jsteemann
1302439d91
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-17 16:48:11 +02:00
Alan Plum
bcb722f0ac
Add legacy mode to web interface
2016-08-17 14:51:04 +02:00
jsteemann
000fd9cbdc
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-15 18:35:43 +02:00
jsteemann
5b0bc88cc2
added tests for unary minus and plus in c++
2016-08-15 18:17:02 +02:00
jsteemann
e9cabbecb7
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
2016-08-15 14:26:50 +02:00
jsteemann
ae40ea5450
finally fixed some nasty bugs after refactoring
2016-08-15 14:26:09 +02:00
Michael Hackstein
7b328d39e9
Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream
2016-08-11 12:41:08 +02:00
Andreas Streichardt
87c8c0033a
Improve clusterawareness in foxx and foxx queues
2016-08-10 12:26:24 +02:00
Jan Steemann
ed475b698b
fixed failing test
2016-08-05 17:43:11 +02:00
jsteemann
5d640b7144
fixed tests
2016-08-04 13:32:54 +02:00
jsteemann
2256ffd5b2
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-03 10:52:03 +02:00
Jan Steemann
5b4e4e0845
issue #1977
2016-08-03 09:56:13 +02:00
jsteemann
10341eafdb
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-02 09:42:17 +02:00
Wilfried Goesgens
ad0bc4d00f
Work on the debian build
...
- change 3.0.x-devel to be 3.0.devel since minus or underscore collide with packaging requirements
- re-sync package scripts with whats current on suse OBS
- add config-uid support.
2016-08-01 13:43:30 +02:00
Andreas Streichardt
6f156d8554
Fix foxx issues in cluster
...
Bootstrap will now be done on the bootstrap coordinator.
queues will now be executed by the "foxxmaster"
2016-08-01 13:43:30 +02:00
jsteemann
80f1a7aaee
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-07-29 17:16:20 +02:00
Andreas Streichardt
526c8f42c2
Fix foxx issues in cluster
...
Bootstrap will now be done on the bootstrap coordinator.
queues will now be executed by the "foxxmaster"
2016-07-29 16:06:31 +02:00
Max Neunhoeffer
4bc433d5a7
Fix bug in synchronous replication.
2016-07-29 11:29:05 +02:00
jsteemann
ba6bb338ba
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-07-28 17:25:19 +02:00
Jan Steemann
ddecc740e6
fixed issue in `INTERSECTION` AQL function with duplicate elements in the source arrays
2016-07-28 17:11:21 +02:00
jsteemann
b48779c821
fixed tests
2016-07-28 15:56:38 +02:00
jsteemann
d6baadf59a
fix recovery edge case
2016-07-25 17:57:25 +02:00
Jan Steemann
44059b5feb
issue #1959
2016-07-25 11:37:24 +02:00
Jan Steemann
eb7dd14e95
added test case
2016-07-21 16:12:25 +02:00
Jan Steemann
74f7da4f45
don't copy unneeded registers
2016-07-21 12:10:09 +02:00
Jan Steemann
8369f652a4
fixed issue #1950
2016-07-20 09:38:25 +02:00
Alan Plum
6bbe8e8098
Fix OAuth2 getActiveUserUrl
2016-07-19 22:27:24 +02:00
Jan Steemann
2441b2f700
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-07-14 10:09:01 +02:00
Jan Steemann
a1c2b7cc63
fixed issue #1941
2016-07-14 10:08:17 +02:00
Jan Steemann
6d856efd4f
added test for "fake" _key values
2016-07-14 09:29:42 +02:00
jsteemann
f5608449b2
fixed issue #1942
2016-07-13 20:32:59 +02:00
Max Neunhoeffer
a78fd42b67
Merge branch 'HLC' into devel
2016-07-13 12:52:33 +02:00
Jan Steemann
6b7defc737
fixed array index batch insertion issue
2016-07-13 11:32:39 +02:00
Max Neunhoeffer
18925faf8f
Merge branch 'devel' into HLC
2016-07-12 22:51:40 +02:00
Alan Plum
284e71c8e0
GraphQL! Hype! 🎉
2016-07-12 17:03:44 +02:00
Jan Steemann
403ba8a30c
fixed issue #1937
2016-07-12 15:57:19 +02:00
Max Neunhoeffer
846e6b6127
Merge remote-tracking branch 'origin/devel' into HLC
2016-07-12 15:10:24 +02:00
Jan Steemann
1719d3c993
fix destructuring of Externals in MERGE
2016-07-12 13:37:39 +02:00
Jan Steemann
6f3091e30a
fix recovery issues
2016-07-12 09:45:45 +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
fedcc9cb17
Improving trace logging for syncCollectionFinalize.
2016-07-11 23:37:06 +02:00
Jan Steemann
2d7faa795a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-07-11 18:39:18 +02:00
Jan Steemann
10db618129
fix recovery
2016-07-11 18:36:00 +02:00
Max Neunhoeffer
8f69fb74f5
Further fixes of commonProperties and friends.
2016-07-11 14:42:42 +00:00
Jan Steemann
55532a9fa5
removed some log message
2016-07-08 14:44:11 +02:00
Jan Steemann
cb14a63778
pass UDF name into UDF call via this argument
2016-07-08 14:31:14 +02:00
Jan Steemann
351f800eb1
fix upsert
2016-07-07 15:15:43 +02:00
Jan Steemann
f8b61c6723
added tests
2016-07-07 12:22:24 +02:00
Jan Steemann
2aaf941110
added test
2016-07-07 12:22:07 +02:00
Alan Plum
6c25aa7648
Restrict file 404 messages to relative path
2016-07-06 15:43:47 +02:00