Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/ceph_mon.cc
Simple merge

diff --cc src/common/WorkQueue.h
Simple merge

diff --cc src/common/obj_bencher.cc
Simple merge

diff --cc src/compressor/AsyncCompressor.h
Simple merge

diff --cc src/kv/RocksDBStore.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/os/ObjectStore.h
Simple merge

diff --cc src/os/bluestore/BlueFS.h
Simple merge

diff --cc src/os/bluestore/BlueRocksEnv.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
index 6f6ecd4fbf33753bd0fe01df94edc633889ef982,1fb4b67e2a2fcc204f8bf492c9abf4b9a31ff2bf..30496e7afbbdaf3bbdab3047db79206b8da7173d
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -751,6 -757,8 +751,7 @@@ BlueStore::BlueStore(CephContext *cct, 
      fsid_fd(-1),
      mounted(false),
      coll_lock("BlueStore::coll_lock"),
 -    nid_lock("BlueStore::nid_lock"),
+     nid_last(0),
      nid_max(0),
      throttle_ops(cct, "bluestore_max_ops", cct->_conf->bluestore_max_ops),
      throttle_bytes(cct, "bluestore_max_bytes", cct->_conf->bluestore_max_bytes),

diff --cc src/os/bluestore/BlueStore.h
Simple merge

diff --cc src/os/filestore/CollectionIndex.h
index 63744cbd08dea890ade94e0b7229c436a753f23c,7e2fc55ce8f1d4000628dc88087e7b3f106657ec..3c27fecad2080d0d69c77805204086a794c4ee7e
--- 1/src/os/filestore/CollectionIndex.h
--- 2/src/os/filestore/CollectionIndex.h
+++ b/src/os/filestore/CollectionIndex.h
@@@ -176,7 -176,7 +176,7 @@@ protected
    /// Call prior to removing directory
    virtual int prep_delete() { return 0; }
  
-   CollectionIndex(const coll_t& collection):
 -  explicit CollectionIndex(coll_t collection):
++  explicit CollectionIndex(const coll_t& collection):
      access_lock_name ("CollectionIndex::access_lock::" + collection.to_str()),
      access_lock(access_lock_name.c_str()) {}
  

diff --cc src/os/filestore/FileStore.cc
Simple merge

diff --cc src/os/filestore/FileStore.h
Simple merge

diff --cc src/os/kstore/KStore.h
Simple merge

diff --cc src/os/memstore/MemStore.h
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge

diff --cc src/test/bench/dumb_backend.h
Simple merge

diff --cc src/test/librbd/test_librbd.cc
Simple merge

diff --cc src/tools/rados/rados.cc
Simple merge