1
0
Fork 0
arangodb/lib
Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
2013-12-30 17:27:17 +01:00
..
Admin don't complain upon usage of obsolete --database.force-sync-shapes option 2013-11-14 01:25:55 +01:00
ApplicationServer Merge remote-tracking branch 'origin/1.4' into devel 2013-12-30 17:27:17 +01:00
Basics merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
BasicsC merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Dispatcher removed second logger implementation 2013-10-30 00:38:25 +01:00
Documentation
GeneralServer added --server.ssl-protocol option for client tools 2013-12-13 17:58:24 +01:00
HttpServer added detailed HTTP request statistics 2013-12-13 16:00:02 +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 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Rest merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Scheduler removed second logger implementation 2013-10-30 00:38:25 +01:00
ShapedJson mini optimisations for shaping 2013-11-22 02:41:39 +01:00
SimpleHttpClient fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Statistics added detailed HTTP request statistics 2013-12-13 16:00:02 +01:00
Utilities merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
V8 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Zip windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
CMakeLists.txt merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Makefile.bison
Makefile.files merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Makefile.flex
valgrind.supp