jsteemann
0c4d507ffc
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-07-14 09:32:08 +02:00
Jan Steemann
6d856efd4f
added test for "fake" _key values
2016-07-14 09:29:42 +02:00
jsteemann
3be664ca56
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-07-14 09:29:21 +02:00
jsteemann
f5608449b2
fixed issue #1942
2016-07-13 20:32:59 +02:00
jsteemann
5672171c11
initial commit for rc implementation
2016-07-13 17:33:17 +02:00
Wilfried Goesgens
fe5c742803
In Farbe und in STEREREOOOUU!
2016-07-13 17:12:24 +02:00
hkernbach
39a6e0a73e
grunt [ci skip]
2016-07-13 16:40:03 +02:00
hkernbach
1929b24901
gv [ci skip]
2016-07-13 16:39:56 +02:00
Wilfried Goesgens
08b892f09f
Fix documentation.
2016-07-13 15:19:58 +02:00
Max Neunhoeffer
a78fd42b67
Merge branch 'HLC' into devel
2016-07-13 12:52:33 +02:00
Max Neunhoeffer
4202b817ed
Fix fix.
2016-07-13 12:22:00 +02:00
Max Neunhoeffer
3df0d2dc32
Fix bug in HybridLogicalClock.
2016-07-13 12:21:17 +02:00
Jan Christoph Uhde
03e89265fd
Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver
...
* 'devel' of github.com:arangodb/arangodb:
updated CHANGELOG
fixed array index batch insertion issue
Fix syntax errors in user auth documentation
fix grammer.
prevent compile warning
2016-07-13 11:35:16 +02:00
Jan Steemann
6022456e89
updated CHANGELOG
2016-07-13 11:33:05 +02:00
Jan Steemann
6b7defc737
fixed array index batch insertion issue
2016-07-13 11:32:39 +02:00
Wilfried Goesgens
cbe634a0e6
Fix syntax errors in user auth documentation
2016-07-13 11:24:20 +02:00
Wilfried Goesgens
342af7f795
fix grammer.
2016-07-13 10:38:36 +02:00
jsteemann
fe079b50f3
prevent compile warning
2016-07-13 09:45:23 +02:00
Jan Christoph Uhde
ff49d7b0b4
Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next
...
* origin/devel: (105 commits)
Fixed failure tests in SkiplistIndex
Fixed a bug with reset of new skiplist index iterator
whitespace removal
micro optimization for key generator key tracking
GraphQL! Hype! 🎉
explicit
remove unused variable
explicit
Fix VS complaints
complaints
complaints
updated CHANGELOG
fixed issue #1937
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.
ignore revision ids
fix destructuring of Externals in MERGE
make it code.
ignore primary and edge indexes during cluster restore
grunt build [ci skip]
semist.
...
2016-07-13 07:33:13 +00:00
Michael Hackstein
6e5f6d1a48
Fixed failure tests in SkiplistIndex
2016-07-13 07:26:35 +02:00
Max Neunhoeffer
4649036943
Add and read out HLC time stamps in HTTP headers.
2016-07-12 23:36:14 +02:00
Max Neunhoeffer
b3fbb1378f
Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC
2016-07-12 21:14:02 +00:00
Max Neunhoeffer
985723e468
Add HLC timestamp as HTTP header in asyncRequst and syncRequest.
2016-07-12 23:11:57 +02:00
Max Neunhoeffer
4c440337ba
Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC
2016-07-12 21:08:57 +00:00
Max Neunhoeffer
27fcfecee3
Handle overflow of counter in HLC better.
2016-07-12 23:00:23 +02:00
Max Neunhoeffer
6c39908f8e
Merge branch 'HLC' of https://github.com/ArangoDB/ArangoDB into HLC
2016-07-12 20:52:06 +00:00
Max Neunhoeffer
18925faf8f
Merge branch 'devel' into HLC
2016-07-12 22:51:40 +02:00
Michael Hackstein
c46ff5c085
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-07-12 18:07:21 +02:00
Michael Hackstein
63bad694c5
Fixed a bug with reset of new skiplist index iterator
2016-07-12 18:07:11 +02:00
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