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

Fix FLO_DIR path in 2015.8 #30376

merged 1 commit into from Jan 15, 2016


None yet
2 participants

pritambaral commented Jan 15, 2016

In release 2015.8.3, in salt.config, FLO_DIR should be like it is at 92e0e90:salt/

But somehow, this commit from develop seems to have been backported (read: cherry-picked). This commit was supposed to apply after salt/ was made its own package, but the backported commit applies before that event, thus breaking FLO_DIR.

TL;DR: Note the branches, tags, and the file paths at these two commits:

Status Commit
Good ✔ d6192cd
Bad ✖ 2afbe68

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

@cachedout cachedout merged commit 9fe2df8 into saltstack:2015.8 Jan 15, 2016

2 of 5 checks passed

default Merged build finished.
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11347 — FAILURE
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8835 — FAILURE
jenkins/salt-pr-clone Salt PR - Clone Repository #12757 — SUCCESS
jenkins/salt-pr-lint-n Salt PR - Code Lint #12453 — SUCCESS

This comment has been minimized.

Show comment
Hide comment

cachedout Jan 15, 2016


Thanks, @pritambaral


cachedout commented Jan 15, 2016

Thanks, @pritambaral

@pritambaral pritambaral deleted the pritambaral:fix/flo-dir branch Jan 15, 2016

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