1
0
Fork 0
Commit Graph

7 Commits

Author SHA1 Message Date
Frank Celler 1ccd0677c5 fixed version number, added arangosh chapter 2012-08-03 10:22:09 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +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