Merge remote-tracking branch 'couchbase/sherlock' into 'couchbase/wat…

…son' * commit '1301ca609be559248af78d6fa52ce766dd8e4915': MB-20307: Re-enable dcp ep_dcp_dead_conn_count MB-20312: Initialise snapshot task priority MB-20330: ReaderLockHolder with no lvalue Change-Id: I5878d95f8d792971fbb4ab5342baf4b017b6614a
membase · Aug 3, 2016 · 1b4babc · 1b4babc
2 parents 5edb7b1 + 1301ca6
commit 1b4babc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/connmap.cc b/src/connmap.cc
@@ -1325,8 +1325,7 @@ void DcpConnMap::updateMaxActiveSnoozingBackfills(size_t maxDataSize)
         maxActiveSnoozingBackfills);
 }
 
-void DcpConnMap::addStats(ADD_STAT add_stat, const void *c)
-{
+void DcpConnMap::addStats(ADD_STAT add_stat, const void *c) {
     LockHolder lh(connsLock);
     add_casted_stat("ep_dcp_dead_conn_count", deadConnections.size(), add_stat,
                     c);

diff --git a/src/connmap.h b/src/connmap.h
@@ -545,8 +545,6 @@ class DcpConnMap : public ConnMap {
      */
     void consumerBatchSizeConfigChanged(size_t newValue);
 
-protected:
-
     bool isPassiveStreamConnected_UNLOCKED(uint16_t vbucket);
 
     void closeAllStreams_UNLOCKED();