1
0
Fork 0
Commit Graph

82 Commits

Author SHA1 Message Date
jsteemann 29170414a2 removed unused property 2016-09-01 10:40:29 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
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
jsteemann bdd9d1422e bugfixes 2016-08-30 13:45:54 +02:00
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
2016-08-24 14:45:08 +02:00
jsteemann fb4b3d0a3c Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-24 11:07:45 +02:00
jsteemann 7794b76b33 intermediate commit 2016-08-24 10:54:47 +02:00
jsteemann b29103c1f1 fix collector inactivity in shutdown 2016-08-24 09:37:47 +02:00
Michael Hackstein efce89e3f4 Fixed database/collection lookup in cluster. It did not get the correct vocbase when using a Database other than _system 2016-08-18 17:39:25 +02:00
jsteemann b2cb551685 moved functionality from vocbase into DatabaseFeature 2016-08-18 09:24:26 +02:00
jsteemann 5d640b7144 fixed tests 2016-08-04 13:32:54 +02:00
jsteemann dd30b47b9d make _state private 2016-08-02 15:31:55 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann f1596fa459 refactoring 2016-08-02 14:01:04 +02:00
jsteemann 3664511e36 privatize vocbase methods 2016-08-02 13:49:22 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
jsteemann b48779c821 fixed tests 2016-07-28 15:56:38 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann 5d6cd9ef71 moved query id generation 2016-07-27 17:44:31 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
jsteemann 9af8a30a36 fixed compactor locks 2016-07-26 10:22:44 +02:00
jsteemann 253cb173a9 cleanup compaction responsibility a little bit 2016-07-26 07:34:02 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
jsteemann 50f3dcfb3f cleanup 2016-07-25 16:16:07 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00
jsteemann 33c94e5041 moved database lookup functions into DatabaseFeature 2016-07-25 14:56:39 +02:00
jsteemann b288d3e4dd moved dropDatabaseCoordinator() into DatabaseFeature 2016-07-25 14:04:55 +02:00
jsteemann de6d7182c8 move deletion of databases into DatabaseFeature 2016-07-25 13:56:34 +02:00
jsteemann e8a5b5ccf5 move createDatabase into DatabaseFeature 2016-07-25 12:35:53 +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 95462e7796 moved database creation in DatabaseFeature 2016-07-22 17:43:22 +02:00
jsteemann dfa2e59c4a don't access nullptr 2016-07-22 14:14:50 +02:00
jsteemann e55070dcd2 starting again... well, at least in some configuration 2016-07-22 14:03:03 +02:00
jsteemann b9529d80e3 moved functionality into engine 2016-07-20 17:26:58 +02:00
jsteemann e36770efdf moved functionality 2016-07-20 16:25:41 +02:00
jsteemann ca1da8fd4a moved functionality from TRI_server_t into DatabaseFeature 2016-07-20 16:09:12 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 8313682b2c refactoring 2016-07-18 17:48:24 +02:00
jsteemann 53f77017fb moved SERVER away from DatabasePathFeature 2016-07-18 17:33:11 +02:00
jsteemann 2dab54a751 removed a define 2016-07-18 17:15:41 +02:00
jsteemann f373a2c327 removed TRI_vocbase_defaults_t 2016-07-18 16:55:25 +02:00
jsteemann 904868d996 renamed DatabaseServerFeature to DatabasePathFeature 2016-07-18 15:41:10 +02:00