]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31478 into master
authorSage Weil <sage@redhat.com>
Fri, 8 Nov 2019 13:22:59 +0000 (07:22 -0600)
committerSage Weil <sage@redhat.com>
Fri, 8 Nov 2019 13:22:59 +0000 (07:22 -0600)
* refs/pull/31478/head:
ceph-daemon: add --skip-pull
ceph-daemon: add explicit pull at bootstrap start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/ceph-daemon

diff --cc src/ceph-daemon
Simple merge