Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 71/65571/1
authorDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 10:57:50 +0000 (11:57 +0100)
committerDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 10:57:50 +0000 (11:57 +0100)
commitb3c259bc5305b5fa9221b1dd746e3d25df827e1b
tree433d4cd480d3106104b72bc51162739c605a8f0a
parent0b766219ff466e6165e618e7fd9e86b16dc8709a
parentc99b61d1795407f042e66d44c3375cc834c901e4
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19503: Fix ConnMap so notifications don't go missing [2]
  MB-19503: Fix ConnMap so notifications don't go missing.
  MB-19404: [BP] Address data race in DCP-Producer seen while making a stats request
  MB-19405: [BP] Address possible data races in PassiveStream context

Change-Id: I241ebd07f9e6177d557dd0ea37da97d6b4cc1489
src/dcp-producer.h
src/dcp-stream.cc
src/dcp-stream.h
tests/ep_testsuite.cc