]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbb32b095a196177fc77f6d806c3ce43623392acc
tree8298289fb57e57b7d191a250660c7ed8e3f21c5d
parent36d4408e855e2ca51adf5b77c9b1dfab249554f8
parent162488389092bea7a1f9a51af328ac2f5adc5caf
Merge PR #29051 into master

* refs/pull/29051/head:
mon/OSDMonitor: tolerate duplicate MRemoveSnaps messages

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