Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,019 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

17 Commits

Author SHA1 Message Date
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 697d09a558 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-12-18 12:57:39 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Frank Celler 832be07319 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	lib/BasicsC/logging.c
	utils/arango-upgrade.in
 2012-11-27 12:37:41 +01:00
Jan Steemann ad6489c2b7 issue #295 2012-11-27 12:30:12 +01:00
Jan Steemann 1d98ab44fc issue #295 2012-11-27 12:23:26 +01:00
Jan Steemann 55463a6c64 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-11-20 21:04:19 +01:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 89cffbe083 set log level to info (which is the default otherwise) for unknown log levels 2012-09-24 16:59:35 +02:00
Jan Steemann d9227ac680 issue #122: arangod doesn't start if <log.file> cannot be created 2012-07-04 13:34:26 +02:00
Frank Celler fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00