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)
commit93ffdc3a4cd7747555eb87764eb82efe7a6cd6c9
tree0ca5076196b27e6f951dc0af96e7da7a0fdd92b5
parent1f7138620bef0d815e17515201dac473a57b0a94
parent91b71e1bef6cdef48837e7003db2a35a3a38d57b
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19678: Merge backfill and in-memory snapshots correctly on replica vb

Change-Id: I1b0adbafe45e4f4414da62846019b55c7dd05833