New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #26962 to 2015.8 branch #30179

Merged
merged 2 commits into from Jan 6, 2016

Conversation

Projects
None yet
4 participants
@terminalmage
Member

terminalmage commented Jan 6, 2016

It looks like the person that opened this pull request initially intended for
it to be included in a 2015.8 point release, but mistakenly opened the pull
request against develop.

This PR backports this fix to the 2015.8 branch so that it will appear in
2015.8.4.

ctrlrsf added some commits Sep 8, 2015

Add --state-verbose command line option to salt cmd
This overrides the state_verbose setting that may be set in master config.

If master has state_verbose set to True

--state-verbose=False would suppress states that didn't change.

If master config has state_verbose set to False

--state-verbose=True would still show states that didn't have changes.

Below is test output with state_verbose=True in ./etc/salt/master:

```
$ salt -c ./etc/salt '*' --state-verbose=True  state.highstate
salt-dev:
----------
          ID: test_file.txt
    Function: file.managed
        Name: /tmp/test_file.txt
      Result: True
     Comment: File /tmp/test_file.txt exists with proper permissions. No changes made.
     Started: 13:51:15.798599
    Duration: 7.176 ms
     Changes:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   7.176 ms

$ salt -c ./etc/salt '*' --state-verbose=False  state.highstate
salt-dev:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   8.589 ms
```
@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Jan 6, 2016

Contributor

Backports #26962.

Contributor

jfindlay commented Jan 6, 2016

Backports #26962.

basepi added a commit that referenced this pull request Jan 6, 2016

@basepi basepi merged commit 6516d5b into saltstack:2015.8 Jan 6, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #4003 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11107 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12520 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12219 — SUCCESS
Details
@ctrlrsf

This comment has been minimized.

Show comment
Hide comment
@ctrlrsf

ctrlrsf Jan 7, 2016

Contributor

Thanks @terminalmage! Wasn't aiming for any particular salt release, but glad it'll be in next 2015.8.

Contributor

ctrlrsf commented Jan 7, 2016

Thanks @terminalmage! Wasn't aiming for any particular salt release, but glad it'll be in next 2015.8.

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Jan 7, 2016

Member

@ctrlrsf No problem, thank you very much for doing the initial work on this.

Member

terminalmage commented Jan 7, 2016

@ctrlrsf No problem, thank you very much for doing the initial work on this.

@terminalmage terminalmage deleted the terminalmage:bp-26962 branch Feb 3, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment