Skip to content
Permalink
Browse files
[JENKINS-26739] Backporting #1592 to rc.
(cherry picked from commit cf2b02d)

Conflicts:
	changelog.html
  • Loading branch information
jglick committed Mar 3, 2015
1 parent ef4d155 commit 6ee6fc3b2f7a9bceca1b04c4af5e6f1b024e2ab4
Showing with 6 additions and 1 deletion.
  1. +3 −0 changelog.html
  2. +3 −1 core/src/main/java/hudson/model/RunMap.java
@@ -66,6 +66,9 @@ <h3><a name=v1.601>What's new in 1.601</a> <!--=DATE=--></h3>
<li class="major bug">
Regression with environment variables in 1.600.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-27188">issue 27188</a>)
<li class="major bug">
Errors with concurrent matrix builds since 1.597.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-26739">issue 26739</a>)
<li class=bug>
Errors in Dashboard View plugin since 1.597.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-26690">issue 26690</a>)
@@ -186,7 +186,9 @@ public R put(R r) {
if (rootDir.isDirectory()) {
throw new IllegalStateException(rootDir + " already existed; will not overwite with " + r);
}
proposeNewNumber(r.getNumber());
if (!r.getClass().getName().equals("hudson.matrix.MatrixRun")) { // JENKINS-26739: grandfathered in
proposeNewNumber(r.getNumber());
}
rootDir.mkdirs();
return super._put(r);
}

0 comments on commit 6ee6fc3

Please sign in to comment.