[JENKINS-20951] [JENKINS-18410] Did not make it into 1.544 due to val…

…idated merge holdups (mostly randomly failing tests, sigh).
jenkinsci · Dec 11, 2013 · 2a2a7eb · 2a2a7eb
1 parent 3a0c087
commit 2a2a7eb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,7 +55,12 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class=bug>
+      <code>CannotResolveClassException</code> breaks loading of entire containing folder, not just one job.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20951">issue 20951</a>)
+  <li class=bug>
+    Avoiding serializing the owning build as part of a test result action, as this can lead to errors later.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18410">issue 18410</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
@@ -69,9 +74,6 @@ <h3><a name=v1.544>What's new in 1.544</a> <!--=DATE=--></h3>
   <li class=bug>
     Hudson shows 0GB free space when space available drops below 1GB.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7776">issue 7776</a>)
-  <li class=bug>
-    Avoiding serializing the owning build as part of a test result action, as this can lead to errors later.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18410">issue 18410</a>)
   <li class=rfe>
     Added filter field for installed plugins tab.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20219">issue 20219</a>)
@@ -84,9 +86,6 @@ <h3><a name=v1.544>What's new in 1.544</a> <!--=DATE=--></h3>
   <li class=bug>
     Error page should be visible even if the anonymous user does not have overall/read access.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20866">issue 20866</a>)
-  <li class=bug>
-      <code>CannotResolveClassException</code> breaks loading of entire containing folder, not just one job.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20951">issue 20951</a>)
   <li class=bug>
     JavaScript errors when navigating away from a page with a build timeline widget while the timeline is loading.
     (<a href="https://github.com/jenkinsci/jenkins/pull/1041">pull request 1041</a>)

diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java
@@ -68,7 +68,7 @@ public TestResultAction(AbstractBuild owner, TestResult result, BuildListener li
         setResult(result, listener);
     }
 
-    /** @since 1.544 */
+    /** @since 1.545 */
     public TestResultAction(TestResult result, BuildListener listener) {
         this(null, result, listener);
     }

diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
@@ -67,7 +67,7 @@ public abstract class AbstractTestResultAction<T extends AbstractTestResultActio
 
     private Map<String,String> descriptions = new ConcurrentHashMap<String, String>();
 
-    /** @since 1.544 */
+    /** @since 1.545 */
     protected AbstractTestResultAction() {}
 
     /** @deprecated Use the default constructor and just call {@link Run#addAction} to associate the build with the action. */

diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java
@@ -72,7 +72,7 @@ public AggregatedTestResultAction(AbstractBuild owner) {
         super(owner);
     }
 
-    /** @since 1.544 */
+    /** @since 1.545 */
     public AggregatedTestResultAction() {}
 
     protected void update(List<? extends AbstractTestResultAction> children) {

diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java
@@ -44,7 +44,7 @@ public MatrixTestResult(MatrixBuild owner) {
         super(owner);
     }
 
-    /** @since 1.544 */
+    /** @since 1.545 */
     public MatrixTestResult() {}
 
     /**

diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java
@@ -40,7 +40,7 @@ protected TrivialTestResultAction(AbstractBuild owner, TrivialTestResult result)
         this.result.setParentAction(this);
     }
 
-    /** @since 1.544 */
+    /** @since 1.545 */
     protected TrivialTestResultAction(TrivialTestResult result) {
         this(null, result);
     }