Merge branch 'master' into track-plugins-15003

This commit is contained in:
Jesse Glick committed 2012-09-11 16:22:48 -04:00
commit b3f88effc0
15 files changed
+297 -110

No files matched your search

+2 -2
View File
@@ -667,10 +667,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
UpdateCenter uc = hudson.getUpdateCenter();
PersistedList<UpdateSite> sites = uc.getSites();
for (UpdateSite s : sites) {
if (s.getId().equals("default"))
if (s.getId().equals(UpdateCenter.ID_DEFAULT))
sites.remove(s);
}
sites.add(new UpdateSite("default",site));
sites.add(new UpdateSite(UpdateCenter.ID_DEFAULT, site));
return HttpResponses.redirectToContextRoot();
}