From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Feb 2020 03:51:27 +0000 (-0600)
Subject: Merge PR #33342 into master
X-Git-Tag: v15.1.1~397
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb5636596347533e81d46bba20003760c3b9d6a6;p=ceph.git

Merge PR #33342 into master

* refs/pull/33342/head:
	cephadm: expose `timeout` for `is_available` check
	cephadm: add `--retry` arg

Reviewed-by: Sage Weil <sage@redhat.com>
---

eb5636596347533e81d46bba20003760c3b9d6a6