Merge branch 'master' into slow-people-15206

Conflicts:
	changelog.html

changelog.html

@@ -58,6 +58,8 @@ Upcoming changes</a>
   <li class=bug>
     Displaying <code>/people</code> can consume huge resources.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15206">issue 15206</a>)
+    Log recorders do not work reliably.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15226">issue 15226</a>)
   <li class=>
 </ul>
 </div><!--=TRUNK-END=-->
@@ -66,6 +68,9 @@ Upcoming changes</a>
 <div id="rc" style="display:none;"><!--=BEGIN=-->
 <h3><a name=v1.483>What's new in 1.483</a> <!--=DATE=--></h3>
 <ul class=image>
+  <li class=bug>
+    Invalid warning message when the config-file-provider plugin is not installed
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15207">issue 15207</a>)
   <li class=bug>
     JDK installation failed on some slaves with <code>InvalidClassException: hudson.tools.JDKInstaller$Platform$1; local class incompatible: …</code>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14667">issue 14667</a>)

core/src/main/java/hudson/logging/LogRecorder.java

@@ -87,6 +87,7 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
     public static final class Target {
         public final String name;
         private final int level;
+        private transient /* almost final*/ Logger logger;
 
         public Target(String name, Level level) {
             this(name,level.intValue());
@@ -118,7 +119,10 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
         }
 
         public Logger getLogger() {
-            return Logger.getLogger(name);
+            if (logger == null) {
+                logger = Logger.getLogger(name);
+            }
+            return logger;
         }
 
         /**

core/src/main/resources/hudson/triggers/Messages_fr.properties

@@ -20,8 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-SCMTrigger.DisplayName=Scruter l''outil de gestion de version
+SCMTrigger.DisplayName=Scrutation de l''outil de gestion de version
 SCMTrigger.getDisplayName=Log du dernier accès à {0}
-SCMTrigger.SCMTriggerCause.ShortDescription=Un changement dans la base de code a provoqué le lancement de ce job
+SCMTrigger.BuildAction.DisplayName=Log de scrutation
+SCMTrigger.SCMTriggerCause.ShortDescription=Lancé par un changement dans la base de code
 TimerTrigger.DisplayName=Construire périodiquement
-TimerTrigger.TimerTriggerCause.ShortDescription=L''\u00e9\u00e9ch\u00e9ance d''une alarme p\u00e9riodique a provoqu\u00e9 le lancement de ce job
+TimerTrigger.MissingWhitespace=Il semble manquer un espace entre * et *.
+TimerTrigger.TimerTriggerCause.ShortDescription=Lancé par une alarme périodique
+Trigger.init=Initialisation des minuteurs des déclencheurs

maven-plugin/src/main/java/hudson/maven/settings/ConfigProviderDelegate.java

@@ -37,7 +37,7 @@ public class ConfigProviderDelegate implements ConfigProviderFacade {
         if (Jenkins.getInstance().getPlugin("config-file-provider") != null) {
             cpf = new ConfigProviderMediator();
         } else {
-            LOGGER.warning("'config-file-provider' plugin installed..., administration of setting.xml will not be available!");
+            LOGGER.warning("'config-file-provider' plugin not installed..., administration of setting.xml will not be available!");
             cpf = new DefaultConfigProviderFacade();
         }
     }

plugins/update-dependency-hudson-version.rb

-#!/usr/bin/ruby
-# update the version of Hudson that this POM depends on from $1
-require "rexml/document"
-require "rexml/xpath"
-
-# version to update to
-v=ARGV.shift
-
-pom = REXML::Document.new $stdin
-pom.elements.each("//dependency[groupId='org.jvnet.hudson.main']") { |dep|
-  dep.elements["version"].text = v
-}
-pom.write $stdout
-
-

pom.xml

@@ -53,6 +53,7 @@ THE SOFTWARE.
     <module>war</module>
     <module>test</module>
     <module>cli</module>
+    <module>plugins</module>
   </modules>
 
   <scm>