Merge branch 'master' of github.com:jenkinsci/jenkins

changelog.html

@@ -67,6 +67,9 @@ Upcoming changes</a>
   <li class=bug>
     Master node mode not correctly displayed in <code>/computer/(master)/configure</code>.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17263">issue 17263</a>)
+  <li class='major rfe'>
+    Performance improvement in master/slave communication throughput
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7813">issue 7813</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

core/pom.xml

@@ -125,7 +125,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>trilead-ssh2</artifactId>
-      <version>build214-jenkins-1</version>
+      <version>build214-jenkins-2</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>

core/src/main/java/hudson/tasks/ArtifactArchiver.java

@@ -32,6 +32,7 @@ import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
 import hudson.model.Result;
 import hudson.util.FormValidation;
+import hudson.util.TimeUnit2;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.AncestorInPath;
@@ -122,6 +123,7 @@ public class ArtifactArchiver extends Recorder {
         File dir = build.getArtifactsDir();
         dir.mkdirs();
 
+        final long start = System.nanoTime();
         listener.getLogger().println(Messages.ArtifactArchiver_ARCHIVING_ARTIFACTS());
         try {
             FilePath ws = build.getWorkspace();
@@ -157,6 +159,8 @@ public class ArtifactArchiver extends Recorder {
             return true;
         }
 
+        // System.out.println("Took "+ TimeUnit2.NANOSECONDS.toMillis(System.nanoTime()-start));
+
         return true;
     }
 

pom.xml

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

war/pom.xml

@@ -271,7 +271,19 @@ THE SOFTWARE.
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>ssh-slaves</artifactId>
                   <!-- when upgrading may need to add credentials and ssh-credentials too: https://github.com/jenkinsci/ssh-slaves-plugin/commit/7f7031bdaae528baf8e4a1cf29a95849ef268c5c -->
-                  <version>0.22</version>
+                  <version>0.23</version>
+                  <type>hpi</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.plugins</groupId>
+                  <artifactId>credentials</artifactId>
+                  <version>1.3.1</version>
+                  <type>hpi</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.plugins</groupId>
+                  <artifactId>ssh-credentials</artifactId>
+                  <version>0.2</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>