Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
34,258 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1642 Commits

Author SHA1 Message Date
Max Neunhoeffer f946517413 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-13 10:59:35 +02:00
Max Neunhoeffer 3ee28ac333 Adjust comments about TRI_usleep and usleep. 2016-10-13 10:57:00 +02:00
Jan Steemann e88460efcb add state "loading collections" to query profile results 2016-10-13 10:31:16 +02:00
Jan Steemann 3b11acbc29 micro optimizations 2016-10-12 16:59:57 +02:00
Jan Steemann f9fe5387bf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-12 13:37:38 +02:00
Jan Steemann 958379dce3 cppcheck 2016-10-12 13:37:27 +02:00
Wilfried Goesgens e6f505ebe0 Fix windows compile 2016-10-12 13:27:59 +02:00
Wilfried Goesgens cbaa2c3b02 More places to pass along the binaryPath for teh windows 2016-10-12 13:21:38 +02:00
Wilfried Goesgens 26566183a4 its nullptr on windows too. 2016-10-12 12:45:12 +02:00
Wilfried Goesgens 54ae758c7c We also need to know the binary directory when looking up the config 
file; else we may miscalculate file locations.
 2016-10-12 12:03:37 +02:00
Wilfried Goesgens bbbaf133f0 Fix windows build with the calculation of file locations 2016-10-11 19:08:53 +02:00
Andreas Streichardt e75b8f5503 Implement cURL based inter server communication 2016-10-10 14:56:04 +02:00
Max Neunhoeffer f578ee394f Fixes in AQL write code to smart collections. 2016-10-09 11:09:00 +02:00
Michael Hackstein 6c64e61982 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-08 01:29:48 +02:00
Michael Hackstein ced62cdaf6 Some improvements in general-graph. Added a new Enterprise error 2016-10-08 01:28:53 +02:00
Max Neunhoeffer f316a9bc4c More changes for AQL writing to smart edge collections. 2016-10-08 00:48:23 +02:00
Michael Hackstein cec7d79fc2 Added a new error code if a collection is not smart (EE only) 2016-10-05 13:00:43 +02:00
Frank Celler f83f6a7114 more authentication events, fixed changePassword 2016-10-03 19:54:54 +02:00
Frank Celler f559344034 added different path for different editions 2016-09-30 15:24:31 +02:00
jsteemann b5c5407b02 try to fix compile warnings in non-maintainer mode 2016-09-27 13:31:17 +02:00
Michael Hackstein e16e6b6532 Templatified read and write locker. They can now use Cpp11 style locks. Also included distributeShardsLike in AgencyInformation about collections. 2016-09-26 18:29:51 +02:00
Michael Hackstein ac7e627f5b Merge branch 'devel' of github.com:arangodb/arangodb into hmh 2016-09-19 09:45:01 +02:00
jsteemann 501c368ae8 added experimental support for incoming gzip-compressed requests 2016-09-19 08:57:21 +02:00
Michael Hackstein 6e4f66c351 Merge branch 'devel' of github.com:arangodb/arangodb into hmh 2016-09-16 17:21:10 +02:00
Michael Hackstein 3e130c1cb4 Added a hash and equals comparator for velocypack that only takes _id into account. 2016-09-16 17:20:43 +02:00
jsteemann fad7efe8c3 more diagnostics 2016-09-16 09:35:08 +02:00
Wilfried Goesgens abd83047fe implement use-local-time for slow queries as sugested in #2051 2016-09-14 13:01:30 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Max Neunhoeffer d7ab888046 Cleanup hash function for attributes. Prepare enterprise. 2016-09-09 16:49:02 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann eea35223de move json-utilities to the place where it is solely used 2016-09-08 09:51:15 +02:00
jsteemann 34f7e27d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 09:27:53 +02:00
Frank Celler 6abe3d9487 give more debug info 2016-09-08 08:40:29 +02:00
jsteemann 5807d121e6 added comments 2016-09-07 15:00:15 +02:00
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
Frank Celler 650b325529 shutdown thread that is not started directly 2016-09-06 23:20:23 +02:00
Kaveh Vahedipour 2840d4a002 try to fix the shutdown in thread 2016-09-06 18:32:46 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
jsteemann a7cee1490a fix some shutdown issues 2016-09-01 17:43:32 +02:00
jsteemann 69bfca08ca Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:39:11 +02:00
jsteemann 6b376fe3e1 a bit less locking 2016-09-01 15:25:19 +02:00
jsteemann 68ae8d2945 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 12:02:50 +02:00
Jan Steemann d57c3ef792 removed unused method 2016-09-01 12:02:24 +02:00
Jan Steemann a2f0b0a49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:20:15 +02:00
Jan Steemann e03d550985 removed unused methods 2016-09-01 11:19:55 +02:00
jsteemann be820ac927 fix freeing of nullptr 2016-09-01 08:42:17 +02:00
jsteemann 149ef4ab8b fix freeing of nullptr 2016-09-01 08:39:44 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +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