[jenkins] 02/04: Merge tag 'upstream/1.565.3'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Oct 3 15:38:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins.
commit 1b93980ed09bc578f5f0db42e7d18884f5465256
Merge: 4e6b4f1 7831304
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Oct 3 17:13:44 2014 +0200
Merge tag 'upstream/1.565.3'
Upstream version 1.565.3
cli/pom.xml | 2 +-
core/pom.xml | 14 ++--
core/src/main/java/hudson/Plugin.java | 22 +++---
core/src/main/java/hudson/cli/CLICommand.java | 9 +++
.../main/java/hudson/cli/CommandDuringBuild.java | 3 +
.../java/hudson/cli/SetBuildParameterCommand.java | 1 +
.../java/hudson/cli/SetBuildResultCommand.java | 2 +-
.../main/java/hudson/diagnosis/OldDataMonitor.java | 8 ++-
core/src/main/java/hudson/model/AbstractItem.java | 40 ++++++++---
.../main/java/hudson/model/FileParameterValue.java | 11 +++
.../java/hudson/model/FullDuplexHttpChannel.java | 22 +++++-
core/src/main/java/hudson/model/ListView.java | 81 +++++++++++++---------
core/src/main/java/hudson/model/Slave.java | 2 -
.../node_monitors/AbstractDiskSpaceMonitor.java | 2 -
core/src/main/java/hudson/security/ACL.java | 19 +++++
.../tasks/test/AbstractTestResultAction.java | 10 +--
.../java/hudson/tools/InstallerTranslator.java | 17 +++--
core/src/main/java/jenkins/model/Jenkins.java | 3 +-
.../model/JenkinsLocationConfiguration.java | 37 ++++++++++
.../hudson/model/LoadStatistics/main.jelly | 11 ++-
.../model/PasswordParameterDefinition/index.jelly | 2 +-
.../hudson/slaves/SlaveComputer/sidepanel2.jelly | 2 +-
.../hudson/slaves/SlaveComputer/systemInfo.jelly | 28 ++++++--
.../resources/lib/layout/copyButton/copyButton.css | 3 +
.../resources/lib/layout/copyButton/copyButton.js | 19 +++--
plugins/pom.xml | 8 +--
pom.xml | 6 +-
war/pom.xml | 2 +-
28 files changed, 282 insertions(+), 104 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git
More information about the pkg-java-commits
mailing list