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

13404 Commits

Author SHA1 Message Date
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
jsteemann d0766688f3 properly tag geo index tests, and include the long running geo index tests by default 2017-03-29 00:54:24 +02:00
mpv1989 43cb5fc81b Merge branch 'feature/cors' into devel 2017-03-28 20:37:30 +02:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
Wilfried Goesgens ffc3d6a515 - move runInArangosh over to test-utils, so its right next to runThere. 
- use runInArangosh for the replication tests, so they show proper result reports.
 2017-03-28 19:05:00 +02:00
Wilfried Goesgens 476befc9d0 refactor testing.js 
- split utility functionality into its own file
 - add module loader so we can have modules
 - move all testsuites into own files
 - remove complicated testcase joining / splitting methods
 2017-03-28 16:29:51 +02:00
mpv1989 4b8c880486 added OPTIONS to cors methods header 2017-03-28 16:18:53 +02:00
hkernbach 0a9ed38b6a ui - bugfix smart graph selection missing 2017-03-28 14:22:45 +02:00
Andreas Streichardt f32256e5a7 Normalize test resultstructure (hopefully) 2017-03-28 14:15:08 +02:00
jsteemann 40e4bba260 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:03:53 +02:00
jsteemann 467307fd07 fixed issue #2400 2017-03-28 13:58:49 +02:00
jsteemann 888fd67ee6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 12:09:04 +02:00
Jan Christoph Uhde b5e760b1d3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  move engine sources into their own cmake files
  Fixed exception because of hash index
  Fixed feature start order
  fix recovery test
  Edge index fixes
  remove alignas
  fix recovery test
  force recovery tests to fail when not compiled with failure-tests
  implement SLEEP() in C++
  remove useless and harmful adjustment (lowering) of file descriptors limit
  Windows: fix namespaces
  fix recovery tests
  slightly adjusted index creation
  Removed some alignas directives.
  alias boost to catch
  fix arangosh test
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
 2017-03-28 12:01:24 +02:00
jsteemann bc7e7da9df dont create index for rocksdb only 2017-03-28 11:56:31 +02:00
Jan Christoph Uhde 155f131031 Avoid usage of hash index 2017-03-28 11:56:00 +02:00
hkernbach 3ad5c6366d fixed issue: #2389 2017-03-28 11:54:47 +02:00
Simon Grätzer 4174183ffa Fixed exception because of hash index 2017-03-28 11:29:52 +02:00
jsteemann cedee8ed02 fix recovery test 2017-03-28 10:46:56 +02:00
jsteemann 17c1a6db05 fix recovery test 2017-03-28 10:04:39 +02:00
jsteemann 8f5230e29c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 09:48:50 +02:00
jsteemann a5013733a2 force recovery tests to fail when not compiled with failure-tests 2017-03-28 09:47:52 +02:00
jsteemann 2c688aa0fa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 09:40:12 +02:00
jsteemann a684bd6152 fix recovery tests 2017-03-28 09:34:59 +02:00
jsteemann c8bdacbc95 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 08:47:14 +02:00
Wilfried Goesgens 6940aa6ec1 alias boost to catch 2017-03-27 19:44:06 +02:00
Wilfried Goesgens eb4c2ed8e4 fix arangosh test 2017-03-27 19:42:24 +02:00
Wilfried Goesgens e9a661e470 start splitting testing.js into handy bits. 2017-03-27 19:10:03 +02:00
Wilfried Goesgens f09ee72d65 start splitting testing.js into handy bits. 2017-03-27 19:00:21 +02:00
Wilfried Goesgens 4d0778a825 start splitting testing.js into handy bits. 2017-03-27 18:57:05 +02:00
jsteemann dab48de61b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:16:05 +02:00
Jan Christoph Uhde f4e164ef78 fix compile errors 2017-03-27 08:57:51 +02:00
hkernbach f3ce18b848 ui - fixed edge save bug due to api conversion 2017-03-25 18:03:43 +01:00
Wilfried Goesgens f67ddb7bab split testcase to work around macos instabilities 2017-03-24 16:22:10 +01:00
Wilfried Goesgens 81889bfc54 Work on testingjs to make it fit for storage engine and others: 
- add storage engine switch:
  - filter for files with `-rocksdb` or `-mmfiles` depending on the used storage engine.
- fix missing color reset on error messages
- make --test a substring match instead of a full match.
- print an error message if --test did not match any testcase and thus no tests were run
- disable crash check for the recovery testcases that are actually intended to crash so we can recover from the failed state
- scan for recovery testcases instead of keeping a hand written list
- make test-scan function public
 2017-03-24 16:17:36 +01:00
