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

39264 Commits

Author SHA1 Message Date
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 861291da16 honor exclusive locks 2017-04-25 12:56:56 +02:00
baslr eda353819a Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 12:45:30 +02:00
jsteemann 9db917bd77 try to fix shutdown issue 2017-04-25 12:28:51 +02:00
Simon Grätzer 8aaac6d5a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 12:02:04 +02:00
Simon Grätzer 5d20b79c0f Incremental Sync 2017-04-25 12:01:58 +02:00
Kaveh Vahedipour 681e3e56e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 11:54:05 +02:00
Kaveh Vahedipour bc8f08189b searching for the shutdown problem on mac 2017-04-25 11:53:55 +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
baslr 579718ad37 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 11:18:07 +02:00
Jan Christoph Uhde 319a47c64b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  try to fix startup order
 2017-04-25 11:14:45 +02:00
jsteemann 3cdeeffc13 try to fix startup order 2017-04-25 11:14:10 +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
Jan Christoph Uhde e5447d2e8c prevent crashing of replication when not using mmfiles engine 2017-04-25 11:11:58 +02:00
Michael Hackstein 433420ae2c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 10:10:54 +02:00
Michael Hackstein 9e49f87fe6 Removed if where if and else were identical 2017-04-25 10:10:46 +02:00
hkernbach ce2bef7c84 changelog 2017-04-25 10:03:55 +02:00
hkernbach e96ca25566 fixed issue: 2448 2017-04-25 10:03:34 +02:00
Kaveh Vahedipour f5d0dc75bd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 09:34:21 +02:00
Kaveh Vahedipour 7766c44aaa all agency threads shutdown in their destructors if not stopping yet 2017-04-25 09:34:08 +02:00
hkernbach 31e4aa1a7d ui: fixed login windows showing wrong available dbs 2017-04-25 09:27:36 +02:00
Kaveh Vahedipour 2e3bd066f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 08:54:45 +02:00
Kaveh Vahedipour 6ef775e52f fix bug with ioService gone before hearbeatthread 2017-04-25 08:54:33 +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 a52a6ff21e unused variable 2017-04-25 02:26:02 +02:00
jsteemann 0434d88ab4 rocksdb options 2017-04-25 02:22:00 +02:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
jsteemann ca5d54aa58 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 00:03:05 +02:00
Max Neunhoeffer e16f9ca7c5 Add check for distributeShardsLike to dropCollectionCoordinator. 2017-04-24 23:54:07 +02:00
jsteemann 3c4393636a fixed foxx test 2017-04-24 23:52:28 +02:00
jsteemann fe1268af97 added missing return 2017-04-24 23:30:57 +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
jsteemann d1cad2acc9 cppcheck 
fix
 2017-04-24 23:06:36 +02:00
Dan Larkin 0ce293bb6a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-24 16:36:53 -04:00
Dan Larkin a17de4e296 Added a missing switch break. 2017-04-24 16:36:50 -04:00
jsteemann 9cdf52c6e9 remove dead code 2017-04-24 21:42:13 +02:00
Jan Christoph Uhde 5c59255c5f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fixed unnecessary move of temporary object
  fix license / readme filenames
  two ways to name snap packages?
  Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit
  avoid warnings for time being
  fixed exterprise build in devel
 2017-04-24 19:01:42 +02:00
Jan Christoph Uhde 37db67dee5 fix engine name 2017-04-24 19:01:31 +02:00
Frank Celler 53e5da6643 updated CHANGELOG 2017-04-24 19:01:12 +02:00
Frank Celler 856f8c9df3 raised to 4 2017-04-24 18:59:02 +02:00
Frank Celler f94df236a3 added 'x-content-type-options: nosniff' to avoid MSIE bug 2017-04-24 18:47:56 +02:00
Frank Celler 45690bbbdd fixed queue size 2017-04-24 18:47:44 +02:00
Frank Celler 1a4675dfbf added queue size to statistics 2017-04-24 18:47:44 +02:00
Frank Celler d783d4ecae added queue time and request tracing with timings 2017-04-24 18:47:44 +02:00