Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,771 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

2612 Commits

Author SHA1 Message Date
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Alan Plum 041ebf1542 Fix #1577 once and for all 
This guarantees the module resolution doesn't break out of the ArangoDB module root (or the service's root).
 2016-02-26 12:24:26 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Frank Celler 034eea10b3 fixed version 2016-02-19 20:15:39 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
Michael Hackstein 32d0e48d61 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-16 13:56:08 +01:00
Alan Plum fb23c44e3d Fix client test 2016-02-16 01:45:57 +01:00
Frank Celler 8f1e79e5dc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 23:23:44 +01:00
Frank Celler 9a2ced5056 raised waitForSync 2016-02-15 23:22:50 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Alan Plum e228ce0cd0 @arangodb/request: res.body -> res.json 2016-02-11 16:50:07 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Jan Steemann 196ec2593c added parentheses for explain 2016-02-10 15:21:12 +01:00
Jan Steemann cc257b90ff print brackets in explainer 2016-02-10 13:12:46 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Frank Celler 546ffce3ed added replication test 2016-02-06 23:30:22 +01:00
Frank Celler 6d4b68245a added print.limitString 2016-02-06 20:20:07 +01:00
Jan Steemann 6aa28abce3 adjusted test 2016-02-05 20:46:57 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
jsteemann b962c5a9e8 array comparison operators 2016-02-03 00:28:03 +01:00
Jan Steemann fc909486c2 parser adjustments for array operators, not yet working 2016-02-02 18:05:39 +01:00
Jan Steemann 45d9745756 fixed display of Traversals in AQL explain 2016-02-02 11:24:51 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Michael Hackstein 847463f968 Fixed JSLintQ 2016-01-28 17:29:29 +01:00
Michael Hackstein ff1a3e5675 Updated AQL explainer to work with Multi Direction Traversals. Last step closes #1683 2016-01-28 17:15:53 +01:00
Frank Celler 732fb58f86 moved into sub-directories 2016-01-24 13:16:05 +01:00
Frank Celler c2a3f90fde moved tests into sub-directories 2016-01-24 12:21:04 +01:00
Frank Celler 8a7f409380 added fs.append 2016-01-24 11:34:13 +01:00
Frank Celler df0a6f4abf create out directory 2016-01-23 23:30:41 +01:00
Andreas Streichardt 4ff105167a Issue #1675 . allow enabling strict mode in tests 2016-01-22 11:38:56 +01:00
jsteemann e0f5401bed fixed test in failure mode 2016-01-21 00:20:32 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Frank Celler 9840280637 added vm 2016-01-15 12:36:57 +01:00
Frank Celler cc91d528e2 do not check DB if connection is down 2016-01-15 12:35:00 +01:00
Jan Steemann 798a1e05cc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-12 19:41:49 +01:00
Jan Steemann a119837c3e fixed journalSize handling for collections 2016-01-12 19:41:39 +01:00
Alan Plum b3c7cfd11e Remove jasmine completely 
This should not impact the frontend tests as they use a npm-installed copy of jasmine.
 2016-01-12 19:04:49 +01:00
Alan Plum 812060864b Handle pending mocha tests in output 2016-01-12 18:49:52 +01:00
Alan Plum f442465445 Implement mocha.grep 
Allows using context.only and context.skip to skip tests.
 2016-01-12 18:49:51 +01:00
Alan Plum 44faf4428d Improved mocha integration 
Mocha tests now produce pretty XML files and log output for Jenkins.
 2016-01-12 18:49:50 +01:00
Alan Plum e90c89812f shell-foxx-manager-install-spec to mocha 2016-01-12 18:49:49 +01:00
Alan Plum 0d16d03853 shell-query-timecritical-spec to mocha 2016-01-12 18:49:48 +01:00
Alan Plum 4eab5cd6c8 Disable mocha timeout and bail 
The timeout only results in tests being marked as failing
AFTER the tests have run. That's worse than useless for sync-only
tests like we use.
 2016-01-12 18:49:27 +01:00
Alan Plum c7930e1df9 Fix minimal-working setup scripts 2016-01-12 18:49:27 +01:00
Jan Steemann 7524c21f3a added derived files 2016-01-12 17:45:05 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Jan Steemann 2044cf8038 implemented aggregations for SortedCollectBlock 2016-01-12 12:05:57 +01:00
Alan Plum c4c8418b6d Add support for mocha in built-in test runner 2016-01-11 20:00:56 +01:00
Jan Steemann b64f69cfd7 increase timeout a bit 2016-01-11 19:28:38 +01:00
jsteemann 67147482ce bumped built-in version number from 2.7.0-devel to 2.8 2016-01-08 01:56:23 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Jan Steemann 1e6a07426c collect refactoring 2016-01-07 14:10:32 +01:00
Jan Steemann ad1163e3bb refactoring for Aql COLLECT 2016-01-07 13:35:12 +01:00
Alan Plum e6149f1fff rm unused queue-legacy-test fixture 2016-01-06 19:20:50 +01:00
Alan Plum 537ff51445 Mark various test apps as 2.8.0 compat 
This will make them use legacy mode in FOTF.
 2016-01-06 19:18:10 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann 10f97380be updated documentation 2016-01-04 19:10:41 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
Alan Plum bdee7f3309 Fix cluster test 
The implementation of `_.clone` in underscore naively clones all properties including inherited ones.
As lodash does The Right Thing and ignores the prototype, we need to flatten the object first.
 2015-12-29 13:44:00 +01:00
Alan Plum 9ecc710491 Avoid _.clone 
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
 2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
Michael Hackstein ba3fe43a4e Fixed Explainer for traversal node. It did only know one direction and only hard-coded starting points 2015-12-18 16:17:01 +01:00
jsteemann fb908043ac truncate long objects 2015-12-17 22:14:52 +01:00
Jan Steemann 928837e1ff \0 fix 2015-12-17 13:07:05 +01:00
Alan Plum dd51a91d59 Always org/arangodb -> @arangodb 2015-12-17 13:02:39 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
jsteemann ead2ee47e7 issue #1409: fix NUL-byte handling 2015-12-17 10:54:24 +01:00
Wilfried Goesgens 788e59ed39 Lintify. 2015-12-16 15:05:29 +01:00
Wilfried Goesgens e93949674b while printing the cursor info check for whether its extra section contains a warning. 2015-12-16 14:06:37 +01:00
Wilfried Goesgens da57d31488 Implement de/serializing of filters in traversalnodes 2015-12-16 11:17:38 +01:00
Alan Plum 34843b76fb Remove CoffeeScript support 2015-12-16 02:03:44 +01:00
Alan Plum 7039647936 Make require behave again 
Calls to require should stay within the ArangoDB paths or Foxx service root.

The require cache for Foxx services should be service specific.

Reloading a service's controllers should clear the service's require cache.

See #1577.
 2015-12-16 01:16:38 +01:00
Alan Plum 6910f9eaa8 Don't deprecate CoffeeScript in 2.x 2015-12-16 01:16:34 +01:00
Alan Plum c7c8ee90ae Goodbye ES2015 classes 2015-12-16 01:16:33 +01:00
Alan Plum 87c1310690 Log stacktraces in deprecation warnings 2015-12-16 01:16:33 +01:00
Alan Plum 8b66bf1143 Extend will not be removed in 2.9 2015-12-16 01:16:33 +01:00
jsteemann 7a6022466b fixed test 2015-12-15 22:08:46 +01:00
Max Neunhoeffer dc033e31d9 Merge branch 'devel' into ClustUp1 2015-12-15 21:08:36 +01:00
jsteemann 4a88a17a44 lol self 2015-12-15 21:07:22 +01:00
Max Neunhoeffer d43e118244 Merge branch 'devel' into ClustUp1 2015-12-15 20:44:06 +01:00
jsteemann 6bc3e8c5df fixed rename tests in cluster 2015-12-15 20:42:57 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Jan Steemann 8ed8681505 updated module name 2015-12-15 16:15:26 +01:00
Alan Plum 1eb99c527b Add @arangodb/db 2015-12-15 15:51:44 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann b123ffbe26 issue #1610 2015-12-15 15:41:50 +01:00
jsteemann a098289532 fixed test 2015-12-15 13:57:22 +01:00
jsteemann c043f9301c changed error message 2015-12-15 13:13:31 +01:00
Max Neunhoeffer 8a69ca5367 Merge branch 'devel' into ClustUp1 2015-12-15 09:23:51 +01:00
Jan Steemann 8e7ac689a2 issue #1606: fail gracefully on invalid index definitions 2015-12-14 16:58:05 +01:00
Max Neunhoeffer 525e54d5a0 Merge branch 'devel' into ClustUp1 2015-12-14 11:26:10 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
Alan Plum 3c804390cd More consistency 2015-12-11 15:26:41 +01:00
Alan Plum 70ad91c122 Consistency 2015-12-11 15:25:51 +01:00
Max Neunhoeffer 95b311f802 Merge branch 'devel' into ClustUp1 2015-12-11 13:33:33 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Max Neunhoeffer c11ec07564 Merge branch 'devel' into ClustUp1 2015-12-11 13:28:07 +01:00
Jan Steemann 4335af50e7 replication improvements 2015-12-10 19:07:10 +01:00
Jan Steemann fcf978a422 do not print overly long string values 2015-12-10 17:06:25 +01:00
Max Neunhoeffer ea72850aeb Fix bug in client tests. 2015-12-09 23:13:26 +01:00
Alan Plum d3e2f75c33 Make require behave again 
Calls to require should stay within the ArangoDB paths or Foxx service root.

