Merge pull request #6354 from jslatts/issue_4948_output_state

Issue #4948 - add state_output argument to allow override of value configured in master

salt/utils/parsers.py

@@ -952,6 +952,14 @@ 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',
+            default='full',
+            dest='state_output',
+            type=str,
+            help=('Override the configured state_output value for minion output'
+                  '. Default: full')
+        )
         self.add_option(
             '--subset',
             default=0,