Branch: refs/heads/stable
  Home:   https://github.com/jenkinsci/jenkins
  Commit: 6b495ceecc68d668690433eef663362d8ddede50
      
https://github.com/jenkinsci/jenkins/commit/6b495ceecc68d668690433eef663362d8ddede50
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M changelog.html
    M core/src/main/java/hudson/FilePath.java
    M pom.xml

  Log Message:
  -----------
  [FIXED JENKINS-11251]

The actual meat of the change is in remoting.
(cherry picked from commit f49d6258451155c716976d7af5433c0fde7fe890)

Conflicts:

        changelog.html


  Commit: 47bb6d8ab64700cb821b44691d704b145281c253
      
https://github.com/jenkinsci/jenkins/commit/47bb6d8ab64700cb821b44691d704b145281c253
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M core/pom.xml
    M core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
    M core/src/main/java/jenkins/model/Jenkins.java
    M war/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  [FIXED JENKINS-13625]

In the end, proper fix requires having a filter that tracks
GZipOutputStream.
(cherry picked from commit 18963ee9af2b98ce94eda799069d9135f6031a0e)

Conflicts:

        core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java


  Commit: a80bc2ca0d95945e21b43291a8bc13c5245f859f
      
https://github.com/jenkinsci/jenkins/commit/a80bc2ca0d95945e21b43291a8bc13c5245f859f
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M changelog.html
    M core/src/main/java/hudson/cli/UpdateJobCommand.java
    M core/src/main/java/hudson/model/AbstractItem.java
    M core/src/main/java/hudson/model/AbstractProject.java
    M core/src/main/java/hudson/model/RunMap.java
    A test/src/test/groovy/hudson/model/RunMapTest.groovy

  Log Message:
  -----------
  [FIXED JENKINS-12318]

Preserve in-progress builds when reloading a job.
Because in-flight builds tend to update the state a lot, with this
change we refrain from reloading those builds from the disk.

This should be acceptable since we are primarily reloading a job, and
reloading of builds are secondary.
(cherry picked from commit 9fbd6d3a482643f4080fbb793c67323e8464b11c)

Conflicts:

        changelog.html


Compare: 
https://github.com/jenkinsci/jenkins/compare/75dc1e17f4c1...a80bc2ca0d95

Reply via email to