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

Clean up _uptodate() in git state #30129

Merged
merged 2 commits into from Jan 4, 2016

Conversation

Projects
None yet
2 participants
@optix2000
Contributor

optix2000 commented Jan 4, 2016

Clean up some fixes to follow the flow of the rest of the code.

In every other condition branch, comments is passed as a string to _uptodate() using _format_comments()

optix2000 added some commits Jan 4, 2016

Properly fix concat list issue in git state.
No need to check if it's a list.
Just join it before passing to _uptodate()
No point to recast comments to a string.
_uptodate() should only accept strings for comments.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 4, 2016

Contributor

Go Go Jenkins!

Contributor

cachedout commented Jan 4, 2016

Go Go Jenkins!

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

Merge pull request #30129 from optix2000/2015.8
Clean up _uptodate() in git state

@cachedout cachedout merged commit a6d9435 into saltstack:2015.8 Jan 4, 2016

3 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3861 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12483 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12182 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11068 — SUCCESS
Details
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 4, 2016

Contributor

Thanks, @optix2000

Contributor

cachedout commented Jan 4, 2016

Thanks, @optix2000

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