1
0
Fork 0
arangodb/lib/SimpleHttpClient
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
..
ClientConnection.cpp splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
ClientConnection.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ConnectionManager.cpp Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
ConnectionManager.h changes for Visual Studio 2016-08-19 17:22:57 +02:00
GeneralClientConnection.cpp fix Windows build 2016-04-08 13:09:32 +02:00
GeneralClientConnection.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
SimpleHttpClient.cpp finish ResponseCode enum 2016-08-23 15:46:42 +02:00
SimpleHttpClient.h finish RequestType enum 2016-08-23 14:49:29 +02:00
SimpleHttpResult.cpp Fix comments 2016-08-29 11:52:09 +02:00
SimpleHttpResult.h potential performance optimizations 2016-06-23 14:47:44 +02:00
SslClientConnection.cpp moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
SslClientConnection.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00