]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #18399 from jcsp/wip-20950
authorJohn Spray <jspray@redhat.com>
Thu, 2 Nov 2017 10:37:09 +0000 (10:37 +0000)
committerGitHub <noreply@github.com>
Thu, 2 Nov 2017 10:37:09 +0000 (10:37 +0000)
commit737877fb381c3f6f6c12d0b45186057fd924a25d
treeb286ba236c085ee314c65daff7c797f12ebad053
parent0ee9fd2c149e993f357c84ce265bf452bfba97be
parent57229ea2a4369518c7a16b7a09b045b7896f5a70
Merge pull request #18399 from jcsp/wip-20950

mon: don't blow away bootstrap-mgr on upgrades

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>