1
0
Fork 0
Commit Graph

29516 Commits

Author SHA1 Message Date
Max Neunhoeffer 907edaf5ac Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 18:38:13 +02:00
Max Neunhoeffer 79113bd4e9 Take external bootstrap out of testing.js. 2016-04-29 18:37:35 +02:00
hkernbach 037ec3007d query editor bugfix 2016-04-29 18:14:35 +02:00
Michael Hackstein ba37b1c030 trx.all now issues externals to AQL 2016-04-29 17:49:56 +02:00
Michael Hackstein ddc7b2ca98 Further tests for AQL externals 2016-04-29 17:39:43 +02:00
jsteemann 14503947de Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 17:34:42 +02:00
Michael Hackstein 0ca6452bab Started to add some tests for VPack externals in AQL. 2016-04-29 17:30:50 +02:00
jsteemann 58736a9d50 prepation for optimizations 2016-04-29 17:26:22 +02:00
Michael Hackstein 4216e6cbb1 Removed resolved TODO comments 2016-04-29 17:05:26 +02:00
hkernbach 18bde3282c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 17:03:24 +02:00
Max Neunhoeffer a8e70bd8fa Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 16:36:54 +02:00
Max Neunhoeffer 18b72dfdbe Fix cluster startup. 2016-04-29 16:36:41 +02:00
Alan Plum cc4ab07705
Session storage ttl should be specified in secs not mins 2016-04-29 16:36:26 +02:00
jsteemann cb64122ab4 updated vpack library 2016-04-29 16:26:18 +02:00
jsteemann 65ebc5166a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 16:25:27 +02:00
jsteemann 8d17d10ebb fixed undefined behavior 2016-04-29 16:25:17 +02:00
Alan Plum b83921bc62
jwt sessions: expiry -> ttl 2016-04-29 16:11:14 +02:00
Alan Plum eb506054e9
gitignore logs/ output/ 2016-04-29 16:11:03 +02:00
hkernbach 23d780cf23 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:37:24 +02:00
hkernbach cddb11d315 added *.swp to gitignore 2016-04-29 15:37:15 +02:00
Alan Plum 841790e524
Unbreak HTTP tests 2016-04-29 15:33:17 +02:00
Alan Plum 61d35d5906
Add an errorNum to gharial ArangoErrors 2016-04-29 15:33:17 +02:00
Michael Hackstein e336c846f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:31:29 +02:00
Michael Hackstein c58b78062b Added a sanitize externals function that expands externals on demand. It is now used whenever a query is stored in the query cache as the data it is pointing to might be moved. Has to be used as well when sending VPack to client. 2016-04-29 15:21:48 +02:00
jsteemann bb6c0aba37 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 15:18:29 +02:00
jsteemann 3a92773685 use StaticStrings 2016-04-29 15:18:20 +02:00
jsteemann 646b202bf9 reset Instace variable later 2016-04-29 15:18:05 +02:00
Andreas Streichardt e26d1e4a7d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:17:35 +02:00
Andreas Streichardt b784084cbc Fix uninitialised value 2016-04-29 15:17:19 +02:00
jsteemann ea46d40bcd remove unused variable 2016-04-29 15:16:24 +02:00
Alan Plum fb2a9818e6
Session storages need both forClient and fromClient 2016-04-29 15:04:03 +02:00
Alan Plum 80dbea94a4
Make gharial behave better on errors again 2016-04-29 15:04:02 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
jsteemann 6e57c95de8 updated vpack library 2016-04-29 14:52:20 +02:00
Max Neunhoeffer 017d4a56a7 Better logging. 2016-04-29 14:45:27 +02:00
Max Neunhoeffer bf05db339f Update API-changes. 2016-04-29 14:39:59 +02:00
jsteemann ceb138d888 translate more errors 2016-04-29 14:30:11 +02:00
Max Neunhoeffer 84d7616cde Better logging. 2016-04-29 14:25:33 +02:00
Max Neunhoeffer 1885c77331 Fix API change description. 2016-04-29 14:25:20 +02:00
Max Neunhoeffer 3767b01e3b Add an API change. 2016-04-29 14:22:26 +02:00
Max Neunhoeffer 0f981b560d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 13:59:30 +02:00
Max Neunhoeffer b05464b78c Cluster bootstrap revolution. 2016-04-29 13:59:12 +02:00
Michael Hackstein dbe75625d4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 13:58:59 +02:00
Michael Hackstein 7af9beefa1 Neighbors now uses VPackSlices with specialized string comparision function. 2016-04-29 13:55:02 +02:00
Michael Hackstein 536603f66f Velocypack helper now has a specialized hash and compare function for VPackStrings. It is more efficient as it uses shortcuts for bytesize. Will fail for non string case, use with caution 2016-04-29 13:53:41 +02:00
Frank Celler 0abc75335e fixed examples 2016-04-29 13:34:15 +02:00
Alan Plum c253026711
Support iterator API in query results 2016-04-29 13:30:55 +02:00
Frank Celler 43d1130c24 fixed examples 2016-04-29 13:22:38 +02:00
jsteemann 64ee910e38 move system attributes to the front of objects 2016-04-29 13:13:39 +02:00
Alan Plum c829737568
Don't use _users in aardvark directly 2016-04-29 12:58:51 +02:00