Merge branch '1.469-out-of-cycle' into rc

Conflicts:
	changelog.html

changelog.html

@@ -61,7 +61,7 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.469>What's new in 1.469</a> <!--=DATE=--></h3>
+<h3><a name=v1.470>What's new in 1.470</a> <!--=DATE=--></h3>
 <ul class=image>
   <li class=bug>
     JSON MIME type should be "application/json"
@@ -81,6 +81,11 @@ Upcoming changes</a>
     The CLI <tt>build</tt> command can now wait until the start of the build.
 </ul>
 </div><!--=END=-->
+<h3><a name=v1.469>What's new in 1.469</a> (2012/06/11)</h3>
+<ul class=image>
+  <li class=bug>
+    Fixed a regression in 1.468 that broke LDAP
+</ul>
 <h3><a name=v1.468>What's new in 1.468</a> (2012/06/11)</h3>
 <ul class=image>
   <li class=bug>

core/src/main/java/hudson/security/SecurityRealm.java

@@ -372,7 +372,7 @@ public abstract class SecurityRealm extends AbstractDescribableImpl<SecurityReal
      * This method is intended to be used to pick up a Acegi object from
      * spring once the bean definition file is parsed.
      */
-    protected static <T> T findBean(Class<T> type, ApplicationContext context) {
+    public static <T> T findBean(Class<T> type, ApplicationContext context) {
         Map m = context.getBeansOfType(type);
         switch(m.size()) {
         case 0:

debian/debian/changelog

+jenkins (1.469) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 11 Jun 2012 23:01:04 -0700
+
 jenkins (1.468) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

plugins/pom.xml

@@ -10,7 +10,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.469-SNAPSHOT</version>
+  <version>1.470-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -33,7 +33,7 @@
       <dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>maven-plugin</artifactId>
-        <version>1.469-SNAPSHOT</version>
+        <version>1.470-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -43,25 +43,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.469-SNAPSHOT</version>
+      <version>1.470-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.469-SNAPSHOT</version>
+      <version>1.470-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.469-SNAPSHOT</version>
+      <version>1.470-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.469-SNAPSHOT</version>
+      <version>1.470-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>