From: Sage Weil <sage@inktank.com>
Date: Tue, 22 Oct 2013 19:22:32 +0000 (-0700)
Subject: ceph: default 5 second timeout for -h
X-Git-Tag: v0.72-rc1~23^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b33c3158d4fdd1829bebe1b8ccb99377b753e5a8;p=ceph.git

ceph: default 5 second timeout for -h

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index ec20198b697f..9e5110dc2297 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -589,6 +589,10 @@ def main():
     if parsed_args.help:
         do_basic_help(parser, childargs)
 
+        # short default timeout for -h
+        if not timeout:
+            timeout = 5
+
         hdr('Monitor commands:')
         print '[Contacting monitor, timeout after %d seconds]' % timeout