]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ee9fd2 57229ea)
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)
mon: don't blow away bootstrap-mgr on upgrades

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

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