]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #28865 into master
authorSage Weil <sage@redhat.com>
Thu, 4 Jul 2019 02:26:57 +0000 (21:26 -0500)
committerSage Weil <sage@redhat.com>
Thu, 4 Jul 2019 02:26:57 +0000 (21:26 -0500)
commit948cd0db434322e0371cb0e8f53063b918d14c4d
tree21ef6bc5d90d2853f455a39e08a0f8f3ba53fa0a
parente2a0ea78c50802e04f0b45ee5b6243e5f8938f79
parent0a48392ce066471233cc1e81e957b2999b9c411c
Merge PR #28865 into master

* refs/pull/28865/head:
mon/OSDMonitor: fix _lookup_snap to verify the pool matches
ceph_test_rados_api_*: make failing to clean up namespace non-fatal
osd: store purged_snaps history under separate object

Reviewed-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.cc
src/osd/OSD.h