merged back the RC branch

changelog.html

@@ -75,7 +75,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.397>What's new in 1.397</a> <!--=DATE=--></h3>
+<h3><a name=v1.398>What's new in 1.398</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.397>What's new in 1.397</a> (2011/02/12)</h3>
 <ul class=image>
   <li class='major bug'>
     Fixed a master/slave communication problem since 1.378 that often manifests as "Not in GZIP format"
@@ -117,7 +120,6 @@ Upcoming changes</a>
     Lock down maven plugin versions to shut up m3
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-7275">issue 7275</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.396>What's new in 1.396</a> (2011/02/02)</h3>
 <ul class=image>
   <li class=bug>

core/src/test/java/hudson/model/UpdateCenterTest.java

@@ -39,13 +39,13 @@ public class UpdateCenterTest extends TestCase {
     public void testData() throws IOException {
         // check if we have the internet connectivity. See HUDSON-2095
         try {
-            new URL("http://updates.hudson-labs.org/").openStream();
+            new URL("http://updates.jenkins-ci.org/").openStream();
         } catch (IOException e) {
             System.out.println("Skipping this test. No internet connectivity");
             return;
         }
 
-        URL url = new URL("http://updates.hudson-labs.org/update-center.json?version=build");
+        URL url = new URL("http://updates.jenkins-ci.org/update-center.json?version=build");
         String jsonp = IOUtils.toString(url.openStream());
         String json = jsonp.substring(jsonp.indexOf('(')+1,jsonp.lastIndexOf(')'));
 

debian/debian/changelog

+jenkins (1.397) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sat, 12 Feb 2011 07:57:47 -0800
+
 jenkins (1.396) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.