Merge remote-tracking branch 'couchbase/3.0.x' into 'couchbase/sherlock' 98/62598/1
authorabhinavdangeti <abhinav@couchbase.com>
Fri, 8 Apr 2016 03:03:22 +0000 (20:03 -0700)
committerabhinavdangeti <abhinav@couchbase.com>
Fri, 8 Apr 2016 03:03:43 +0000 (20:03 -0700)
couchbase/3.0.x:
|\
| * 771859f MB-19093 [BP]: [ActiveStream] Address potential lock-inversion scenarios
| * 6811030 MB-19075: Remove printing of empty string in CouchKVStore::getMulti()

Change-Id: I06717dcaad2b764582ebe378a6f9023f7ca76d88

1  2 
src/couch-kvstore/couch-kvstore.cc
src/dcp-producer.cc
src/dcp-stream.cc

Simple merge
Simple merge
Simple merge