Branch: refs/heads/stable-1.596
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: 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
Compare:
https://github.com/jenkinsci/jenkins/compare/0c39e8eafff6...a621099bf1a9
--
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.
