]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/wip-da-SCA-20150910'
authorSage Weil <sage@redhat.com>
Tue, 2 Feb 2016 13:08:26 +0000 (08:08 -0500)
committerSage Weil <sage@redhat.com>
Tue, 2 Feb 2016 13:08:26 +0000 (08:08 -0500)
commitaa5e8db78b0164ce4074ba67fb64ccad580ce473
treeb557ce07ceaed3b0d39667271456215b60c2d333
parent73651d9e96be829295ee4f7f4b82d3cafa2c5986
parent579fbc8d5b120242d42a7177dc276c974995ecfa
Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

Reviewed-by: Kefu Chai <kchai@redhat.com>
22 files changed:
src/ceph_mon.cc
src/common/WorkQueue.h
src/common/obj_bencher.cc
src/compressor/AsyncCompressor.h
src/kv/RocksDBStore.cc
src/mon/Monitor.cc
src/os/ObjectStore.h
src/os/bluestore/BlueFS.h
src/os/bluestore/BlueRocksEnv.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/os/filestore/CollectionIndex.h
src/os/filestore/FileStore.cc
src/os/filestore/FileStore.h
src/os/kstore/KStore.h
src/os/memstore/MemStore.h
src/osd/OSD.h
src/rgw/rgw_admin.cc
src/rgw/rgw_main.cc
src/test/bench/dumb_backend.h
src/test/librbd/test_librbd.cc
src/tools/rados/rados.cc