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.

Sign up for GitHub

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

Jump to bottom

Use correct deploy directory #31172

Merged
merged 1 commit into from Feb 12, 2016
Merged

Use correct deploy directory #31172

merged 1 commit into from Feb 12, 2016

Conversation

techhat
Copy link
Contributor

@techhat techhat commented Feb 12, 2016

This was likely introduced when config.py became config/__init__.py.

@s0undt3ch
Copy link
Member

👍

@techhat
Copy link
Contributor Author

techhat commented Feb 12, 2016

This fixes an issue where salt-cloud would refuse to run a deploy script until salt-cloud -u was run.

@rallytime
Copy link
Contributor

Fixes #26699

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Feb 12, 2016
@rallytime
Copy link
Contributor

This needs to go into 2015.8, too. I'll backport this once tests pass or it is merged.

@rallytime rallytime mentioned this pull request Feb 12, 2016
Closed
@meggiebot
Copy link

Approved once tests pass

basepi added a commit that referenced this pull request Feb 12, 2016
@basepi
Merge pull request #31172 from techhat/bootsdir
2b93f53 
Use correct deploy directory
@basepi basepi merged commit 2b93f53 into saltstack:2016.3 Feb 12, 2016
@rallytime rallytime mentioned this pull request Feb 12, 2016
Merged
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Feb 12, 2016
@techhat techhat deleted the bootsdir branch February 12, 2016 21:56
rallytime pushed a commit that referenced this pull request Feb 13, 2016
Merge pull request #31182 from rallytime/bp-31172
415654e 
Back-port #31172 to 2015.8
This was referenced Mar 23, 2016
Merged
Closed
rallytime pushed a commit to rallytime/salt that referenced this pull request Mar 31, 2016
Reimplement saltstack#31172, which got crunched in a merge-forward.
3dcf43c 
This fixes saltstack#32183 for the 2016.3 branch.

Also refs saltstack#32105
@rallytime rallytime mentioned this pull request Mar 31, 2016
Merged
cachedout pushed a commit that referenced this pull request Apr 4, 2016
Merge pull request #32287 from rallytime/reimplement-31172
95bcdaa 
Reimplement #31172, which got removed in a merge-forward.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ZRELEASED - Boron ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@techhat @s0undt3ch @rallytime @meggiebot @basepi