]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccd1bc2 c0828ca)
Merge pull request #621 from dachary/wip-13449-admin-socket
authorKefu Chai <tchaikov@gmail.com>
Tue, 13 Oct 2015 09:04:55 +0000 (17:04 +0800)
committerKefu Chai <tchaikov@gmail.com>
Tue, 13 Oct 2015 09:04:55 +0000 (17:04 +0800)
tasks/admin_socket.py: wait 120 seconds instead of 60

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

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