git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

author	Sage Weil <sage@redhat.com>
	Tue, 26 Nov 2019 22:18:44 +0000 (16:18 -0600)
committer	Sage Weil <sage@redhat.com>
	Tue, 26 Nov 2019 22:18:44 +0000 (16:18 -0600)
commit	4e9f6c2205edd5c648cbb452c8c710c1caf08099
tree	1bf79fec9cf0e624aa28b2dcf1e0c3cb60de7933	tree \| snapshot
parent	b62e23aaa6dd44e9b134c2d6edd3d5e0f1728e2a	commit \| diff
parent	6bcf50548534231174e1ebd29a03990c0a4c27a6	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/ceph-daemon/ceph-daemon	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/orchestrator.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/orchestrator_cli/module.py	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/ssh/module.py	diff1 \|	diff2 \|	blob \| history