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

Salt cloud map alt update #51749

Merged
merged 2 commits into from
Mar 28, 2019

Conversation

alan-cugler
Copy link
Contributor

What does this PR do?

links the map file page to the salt cloud file page, and clarifies briefly that options listed in the salt-cloud page can also be put in the cloud map files.

What issues does this PR fix or reference?

Fixes #51127

Commits signed with GPG?

Yes

@alan-cugler alan-cugler requested a review from a team as a code owner February 21, 2019 19:55
@alan-cugler alan-cugler changed the base branch from develop to 2017.7 February 21, 2019 19:56
@waynew
Copy link
Contributor

waynew commented Feb 21, 2019

Hey, thanks for the PR! I'm not positive, but I think these build failures might be something on our Jenkins server. We've got someone looking into it!

@alan-cugler
Copy link
Contributor Author

Sounds good, if I am doing something wrong please clarify! It's taken me three weeks to figure out all the requirements for doing salt doc changes. So I wouldn't be surprised if I am still doing it wrong.

@waynew
Copy link
Contributor

waynew commented Feb 21, 2019

No worries - I know that if you're not familiar with the tools it can be a bit daunting :)

There's nothing that sticks out to me as obviously wrong from your PR, and nothing about your PR that Jenkins is obviously complaining about, which is why I'm guessing that there's something going odd with our Jenkins. But I want to make sure that I'm not missing something before we approve this!

@alan-cugler
Copy link
Contributor Author

has anything come up to explain the check failures?

@Ch3LL
Copy link
Contributor

Ch3LL commented Mar 7, 2019

@alan-cugler are you okay migrating this PR to the 2018.3 branch since that branch is now the previous docs branch?

@alan-cugler alan-cugler changed the base branch from 2017.7 to 2018.3 March 18, 2019 19:30
@alan-cugler
Copy link
Contributor Author

@Ch3LL I switched it over, let me know if I did it wrong.

@alan-cugler
Copy link
Contributor Author

This should be able to PR in now.

doc/topics/cloud/config.rst Outdated Show resolved Hide resolved
@alan-cugler alan-cugler force-pushed the salt-cloud-map-alt-update branch from 9382c65 to 9ca0f72 Compare March 27, 2019 18:20
@alan-cugler
Copy link
Contributor Author

@Ch3LL I made the change, after jenkins testing it should be good for merge.
Let me know if there is anything else.

@Ch3LL Ch3LL merged commit bda3ca2 into saltstack:2018.3 Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants