Merge branch 'master' of https://github.com/ceph/ceph
Merge branch 'rocksdb' of https://github.com/xinxinsh/ceph into rocksdb