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

…idated merge holdups (mostly randomly failing tests, sigh). (cherry picked from commit 2a2a7eb) Conflicts: changelog.html
jenkinsci · Jan 9, 2014 · 412befc · 412befc · jglick · Jan 10, 2014
1 parent fb0c7db
commit 412befc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
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);
     }