Merge branch 'rc'

This commit is contained in:
Jesse Glick committed 2013-04-08 11:12:04 -04:00
commit 7251965dfd
2 files changed
+2 -5

No files matched your search

-3
View File
@@ -72,9 +72,6 @@ Upcoming changes</a>
<li class=rfe>
Better display of parameters in queue items.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17454">issue 17454</a>)
<li class='bug'>
"projects tied to slave" shows unrelated maven module jobs
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17451">issue 17451</a>)
<li class='bug'>
sort order of plugin list is not working by default.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17039">issue 17039</a>)
+2 -2
View File
@@ -335,13 +335,13 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
@Exported
public List<AbstractProject> getTiedJobs() {
List<AbstractProject> r = new ArrayList<AbstractProject>();
for (AbstractProject<?,?> p : Jenkins.getInstance().getItems(AbstractProject.class)) {
for (AbstractProject<?,?> p : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
if(this.equals(p.getAssignedLabel()))
r.add(p);
}
return r;
}
public boolean contains(Node node) {
return getNodes().contains(node);
}