1
0
Fork 0
Commit Graph

32 Commits

Author SHA1 Message Date
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
Kaveh Vahedipour c53428ce89 minor fixes 2016-08-29 17:13:33 +02:00
jsteemann 80f1a7aaee Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-29 17:16:20 +02:00
Andreas Streichardt 526c8f42c2 Fix foxx issues in cluster
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
2016-07-29 16:06:31 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann 9af8a30a36 fixed compactor locks 2016-07-26 10:22:44 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
jsteemann 33c94e5041 moved database lookup functions into DatabaseFeature 2016-07-25 14:56:39 +02:00
jsteemann a92ac7be28 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:14:44 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 8cf7fc889d renamed method 2016-07-18 18:07:11 +02:00
jsteemann 53f77017fb moved SERVER away from DatabasePathFeature 2016-07-18 17:33:11 +02:00
jsteemann 904868d996 renamed DatabaseServerFeature to DatabasePathFeature 2016-07-18 15:41:10 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Frank Celler 69e254d28a trying to fix cleanup 2016-06-06 23:53:53 +02:00
jsteemann b247a6e08c added --hund option 2016-06-02 13:54:53 +02:00
Max Neunhoeffer 0cb9441912 First Bootstrap, then AgencyFeature. 2016-05-31 12:44:19 -06:00
Max Neunhoeffer 9b8f9f22e9 Let bootstrap feature publish its readiness. 2016-05-25 17:29:34 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Max Neunhoeffer f41ab22098 Change a few startup messages from level INFO to DEBUG. 2016-05-11 11:42:33 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
Max Neunhoeffer 6c37027b49 Get rid of an AgencyComm::getValues. 2016-05-09 13:41:19 +02:00
jsteemann 1a4a95a2ad notify queries about shutdown 2016-05-06 10:20:00 +02:00
Max Neunhoeffer b9e935b928 At bootstrap: Only leave maintenance mode if things are initialized. 2016-05-02 13:52:46 +02:00
Max Neunhoeffer 18b72dfdbe Fix cluster startup. 2016-04-29 16:36:41 +02:00
Max Neunhoeffer 017d4a56a7 Better logging. 2016-04-29 14:45:27 +02:00
Max Neunhoeffer 84d7616cde Better logging. 2016-04-29 14:25:33 +02:00
Max Neunhoeffer b05464b78c Cluster bootstrap revolution. 2016-04-29 13:59:12 +02:00