Branch: refs/heads/stable Home: https://github.com/jenkinsci/jenkins Commit: 17f7145bdba58ae6e0dc52f99349357611e5831d https://github.com/jenkinsci/jenkins/commit/17f7145bdba58ae6e0dc52f99349357611e5831d Author: Jesse Glick <jgl...@cloudbees.com> Date: 2012-10-23 (Tue, 23 Oct 2012)
Changed paths: M changelog.html M core/src/main/java/hudson/logging/LogRecorder.java Log Message: ----------- [FIXED JENKINS-15226] Log recorders do not work reliably. (cherry picked from commit f9583b89c47833b86c1d3b88c0515d0adfd69192) Commit: 760859de47703b562414cc938a96e97c02201f01 https://github.com/jenkinsci/jenkins/commit/760859de47703b562414cc938a96e97c02201f01 Author: Vojtech Juranek <vjura...@redhat.com> Date: 2012-10-23 (Tue, 23 Oct 2012) Changed paths: M changelog.html Log Message: ----------- Fixed wrong merge in changelog Commit: 53d25ff011eaca755495fe103ff91f1cb4c859c3 https://github.com/jenkinsci/jenkins/commit/53d25ff011eaca755495fe103ff91f1cb4c859c3 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2012-10-23 (Tue, 23 Oct 2012) Changed paths: M changelog.html M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/util/FormFieldValidator.java M core/src/main/resources/hudson/Messages.properties M core/src/main/resources/hudson/util/Messages.properties M core/src/test/java/hudson/FilePathTest.java Log Message: ----------- [FIXED JENKINS-7214] FilePath.validateAntFileMask too slow for /configure.(cherry picked from commit a885cc2179ea76bced186c3ed223ce50fec58a75) Conflicts: changelog.html core/src/test/java/hudson/FilePathTest.java Commit: 9544aedae944c12de1ef781915a1053b1b6b4343 https://github.com/jenkinsci/jenkins/commit/9544aedae944c12de1ef781915a1053b1b6b4343 Author: Vojtech Juranek <vjura...@redhat.com> Date: 2012-10-23 (Tue, 23 Oct 2012) Changed paths: M changelog.html Log Message: ----------- Fix changelog once again (changes weren't in Trunk section) Commit: a7d530c578939d6457e781e244ff1c1cd0380758 https://github.com/jenkinsci/jenkins/commit/a7d530c578939d6457e781e244ff1c1cd0380758 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2012-10-23 (Tue, 23 Oct 2012) Changed paths: M changelog.html M core/src/main/java/hudson/model/View.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/util/ProgressiveRendering.java A core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly A core/src/main/resources/hudson/model/View/AsynchPeople/index_ar.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_cs.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_da.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_de.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_el.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_es.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_fi.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_fr.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_hu.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_it.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_ja.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_ko.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_lt.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_lv.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_nb_NO.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_nl.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_pl.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_ro.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_ru.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_sv_SE.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_tr.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_CN.properties A core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_TW.properties R core/src/main/resources/hudson/model/View/People/index.jelly R core/src/main/resources/hudson/model/View/People/index_ar.properties R core/src/main/resources/hudson/model/View/People/index_cs.properties R core/src/main/resources/hudson/model/View/People/index_da.properties R core/src/main/resources/hudson/model/View/People/index_de.properties R core/src/main/resources/hudson/model/View/People/index_el.properties R core/src/main/resources/hudson/model/View/People/index_es.properties R core/src/main/resources/hudson/model/View/People/index_fi.properties R core/src/main/resources/hudson/model/View/People/index_fr.properties R core/src/main/resources/hudson/model/View/People/index_hu.properties R core/src/main/resources/hudson/model/View/People/index_it.properties R core/src/main/resources/hudson/model/View/People/index_ja.properties R core/src/main/resources/hudson/model/View/People/index_ko.properties R core/src/main/resources/hudson/model/View/People/index_lt.properties R core/src/main/resources/hudson/model/View/People/index_lv.properties R core/src/main/resources/hudson/model/View/People/index_nb_NO.properties R core/src/main/resources/hudson/model/View/People/index_nl.properties R core/src/main/resources/hudson/model/View/People/index_pl.properties R core/src/main/resources/hudson/model/View/People/index_pt_BR.properties R core/src/main/resources/hudson/model/View/People/index_ro.properties R core/src/main/resources/hudson/model/View/People/index_ru.properties R core/src/main/resources/hudson/model/View/People/index_sv_SE.properties R core/src/main/resources/hudson/model/View/People/index_tr.properties R core/src/main/resources/hudson/model/View/People/index_zh_CN.properties R core/src/main/resources/hudson/model/View/People/index_zh_TW.properties M core/src/main/resources/hudson/model/View/sidepanel.jelly A core/src/main/resources/lib/layout/progressiveRendering.jelly A core/src/main/resources/lib/layout/progressiveRendering.properties A core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js A ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java A ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly M war/src/main/webapp/scripts/sortable.js Log Message: ----------- Merge branch 'pull-570' (cherry picked from commit 454d0f2b874fbd104b0326520dd0a336bcfeacf7) Conflicts: changelog.html core/src/main/java/hudson/model/View.java Compare: https://github.com/jenkinsci/jenkins/compare/be6d2ccdbed3...a7d530c57893