-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
[JENKINS-72112] Allow merge strategy inheritance in PodTemplates #1513
Merged
Vlatombe
merged 5 commits into
jenkinsci:master
from
georgblumenschein:improvement/JENKINS-72112
Mar 15, 2024
Merged
[JENKINS-72112] Allow merge strategy inheritance in PodTemplates #1513
Vlatombe
merged 5 commits into
jenkinsci:master
from
georgblumenschein:improvement/JENKINS-72112
Mar 15, 2024
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
georgblumenschein
force-pushed
the
improvement/JENKINS-72112
branch
from
February 26, 2024 13:37
bdd4389
to
61b96c3
Compare
georgblumenschein
force-pushed
the
improvement/JENKINS-72112
branch
from
February 26, 2024 16:13
6820a41
to
d9692e9
Compare
Two notes: |
Vlatombe
added
feature
New features
enhancement
Improvements
and removed
feature
New features
labels
Mar 7, 2024
Vlatombe
reviewed
Mar 12, 2024
...urces/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/help-inheritYamlMergeStrategy.html
Outdated
Show resolved
Hide resolved
Vlatombe
reviewed
Mar 12, 2024
src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/config.jelly
Outdated
Show resolved
Hide resolved
Vlatombe
reviewed
Mar 12, 2024
src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/config.jelly
Outdated
Show resolved
Hide resolved
…Template/help-inheritYamlMergeStrategy.html Co-authored-by: Vincent Latombe <vincent@latombe.net>
…Template/config.jelly Co-authored-by: Vincent Latombe <vincent@latombe.net>
…Template/config.jelly Co-authored-by: Vincent Latombe <vincent@latombe.net>
Vlatombe
approved these changes
Mar 15, 2024
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.
Ticket: https://issues.jenkins.io/browse/JENKINS-72112
Note
This Pull Request is taken from #1448 and the changes done there!
I was not quite sure what the workflow in such cases is, I could also open a PR on the fork so that the first forker can update the PR here, I just assumed it is simpler this way.
Testing done
Testing done in #1448, I am fixing (at least I try ;-) ) the automated tests that prevent it from merging.
Submitter checklist