Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 81/64981/1
authorDave Rigby <daver@couchbase.com>
Thu, 16 Jun 2016 16:59:54 +0000 (17:59 +0100)
committerDave Rigby <daver@couchbase.com>
Thu, 16 Jun 2016 16:59:54 +0000 (17:59 +0100)
commitd7ca7213ad1f807d23a365ea410a55507fa10fd0
treea51e16357b38049ee68844f900039b6f5cef66ee
parent8bd5b51543479fa7f9978b46e94a65ef0ae89ad9
parenta33a746c9b65f7ed5a373737b58b6580448fd5ee
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19226: Address potential data races in the warmup code
  MB-19225: Fix data race on Flusher::taskId
  MB-19225: Fix race in Flusher._state
  MB-19224: Address possible data race with global task's waketime

Change-Id: Idc461799bc50bd1274f3ffafab4b3257a024327b
src/executorthread.cc
src/flusher.cc
src/taskqueue.cc
src/tasks.cc
src/tasks.h
src/warmup.cc