1
0
Fork 0
arangodb/lib
Frank Celler b5905a293b Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	Documentation/RefManual/Actions.md
	Documentation/UserManual/Foxx.md
	Documentation/UserManual/UserManual.md
	lib/ProgramOptions/program-options.c
2014-01-25 22:30:04 +01:00
..
Admin updated documentation 2014-01-17 17:10:53 +01:00
ApplicationServer issue #744 2014-01-23 09:58:18 +01:00
Basics merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
BasicsC added graph-specific error code 2014-01-18 01:08:24 +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 Merge remote-tracking branch 'origin/1.4' into devel 2014-01-25 22:30:04 +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 upgraded client version number 2014-01-14 13:27:35 +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
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