Code Review / ep-engine.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: 002f68f ab15229)
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 89/65189/2
authorDave Rigby <daver@couchbase.com>
Tue, 28 Jun 2016 15:13:14 +0000 (16:13 +0100)
committerDave Rigby <daver@couchbase.com>
Tue, 28 Jun 2016 15:14:34 +0000 (16:14 +0100)
commitae30faa43273b4e4786c5cc41bc738141471d35f
tree967b48a1f2ae4ae63e85dc50fa259ee65b09ba1dtree | snapshot
parent002f68f2a048dfbce4d1a573ad71d3810773ee47commit | diff
parentab152290a96e35d0c3ead2de0f619ca7dc065ab7commit | diff
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19343: Use cb_gmtime_r instead of gmtime_r
  [BP] MB-16366: Obtain vbstate readlock in numerous operations
  MB-19280: Fix data race in CouchKVStore stats access
  MB-19279: Fix race in use of gmtime()
  MB-19113: Suppress test_mb16357 when on thread sanitizer

Change-Id: Id289ae95e6fc5e03a64957cc41f53af9ee262a2a
src/couch-kvstore/couch-kvstore.h diff1 | diff2 | blob | history
src/ep.cc diff1 | diff2 | blob | history
src/ep.h diff1 | diff2 | blob | history
tests/ep_testsuite.cc diff1 | diff2 | blob | history
The membase EP engine.