Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 82/65582/1
authorDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:59:04 +0000 (14:59 +0100)
committerDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:59:04 +0000 (14:59 +0100)
commit40cb9cfae005364cbfa9e035d2c0904d7e613c12
treea0116d09365be1a1a94491463adb833c0ab13ecc
parent45a7c2881dd0694983582522c6bffefe61bfe1d4
parentdd3b6ae5e919bf51adaf5183fc8f1a076eac5357
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19982: Don't hold connsLock for duration of dcp stats
  MB-19982: Fix potential deadlock between DcpConsumer::bufMutex & connsLock
  MB-14859: Handle quick successive BG Fetch of a key interleaved with exp pager

Change-Id: Ie192ce93370c3218948434794b335732a6a7ff18
src/connmap.cc
src/connmap.h
src/ep.cc
src/ep_engine.cc
tests/ep_testsuite.cc