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.

Sign up for GitHub

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

Jump to bottom

Update at-since up to and including 2.226 #4587

Merged
merged 2 commits into from
Mar 17, 2020
Merged

Update at-since up to and including 2.226 #4587

merged 2 commits into from
Mar 17, 2020

Conversation

daniel-beck
Copy link
Member

@daniel-beck daniel-beck commented Mar 16, 2020 •
edited by MarkEWaite
Loading

Also update the script to deal with untagged-* tags.

Proposed changelog entries

None, internal

Submitter checklist

  • JIRA issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are correct
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a JIRA issue should exist and be labeled as lts-candidate

MarkEWaite
MarkEWaite approved these changes Mar 16, 2020
View reviewed changes
daniel-beck
daniel-beck commented Mar 16, 2020
View reviewed changes
core/src/main/java/hudson/EnvVars.java
@@ -391,7 +391,7 @@ public void putIfNotNull(String key, String value) {

/**
* Add entire map but filter null values out.
* @since TODO
* @since 2.214
Copy link
Member Author

Choose a reason for hiding this comment

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

#4194 (still a pointless change without merit).

core/src/main/java/hudson/Functions.java
@@ -526,7 +526,7 @@ public static String getSystemProperty(String key) {
/**
* Returns true if and only if the UI refresh is enabled.
*
* @since TODO
* @since 2.222
Copy link
Member Author

Choose a reason for hiding this comment

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

#4463

core/src/main/java/hudson/Functions.java
@@ -1099,7 +1099,7 @@ public static String getFooterURL() {
*
* @param predicate
* Filter the descriptors based on this predicate
* @since TODO
* @since 2.222
Copy link
Member Author

Choose a reason for hiding this comment

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

#4506

core/src/main/java/hudson/Functions.java
@@ -1148,7 +1148,7 @@ public static String getFooterURL() {
/**
* Descriptors shown in the global configuration form to users with {@link Jenkins#SYSTEM_READ} permission.
*
* @since TODO
* @since 2.222
Copy link
Member Author

Choose a reason for hiding this comment

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

#4506

core/src/main/java/hudson/Functions.java
@@ -1162,7 +1162,7 @@ public static String getFooterURL() {
* @throws AccessDeniedException
* if the user doesn't have the permission.
*
* @since TODO
* @since 2.222
Copy link
Member Author

Choose a reason for hiding this comment

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

#4506

core/src/main/java/jenkins/model/Jenkins.java
@@ -5310,7 +5310,7 @@ public boolean shouldShowStackTrace() {
* <p>This permission is disabled by default and support for it considered experimental.
* Administrators can set the system property {@code jenkins.security.ManagePermission} to enable it.</p>
*
* @since TODO
* @since 2.222
Copy link
Member Author

Choose a reason for hiding this comment

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

#4501

core/src/main/java/jenkins/model/Jenkins.java
@@ -1794,7 +1794,7 @@ public String getFullDisplayName() {
* Gets just the immediate children of {@link Jenkins} based on supplied predicate.
*
* @see #getAllItems(Class)
* @since TODO
* @since 2.221
Copy link
Member Author

Choose a reason for hiding this comment

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

#4469

core/src/main/java/jenkins/telemetry/Telemetry.java
@@ -145,7 +145,7 @@ public static boolean isDisabled() {
* Returns true iff we're in the time period during which this is supposed to collect data.
* @return true iff we're in the time period during which this is supposed to collect data
*
* @since TODO
* @since 2.202
Copy link
Member Author

Choose a reason for hiding this comment

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

#3894

core/src/main/java/jenkins/websocket/WebSocketSession.java
@@ -39,7 +39,7 @@
/**
* One WebSocket connection.
* @see WebSockets
* @since TODO
* @since 2.216
Copy link
Member Author

Choose a reason for hiding this comment

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

#4369

core/src/main/java/jenkins/websocket/WebSockets.java
@@ -41,7 +41,7 @@

/**
* Support for serving WebSocket responses.
* @since TODO
* @since 2.216
Copy link
Member Author

Choose a reason for hiding this comment

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

#4369

@MarkEWaite MarkEWaite added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 17, 2020
@MarkEWaite
Copy link
Contributor

If no objections, I will merge tomorrow.

@MarkEWaite MarkEWaite merged commit cc3d24c into jenkinsci:master Mar 17, 2020
@daniel-beck daniel-beck mentioned this pull request May 3, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkEWaite MarkEWaite MarkEWaite approved these changes

@timja timja timja approved these changes

@res0nance res0nance res0nance approved these changes

Assignees
No one assigned
Labels
internal ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@daniel-beck @MarkEWaite @timja @res0nance