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

Include war location fix and remove limits.conf reference #304

Conversation

MarkEWaite
Copy link
Contributor

@MarkEWaite MarkEWaite commented Apr 1, 2022

Include JENKINS-68149 war location fix in 2.332.2

Also includes #300 - Remove references to limits.conf.

Also includes #298 - Preview support for Java 17

Merges portion of the master branch to simplify future merges.

Checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes

@MarkEWaite MarkEWaite requested a review from basil April 1, 2022 18:25
@MarkEWaite MarkEWaite changed the title Include JENKINS-68149 war loaction and remove limits.conf reference Include JENKINS-68149 war location and remove limits.conf reference Apr 1, 2022
@MarkEWaite MarkEWaite changed the title Include JENKINS-68149 war location and remove limits.conf reference Include war location fix and remove limits.conf reference Apr 1, 2022
@MarkEWaite MarkEWaite changed the base branch from master to stable-2.332 April 1, 2022 18:34
@MarkEWaite MarkEWaite requested a review from a team as a code owner April 1, 2022 18:34
@MarkEWaite
Copy link
Contributor Author

@timja are you OK with merging this change for 2.332.2?

@imonteroperez does this look OK to you?

@timja
Copy link
Member

timja commented Apr 2, 2022

Yes it’s fine

@timja timja merged commit d83519d into jenkinsci:stable-2.332 Apr 2, 2022
@MarkEWaite MarkEWaite deleted the stable-2.332-fix-war-location-migration branch April 4, 2022 02:18
Copy link

@imonteroperez imonteroperez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@imonteroperez imonteroperez mentioned this pull request Apr 4, 2022
36 tasks
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.

None yet

5 participants