]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #37180 from callithea/wip-47410-octopus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 29 Sep 2020 16:09:43 +0000 (09:09 -0700)
committerGitHub <noreply@github.com>
Tue, 29 Sep 2020 16:09:43 +0000 (09:09 -0700)
commitfadafcbe28d24af7013d788b0aac69dbcef0d0b4
treede82c5d5e547c867c99484d9b5952a30bd549235
parent513a0c3d95302734b9d2c96dc233a1aa354482b8
parent20b862c3dc5497332269fd4214990149f5ce443f
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>