]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Fri, 19 Jul 2013 16:17:48 +0000 (09:17 -0700)
committerSage Weil <sage@inktank.com>
Fri, 19 Jul 2013 16:17:48 +0000 (09:17 -0700)
1  2 
src/ceph.in
src/pybind/ceph_argparse.py

diff --cc src/ceph.in
Simple merge
index e99f72d7f0c2119954df59bb28bbc20db13b34a7,72b36dd50a53654a8c338538c6a210cec7c17f5c..73d1115f6456efaaa5821c4f9ab7ab0a29afdfd1
@@@ -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