Cherry-picks for 6.0.1 #371
Merged
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
(cherry picked from commit 494b4f2)
(cherry picked from commit cafdf9b)
…proxy (theforeman#359) The playbook does some local lookups so running it from another proxy would fail. It relies on proxy selector override on feature Adds new feature, to support the template connection to this feature. (cherry picked from commit 2d720cb)
The variables no longer have a model name as a root in json. (cherry picked from commit b53842a)
|
@adamruzicka, @ezr-ondrej can you merge please? |
|
Thanks @xprazak2 ! |
ezr-ondrej
approved these changes
Dec 2, 2020
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.
No description provided.