]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a44d75a 71befa2)
Merge PR #33418 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 19:42:08 +0000 (13:42 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 19:42:08 +0000 (13:42 -0600)
* refs/pull/33418/head:
mon: stash newer map on bootstrap when addr doesn't match

Reviewed-by: Neha Ojha <nojha@redhat.com>

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