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

2965 Commits

Author SHA1 Message Date
Simon Grätzer 1948896e5c Broke a test file 2017-04-28 18:16:16 +02:00
Simon Grätzer 86ad31124d Fixing some shell_replication tests 2017-04-28 18:14:03 +02:00
Simon Grätzer 52058ac909 fixing replication errors 2017-04-28 16:28:35 +02:00
Simon Grätzer 84ed7ec100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
 2017-04-28 14:40:17 +02:00
Simon Grätzer 0a00a7eb67 Fixed broken JSON output 2017-04-28 14:28:34 +02:00
jsteemann 8e95e1ee59 try to make task tests more robust and reliable 2017-04-28 09:40:08 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth 
Feature/ldap auth
 2017-04-26 14:12:32 +02:00
Michael Hackstein 2e417a1576 db._explain should now be backwards-compatible if we access a 3.1 instance with a 3.2 arangosh 2017-04-26 11:01:05 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
Wilfried Goesgens 05a46e4781 fix db._explain() to work with the new interface of the graph traverser 2017-04-25 20:33:17 +02:00
Michael Hackstein f21fd3c0fe Made dropping of graphs more resilient to errors 2017-04-25 15:56:39 +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
baslr 54e2bd6386 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 14:19:05 +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
baslr 579718ad37 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 11:18:07 +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
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
Jan Christoph Uhde 37db67dee5 fix engine name 2017-04-24 19:01:31 +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
baslr 9a78fc650b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:37:18 +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
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +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 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 054f1afeb0 fix README_maintainers, provide debug output for invalid invocations 2017-04-19 12:05:16 +02:00
Simon Grätzer a389dc0a92 Fixing geo + full text tests 2017-04-18 13:32:44 +02:00
Simon Grätzer bab71f6339 Fixing jslint errors 2017-04-18 12:15:26 +02:00
Dan Larkin 5852597080 Moved a test file. 2017-04-14 00:04:11 -04:00
Simon Grätzer 866d8b7451 Fixing tests 2017-04-13 17:45:16 +02:00
Simon Grätzer a0e25edac8 Fix a cluster test 2017-04-13 15:20:28 +02:00
baslr d4ae94f937 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-10 17:14:37 +02:00
Jan Christoph Uhde 77da0794ce fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:32:49 +02:00
Jan Christoph Uhde b7bd1d9e59 fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:31:21 +02:00
jsteemann a8f8587504 fix a test 2017-04-06 14:16:35 +02:00
Simon Grätzer 5603e1a6da Renaming test files 2017-04-06 10:29:40 +02:00
Dan Larkin 1d9366b1f1 Moved/split more tests. 2017-04-05 16:09:46 -04:00
Dan Larkin ff0efe8de8 Split/moved more test files. 2017-04-05 12:16:54 -04:00
Dan Larkin 84be9365af Split a JS test. 2017-04-05 11:39:28 -04:00
jsteemann ca60cd691a remove dependency on fulltext index 2017-04-05 11:22:53 +02:00
Simon Grätzer 4e818e483a Marked hash index selectivity test as MMFiles only 2017-03-31 11:48:11 +02:00
Simon Grätzer 807d38784c Added some small fixes 2017-03-31 11:29:27 +02:00
baslr f669fd4b9e LDAP: more options 2017-03-30 11:03:13 +02:00
baslr 3b2ccf46f4 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-30 01:55:08 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00