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

Backporting for LTS 2.303.1 #5659

Merged
merged 6 commits into from
Aug 12, 2021
Merged

Conversation

bmunozm
Copy link

@bmunozm bmunozm commented Aug 10, 2021

@bmunozm
Copy link
Author

bmunozm commented Aug 10, 2021

Based on closed tickets with lts-candidate label I created this PR for tomorrow's release candidate.

@basil I cannot execute the script so the format of the description is not the expected one. I cannot include into-lts label and I can't include reviewers.. cc/ @daniel-beck @amuniz @Vlatombe @MarkEWaite @oleg-nenashev @timja @raul-arabaolaza @batmat

@timja timja added the into-lts This PR is filed against an LTS branch label Aug 10, 2021
@oleg-nenashev
Copy link
Member

Will try to review tomorrow. I am back to the Jenkins core maintenance, more or less

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Thanks! Looks good to me pending #5599.

@MarkEWaite MarkEWaite mentioned this pull request Aug 11, 2021
35 tasks
…jenkinsci#5621)

* [JENKINS-66139] Avoid polluting the log if usage stats cannot be sent

* Update core/src/main/java/hudson/model/UsageStatistics.java

Co-authored-by: James Nord <jtnord@users.noreply.github.com>

* Update core/src/main/java/hudson/model/UsageStatistics.java

Co-authored-by: James Nord <jtnord@users.noreply.github.com>

* Update core/src/main/java/hudson/model/UsageStatistics.java

Co-authored-by: James Nord <jtnord@users.noreply.github.com>
(cherry picked from commit 1f1eb71)
@bmunozm
Copy link
Author

bmunozm commented Aug 11, 2021

@timja @basil @jtnord I included JENKINS-66094 - PR 5621

@bmunozm
Copy link
Author

bmunozm commented Aug 12, 2021

@timja can we merge this PR? I saw the release candidate is not including this changes

@timja timja changed the title Backporting for LTS 2.302.1 Backporting for LTS 2.303.1 Aug 12, 2021
@timja timja changed the base branch from stable-2.302 to stable-2.303 August 12, 2021 11:03
Copy link
Member

@daniel-beck daniel-beck left a comment

Choose a reason for hiding this comment

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

Backports look correctly applied.

History looks a bit messy but seems with the support from Tim, so it should be fine.

@timja
Copy link
Member

timja commented Aug 12, 2021

@timja can we merge this PR? I saw the release candidate is not including this changes

it should be, it's an incremental build passed off of this. We can merge it anyway

@timja timja merged commit 66d9c71 into jenkinsci:stable-2.303 Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
into-lts This PR is filed against an LTS branch
Projects
None yet