]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23e39ed 8bbb13f)
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)
* 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>

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