1
0
Fork 0
Commit Graph

13 Commits

Author SHA1 Message Date
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Jan Steemann 5e931b4e06 issue #150 2012-09-06 11:52:03 +02:00
Jan Steemann ff03b3c63f issue #150 comments 2012-09-04 23:58:37 +02:00
Jan Steemann a667f633d5 issue #150 2012-09-04 22:30:44 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
2012-07-24 22:19:46 +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 9e1acf7a75 yesterday 2012-07-02 18:47:12 +02:00
Frank Celler 0482963c7d Merge branch 'master' of github.com:fceller/ArangoDB into 1.1 2012-07-02 15:20:35 +02:00
Frank Celler fff2a9d656 cleanup mruby 2012-07-02 14:26:51 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +02:00