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

2367 Commits

Author SHA1 Message Date
Jan Steemann 9e979db56a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-15 10:22:51 +01:00
Jan Steemann 7b4bf30c38 fixed differing behavior in NEIGHBORS() implementations 2016-01-15 10:22:23 +01:00
Wilfried Goesgens 77b6c52d01 No more one letter vars. 2016-01-15 10:20:34 +01:00
Wilfried Goesgens a5b5e7764d its o - not c 2016-01-15 09:46:43 +01:00
Jan Steemann 13a620599d fixed differing behavior in NEIGHBORS() implementations 2016-01-15 09:38:05 +01:00
jsteemann ae9147ef68 fixed invalid variable usage 2016-01-14 23:02:03 +01:00
Wilfried Goesgens f6f885d027 increase grace period for server to run tests when valgrind is in sight 2016-01-14 15:38:04 +01:00
Wilfried Goesgens 499d6b9df3 Handle situations in which the http reply object doesn't have a body (i.e. timeout...) 2016-01-14 15:36:38 +01:00
Alan Plum 4462f477e2 Fix spammy log output for realz 2016-01-13 18:53:27 +01:00
Alan Plum 90cbe39495 Better output for test authentication_parameters 2016-01-13 16:44:49 +01:00
Alan Plum 008d4826a9 Actually filter out log spam in tests again 2016-01-13 16:07:52 +01:00
Jan Steemann 150ed86c86 fixed jslint warning 2016-01-13 11:28:50 +01:00
Wilfried Goesgens e9fb81b845 Fix test: return proper result array. 2016-01-13 11:20:59 +01:00
Alan Plum b4ca221bee Fix the brokenness 
let outside strict is bad.
 2016-01-12 19:53:16 +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 bb14ad043d Also run mocha tests in runHere 2016-01-12 18:54:40 +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
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Wilfried Goesgens fd3d282fb1 Merge pull request #1653 from arangodb/mocha-tests 
Add support for mocha in built-in test runner
 2016-01-12 09:35:35 +01:00
Wilfried Goesgens a884e73404 assertQueryError: also output the query that failed with the error message. 2016-01-12 09:20:01 +01:00
Alan Plum c4c8418b6d Add support for mocha in built-in test runner 2016-01-11 20:00:56 +01:00
jsteemann debeaeec07 less garbage collection 2016-01-11 12:43:05 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Alan Plum 480194ae14 Add missing header to foxx/service 2016-01-06 18:47:13 +01:00
Alan Plum e2f3bfabd1 Fix typo in error message 2016-01-06 18:47:13 +01:00
Jan Steemann 1fc4c0d34e fixed hanging test 2016-01-05 17:58:36 +01:00
Alan Plum 1b25f98996 On Windows, posix-ify mocha test paths 2016-01-05 11:32:21 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
Max Neunhoeffer d8bae80887 Snapshot, with debugging output. 2015-12-30 16:53:13 +01:00
Max Neunhoeffer ad5446bf49 Set heartbeat interval to 5s. 2015-12-29 15:49:37 +01:00
Max Neunhoeffer 8feb663890 Add synchronisation of follower shards. 2015-12-29 15:48:55 +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
Alan Plum a1b816e4f3 Update copyright headers 2015-12-23 23:30:43 +01:00
Alan Plum 840c432904 org/arangodb -> @arangodb in Foxx generator 2015-12-23 23:25:50 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Alan Plum cad8c3841a Replace exportCache with app.main.loaded 2015-12-21 19:30:15 +01:00
Alan Plum ff23c28a44 Invalidate export cache when app is reloaded 2015-12-21 19:27:16 +01:00
Max Neunhoeffer b227b71c96 Remove name from collection properties for shards. 2015-12-18 15:34:37 +01:00
jsteemann b5fa1b4629 extremeVerbosity 2015-12-16 11:48:04 +01:00
Wilfried Goesgens e096903af6 Add comments howto configure the system so we can do automatic coredump analysis 2015-12-16 10:20:19 +01:00
Alan Plum b61d08efce applicationContext.foxxFilename -> applicationContext.fileName 2015-12-16 01:57:30 +01:00
Alan Plum 8b05198e17 Remove duplication 2015-12-16 01:41:20 +01:00
Alan Plum b8b0aa02f4 Remove unnecessary deprecation warnings 2015-12-16 01:16:38 +01:00
Alan Plum 318cf45def fix console.warn in Foxx 2015-12-16 01:16:38 +01:00
Alan Plum 8cd34bc586 Fix UndocumentedBody 2015-12-16 01:16:37 +01:00
Alan Plum 0c913dfbcf Make the Foxx console behave as documented 2015-12-16 01:16:37 +01:00
Alan Plum 78979e6a0c Revert unnecessary changes 2015-12-16 01:16:36 +01:00
Alan Plum ea419c671e Make activateAuthentication actually work again 2015-12-16 01:16:36 +01:00
Alan Plum 220468ec45 Add Model.toJSONSchema for 2.5 compat 2015-12-16 01:16:36 +01:00
Alan Plum ecfc00098e Lint 2015-12-16 01:16:35 +01:00
Alan Plum 64d3744594 Add jwt support back to Foxx sessions 2015-12-16 01:16:35 +01:00
Alan Plum c09b000d01 Make sessions more backwards compatible again 2015-12-16 01:16:35 +01:00
Alan Plum 06135043c1 Undeprecate Foxx.requireApp 2015-12-16 01:16:35 +01:00
Alan Plum 35b1f4e84f More undeprecation 2015-12-16 01:16:34 +01:00
Alan Plum 07209e278a Don't deprecate addInjector 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 abbf019256 ctrl.del will not be removed in 2.9 2015-12-16 01:16:33 +01:00
Alan Plum 9c4bb1500d Linting 2015-12-16 01:16:32 +01:00
Alan Plum 0d6c70b4ee Remove ramda from npm deps 2015-12-16 00:10:19 +01:00
Alan Plum 0223b59233 Quotes 2015-12-16 00:09:41 +01:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
Alan Plum 5947e2d9a8 fix console.warn in Foxx 2015-12-15 18:16:42 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 5235ced456 out/in/edges on an edge collection in a cluster now works for an array of vertices as well 2015-12-15 16:39:04 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Max Neunhoeffer 27cf790fef Merge branch 'devel' into ClustUp1 2015-12-14 16:46:30 +01:00
Jan Steemann 5a4165fd54 removed debug output 2015-12-14 14:34:57 +01:00
Max Neunhoeffer 525e54d5a0 Merge branch 'devel' into ClustUp1 2015-12-14 11:26:10 +01:00
Jan Steemann 90ff8508ac set `extremeVerbosity` to false 2015-12-14 10:03:52 +01:00
Jan Steemann 23367b098b make test output verbose more configurable 2015-12-11 17:54:40 +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 7a91accb71 Merge branch 'devel' into ClustUp1 2015-12-09 15:19:11 +01:00
Wilfried Goesgens 181db60b49 break if server is dead. 2015-12-09 13:43:04 +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
Max Neunhoeffer 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
jsteemann f13ffb4dff jslint 2015-12-09 00:21:55 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Jan Steemann 4cd2621d06 adjusted AQL function return values 2015-12-08 19:45:32 +01:00
Alan Plum 6b4fbdc5a7 Make the Foxx console behave as documented 2015-12-08 18:42:13 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Max Neunhoeffer 257c6c897d Fix bugs and tests. 2015-12-08 12:48:11 +01:00
Jan Steemann a3f42b5072 renamed test method 2015-12-08 11:49:45 +01:00
Jan Steemann bbe8d5bb1f reduced wait period 2015-12-07 17:10:07 +01:00
Wilfried Goesgens ad8948057e Add timestamp to the output of testing.js before it starts rspec tests 2015-12-07 16:34:16 +01:00
Jan Steemann 1daeb7ad28 deadlock tests for drivers 2015-12-07 15:01:35 +01:00
Max Neunhoeffer a8a9f1832b Merge branch 'devel' into ClustUp1 2015-12-04 23:06:11 +01:00
Jan Steemann a53da38fcd fixed some cluster queries 2015-12-04 17:07:36 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency. 
Snapshot, compiles, untested, needs new VelocyPack.
 2015-12-04 15:08:47 +01:00
Max Neunhoeffer a926c7570a Cleanup ClusterInfo library w.r.t. Current/Collections. 2015-12-04 15:08:47 +01:00
Wilfried Goesgens de86282978 add -, we do so in all other cases. 2015-12-04 14:24:10 +01:00