]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit971cf07c1477133dd6817e08c61fd93484209f9c
treeba80fdfbde9107bfa4b33a3d52f7f38e969472a1
parenta44d75a8ccc1131fff2f2b0e626f7d9cc69f4f00
parent71befa298658925555841a2a98802210954358ce
Merge PR #33418 into master

* refs/pull/33418/head:
mon: stash newer map on bootstrap when addr doesn't match

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