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

14251 Commits

Author SHA1 Message Date
jsteemann 59d08c79cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:12:58 +02:00
Max Neunhoeffer ed13ee7973 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 10:10:06 +02:00
Max Neunhoeffer 17a88ddbf8 Port 3.1 fixes to devel, add an access method. 2017-04-26 10:09:47 +02:00
jsteemann e42144f93d disable currently unused variable 2017-04-26 10:09:35 +02:00
Andreas Streichardt 42577df48d remove useless variable 2017-04-26 10:07:51 +02:00
Michael Hackstein 9ee17fea5a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 10:06:38 +02:00
Max Neunhoeffer 63d51b9ae4 Port 3.1 fixes to devel, support setting the agencyPrefix again. 2017-04-26 10:03:20 +02:00
Michael Hackstein d3517eb491 Removed unnecessary friend declaration 2017-04-26 10:02:20 +02:00
jsteemann 6b8c818e2d remove unused variable 2017-04-26 09:59:19 +02:00
jsteemann 178171033f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 09:58:26 +02:00
jsteemann f36a889709 try to fix shutdown issues 2017-04-26 09:58:19 +02:00
Andreas Streichardt ed0e9fdc8e Set waiting to false until tests are changed 2017-04-26 09:57:40 +02:00
Andreas Streichardt dad5a1429e Add waitForSyncReplication as a _create() option 2017-04-26 09:57:40 +02:00
Frank Celler 1ac30babf5 raised statistics entries 2017-04-26 09:54:14 +02:00
Michael Hackstein f876eef088 Removed unused member variable in ShortestPathBlock 2017-04-26 09:52:00 +02:00
jsteemann c617ebddbf honor return value of TRI_vocbase_t::use 2017-04-26 09:51:40 +02:00
jsteemann 404ef431ae cppcheck 2017-04-26 09:50:55 +02:00
jsteemann c59857c2e6 decrease max wait time 2017-04-26 09:50:16 +02:00
Michael Hackstein 344979709e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 09:36:09 +02:00
Michael Hackstein 52b3b67479 Fixed cluster restore of System Collections. 2017-04-26 08:58:17 +02:00
Jan Christoph Uhde 26112be584 do checking before creating copy of slice 2017-04-26 08:33:23 +02:00
Jan Christoph Uhde 7b2acaebfb use stringref instead of allocation 2017-04-26 07:33:14 +02:00
Dan Larkin 20dc8b4fa0 Fixed duplicate objectIds in InitialSyncer. 2017-04-25 16:51:38 -04: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
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +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
Jan Christoph Uhde e4b3f5c4ac fix warning 2017-04-25 15:12:22 +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
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
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
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