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

460 Commits

Author SHA1 Message Date
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler c9673e08b3 added internal.wait 2012-08-08 15:33:11 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script 
renamed --unit-tests to --javascript.unit-tests
 2012-07-15 00:50:05 +02:00
Frank Celler 2c9d3ded48 regenerated files 2012-06-24 20:44:51 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00