]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #627 from dachary/wip-13449-admin-socket-hammer
authorKefu Chai <tchaikov@gmail.com>
Wed, 21 Oct 2015 02:14:16 +0000 (10:14 +0800)
committerKefu Chai <tchaikov@gmail.com>
Wed, 21 Oct 2015 02:14:16 +0000 (10:14 +0800)
tasks/admin_socket.py: wait 120 seconds instead of 60

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge