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

38998 Commits

Author SHA1 Message Date
jsteemann 95f9439174 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 16:09:08 +02:00
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
Michael Hackstein 1dda903834 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 15:56:48 +02:00
Michael Hackstein f21fd3c0fe Made dropping of graphs more resilient to errors 2017-04-25 15:56:39 +02:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
Wilfried Goesgens b0b919d9cc portabilize the output of the debugger hint command 2017-04-25 15:31:10 +02:00
Andreas Streichardt 2b4038953e Remove unused CXX checks (were not in use and cmake has built in support for these) 2017-04-25 15:20:50 +02:00
jsteemann 9ab0ee817a jslint 2017-04-25 15:17:33 +02:00
Jan Christoph Uhde e4b3f5c4ac fix warning 2017-04-25 15:12:22 +02:00
Jan Christoph Uhde 3461de867b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fixed drop in general-graph it now honors distributeShardsLike
  HTTP collection API now finally exposes distributeShardsLike
 2017-04-25 15:10:37 +02:00
Michael Hackstein b9edda2d01 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 15:08:52 +02:00
Michael Hackstein e5f7303dad Fixed drop in general-graph it now honors distributeShardsLike 2017-04-25 15:08:45 +02:00
Jan Christoph Uhde 506a02efec Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  fixed warning
 2017-04-25 15:08:37 +02:00
Jan Christoph Uhde e06efa6420 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  fix compile warnings
  Fixed build
  add missing signaling of crashed state
 2017-04-25 15:08:17 +02:00
Michael Hackstein d49e22f691 HTTP collection API now finally exposes distributeShardsLike 2017-04-25 15:08:14 +02:00
Simon Grätzer a143cd1254 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
 2017-04-25 15:06:16 +02:00
Simon Grätzer da5102ce6a fixed warning 2017-04-25 15:05:18 +02:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
jsteemann 26d4fd61db fix compile warnings 2017-04-25 14:56:00 +02:00
Simon Grätzer 4804123e0f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:54:03 +02:00
Simon Grätzer 2f968d649a Fixed build 2017-04-25 14:53:59 +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
jsteemann f4972d38ab Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:41:13 +02:00
jsteemann 09e3a19a5b try to fix shutdown issue 2017-04-25 14:41:04 +02:00
Simon Grätzer 284d620c0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:27:39 +02:00
Simon Grätzer 69c2faf592 Fixed synced 2017-04-25 14:27:34 +02:00
jsteemann 6935b6fe3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:20:20 +02:00
jsteemann bd5737c5e7 try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish 2017-04-25 14:20:00 +02:00
Kaveh Vahedipour d88f990ad0 dropping sharding prototype collection more verbose 2017-04-25 14:17:08 +02:00
Kaveh Vahedipour 999334e366 dropping sharding prototype collection more verbose 2017-04-25 14:13:07 +02:00
Kaveh Vahedipour bf67189d98 dropping sharding prototype collection more verbose 2017-04-25 14:11:44 +02:00
Kaveh Vahedipour 1361e5e6dd dropping sharding prototype collection more verbose 2017-04-25 14:03:26 +02:00
Kaveh Vahedipour 21c1a68702 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:00:05 +02:00
Kaveh Vahedipour f0f40b6e8d dropping sharding prototype collection more verbose 2017-04-25 13:59:56 +02:00
Simon Grätzer 3c6074a206 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 13:33:36 +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 861291da16 honor exclusive locks 2017-04-25 12:56:56 +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
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