From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Nov 2019 22:18:44 +0000 (-0600)
Subject: Merge PR #31828 into master
X-Git-Tag: v15.1.0~741
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e9f6c2205edd5c648cbb452c8c710c1caf08099;p=ceph.git

Merge PR #31828 into master

* refs/pull/31828/head:
	mgr/orchestrator: include container_image in 'service ls' output
	ceph-daemon: include container_image_name and container_image_id in 'ls' output
	common/options: default to ceph/ceph:latest-master-devel (for now)

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

4e9f6c2205edd5c648cbb452c8c710c1caf08099