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

32124 Commits

Author SHA1 Message Date
jsteemann 522b23590b whitespace removal 2016-07-12 17:58:05 +02:00
jsteemann 27534399f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 17:16:17 +02:00
jsteemann d687cd7ebe micro optimization for key generator key tracking 2016-07-12 17:16:06 +02:00
Alan Plum 284e71c8e0
GraphQL! Hype! 🎉 2016-07-12 17:03:44 +02:00
jsteemann 04992ab68d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 17:01:40 +02:00
jsteemann 94556cb9fb explicit 2016-07-12 17:01:34 +02:00
Max Neunhoeffer c0da76b634 Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC 2016-07-12 14:57:06 +00:00
Max Neunhoeffer 386f0fe883 Remove an unused var. 2016-07-12 16:56:51 +02:00
jsteemann 76f55d84bc remove unused variable 2016-07-12 16:56:48 +02:00
jsteemann 28479d3778 explicit 2016-07-12 16:56:42 +02:00
Max Neunhoeffer 183bcb50df FIx typo. 2016-07-12 16:55:59 +02:00
Max Neunhoeffer 40df0b3422 Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC 2016-07-12 14:53:13 +00:00
Max Neunhoeffer 2c2c50aa19 Rewrite old revision strings with new HLC time stamps. 2016-07-12 16:51:25 +02:00
jsteemann 6713ec39dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:49:36 +02:00
Jan Steemann 7a445934b7 Fix VS complaints 2016-07-12 15:39:09 +01:00
Jan Steemann 5773154791 complaints 2016-07-12 15:37:37 +01:00
Jan Steemann d9aa695cea complaints 2016-07-12 15:36:47 +01:00
jsteemann 5d2d343baa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:10:49 +02:00
Jan Steemann 3ba1d55fba updated CHANGELOG 2016-07-12 16:07:48 +02:00
jsteemann dcfaee33e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 15:57:40 +02:00
Jan Steemann 403ba8a30c fixed issue #1937 2016-07-12 15:57:19 +02:00
Max Neunhoeffer a31c12f989 Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC 2016-07-12 13:10:35 +00:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Michael Hackstein daeef23761 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 14:46:35 +02:00
Michael Hackstein d9e1f41871 Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals. 2016-07-12 14:46:24 +02:00
Max Neunhoeffer 3b6523a510 Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC 2016-07-12 12:02:01 +00:00
Max Neunhoeffer 17e4c05de5 Change encoding of HLC time stamps, tolerate old ticks in _rev. 2016-07-12 14:01:33 +02:00
jsteemann e03cf68861 ignore revision ids 2016-07-12 13:54:41 +02:00
Jan Steemann f7696c6aef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 13:37:48 +02:00
Jan Steemann 1719d3c993 fix destructuring of Externals in MERGE 2016-07-12 13:37:39 +02:00
Wilfried Goesgens 7392535f15 make it code. 2016-07-12 13:06:32 +02:00
Jan Steemann 55b2dcfe97 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 10:18:28 +02:00
Jan Steemann 233453bb42 ignore primary and edge indexes during cluster restore 2016-07-12 10:18:12 +02:00
hkernbach b1cfb98e09 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 10:08:32 +02:00
hkernbach 3e68a42410 grunt build [ci skip] 2016-07-12 10:00:32 +02:00
hkernbach cd36e265ca semist. 2016-07-12 09:53:14 +02:00
hkernbach 1d3406f1e3 gv ui 2016-07-12 09:52:54 +02:00
Andreas Streichardt e7988ff060 Make current implementation a bit clearer 2016-07-12 09:49:31 +02:00
Jan Steemann 3705a1d2f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 09:45:52 +02:00
Jan Steemann 6f3091e30a fix recovery issues 2016-07-12 09:45:45 +02:00
Jan Steemann 94bd64d9ab fix complaining about null keys 2016-07-12 09:42:32 +02:00
Jan Christoph Uhde 4f357502b0 fix: add missing mutex 2016-07-12 09:30:49 +02:00
Max Neunhoeffer 4caf01405b New option for maximal port number in testing.js. 2016-07-12 09:04:36 +02:00
Max Neunhoeffer 7571a16c9d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-11 23:46:12 +02:00
Max Neunhoeffer 869a820275 Use babies in handler for arangorestore. 
This fixes bad performance and corresponding errors due to timeouts
in the cluster case with synchronous replication in the restored
collections.
 2016-07-11 23:37:38 +02:00
Max Neunhoeffer fedcc9cb17 Improving trace logging for syncCollectionFinalize. 2016-07-11 23:37:06 +02:00
Max Neunhoeffer 673c84ebf2 Merge branch 'devel' into HLC 2016-07-11 21:08:02 +00:00
Simran Brucherseifer 2dc99fd231 Documentation improvements 2016-07-11 19:21:00 +02:00
Simran Brucherseifer 53022968d5 Remove add-header settings, unify version switcher code 2016-07-11 19:21:00 +02:00
Jan Steemann 2d7faa795a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-11 18:39:18 +02:00