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

14397 Commits

Author SHA1 Message Date
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth 
Feature/ldap auth
 2017-04-26 14:12:32 +02:00
Simon Grätzer bdd002d6ec Fixing incremental sync deletion 2017-04-26 14:11:51 +02:00
jsteemann 631be66ba8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 13:37:51 +02:00
jsteemann 9161d48788 changed option description 2017-04-26 13:37:40 +02:00
Simon Grätzer 02e41de608 Working on replication 2017-04-26 13:32:12 +02:00
jsteemann 99dc29d0e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:11:37 +02:00
jsteemann b7de569a27 change log level for debugging 2017-04-26 12:07:28 +02:00
Kaveh Vahedipour 27275e3686 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:07:03 +02:00
Kaveh Vahedipour 0d96ba4f4b merge from 3.1 2017-04-26 12:06:43 +02:00
Simon Grätzer a8285641fb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:30:44 +02:00
jsteemann d3c165cb8f allow periodic tasks to cancel themselves 2017-04-26 11:28:43 +02:00
Simon Grätzer 6472c4928d Various warnings 2017-04-26 11:26:08 +02:00
Frank Celler ab7bcfe224 --server.maximal-queue-size is now an absolute maximum 2017-04-26 11:20:56 +02:00
Max Neunhoeffer 067a4510a8 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:17:24 +02:00
Max Neunhoeffer d3f492158c Port 3.1 fixes to devel, move something into try block. 2017-04-26 11:17:08 +02:00
jsteemann 7283e0d793 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:15:42 +02:00
jsteemann 664c6fc83c added more marker types 2017-04-26 11:15:33 +02:00
Max Neunhoeffer 855d7cf1c2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:07:24 +02:00
Max Neunhoeffer c12878b1f0 Port 3.1 changes to devel, JS support AddFollower/RemoveFollower for tests. 2017-04-26 11:06:24 +02:00
Simon Grätzer f31e3c3688 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:06:13 +02:00
Simon Grätzer d228a94462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
 2017-04-26 11:06:09 +02:00
Michael Hackstein 5beae6081b Removed double include due to hidden merge conflict. 2017-04-26 11:04:01 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
jsteemann b349eaf34a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:40:14 +02:00
jsteemann b226dfdc9a add missing include files 2017-04-26 10:40:04 +02:00
Michael Hackstein e891c66c88 Fixed missing includes 2017-04-26 10:39:10 +02:00
jsteemann 19129835f2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:33:03 +02:00
Michael Hackstein aed90940d0 Fixed compile bugin shortest path 2017-04-26 10:32:40 +02:00
Kaveh Vahedipour d9f0e7bf2a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:28:27 +02:00
Kaveh Vahedipour 8f2fbd6b3c Fix compile bug 2017-04-26 10:27:52 +02:00
jsteemann 5cf3787c8d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:23:01 +02:00
Michael Hackstein 6e949f97e7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 10:22:22 +02:00
Michael Hackstein 9e1eba3bde ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors 2017-04-26 10:21:18 +02:00
Kaveh Vahedipour 5f7cc6de59 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:20:27 +02:00
Kaveh Vahedipour 7aceac2f56 ClusterComm cherry pick from 3.1 2017-04-26 10:20:21 +02:00
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
Michael Hackstein 4c58817cc7 Further unnecessary friends and member variables removed 2017-04-26 10:10:05 +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
Simon Grätzer 020c3db093 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 20:55:26 +02:00
Simon Grätzer a53025b5a9 Added RocksDB WAL types 2017-04-25 20:55:21 +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
Simon Grätzer 6d358c9b6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 16:55:44 +02:00
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
Simon Grätzer 3aada2afe0 Fixed double handled case 2017-04-25 16:03:51 +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
baslr 54e2bd6386 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 14:19:05 +02:00
baslr be4da8cd0c ldap random salt for new user 2017-04-25 14:18:44 +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
baslr a478e6f03c remove ldap feature here 2017-04-25 13:48:57 +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
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 bc8f08189b searching for the shutdown problem on mac 2017-04-25 11:53:55 +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