From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 29 Sep 2020 16:09:43 +0000 (-0700)
Subject: Merge pull request #37180 from callithea/wip-47410-octopus
X-Git-Tag: v15.2.9~122^2~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fadafcbe28d24af7013d788b0aac69dbcef0d0b4;p=ceph.git

Merge pull request #37180 from callithea/wip-47410-octopus

octopus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

fadafcbe28d24af7013d788b0aac69dbcef0d0b4