From: Sage Weil <sage@redhat.com>
Date: Sat, 26 Oct 2019 15:55:19 +0000 (-0500)
Subject: Merge PR #31169 into master
X-Git-Tag: v15.1.0~1156
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fc78b63425abd192a82f812958349f2bf079dea;p=ceph.git

Merge PR #31169 into master

* refs/pull/31169/head:
	mgr/ssh: implement (synchronous) describe_service
	ceph-daemon: ls: replace 'active' bool with 'state' enum
	ceph-daemon: include container_id and version in 'ls' output
	ceph-daemon: tolerate systemctl is-* exit codes
	mgr/ssh: modernize timeout config option

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

7fc78b63425abd192a82f812958349f2bf079dea