1
0
Fork 0
arangodb/lib
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
..
Admin updated documentation 2014-01-17 17:10:53 +01:00
ApplicationServer Remove debugging code. 2014-02-04 16:21:18 +01:00
Basics Remove debugging code. 2014-02-04 16:21:18 +01:00
BasicsC Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 12:17:51 +01:00
Dispatcher removed unused file 2014-01-16 14:53:35 +01:00
Documentation fixed shutdown 2012-07-01 14:10:01 +02:00
GeneralServer Merge remote-tracking branch 'origin/devel' into sharding 2013-12-20 15:35:50 +01:00
HttpServer Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 13:18:52 +01:00
JsonParser fixed compiler warnings and freebsd problem 2013-11-01 23:05:43 +01:00
MRuby fixed compiler warnings and freebsd problem 2013-11-01 23:05:43 +01:00
ProgramOptions Merge remote-tracking branch 'origin/1.4' into devel 2014-01-25 22:30:04 +01:00
Rest Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 13:18:52 +01:00
Scheduler added option `--server.disable-authentication-unix-sockets` 2014-02-02 00:22:07 +01:00
ShapedJson mini optimisations for shaping 2013-11-22 02:41:39 +01:00
SimpleHttpClient Exorcise closing of connections in SimpleHttpClient. 2014-01-30 20:46:26 +01:00
Statistics added detailed HTTP request statistics 2013-12-13 16:00:02 +01:00
Utilities Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
V8 Redirect on 307 as well if requested. 2014-02-06 09:14:27 +01:00
Zip windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
CMakeLists.txt windows fixes 2014-01-27 17:46:15 +01:00
Makefile.bison removed generated files 2012-10-11 20:37:41 +02:00
Makefile.files Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
Makefile.flex removed generated files 2012-10-11 20:37:41 +02:00
valgrind.supp ignore protobuf 2012-07-01 14:43:36 +02:00