1
0
Fork 0
Commit Graph

4285 Commits

Author SHA1 Message Date
Max Neunhoeffer 12bf5a2dde Fix cluster.js. 2016-05-02 16:48:59 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Alan Plum 649c571e54
Prefer path.join over fs.join 2016-05-02 15:50:07 +02:00
Alan Plum 11c7db4375
Quality of life improvements in Foxx 2016-05-02 15:50:07 +02:00
Alan Plum e1d384813e
Make Foxx name/version optional 2016-05-02 15:50:06 +02:00
Andreas Streichardt 3e470891f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 15:21:06 +02:00
Andreas Streichardt b55ac05a49 fix init 2016-05-02 15:20:31 +02:00
Alan Plum 53dc168a71
Linting 2016-05-02 14:42:10 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
Alan Plum ea7ff40a9c
Warn when specifying manifest.engine 2016-05-02 14:42:08 +02:00
Andreas Streichardt 5d7b8acba0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:00:50 +02:00
Andreas Streichardt 974ecdc208 Implement Current callback 2016-05-02 14:00:26 +02:00
Jan Steemann 4a8052e309 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-02 13:29:46 +02:00
Jan Steemann 2b0f3f7b57 change behavior of arithmetic operators, TO_STRING and TO_NUMBER 2016-05-02 13:29:29 +02:00
jsteemann fb912c28b6 jslint 2016-05-02 13:19:22 +02:00
Andreas Streichardt b1d4a9d9d7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 12:21:00 +02:00
Andreas Streichardt 18ea698038 Restructure code so that the installed versions are being returned by
the plan changer
2016-05-02 12:19:07 +02:00
Alan Plum 081a6f6a7f
Collection session storage should autoUpdate by default 2016-05-02 10:29:23 +02:00
jsteemann c7490a211c added fail() to tests 2016-05-01 14:46:59 +02:00
Kaveh Vahedipour b962ee0b99 correct unit tests 2016-04-29 19:26:10 +02:00
Kaveh Vahedipour 82417a763e Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:37:18 +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
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00
Alan Plum b83921bc62
jwt sessions: expiry -> ttl 2016-04-29 16:11:14 +02:00
Alan Plum 841790e524
Unbreak HTTP tests 2016-04-29 15:33:17 +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 ceb138d888 translate more errors 2016-04-29 14:30:11 +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
Alan Plum c829737568
Don't use _users in aardvark directly 2016-04-29 12:58:51 +02:00
Kaveh Vahedipour 4c3d906bd8 UserVersion, HB interval integers 2016-04-29 11:19:40 +02:00
Kaveh Vahedipour 7733e16392 UserVersion is a number 2016-04-29 10:45:27 +02:00
jsteemann 6ac4c809ee do not create markers on the heap, but create them in the WAL space directly 2016-04-29 01:01:10 +02:00
Kaveh Vahedipour ee2115ceeb remaining verbose output 2016-04-28 16:28:59 +02:00
Kaveh Vahedipour e81e3e51e0 javascript side of jsonified agency 2016-04-28 15:15:55 +02:00
Jan Steemann cdc9b8e774 re-active test 2016-04-28 13:47:28 +02:00
Kaveh Vahedipour 9d314699b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-28 09:18:50 +02:00
jsteemann cd45a52ba5 attempt to finish startup order 2016-04-27 22:54:29 +02:00
Kaveh Vahedipour 6329d90155 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-27 17:27:52 +02:00
Kaveh Vahedipour bb834bb4a1 cluster startup ok. execept of corrdinator. 2016-04-27 17:27:06 +02:00
Kaveh Vahedipour 049cc8602e careful with loops :( 2016-04-27 16:53:09 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Michael Hackstein c1191d4268 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:50:28 +02:00
jsteemann d21cdb50ad speed up transactions 2016-04-26 11:58:10 +02:00
Michael Hackstein bd302a023c Reduced the nesting level of arrays in AQL test. Icannot be executed on MacOs and asan 2016-04-26 11:50:19 +02:00