Merge branch 'master' of github.com:jenkinsci/jenkins

changelog.html

@@ -55,6 +55,8 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=rfe>
+    Added "manage old data" permanently to the "manage Jenkins" page.
   <li class=rfe>
     Plugin manager now supports uninstallation.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-3070">issue 3070</a>)
@@ -91,6 +93,7 @@ Upcoming changes</a>
     Memory footprint improvement, especially under large HTTP request threads.
   <li class='major rfe'>
     Build records are now lazy loaded, resulting in a reduced startup time 
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8754">issue 8754</a>)
 </ul>
 <h3><a name=v1.484>What's new in 1.484</a> (2012/09/30)</h3>
 <ul class=image>

core/src/main/java/hudson/diagnosis/OldDataMonitor.java

@@ -25,6 +25,7 @@ package hudson.diagnosis;
 
 import hudson.XmlFile;
 import hudson.model.AdministrativeMonitor;
+import hudson.model.ManagementLink;
 import jenkins.model.Jenkins;
 import hudson.Extension;
 import hudson.model.Item;
@@ -282,4 +283,26 @@ public class OldDataMonitor extends AdministrativeMonitor {
     public HttpResponse doIndex(StaplerResponse rsp) throws IOException {
         return new HttpRedirect("manage");
     }
+
+    @Extension
+    public static class ManagementLinkImpl extends ManagementLink {
+        @Override
+        public String getIconFileName() {
+            return "document.png";
+        }
+
+        @Override
+        public String getUrlName() {
+            return "administrativeMonitor/OldData/";
+        }
+
+        @Override
+        public String getDescription() {
+            return Messages.OldDataMonitor_Description();
+        }
+
+        public String getDisplayName() {
+            return Messages.OldDataMonitor_DisplayName();
+        }
+    }
 }

core/src/main/resources/hudson/diagnosis/Messages.properties

 MemoryUsageMonitor.USED=Used
 MemoryUsageMonitor.TOTAL=Total
+OldDataMonitor.Description=Scrub configuration files to remove remnants from old plugins and earlier versions.
 OldDataMonitor.DisplayName=Old Data
+OldDataMonitor.DisplayName=Manage Old Data