[jenkins] 01/03: Merge tag 'upstream/1.554.3'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit c5aefc6658a0b72f7d7d4116a4f4b3a7106f14a5
Merge: 279654c 6e37f7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 4 00:16:06 2014 +0200

    Merge tag 'upstream/1.554.3'
    
    Upstream version 1.554.3

 changelog.html                                     |  4 +-
 cli/pom.xml                                        |  2 +-
 core/pom.xml                                       |  6 +--
 core/src/main/java/hudson/Functions.java           | 11 ++---
 core/src/main/java/hudson/Launcher.java            | 25 ++++++++++++
 .../hudson/lifecycle/WindowsServiceLifecycle.java  |  3 +-
 core/src/main/java/hudson/model/Cause.java         | 11 +----
 core/src/main/java/hudson/model/ListView.java      |  8 +++-
 core/src/main/java/hudson/model/Run.java           | 15 +++++--
 core/src/main/java/hudson/model/Slave.java         | 14 ++++++-
 .../src/main/java/hudson/model/ViewDescriptor.java | 28 ++-----------
 .../java/jenkins/diagnostics/ooom/BuildPtr.java    | 17 +-------
 .../java/jenkins/diagnostics/ooom/Problem.java     |  8 ++--
 .../main/java/jenkins/model/PeepholePermalink.java | 30 +++++++++++---
 .../jenkins/model/lazy/AbstractLazyLoadRunMap.java |  2 +-
 .../hudson/logging/LogRecorder/configure.jelly     |  1 +
 .../hudson/model/Computer/configure.jelly          |  1 +
 .../resources/hudson/model/ComputerSet/_new.jelly  |  3 +-
 .../hudson/model/ComputerSet/configure.jelly       |  1 +
 .../resources/hudson/model/Job/configure.jelly     |  4 +-
 .../resources/hudson/model/Run/configure.jelly     |  3 ++
 .../resources/hudson/model/User/configure.jelly    |  1 +
 .../resources/hudson/model/View/configure.jelly    |  1 +
 .../hudson/model/labels/LabelAtom/configure.jelly  |  1 +
 .../GlobalSecurityConfiguration/index.groovy       |  2 +
 .../jenkins/model/Jenkins/configure.jelly          |  1 +
 core/src/main/resources/lib/form/apply/apply.js    |  2 +-
 core/src/main/resources/lib/form/confirm.js        | 47 ++++++++++++++++++----
 .../src/main/resources/lib/form/hetero-radio.jelly |  3 +-
 core/src/test/java/hudson/FunctionsTest.java       | 30 ++++++++++----
 .../java/jenkins/model/PeepholePermalinkTest.java  |  1 +
 .../model/lazy/AbstractLazyLoadRunMapTest.java     | 19 +++++++++
 core/src/test/java/jenkins/model/lazy/FakeMap.java |  5 +++
 plugins/pom.xml                                    |  8 ++--
 pom.xml                                            |  2 +-
 war/pom.xml                                        |  4 +-
 war/src/main/webapp/scripts/hudson-behavior.js     | 15 ++++---
 37 files changed, 229 insertions(+), 110 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git