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

4254 Commits

Author SHA1 Message Date
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 fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +02:00
jsteemann 89ac2dfba5 don't leak on help 2016-08-31 14:28:23 +02:00
Andreas Streichardt a14935aca3 Handle 503 answer from dbservers properly 2016-08-31 11:24:23 +02:00
jsteemann c8ee419a80 fix calls 2016-08-31 11:23:48 +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 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
jsteemann 61d11fd71c acquire lock later 2016-08-30 13:00:17 +02:00
jsteemann bc9d0e74d5 unprepare features on abort 2016-08-30 12:59:15 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
jsteemann 8fac72e8d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 12:52:47 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +02:00
jsteemann ae52fa028d use Buffer.append() instead of memcpy 2016-08-29 10:06:46 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +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 0b8b56a54a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-26 16:25:17 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann 50d4d5493c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:32:24 +02:00
jsteemann 4f994f70b5 fix compile warning 2016-08-26 15:31:57 +02:00
jsteemann 598990eb5c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:27:37 +02:00
Wilfried Goesgens 1a4675865e Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-26 14:55:48 +02:00
jsteemann 0fe0e89a89 invalidate bucket data 2016-08-26 14:53:37 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
Jan Christoph Uhde b30c3f8e85 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  fix CMake so it finds the PythonInterpreter even with oder versions
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
 2016-08-26 14:09:38 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde c2e2ff6744 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  undo simrans change - building on linux works again
  added assertions to prevent buffer overruns
  moved _compactionLock out of TRI_collection_t
  cmake: don't allow Python 3 interpreter (gyp only works with Python 2)
  updated CHANGELOG
  throw OOM error in case no buffer can be allocated
  add note about potential performance issues
 2016-08-26 13:16:14 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Wilfried Goesgens 3d6810ecfe If we have relative paths that are working, make them absolute so they still work after CWD's of arangod 2016-08-26 12:50:48 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 08f1fa3a22 added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
 2016-08-26 11:47:23 +02:00