Branch: refs/heads/stable
Home: https://github.com/jenkinsci/jenkins
Commit: 580e7de701c923e5c97f94513f8672bf292e4972
https://github.com/jenkinsci/jenkins/commit/580e7de701c923e5c97f94513f8672bf292e4972
Author: Vincent Latombe <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
M core/src/main/java/hudson/util/ComboBoxModel.java
Log Message:
-----------
[JENKINS-16069] Remove wrapping of JSON with ( )
now it is done properly on Javascript side so the current server
implementation triggers javascript errors.
Result can be observed on DynamicComboBox within ui-samples-plugin(cherry
picked from commit b6ce03878ed7523878ceffdb69e699c19a941bfc)
Conflicts:
changelog.html
Commit: fd3d7b9784e23a375eefa7f25878fb94c335a7c0
https://github.com/jenkinsci/jenkins/commit/fd3d7b9784e23a375eefa7f25878fb94c335a7c0
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/hudson/model/View.java
M core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
M core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
M core/src/main/resources/hudson/model/View/sidepanel.jelly
M maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
M
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly
M
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly
Log Message:
-----------
Fixed the lock contention problem on Queue.getItems()
>From what I was told by Emanuele today in the office hours, this came up
during the Copenhagen hackathon.
(cherry picked from commit f1aa7ba07e3fa5ddf34888a7f10bf04a56de1c74)
Conflicts:
changelog.html
Commit: cf4e3f7f3564059ec71bd1d2a668baaea3dd2a11
https://github.com/jenkinsci/jenkins/commit/cf4e3f7f3564059ec71bd1d2a668baaea3dd2a11
Author: Jesse Glick <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
M core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
Log Message:
-----------
[FIXED JENKINS-15335] Typo broke build queue display.(cherry picked from
commit 6c4e65f576ea6fa43b06e6d677f40410a87fefc1)
Commit: 897cab3f8d5584b2c43dc221db0e35ccaf155a72
https://github.com/jenkinsci/jenkins/commit/897cab3f8d5584b2c43dc221db0e35ccaf155a72
Author: Jesse Glick <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
Log Message:
-----------
[JENKINS-16468] Linking in changelog.
(cherry picked from commit 2f1ad0b2fbad9bb81ebbf1d0df08a24dcb3f0f16)
Conflicts:
changelog.html
Commit: 2e3156dde4cf4e47db54d6fdc901146dc671d5cd
https://github.com/jenkinsci/jenkins/commit/2e3156dde4cf4e47db54d6fdc901146dc671d5cd
Author: Jesse Glick <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
Log Message:
-----------
[JENKINS-16468] Marking as a bug, not an RFE.
(cherry picked from commit a156f1ebc610eae0e6e2316576d6f97a0180986b)
Conflicts:
changelog.html
Commit: 5f7ad6e5feee4c70e2d13d68e80e086abf6a9f50
https://github.com/jenkinsci/jenkins/commit/5f7ad6e5feee4c70e2d13d68e80e086abf6a9f50
Author: Jesse Glick <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M changelog.html
M core/src/main/java/hudson/model/FileParameterValue.java
Log Message:
-----------
[FIXED JENKINS-13536] Using file parameters could cause build records to not
load.
Solves the issue for newly created builds by not attempting to persist the
original file upload record, which is useless after the build has run (the
fileParameters dir in the build already archives them).
Does not help loading pre-fix builds in which the upload temp file has been
deleted; for these, you must manually delete <file
class="org.apache.commons.fileupload.disk.DiskFileItem"
serialization="custom">…</file> from the build.xml.
(Did not find a straightforward way to just instruct XStream to ignore this bit
of XML: it is easy to avoid serializing a field, but deserializing is
different.)(cherry picked from commit 4dde24e62037439b7b73addd7cefae83a254eb3c)
Conflicts:
changelog.html
Compare:
https://github.com/jenkinsci/jenkins/compare/8734bb733dc4...5f7ad6e5feee