jsteemann 7794350018 remove debug output 2017-03-24 14:18:00 +01:00
jsteemann a34a10f719 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-24 12:27:09 +01:00
Simon Grätzer fbbc118160 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-24 11:04:38 +01:00
Simon Grätzer 39b2e349dd Pregel: Coverty Scan fixes 2017-03-24 11:04:15 +01:00
jsteemann dd86a50ca5 fix misleading init messages 2017-03-24 09:49:57 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann 6cbe5e7776 fix message 2017-03-23 19:41:28 +01:00
Max Neunhoeffer 07216bb4e3 Add test for COLLECT bug. 2017-03-23 13:35:57 +01:00
jsteemann 5d82e260ff added test for issue #2392 2017-03-23 12:25:42 +01:00
hkernbach cebc1eb888 grunt build 2017-03-22 19:35:36 +01:00
hkernbach b7d165eed3 ui - fixed submenu issue 2017-03-22 15:41:23 +01:00
hkernbach 1b3c2e59b2 fixed mem leak issue: #2352 2017-03-22 14:36:25 +01:00
jsteemann 54a3b1fe5c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-22 13:27:58 +01:00
jsteemann 82ba9a3538 fixed test expectation 2017-03-22 13:26:58 +01:00
Wilfried Goesgens 7f88bcaf33 make this test work for milestone/alpha/beta/ releases 2017-03-22 13:21:02 +01:00
jsteemann c7b3e002b5 fixed tests 2017-03-22 13:15:21 +01:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
hkernbach af8401b7ee ui - fixed calculaction issue 2017-03-22 11:55:22 +01:00
hkernbach 455867035d ui - optimized logo rendering 2017-03-22 11:39:57 +01:00
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
Wilfried Goesgens 8287c7a444 more debug logging 2017-03-21 18:25:13 +01:00
hkernbach d04e2afec8 removed some wrong dusty code 2017-03-21 18:04:29 +01:00
hkernbach 27764e9e8e ui - added missing disabled attribute when max sort limit is reached 2017-03-21 17:56:21 +01:00
Dan Larkin 7b690408c8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-21 12:21:10 -04:00
Wilfried Goesgens 388424bbdc engage debugger when calling general binaries that segfault 2017-03-21 16:49:20 +01:00
Dan Larkin 6cedc0ba53 Merge branch 'views' into devel 2017-03-21 11:40:42 -04:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
hkernbach 2381e2a798 ui - fixed some event issues 2017-03-21 12:27:52 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
Dan Larkin a80ed16477 Added basic views support to ArangoShell. 2017-03-18 16:35:51 -04:00
jsteemann c66b05afc0 hard-code v8 version number so it works 2017-03-17 17:23:55 +01:00
jsteemann 2cda79ec0b add some debug output for replication tests 2017-03-17 13:02:15 +01:00
jsteemann b3ca6edb7c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 12:15:34 +01:00
Wilfried Goesgens 5654c5cd68 add log messages so we can find out where this locks up now and then 2017-03-17 11:55:03 +01:00
jsteemann 81ff25c3bc Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-17 11:25:17 +01:00
hkernbach 29c63877e0 ui - changed document api due a chrome bug, fixed a submenu bug 2017-03-17 11:21:46 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
jsteemann 3d5ab2b6ae Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 17:26:28 +01:00
Wilfried Goesgens e4fbbcd0eb migrate wording boost->catch 2017-03-16 17:18:28 +01:00
jsteemann e22586f40c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 16:45:31 +01:00
Wilfried Goesgens 54c62a59a9 try to get stacktraces on mac 2017-03-16 16:04:24 +01:00
jsteemann 2c0f9d9369 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 15:47:48 +01:00
Alan Plum 97e80c9d3b
Whitespace 2017-03-16 15:45:45 +01:00
jsteemann 2482de5770 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 15:19:50 +01:00
jsteemann 42aefaa8bf fixed require 2017-03-16 15:19:41 +01:00
Wilfried Goesgens 968ad1f82a try to get stacktraces on mac 2017-03-16 15:01:30 +01:00
Wilfried Goesgens 9d3740d098 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-16 14:57:12 +01:00
Wilfried Goesgens ae50e4ca1c try to get stacktraces on mac 2017-03-16 14:56:55 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
jsteemann 0bb2711abb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into views 2017-03-16 12:16:23 +01:00
Max Neunhoeffer 2cf17c0c5d Update swagger. 2017-03-16 11:54:48 +01:00
Max Neunhoeffer 4017bfb296 Revise /_api/cluster/endpoints API and Documentation. 2017-03-16 11:33:46 +01:00
Simon Grätzer 215937a884 Fixing cppcheck and jslint warnings 2017-03-16 11:20:35 +01:00
Simon Grätzer f2c133d5f6 Fix pregel test 2017-03-16 10:52:02 +01:00
Alan Plum 50e0eb16d2
Use COLOR_OUTPUT to determine whether to use color 2017-03-15 20:44:03 +01:00
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
jsteemann 9a88c8c226 fix a memleak 2017-03-15 14:05:13 +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
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +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
jsteemann 356020a3c6 try to make test more deterministic, by not relying on a wait time of 5 seconds 2017-03-03 12:35:12 +01:00
jsteemann 3a39921147 fixed documentation and added tests for grants API 2017-03-03 12:33:13 +01:00
jsteemann 4baff0e2d9 issue #2348 2017-03-03 10:50:13 +01:00
jsteemann d369c698b5 fixed issue #2346 2017-03-03 10:10:38 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00
jsteemann 7017c4747d change default string truncation length 
from 80 characters to 256 characters for `print`/`printShell` functions in ArangoShell and arangod.
this will emit longer prefixes of string values before truncating them with `...`, which is helpful for debugging.
 2017-03-02 09:52:43 +01:00
