Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 75/65575/2
authorDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:20:43 +0000 (14:20 +0100)
committerDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:20:43 +0000 (14:20 +0100)
* couchbase/3.0.x:
  MB-19678: Merge backfill and in-memory snapshots correctly on replica vb

Change-Id: I1b0adbafe45e4f4414da62846019b55c7dd05833


Trivial merge