]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit2dca76ac843aa9b0dc60bfc368baca9c08869c0b
tree1984a17182fb2185852a3920b03c6d53ef73d7d7
parentb7134f4ea93791c854ec0eb00ac70b4cc1218556
parentf5a1c57c94a61b235b08746bc89d12cd15ce32d2
Merge PR #29774 into master

* refs/pull/29774/head:
qa/standalone/scrub/osd-scrub-snaps: snapmapper omap is now 'm'

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