]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0b2970 b9edfbd)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.