1
0
Fork 0
Commit Graph

17389 Commits

Author SHA1 Message Date
Jan Steemann 8af715e9b1 removed unused function 2014-10-20 22:30:39 +02:00
Jan Steemann aec1ea970a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 18:28:32 +02:00
Jan Steemann 40e62e95a5 fixed out-of-scheduler-threads issue 2014-10-20 18:27:50 +02:00
Max Neunhoeffer ba41701bf8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 17:33:04 +02:00
Max Neunhoeffer a54c4351bd Add a reminder for myself. 2014-10-20 17:32:56 +02:00
Willi Goesgens b3beff3053 Call shutdown() on execution abortion, so we don't leave trash behind on the cluster nodes. 2014-10-20 16:36:54 +02:00
Jan Steemann 34d34af340 do not throw on shutdown 2014-10-20 16:17:19 +02:00
Jan Steemann bafdf8a332 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 15:40:03 +02:00
Jan Steemann 10c9a54932 start transactions on coordinator 2014-10-20 15:39:55 +02:00
Willi Goesgens 8856abeacc Implement error-logging of RestAqlHandler 2014-10-20 14:49:44 +02:00
Willi Goesgens 28149299b9 Fix condition of assertion when error: true is to be expected. 2014-10-20 14:48:54 +02:00
Jan Steemann d9fe3dd3f3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 12:42:28 +02:00
Michael Hackstein c179978980 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 12:42:21 +02:00
Michael Hackstein 55f2d57fb4 Reunified ahuacatl-general-graph and aql-general-graph. Fixed JSLint in aql 2014-10-20 12:42:17 +02:00
Jan Steemann 6356c47f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 12:32:15 +02:00
Jan Steemann c93c952c05 fixed from/to-handling in cluster 2014-10-20 12:32:08 +02:00
Willi Goesgens 56099b96c9 - More precisely describe which request failed in the cluster communication
- catch exceptions during shutdown - they shouldn't be output since its usually already known.
2014-10-20 12:06:53 +02:00
Willi Goesgens 506eb1113a Fix status message - non/cluster has to be flipped. 2014-10-20 12:05:32 +02:00
Michael Hackstein 501c4c2c84 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 11:47:06 +02:00
Michael Hackstein 0df20e734f Moved general-graph changes from ahuacatl to aql 2014-10-20 11:45:51 +02:00
Max Neunhoeffer 828926d819 Take out debugging output. 2014-10-20 11:29:52 +02:00
Max Neunhoeffer 4ab4dc1c11 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 11:21:28 +02:00
Max Neunhoeffer 44f89adc66 Fix instanciation of queries in which a sharded collection is used >=2 times. 2014-10-20 11:21:00 +02:00
Frank Celler 43abc04656 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 10:59:59 +02:00
Frank Celler a3892fb672 fixed collection prefix for users and sessions 2014-10-20 10:59:54 +02:00
Jan Steemann 4d52ac8c99 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 10:50:38 +02:00
Jan Steemann 04d5f5dfdd fixed segfault 2014-10-20 10:50:31 +02:00
Max Neunhoeffer f15cb48a10 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 10:47:49 +02:00
Max Neunhoeffer 9744228bf9 Make correct parts on DBserver MAIN and DEPENDENT.
Seems not to work yet because of more fundamental problems.
2014-10-20 10:47:14 +02:00
Frank Celler 13a45f56f5 removed superfluous test, because of possible race condition 2014-10-20 10:34:58 +02:00
Frank Celler 1cdf01970e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 10:12:35 +02:00
Jan Steemann 5c1d01068a log a warning if an AQL user functions throws an exception 2014-10-20 10:00:41 +02:00
Jan Steemann 4cbb5ea939 fixed wrong if statement 2014-10-20 09:58:46 +02:00
Jan Steemann 9132a10785 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:51:43 +02:00
Jan Steemann 5510f7eee8 indentation 2014-10-20 09:51:33 +02:00
Michael Hackstein 0313c74b66 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 09:36:39 +02:00
Michael Hackstein a783081742 Made useage of the model more backbone like in queryView 2014-10-20 09:36:35 +02:00
Frank Celler 05c6b645df fixed authentication 2014-10-20 09:29:57 +02:00
Max Neunhoeffer feef5140a7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:14:37 +02:00
Max Neunhoeffer 6eb2073336 Rename VarOverview into RegisterPlan, because that is what it is. 2014-10-20 09:14:01 +02:00
Max Neunhoeffer db7b23bdb8 Fix cloning of VarOverview. 2014-10-20 09:04:32 +02:00
Jan Steemann 648274f30a removed HTTP DELETE handler 2014-10-20 08:52:44 +02:00
Frank Celler ad50ad066e added pipelining 2014-10-19 23:17:21 +02:00
Michael Hackstein cfd284955d Documentation fix of GRAPH_NEIGHBORS vertex restriction. 2014-10-19 21:04:58 +02:00
James 82b38b022d tests for gather block 2014-10-18 17:08:19 +01:00
James 282341b2d9 more tests for distribute-in-cluster 2014-10-18 15:47:32 +01:00
James 78339c6c52 more bug fixes in GatherBlock. 2014-10-18 15:06:03 +01:00
James a89d250316 fixed skipSome and further cleaning up 2014-10-18 14:33:37 +01:00
James f16ee1a671 fixed bug in comparison function for GatherBlock 2014-10-18 14:17:43 +01:00
James 6f1c251077 debugging GatherBlock 2014-10-18 14:01:53 +01:00