]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29051 into master
authorSage Weil <sage@redhat.com>
Wed, 17 Jul 2019 16:26:18 +0000 (11:26 -0500)
committerSage Weil <sage@redhat.com>
Wed, 17 Jul 2019 16:26:18 +0000 (11:26 -0500)
* refs/pull/29051/head:
mon/OSDMonitor: tolerate duplicate MRemoveSnaps messages

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge