]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31138 into master
authorSage Weil <sage@redhat.com>
Fri, 25 Oct 2019 14:11:36 +0000 (09:11 -0500)
committerSage Weil <sage@redhat.com>
Fri, 25 Oct 2019 14:11:36 +0000 (09:11 -0500)
* refs/pull/31138/head:
mon: fix tell to hybrid octopus/pre-octopus mons

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge