1
0
Fork 0
arangodb/arangod/GeneralServer
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
..
AsyncJobManager.cpp rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
AsyncJobManager.h rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
GeneralCommTask.cpp StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +02:00
GeneralCommTask.h StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +02:00
GeneralDefinitions.h finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
GeneralListenTask.cpp finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
GeneralListenTask.h finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
GeneralServer.cpp Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent 2016-08-26 11:47:23 +02:00
GeneralServer.h fixed ownership of handler 2016-08-18 23:06:36 +02:00
GeneralServerFeature.cpp make _state private 2016-08-02 15:31:55 +02:00
GeneralServerFeature.h moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
GeneralServerJob.cpp fix usage of unique_ptr 2016-08-26 09:15:54 +02:00
GeneralServerJob.h fix usage of unique_ptr 2016-08-26 09:15:54 +02:00
HttpCommTask.cpp Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
HttpCommTask.h finish ResponseCode enum 2016-08-23 15:46:42 +02:00
HttpsCommTask.cpp fixed ownership of handler 2016-08-18 23:06:36 +02:00
HttpsCommTask.h Split Http- and HttpsCommTask 2016-07-23 01:17:48 +02:00
PathHandler.cpp renamed method 2016-08-30 10:36:34 +02:00
PathHandler.h fixed ownership of handler 2016-08-18 23:06:36 +02:00
RestHandler.cpp renamed method 2016-08-30 10:36:34 +02:00
RestHandler.h renamed method 2016-08-30 10:36:34 +02:00
RestHandlerFactory.cpp renamed method 2016-08-30 10:36:34 +02:00
RestHandlerFactory.h merge with frank 2016-08-19 10:00:43 +02:00
VppCommTask.cpp prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
VppCommTask.h Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 2016-08-24 15:26:49 +02:00
VppsCommTask.cpp Split Http- and HttpsCommTask 2016-07-23 01:17:48 +02:00
VppsCommTask.h Split Http- and HttpsCommTask 2016-07-23 01:17:48 +02:00