[jenkins] 01/02: Merge tag 'upstream/1.532.2'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Sep 3 15:17:59 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 f4ef0dff6a61ba846ca1df0dabd40d44dab4a15b
Merge: 93b8be1 1803c77
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 3 15:24:16 2014 +0200

    Merge tag 'upstream/1.532.2'
    
    Upstream version 1.532.2

 cli/pom.xml                                        |   2 +-
 .../main/java/hudson/cli/NoCheckTrustManager.java  |   4 +-
 core/pom.xml                                       |  12 +-
 .../src/main/groovy/hudson/util/LoadMonitor.groovy |   5 +-
 core/src/main/java/hudson/FilePath.java            |   7 +-
 core/src/main/java/hudson/Functions.java           |  21 +++-
 core/src/main/java/hudson/PluginWrapper.java       |  22 ++--
 core/src/main/java/hudson/XmlFile.java             |  10 +-
 core/src/main/java/hudson/cli/CLIAction.java       | 137 +++++++++++++++++++++
 core/src/main/java/hudson/cli/CLICommand.java      |  54 +++++++-
 .../src/main/java/hudson/cli/CreateJobCommand.java |   1 +
 core/src/main/java/hudson/cli/GroovyCommand.java   |   2 +-
 core/src/main/java/hudson/cli/GroovyshCommand.java |  12 +-
 core/src/main/java/hudson/cli/HelpCommand.java     |  31 ++++-
 .../java/hudson/cli/SetBuildParameterCommand.java  |   4 +-
 .../java/hudson/cli/declarative/CLIRegisterer.java |  67 ++++++----
 .../src/main/java/hudson/markup/MyspacePolicy.java |   3 +-
 core/src/main/java/hudson/model/AbstractBuild.java |  92 +++++++-------
 .../main/java/hudson/model/AbstractProject.java    |  17 ++-
 core/src/main/java/hudson/model/AperiodicWork.java |  20 ++-
 core/src/main/java/hudson/model/Api.java           |  23 +++-
 core/src/main/java/hudson/model/Cause.java         |  10 +-
 core/src/main/java/hudson/model/ComputerSet.java   |  16 +++
 core/src/main/java/hudson/model/Descriptor.java    |   2 +-
 .../src/main/java/hudson/model/ItemGroupMixIn.java |   4 +-
 core/src/main/java/hudson/model/ListView.java      |  10 +-
 .../hudson/model/PasswordParameterDefinition.java  |   7 ++
 core/src/main/java/hudson/model/PeriodicWork.java  |  14 ++-
 core/src/main/java/hudson/model/Queue.java         |   7 +-
 core/src/main/java/hudson/model/RunMap.java        |  19 ++-
 core/src/main/java/hudson/model/View.java          |   2 +-
 .../AbstractNodeMonitorDescriptor.java             |  12 +-
 .../security/AuthenticationProcessingFilter2.java  |   1 +
 .../security/GlobalSecurityConfiguration.java      |   5 +
 .../security/HudsonPrivateSecurityRealm.java       |  13 +-
 .../security/TokenBasedRememberMeServices2.java    |  11 ++
 .../hudson/tasks/junit/JUnitResultArchiver.java    |   3 +-
 .../java/hudson/tasks/junit/TestResultAction.java  |  10 ++
 .../tasks/test/AbstractTestResultAction.java       |  36 ++++--
 .../tasks/test/AggregatedTestResultAction.java     |   7 ++
 .../tasks/test/AggregatedTestResultPublisher.java  |   3 +-
 .../java/hudson/tasks/test/MatrixTestResult.java   |   8 ++
 .../hudson/tasks/test/TestResultAggregator.java    |   2 +-
 core/src/main/java/hudson/triggers/Trigger.java    |  36 +-----
 .../main/java/hudson/util/DoubleLaunchChecker.java |  22 ++--
 .../main/java/hudson/util/RemotingDiagnostics.java |   2 +-
 .../java/hudson/util/RingBufferLogHandler.java     |   2 +-
 .../hudson/util/RobustReflectionConverter.java     |  24 ++++
 core/src/main/java/hudson/util/XStream2.java       |  23 ++++
 core/src/main/java/jenkins/model/Jenkins.java      |  95 ++++++--------
 .../jenkins/model/lazy/AbstractLazyLoadRunMap.java |  53 ++++----
 .../main/java/jenkins/security/ApiTokenFilter.java |  15 +++
 .../java/jenkins/security/SecureRequester.java     |  51 ++++++++
 core/src/main/java/jenkins/util/Timer.java         |  76 ++++++++++++
 .../cli/CLIAction/command.jelly}                   |  23 ++--
 .../cli/CLIAction/example.jelly}                   |  28 +++--
 .../cli/CLIAction/index.jelly}                     |  23 ++--
 .../cli/CLIAction/index.properties}                |   0
 .../cli/CLIAction/index_cs.properties}             |   0
 .../cli/CLIAction/index_da.properties}             |   0
 .../cli/CLIAction/index_de.properties}             |   0
 .../cli/CLIAction/index_es.properties}             |   0
 .../cli/CLIAction/index_fr.properties}             |   0
 .../cli/CLIAction/index_it.properties}             |   0
 .../cli/CLIAction/index_ja.properties}             |   0
 .../cli/CLIAction/index_lv.properties}             |   0
 .../cli/CLIAction/index_nl.properties}             |   0
 .../cli/CLIAction/index_pt_BR.properties}          |   0
 .../cli/CLIAction/index_ru.properties}             |   0
 .../cli/CLIAction/index_zh_CN.properties}          |   0
 .../cli/CLIAction/index_zh_TW.properties}          |   0
 .../main/resources/hudson/cli/Messages.properties  |   2 +-
 .../model/PasswordParameterDefinition/config.jelly |   2 +-
 .../help-disableRememberMe.html                    |   3 +
 .../GlobalSecurityConfiguration/index.groovy       |   4 +
 .../resources/jenkins/model/Jenkins/login.jelly    |   2 +-
 .../resources/jenkins/model/Jenkins/oops.jelly     |   2 +
 core/src/main/resources/lib/form/apply/apply.js    |  23 +++-
 .../main/resources/lib/hudson/setIconSize.jelly    |   2 +-
 core/src/main/resources/lib/layout/layout.jelly    |   1 +
 core/src/test/java/hudson/FunctionsTest.java       |  33 ++++-
 .../test/java/hudson/markup/MyspacePolicyTest.java |   6 +-
 .../hudson/scheduler/CronTabEventualityTest.java   |  18 +--
 core/src/test/java/hudson/util/XStream2Test.java   |  16 +++
 core/src/test/java/jenkins/util/TimerTest.java     |  46 +++++++
 plugins/pom.xml                                    |  10 +-
 pom.xml                                            |   4 +-
 ui-samples-plugin/pom.xml                          |   2 +-
 war/pom.xml                                        |   4 +-
 89 files changed, 1031 insertions(+), 370 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