mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
Merge branch 'master' of github.com:jenkinsci/jenkins
This commit is contained in:
commit
55a4bfaac5
4 files changed
+16
-4
No files matched your search
@@ -75,6 +75,9 @@ Upcoming changes</a>
|
||||
<li class=bug>
|
||||
Do not follow href after sending POST via l:task
|
||||
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-28437">issue 28437</a>)
|
||||
<li class=bug>
|
||||
Build history overflows
|
||||
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-28425">issue 28425</a>)
|
||||
</ul>
|
||||
<h3><a name=v1.613>What's new in 1.613</a> (2015/05/10)</h3>
|
||||
<ul class=image>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
*/
|
||||
package hudson.model;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import hudson.Extension;
|
||||
import hudson.ExtensionPoint;
|
||||
import hudson.model.Queue.Task;
|
||||
@@ -34,6 +35,7 @@ import hudson.util.ConsistentHash.Hash;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Strategy that decides which {@link Task} gets run on which {@link Executor}.
|
||||
@@ -84,8 +86,14 @@ public abstract class LoadBalancer implements ExtensionPoint {
|
||||
return node.getName();
|
||||
}
|
||||
});
|
||||
for (ExecutorChunk ec : ws.works(i).applicableExecutorChunks())
|
||||
hash.add(ec,ec.size()*100);
|
||||
|
||||
// Build a Map to pass in rather than repeatedly calling hash.add() because each call does lots of expensive work
|
||||
List<ExecutorChunk> chunks = ws.works(i).applicableExecutorChunks();
|
||||
Map<ExecutorChunk, Integer> toAdd = Maps.newHashMapWithExpectedSize(chunks.size());
|
||||
for (ExecutorChunk ec : chunks) {
|
||||
toAdd.put(ec, ec.size()*100);
|
||||
}
|
||||
hash.addAll(toAdd);
|
||||
|
||||
hashes.add(hash);
|
||||
}
|
||||
|
||||
@@ -511,7 +511,7 @@ AbstractProject.LabelLink=Slaves em <a href="{0}{1}">label</a>: {2}
|
||||
# Artifacts of {0} {1}
|
||||
Run.ArtifactsBrowserTitle=Artefatos de {0} {1}
|
||||
# Build with Parameters
|
||||
AbstractProject.build_with_parameters=Constru\u00eddo com par\u00e2metros
|
||||
AbstractProject.build_with_parameters=Construir com par\u00e2metros
|
||||
# Still unstable
|
||||
ResultTrend.StillUnstable=Ainda inst\u00e1vel
|
||||
# Running as {0}
|
||||
|
||||
@@ -982,6 +982,7 @@ table.parameters > tbody:hover {
|
||||
.build-row-cell .pane.build-name {
|
||||
width: 25%;
|
||||
font-weight: bold;
|
||||
vertical-align: top;
|
||||
}
|
||||
.build-row-cell .pane.build-details {
|
||||
width: 50%;
|
||||
@@ -1066,7 +1067,7 @@ table.parameters > tbody:hover {
|
||||
|
||||
.build-row-cell .pane.build-name .display-name,
|
||||
.build-row-cell .indent-multiline {
|
||||
margin-left: 20px !important; /* Sync changes with func expandControlsTo50Percent in hudson-behavior.js */
|
||||
padding-left: 20px !important; /* Sync changes with func expandControlsTo50Percent in hudson-behavior.js */
|
||||
}
|
||||
|
||||
.build-row .build-row-cell {
|
||||
|
||||
Reference in new issue
Block a user