From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 13:22:59 +0000 (-0600)
Subject: Merge PR #31478 into master
X-Git-Tag: v15.1.0~984
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5eb2531053ad0c14063d400178bc609bef5adff;p=ceph.git

Merge PR #31478 into master

* refs/pull/31478/head:
	ceph-daemon: add --skip-pull
	ceph-daemon: add explicit pull at bootstrap start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

a5eb2531053ad0c14063d400178bc609bef5adff