]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37181 from callithea/wip-47411-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 29 Sep 2020 15:16:08 +0000 (08:16 -0700)
committerGitHub <noreply@github.com>
Tue, 29 Sep 2020 15:16:08 +0000 (08:16 -0700)
nautilus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Trivial merge