From: Dave Rigby <daver@couchbase.com>
Date: Thu, 7 Jul 2016 13:13:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'couchbase/3.0.x' into sherlock
X-Git-Tag: v4.1.2~12
X-Git-Url: http://review.couchbase.org/gitweb?p=ep-engine.git;a=commitdiff_plain;h=cd51ba4077b349d811ccd7c43f96c664d7ba421d

Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19732: Fix the data race on lastSendTime between stats and dcp worker threads
  MB-19732: Record time for all DCP consumer messages
  MB-19732: Only update sendTime if successfully send noop
  MB-19691: Address data race on vb_state::high_seqno

Change-Id: I2d994dd799c8fe5ee5779d3916e374aa3fa9615b
---

cd51ba4077b349d811ccd7c43f96c664d7ba421d