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

33469 Commits

Author SHA1 Message Date
Frank Celler 9bb239b737 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-31 10:38:59 +02:00
Frank Celler 52c2c4a3ac return service unavailable during shutdown 2016-08-31 10:38:53 +02:00
Kaveh Vahedipour 676e5b1329 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-31 08:34:21 +00:00
Wilfried Goesgens 16f03bb747 Add cxgcc snippets 2016-08-31 10:08:22 +02:00
jsteemann 32d74c3ac3 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:14 +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
Wilfried Goesgens 3c3a941bea Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-30 17:46:54 +02:00
Wilfried Goesgens 1a841feb1a fix users home directory. 2016-08-30 17:46:29 +02:00
Wilfried Goesgens b4ddb77d58 Fix debian scripted password documentation. 2016-08-30 17:31:49 +02:00
jsteemann a2048f1255 fix bitshifting 2016-08-30 17:27:50 +02:00
jsteemann 0ccee3b412 nicer hex output 2016-08-30 17:08:50 +02:00
jsteemann baad30fdb7 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:47:35 +02:00
Michael Hackstein 4175c6eb65 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 16:37:26 +02:00
Michael Hackstein 8fa571073e Index creation now actually writes index files on logical collection 2016-08-30 16:37:12 +02:00
Jan Steemann 226ed6d17a slighty improved error handling in import API 2016-08-30 16:33:44 +02:00
jsteemann ea9124eb51 fixed dump test 2016-08-30 16:32:20 +02:00
jsteemann 1bc8ce1060 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:28:11 +02:00
Michael Hackstein 8bced11a07 Potential assertion fix on planId 2016-08-30 16:27:54 +02:00
Jan Christoph Uhde 3a7f5ea826 add flags only for gcc as they are meaningless for clang 2016-08-30 16:11:57 +02:00
jsteemann b2eadbd179 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:50 +02:00
jsteemann 7223179b7f Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:44 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Michael Hackstein 0e840afcb6 Removed obsolete constructor 2016-08-30 15:48:25 +02:00
Michael Hackstein 277953489c Fixed now false checks on planId == 0 for SingleServer case. This is not true any more 2016-08-30 15:37:26 +02:00
Jan Steemann b7be5d5cfb fixed issue #2026 2016-08-30 15:14:16 +02:00
Kaveh Vahedipour 75d54abce6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-30 14:41:33 +02:00
Kaveh Vahedipour c8178239e1 agency configuration persisted to state machine 2016-08-30 14:41:28 +02:00
Wilfried Goesgens 1c34b564ed Fix release matching for alpha/beta versions 2016-08-30 14:39:48 +02:00
Jan Christoph Uhde add0a26228 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  renamed method
 2016-08-30 14:20:27 +02:00
jsteemann 09b611100c Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 13:46:01 +02:00
jsteemann bdd9d1422e bugfixes 2016-08-30 13:45:54 +02:00
Michael Hackstein d6a21b20e3 Fixed creation of keyGenerator. It was not extracted correctly from the parameters 2016-08-30 13:31:53 +02:00
Michael Hackstein 294fa10e14 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 13:08:40 +02:00
Michael Hackstein 2f7f3e0fe0 Fixed creation of system collections without System name 2016-08-30 13:05:33 +02:00
jsteemann fab835c63a Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 13:02:14 +02:00
jsteemann cf42f5dbc8 fix leaks 2016-08-30 13:02:04 +02:00
jsteemann d95f1773c4 fix leaks 2016-08-30 13:01:50 +02:00
jsteemann 672255fad7 removed some TRI_collection_t instances 2016-08-30 13:01:34 +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
Wilfried Goesgens 9b21d403ea We mustn't use minuses in the releases since that will collide later on with packaging. 2016-08-30 12:57:08 +02:00
Jan Christoph Uhde b340546023 update my scripts 2016-08-30 12:33:05 +02:00
jsteemann 7dfaf0d3f4 remove superfluous _infoLock 2016-08-30 11:54:04 +02:00
jsteemann a7cf45342f removed unused methods 2016-08-30 11:41:50 +02:00
jsteemann e227d670f0 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 11:30:14 +02:00
jsteemann 983fca3b56 removed unused methods 2016-08-30 11:29:58 +02:00
Wilfried Goesgens c2c774fcc8 Pass arguments along to build.sh 2016-08-30 11:23:01 +02:00
Michael Hackstein 9c0382ed19 Now also the journalSize is checked if it is too small. Also reverted report message for isVolatile to be equal to the pre 3.1 message. 2016-08-30 11:18:36 +02:00
Michael Hackstein 5f067cb1fb Fixed creation of volatile collections. They can now again not waitForSync at the same time. 2016-08-30 11:11:25 +02:00