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

changelog.html

@@ -64,6 +64,8 @@ Upcoming changes</a>
   <li class=bug>
     When installing plugins with overlapping dependencies, Jenkins downloads the duplicate plugins multiple times.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10569">issue 10569</a>)
+  <li class=rfe>
+    Disable Nagle's algorithm for TCP/IP slave connection
 </ul>
 </div><!--=TRUNK-END=-->
 

core/src/main/java/hudson/TcpSlaveAgentListener.java

@@ -94,6 +94,8 @@ public final class TcpSlaveAgentListener extends Thread {
                 // and that goes without unnoticed. However, the time out is often very long (for example 2 hours
                 // by default in Linux) that this alone is enough to prevent that.
                 s.setKeepAlive(true);
+                // we take care of buffering on our own
+                s.setTcpNoDelay(true);
 
                 new ConnectionHandler(s).start();
             }

core/src/main/resources/hudson/model/User/configure.jelly

@@ -55,7 +55,12 @@ THE SOFTWARE.
         </j:forEach>
 
         <f:block>
-          <f:submit value="${%Save}" />
+          <div id="bottom-sticker">
+            <div class="bottom-sticker-inner">
+              <f:submit value="${%Save}" />
+              <f:apply />
+            </div>
+          </div>
         </f:block>
       </f:form>
     </l:main-panel>

pom.xml

@@ -197,7 +197,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
       </dependency>
 
       <dependency>

war/src/main/webapp/help/tasks/junit/report.html

@@ -9,7 +9,7 @@
   specify the path to JUnit XML files in the
   <a href="http://ant.apache.org/manual/Types/fileset.html">Ant glob syntax</a>,
   such as <tt>**/build/test-reports/*.xml</tt>. Be sure not to include any non-report
-  files into this pattern.
+  files into this pattern. You can specify multiple patterns of files separated by commas.
 
   <p>
   Once there are a few builds running with test results, you should start seeing