1
0
Fork 0
Commit Graph

27361 Commits

Author SHA1 Message Date
Wilfried Goesgens 8eb24c3a40 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-10 23:28:12 +01:00
Wilfried Goesgens ddc5369949 test for OPENSSL_NO_SSL3_METHOD; this fixes #1773 2016-03-10 23:26:36 +01:00
Frank Celler ab6224e2ae cleanup 2016-03-10 23:02:59 +01:00
Frank Celler f4335d4a7e fixed color output 2016-03-10 21:56:29 +00:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Jan Steemann 613b08440e handle externals, somehow 2016-03-10 18:45:22 +01:00
Jan Steemann 7028516b03 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 18:24:26 +01:00
Jan Steemann beb132b466 AqlValue refactoring 2016-03-10 18:24:12 +01:00
Max Neunhoeffer 0daedb4cbe Prepare returnOld and returnNew. 2016-03-10 16:49:03 +01:00
Max Neunhoeffer a25df3aece Fix jslint problems. 2016-03-10 16:44:44 +01:00
Max Neunhoeffer 97b5a7860f Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 16:28:37 +01:00
Max Neunhoeffer 9e98cc7107 Fix a bug in babies API for documents. 2016-03-10 16:28:27 +01:00
Max Neunhoeffer 6e4a4d1f7b Add babies tests for document API. 2016-03-10 16:28:10 +01:00
Michael Hackstein 9a0a8746db Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 16:23:22 +01:00
Michael Hackstein 380e4eda69 Another fix for skiplist index for Searches that should not hit any element 2016-03-10 16:22:15 +01:00
Michael Hackstein 34f9206a63 Fixed SkiplistIndex Lookup for Slice. Seems to be working in AQL. Needs to be tested in detail 2016-03-10 16:11:28 +01:00
Max Neunhoeffer c23b20c741 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 15:31:05 +01:00
Max Neunhoeffer 0647661f5a Fix a bug in update for babies. 2016-03-10 15:30:52 +01:00
Frank Celler 6dbb6ceb03 changed newline for windows 2016-03-10 14:22:26 +00:00
Michael Hackstein 123d8fa7ee Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 14:37:17 +01:00
Michael Hackstein eb8b09c85b Fixed Skiplist Index Lookup. Equallity Lookups now seem to work. Range Lookups will crash now. 2016-03-10 14:37:12 +01:00
Max Neunhoeffer 3e27b5b211 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 13:18:25 +01:00
Max Neunhoeffer c0acebbfd1 Further breaking changes. 2016-03-10 13:18:15 +01:00
Michael Hackstein 25452fa147 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 13:11:52 +01:00
Michael Hackstein 161c050c8e Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 13:11:40 +01:00
Michael Hackstein b802ff9d25 Fixed memleak in HashIndex Lookup 2016-03-10 13:11:32 +01:00
Max Neunhoeffer a8ff672ba7 Fix arangosh w.r.t. withdrawn /_api/edge 2016-03-10 13:11:07 +01:00
Max Neunhoeffer df487862a8 Fix some more edge tests. 2016-03-10 13:08:02 +01:00
Frank Celler e68fa98154 fixed colors 2016-03-10 12:05:44 +00:00
Michael Hackstein 5e860c14da Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 12:49:33 +01:00
Michael Hackstein 3cf571d59f Undefined behaviour in HashIndex. Slice is correct but is not iterated properly yet 2016-03-10 12:49:26 +01:00
Max Neunhoeffer 147dafcc42 Fix edge tests. 2016-03-10 12:45:10 +01:00
Max Neunhoeffer 66a7f298da Remove RestEdgeHandler. 2016-03-10 11:29:24 +01:00
Max Neunhoeffer 70772d6174 Remove RestEdgeHandler, start API-Changes-3.0.md Dokument. 2016-03-10 11:28:26 +01:00
Max Neunhoeffer 3ed256a478 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 11:25:20 +01:00
Max Neunhoeffer 3def27ee6e Do not check for existence of vertex collection at edge insertion. 2016-03-10 11:24:59 +01:00
Michael Hackstein 0d414b2aa6 Fixed PrimaryIndex iterator creation from AQL. Got my first FILTER x._key == 'test' query running. yeah 2016-03-10 11:10:58 +01:00
Michael Hackstein ff4cf5e0b2 Fixed merge bug. Last commit didn't build 2016-03-10 11:10:13 +01:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Max Neunhoeffer 5ef1d8dd99 Fix tests for documents. 2016-03-10 09:48:38 +01:00
Max Neunhoeffer 995eecc832 Last traces of update_policy gone. 2016-03-10 00:17:33 +01:00
Max Neunhoeffer d51beb5326 Get rid of update_policy for good. 2016-03-10 00:14:06 +01:00
Max Neunhoeffer f25c5175ac Kill further uses of update_policy. 2016-03-10 00:07:51 +01:00
Max Neunhoeffer 9074f99f09 Get rid of update policy in RestHandlers. 2016-03-10 00:02:47 +01:00
Max Neunhoeffer 31112b9257 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-09 23:59:34 +01:00
Max Neunhoeffer 80ee083105 Fix RestDocumentHandler: modify and remove. 2016-03-09 23:59:02 +01:00
Max Neunhoeffer 54002b505e Adjust API tests to 3.0. 2016-03-09 23:58:11 +01:00
jsteemann a67877de66 removed unused shaping functionality 2016-03-09 23:33:10 +01:00