Merge branch 'security-stable-2.60' into security-stable-2.73

This commit is contained in:
Jesse Glick committed 2017-12-13 13:02:43 -05:00
commit 8f816cbf03
1 file changed
+2 -2
@@ -3120,7 +3120,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
});
}
g.requires(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
g.requires(JOB_LOADED).attains(COMPLETED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
public void run(Reactor reactor) throws Exception {
// anything we didn't load from disk, throw them away.
// doing this after loading from disk allows newly loaded items
@@ -3135,7 +3135,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
});
g.requires(JOB_LOADED).add("Finalizing set up",new Executable() {
g.requires(JOB_LOADED).attains(COMPLETED).add("Finalizing set up",new Executable() {
public void run(Reactor session) throws Exception {
rebuildDependencyGraph();