Branch: refs/heads/pull-1610
Home: https://github.com/jenkinsci/jenkins
Commit: d72d5d2157965be6bc3de71f7df16bb12b4a4b20
https://github.com/jenkinsci/jenkins/commit/d72d5d2157965be6bc3de71f7df16bb12b4a4b20
Author: Jesse Glick <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M changelog.html
M core/src/main/resources/hudson/model/View/builds_pl.properties
M core/src/main/resources/jenkins/model/Jenkins/login_pl.properties
A test/src/main/java/org/jvnet/hudson/test/BuildWatcher.java
M test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
Log Message:
-----------
Merge branch 'master' into Executable-JENKINS-25938
Commit: ced8d78db46159a0f9b18d727671e1f21f0b0346
https://github.com/jenkinsci/jenkins/commit/ced8d78db46159a0f9b18d727671e1f21f0b0346
Author: Jesse Glick <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/Executor.java
M core/src/main/java/hudson/model/Run.java
M core/src/main/java/hudson/model/queue/Executables.java
M core/src/main/resources/lib/hudson/buildProgressBar.jelly
Log Message:
-----------
As requested by @kohsuke, rename Executables.getExecutor to Executor.of.
Commit: 4949cb1cc613df38681ec92383a4ff729cb63ad1
https://github.com/jenkinsci/jenkins/commit/4949cb1cc613df38681ec92383a4ff729cb63ad1
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/queue/Executables.java
Log Message:
-----------
javadoc reference fix
Commit: 970ec517cb988b9eb26667a495d709fa87eda8d5
https://github.com/jenkinsci/jenkins/commit/970ec517cb988b9eb26667a495d709fa87eda8d5
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/Executor.java
Log Message:
-----------
pulling out setUp1.
This helps the structure more visible that setUp1/finish1 are supposed to pair
up
Commit: 5a749f9392e52f1cabac56a90ad9e2c8ebbe377d
https://github.com/jenkinsci/jenkins/commit/5a749f9392e52f1cabac56a90ad9e2c8ebbe377d
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/jenkins/model/queue/AsynchronousExecution.java
Log Message:
-----------
javadoc formatting fix for better readability from code editor
Commit: 9fc00da0c9e6f77bba55737a6a10eb8dcb5bc001
https://github.com/jenkinsci/jenkins/commit/9fc00da0c9e6f77bba55737a6a10eb8dcb5bc001
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/Executor.java
Log Message:
-----------
javadoc improvement
Commit: a75e93a4407cc44e7ff945e5644fc5723bd12e80
https://github.com/jenkinsci/jenkins/commit/a75e93a4407cc44e7ff945e5644fc5723bd12e80
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/jenkins/model/queue/AsynchronousExecution.java
Log Message:
-----------
More minor javadoc
Commit: 5128b1af9841a6d80181513840f14447f4bd9cfc
https://github.com/jenkinsci/jenkins/commit/5128b1af9841a6d80181513840f14447f4bd9cfc
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M core/src/main/java/jenkins/model/queue/AsynchronousExecution.java
Log Message:
-----------
Fixed a race condition.
IIUC, the expectation here is that Queue.Executable will instantiate
AsynchronousException as a handle, start something asynchronously (say send a
JMS message) with a callback, and the callback will tickle
AsynchronousException.
So AsynchronousException might complete before it gets its executor set. This
code change ensures that that case gets handled correctly.
Compare:
https://github.com/jenkinsci/jenkins/compare/e954ef42a073...5128b1af9841
--
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/d/optout.
