merged RC branch

assembly-src.xml

@@ -36,6 +36,13 @@ THE SOFTWARE.
         <include>**/*</include>
       </includes>
       <excludes>
+        <exclude>*.build</exclude>
+        <exclude>*.changes</exclude>
+        <exclude>*.pkg</exclude>
+        <exclude>*.zip</exclude>
+        <exclude>*.log</exclude>
+        <exclude>.repository</exclude>
+        <exclude>.repository/**/*</exclude>
         <exclude>**/target</exclude>
         <exclude>**/target/**/*</exclude>
         <exclude>**/work</exclude>
@@ -43,4 +50,4 @@ THE SOFTWARE.
       </excludes>
     </fileSet>
   </fileSets>
-</assembly>
+</assembly>

changelog.html

@@ -68,7 +68,10 @@ 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.421>What's new in 1.421</a> <!--=DATE=--></h3>
+<h3><a name=v1.422>What's new in 1.422</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.421>What's new in 1.421</a> (2011/07/17)</h3>
 <ul class=image>
   <li class=bug>
     NPE when requesting http://server/job/TEST-START/description and the description is empty
@@ -111,7 +114,6 @@ Upcoming changes</a>
     Maven build script to produce the binary was significantly modified.
     (<a href="https://github.com/jenkinsci/jenkins/pull/193">pull request 193</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.420>What's new in 1.420</a> (2011/07/11)</h3>
 <ul class=image>
   <li class=bug>

debian/debian/changelog

@@ -1,3 +1,9 @@
+jenkins (1.421) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 17 Jul 2011 06:09:40 -0700
+
 jenkins (1.420) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.