]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #41130 from gregsfortytwo/pacific-stretch-mon-state
authorGregory Farnum <gfarnum@redhat.com>
Fri, 4 Jun 2021 21:54:08 +0000 (14:54 -0700)
committerGitHub <noreply@github.com>
Fri, 4 Jun 2021 21:54:08 +0000 (14:54 -0700)
Pacific stretch mon state [Merge after 40484]

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/mon/Monitor.cc
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h

Simple merge
Simple merge
Simple merge