]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18362 from kmroz/wip-21543-luminous
authorSage Weil <sage@newdream.net>
Sat, 21 Oct 2017 04:10:06 +0000 (23:10 -0500)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 04:10:06 +0000 (23:10 -0500)
luminous: qa/tasks: prolong revive_osd() timeout to 6 min

1  2 
qa/tasks/ceph_manager.py

Simple merge