From: Sage Weil <sage@inktank.com>
Date: Fri, 19 Jul 2013 16:17:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23cde453c13d1854d10bdb3b52c6757fdecf4d28;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

23cde453c13d1854d10bdb3b52c6757fdecf4d28
diff --cc src/pybind/ceph_argparse.py
index e99f72d7f0c2,72b36dd50a53..73d1115f6456
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@@ -878,12 -885,9 +889,9 @@@ def validate_command(parsed_args, sigdi
          if parsed_args.output_format:
              valid_dict['format'] = parsed_args.output_format
  
-         if parsed_args.threshold:
-             valid_dict['threshold'] = parsed_args.threshold
- 
          return valid_dict
  
 -def send_command(cluster, target=('mon', ''), cmd=[], inbuf='', timeout=0, 
 +def send_command(cluster, target=('mon', ''), cmd=None, inbuf='', timeout=0, 
                   verbose=False):
      """
      Send a command to a daemon using librados's