From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 9 Sep 2020 15:32:06 +0000 (-0400)
Subject: Merge pull request #36964 from trociny/wip-47275
X-Git-Tag: v16.1.0~1155
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa53f1032fc2e3bdce437797a09676dff58426a3;p=ceph.git

Merge pull request #36964 from trociny/wip-47275

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

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

fa53f1032fc2e3bdce437797a09676dff58426a3