]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #31169 into master
authorSage Weil <sage@redhat.com>
Sat, 26 Oct 2019 15:55:19 +0000 (10:55 -0500)
committerSage Weil <sage@redhat.com>
Sat, 26 Oct 2019 15:55:19 +0000 (10:55 -0500)
commit7fc78b63425abd192a82f812958349f2bf079dea
tree78c54f07d505b288f33438d4ed083867efe6600e
parent23e39ed9e50e71a8a36e620272a1c17a5450b573
parent8bbb13f0eb8fd570ed0d626f49e0d2dc64aaba9c
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>