From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Feb 2020 13:08:22 +0000 (-0600)
Subject: Merge PR #33048 into master
X-Git-Tag: v15.1.1~560
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19928c13ecefdeef14267ec1919cccd5c1d2ce51;p=ceph.git

Merge PR #33048 into master

* refs/pull/33048/head:
	cephadm: fix error handling in `command_check_host()`
	cephadm: increase default retry_max value

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

19928c13ecefdeef14267ec1919cccd5c1d2ce51