Skip to content
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

Bugfix: Exit on configuration read (backport) #34606

Merged
merged 9 commits into from
Jul 22, 2016

Conversation

isbm
Copy link
Contributor

@isbm isbm commented Jul 12, 2016

Backport of #34604

@isbm isbm changed the title Bugfix: Exit on configuration read Bugfix: Exit on configuration read (backport) Jul 12, 2016
@rallytime
Copy link
Contributor

@isbm Thanks for updating the backport PRs with your new commits from the original in develop. It looks like there is still a related unit test failure here, however.

https://jenkins.saltstack.com/job/PR/job/salt-pr-rs-cent7-n/3439/testReport/junit/unit.config_test/ConfigTestCase/test_issue_6714_parsing_errors_logged/

Can you take another look?

@rallytime rallytime added the pending-changes The pull request needs additional changes before it can be merged label Jul 13, 2016
@isbm
Copy link
Contributor Author

isbm commented Jul 19, 2016

@cachedout is this one you forgot or?

@isbm isbm force-pushed the isbm-config-reading-exit-2015.8 branch from 3c23288 to 5f5b802 Compare July 20, 2016 14:32
@isbm
Copy link
Contributor Author

isbm commented Jul 21, 2016

@cachedout 🙏

@thatch45 thatch45 merged commit 5c13ee0 into saltstack:2015.8 Jul 22, 2016
@thatch45
Copy link
Contributor

Thanks for getting this test fixed up!

@isbm isbm deleted the isbm-config-reading-exit-2015.8 branch August 31, 2016 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pending-changes The pull request needs additional changes before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants