1
0
Fork 0
arangodb/lib
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
2016-08-30 22:04:31 +02:00
..
ApplicationFeatures removed unused file 2016-08-25 14:03:54 +02:00
Basics Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
Endpoint fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
Logger finalize classes 2016-08-25 14:25:17 +02:00
Meta fist changes to get request agents working 2016-08-25 13:28:19 +02:00
ProgramOptions Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Random fixed random number generator initialization 2016-08-02 12:25:46 +02:00
Rest fixed some tests 2016-08-30 09:36:43 +02:00
SimpleHttpClient Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
Ssl Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Utilities
V8 Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
Zip
CMakeLists.txt Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 2016-08-19 14:35:05 +02:00