hkernbach 36955e7267 grunt 2017-03-01 17:09:41 +01:00
hkernbach a8ba3a43fc fixed ui graph issue 2017-03-01 16:57:22 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
baslr d4680cfc0c arangoexport:test fix jslint 2017-02-28 15:54:39 +01:00
baslr a0256af44b arangoexport: added test for xgmml, node module xmldom 2017-02-28 15:25:18 +01:00
Alan Plum 705273bdab
Allow passing own graphql-sync module to Foxx 2017-02-28 14:47:17 +01:00
jsteemann 82a17fb493 turn off cache tests by default 2017-02-27 09:52:29 +01:00
Dan Larkin 09600f0971 Added hash cache system. 2017-02-24 15:31:40 -05:00
jsteemann ed3a230939 some final cleanup 2017-02-21 13:04:24 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Kaveh Vahedipour e65e7c2d60 resilience tests fail at times 2017-02-21 11:05:10 +01:00
jsteemann 12f1a7af29 fixed issue #2315 2017-02-21 09:11:50 +01:00
hkernbach 0074e8e39b grunt build 2017-02-17 11:24:29 +01:00
hkernbach 399cf4d9c3 css 2017-02-17 11:14:28 +01:00
hkernbach a50f81b1ac ui: queries now using cursors api - issue #2065 2017-02-17 11:14:16 +01:00
Alan Plum 90c538b7a4
Not undefined 
[skip ci]
 2017-02-15 18:32:56 +01:00
baslr b21ef73aa4 arangoexport: tests use temp directory for output 2017-02-15 12:53:53 +01:00
Alan Plum 622b4fac4b
JWT uses seconds 
Fixes #2249.
 2017-02-14 19:20:41 +01:00
Alan Plum 7471f94fa7
Linting 2017-02-14 19:20:41 +01:00
Alan Plum 5a02a8983f
More cookie options 
Fixes #2085.
 2017-02-14 19:20:40 +01:00
Frank Celler 511e907c58 fixed missing semicolon 2017-02-14 18:20:34 +01:00
hkernbach cf636b6970 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 18:06:43 +01:00
hkernbach 1a5112da79 optimized graph management view 2017-02-14 18:06:29 +01:00
Alan Plum 022ff11886
REALLY fix routing tests 2017-02-14 17:18:40 +01:00
Alan Plum 01f83c20a2
Really fix routing 2017-02-14 17:15:44 +01:00
Alan Plum d72be1cf74
Fix routing 2017-02-14 17:15:06 +01:00
Alan Plum 0f4b932717
Fix Foxx routing 2017-02-14 16:36:40 +01:00
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
Alan Plum 2eb8f30c7f
Spring cleaning 
Also removed actions.rewriteRouting as it is not actually used anywhere.
 2017-02-14 16:36:40 +01:00
jsteemann 2cebe3de66 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 12:01:36 +01:00
hkernbach b40c33bfbd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 11:47:51 +01:00
hkernbach bf9250fdb1 grunt 2017-02-14 11:47:38 +01:00
hkernbach 559b8d371d fixed memory issue within ui dashboard 2017-02-14 11:44:37 +01:00
jsteemann 107620708c remove now useless decodeURIComponent calls 2017-02-14 11:29:08 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +01:00
jsteemann a6d6bfe71a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 09:15:31 +01:00
jsteemann b55cf1b12a make smartGraphAttribute optional 2017-02-14 09:15:12 +01:00
Andreas Streichardt e345415879 Allow removing dbservers which are no longer in use 2017-02-13 17:23:39 +01:00
Andreas Streichardt 1b92c8e46b Allow removing dbservers 2017-02-13 17:23:39 +01:00
jsteemann 5a1fe3a341 jslint 2017-02-13 14:35:14 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
baslr 4783792684 arangoexport: inital work on test 2017-02-13 12:04:57 +01:00
jsteemann f4f85c16cb Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:48:24 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00
jsteemann 238070b477 fixed code of some examples 2017-02-13 08:21:28 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt cf39ddd39a Fix jslint 2017-02-10 19:43:04 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt bc1df86ddd remove lock queries 2017-02-10 19:34:29 +01:00
hkernbach 16be7120aa ui: optimized smart graph creation usability 2017-02-10 17:49:35 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00