| author | akozak | 2011-11-25 02:18:40 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:32 (EST) |
| commit | cadb4222400589dc418b9a92d1ee724a36903ce5 (patch) (side-by-side diff) | |
| tree | e306a7f360c0e668e04dbcdac50430eb3e1ed17d | |
| parent | 1bd14830a3262f92002654e0d05cd95d0501eeec (diff) | |
| download | org.eclipse.hudson.core-cadb4222400589dc418b9a92d1ee724a36903ce5.zip org.eclipse.hudson.core-cadb4222400589dc418b9a92d1ee724a36903ce5.tar.gz org.eclipse.hudson.core-cadb4222400589dc418b9a92d1ee724a36903ce5.tar.bz2 | |
Resolve HUDSON-7046 (Block Build when downstream project is building - No UI for matrix build): add UI for matrix build
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/AbstractProject.java | 3 | ||||
| -rw-r--r-- | hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java index e5165c6..07ff4be 100644 --- a/hudson-core/src/main/java/hudson/model/AbstractProject.java +++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java @@ -1349,7 +1349,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A AbstractProject<?,?> bup = getBuildingDownstream(); if (bup!=null) return new BecauseOfDownstreamBuildInProgress(bup); - } else if (blockBuildWhenUpstreamBuilding()) { + } + if (blockBuildWhenUpstreamBuilding()) { AbstractProject<?,?> bup = getBuildingUpstream(); if (bup!=null) return new BecauseOfUpstreamBuildInProgress(bup); diff --git a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly index e4ad6c6..30b102c 100644 --- a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly +++ b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly @@ -29,6 +29,7 @@ <p:config-quietPeriod /> <p:config-retryCount /> <p:config-blockWhenUpstreamBuilding /> + <p:config-blockWhenDownstreamBuilding /> <p:config-customWorkspace /> </f:advanced> </f:section> |