]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
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)
* 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>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge