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

8946 Commits

Author SHA1 Message Date
Michael Hackstein dc58c5d769 Fixed Modify edges in cluster test. Expected old return codes 2016-04-04 18:41:28 +02:00
Michael Hackstein 96df479125 Fixed error Reporting in AQLRestHandler. It did always throw OOM despite of the error. 2016-04-04 17:46:41 +02:00
Kaveh Vahedipour 90406d3e92 redefinition of agency api 2016-04-04 16:43:48 +02:00
Kaveh Vahedipour 35cc67fa61 redefinition of agency api 2016-04-04 16:40:40 +02:00
Michael Hackstein e29e3e3d6c Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 16:18:49 +02:00
Michael Hackstein 8bde9506a1 Fixed getIndexByHandle in trx for Cluster case. This is required for executing a query from a JSON query plan on Coordintator. Unlikely in Production but required for tests 2016-04-04 16:18:45 +02:00
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Kaveh Vahedipour 005e8dfd00 type fixed 2016-04-04 15:48:11 +02:00
Andreas Streichardt a2b8bb92f2 Oops...still conflicted 2016-04-04 15:45:30 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Jan Steemann bd43decab4 replication fixes 2016-04-04 14:55:55 +02:00
Kaveh Vahedipour 3d3f11ef54 comments 2016-04-04 12:55:18 +00:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Michael Hackstein bf76988267 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 12:52:27 +02:00
Michael Hackstein ab46b07f98 Reimplemented Traversal in Cluster case 2016-04-04 12:52:11 +02:00
Kaveh Vahedipour c61f73314c endpoints are now coming from applicationendpointserver 2016-04-04 12:49:35 +02:00
Michael Hackstein 4339c6540d Fixed a bug with custom _id attribute in RestSimpleHandle lookupByKeys 2016-04-04 12:48:55 +02:00
Jan Steemann ba9dce75f4 fixed some replication tests 2016-04-04 12:26:30 +02:00
Kaveh Vahedipour b26ea07eaf endpoints are now coming from applicationendpointserver 2016-04-04 11:50:24 +02:00
Kaveh Vahedipour 67e6e403e3 agency's own endpoint is now derived from server.endpoint 2016-04-04 11:28:48 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00
Jan Steemann 9f213281b1 fixed some issues with tests 2016-04-04 10:13:13 +02:00
Kaveh Vahedipour bcc180bf2b Clearing time table effectlively done the same way as for external calls 2016-04-04 08:41:59 +02:00
Andreas Streichardt 983c6f1b7e Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-01 17:21:42 +02:00
Michael Hackstein 0f7c2af9dc Fixed undefined behaviour bug if someone tries to delete a document without key and body. 2016-04-01 17:12:22 +02:00
Andreas Streichardt 70d6f1259a Finally cluster is working with the new agency 2016-04-01 17:07:28 +02:00
Michael Hackstein 98ab36fe56 Coordinator now reports UNIQUE_CONSTRAINT_VIOLATED correctly 2016-04-01 16:05:48 +02:00
Kaveh Vahedipour 3e2f7b4043 replaced put_time 2016-04-01 15:34:13 +02:00
Kaveh Vahedipour a3d8ce9cab gcc 4.8 does not entail std::put_time 2016-04-01 15:22:08 +02:00
Kaveh Vahedipour 1dba990295 ttl overwrite 2016-04-01 15:10:20 +02:00
Kaveh Vahedipour f013604f47 ttl overwright 2016-04-01 15:01:53 +02:00
Michael Hackstein 91d394105c ClusterResolver cid by numeric name now checks if the number is actually a valid collection and it returns cid 0 instead of the given numeric number. Some apis rely on this to check if collection exists or not. 2016-04-01 14:31:13 +02:00
Kaveh Vahedipour 0849737d78 Overwriting ttls 2016-04-01 14:28:25 +02:00
Kaveh Vahedipour 8ace3c10a3 Overwriting ttls 2016-04-01 14:24:30 +02:00
Michael Hackstein 4637d0ff40 Fixed api/edges in Cluster 2016-04-01 11:38:44 +02:00
Kaveh Vahedipour 65623fc4e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-01 10:42:07 +02:00
Frank Celler 8e39a3c889 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 10:39:50 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Kaveh Vahedipour 0b552be0f1 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-01 10:38:32 +02:00
Kaveh Vahedipour e0990c947e fixed broken agency test 2016-04-01 10:38:10 +02:00
Kaveh Vahedipour 5363703846 Log.h not needed anymore 2016-04-01 09:10:55 +02:00
Kaveh Vahedipour a62be6a6ea remerged devel 2016-03-31 23:34:39 +02:00
Kaveh Vahedipour 768e376c35 ttls revisited for proper logging 2016-03-31 22:35:50 +02:00
Frank Celler a11a7c134c maintainer mode fixes 2016-03-31 17:39:52 +02:00
Michael Hackstein e32df21b2c Also reverted simple geo queries to old version to make them functional again 2016-03-31 17:34:21 +02:00
Frank Celler ae45b7cd67 MSVC fixes 2016-03-31 17:16:37 +02:00
Kaveh Vahedipour 18d0528c1c Merge back from agency 2016-03-31 17:12:57 +02:00
Kaveh Vahedipour 650f1bb06a Correction to adapt to HTTP_REQUEST 2016-03-31 17:10:25 +02:00
Kaveh Vahedipour 394dcdb46b added more precondition and ttl tests 2016-03-31 16:50:00 +02:00
Michael Hackstein b5c0ce0a82 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 16:20:33 +02:00
Michael Hackstein fb2b7b6b0f Fixed FullText index in cluster. Newest implementation ended up in an endless Loop. Reverted to original version. 2016-03-31 16:20:20 +02:00
Kaveh Vahedipour 8ac7491e53 cleaning up log messages. corrected agency test for failed precondition. 2016-03-31 16:10:25 +02:00
Frank Celler c41c51b23d Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 14:46:49 +02:00
Andreas Streichardt b2fc192dd2 implement new agency 2016-03-31 14:03:01 +02:00
Frank Celler 1c0492ff8a MSVC fixes 2016-03-31 14:02:02 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Kaveh Vahedipour cec6c4bc13 merge back from agency 2016-03-31 11:52:18 +00:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Michael Hackstein d7c3202e97 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:03:16 +02:00
Michael Hackstein 938c5470f4 Fixed serialisation of ItemBlock in Cluster Case. 2016-03-31 13:03:05 +02:00
Kaveh Vahedipour a0edfe2b8d ids need to be sorted in the proper order. zero filling from left 2016-03-31 12:23:07 +02:00
Kaveh Vahedipour cdd76c1b89 still ttl in long 2016-03-31 11:53:08 +02:00
Andreas Streichardt 3203dbda01 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:52:18 +02:00
Kaveh Vahedipour f4ee0729eb still ttl in long 2016-03-31 11:52:17 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Andreas Streichardt 4446345dba Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:44:36 +02:00
Kaveh Vahedipour 2ddc1cd8ec i am a teapot if value not found and only a single search string is requested 2016-03-31 11:44:02 +02:00
Andreas Streichardt 9fd044b2e9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:19:37 +02:00
Kaveh Vahedipour fcc159764c reading persistent log failes on linux 2016-03-31 09:19:05 +00:00
Frank Celler 2f2b0b9741 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 11:12:17 +02:00
Michael Hackstein 7eb4b2b730 Removed JS implementation of edges. The new CXX AQL implementation can server for CLuster as well. 2016-03-31 11:11:35 +02:00
Andreas Streichardt 7b99111cbe Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:04:25 +02:00
Kaveh Vahedipour f9cc972cff i am a teapot if value not found and only a single search string is requested 2016-03-31 11:04:10 +02:00
Michael Hackstein 618c855c85 Cluster Methods now use the OperationOptions of transactions. And now reacts to these options accordingly incl returnNew/returnOld 2016-03-31 10:52:24 +02:00
Kaveh Vahedipour 3e225f4304 remergin devel 2016-03-31 09:51:34 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Kaveh Vahedipour ecbf988d0f merging back agency into devel 2016-03-31 09:25:05 +02:00
Kaveh Vahedipour b765df6551 corrected ttl for accepting integer seconds :) 2016-03-31 09:13:12 +02:00
Kaveh Vahedipour 153610c76f corrected ttl for accepting integer seconds :) 2016-03-31 09:08:18 +02:00
Michael Hackstein 118cc6c141 Reoming Documents in Cluster case now reacts to old revisions 2016-03-30 18:19:45 +02:00
Michael Hackstein 726e231b8a Checking for change shard attributes now uses VPackHelper compare instead of equals. Then it is able to compare different number types 2016-03-30 17:32:13 +02:00
Michael Hackstein a653f6d377 Fixed Conflict reporting in Cluster Case of delete 2016-03-30 17:14:03 +02:00
Kaveh Vahedipour af0e55bf25 updating state to AQL 2016-03-30 16:22:08 +02:00
Kaveh Vahedipour 3b6dd3ef10 updating state to AQL 2016-03-30 16:21:33 +02:00
Michael Hackstein 92deaf3231 Removed obsolete variable 2016-03-30 16:18:29 +02:00
Kaveh Vahedipour 0e49485c73 updating state to AQL 2016-03-30 16:18:12 +02:00
Kaveh Vahedipour f8e49bd208 updating state to AQL 2016-03-30 15:59:13 +02:00
Michael Hackstein 428beab2c9 Fixed a Coordinator return code if document was not found (was collection not found former which was totally wrong 2016-03-30 15:54:39 +02:00
Michael Hackstein 4bdb090357 Replaced old version of cluster communication using ?rev= with new if-match header 2016-03-30 15:54:07 +02:00
Michael Hackstein 187b8e4770 Fixed a bug in replace/update cluster case. Where the DBserver requested shardkeys by shardname, which is not possible any more. shardKeys are only available for global collection Name. 2016-03-30 15:32:50 +02:00
Kaveh Vahedipour 0d092b0867 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-30 13:42:58 +02:00
Kaveh Vahedipour d09986ca4b updating state to AQL 2016-03-30 13:42:29 +02:00
Michael Hackstein c4562a760c The cluster internal communication now uses if-match header instead of ?rev= which is not supported any more 2016-03-30 13:38:51 +02:00
Kaveh Vahedipour 375721d2bf Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-30 13:20:53 +02:00
Kaveh Vahedipour ee97eb769b updating state to AQL 2016-03-30 13:20:19 +02:00
Michael Hackstein 9d70091713 The RestEdges handler now behaves identically to the server side edges() functions. Specifically it does not return duplicate edges any more. Also added a helper function to build an EdgeIndex Lookup from VPackArray. 2016-03-30 10:13:09 +02:00
Wilfried Goesgens f2accf4f97 Anounce we know howto talk TLSv1.2 2016-03-29 17:05:59 +02:00
Michael Hackstein 8761550add Whenever an AQLValue should store an external it will now store a pointer instead. 2016-03-29 16:01:58 +02:00
Kaveh Vahedipour a48b795b44 bug in increment and decrement in agency solved. 2016-03-29 15:48:49 +02:00
Kaveh Vahedipour 19267cbbac bug in increment and decrement in agency solved. 2016-03-29 15:09:58 +02:00
Kaveh Vahedipour 43749f1f52 bug in increment and decrement in agency solved. 2016-03-29 15:04:13 +02:00
Kaveh Vahedipour 0257162f82 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-29 14:13:12 +02:00
Kaveh Vahedipour 1e6d47700a visualstudio compatibility of std::chrono::duration<double,std::ratio<1,1>> missing. 2016-03-29 14:11:01 +02:00
Andreas Streichardt efa2c658bb Remove obsolete addEndpoints 2016-03-29 13:44:15 +02:00
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
Kaveh Vahedipour 173a6010b5 VisualStudio warnings 2016-03-29 13:01:23 +02:00
Michael Hackstein a5d20b0041 Activated Externals in OperationCursor. This commit might break tests again. 2016-03-29 11:08:31 +02:00
Kaveh Vahedipour a11ed509a1 some consistency namign 2016-03-29 10:28:57 +02:00
Kaveh Vahedipour 8e24b383de VisualStudio compatibility 2016-03-29 07:25:28 +00:00
Jan Steemann d9c5877054 test fixes 2016-03-24 19:25:25 +01:00
Jan Steemann 07e43276c6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 18:20:37 +01:00
Kaveh Vahedipour 1f9e40fbf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 17:54:13 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Andreas Streichardt 8a93687d93 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-24 16:56:35 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Jan Steemann ead20d9d11 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 16:55:11 +01:00
Michael Hackstein 91c98d479d Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 16:43:34 +01:00
Kaveh Vahedipour aaf7e829fb nasty bug in state. erradic behaviour on removing conflicting entries in state machine. 2016-03-24 16:43:11 +01:00
Michael Hackstein 8dcded7d00 Fixed SkiplistIndex lookup if searchValue is less than the smalles index element. 2016-03-24 16:32:36 +01:00
Max Neunhoeffer af63defa05 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-24 16:29:38 +01:00
Max Neunhoeffer 46b087a6d7 Fix one bug in replication. 
Now it runs, but no documents seem to reach the destination.
 2016-03-24 16:29:17 +01:00
Jan Steemann 13980ef299 bugfixes 2016-03-24 16:18:18 +01:00
Jan Steemann cd0f717166 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:55:26 +01:00
Michael Hackstein db4b6d2a5b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 15:48:50 +01:00
Jan Steemann dda3c402fe Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:43:56 +01:00
Kaveh Vahedipour 5f8bd3d720 address sanitizer bitching about non-initialised boolean 2016-03-24 15:37:26 +01:00
Jan Steemann 1915e39aea Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:28:57 +01:00
Jan Steemann dce7c427d9 test fixes 2016-03-24 14:55:31 +01:00
Kaveh Vahedipour 88909eb50a Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:28:21 +01:00
Kaveh Vahedipour 9d43d4b708 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 14:14:45 +01:00
Kaveh Vahedipour 1bdfe53ec2 Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:14:33 +01:00
Michael Hackstein 76d70591e9 Removed unnecessary import 2016-03-24 13:41:39 +01:00
Michael Hackstein c0173d7d67 Fixed unused variable warning when compiling without maintainer mode 2016-03-24 13:40:43 +01:00
Michael Hackstein ed7fd3c495 Added VPack MinKey as Illegal Index Element. Is used to distinguish NON existance in Array indexes 2016-03-24 13:40:16 +01:00
Michael Hackstein 71068cb468 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 12:46:50 +01:00
Michael Hackstein c1d2c8ff6f Fixed compare function fpr Unique HashIndex. Had a problem with different number types 2016-03-24 12:46:35 +01:00
Jan Steemann b8e5064c45 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 12:46:23 +01:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
Jan Steemann 7b758efaeb handle status CL_COMM_BACKEND_UNAVAILABLE 2016-03-24 12:00:03 +01:00
Michael Hackstein af14e598d1 Fixed Array Indexing. All tests are green again 2016-03-24 11:22:01 +01:00
Kaveh Vahedipour 8bc6d193c4 Remerge from devel into agency for integration into cluster 2016-03-24 11:17:59 +01:00
Kaveh Vahedipour a6bd03c609 Fixing VS 2015 warnings and errors 2016-03-24 10:46:00 +01:00
Kaveh Vahedipour c1a5b56061 Fixing VS 2015 warnings and errors 2016-03-24 10:38:50 +01:00
Michael Hackstein b6796bebcf Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 10:02:42 +01:00
jsteemann 20dfe7ca9e fixed test 2016-03-24 01:50:55 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
jsteemann 1efc83babf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 23:48:27 +01:00
jsteemann 8f4a3be165 cppcheck 2016-03-23 23:06:18 +01:00
jsteemann 3f3ac72503 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 20:55:01 +01:00
Jan Steemann c3678ea845 prevent startup errors due to uninitialized variable 2016-03-23 20:24:00 +01:00
Jan Steemann 2986ec2a64 removed dead code 2016-03-23 20:08:22 +01:00
Kaveh Vahedipour 6e31d0374d need to log all changes of term in agency 2016-03-23 19:16:21 +01:00
Kaveh Vahedipour f774a3969a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 19:14:49 +01:00
Jan Steemann f7faf536eb merge 2016-03-23 19:12:57 +01:00
Jan Steemann 3ccf593565 fixed potential shutdown issue 2016-03-23 19:07:21 +01:00
Kaveh Vahedipour ef2fe19cbf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 19:05:53 +01:00
Kaveh Vahedipour 80e7828a97 need to log all changes of term in agency 2016-03-23 19:05:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Jan Steemann 3a2e9f6e1f initialize value 2016-03-23 18:50:57 +01:00
Jan Steemann 7975913fc5 fixed tests 2016-03-23 18:50:46 +01:00
Jan Steemann cb860d39e9 added assertions 2016-03-23 18:31:26 +01:00
Jan Steemann 6abcc57459 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 18:14:12 +01:00
Jan Steemann da1721f262 added assertions 2016-03-23 18:14:03 +01:00
Kaveh Vahedipour b1a8f1611b fixed random compile warnings 2016-03-23 18:06:56 +01:00
Kaveh Vahedipour 90a085975d missing overrides 2016-03-23 17:39:16 +01:00
Michael Hackstein eeb8279854 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-23 17:32:09 +01:00
Michael Hackstein bf6a4fedd9 Fixed array index insertion. 2016-03-23 17:31:11 +01:00
Kaveh Vahedipour 599abfb415 repaired redirection in public agency api 2016-03-23 17:19:46 +01:00
Jan Steemann 0a9b43f654 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 17:09:42 +01:00
Jan Steemann d5d943b4a5 adapt to branch 2016-03-23 17:09:29 +01:00
Michael Hackstein fb5bcfcf82 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-23 16:38:38 +01:00
Michael Hackstein 7269fd3dc9 Fixed multiple edge collections in Traverser. All aql-traverser tests seem to work 2016-03-23 16:38:29 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Jan Steemann 7c245bd3a3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:21 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Michael Hackstein 2b82712803 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-23 16:04:58 +01:00
Michael Hackstein 2d45a6e5b2 Fixed statistics for Traversals. Also uses less lookups now 2016-03-23 16:04:53 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Kaveh Vahedipour 67a2541d25 Fixing override finals 2016-03-23 15:18:30 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Andreas Streichardt 0ab683d1f8 Fix override warnings 2016-03-23 14:49:23 +01:00
Max Neunhoeffer 1d1c9b55dc Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-23 14:08:14 +01:00
Max Neunhoeffer 9322e47740 Fix a few uninitialized shared_ptr<Builder>s. 2016-03-23 14:07:46 +01:00
Max Neunhoeffer 1f6a4fd58d Fix potential shutdown crash. 2016-03-23 14:07:09 +01:00
Michael Hackstein e71d650178 Dryed code in v8Traverser and fixed a boolen if error 2016-03-23 12:13:07 +01:00
Michael Hackstein c1a3ff0a8e Simplyfied skiplist index by removing an used member variable in Iterator 2016-03-23 12:12:12 +01:00
Kaveh Vahedipour 9677db67a6 turning off lights in agency? 2016-03-23 11:44:46 +01:00
Kaveh Vahedipour f8cbfa9d3b fixed entirely broken arangod 2016-03-23 10:33:42 +00:00
Michael Hackstein b6245022b0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-23 10:36:56 +01:00
Michael Hackstein 8c224bd435 Fixed Traverser Matches check 2016-03-23 10:36:51 +01:00
Kaveh Vahedipour 9e077e2293 Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-23 10:05:34 +01:00
Kaveh Vahedipour 342ca3e383 merging into devel 2016-03-23 10:05:14 +01:00
Kaveh Vahedipour 0d15a3ceaf No need for hexdump header anymore 2016-03-23 08:58:31 +00:00
Kaveh Vahedipour bab4816e8f Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-23 09:40:16 +01:00