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

13400 Commits

Author SHA1 Message Date
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
jsteemann 9eb8942af9 fix startup dependencies 2017-03-16 15:47:04 +01:00
Max Neunhoeffer 00cf48b638 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-16 14:13:44 +01:00
Max Neunhoeffer d4d532faa4 Silence a compiler warning. 2017-03-16 14:13:28 +01:00
Simon Grätzer a01c529d8a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 14:12:50 +01:00
Simon Grätzer 5cc259e2a1 Pregel micro optimization 2017-03-16 14:12:43 +01:00
Max Neunhoeffer bbcc20378a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-16 13:54:02 +01:00
Max Neunhoeffer 428b6aa67f Port thread fixes from 3.1 to devel. 2017-03-16 13:53:40 +01:00
Simon Grätzer a823442811 Changed Pregel LogLevels to debug where appropriate 2017-03-16 12:25:24 +01:00
Simon Grätzer 215937a884 Fixing cppcheck and jslint warnings 2017-03-16 11:20:35 +01:00
Simon Grätzer e6ad88f2a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 10:52:08 +01:00
Simon Grätzer f2c133d5f6 Fix pregel test 2017-03-16 10:52:02 +01:00
jsteemann 6b7b4d1593 defer access to PersistentIndexFeature until later 2017-03-16 10:34:54 +01:00
jsteemann 22c86744b2 cppcheck 2017-03-16 10:34:09 +01:00
Simon Grätzer f22aec113f Fix typo in summary.md, fix segmentation fault, fix test 2017-03-15 17:47:33 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
Simon Grätzer 3c8a6dbe9e Fixing windows build and warnings 2017-03-15 14:10:54 +01:00
Simon Grätzer e8258063b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	CMakeLists.txt
 2017-03-15 12:59:22 +01:00
Michael Hackstein ce4e394305 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-15 12:35:53 +01:00
Simon Grätzer 24eaf6a6ef Reverting integer hashing 2017-03-15 12:35:40 +01:00
jsteemann 61e0fc1170 make options hidden 2017-03-15 12:33:35 +01:00
jsteemann df3d33774e fix revision conflict handling 2017-03-15 12:33:16 +01:00
Simon Grätzer 45fca509a8 Fixing linux build 2017-03-15 10:41:54 +01:00
Simon Grätzer 529cb4ae85 Integer ID for testing 2017-03-15 10:20:48 +01:00
Dan Larkin 3ac4495eac Moved Finding class out of Cache for convenience. 2017-03-14 11:51:25 -04:00
Simon Grätzer f9e4f4b43d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-14 16:39:41 +01:00
jsteemann 889960a6a0 fixed wrong assertion 2017-03-14 11:22:37 +01:00
Michael Hackstein 1ebf562c4e Moved MMFiles out of vocbase.cpp 2017-03-14 10:29:17 +01:00
Simon Grätzer ec261d91eb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-14 10:11:08 +01:00
jsteemann a42948c6bc fix invalid assertion 2017-03-14 09:49:41 +01:00
Michael Hackstein 5eecac958f Removed accidently commited log output 2017-03-14 09:13:45 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
Simon Grätzer ec6eb718f2 Working lazyloading with new memory backend 2017-03-13 23:25:53 +01:00
Dan Larkin 45ca4bca08 Fixed some compiler warnings. 2017-03-13 13:10:22 -04:00
Michael Hackstein 8727b7b360 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-13 17:50:01 +01:00
jsteemann 7634bb5039 fixed some compile warnings 2017-03-13 17:44:46 +01:00
jsteemann 4727fd0f4b remove unused file 2017-03-13 17:32:13 +01:00
Michael Hackstein bf6f785415 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-13 17:31:51 +01:00
Michael Hackstein 1c33e77bd8 Moved unloadCollection callback into StorageEngine. 2017-03-13 17:28:08 +01:00
Simon Grätzer 7e0ed82f0f Memory Mapped files 2017-03-13 15:13:47 +01:00
Kaveh Vahedipour 5e01e89e7a oops 2017-03-13 14:53:04 +01:00
Kaveh Vahedipour 5e7cdc01cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 13:35:30 +01:00
Kaveh Vahedipour 870eef2f52 backport of 3.1 bug fixes and resilience improvements 2017-03-13 13:35:19 +01:00
Simon Grätzer fb560eece1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 13:02:55 +01:00
hkernbach ecfe18a6ce fixed clang build error 2017-03-13 12:47:09 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
 2017-03-13 12:25:28 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
jsteemann 709249bfde Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 10:25:13 +01:00
jsteemann 0f51ccbb93 renamed option and updated documentation 2017-03-13 10:24:58 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00