Regression fix: minion ID generator should use FQDN first, if available #34876
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks @isbm! |
|
Ah! Sorry - I forgot to not squash your commits, as that is the default. My apologies. I'll be more careful next time. |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jul 22, 2016
* upstream/develop: Regression fix: minion ID generator should use FQDN first, if available (saltstack#34876) Add VirtuozzoLinux is yumpkg enable list. (saltstack#34878) modules.proxy: __virtual__ return err msg (saltstack#34879)
thatch45
added
the
bugfix-bckport
|
@rallytime lets get this backported to 2015.8 since that is the branch this regression was introduced on |
rallytime
removed
the
bugfix-bckport
|
Ahh, perfect! Thanks! |
|
@thatch45 Nope, this went only to the development on upstream. This was only in 2015.8 on our side. |
|
Yep, sorry my memory of the event was not clear :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Let Minion ID uses first FQDN, if available.
Tests written?
Yes
Addresses regression, reported: #33715 (comment)