Branch: refs/heads/stable
Home: https://github.com/jenkinsci/jenkins
Commit: 44ee0bb39a134fd12745ccb5e922af93266ad4e2
https://github.com/jenkinsci/jenkins/commit/44ee0bb39a134fd12745ccb5e922af93266ad4e2
Author: Ryan Campbell <[email protected]>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M core/src/main/groovy/hudson/util/LoadMonitor.groovy
M core/src/main/java/hudson/model/AperiodicWork.java
M core/src/main/java/hudson/model/ComputerSet.java
M core/src/main/java/hudson/model/PeriodicWork.java
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
M core/src/main/java/hudson/triggers/Trigger.java
M core/src/main/java/hudson/util/DoubleLaunchChecker.java
M core/src/main/java/jenkins/model/Jenkins.java
A core/src/main/java/jenkins/util/Timer.java
A core/src/test/java/jenkins/util/TimerTest.java
Log Message:
-----------
[FIXES JENKINS-19622] Replace hudson.model.Trigger#timer with
jenkins.util.Timer, which exposes a ScheduledExecutorService. Up to 10
additional threads will be created to run pending tasks even if running tasks
are blocked.
Also, move static initialization of timers to the classes which require them.
(cherry picked from commit 565ced0dba75c3f198c5cf9b9df247941df6ad46)
Conflicts:
core/src/main/java/hudson/model/Queue.java
Commit: 56a424073c886d86cd700168bbd30740a5d1713f
https://github.com/jenkinsci/jenkins/commit/56a424073c886d86cd700168bbd30740a5d1713f
Author: Jesse Glick <[email protected]>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M core/src/main/java/jenkins/util/Timer.java
Log Message:
-----------
[JENKINS-19622] Merged #989: allow background tasks to run simultaneously,
preventing task blockage.
(cherry picked from commit 53317a8045ec797e0fd718ec1599be95c18a2ba5)
Conflicts:
changelog.html
Commit: 0485bfd44169bd00562327860b2848f8657c7944
https://github.com/jenkinsci/jenkins/commit/0485bfd44169bd00562327860b2848f8657c7944
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Log Message:
-----------
[FIXED JENKINS-14336]
Integrating the stapler fix.
(cherry picked from commit 02e00449e412fa3d18d9c4a04a670eaad899ec91)
Conflicts:
changelog.html
core/pom.xml
Commit: 5cf3e28c4885a86a4dad3463952e1aae34932f9c
https://github.com/jenkinsci/jenkins/commit/5cf3e28c4885a86a4dad3463952e1aae34932f9c
Author: Oliver Gondža <[email protected]>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Log Message:
-----------
[FIXED JENKINS-20093 JENKINS-19453 JENKINS-19004 JENKINS-8856] Noting
retroactively
Backported as 23424ea7dbced486963a73d6bf56e8367ab779dd
Compare:
https://github.com/jenkinsci/jenkins/compare/7d602d52b445...5cf3e28c4885
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
