]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #36964 from trociny/wip-47275
authorJason Dillaman <dillaman@redhat.com>
Wed, 9 Sep 2020 15:32:06 +0000 (11:32 -0400)
committerGitHub <noreply@github.com>
Wed, 9 Sep 2020 15:32:06 +0000 (11:32 -0400)
commitfa53f1032fc2e3bdce437797a09676dff58426a3
treea2f83ee1a0e31c27865bf4b9095c0c44b9f13998
parente0b2970bcacf052ccfe3eba28946c126e0be1c45
parentb9edfbd55f897ebaaad56dc67c15887f57ab61ad
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>