Branch: refs/heads/master
Home: https://github.com/jenkinsci/jenkins
Commit: b105627b7357149f98f87ec2bf494e25bd2ed88b
https://github.com/jenkinsci/jenkins/commit/b105627b7357149f98f87ec2bf494e25bd2ed88b
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M cli/pom.xml
M core/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
Towards 1.580.1
Commit: 8ae29e50c7356a8e2ec9be1126bad957dab0117a
https://github.com/jenkinsci/jenkins/commit/8ae29e50c7356a8e2ec9be1126bad957dab0117a
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M core/pom.xml
Log Message:
-----------
[JENKINS-24458 JENKINS-11543] integrated the newer version of stapler with
reduced log level
(cherry picked from commit c57f9ed577b9635f01aa5affabf1f770b689a115)
Conflicts:
changelog.html
Commit: 9c82fc42eb08b89047c544aaa586291ad1485472
https://github.com/jenkinsci/jenkins/commit/9c82fc42eb08b89047c544aaa586291ad1485472
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M changelog.html
M pom.xml
Log Message:
-----------
[JENKINS-23471 JENKINS-24050]
Integrated the fix in remoting to Jenkins 1.580.
(cherry picked from commit 8fc609fe0952b285d5b26a59fd5ff4c29704d33d)
Commit: 4d455fbb0d2f33bd87a8c38580f7ff2ffb78b0ac
https://github.com/jenkinsci/jenkins/commit/4d455fbb0d2f33bd87a8c38580f7ff2ffb78b0ac
Author: Daniel Beck <daniel-b...@github.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M core/src/main/resources/hudson/model/Run/console_he.properties
Log Message:
-----------
[FIXED JENKINS-24614] Broken format string in Hebrew console output
(cherry picked from commit 07fd5fa45d4b818fc11de97ce99ab6b3423aca85)
Commit: efae48a451b1dbb15a13abff26b0bec269a63909
https://github.com/jenkinsci/jenkins/commit/efae48a451b1dbb15a13abff26b0bec269a63909
Author: David Ruhmann <david.ruhm...@cerner.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M core/src/main/java/hudson/tasks/BatchFile.java
M core/src/main/java/hudson/tasks/Shell.java
M core/src/main/java/hudson/tools/AbstractCommandInstaller.java
M core/src/main/java/hudson/tools/BatchCommandInstaller.java
M core/src/main/java/hudson/tools/CommandInstaller.java
A core/src/main/java/hudson/util/LineEndingConversion.java
A test/src/test/java/hudson/tasks/BatchFileTest.java
M test/src/test/java/hudson/tasks/ShellTest.java
A test/src/test/java/hudson/tools/BatchCommandInstallerTest.java
A test/src/test/java/hudson/tools/CommandInstallerTest.java
A test/src/test/java/hudson/util/LineEndingConversionTest.java
Log Message:
-----------
[FIXED JENKINS-7478]
Create Line Ending Conversion utility to convert scripts to proper OS
line ending type. Tests included.
(cherry picked from commit 67ac47af0709dde6297dffeb210b03d8b65f6033)
Commit: 20473dab36e88fca4f7826a61346a4e3a043f1ac
https://github.com/jenkinsci/jenkins/commit/20473dab36e88fca4f7826a61346a4e3a043f1ac
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M core/src/main/java/hudson/model/Slave.java
M core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java
Log Message:
-----------
@DataBoundConstructor makes no sense on an abstract class.
(cherry picked from commit 71600d8b37581ea367937e0cda6dbc31b13c6904)
Commit: 21fb398bfa7068f6f72154763bdbb09baddf313d
https://github.com/jenkinsci/jenkins/commit/21fb398bfa7068f6f72154763bdbb09baddf313d
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M core/pom.xml
Log Message:
-----------
[JENKINS-24453][ZD-20503] Incorporated a newer version of winp.
This version checks the critical flag of the process, as killing such a
process results in BSoD.
(cherry picked from commit 040b7d4047b324f17c0971f2511f954eb173fa23)
Conflicts:
changelog.html
Commit: 66dce647d1d7df919f9707b4ce631cd49dc242f7
https://github.com/jenkinsci/jenkins/commit/66dce647d1d7df919f9707b4ce631cd49dc242f7
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M test/src/test/java/hudson/model/ParametersTest.java
Log Message:
-----------
[JENKINS-11543] Unit test
(cherry picked from commit 75f5d2180f7340ce2efd4f41c8670afb049eb530)
Commit: 96b973c4082569d4ed386aca5edf21205bfb7314
https://github.com/jenkinsci/jenkins/commit/96b973c4082569d4ed386aca5edf21205bfb7314
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-14 (Tue, 14 Oct 2014)
Changed paths:
M core/pom.xml
Log Message:
-----------
Integrated the new version.
This version includes a change from christ66 in
https://github.com/stapler/stapler/pull/40
(cherry picked from commit 65c2d378814ebd3fe8c43f428a1408dd6354c9bb)
Conflicts:
core/pom.xml
Commit: 1203b091902526620775a3e3603a245b81ed46b4
https://github.com/jenkinsci/jenkins/commit/1203b091902526620775a3e3603a245b81ed46b4
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M core/pom.xml
M core/src/main/java/hudson/Plugin.java
M core/src/main/java/hudson/cli/CLICommand.java
M core/src/main/java/hudson/model/AbstractItem.java
M core/src/main/java/hudson/model/FileParameterValue.java
M core/src/main/java/hudson/model/FullDuplexHttpChannel.java
M core/src/main/java/hudson/security/ACL.java
M core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
M core/src/main/resources/hudson/model/LoadStatistics/main.jelly
M
core/src/main/resources/hudson/model/PasswordParameterDefinition/index.jelly
M core/src/main/resources/lib/layout/copyButton/copyButton.css
M core/src/main/resources/lib/layout/copyButton/copyButton.js
M pom.xml
M test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
A test/src/test/java/hudson/PluginTest.java
M test/src/test/java/hudson/security/CliAuthenticationTest.java
Log Message:
-----------
Merge branch 'security' into stable-1.580
Conflicts:
.idea/compiler.xml
.idea/encodings.xml
core/pom.xml
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/markup/MyspacePolicy.java
core/src/main/java/hudson/model/AbstractItem.java
core/src/main/java/hudson/security/ACL.java
core/src/main/java/hudson/util/RobustReflectionConverter.java
core/src/main/resources/lib/layout/layout.jelly
pom.xml
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
test/src/test/java/hudson/model/UpdateSiteTest.java
test/src/test/java/hudson/tasks/FingerprinterTest.java
test/src/test/java/hudson/tasks/junit/CaseResultTest.java
test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java
war/pom.xml
Commit: 4ddafceec3363a7b73358890d76bb8c4947e32a8
https://github.com/jenkinsci/jenkins/commit/4ddafceec3363a7b73358890d76bb8c4947e32a8
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M core/src/main/java/hudson/EnvVars.java
M core/src/main/java/hudson/FilePath.java
M core/src/main/java/hudson/Launcher.java
M core/src/main/java/hudson/cli/CLICommand.java
M core/src/main/java/hudson/cli/ClientAuthenticationCache.java
M core/src/main/java/hudson/cli/CommandDuringBuild.java
M core/src/main/java/hudson/cli/InstallToolCommand.java
M core/src/main/java/hudson/cli/util/ScriptLoader.java
M core/src/main/java/hudson/logging/LogRecorder.java
M core/src/main/java/hudson/model/AbstractItem.java
M core/src/main/java/hudson/model/Computer.java
M core/src/main/java/hudson/model/DirectoryBrowserSupport.java
M core/src/main/java/hudson/model/ItemGroupMixIn.java
M core/src/main/java/hudson/model/Slave.java
M core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java
M core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
M core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
M core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java
M core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
M core/src/main/java/hudson/os/solaris/ZFSInstaller.java
M core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
M core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
M core/src/main/java/hudson/slaves/ChannelPinger.java
M core/src/main/java/hudson/slaves/Channels.java
M core/src/main/java/hudson/slaves/ComputerListener.java
M core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java
M core/src/main/java/hudson/slaves/SlaveComputer.java
M core/src/main/java/hudson/tasks/ArtifactArchiver.java
M core/src/main/java/hudson/tasks/Fingerprinter.java
M core/src/main/java/hudson/tasks/Maven.java
M core/src/main/java/hudson/tasks/Shell.java
M core/src/main/java/hudson/tools/JDKInstaller.java
M core/src/main/java/hudson/tools/ZipExtractionInstaller.java
M core/src/main/java/hudson/util/ProcessTree.java
M core/src/main/java/hudson/util/RemotingDiagnostics.java
M core/src/main/java/hudson/util/io/ParserConfigurator.java
A core/src/main/java/jenkins/FilePathFilter.java
A core/src/main/java/jenkins/FilePathFilterAggregator.java
A core/src/main/java/jenkins/MasterToSlaveFileCallable.java
A core/src/main/java/jenkins/SlaveToMasterFileCallable.java
M core/src/main/java/jenkins/model/Jenkins.java
A core/src/main/java/jenkins/security/AdminCallableMonitor.java
A core/src/main/java/jenkins/security/AdminCallableWhitelist.java
A core/src/main/java/jenkins/security/CallableDirectionChecker.java
A core/src/main/java/jenkins/security/CallableWhitelist.java
A core/src/main/java/jenkins/security/ChannelConfigurator.java
A core/src/main/java/jenkins/security/DefaultFilePathFilter.java
A core/src/main/java/jenkins/security/MasterToSlaveCallable.java
A core/src/main/java/jenkins/security/NotReallyRoleSensitiveCallable.java
A core/src/main/java/jenkins/security/Roles.java
A core/src/main/java/jenkins/security/SlaveToMasterCallable.java
M core/src/main/java/jenkins/slaves/StandardOutputSwapper.java
M
core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
M core/src/main/java/jenkins/util/VirtualFile.java
A
core/src/main/resources/jenkins/security/AdminCallableMonitor/message.jelly
A
core/src/main/resources/jenkins/security/AdminCallableMonitor/message.properties
A
core/src/main/resources/jenkins/security/AdminCallableWhitelist/index.jelly
M core/src/test/java/hudson/LauncherTest.java
M core/src/test/java/hudson/os/SUTester.java
M core/src/test/java/hudson/util/ProcessTreeTest.java
M
core/src/test/java/hudson/util/io/ReopenableRotatingFileOutputStreamTest.java
M pom.xml
M test/src/test/java/hudson/ProcTest.java
M test/src/test/java/hudson/logging/LogRecorderManagerTest.java
M test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java
M test/src/test/java/hudson/slaves/JNLPLauncherTest.java
A test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
A test/src/test/java/jenkins/security/FilePathSecureTest.java
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Conflicts:
core/src/main/java/hudson/EnvVars.java
core/src/main/java/hudson/FilePath.java
core/src/main/java/hudson/cli/ClientAuthenticationCache.java
core/src/main/java/hudson/markup/MyspacePolicy.java
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/tasks/Fingerprinter.java
core/src/main/java/hudson/tasks/Shell.java
core/src/main/java/hudson/tasks/junit/JUnitParser.java
core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
core/src/main/java/hudson/util/ProcessTree.java
core/src/main/java/hudson/util/RemotingDiagnostics.java
core/src/main/java/jenkins/model/Jenkins.java
core/src/test/java/hudson/LauncherTest.java
pom.xml
Commit: 69c1492fa09c89456d69a804d2560c443405b662
https://github.com/jenkinsci/jenkins/commit/69c1492fa09c89456d69a804d2560c443405b662
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M pom.xml
Log Message:
-----------
maven-plugin SECURITY-144 is now 2.7.1-SNAPSHOT.
Commit: 84a92396de77f3f744db1287e44ff78f16a5fc1a
https://github.com/jenkinsci/jenkins/commit/84a92396de77f3f744db1287e44ff78f16a5fc1a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M core/src/main/java/hudson/ClassicPluginStrategy.java
M core/src/main/java/hudson/FilePath.java
M core/src/main/java/hudson/PluginManager.java
M core/src/main/java/hudson/PluginWrapper.java
M core/src/main/java/hudson/util/TextFile.java
M core/src/main/java/jenkins/FilePathFilter.java
M core/src/main/java/jenkins/FilePathFilterAggregator.java
A core/src/main/java/jenkins/ReflectiveFilePathFilter.java
A core/src/main/java/jenkins/SoloFilePathFilter.java
A
core/src/main/java/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor.java
R core/src/main/java/jenkins/security/AdminCallableMonitor.java
R core/src/main/java/jenkins/security/AdminCallableWhitelist.java
M core/src/main/java/jenkins/security/CallableDirectionChecker.java
M core/src/main/java/jenkins/security/DefaultFilePathFilter.java
A core/src/main/java/jenkins/security/admin/AdminCallableMonitor.java
A core/src/main/java/jenkins/security/admin/AdminCallableWhitelist.java
A core/src/main/java/jenkins/security/admin/AdminFilePathFilter.java
A core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java
A core/src/main/java/jenkins/security/admin/CallableRejectionConfig.java
A core/src/main/java/jenkins/security/admin/CallableWhitelistConfig.java
A core/src/main/java/jenkins/security/admin/ConfigDirectory.java
A core/src/main/java/jenkins/security/admin/ConfigFile.java
A core/src/main/java/jenkins/security/admin/FilePathRule.java
A core/src/main/java/jenkins/security/admin/FilePathRuleConfig.java
A core/src/main/java/jenkins/security/admin/OpMatcher.java
A core/src/main/java/jenkins/security/admin/RejectedCallable.java
A core/src/main/java/jenkins/security/admin/package-info.java
M core/src/main/java/jenkins/util/io/FileBoolean.java
A
core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.jelly
A
core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.properties
R
core/src/main/resources/jenkins/security/AdminCallableMonitor/message.jelly
R
core/src/main/resources/jenkins/security/AdminCallableMonitor/message.properties
R
core/src/main/resources/jenkins/security/AdminCallableWhitelist/index.jelly
A
core/src/main/resources/jenkins/security/admin/AdminCallableMonitor/message.jelly
A
core/src/main/resources/jenkins/security/admin/AdminCallableMonitor/message.properties
A
core/src/main/resources/jenkins/security/admin/AdminWhitelistRule/index.jelly
A core/src/main/resources/jenkins/security/admin/callable.conf
A core/src/main/resources/jenkins/security/admin/filepath-filter.conf
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Conflicts:
core/src/main/java/hudson/FilePath.java
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginWrapper.java
Commit: 69a4969a988f993eebbfecb65c3e1dfb13fcfdb1
https://github.com/jenkinsci/jenkins/commit/69a4969a988f993eebbfecb65c3e1dfb13fcfdb1
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M plugins/pom.xml
M pom.xml
Log Message:
-----------
b105627 failed to move completely away from 1.580.
Commit: d113d931943580523aadaff9201fc167db4fb8db
https://github.com/jenkinsci/jenkins/commit/d113d931943580523aadaff9201fc167db4fb8db
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M plugins/pom.xml
M pom.xml
Log Message:
-----------
Merge branch 'security-stable-1.580' into SECURITY-144-stable-1.580
Commit: 4f3b6811c10608774a82eb37a7284a31b836f8c8
https://github.com/jenkinsci/jenkins/commit/4f3b6811c10608774a82eb37a7284a31b836f8c8
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M core/src/main/java/jenkins/security/CallableDirectionChecker.java
M core/src/main/java/jenkins/security/admin/FilePathRuleConfig.java
M core/src/main/resources/jenkins/security/admin/callable.conf
M core/src/main/resources/jenkins/security/admin/filepath-filter.conf
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Commit: 01827e1e2ba0fa1e833b6653a76170bd49a2a795
https://github.com/jenkinsci/jenkins/commit/01827e1e2ba0fa1e833b6653a76170bd49a2a795
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M war/pom.xml
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Conflicts:
war/pom.xml
Commit: 57b38ecfb78d292154fe1b3f33636b1d98e1b223
https://github.com/jenkinsci/jenkins/commit/57b38ecfb78d292154fe1b3f33636b1d98e1b223
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M
core/src/main/resources/jenkins/diagnostics/PinningIsBlockingBundledPluginMonitor/message.properties
M core/src/main/resources/jenkins/security/admin/callable.conf
M core/src/main/resources/jenkins/security/admin/filepath-filter.conf
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Commit: 4ab018a07806bb03542bd1a797fdd763f661c4e2
https://github.com/jenkinsci/jenkins/commit/4ab018a07806bb03542bd1a797fdd763f661c4e2
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M core/src/main/java/hudson/FilePath.java
M core/src/main/java/jenkins/FilePathFilter.java
M core/src/main/java/jenkins/FilePathFilterAggregator.java
M core/src/main/java/jenkins/ReflectiveFilePathFilter.java
M core/src/main/java/jenkins/SoloFilePathFilter.java
R core/src/main/java/jenkins/security/CallableDirectionChecker.java
R core/src/main/java/jenkins/security/CallableWhitelist.java
R core/src/main/java/jenkins/security/DefaultFilePathFilter.java
R core/src/main/java/jenkins/security/admin/AdminCallableMonitor.java
R core/src/main/java/jenkins/security/admin/AdminCallableWhitelist.java
R core/src/main/java/jenkins/security/admin/AdminFilePathFilter.java
R core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java
R core/src/main/java/jenkins/security/admin/CallableRejectionConfig.java
R core/src/main/java/jenkins/security/admin/CallableWhitelistConfig.java
R core/src/main/java/jenkins/security/admin/ConfigDirectory.java
R core/src/main/java/jenkins/security/admin/ConfigFile.java
R core/src/main/java/jenkins/security/admin/FilePathRule.java
R core/src/main/java/jenkins/security/admin/FilePathRuleConfig.java
R core/src/main/java/jenkins/security/admin/OpMatcher.java
R core/src/main/java/jenkins/security/admin/RejectedCallable.java
R core/src/main/java/jenkins/security/admin/package-info.java
A core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java
A core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java
A core/src/main/java/jenkins/security/s2m/AdminFilePathFilter.java
A core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java
A core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
A core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java
A core/src/main/java/jenkins/security/s2m/CallableWhitelist.java
A core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java
A core/src/main/java/jenkins/security/s2m/ConfigDirectory.java
A core/src/main/java/jenkins/security/s2m/ConfigFile.java
A core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
A core/src/main/java/jenkins/security/s2m/FilePathRule.java
A core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java
A core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
A core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java
A core/src/main/java/jenkins/security/s2m/OpMatcher.java
A core/src/main/java/jenkins/security/s2m/RejectedCallable.java
A core/src/main/java/jenkins/security/s2m/package-info.java
R
core/src/main/resources/jenkins/security/admin/AdminCallableMonitor/message.jelly
R
core/src/main/resources/jenkins/security/admin/AdminCallableMonitor/message.properties
R
core/src/main/resources/jenkins/security/admin/AdminWhitelistRule/index.jelly
R core/src/main/resources/jenkins/security/admin/callable.conf
R core/src/main/resources/jenkins/security/admin/filepath-filter.conf
A
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
A
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.properties
A
core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly
A
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchConfiguration/config.groovy
A
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchConfiguration/help-masterToSlaveAccessControl.html
A
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly
A
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties
A core/src/main/resources/jenkins/security/s2m/callable.conf
A core/src/main/resources/jenkins/security/s2m/filepath-filter.conf
M test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Commit: 1351b18e42b1677ee9bb14255583f5b3624d530a
https://github.com/jenkinsci/jenkins/commit/1351b18e42b1677ee9bb14255583f5b3624d530a
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M war/pom.xml
Log Message:
-----------
[JENKINS-25169] integrated the fix for POODLE
Commit: ae181567a895a60c6f97eb7f2c8ee65cf2999796
https://github.com/jenkinsci/jenkins/commit/ae181567a895a60c6f97eb7f2c8ee65cf2999796
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M war/pom.xml
Log Message:
-----------
Merge remote-tracking branch 'community/stable-1.580' into
SECURITY-144-stable-1.580
Commit: e70601482a71e5876816a4bfbcda1ee76b242d66
https://github.com/jenkinsci/jenkins/commit/e70601482a71e5876816a4bfbcda1ee76b242d66
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
M war/pom.xml
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Commit: 0b25d25226360a0bb24e66f3ab5c5bf987464e7d
https://github.com/jenkinsci/jenkins/commit/0b25d25226360a0bb24e66f3ab5c5bf987464e7d
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Changed paths:
M war/pom.xml
Log Message:
-----------
Merge branch 'security' into security-stable-1.580
Conflicts:
war/pom.xml
Commit: bc0f3632276f3bb654ad5615abb53fd3e50feb30
https://github.com/jenkinsci/jenkins/commit/bc0f3632276f3bb654ad5615abb53fd3e50feb30
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Log Message:
-----------
Merge branch 'security-stable-1.580' into SECURITY-144-stable-1.580
Commit: 2269703ee7ce018a2ecef8ea035ac301c25f0a92
https://github.com/jenkinsci/jenkins/commit/2269703ee7ce018a2ecef8ea035ac301c25f0a92
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Changed paths:
M
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchConfiguration/help-masterToSlaveAccessControl.html
M pom.xml
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Conflicts:
pom.xml
Commit: 16719ced4601a1926250551733d6c81e9fb31b7b
https://github.com/jenkinsci/jenkins/commit/16719ced4601a1926250551733d6c81e9fb31b7b
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Log Message:
-----------
Merge branch 'stable-1.580' into security-stable-1.580
Commit: 687598888d3d296fb768f127bdc8f6d853db7268
https://github.com/jenkinsci/jenkins/commit/687598888d3d296fb768f127bdc8f6d853db7268
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Log Message:
-----------
Merge branch 'security' into security-stable-1.580
Conflicts:
pom.xml
Commit: b64dfc959961d662305a06d8799818b10e1c70ca
https://github.com/jenkinsci/jenkins/commit/b64dfc959961d662305a06d8799818b10e1c70ca
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-26 (Sun, 26 Oct 2014)
Log Message:
-----------
Merge branch 'security-stable-1.580' into SECURITY-144-stable-1.580
Commit: 0d24f2d288a1f93b1e929461d54679813bd57d6e
https://github.com/jenkinsci/jenkins/commit/0d24f2d288a1f93b1e929461d54679813bd57d6e
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)
Changed paths:
M core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java
M
core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly
Log Message:
-----------
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Commit: e0952e94ea7ae5cdc072a579ad13216df2cfb56c
https://github.com/jenkinsci/jenkins/commit/e0952e94ea7ae5cdc072a579ad13216df2cfb56c
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-29 (Wed, 29 Oct 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Switch to a released version
Commit: 388fa0b44a56cdc1d56596ab5b6415da8e1de04f
https://github.com/jenkinsci/jenkins/commit/388fa0b44a56cdc1d56596ab5b6415da8e1de04f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-29 (Wed, 29 Oct 2014)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.580.1
Commit: 3229bdaac8e07b1ae6f6be784fc945b08d76ad8a
https://github.com/jenkinsci/jenkins/commit/3229bdaac8e07b1ae6f6be784fc945b08d76ad8a
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-29 (Wed, 29 Oct 2014)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 034919e1fde18dfecec949931ae875a931cec583
https://github.com/jenkinsci/jenkins/commit/034919e1fde18dfecec949931ae875a931cec583
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-10-29 (Wed, 29 Oct 2014)
Changed paths:
M debian/debian/changelog
Log Message:
-----------
updated changelog as a part of the release
Commit: a4a28fb87f6ad64e1faf816ee669c38cc5ada085
https://github.com/jenkinsci/jenkins/commit/a4a28fb87f6ad64e1faf816ee669c38cc5ada085
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/AbstractItem.java
M core/src/main/java/hudson/model/Items.java
M core/src/main/java/hudson/model/Job.java
Log Message:
-----------
[FIXED JENKINS-24825] define hudson.model.AbstractItem#movedTo
(cherry picked from commit 9b3f48853d481b848f91b4f6fb7d96e87e81b500)
Conflicts:
changelog.html
Commit: 03a13fcf973d6add0f02a8ce7102db35d393cba7
https://github.com/jenkinsci/jenkins/commit/03a13fcf973d6add0f02a8ce7102db35d393cba7
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M test/src/test/java/hudson/model/ItemsTest.java
Log Message:
-----------
test case for JENKINS-24825
(cherry picked from commit 8975b0e0b5b5c553301c7bc85fd81d080a658b96)
Commit: 3eefad8d30d38ad2b4ab23f228a82291a87578aa
https://github.com/jenkinsci/jenkins/commit/3eefad8d30d38ad2b4ab23f228a82291a87578aa
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/src/main/java/jenkins/util/ProgressiveRendering.java
M core/src/main/resources/lib/layout/progressiveRendering.jelly
M
core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js
Log Message:
-----------
[FIXED JENKINS-25081] Memory leak in BoundObjectTable when
ProgressiveRendering is used.
(cherry picked from commit aac8c239721ed52caacbff389a29d5db2c1e3a00)
Conflicts:
changelog.html
Commit: 1b0d8fb63aa98a666f656a60c4c6802c6d023dba
https://github.com/jenkinsci/jenkins/commit/1b0d8fb63aa98a666f656a60c4c6802c6d023dba
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
Log Message:
-----------
[FIXED JENKINS-24340] - Do not disable jobs if supportsMakeDisabled() returns
false
This changes prevents the improper usage of method without the preliminary
supportsMakeDisabled() check.
As an example, Subversion plugin behaves in such way (JENKINS-24341)
Signed-off-by: Oleg Nenashev <o.v.nenas...@gmail.com>
(cherry picked from commit a78f1d3246cfdbee96820d5629dbb8676a3ca19a)
Commit: 68eb26633b1c042d90a426efac7b6e60dd4b2ede
https://github.com/jenkinsci/jenkins/commit/68eb26633b1c042d90a426efac7b6e60dd4b2ede
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/pom.xml
Log Message:
-----------
[FIXED JENKINS-20108]
Integrated the trilead with SecureRandom instantiation fix.
(cherry picked from commit 70f5968160b0a1cf81dc451fd2aacf1e0f9201ea)
Conflicts:
changelog.html
core/pom.xml
Commit: b73bb3d0af419dd653b743b4c0b8458c965396e1
https://github.com/jenkinsci/jenkins/commit/b73bb3d0af419dd653b743b4c0b8458c965396e1
Author: Daniel Beck <daniel-b...@users.noreply.github.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/ManagementLink.java
M core/src/main/java/jenkins/management/ShutdownLink.java
M core/src/main/resources/jenkins/model/Jenkins/manage.jelly
A core/src/main/resources/lib/form/link.jelly
A core/src/main/resources/lib/form/link/link.js
M core/src/main/resources/lib/hudson/queue.jelly
Log Message:
-----------
Merge pull request #1306 from bkmeneguello/post-cancel-shutdown
[FIXED JENKINS-23020 JENKINS-23942] Convert the queue's cancel shutdown to POST
(cherry picked from commit fda84f456f4be4f48048970a6055399f17761ab0)
Commit: fff888cc822f235dde8ebdd01152c626e85a12b2
https://github.com/jenkinsci/jenkins/commit/fff888cc822f235dde8ebdd01152c626e85a12b2
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/FileParameterValue.java
Log Message:
-----------
[FIXED JENKINS-19017] - FileParameter - Handle non-null file parameters as
different values
The change prevents the issue when Jenkins merges builds with different files
coming from one source (It may happen!).
Signed-off-by: Oleg Nenashev <o.v.nenas...@gmail.com>
(cherry picked from commit 7c4f6b7ef433f4a3d85707096f9e5f8b366f232a)
Commit: be835bfcfb172ecde489ad3598750b7fdc88a965
https://github.com/jenkinsci/jenkins/commit/be835bfcfb172ecde489ad3598750b7fdc88a965
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Changed paths:
A core/src/test/java/hudson/model/FileParameterValueTest.java
Log Message:
-----------
[JENKINS-19017] - Unit tests
Signed-off-by: Oleg Nenashev <o.v.nenas...@gmail.com>
(cherry picked from commit cc06ae78e3955746176f64ff3f36d7f0e3cc80ab)
Commit: 8fbd44db2b2ebf81947a6c3c5861bc30b48cc775
https://github.com/jenkinsci/jenkins/commit/8fbd44db2b2ebf81947a6c3c5861bc30b48cc775
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M core/pom.xml
Log Message:
-----------
Revert "[FIXED JENKINS-20108]"
This reverts commit 68eb26633b1c042d90a426efac7b6e60dd4b2ede.
Commit: 0efd811adb89769c8a6180e33e3d06d755bca4b5
https://github.com/jenkinsci/jenkins/commit/0efd811adb89769c8a6180e33e3d06d755bca4b5
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/listeners/ItemListener.java
M test/src/test/java/hudson/model/ListViewTest.java
Log Message:
-----------
[FIXED JENKINS-22769] ItemListener callbacks should run as SYSTEM since they
sometimes do ACL-checked calls.
(cherry picked from commit c04cdcd9f717ddcd3e8c9dbe86cb353c14ae511e)
Conflicts:
changelog.html
Commit: b70313476a86813417b9197555780622cf5170b8
https://github.com/jenkinsci/jenkins/commit/b70313476a86813417b9197555780622cf5170b8
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/listeners/ItemListener.java
Log Message:
-----------
[JENKINS-21224] Defend against exceptions in listeners, for now just for
ItemListener.
java.lang.RuntimeException: Unable to copy /…/jobs/…/config.xml
at
hudson.plugins.jobConfigHistory.FileHistoryDao.createNewHistoryEntryAndCopyConfig(FileHistoryDao.java:252)
at
hudson.plugins.jobConfigHistory.FileHistoryDao.createNewItem(FileHistoryDao.java:238)
at
hudson.plugins.jobConfigHistory.JobConfigHistoryJobListener.onCreated(JobConfigHistoryJobListener.java:31)
at
hudson.model.listeners.ItemListener.fireOnCreated(ItemListener.java:161)
at jenkins.model.Jenkins.putItem(Jenkins.java:2483)
at …
Caused by: java.io.FileNotFoundException: /…/jobs/…/config.xml (No such file or
directory)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.<init>(FileInputStream.java:120)
at
hudson.plugins.jobConfigHistory.FileHistoryDao.copyConfigFile(FileHistoryDao.java:178)
at
hudson.plugins.jobConfigHistory.FileHistoryDao.createNewHistoryEntryAndCopyConfig(FileHistoryDao.java:250)
... 108 more
(cherry picked from commit 6825121f06d6427304fd5149531216ecae6fdf93)
Commit: 8478e24609d407268bd579609bf0ce3ad395a046
https://github.com/jenkinsci/jenkins/commit/8478e24609d407268bd579609bf0ce3ad395a046
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M core/src/main/java/hudson/model/Fingerprint.java
M core/src/main/java/hudson/model/ListView.java
M core/src/main/java/hudson/model/listeners/ItemListener.java
M core/src/main/java/hudson/tasks/BuildTrigger.java
Log Message:
-----------
[FIXED JENKINS-25400] Rework fix of JENKINS-22769 (c04cdcd) to put the burden
on each listener to impersonate ACL.SYSTEM if it needs to.
(cherry picked from commit a6a3d5e1660735edc18d331500f7ce9850fbc724)
Conflicts:
changelog.html
Commit: 03600e925c3d674b204981a140031a4ae3571609
https://github.com/jenkinsci/jenkins/commit/03600e925c3d674b204981a140031a4ae3571609
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.580.2
Commit: 0e445324fbb6e24e9f1a1d2201834ba7410c024e
https://github.com/jenkinsci/jenkins/commit/0e445324fbb6e24e9f1a1d2201834ba7410c024e
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 66975f6158423cb60e6ea15852d3c3d6f8b06dfc
https://github.com/jenkinsci/jenkins/commit/66975f6158423cb60e6ea15852d3c3d6f8b06dfc
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths:
M debian/debian/changelog
Log Message:
-----------
updated changelog as a part of the release
Commit: 4629122c5572be5bb1bad4183379a3374b308f6d
https://github.com/jenkinsci/jenkins/commit/4629122c5572be5bb1bad4183379a3374b308f6d
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M core/src/main/resources/lib/hudson/buildHealth.jelly
Log Message:
-----------
[FIXED JENKINS-25074] Make sure to call Job.getBuildHealthReports just once
per t:buildHealth render.
(cherry picked from commit f463abbe53488747725ea2e45dfc4a98ada02b8e)
Conflicts:
changelog.html
Commit: cca17cc4f6106304c954a0bf3942ad0d7be4c7e6
https://github.com/jenkinsci/jenkins/commit/cca17cc4f6106304c954a0bf3942ad0d7be4c7e6
Author: N Nachiappan <nna...@sighapply.corp.ne1.yahoo.com>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M core/src/main/java/jenkins/model/Jenkins.java
Log Message:
-----------
[FIXED JENKINS-25473] move config file check as part of loading job to do it
in multithread fashion than in a single thread
(cherry picked from commit dc547cf2974365a6b355de9981b7183f3d4fc17f)
Commit: 7169a3916528ac95eada2cf13e3fbd7e50ae6387
https://github.com/jenkinsci/jenkins/commit/7169a3916528ac95eada2cf13e3fbd7e50ae6387
Author: Christof Schoell <c.scho...@external.telekom.de>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M
core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
M test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java
Log Message:
-----------
[JENKINS-25144]
return authentication object instead of null if authentication is not
required - otherwise valid login fails with basic authentication
(cherry picked from commit 0176b6d902faeec7bff63eb34ce16e2f70062035)
Commit: be34b675f0f9cb59a67c09dbe42364d34c3eaff1
https://github.com/jenkinsci/jenkins/commit/be34b675f0f9cb59a67c09dbe42364d34c3eaff1
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M core/src/main/java/jenkins/security/BasicHeaderProcessor.java
M
core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
Log Message:
-----------
[FIXED JENKINS-25144] Revisiting the attempted fix in the previous commit.
IIUC, the issue here is that the request in question contains both a
valid session cookie AND basic authentication header, and that path
results in a failure because BasicHeaderProcessor expects one of
BasicHeaderAuthenticators to validate the basic authentication header
(without knowing that there's already a valid Authentication object that
came from the HTTP session, yet no BasicHeaderAuthenticator actually
processes this because BasicHeaderRealPasswordAuthenticator backs away
from doing that.
I think the corect fix is for BasicHeaderRealPasswordAuthenticator to
get rid of authenticationIsRequired check. This check instead belongs to
BasicHeaderProcessor, where it should be used to check if any
BasicHeaderAuthenticator should be consulted or not.
The problem with having this logic in
BasicHeaderRealPasswordAuthenticator is that this is just an
implementation of an extension point, and thus it needs to be removable.
As it stands right now in this fix, if this impl is removed,
JENKINS-25144 will be back again.
(cherry picked from commit 9e81b8e4feebceef94d117b757952c965bf91c61)
Commit: bd0453fe98e33cd99df9920c822210e49ad5cb6e
https://github.com/jenkinsci/jenkins/commit/bd0453fe98e33cd99df9920c822210e49ad5cb6e
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
M core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
M core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java
Log Message:
-----------
[FIXED JENKINS-25655] Incorrect caching from entrySet sometimes caused
incorrect results.
Caused a failure in
hudson.plugins.promoted_builds.conditions.ManualConditionTest.testManualPromotionProcessViaWebClient
when run against 1.580.1.
(cherry picked from commit b76e7bf9988ebf5b3b7e2c5e588d5ce6dbde957e)
Commit: 23e0d6ad1964e0efdd1e0f1c90360321acc8a073
https://github.com/jenkinsci/jenkins/commit/23e0d6ad1964e0efdd1e0f1c90360321acc8a073
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M core/src/main/java/hudson/FilePath.java
M core/src/main/java/hudson/tasks/ArtifactArchiver.java
M core/src/main/java/hudson/util/FormFieldValidator.java
M core/src/test/java/hudson/FilePathTest.java
Log Message:
-----------
[FIXED JENKINS-25759] Avoid consuming too much memory while running
validateAntFileMask.
Not fully solved, since the scannedDirs field can still grow to be large, but
at least clearing files/dirsNotIncluded.
Also imposing a 5s timeout on the scan regardless of file count, and defining a
user-customizable bound.
(cherry picked from commit 534328b264f9338e48418d2bcc0d28daaf48b3a0)
Conflicts:
changelog.html
Commit: 5e02457709e72c1577cf9a6a52a6bd9450acd590
https://github.com/jenkinsci/jenkins/commit/5e02457709e72c1577cf9a6a52a6bd9450acd590
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M core/src/main/java/jenkins/security/DefaultConfidentialStore.java
Log Message:
-----------
Misleading error message.
(cherry picked from commit e4c5c7104206536c80379ce18ec640f56b7dba74)
Commit: 5ded56a8288dfcfb9e389ea85edc13cf49981a2a
https://github.com/jenkinsci/jenkins/commit/5ded56a8288dfcfb9e389ea85edc13cf49981a2a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M core/src/main/java/jenkins/security/DefaultConfidentialStore.java
Log Message:
-----------
[FIXED JENKINS-25937] Treat BadPaddingException as an unloadable key and
continue.
(cherry picked from commit 6318b8d800abdf8b280f4e1b8ce8bf22e49242ad)
Conflicts:
changelog.html
Commit: ea6baf9a103b841ec99dd1c2a9aac85fe6d8d29f
https://github.com/jenkinsci/jenkins/commit/ea6baf9a103b841ec99dd1c2a9aac85fe6d8d29f
Author: Richard Mortimer <ri...@oldelvet.org.uk>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M
core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
Log Message:
-----------
[FIXES JENKINS-24272] jnlp slaves fail to reconnect when master is restarted
During master restart only attempt to reconnect the slave after the master has
finished restarting.
(cherry picked from commit 48e19c58f9e2caa998d0942417d58679f5ce47f0)
Commit: 23152a6da4212b65398650faed91146364343b2f
https://github.com/jenkinsci/jenkins/commit/23152a6da4212b65398650faed91146364343b2f
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
R test/src/test/groovy/hudson/model/RunMapTest.groovy
A test/src/test/java/hudson/model/RunMapTest.java
Log Message:
-----------
For RunMapTest to be Groovy was pointless and aggravating.
(cherry picked from commit 30f00b111ad7e6ef689ae018969b2b9dc5ce1571)
Commit: 21a619f2e0ad1658435c9edf5e461d9309ff26af
https://github.com/jenkinsci/jenkins/commit/21a619f2e0ad1658435c9edf5e461d9309ff26af
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M test/src/test/java/hudson/model/RunMapTest.java
Log Message:
-----------
JUnit 4.
(cherry picked from commit 96ecabedb0a6bc77f7f838bdaa5482f4f2c10190)
Commit: 14d676bb15dbf8ddc3208bd8a80033e831756d49
https://github.com/jenkinsci/jenkins/commit/14d676bb15dbf8ddc3208bd8a80033e831756d49
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
M test/src/test/java/hudson/model/RunMapTest.java
Log Message:
-----------
[FIXED JENKINS-25788] RunMap.remove was always returning false, even when the
Run was in fact removed.
(cherry picked from commit ce94579c50621990517c86120236ee9a1d0490da)
Conflicts:
changelog.html
Commit: 2172503f3ce2acf1dd9fb95891e41441bff5197f
https://github.com/jenkinsci/jenkins/commit/2172503f3ce2acf1dd9fb95891e41441bff5197f
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M core/src/main/resources/hudson/model/Computer/index.jelly
M core/src/main/resources/hudson/model/Label/index.jelly
Log Message:
-----------
[FIXED JENKINS-25989] Allow breaking label and node lists
(cherry picked from commit 2820e59202975ce8ad302e4a0b0e17c07e4c40cf)
Commit: 3603b69938e72bd7a03dd431cd1ac7066a5646ef
https://github.com/jenkinsci/jenkins/commit/3603b69938e72bd7a03dd431cd1ac7066a5646ef
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
Single/Multiline Build History
(cherry picked from commit cb9036c45527223525cc1b48020a8ed777020c1a)
Commit: f90e53583a7d7aa06660733374ebc458ffd04342
https://github.com/jenkinsci/jenkins/commit/f90e53583a7d7aa06660733374ebc458ffd04342
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-01-08 (Thu, 08 Jan 2015)
Changed paths:
M core/src/main/java/hudson/FilePath.java
M core/src/main/java/hudson/tasks/ArtifactArchiver.java
M core/src/main/java/hudson/util/FormFieldValidator.java
M core/src/main/java/jenkins/model/Jenkins.java
M core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
M core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
M core/src/main/java/jenkins/security/BasicHeaderProcessor.java
M
core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
M core/src/main/java/jenkins/security/DefaultConfidentialStore.java
M
core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java
M core/src/main/resources/hudson/model/Computer/index.jelly
M core/src/main/resources/hudson/model/Label/index.jelly
M core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
M core/src/main/resources/lib/hudson/buildHealth.jelly
M core/src/test/java/hudson/FilePathTest.java
M core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java
R test/src/test/groovy/hudson/model/RunMapTest.groovy
A test/src/test/java/hudson/model/RunMapTest.java
M test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
Merge branch 'stable-1.580' of github.com:jenkinsci/jenkins into stable-1.580
Commit: a82b5e195b5ffa501eeb236d15dbb506421435aa
https://github.com/jenkinsci/jenkins/commit/a82b5e195b5ffa501eeb236d15dbb506421435aa
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
M core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
Revert "Single/Multiline Build History"
This reverts commit 3603b69938e72bd7a03dd431cd1ac7066a5646ef.
Commit: 49ffccaf030ec85a83f22a86e76a4e94ec314fa2
https://github.com/jenkinsci/jenkins/commit/49ffccaf030ec85a83f22a86e76a4e94ec314fa2
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-01-27 (Tue, 27 Jan 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.580.3
Commit: 9a3ff6c687fc781e609f12b5fabcc100bea00200
https://github.com/jenkinsci/jenkins/commit/9a3ff6c687fc781e609f12b5fabcc100bea00200
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-01-27 (Tue, 27 Jan 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 11c81cacf5776415cd68ee26f32e5d28549a0322
https://github.com/jenkinsci/jenkins/commit/11c81cacf5776415cd68ee26f32e5d28549a0322
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-01-27 (Tue, 27 Jan 2015)
Changed paths:
M debian/debian/changelog
Log Message:
-----------
updated changelog as a part of the release
Commit: e471b8b0e21ebb9265a983ad12c02ee7a973454a
https://github.com/jenkinsci/jenkins/commit/e471b8b0e21ebb9265a983ad12c02ee7a973454a
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
Towards 1.596.1
Commit: d671beffe68236bdcd82c2156ef2fbd4f7c03e69
https://github.com/jenkinsci/jenkins/commit/d671beffe68236bdcd82c2156ef2fbd4f7c03e69
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M changelog.html
M core/src/main/java/hudson/model/DownloadService.java
M core/src/main/java/hudson/model/UpdateSite.java
M core/src/main/java/jenkins/model/DownloadSettings.java
M
core/src/main/resources/hudson/model/UpdateCenter/PageDecoratorImpl/footer.jelly
A
core/src/main/resources/jenkins/model/DownloadSettings/Warning/message.jelly
A
core/src/main/resources/jenkins/model/DownloadSettings/Warning/message.properties
M core/src/main/resources/jenkins/model/DownloadSettings/config.groovy
M
core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
A test/src/test/java/hudson/model/DownloadService2Test.java
M test/src/test/java/hudson/model/DownloadServiceTest.java
A
test/src/test/resources/hudson/model/hudson.tasks.Maven.MavenInstaller.json.html
A test/src/test/resources/hudson/model/hudson.tools.JDKInstaller.json.html
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/pom.xml
core/src/main/java/hudson/model/DownloadService.java
core/src/main/java/hudson/model/UpdateSite.java
core/src/main/java/jenkins/model/DownloadSettings.java
core/src/main/java/jenkins/util/JSONSignatureValidator.java
core/src/main/resources/hudson/model/UpdateCenter/PageDecoratorImpl/footer.jelly
core/src/main/resources/jenkins/model/DownloadSettings/config.groovy
core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
test/src/test/java/hudson/model/DownloadServiceTest.java
Commit: 3520042b1b4cdd11f07c4f4d5a80aeafa1a09377
https://github.com/jenkinsci/jenkins/commit/3520042b1b4cdd11f07c4f4d5a80aeafa1a09377
Author: christ66 <schristo...@gmail.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M core/src/main/java/hudson/model/ItemGroupMixIn.java
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
A
test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
Log Message:
-----------
[JENKINS-22811] Folder loading can break when an item inside the folder fails
to load or throws an Exception.
(cherry picked from commit 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a)
Commit: 16ee133b480787101edc039d94c4f6ff055d4ff7
https://github.com/jenkinsci/jenkins/commit/16ee133b480787101edc039d94c4f6ff055d4ff7
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
Log Message:
-----------
[FIXED JENKINS-23568] Be sure to release WorkspaceList.Lease
deterministically in a finally block.
(cherry picked from commit 47fa17ba61dac99052304b5a9bb44878ed5898c6)
Conflicts:
changelog.html
Commit: 8b528efc49c2735fd3418b4fcb94832190339425
https://github.com/jenkinsci/jenkins/commit/8b528efc49c2735fd3418b4fcb94832190339425
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
Log Message:
-----------
[JENKINS-22811] Fixed compilation error
(cherry picked from commit b5213b3815d3223f619113ebbccde4a8733df4c0)
Commit: 383223bc467d8e3b77dce0cdc4b542f154e1adc1
https://github.com/jenkinsci/jenkins/commit/383223bc467d8e3b77dce0cdc4b542f154e1adc1
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
Log Message:
-----------
[JENKINS-22811] Obtain folder from jenkins instead of using local variable.
(cherry picked from commit 8f24c4aa5ccd944c4647e9f99077cad46cb24a2d)
Commit: 82adc7ff70438ef2484aecfa7d5f31a98b3d9783
https://github.com/jenkinsci/jenkins/commit/82adc7ff70438ef2484aecfa7d5f31a98b3d9783
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
Log Message:
-----------
[JENKINS-22811] Mark test extension with the correct annotation
(cherry picked from commit fa40c102f5dbd8b02470317d730a3778c9153b64)
Commit: 758cb5be1eee8d600734c97a15666002d7c1d39a
https://github.com/jenkinsci/jenkins/commit/758cb5be1eee8d600734c97a15666002d7c1d39a
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
M core/src/main/java/hudson/model/Actionable.java
M core/src/main/java/hudson/model/Project.java
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
M
test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
Log Message:
-----------
[JENKINS-22811] If a project action fails to load we should log the project
action and continue to load the project.
(cherry picked from commit c3eb1cac794e2cf8efcb26695e8eb27ed80ece5c)
Commit: ee309ef92096610259b0ec01e82940ba022bed1a
https://github.com/jenkinsci/jenkins/commit/ee309ef92096610259b0ec01e82940ba022bed1a
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
M core/src/main/java/hudson/model/Actionable.java
Log Message:
-----------
[JENKINS-22811] Fix log message to report more verbose message.
(cherry picked from commit da1c74f619feea134aa887b1e5b1774307ea0e47)
Commit: 937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256
https://github.com/jenkinsci/jenkins/commit/937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/ItemGroupMixIn.java
Log Message:
-----------
[JENKINS-22811] Remove redundant catch exception
(cherry picked from commit d58c3cd5d6ac851f0a28b1c1bb6dbeb02fd2b1c9)
Commit: 13774a105d6b750689afe67261f85c5fd949d371
https://github.com/jenkinsci/jenkins/commit/13774a105d6b750689afe67261f85c5fd949d371
Author: christ66 <schristo...@gmail.com>
Date: 2015-02-01 (Sun, 01 Feb 2015)
Changed paths:
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
Log Message:
-----------
[JENKINS-22811] Remove unnecessary check in test unit. Fix misleading test
unit comment.
(cherry picked from commit 3661ed5093ee1f4dd508bbea8272de447fcc6996)
Commit: 79379fde471eac7bcecad2a8cbde6ecf9e7b4e68
https://github.com/jenkinsci/jenkins/commit/79379fde471eac7bcecad2a8cbde6ecf9e7b4e68
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M war/src/main/webapp/css/style.css
Log Message:
-----------
Revert "Tweak of earlier fix for JENKINS-25971"
This reverts commit 3e9cdcbc8527d6ee2be143aad3365df8fcd02c74.
(cherry picked from commit 66c02a4cc32a22cc81311eb6b478359082924c92)
Commit: f98947f6e426eb3e922e0836c279084caa296547
https://github.com/jenkinsci/jenkins/commit/f98947f6e426eb3e922e0836c279084caa296547
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M core/src/main/resources/lib/layout/layout.jelly
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
[FIX JENKINS-26312] reimpl of layout changes 3e9cdcb
Attempt to do it in pure CSS ala 3e9cdcb failed so using CSS and JS combo.
(cherry picked from commit e2ec9eb3c23a6b4f63c338e634d647486a136f7b)
Commit: 8576c0b6ab720f5dd072b1279a726fcd2b3d0389
https://github.com/jenkinsci/jenkins/commit/8576c0b6ab720f5dd072b1279a726fcd2b3d0389
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
prototypejs setStyle different behavior between firefox and chrome
(cherry picked from commit 7a9649ca704bcf6efb7b15edb2a0d7c0039bca9b)
Commit: 0817b78df204c2403b598d2271c925523d5eb08f
https://github.com/jenkinsci/jenkins/commit/0817b78df204c2403b598d2271c925523d5eb08f
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M core/src/main/resources/lib/hudson/progressiveText.jelly
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
force panel resize check before progressiveText bottom scroll
(cherry picked from commit 0b2bf7ad609c62f6bece7fa7258cb61c7e4f3dcf)
Commit: 1e884de087ca37d108e59d81118514827d6e2711
https://github.com/jenkinsci/jenkins/commit/1e884de087ca37d108e59d81118514827d6e2711
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
M core/src/main/java/hudson/model/Actionable.java
M core/src/main/java/hudson/model/ItemGroupMixIn.java
M core/src/main/java/hudson/model/Project.java
M core/src/main/resources/lib/hudson/progressiveText.jelly
M core/src/main/resources/lib/layout/layout.jelly
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
A
test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
Merge branch 'stable-1.596' into security-stable-1.596
Commit: 7515734b6dd453a8ed4ac2401df16f25d140ea26
https://github.com/jenkinsci/jenkins/commit/7515734b6dd453a8ed4ac2401df16f25d140ea26
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractItem.java
M core/src/main/java/hudson/model/User.java
M core/src/main/java/hudson/model/View.java
M core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
A core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java
A core/src/main/java/jenkins/util/xml/XMLUtils.java
M core/src/main/resources/hudson/model/Messages.properties
A core/src/test/java/jenkins/xml/XMLUtilsTest.java
A test/src/test/java/hudson/model/AbstractItemTest.java
A test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java
A test/src/test/java/hudson/security/pages/SignupPage.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/src/main/java/hudson/model/AbstractItem.java
core/src/main/resources/hudson/model/Messages.properties
Commit: 1ec6abe681e065e47d7194b3ff6b36ca235acd2e
https://github.com/jenkinsci/jenkins/commit/1ec6abe681e065e47d7194b3ff6b36ca235acd2e
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
A test/src/test/java/hudson/model/AbstractItemSecurityTest.java
R test/src/test/java/hudson/model/AbstractItemTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Commit: 253762ac34eff93648a0e3eb1eb0b9cf3fe59ad1
https://github.com/jenkinsci/jenkins/commit/253762ac34eff93648a0e3eb1eb0b9cf3fe59ad1
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M core/src/main/java/hudson/ClassicPluginStrategy.java
M core/src/main/java/hudson/model/User.java
M core/src/main/java/hudson/security/ACL.java
M core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java
M core/src/main/java/jenkins/util/xml/XMLUtils.java
M pom.xml
M test/pom.xml
M test/src/test/java/hudson/model/AbstractItemSecurityTest.java
M test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java
M war/pom.xml
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/cli/AddJobToViewCommand.java
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
core/src/main/java/jenkins/model/IdStrategyDescriptor.java
core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
core/src/main/resources/hudson/model/Job/index.jelly
core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
core/src/main/resources/hudson/node_monitors/Messages_cs.properties
core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
core/src/main/resources/jenkins/model/IdStrategy/config.jelly
core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly
core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
core/src/main/resources/jenkins/triggers/Messages_fr.properties
core/src/main/resources/lib/form/helpLink_pt_BR.properties
core/src/main/resources/lib/form/link.jelly
core/src/main/resources/lib/hudson/project/configurable.properties
core/src/main/resources/lib/hudson/project/configurable_bg.properties
core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
core/src/main/resources/lib/hudson/project/configurable_eu.properties
core/src/main/resources/lib/hudson/project/configurable_gl.properties
core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
core/src/main/resources/lib/hudson/project/configurable_nl.properties
core/src/main/resources/lib/hudson/project/configurable_tr.properties
core/src/main/resources/lib/hudson/project/console-link.jelly
core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
core/src/main/resources/lib/layout/pane_de.properties
core/src/main/resources/lib/layout/pane_pt.properties
core/src/main/resources/lib/layout/pane_pt_BR.properties
core/src/main/resources/lib/layout/task_pt.properties
pom.xml
test/pom.xml
test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
war/src/main/webapp/scripts/msie.js
Commit: ac0db088c03b0fffb066c9f419c282d406289618
https://github.com/jenkinsci/jenkins/commit/ac0db088c03b0fffb066c9f419c282d406289618
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Commit: 7288fea48899e217b9e26c2377df66ff81f93d9a
https://github.com/jenkinsci/jenkins/commit/7288fea48899e217b9e26c2377df66ff81f93d9a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
test/src/test/java/hudson/tasks/BuildTriggerTest.java
Commit: 842e6d8ecaec77344dd6762141a1c849eb5b9a73
https://github.com/jenkinsci/jenkins/commit/842e6d8ecaec77344dd6762141a1c849eb5b9a73
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-06 (Fri, 06 Feb 2015)
Changed paths:
M core/src/main/java/hudson/model/Api.java
A core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java
M test/src/test/java/hudson/model/ApiTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/src/main/java/hudson/model/Api.java
Commit: 9285ed86a2d59f2db50b0f273ee6c6ee365fec43
https://github.com/jenkinsci/jenkins/commit/9285ed86a2d59f2db50b0f273ee6c6ee365fec43
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-07 (Sat, 07 Feb 2015)
Changed paths:
M core/src/main/java/jenkins/util/VirtualFile.java
A core/src/test/java/jenkins/util/VirtualFileTest.java
M test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
Commit: 3c2e8171f89d173d247123aaeaf10f60a9472977
https://github.com/jenkinsci/jenkins/commit/3c2e8171f89d173d247123aaeaf10f60a9472977
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M core/src/main/java/hudson/PluginManager.java
M core/src/test/java/hudson/PluginManagerTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/src/main/java/hudson/PluginManager.java
core/src/test/java/hudson/PluginManagerTest.java
Commit: 6739d35253404e97cade3e6c4ea4bea57bae1aab
https://github.com/jenkinsci/jenkins/commit/6739d35253404e97cade3e6c4ea4bea57bae1aab
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
pom.xml
Commit: 9f12f91190bebbc2a9c3311f0fb3074877bbf216
https://github.com/jenkinsci/jenkins/commit/9f12f91190bebbc2a9c3311f0fb3074877bbf216
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-02-28 (Sat, 28 Feb 2015)
Changed paths:
M test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Commit: ee8cec3ad931b73a11006912172d73b095a7713c
https://github.com/jenkinsci/jenkins/commit/ee8cec3ad931b73a11006912172d73b095a7713c
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-02-28 (Sat, 28 Feb 2015)
Changed paths:
A core/src/main/java/jenkins/fun/Jenkins100K.java
A core/src/main/resources/jenkins/fun/Jenkins100K/index.jelly
A war/src/main/webapp/images/100k.png
Log Message:
-----------
Added Jenkins 100K easter egg for 1.600
My plan is to remove this in a while.
(cherry picked from commit fe1a1487d527b0280d5ccebdb20cde3b753d4702)
Commit: 9dff4b0f74d33fae41cca5c20b93fca198699723
https://github.com/jenkinsci/jenkins/commit/9dff4b0f74d33fae41cca5c20b93fca198699723
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-02-28 (Sat, 28 Feb 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.596.1
Commit: 53249197260bff698ed8574254f5312c8687ef03
https://github.com/jenkinsci/jenkins/commit/53249197260bff698ed8574254f5312c8687ef03
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-02-28 (Sat, 28 Feb 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: b8a559c820a984935639fea088a60a7e9a68953f
https://github.com/jenkinsci/jenkins/commit/b8a559c820a984935639fea088a60a7e9a68953f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-02-28 (Sat, 28 Feb 2015)
Changed paths:
M debian/debian/changelog
Log Message:
-----------
updated changelog as a part of the release
Commit: 669e1dc99f5265e7c0249032f297b6e87f12c471
https://github.com/jenkinsci/jenkins/commit/669e1dc99f5265e7c0249032f297b6e87f12c471
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-03-01 (Sun, 01 Mar 2015)
Changed paths:
M core/src/main/resources/hudson/model/RunParameterValue/value.jelly
Log Message:
-----------
[FIXED JENKINS-25174] Show run display name on parameters page
(cherry picked from commit 3ed7778bd42b99fc5fbef66d63d96604c279ec78)
Commit: dd2083aa4734836164b82a86608ad8a9ec353a02
https://github.com/jenkinsci/jenkins/commit/dd2083aa4734836164b82a86608ad8a9ec353a02
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-01 (Sun, 01 Mar 2015)
Changed paths:
M core/src/main/java/hudson/tasks/Fingerprinter.java
Log Message:
-----------
[FIXED JENKINS-19392] Simpler and more efficient to use String.intern to
compact fingerprint data.
This should work across builds and even across jobs, and does not force us to
load other builds.
(cherry picked from commit 2f59ffc475dc73a9a9cd5a7596819f3242c22f6f)
Conflicts:
changelog.html
Commit: 6e67cb9e28707c19ded5c5c5c301ffe179ed5d64
https://github.com/jenkinsci/jenkins/commit/6e67cb9e28707c19ded5c5c5c301ffe179ed5d64
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M core/src/main/grammar/crontab.g
M core/src/main/java/hudson/scheduler/BaseParser.java
Log Message:
-----------
[FIXED JENKINS-25897] Add range check for H(X-Y) syntax
(cherry picked from commit 9a8329ebfe6b713acd8c6e42de095e44cd126f2c)
Commit: b7ccd6bb14becb51a5df9ebf043d28323abd538a
https://github.com/jenkinsci/jenkins/commit/b7ccd6bb14becb51a5df9ebf043d28323abd538a
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M core/src/test/java/hudson/scheduler/CronTabTest.java
Log Message:
-----------
[JENKINS-25897] Add tests
(cherry picked from commit b090751c16242402ad2187292e40f0f7bd5bbe10)
Commit: bf6859f059bc809a8b1bae6ef184af56a37f79e0
https://github.com/jenkinsci/jenkins/commit/bf6859f059bc809a8b1bae6ef184af56a37f79e0
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/JDK.java
Log Message:
-----------
[FIXED JENKINS-25601] Amend JAVA_HOME check to work with JDK 9
(cherry picked from commit 1186e7b4047a70162a1a3be399fc449ae3b0e1f5)
Commit: 56795ba1f30ea9f060c9bb1e302fcff9827dd947
https://github.com/jenkinsci/jenkins/commit/56795ba1f30ea9f060c9bb1e302fcff9827dd947
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
Log Message:
-----------
[FIXED JENKINS-22311] Show queue item parameters in tool tip
(cherry picked from commit 44e6b5d76211bc40e1a608ae3aa93c083befaeba)
Commit: ff26bb8a18c62a4cd008cfff935166e38ee94f6a
https://github.com/jenkinsci/jenkins/commit/ff26bb8a18c62a4cd008cfff935166e38ee94f6a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/LoadBalancer.java
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/jenkins/model/Jenkins.java
M test/src/test/java/hudson/model/QueueTest.java
Log Message:
-----------
[JENKINS-10944] Merge branch 'master' into FlyweightTask-JENKINS-10944
(cherry picked from commit 1a80973ab875d12c3eda61ebb25850795d9cb6d6)
Commit: 4c4fb74043fa264a29d83d63d77cbb96de83d840
https://github.com/jenkinsci/jenkins/commit/4c4fb74043fa264a29d83d63d77cbb96de83d840
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M war/src/main/webapp/css/style.css
Log Message:
-----------
[FIXED JENKINS-26365] Animated ball in job's build history widget won't open
Console Output
(cherry picked from commit 1dd60ec7780870f9c11686659178e52d251c15fc)
Conflicts:
changelog.html
Commit: 2f4d890785803c22438a40456b08130d61910e87
https://github.com/jenkinsci/jenkins/commit/2f4d890785803c22438a40456b08130d61910e87
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M test/src/test/java/hudson/model/QueueTest.java
M test/src/test/java/hudson/slaves/DummyCloudImpl.java
A test/src/test/java/hudson/slaves/NodeProvisionerRule.java
M test/src/test/java/hudson/slaves/NodeProvisionerTest.java
Log Message:
-----------
JUnit 4.
(cherry picked from commit 778e9e194e66c79b36bab81b621fcb829f4e7c5a)
Commit: 9abf36612a7a92422e0d6c688796bc0fca590ee8
https://github.com/jenkinsci/jenkins/commit/9abf36612a7a92422e0d6c688796bc0fca590ee8
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M core/src/main/java/hudson/util/FormValidation.java
M core/src/main/java/jenkins/security/ApiTokenProperty.java
M core/src/test/java/hudson/util/FormValidationTest.java
M test/src/test/java/hudson/model/UserTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Conflicts:
core/src/test/java/hudson/util/FormValidationTest.java
test/src/test/java/hudson/model/UserTest.java
Commit: 921cfa9ed8ecdc3ebd9f2bdac7caa80e5dcefb06
https://github.com/jenkinsci/jenkins/commit/921cfa9ed8ecdc3ebd9f2bdac7caa80e5dcefb06
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M core/src/main/java/hudson/security/HudsonFilter.java
A test/src/test/java/jenkins/security/Security177Test.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Commit: cefc52cb9422a7161bd29a94b6abe1b3d4ad25d9
https://github.com/jenkinsci/jenkins/commit/cefc52cb9422a7161bd29a94b6abe1b3d4ad25d9
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
M test/src/test/java/hudson/model/UserTest.java
Log Message:
-----------
Merge branch 'security' into security-stable-1.596
Commit: 7809846c90f2a99ace36d55b5a7a3f9f8679c6d7
https://github.com/jenkinsci/jenkins/commit/7809846c90f2a99ace36d55b5a7a3f9f8679c6d7
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.596.2
Commit: 520a8683b45560b5cbc6c1304d00a7cde0f0040f
https://github.com/jenkinsci/jenkins/commit/520a8683b45560b5cbc6c1304d00a7cde0f0040f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: dbd262bc0b7d558b6aa0d78376583ee7b51efea0
https://github.com/jenkinsci/jenkins/commit/dbd262bc0b7d558b6aa0d78376583ee7b51efea0
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M debian/debian/changelog
Log Message:
-----------
updated changelog as a part of the release
Commit: 7e72e7d1218e3443650d8d0c1e20b70d558422b0
https://github.com/jenkinsci/jenkins/commit/7e72e7d1218e3443650d8d0c1e20b70d558422b0
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/Build.java
M core/src/main/java/hudson/model/Run.java
A test/src/test/java/hudson/model/BuildExecutionTest.java
Log Message:
-----------
[JENKINS-26698] Make sure BuildExecution.cleanUp always calls super, to
release the workspace lease.
Also stop closing the build log in Run.handleFatalBuildProblem; we want to see
any subsequent messages too.
(cherry picked from commit 62af87b67a1097376b9af554421e621d32f7013f)
Commit: dc68946fcacdac8b7e1283d90235671eef5add10
https://github.com/jenkinsci/jenkins/commit/dc68946fcacdac8b7e1283d90235671eef5add10
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M core/src/main/java/hudson/slaves/WorkspaceList.java
M test/src/test/java/hudson/model/BuildExecutionTest.java
Log Message:
-----------
Make WorkspaceList.Lease implement AutoCloseable for Java 7 callers, to make
releasing the lease more convenient.
(cherry picked from commit a398cabd32786514d1c373f71c8d566dbc3b22f3)
Commit: 5ed111f0bc4aa1b2608b2aa780bc8778ef6ae60a
https://github.com/jenkinsci/jenkins/commit/5ed111f0bc4aa1b2608b2aa780bc8778ef6ae60a
Author: Ryan Campbell <ryan.campb...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M core/src/main/java/hudson/diagnosis/OldDataMonitor.java
M test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
Log Message:
-----------
[JENKINS-26718] Allow runs to be discarded even if their project can't be
found by its fullname
(cherry picked from commit 327f7780133b2e6083f49686e43298af83b0dea6)
Commit: 446f3cae9f1e660ae48e989a561b7d1ddb722127
https://github.com/jenkinsci/jenkins/commit/446f3cae9f1e660ae48e989a561b7d1ddb722127
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M war/src/main/webapp/css/style.css
M war/src/main/webapp/scripts/hudson-behavior.js
Log Message:
-----------
[FIXED JENKINS-26406] Build history text field wrap fails when containing
markup
(cherry picked from commit b31bb1cc1c5a61a3e984e45e33cafa6130517938)
Commit: f624aab02251fa7d4d97b05d41954d5dc34575a0
https://github.com/jenkinsci/jenkins/commit/f624aab02251fa7d4d97b05d41954d5dc34575a0
Author: Piotr Wielgolaski <pwielgola...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M war/src/main/webapp/css/style.css
Log Message:
-----------
[JENKINS-25953]Tabs in job view are layouted in wrong way
make equal height of tab regardless if selected or not
(cherry picked from commit 70613202f1177ce83e1d9d724a8b21ca9c222cd3)
Commit: 6e94ee3f5a620a2010dbbcf94eed1e834f1aa114
https://github.com/jenkinsci/jenkins/commit/6e94ee3f5a620a2010dbbcf94eed1e834f1aa114
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M test/src/test/java/hudson/tasks/MavenTest.java
Log Message:
-----------
[JENKINS-26684] Reproduce in unittest.
(cherry picked from commit fae41b01c9c034ab98216c92ca6bd171b8d81d6b)
Commit: 9eaba2af9f0fa2649390f83b9b67fe6ee22fe1ad
https://github.com/jenkinsci/jenkins/commit/9eaba2af9f0fa2649390f83b9b67fe6ee22fe1ad
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M core/src/main/java/hudson/tasks/Maven.java
Log Message:
-----------
[FIXED JENKINS-26684] Escape special chars in maven build step arguments
(cherry picked from commit 58a41bcb182290de681da01ba277b5e0d6211707)
Commit: 9441324dbc046a21132ce57e2b291a0899f449ff
https://github.com/jenkinsci/jenkins/commit/9441324dbc046a21132ce57e2b291a0899f449ff
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M test/src/test/java/hudson/tasks/MavenTest.java
Log Message:
-----------
More robust unit test
(cherry picked from commit a87a5a1a5c6c7594fb322e10c815d94052164e19)
Commit: 9bce20951c3ffe8e83a18a5a8d5743e183ebf3a8
https://github.com/jenkinsci/jenkins/commit/9bce20951c3ffe8e83a18a5a8d5743e183ebf3a8
Author: ikedam <de...@ikedam.jp>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
M test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
Log Message:
-----------
[FIXED JENKINS-4409] Disable URLConnection.useCache in tests on Windows. It
prevents deleting temporary directories when tests finish.
(cherry picked from commit c4e5fbdbc9c644f1afcae031b3b4638ad5297238)
Commit: f4611b7c3376d23a55e7857c15b3d21c8beef25d
https://github.com/jenkinsci/jenkins/commit/f4611b7c3376d23a55e7857c15b3d21c8beef25d
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractItem.java
Log Message:
-----------
JENKINS-27183 Avoid deadlock when using build-monitor-plugin
(cherry picked from commit fb5540e38c935676d7f58e9d2ce7a84275bb898f)
Commit: 27a2e3dbf00ce4f5fa5267a96852155ff4a14814
https://github.com/jenkinsci/jenkins/commit/27a2e3dbf00ce4f5fa5267a96852155ff4a14814
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M test/src/test/java/hudson/tasks/MavenTest.java
Log Message:
-----------
Fix missing import
Commit: 797b128083eb2969c0e31bae9e8b0e54550cedc3
https://github.com/jenkinsci/jenkins/commit/797b128083eb2969c0e31bae9e8b0e54550cedc3
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
R core/src/main/java/jenkins/fun/Jenkins100K.java
R core/src/main/resources/jenkins/fun/Jenkins100K/index.jelly
R war/src/main/webapp/images/100k.png
Log Message:
-----------
Revert "Added Jenkins 100K easter egg for 1.600"
This reverts commit ee8cec3ad931b73a11006912172d73b095a7713c.
Commit: 58edc35abf6c3d7da2800395a8af4433d49450a2
https://github.com/jenkinsci/jenkins/commit/58edc35abf6c3d7da2800395a8af4433d49450a2
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
Towards 1.609.1
Commit: 0ce181072cd068b76d0aa12557b09825bc7d31dc
https://github.com/jenkinsci/jenkins/commit/0ce181072cd068b76d0aa12557b09825bc7d31dc
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/pom.xml
Log Message:
-----------
[FIXED JENKINS-27918] Downgrade warning from Stapler.
(cherry picked from commit c51fd534634f06a34276a857c25983fd3d0c061c)
Commit: 0c2f237b261a76ddf6b6fc3b440fc91ab79467bf
https://github.com/jenkinsci/jenkins/commit/0c2f237b261a76ddf6b6fc3b440fc91ab79467bf
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/src/main/java/hudson/search/Search.java
M core/src/main/java/hudson/search/SuggestedItem.java
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
JENKINS-24433 Searchbox doesn't work properly inside a folder
(cherry picked from commit 44db6aef3f055455635da1e126bcd162c95f80df)
Commit: 4535beee8552aeaa73e2d811e5a4e07cecd35a2d
https://github.com/jenkinsci/jenkins/commit/4535beee8552aeaa73e2d811e5a4e07cecd35a2d
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
JENKINS-24433 Improving tests
(cherry picked from commit cb174607b348636eeaf27c6b0eab502ec1f2f3a6)
Commit: 7aad12ec0c5f0b75d6dcc2b909d603f003ab33f1
https://github.com/jenkinsci/jenkins/commit/7aad12ec0c5f0b75d6dcc2b909d603f003ab33f1
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
Correct tests
(cherry picked from commit 9afb092b44a7d72cc5f34aa9309822db3ca8afe0)
Commit: 0029ba827c834bfd018397303be4dee56bba5fef
https://github.com/jenkinsci/jenkins/commit/0029ba827c834bfd018397303be4dee56bba5fef
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
Corrent tab in assertTrue
(cherry picked from commit e5e53be0005745040694c8b2c90c1ac63923266f)
Commit: 54f952545eab62e2f24be57abf5acb2cf072488c
https://github.com/jenkinsci/jenkins/commit/54f952545eab62e2f24be57abf5acb2cf072488c
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
Corrent tab in assertTrue again
(cherry picked from commit dab565068347381498c5f3a83e11670391d53e0e)
Commit: 3c838705782ae84e458a265274b5b23a1e7c4af5
https://github.com/jenkinsci/jenkins/commit/3c838705782ae84e458a265274b5b23a1e7c4af5
Author: Felix Belzunce Arcos <fbelzuncear...@cloudbees.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/search/SearchTest.java
Log Message:
-----------
Tab major clean up
(cherry picked from commit 6528ff1e86055da06d74ece23c98d8015c6ea95e)
Commit: e7efb4430308acad09ceae9ee3f9433a22692ce4
https://github.com/jenkinsci/jenkins/commit/e7efb4430308acad09ceae9ee3f9433a22692ce4
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Executor.java
Log Message:
-----------
[FIXED JENKINS-28115] Division by zero in Executor.getProgress()
```
WARNING: Caught exception evaluating: executor.progress in /ajaxExecutors.
Reason: java.lang.reflect.InvocationTargetException
java.lang.reflect.InvocationTargetException
...
at java.lang.Thread.run(Thread.java:744)
Caused by: java.lang.ArithmeticException: / by zero
at hudson.model.Executor.getProgress(Executor.java:649)
... 154 more
```
(cherry picked from commit e685b604eeeed9c48bee2f728c3ecec3303e5c56)
Commit: d42e8465fc2829bc7a926fe8d52d3bdfaabd857e
https://github.com/jenkinsci/jenkins/commit/d42e8465fc2829bc7a926fe8d52d3bdfaabd857e
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/src/main/java/hudson/slaves/SlaveComputer.java
Log Message:
-----------
[FIXED JENKINS-28062] A Launcher.afterDisconnect() method that propagates an
exception is a sign of a bad Launcher not a problem closing the channel.
(cherry picked from commit d760216d1e3a927b971edf27c7af317a5de71e20)
Commit: 1fed368e4944efeab3bc7d87d905ffbdf79f0e73
https://github.com/jenkinsci/jenkins/commit/1fed368e4944efeab3bc7d87d905ffbdf79f0e73
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/src/main/resources/lib/form/hetero-list/hetero-list.js
Log Message:
-----------
[FIXED JENKINS-27067] Larger minimum popup menu height
(cherry picked from commit f6454983acff9687f0655d23157f723ca5e11090)
Commit: 11b89d9c0b46f0afad0ca86a11264b503b799c2e
https://github.com/jenkinsci/jenkins/commit/11b89d9c0b46f0afad0ca86a11264b503b799c2e
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Queue.java
Log Message:
-----------
[FIXED JENKINS-27708][FIXED JENKINS-27871] Ensure that identification of
blocked tasks is using the live state.
- The creation of a snapshot itself should be relatively cheap given the
expected rate of
job execution. You probably would need 100's of jobs starting execution every
iteration
of maintain() before this could even start to become an issue and likely the
calculation
of isBuildBlocked(p) will become a bottleneck before updateSnapshot() will.
Additionally
since the snapshot itself only ever has at most one reference originating
outside of the stack
it should remain in the eden space and thus be cheap to GC.
- JENKINS-27708 comments 225819 and 225906 provide more complex but logically
equivalent fixes of
this issue. I am favouring this approach as it is simpler and provides less
scope for error as any
new helper methods can just rely on the snapshot being up to date whereas
with the other
two candidates if a new helper method is introduced there is the potential to
miss adding support
for the live view. The comment 225819 has the risk of introducing extra lock
contention while
the comment 225906 version forces every access to the helper methods to pass
a second memory
barrier
(cherry picked from commit 5880ed830201f9349ae9def6653c19a186e1eb18)
Commit: 0d1efdad304df3c9cf5bd9157cce9e9fec5643aa
https://github.com/jenkinsci/jenkins/commit/0d1efdad304df3c9cf5bd9157cce9e9fec5643aa
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
M test/src/test/java/hudson/model/QueueTest.java
Log Message:
-----------
[JENKINS-27871] - Added a direct unit test for the issue
(cherry picked from commit 7514e8c6ce35283da4a8bb4422fe885350fc8681)
Commit: aadc9914ff34edaf564b67706852f34c17245fb4
https://github.com/jenkinsci/jenkins/commit/aadc9914ff34edaf564b67706852f34c17245fb4
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/LoadStatistics.java
Log Message:
-----------
[FIXED JENKINS-28384] NPE when Node.toComputer → null.
(cherry picked from commit 86bac90fcbc6f3720242fa0db8836e562d4113d7)
Commit: dfa17c4a18cb9585681102770db8b7117eab9531
https://github.com/jenkinsci/jenkins/commit/dfa17c4a18cb9585681102770db8b7117eab9531
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
[JENKINS-26781] lookup descriptor by ID, then by class if explicitly set
to match some specific use cases.
(cherry picked from commit 8881703f7c7351695c5d5b2662faefae60de68e8)
Commit: 929adc516289d5396234ecd180be45e8d249c449
https://github.com/jenkinsci/jenkins/commit/929adc516289d5396234ecd180be45e8d249c449
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
deprecated find(string) and introduce explicit methods
to lookup descriptor by id or by Describable class name
(cherry picked from commit 6a8ce6ca099cc9b51db6e1417e507973978a9271)
Commit: 5ecda7689970557f46b5e1dd8a34f748d578f5a4
https://github.com/jenkinsci/jenkins/commit/5ecda7689970557f46b5e1dd8a34f748d578f5a4
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
M core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
make $class and kind mutually exclusive
Use kind when descriptor.id != descriptor.clazz.name and $clazz otherwise.
(cherry picked from commit 901194ae77358b49016a32e6c97e74a70cbbb261)
Commit: 00cbb2823187df7efcf8c9de33907f0f58c77729
https://github.com/jenkinsci/jenkins/commit/00cbb2823187df7efcf8c9de33907f0f58c77729
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M test/src/test/java/hudson/model/DescriptorTest.java
Log Message:
-----------
[JENKINS-26781] Reproduced problem in test.
Besides failing in master, it also fails in 4e0af43 (merge of #1443), but
passes in the 1.598-SNAPSHOT parent 239caf8.
(cherry picked from commit 33041903ab67c3e32959b7b78e557ffb7d4ecd16)
Commit: df7d8623b9f14fcc51a5ba49136147566cdb343c
https://github.com/jenkinsci/jenkins/commit/df7d8623b9f14fcc51a5ba49136147566cdb343c
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M test/src/test/java/hudson/model/DescriptorTest.java
Log Message:
-----------
Now it passes.
(cherry picked from commit 8f1883a0ca9d676e8d23b1b6174459d9860cb541)
Commit: 0a6249e63a1cde16f2895212c4285e41ed2be559
https://github.com/jenkinsci/jenkins/commit/0a6249e63a1cde16f2895212c4285e41ed2be559
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
Added @since.
(cherry picked from commit c4c7259849b92dd02faddfd07aae5f4dda9040f8)
Commit: 9079eb8070eb409e449874bcc8abe0817ac96b61
https://github.com/jenkinsci/jenkins/commit/9079eb8070eb409e449874bcc8abe0817ac96b61
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
Improving Javadoc.
(cherry picked from commit 33923db17344b300ba59d15ba644f6dd23451dc1)
Commit: acc55190bb6be315f24504e75b1822e58c5c408b
https://github.com/jenkinsci/jenkins/commit/acc55190bb6be315f24504e75b1822e58c5c408b
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
findByClassName should not be advertised to outside code.
(cherry picked from commit 8dd079a8f04d3b9897b4e037378fc539ee5a6093)
Commit: 10821fc0a4a531ae35f979f3ab8f7a13c7bc2d8f
https://github.com/jenkinsci/jenkins/commit/10821fc0a4a531ae35f979f3ab8f7a13c7bc2d8f
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/DescriptorExtensionList.java
M core/src/main/java/hudson/model/ComputerSet.java
M core/src/main/java/hudson/model/Items.java
M core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
M core/src/main/java/hudson/util/DescriptorList.java
Log Message:
-----------
Noting deprecations more widely.
(cherry picked from commit 37167d5f0875bf2a7460f76a4a8fe7b3d4afa9d4)
Commit: d7a75713b29b90fd8e5b8d742659f7ac9c64f1fa
https://github.com/jenkinsci/jenkins/commit/d7a75713b29b90fd8e5b8d742659f7ac9c64f1fa
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
$class is not legacy, stapler-class is, so making sure it's not getting mixed
up.
(cherry picked from commit 4e2efcda7e4b94693240ab6ee51715073a93e87f)
Commit: ed9b16ece3ced99a3686acbec5261088864e1a83
https://github.com/jenkinsci/jenkins/commit/ed9b16ece3ced99a3686acbec5261088864e1a83
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
Doc improvements
(cherry picked from commit 3c4b1e63a271ddd3e35f7bda0c6ea7ea2a424cf8)
Commit: 13ea8b76d2ebef90a071841ceb5ad1bd84103407
https://github.com/jenkinsci/jenkins/commit/13ea8b76d2ebef90a071841ceb5ad1bd84103407
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/ComputerSet.java
Log Message:
-----------
Reverting whitespace change.
(cherry picked from commit f4ddac10838ba1fb5a17933d9fdd30163a1af79b)
Commit: ecc848b20dd3d972c76f9435e83908e419111fe2
https://github.com/jenkinsci/jenkins/commit/ecc848b20dd3d972c76f9435e83908e419111fe2
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
[FIXED JENKINS-28011] Amending #1563, ${descriptor} is not necessarily
${attrs.descriptor}!
(cherry picked from commit 343382b9ff8a978f6914cc64714a5c16bd9b511a)
Commit: 30f13604b8a2873188b19b1364ab8a7ccff645eb
https://github.com/jenkinsci/jenkins/commit/30f13604b8a2873188b19b1364ab8a7ccff645eb
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
newInstancesFromHeteroList should recover gracefully from the case that both
kind and $class are missing.
(cherry picked from commit 17a88352abd07b0b3f59a221f2c1ed5c88d97e8c)
Commit: 83c7f8467c15e10b18833acae1154bdf285a589a
https://github.com/jenkinsci/jenkins/commit/83c7f8467c15e10b18833acae1154bdf285a589a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
Log Message:
-----------
[FIXED JENKINS-28093] Reverting getDownloadableId from #1563. Not compatible.
(cherry picked from commit 972db2a593fc978b8fb16a8d14cf485b8679c6e2)
Commit: 2e51740fbeef363a888446846b497550d4d2981b
https://github.com/jenkinsci/jenkins/commit/2e51740fbeef363a888446846b497550d4d2981b
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/resources/lib/form/class-entry.jelly
Log Message:
-----------
[FIXED JENKINS-28110] Always generate stapler-class, even when generating
kind.
(cherry picked from commit ef2b6580a8621a4a627ef015481d58bf4c83a682)
Commit: 11d46ad639943feb9f17da5d4d1529cdfbd87495
https://github.com/jenkinsci/jenkins/commit/11d46ad639943feb9f17da5d4d1529cdfbd87495
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M test/src/test/java/hudson/model/DescriptorTest.java
A test/src/test/resources/hudson/model/DescriptorTest/B1/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/B2/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D1/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D2/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D3/config.jelly
Log Message:
-----------
[JENKINS-28110] Reproduced problem in test.
Starting in 4f24a02 (1.587-SNAPSHOT, before #1443 or stapler #39),
nestedDescribableOverridingId passes.
nestedDescribableSharingClass fails given {stapler-class: D3, kind: d3a}.
(Stapler has no way of interpreting kind since it knows nothing of Descriptor,
only implementation class names.)
In master (3080573), both fail in the way reported (only kind is passed in).
After adding stapler-class back, nestedDescribableOverridingId passes again.
(cherry picked from commit 1f41bec8ef656da014b7145fdff82563c030ca29)
Commit: 3ebd0b3930da70d554e744d3640e9ad7dba40b14
https://github.com/jenkinsci/jenkins/commit/3ebd0b3930da70d554e744d3640e9ad7dba40b14
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
@kohsuke requested some more comments in the code itself.
Given the minefield that is databinding, that seems prudent.
(cherry picked from commit 8e0cbbc98b5a0e373a83d7de066f2afe72d553f7)
Commit: c15bd27978e85915e9c96739f5e2c8a5a6d48625
https://github.com/jenkinsci/jenkins/commit/c15bd27978e85915e9c96739f5e2c8a5a6d48625
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/model/Descriptor.java
Log Message:
-----------
Using @Restricted(NoExternalUse.class) rather than @since for backported API
additions (as opposed to b62a07c0dbba637001539c1e668be814a164f701).
Commit: 0f0047a17d04aa0111e76046b5d3c8b1208e8385
https://github.com/jenkinsci/jenkins/commit/0f0047a17d04aa0111e76046b5d3c8b1208e8385
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M core/src/main/java/hudson/DescriptorExtensionList.java
M core/src/main/java/hudson/model/ComputerSet.java
M core/src/main/java/hudson/model/Descriptor.java
M core/src/main/java/hudson/model/Items.java
M core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
M core/src/main/java/hudson/util/DescriptorList.java
M core/src/main/resources/lib/form/class-entry.jelly
M test/src/test/java/hudson/model/DescriptorTest.java
A test/src/test/resources/hudson/model/DescriptorTest/B1/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/B2/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D1/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D2/config.jelly
A test/src/test/resources/hudson/model/DescriptorTest/D3/config.jelly
Log Message:
-----------
Merge pull request #1701 from jglick/backport-JENKINS-26781
[JENKINS-26781] Backport to 1.609
Commit: d189a6a189d865cbae88601af028f5e60252b74e
https://github.com/jenkinsci/jenkins/commit/d189a6a189d865cbae88601af028f5e60252b74e
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-20 (Wed, 20 May 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.596.3
Commit: 0c39e8eafff6a8c0a9cc3c8d14395b4778bb9ac9
https://github.com/jenkinsci/jenkins/commit/0c39e8eafff6a8c0a9cc3c8d14395b4778bb9ac9
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-20 (Wed, 20 May 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 0c04593627a9d22aeb258c0aab9c0ba6ab470471
https://github.com/jenkinsci/jenkins/commit/0c04593627a9d22aeb258c0aab9c0ba6ab470471
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.609.1
Commit: 0cace71a51e525be1aeaf085150543ed2cd3b0c0
https://github.com/jenkinsci/jenkins/commit/0cace71a51e525be1aeaf085150543ed2cd3b0c0
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 61681d1d15d41e8e55639e684999bebd15411d5a
https://github.com/jenkinsci/jenkins/commit/61681d1d15d41e8e55639e684999bebd15411d5a
Author: vb-linetco <vb...@linetco.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/Run.java
M core/src/test/java/hudson/model/RunTest.java
Log Message:
-----------
avoid IndexOutOfBoundsException when called with 0
return an empty list when called with maxLines = 0
added unit test for getLog(0) returning an empty list
(cherry picked from commit 75f58103d4cd39199705071d6e710da9d318cca6)
Commit: fb47e9b58b8266498a421c00e9adb48b40f968b9
https://github.com/jenkinsci/jenkins/commit/fb47e9b58b8266498a421c00e9adb48b40f968b9
Author: Harald Albers <git...@albersweb.de>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M war/pom.xml
Log Message:
-----------
Update bundled LDAP plugin in order to restore missing help files
In e91782e78f1ade105c5f9ce11088bf9c95618180 some help files were removed
from core because they were moved to LDAP plugin.
Unfortunately, these help files are not available in LDAP plugin
versions prior to 1.11.
(cherry picked from commit 824662a84dc7aceab8acd6f0e682377cd1b371a0)
Commit: 0ce0428f7d4a23f06e6fcf3b87ea64e321da7a1c
https://github.com/jenkinsci/jenkins/commit/0ce0428f7d4a23f06e6fcf3b87ea64e321da7a1c
Author: Martijn Baay <martijn.b...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/hudson/tasks/Maven.java
Log Message:
-----------
Add support for Maven 3 .cmd files in Windows
(cherry picked from commit f7c0a49b4b40f5159545533fedf288ae2d11d693)
Commit: 41dd74dd43baf77884041ea900cb20920ef274ed
https://github.com/jenkinsci/jenkins/commit/41dd74dd43baf77884041ea900cb20920ef274ed
Author: David Hoover <dhoo...@google.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
A core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java
Log Message:
-----------
DefaultJnlpSlaveReceiver should return true when rejecting a takeover.
The contract for JnlpAgentReceiver in case of error on a claimed node is
to call handshake.error() but still return true so other handlers don't
take another crack a it.
Also added unit tests DefaultJnlpSlaveReceiver.
(cherry picked from commit 2d452b6eb30181f477ff089a8d0d970b0b804f27)
Commit: c7264c4668b1ccc9e8e8c7585c46bee818ddd3d5
https://github.com/jenkinsci/jenkins/commit/c7264c4668b1ccc9e8e8c7585c46bee818ddd3d5
Author: tfennelly <tom.fenne...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M war/src/main/webapp/css/style.css
Log Message:
-----------
[FIXED JENKINS-28455] Build History badges don't wrap
(cherry picked from commit 35eb8ac93e5c232b9fd18fa4e36f9bebe84fda7e)
Commit: de5d83de09d2f0ec47292691da063a8eb43846f0
https://github.com/jenkinsci/jenkins/commit/de5d83de09d2f0ec47292691da063a8eb43846f0
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/hudson/model/labels/LabelAssignmentAction.java
Log Message:
-----------
Code documentation/annotation around JENKINS-28446.
Just to prevent similar misuses in the future.
(cherry picked from commit 298e371321b3fa3744d923554624fb94135d32ee)
Commit: 56fc3860954ea4e6d408dc617c1557f9cb9ec870
https://github.com/jenkinsci/jenkins/commit/56fc3860954ea4e6d408dc617c1557f9cb9ec870
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
A test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java
Log Message:
-----------
[JENKINS-28446] - Direct unit test for the issue
(cherry picked from commit 43b06626414b192e695237dfbfe2b4d137cb1363)
Commit: ece651d4d0acc2a12bcc3c53780d67379a801e28
https://github.com/jenkinsci/jenkins/commit/ece651d4d0acc2a12bcc3c53780d67379a801e28
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
Log Message:
-----------
[FIXED JENKINS-28446] - Calculate only tasks without assigned labels
This implementation does not create new methods in API, hence it can be
backported.
(cherry picked from commit 294ce778b3381d84fdb8969729b3628dd3197600)
Commit: 84d80f57f2a31af44d733477efeb89db3f896021
https://github.com/jenkinsci/jenkins/commit/84d80f57f2a31af44d733477efeb89db3f896021
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
Log Message:
-----------
[JENKINS-28446] - Introduce new API method in Queue to optimize the
performance of UnlabeledLoadStatistics
(cherry picked from commit 7697bdb4f57d974546ec4c7e95e87fc8f2ad7f1a)
Commit: 4c11691a8f020a31194366b24ffc05de40049884
https://github.com/jenkinsci/jenkins/commit/4c11691a8f020a31194366b24ffc05de40049884
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
A core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java
Log Message:
-----------
[JENKINS-28419] - Direct unit tests for
JenkinsLocationConfiguration::adminAddress setter and getter
(cherry picked from commit dab392f80f68d222272846927dc7345f80887f63)
Commit: b8ce8da7888453ff32190de3c3f2467897864334
https://github.com/jenkinsci/jenkins/commit/b8ce8da7888453ff32190de3c3f2467897864334
Author: Oleg Nenashev <o.v.nenas...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
Log Message:
-----------
[FIXED JENKINS-28419] - Support the reset of
JenkinsLocationConfiguration::adminAddress
(cherry picked from commit 17116a2129b808d64d76b5dcba9d3037003aed30)
Commit: acf716af98076d20979baafca0e47d3c2442eab0
https://github.com/jenkinsci/jenkins/commit/acf716af98076d20979baafca0e47d3c2442eab0
Author: Yoann Dubreuil <yoann.dubre...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractProject.java
M test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
A test/src/test/resources/hudson/model/AbstractProjectTest/npeTrigger.xml
Log Message:
-----------
[FIXED JENKINS-27549] log job full name and catch Throwable (+1 squashed
commit)
Squashed commits:
[73308b5] [FIXED JENKINS-27549] job loading can be broken by a NPE in a build
trigger
(cherry picked from commit 4c0d3ac6230300c369bc68878ea32c33a23c399a)
Commit: 958f089244968be555afd4baa6062cc7a9f2a2c3
https://github.com/jenkinsci/jenkins/commit/958f089244968be555afd4baa6062cc7a9f2a2c3
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M core/src/main/resources/lib/layout/task.jelly
A test/src/test/java/lib/layout/TaskTest.java
A test/src/test/resources/lib/layout/TaskTest/MockAction/index.jelly
Log Message:
-----------
Do not follow href after sending POST via l:task
Simple `<l:task post="true" href="someurl"/>` triggers post request as expected
but then proceeds to href as normal link to. If the URL accepts GET then request
is sent twice it if does not after POSTing on background user get
'POST is required' error.
(cherry picked from commit baa192499a12ecd3fd819b14fcd9c33cd96433ef)
Commit: aaf0afc54d4e320e2d75a4af6a263745d9de9928
https://github.com/jenkinsci/jenkins/commit/aaf0afc54d4e320e2d75a4af6a263745d9de9928
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/Computer.java
Log Message:
-----------
[FIX JENKINS-27739] Clear cached env vars when node goes online
(cherry picked from commit c569036fca43f286ebbb80498f3f0937766e44c5)
Commit: ba69511c4775bb72feada0b2c0d3fd299f5179a7
https://github.com/jenkinsci/jenkins/commit/ba69511c4775bb72feada0b2c0d3fd299f5179a7
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/Computer.java
Log Message:
-----------
[JENKINS-27739] Ensure cache clearing listener runs first
(cherry picked from commit c6d4204af1db78a6b1ba8cdd5f40f61756a1d009)
Commit: 7a2950b7ad217796df7b1c2ddf2bc129f2ea8bf9
https://github.com/jenkinsci/jenkins/commit/7a2950b7ad217796df7b1c2ddf2bc129f2ea8bf9
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
Log Message:
-----------
Fixup imports
Commit: e18bde37c9e5f02482eb0ab7394029ff733dbf85
https://github.com/jenkinsci/jenkins/commit/e18bde37c9e5f02482eb0ab7394029ff733dbf85
Author: Kanstantsin Shautsou <kanstantsin_shaut...@epam.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractBuild.java
A test/src/test/java/hudson/model/FreestyleJobPublisherTest.java
A test/src/test/java/hudson/model/utils/AbortExceptionPublisher.java
A test/src/test/java/hudson/model/utils/IOExceptionPublisher.java
A test/src/test/java/hudson/model/utils/ResultWriterPublisher.java
A test/src/test/java/hudson/model/utils/TrueFalsePublisher.java
Log Message:
-----------
[FIXED JENKINS-26964] Handle AbortException right
(cherry picked from commit 625a22e63b73bd387d2b33cbb66d3ec05037ea26)
Commit: 231f658d79a79ebe88ff8412bc3856590b0e2853
https://github.com/jenkinsci/jenkins/commit/231f658d79a79ebe88ff8412bc3856590b0e2853
Author: Kanstantsin Shautsou <kanstantsin....@gmail.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractBuild.java
M test/src/test/java/hudson/model/FreestyleJobPublisherTest.java
M test/src/test/java/hudson/model/utils/AbortExceptionPublisher.java
Log Message:
-----------
Fix PR comments
- Print publisher display name instead of class, so user can understand what
publisher in UI was used and failed.
- Setter for artifact archiver shows how it handle status
- Minor typos
- Added test for stacktraces in build log
(cherry picked from commit 92734a8345b782ffd7e5f7c6f023b6228aa4c93d)
Commit: 8e19340c0c2645dc02d06b5faeae73b7be2d3dea
https://github.com/jenkinsci/jenkins/commit/8e19340c0c2645dc02d06b5faeae73b7be2d3dea
Author: Kanstantsin Shautsou <kanstantsin....@gmail.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M core/src/main/java/hudson/model/AbstractBuild.java
M test/src/test/java/hudson/model/FreestyleJobPublisherTest.java
M test/src/test/java/hudson/model/utils/IOExceptionPublisher.java
Log Message:
-----------
Fixing PR comments:
- Typo
- Print error combined
- Set result only when phase like in other code parts.
- Test for expected error message in log
(cherry picked from commit 161a009271f4b05ed5d865932a0dae70fc276e31)
Commit: 0612d94092ebffa8733bb84097c5cd896dd5059c
https://github.com/jenkinsci/jenkins/commit/0612d94092ebffa8733bb84097c5cd896dd5059c
Author: liorha <lio...@jfrog.com>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M core/src/main/java/hudson/util/MaskingClassLoader.java
M test/src/test/java/hudson/ClassicPluginStrategyTest.java
A
test/src/test/resources/hudson/ClassicPluginStrategyTest/testMaskResourceClassLoader.zip
Log Message:
-----------
JENKINS-27289
(cherry picked from commit 7db618e64a8b70514df227dd706566e93a0e112c)
Commit: 726e390627ff4543b95736610a589a270726a0f1
https://github.com/jenkinsci/jenkins/commit/726e390627ff4543b95736610a589a270726a0f1
Author: liorha <lio...@jfrog.com>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M core/src/main/java/hudson/util/MaskingClassLoader.java
Log Message:
-----------
minor: items could be made final
(cherry picked from commit ce862f0b6af330839b3b9fe80d8feebdf62ca88c)
Commit: 905930f0b1eef8d9885c95a471ef99a4390cb75a
https://github.com/jenkinsci/jenkins/commit/905930f0b1eef8d9885c95a471ef99a4390cb75a
Author: liorha <lio...@jfrog.com>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M test/src/test/java/hudson/ClassicPluginStrategyTest.java
Log Message:
-----------
Using JUnit assertions only
(cherry picked from commit ae20c03771d8e0ec34c5261c6f69dd707eeeb906)
Commit: c24c3236917cfac2ae7c536b5fd6ad737fa2253c
https://github.com/jenkinsci/jenkins/commit/c24c3236917cfac2ae7c536b5fd6ad737fa2253c
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Executor.java
Log Message:
-----------
[FIXED JENKINS-28690] Deadlock in hudson.model.Executor
- Rather fun one here. The Lock code relies on assuming that
Thread.interrupted() is clear on entry
- If it then sees Thread.interrupted() set, it will interrupt the current
thread in order to set the
flag again.
- Executor is a thread that does funky things with an overridden interrupt
method
- Executor.abortResult() is used to track a build be interrupted or aborted in
some other way
- As a result the abortResult can cause a deadlockif there is a genuine
interruption
- This fix clears the interrupt flag in abortResult() and uses the write lock
in order to ensure:
- The same lock as used in interrupt() is helf
- The interrupt flag is clear
- Clearing the interrupt flag should be safe as the only time it is called is
immediately after
an interruption and the resulting exception is caught and rethrown/logged
anyway
(cherry picked from commit ddb0a472ad44fcbce31fb565d477901575e3c581)
Commit: 119fcbbf98c27f0257ac1be02104e0d87acc8728
https://github.com/jenkinsci/jenkins/commit/119fcbbf98c27f0257ac1be02104e0d87acc8728
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Computer.java
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/jenkins/model/Jenkins.java
Log Message:
-----------
[FIXED JENKINS-28840] Deadlock between Queue.maintain and Executor.interrupt
More fun here:
- All this originates from Executor extending Thread.
- There is funky logic in the lock handling code of the JVM that makes
assumptions
about how it might proceed with the lock when the thread holding the lock has
its
interrupt flag set.
- Really it would be better if Executor did not extend Thread as that way we
wouldn't
have to deal with some of that complexity. But OTOH we are where we are and
backwards
compatibility may make such a change not possible without a lot of breakage.
- Fixing the issue at hand, firstly requires that interrupting a Computer
happens with the
Queue lock held (to speed up tests we have Jenkins.cleanup get the lock for
all Computers)
That prevents the Queue maintain thread from getting caught
- Secondly, when removing an executor from a computer we process the removal
while
holding the Queue lock, but we move the removal itself to a separate thread
if we cannot
get the Queue lock in order to avoid deadlock.
- Also add helper methods to wrap tasks to be performed while holding the lock
and a helper method for Runnables that exposes the tryLock functionality
(cherry picked from commit 6f343dc7c2f0c32e9eb1a0b5d588a2e7ad6f62ba)
Commit: 0fcb58813b78cf698726a4987e8edcedea130acd
https://github.com/jenkinsci/jenkins/commit/0fcb58813b78cf698726a4987e8edcedea130acd
Author: liorha <lio...@jfrog.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/util/MaskingClassLoader.java
Log Message:
-----------
Contine the JENKINS-27289 ticket: update the getResources as well
(cherry picked from commit 40e75129f40675f8a71b489b38c5911b37cb8559)
Commit: c3dcaeb8d55fe8a8065fb60cecef23d23eb9b87c
https://github.com/jenkinsci/jenkins/commit/c3dcaeb8d55fe8a8065fb60cecef23d23eb9b87c
Author: Daniel Beck <daniel-b...@github.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Run.java
Log Message:
-----------
[FIX JENKINS-14899] Don't use truncating LargeText for /consoleText
(cherry picked from commit 20bd4e304976dc64fa6abc165823425ba524ccb2)
Commit: 4f4a64a522ec7bf31f24280827757214e6985f3d
https://github.com/jenkinsci/jenkins/commit/4f4a64a522ec7bf31f24280827757214e6985f3d
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/hudson/model/queue/QueueSorter.java
Log Message:
-----------
[FIXED JENKINS-28926] Block while upstream/downstream building cycles never
complete
- One could argue that without this change the system is functioning correctly
and that previous behaviour
was a bug. On the other hand, people have come to rely on the previous
behaviour.
- The issue really centeres around state changes in the blocked tasks. Since
blocking on upstream/downstream
relies on checking the building projects and the queued (excluding blocked)
tasks we need any change in
the blocked task list to be visible immediately (i.e. update the snapshot)
- I was able to reliably reproduce this behaviour with a convoluted set of
manually configured projects
but turning this into a test case has not proved quite as easy. Manual
testing confirms that the issue is
fixed for my manual test case
- I have also added a sorting of the blocked list when probing for tasks to
unblock. This should prioritise
tasks as intended by the QueueSorter
(cherry picked from commit de87736795898e57f7aca140124c2b1a3d1daf40)
Commit: 8596004024e9d8a00a99c459b4d7c82c004d1724
https://github.com/jenkinsci/jenkins/commit/8596004024e9d8a00a99c459b4d7c82c004d1724
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M test/src/test/java/hudson/model/QueueTest.java
Log Message:
-----------
[JENKINS-28926] Adding test case
- I was forgetting the call to `rebuildDependencyGraph()` which was why the
test didn't work for me
(cherry picked from commit c44c088442e1821f8cd44f4fdaa146d94dd85910)
Commit: 260b0947cd10bae186fe9f5688d6f9bfa739087c
https://github.com/jenkinsci/jenkins/commit/260b0947cd10bae186fe9f5688d6f9bfa739087c
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Queue.java
Log Message:
-----------
Avoid diamonds for now
Commit: 3005532a94561ac597c6debbb65f1c3dece442f8
https://github.com/jenkinsci/jenkins/commit/3005532a94561ac597c6debbb65f1c3dece442f8
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/queue/QueueSorter.java
Log Message:
-----------
Avoid Long#compare for now
Commit: 88f9f4c8fcf23ebe14abe550e849a46504aa9131
https://github.com/jenkinsci/jenkins/commit/88f9f4c8fcf23ebe14abe550e849a46504aa9131
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.609.2
Commit: 7613069799dacf7e8eced3441631cb6424dde36f
https://github.com/jenkinsci/jenkins/commit/7613069799dacf7e8eced3441631cb6424dde36f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 8f5bdcb414cd70227f7e768f8b23ddfc328250b0
https://github.com/jenkinsci/jenkins/commit/8f5bdcb414cd70227f7e768f8b23ddfc328250b0
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
R
core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html
R
core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString_zh_TW.html
A core/src/main/resources/hudson/model/AbstractProject/help-label.html
A core/src/main/resources/hudson/model/AbstractProject/help-label_zh_TW.html
Log Message:
-----------
[FIXED JENKINS-29376] Rename help texts as well
Amends eec43983a3bdfce6de45ca0559d8a9f8a1250b71.
(cherry picked from commit 1c1d5a95d9d5aa86b5ae890942553fbcb0f1a641)
Commit: 132b915615bed822a14d751667c4a0842ed6ffa6
https://github.com/jenkinsci/jenkins/commit/132b915615bed822a14d751667c4a0842ed6ffa6
Author: Oliver Gondža <ogon...@gmail.com>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
M core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
M core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/column.jelly
M core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/column.jelly
M
core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/column.jelly
Log Message:
-----------
[FIXED JENKINS-29286] Use byte size to sort disk space monitor columns
(cherry picked from commit fabec0eef00212109a1ad5c2bedcb8c55de4f38a)
Commit: b591a241b4a437863bf48ebbd6aa4d3f2c0f831c
https://github.com/jenkinsci/jenkins/commit/b591a241b4a437863bf48ebbd6aa4d3f2c0f831c
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
M core/src/main/java/hudson/model/Computer.java
Log Message:
-----------
[FIXED JENKINS-28058] Don't send a reference to Computer.class over remoting
channels
- Logging added to help diagnose was actually causing Jenkins.class to be
initialized on the remoting side
(cherry picked from commit df831325b6623c479dcf4b215415f4523d10530b)
Commit: 2906718ff53dd781a1248fff5dd56ac729438558
https://github.com/jenkinsci/jenkins/commit/2906718ff53dd781a1248fff5dd56ac729438558
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
M pom.xml
Log Message:
-----------
[FIXED JENKINS-28844] The curious case of the Channel memory cycles
Pick up the remoting 2.52 release
(cherry picked from commit aac20468ff5511ea6c58de07f3bcf3ae108b9cb0)
Commit: fea12f76f50ecb49bef5b20ca23677fa0aa4ef0a
https://github.com/jenkinsci/jenkins/commit/fea12f76f50ecb49bef5b20ca23677fa0aa4ef0a
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M core/src/main/java/hudson/model/Computer.java
M core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
R
core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html
R
core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString_zh_TW.html
A core/src/main/resources/hudson/model/AbstractProject/help-label.html
A core/src/main/resources/hudson/model/AbstractProject/help-label_zh_TW.html
M core/src/main/resources/hudson/node_monitors/DiskSpaceMonitor/column.jelly
M core/src/main/resources/hudson/node_monitors/SwapSpaceMonitor/column.jelly
M
core/src/main/resources/hudson/node_monitors/TemporarySpaceMonitor/column.jelly
M pom.xml
Log Message:
-----------
Merge branch 'stable-1.609' of github.com:jenkinsci/jenkins into stable-1.609
Commit: f2500bd51b715de5191dad1b7ed58090b63da50f
https://github.com/jenkinsci/jenkins/commit/f2500bd51b715de5191dad1b7ed58090b63da50f
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-08-19 (Wed, 19 Aug 2015)
Changed paths:
M core/src/main/java/hudson/slaves/NodeProvisioner.java
Log Message:
-----------
The call to PlannedNode.spent() *must* always occur
- They have been removed from the pendingLaunches, so once we leave this method
we have no reference to them
- Arguably the call to spent should take place when removing from the
pendingLaunches, but that would change
the method contract
(cherry picked from commit 252e1296099e838b8fba52221910442e0a757db4)
Commit: db1e2d2a199f7231f85809234cc1c703d3cb67a0
https://github.com/jenkinsci/jenkins/commit/db1e2d2a199f7231f85809234cc1c703d3cb67a0
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Date: 2015-08-19 (Wed, 19 Aug 2015)
Changed paths:
M core/src/main/java/hudson/slaves/NodeProvisioner.java
Log Message:
-----------
[FIXED JENKINS-29568] A better fix
- 252e1296099e838b8fba52221910442e0a757db4 doesn't work for all cases as there
are code paths
where a pending launch can be removed from the pending list and not have
spent() called.
- There was no reason for iterating the list twice anyway, as all of this takes
place with the locks held
- My notifying each one as we process, if there is an Error, we will not leave
any stranded. The next run
through, if there is one, will cover those instances.
(cherry picked from commit 4f0ca16b01abcd5ac84a9259736c2d96b1712354)
Commit: 9a63d6f8cb734d99597c12263f232fc49604eeb0
https://github.com/jenkinsci/jenkins/commit/9a63d6f8cb734d99597c12263f232fc49604eeb0
Author: James Nord <jnord+git...@cloudbees.com>
Date: 2015-08-19 (Wed, 19 Aug 2015)
Changed paths:
M core/src/main/java/hudson/diagnosis/OldDataMonitor.java
Log Message:
-----------
[JENKINS-29936] when removing an item use ACL.SYTEM.
The OldDataMonitor should be using ACL.system not the ACL of the calling
thread - this also avoids the deadlock when an authorization strategy is
being saved (locking the auth strategy) which will call into the ODM at
the same point the ODM is being called an a Run has been saved (which will
cause a lookup of the job which will do a permissions check).
(cherry picked from commit 8a077a801960aa74da455441cfb12d300c6d6e3a)
Commit: c105ce5ab430708226cdab3bfa407b9b680c4e73
https://github.com/jenkinsci/jenkins/commit/c105ce5ab430708226cdab3bfa407b9b680c4e73
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release jenkins-1.609.3
Commit: 892f203b9d2a5fe678e68a59d5d5cd499a278d64
https://github.com/jenkinsci/jenkins/commit/892f203b9d2a5fe678e68a59d5d5cd499a278d64
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: a621099bf1a9082b115c173a9d9416e8027db298
https://github.com/jenkinsci/jenkins/commit/a621099bf1a9082b115c173a9d9416e8027db298
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Log Message:
-----------
Merge (-s ours) branch 'stable-1.580' into stable-1.596
Commit: d049840bcc6478edb09d43d409303bf5787d32d2
https://github.com/jenkinsci/jenkins/commit/d049840bcc6478edb09d43d409303bf5787d32d2
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Log Message:
-----------
Merge ( -s ours) branch 'stable-1.596' into stable-1.609
Commit: 3537831a42cd5b3b27a41fcde9b1f201962f38a1
https://github.com/jenkinsci/jenkins/commit/3537831a42cd5b3b27a41fcde9b1f201962f38a1
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Log Message:
-----------
Merge (-s ours) branch 'stable-1.609' into master
Commit: ed60950b17b267437c68d3424558b5aa77e937e3
https://github.com/jenkinsci/jenkins/commit/ed60950b17b267437c68d3424558b5aa77e937e3
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths:
M cli/pom.xml
M core/pom.xml
M plugins/pom.xml
M pom.xml
M test/pom.xml
M war/pom.xml
Log Message:
-----------
Merge branch 'stable-1.609' of git://github.com/jenkinsci/jenkins into
stable-1.609
Commit: 0c19ee935412925de196f41681ade2fd9eb16dd6
https://github.com/jenkinsci/jenkins/commit/0c19ee935412925de196f41681ade2fd9eb16dd6
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths:
M changelog.html
M cli/pom.xml
M core/pom.xml
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_cs.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_da.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_es.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_et.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fi.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fr.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_hu.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_id.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_it.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ja.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ko.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lt.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lv.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nb_NO.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nl.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_PT.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ru.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sk.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sl.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sv_SE.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_uk.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_CN.properties
A
core/src/filter/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_TW.properties
M core/src/main/java/hudson/Functions.java
M core/src/main/java/hudson/diagnosis/OldDataMonitor.java
M core/src/main/java/hudson/model/TopLevelItemDescriptor.java
M core/src/main/java/jenkins/model/Jenkins.java
M core/src/main/resources/hudson/cli/Messages.properties
M core/src/main/resources/hudson/model/Messages.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_cs.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_da.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_es.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_et.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fi.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fr.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_hu.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_id.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_it.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ja.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ko.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lt.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lv.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nb_NO.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nl.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pl.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_PT.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ru.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sk.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sl.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_sv_SE.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_uk.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_CN.properties
R
core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_TW.properties
M core/src/main/resources/hudson/tools/InstallSourceProperty/help.html
M plugins/pom.xml
M pom.xml
M test/pom.xml
M test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
M test/src/test/java/hudson/cli/DeleteJobCommandTest.java
M war/pom.xml
Log Message:
-----------
Merge branch 'master' of git://github.com/jenkinsci/jenkins
Commit: e2dccc35572b64f5e602a6b1b3efb517c578872c
https://github.com/jenkinsci/jenkins/commit/e2dccc35572b64f5e602a6b1b3efb517c578872c
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)
Log Message:
-----------
Merge branch 'stable-1.609'
Compare:
https://github.com/jenkinsci/jenkins/compare/699d2b22adb0...e2dccc35572b
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
