Merge remote-tracking branch 'couchbase/3.1.3' into 'couchbase/3.0.x' 19/57619/1
authorDave Rigby <daver@couchbase.com>
Wed, 9 Dec 2015 10:12:25 +0000 (10:12 +0000)
committerDave Rigby <daver@couchbase.com>
Wed, 9 Dec 2015 10:12:25 +0000 (10:12 +0000)
commitdb7bf3f9cb7b34a2cc97e321289d13641ea6c902
tree57be9903e860827c7000edce3eb889dc72ce1752
parent93d4b0fa5bcc154067d486c41ac59d21372162b3
parent1be129dcb858b1fa87cb2faa6fb999bb5616c0a5
Merge remote-tracking branch 'couchbase/3.1.3' into 'couchbase/3.0.x'

* couchbase/3.1.3:
  Fix compilation issue on windows
  [BP] MB-16915: Remove cyclic reference between DcpConsumer and PassiveStream.
  [BP] MB-16915: RollbackTask to hold ref count ptr for DCP consumer instead of raw ptr
  [BP] MB-16915: Use refcounted pointers on producer/consumer

Change-Id: Ied8b262fef0eb06671277524e17f0b6cbf7acbeb
tests/ep_testsuite.cc