Code Review / ep-engine.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: cd51ba4 9b19427)
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 81/65581/1
authorDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:48:01 +0000 (14:48 +0100)
committerDave Rigby <daver@couchbase.com>
Thu, 7 Jul 2016 13:48:01 +0000 (14:48 +0100)
commit45a7c2881dd0694983582522c6bffefe61bfe1d4
treeb31fc5b683a4a7ae6736df0d85471857b9e20f00tree | snapshot
parentcd51ba4077b349d811ccd7c43f96c664d7ba421dcommit | diff
parent9b194271f12e9b620c803a11b77a62e5402fb346commit | diff
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19886: Fix data race on ActiveStream::curChkSeqno by making it atomic
  MB-19886: In markDiskSnapshot() get current vb snapshot info outside streamMutex
  MB-19843: Modify the end_seqno in DCP stream request after checking for rollback

Change-Id: I32c52689b4c78f3416af180818df772d217db882
src/dcp-stream.h diff1 | diff2 | blob | history
src/vbucket.h diff1 | diff2 | blob | history
The membase EP engine.