1
0
Fork 0
Commit Graph

13464 Commits

Author SHA1 Message Date
Wilfried Goesgens 05a46e4781 fix db._explain() to work with the new interface of the graph traverser 2017-04-25 20:33:17 +02:00
Dan Larkin c11857df09 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 13:58:47 -04:00
Dan Larkin 9dd275b497 Fixed dump/restore tests. 2017-04-25 13:54:56 -04:00
hkernbach cd819e0b26 node info view 2017-04-25 19:27:30 +02:00
Kaveh Vahedipour aefe90f89b distributeShardsLike port from 3.1 app.js 2017-04-25 16:56:51 +02:00
Kaveh Vahedipour 6e7843897b distributeShardsLike port from 3.1 app.js 2017-04-25 16:55:40 +02:00
Michael Hackstein f21fd3c0fe Made dropping of graphs more resilient to errors 2017-04-25 15:56:39 +02:00
Wilfried Goesgens b0b919d9cc portabilize the output of the debugger hint command 2017-04-25 15:31:10 +02:00
jsteemann 9ab0ee817a jslint 2017-04-25 15:17:33 +02:00
Michael Hackstein e5f7303dad Fixed drop in general-graph it now honors distributeShardsLike 2017-04-25 15:08:45 +02:00
Michael Hackstein d49e22f691 HTTP collection API now finally exposes distributeShardsLike 2017-04-25 15:08:14 +02:00
Wilfried Goesgens 3b17d9cdbc add missing signaling of crashed state 2017-04-25 14:50:58 +02:00
Max Neunhoeffer e7dba402e5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-25 14:49:38 +02:00
Max Neunhoeffer ab56530f76 Hand out distributeShardsLike in properties in arangosh. 2017-04-25 14:49:19 +02:00
Michael Hackstein 02eb704279 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 12:58:53 +02:00
Michael Hackstein 5737dd00e0 Adapted replication applier tests to connect to 127.0.0.1:0 which is invalid instead of some random invalid IP. Causes the Mac to ignore the timeout. 2017-04-25 12:58:46 +02:00
jsteemann e0b38b32b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 11:29:34 +02:00
jsteemann 5209312f5d remove unused method call 2017-04-25 11:28:31 +02:00
Jan Christoph Uhde 17db954a86 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  Removed if where if and else were identical
  changelog
  fixed issue: 2448
  all agency threads shutdown in their destructors if not stopping yet
  ui: fixed login windows showing wrong available dbs
  fix bug with ioService gone before hearbeatthread
2017-04-25 11:12:49 +02:00
hkernbach e96ca25566 fixed issue: 2448 2017-04-25 10:03:34 +02:00
hkernbach 31e4aa1a7d ui: fixed login windows showing wrong available dbs 2017-04-25 09:27:36 +02:00
Jan Christoph Uhde 5f31e2b692 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  Removed non-applicable test case.
  unused variable
  rocksdb options
  fixes for non-array IN lookups, added tests
  Add check for distributeShardsLike to dropCollectionCoordinator.
  fixed foxx test
  added missing return
  js request simplified if sslProtocol
  pass also sslProtocol from request to internal.download
  fixed issue #2450
  cppcheck
  Added a missing switch break.
  remove dead code
  updated CHANGELOG
  raised to 4
  added 'x-content-type-options: nosniff' to avoid MSIE bug
  fixed queue size
  added queue size to statistics
  added queue time and request tracing with timings
2017-04-25 08:38:51 +02:00
Dan Larkin 107e6ab39d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-24 22:27:23 -04:00
Dan Larkin d1933486da Removed non-applicable test case. 2017-04-24 22:26:58 -04:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
jsteemann 3c4393636a fixed foxx test 2017-04-24 23:52:28 +02:00
baslr 28461a24ca js request simplified if sslProtocol 2017-04-24 23:06:46 +02:00
baslr e01abcf1ed pass also sslProtocol from request to internal.download 2017-04-24 23:06:45 +02:00
jsteemann 4d6c21f3c5 fixed issue #2450 2017-04-24 23:06:45 +02:00
Jan Christoph Uhde 37db67dee5 fix engine name 2017-04-24 19:01:31 +02:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Michael Hackstein adf86751f1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-24 15:38:02 +02:00
Michael Hackstein 13b7bf5744 Fixed replication tests. They tried to drop system collections without FORCE => setup failures if the collection exists before. 2017-04-24 15:37:52 +02:00
Jan Christoph Uhde 6b688c75f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  comment out the windows unhandled exception handler
  more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:30:15 +02:00
Jan Christoph Uhde a21fc6fd7c fix engine type filtering for replication tests 2017-04-24 15:29:22 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
Jan Christoph Uhde 64ccf864a4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Adapted statistics in tests for SinlgeServer Traversal.
  Fixed JSLint
2017-04-24 15:01:26 +02:00
Jan Christoph Uhde dd3253a935 remove mmfiles specific test code for other engines 2017-04-24 15:00:21 +02:00
Michael Hackstein 54c857ed74 Adapted statistics in tests for SinlgeServer Traversal. 2017-04-24 13:22:42 +02:00
Michael Hackstein 6eab0b4f20 Fixed JSLint 2017-04-24 13:07:52 +02:00
Michael Hackstein 1d52eb8afe Adapted cluster-hash-index tests for RocksDB. 2017-04-24 12:45:21 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Kaveh Vahedipour d5a8269d57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 15:47:09 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann dbe5aec4aa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:31:13 +02:00
jsteemann efefb87d70 jslint 2017-04-21 15:30:53 +02:00
jsteemann 03585460a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:28:45 +02:00
Wilfried Goesgens 3a1e65d53f add test whether append to NULL works 2017-04-21 15:23:54 +02:00