The require cache for Foxx services should be service specific.

Reloading a service's controllers should clear the service's require cache.

See #1577.
 2015-12-09 13:33:41 +01:00
Jan Steemann e4fca5e6b3 issue #1600: updated documentation for register() function 2015-12-09 13:12:45 +01:00
Alan Plum adde8c2867 Yak shaving 2015-12-08 20:17:00 +01:00
Alan Plum 6b4fbdc5a7 Make the Foxx console behave as documented 2015-12-08 18:42:13 +01:00
Wilfried Goesgens fcf3c392c9 Add geo locations to the city navigator. 2015-12-08 18:15:18 +01:00
Jan Steemann ee6792dd6b fixes for traversal and multi-modify 2015-12-08 14:50:05 +01:00
Jan Steemann 06e43fc5cb fixed explainer output for traversals 2015-12-03 14:16:01 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 2459e2a326 Removed unnecessary tests 2015-12-03 10:19:43 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann 7c3034681b fix for cluster explainer in arangosh 2015-12-02 13:31:13 +01:00
Jan Steemann 1462779281 try to fix cluster access from arangosh 2015-12-02 13:29:42 +01:00
Michael Hackstein 8a76d4be9e Fixed AQL explainer for Traverser 2015-12-02 11:35:39 +01:00
Alan Plum 707c3fe1e2 Brute force ignore events module in jshint 2015-12-01 20:19:54 +01:00
Alan Plum 125f825420 Add process to system modules (because it's global) 2015-12-01 19:53:34 +01:00
Wilfried Goesgens 4b861dd44a Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-12-01 16:37:06 +01:00
Frank Celler dd2ba7a0be added OS to version check to catch new packages 2015-12-01 12:57:40 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +01:00
Jan Steemann 459d15bb2c added cluster execution site info in explain output for AQL queries 2015-12-01 10:30:13 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
jsteemann 04e81ea851 more replication 2015-11-30 23:33:59 +01:00
Jan Steemann f013c809ea replication improvements 2015-11-30 18:27:31 +01:00
Michael Hackstein 8a01687565 Moved AQL graph tests into the server side. All other AQL tests are there as well 2015-11-30 15:20:03 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Michael Hackstein d79c2f9048 Added a test if the traverser prunes early 2015-11-27 17:03:24 +01:00
Jan Steemann bd8b70455a replication improvements 2015-11-27 16:16:15 +01:00
hkernbach ac8542fe07 Merge branch 'JHMH' of github.com:arangodb/arangodb into JHMH 2015-11-27 14:58:00 +01:00
hkernbach 7dd817417f jslint 2015-11-27 14:57:51 +01:00
Michael Hackstein a93fcac0e8 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-27 09:29:01 +01:00
Wilfried Goesgens aae19ff291 Fix dangling anchors and add checker script to the make target. 2015-11-26 18:51:39 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Alan Plum 1a23993f99 Make sure constructor is called in legacy-extended classes 
This is a horrible workaround for the lack of a spread operator in the V8 version we are currently using.
The super keyword has no way to pass a dynamic number of arguments without using the spread operator
but someone might reasonably want to use additional arguments in a regular subclass that is then
legacy-extended with a constructor property. This should at least protect against the majority of such
cases even if it creates a silly function signature.

See #1592.
 2015-11-25 18:19:54 +01:00
Wilfried Goesgens de76c096c9 Adjust explainer to new simple expressions; linting. 2015-11-25 16:50:23 +01:00
hkernbach da06ce12e9 typo 2015-11-24 16:09:00 +01:00
hkernbach a58157f6b4 example graphs now checking if dependencies exist 2015-11-24 15:34:13 +01:00
Alan Plum 5d3b0b0619 Set returnBodyOnError: true by default in org/arangodb/request 
Fixes #1437.
 2015-11-24 15:00:11 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
hkernbach 922782c13f removed unnecessary parameter in explainer function 2015-11-20 15:20:26 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Wilfried Goesgens 58dbbda09c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-18 17:31:00 +01:00
Jan Steemann 23a1782bd8 use options 2015-11-18 17:30:46 +01:00
Wilfried Goesgens 0b69da93bc Add Traversal example 2015-11-18 15:52:23 +01:00
Wilfried Goesgens 0f2686db5d Add the world graph to the script. 2015-11-18 15:36:35 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
Michael Hackstein a656182145 Fixed example graph and aql traversal test. 2015-11-18 10:15:44 +01:00
hkernbach bb814f1c5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-11-17 13:10:53 +01:00
hkernbach f21cb27dca aql explainer support for bind params 2015-11-17 13:10:47 +01:00
Jan Steemann f9ba16f8d4 fixed explainer indentation 2015-11-17 11:31:06 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
Frank Celler 1e8a7d20bc return graph 2015-11-09 10:22:22 +01:00
Wilfried Goesgens d51b5cdc9b Finalize the explain feature 2015-11-06 13:41:44 +01:00
Wilfried Goesgens bb9039c855 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-29 16:01:01 +01:00
Jan Steemann 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
 2015-10-28 11:08:18 +01:00
Alan Plum 131da2ea97 Workaround for missing root props on Foxx apps 
Fixes #1547.
 2015-10-27 18:37:22 +01:00
Jan Steemann 3c4849e81a only drop known graphs 2015-10-23 19:03:11 +02:00
Jan Steemann e2136ea21a do not allow index creation with multiple [*] in single attribute 2015-10-23 11:45:17 +02:00
Wilfried Goesgens e9928de21b start to fix graph implementation for explain() 2015-10-22 13:05:13 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +02:00
Wilfried Goesgens 30be20224e Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other) 2015-10-19 16:40:39 +02:00
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +02:00
Jan Steemann fcdd95d7cd fixes 2015-10-13 16:26:43 +02:00
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann 1f4c775a02 print names of files with failing tests 2015-10-12 17:57:27 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00
Jan Steemann 0d80a17002 generalize condition handling 2015-10-08 15:10:28 +02:00
Jan Steemann 4bf3bb047b Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-07 17:25:56 +02:00
Frank Celler 4b0911c799 added debugging header x-arango-v8-context 2015-10-07 13:37:35 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-07 10:18:21 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Alan Plum 820e694d0c Re-implement cleanupCancelation 2015-10-06 15:10:43 +02:00
Alan Plum 5b7f3d19d0 Deprecate CS in 2.9, not 2.8 2015-10-06 12:47:58 +02:00
Jan Steemann 849dad60cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-06 11:58:52 +02:00
Jan Steemann beaf3acbd3 simplifications 2015-10-06 11:58:23 +02:00
Alan Plum 7332f3803e Make org/arangodb/deprecated work in arangosh without db 2015-10-06 11:37:42 +02:00
Jan Steemann 1f009a046c Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-05 10:32:53 +02:00
Jan Steemann 1c990b7324 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	arangod/Aql/ExecutionNode.cpp
 2015-10-05 10:32:36 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +02:00
Wilfried Goesgens 232d0601cb fix running of arangosh tests with the proper parametrization. 2015-10-02 15:47:01 +02:00
Wilfried Goesgens a968707134 Fix foxx-manager test for running in arangosh 2015-10-02 15:39:49 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00