Merge remote-tracking branch 'couchbase/3.0.x' into sherlock 28/65328/2
authorDave Rigby <daver@couchbase.com>
Wed, 29 Jun 2016 09:17:13 +0000 (10:17 +0100)
committerDave Rigby <daver@couchbase.com>
Wed, 29 Jun 2016 09:47:05 +0000 (10:47 +0100)
commit484230a6de3f1d853dbf58c49d9b224f75982c56
treed5a8d6e5ce6c255d22bb1553a12f2458e9b6ce33
parentae30faa43273b4e4786c5cc41bc738141471d35f
parent4b25964c5c96471a6e9720f10e99a9ebcff1f818
Merge remote-tracking branch 'couchbase/3.0.x' into sherlock

* couchbase/3.0.x:
  MB-19359: [2] Address lock inversion with vb's state lock and snapshot lock
  MB-19359: [1] Address lock inversion with vb's state lock and snapshot lock

Change-Id: Ia068af9b26e8a4b980bf22341fa43ac5452aca60
src/ep_engine.cc