]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge branch 'wip-names!-in!-space!' of git://github.com/adamemerson/ceph
authorSage Weil <sage@redhat.com>
Thu, 11 Jan 2018 21:53:55 +0000 (15:53 -0600)
committerSage Weil <sage@redhat.com>
Thu, 11 Jan 2018 22:14:44 +0000 (16:14 -0600)
commit4da29a07cfc4c7c3e6fb499f4f7ddac307292ca0
tree6c6980e241471e826ae690290530ddefc8a87cab
parentc6d6676422aebfba714392b6a9365c6b1dc440e7
parent8da07089dfee583d3039ce2d1154289923ef87b2
Merge branch 'wip-names!-in!-space!' of git://github.com/adamemerson/ceph

Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
# Conflicts:
# src/cls/rbd/cls_rbd.cc
# src/cls/rbd/cls_rbd_types.cc
22 files changed:
src/cls/rbd/cls_rbd.cc
src/cls/rbd/cls_rbd.h
src/cls/rbd/cls_rbd_client.cc
src/cls/rbd/cls_rbd_types.cc
src/cls/rbd/cls_rbd_types.h
src/msg/async/AsyncConnection.cc
src/os/Transaction.cc
src/os/bluestore/BlueStore.cc
src/os/filestore/FileJournal.cc
src/os/filestore/FileStore.cc
src/osd/OSDMap.h
src/osd/PG.cc
src/osd/PGLog.cc
src/osd/PGLog.h
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rados.h
src/test/cls_rbd/test_cls_rbd.cc
src/tools/rados/rados.cc
src/tools/rbd/Utils.cc
src/tools/rbd_mirror/ImageReplayer.cc