valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18753 from basepi/state-output-salt-call

Browse Source 
[2014.7] Move state_output CLI option to Output mixin
This commit is contained in:
Thomas S Hatch 2014-12-04 16:50:22 -07:00
commit 2415142616
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/parsers.py
View File

@ -1001,6 +1001,12 @@ class OutputOptionsMixIn(object):
action='store_true',
help='Force colored output'
)
group.add_option(
'--state-output', '--state_output',
default='full',
help=('Override the configured state_output value for minion output'
'. Default: full')
)
for option in self.output_options_group.option_list:
def process(opt):
@ -1420,12 +1426,6 @@ class SaltCMDOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
action='store_true',
help=('Run the salt command but don\'t wait for a reply')
)
self.add_option(
'--state-output', '--state_output',
default='full',
help=('Override the configured state_output value for minion output'
'. Default: full')
)
self.add_option(
'--subset',
default=0,