]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #24098 into master
authorSage Weil <sage@redhat.com>
Tue, 18 Sep 2018 22:24:12 +0000 (17:24 -0500)
committerSage Weil <sage@redhat.com>
Tue, 18 Sep 2018 22:24:12 +0000 (17:24 -0500)
commit7591ccd7189f98d63e8aa4c099d0b0b9122d172d
tree0f8edbac6f1f1da57af9532d4d298ef9f6e9d860
parentb2a9c6082d14b5ba0a150bf9e61e123686ea43fb
parent5009d9ecc692076360ff777e47db9902c7bff669
Merge PR #24098 into master

* refs/pull/24098/head:
Rename "include/assert.h"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
15 files changed:
src/client/Client.cc
src/common/buffer.cc
src/include/buffer.h
src/mds/MDCache.cc
src/mds/Server.cc
src/mon/AuthMonitor.cc
src/mon/MonCap.cc
src/msg/async/dpdk/DPDKStack.cc
src/osd/OSD.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/test/librados_test_stub/LibradosTestStub.cc
src/test/rbd_mirror/test_mock_fixture.h
src/tools/rbd/action/MirrorPool.cc
src/tools/rbd_mirror/PoolWatcher.h