Merge remote-tracking branch 'origin/master'

changelog.html

@@ -72,6 +72,8 @@ Upcoming changes</a>
   <li class=bug>
     NPE in MavenFingerprinter.getArtifactRepositoryMaven21.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18441">issue 18441</a>)
+  <li class=rfe>
+    More reliability improvement in remote slave reconnection.
 </ul>
 </div><!--=END=-->
 <h3><a name=v1.523>What's new in 1.523</a> (2013/07/14)</h3>

core/src/main/java/hudson/console/ConsoleAnnotator.java

@@ -35,7 +35,7 @@ import java.util.ListIterator;
  * Annotates one line of console output.
  *
  * <p>
- * In Hudson, console output annotation is done line by line, and
+ * In Jenkins, console output annotation is done line by line, and
  * we model this as a state machine &mdash;
  * the code encapsulates some state, and it uses that to annotate one line (and possibly update the state.)
  *
@@ -54,7 +54,7 @@ import java.util.ListIterator;
  * </pre>
  *
  * <p>
- * Because of a browser can request console output incrementally, in addition to above a console annotator
+ * Because a browser can request console output incrementally, in addition to above a console annotator
  * can be serialized at any point and deserialized back later to continue annotation where it left off.
  *
  * <p>

core/src/main/java/hudson/model/UpdateCenter.java

@@ -39,6 +39,7 @@ import hudson.lifecycle.RestartNotSupportedException;
 import hudson.model.UpdateSite.Data;
 import hudson.model.UpdateSite.Plugin;
 import hudson.model.listeners.SaveableListener;
+import hudson.remoting.AtmostOneThreadExecutor;
 import hudson.security.ACL;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.FormValidation;
@@ -129,7 +130,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
      * {@link ExecutorService} that performs installation.
      * @since 1.501
      */
-    private final ExecutorService installerService = Executors.newSingleThreadExecutor(
+    private final ExecutorService installerService = new AtmostOneThreadExecutor(
         new DaemonThreadFactory(new ThreadFactory() {
             public Thread newThread(Runnable r) {
                 Thread t = new Thread(r);

pom.xml

@@ -175,7 +175,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.28</version>
+        <version>2.30</version>
       </dependency>
 
       <dependency>