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

13163 Commits

Author SHA1 Message Date
Alan Plum c8d03dd4e1
Provide ljson output for Foxx stream reporter 2017-03-15 20:09:33 +01:00
Alan Plum 4920ef8b41
Implement tap/xunit reporters in Foxx 2017-03-15 20:09:31 +01:00
Alan Plum c18aa323dc
Extract util.indentation 2017-03-15 20:09:30 +01:00
Alan Plum c919cb7be8
Add Foxx res.type helper 2017-03-15 20:09:27 +01:00
Simon Grätzer f22aec113f Fix typo in summary.md, fix segmentation fault, fix test 2017-03-15 17:47:33 +01:00
Simon Grätzer ad268697e3 Fix some stuff 2017-03-15 16:22:10 +01:00
Simon Grätzer d909c415aa Fixing jslint in pretzel 2017-03-15 16:14:13 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
Max Neunhoeffer c8a205b1aa New /_api/cluster/endpoints. 
Also fix documentation (and deprecate) /_api/endpoint.
 2017-03-15 13:33:50 +01:00
Simon Grätzer 529cb4ae85 Integer ID for testing 2017-03-15 10:20:48 +01:00
Simon Grätzer f1851375da Fixed sleep time 2017-03-14 16:50:09 +01:00
Simon Grätzer 76b3487ab2 Renamed pregel test 2017-03-14 11:12:04 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
hkernbach a9ba949e8f feature request #2317 2017-03-13 15:45:47 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
Frank Celler c4a591abd2 ui - fixed wrong merge of statistics information from different coordinators 2017-03-10 16:43:58 +01:00
hkernbach 5cd6bbaa71 ui - fixed wrong protocol usage within encrypted environment 2017-03-10 14:00:42 +01:00
Simon Grätzer a326aa2ffb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-09 14:38:50 +01:00
jsteemann 9278149b24 fixed --convert 2017-03-09 14:29:23 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 928060153e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-08 15:07:38 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
hkernbach 6ab5132a6f fixed issue #2316 2017-03-08 09:45:43 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
jsteemann 836afb39a1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 13:11:18 +01:00
Andreas Streichardt c5aaa5c633 use junit 2017-03-07 11:59:53 +01:00
Andreas Streichardt 7d51256234 Properly publish results 2017-03-07 11:54:37 +01:00
Andreas Streichardt 4af0eab357 fix icu stuff 2017-03-07 11:21:35 +01:00
Simon Grätzer 0b64bf3bc2 Fixed pregel test, async default off 2017-03-07 10:41:03 +01:00
jsteemann bda65cef8b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 10:33:25 +01:00
jsteemann aa870e9bce fix attribute name parser failure return code 2017-03-07 10:32:27 +01:00
jsteemann 63918afce9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 00:19:39 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
Andreas Streichardt 9c25f5afd8 Adjustments for catch 2017-03-06 18:11:14 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
jsteemann 40abf7c1e2 fix test 2017-03-06 17:47:12 +01:00
jsteemann 965a9547cc fix test 2017-03-06 17:46:38 +01:00
jsteemann c2d7412cb3 removed unused files 2017-03-06 17:41:30 +01:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
Simon Grätzer 5b1cb0ec6d Various fixes 2017-03-06 15:41:27 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 7640586bd9 added test case for duplicate collections 2017-03-06 13:07:04 +01:00
Michael Hackstein b26ea6c3bd Added a recovery test for duplicate-name creation. This was broken during Engine-API build. 2017-03-06 10:41:21 +01:00
Frank Celler ab49f6c1b4 fixed variables parsing in GraphQL 2017-03-05 23:31:38 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
Simon Grätzer e94cb25c92 Editing documentation and moving test 2017-03-03 23:29:23 +01:00
Andreas Streichardt 9420fb0e84 scripts unittests fix 2017-03-03 21:15:06 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00