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

Patch for issue #30117 #30121

Merged
merged 5 commits into from Jan 6, 2016

Conversation

Projects
None yet
4 participants
@MadsRC
Contributor

MadsRC commented Jan 1, 2016

Fixed the service beacon as it had a few issues.

The commit messages are pretty self explanatory.

The code is tested on 2015.8.3 - CentOS 7

MadsRC added some commits Jan 1, 2016

Fixed issue number #30117 - When no parameters are given to a service…
…, the service object is of type None and thus isn't iterable. This is contrary to the documentation which states that there are default values. Default values added as False
On an unclean shutdown, if oncleanshutdown is given a path, an keyy:v…
…alue of shutdown:unclean is added to the returned data. The documentation states that the key should be 'uncleanshutdown' and that the value should either be True or False. This is fixed in the code
Added note about systemd and uncleanshutdown. Also fixed line lenght …
…of comments to max 80 characters as per PEP0008
Show outdated Hide outdated salt/beacons/service.py Outdated
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 4, 2016

Contributor

Hi @MadsRC

This logic looks good. There is a minor style issue to clean up and then we will get this merged. Thanks very much!

Contributor

cachedout commented Jan 4, 2016

Hi @MadsRC

This logic looks good. There is a minor style issue to clean up and then we will get this merged. Thanks very much!

Show outdated Hide outdated salt/beacons/service.py Outdated

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

@basepi basepi merged commit 7ed5788 into saltstack:develop 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 #3931 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11088 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12501 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12200 — SUCCESS
Details

@basepi basepi removed the Pending Changes label Jan 6, 2016

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 6, 2016

Collaborator

Thanks @MadsRC !

Collaborator

basepi commented Jan 6, 2016

Thanks @MadsRC !

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 11, 2016

Collaborator

Backport to 2015.8

Collaborator

basepi commented Jan 11, 2016

Backport to 2015.8

cachedout added a commit that referenced this pull request Jan 12, 2016

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