]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29774 into master
authorSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 17:27:26 +0000 (12:27 -0500)
committerSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 17:27:26 +0000 (12:27 -0500)
* refs/pull/29774/head:
qa/standalone/scrub/osd-scrub-snaps: snapmapper omap is now 'm'

Reviewed-by: David Zafman <dzafman@redhat.com>

Trivial merge