]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #32049 from mgfritch/wip-cd-timeout
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 17 Jan 2020 07:32:06 +0000 (08:32 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Jan 2020 07:32:06 +0000 (08:32 +0100)
cephadm: add ability to specify a timeout

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
qa/workunits/cephadm/test_cephadm.sh
src/cephadm/cephadm

Simple merge
Simple merge