merged back the RC branch

Conflicts:
	core/src/main/java/hudson/model/AbstractProject.java

.gitignore

@@ -35,5 +35,7 @@ debian/configure-stamp
 jenkins_*.build
 jenkins_*.changes
 *.deb
+*.pkg
+*.zip
 push-build.sh
-war/node_modules/
\ No newline at end of file
+war/node_modules/

changelog.html

@@ -63,8 +63,14 @@ 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.522>What's new in 1.522</a> <!--=DATE=--></h3>
+<h3><a name=v1.523>What's new in 1.523</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.522>What's new in 1.522</a> (2013/07/06)</h3>
 <ul class=image>
+  <li class=bug>
+    Fixed a regression in the config form with some plugins
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18585">issue 18585</a>)
   <li class=bug>
     Fixed a dead lock in the <tt>Project</tt> class and improved the signature of the persisted XML form a bit.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18589">issue 18589</a>)
@@ -80,7 +86,6 @@ Upcoming changes</a>
   <li class=bug>
     If every node is restricted to tied jobs only, Matrix build jobs can never start.
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.521>What's new in 1.521</a> (2013/07/02)</h3>
 <ul class=image>
   <li class=bug>

core/src/main/java/hudson/model/AbstractProject.java

@@ -241,7 +241,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
      * List of all {@link Trigger}s for this project.
      */
     protected volatile DescribableList<Trigger<?>,TriggerDescriptor> triggers = new DescribableList<Trigger<?>,TriggerDescriptor>(this);
-    private AtomicReferenceFieldUpdater<AbstractProject,DescribableList> triggersUpdater
+    private static final AtomicReferenceFieldUpdater<AbstractProject,DescribableList> triggersUpdater
             = AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,DescribableList.class,"triggers");
 
     /**

core/src/main/resources/lib/form/textarea/textarea.js

@@ -15,7 +15,7 @@ Behaviour.specify("TEXTAREA.codemirror", 'textarea', 0, function(e) {
         scroller.style.height = h+"px";
 
         // the form needs to be populated before the "Apply" button
-        YAHOO.util.Event.on(e.up('form'), "jenkins:apply", function() {
+    Element.on(e.up('form'),"jenkins:apply", function() {
             e.value = codemirror.getValue()
         })
     });

debian/debian/changelog

+jenkins (1.522) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sat, 06 Jul 2013 08:57:45 -0700
+
 jenkins (1.521) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

pom.xml

@@ -175,7 +175,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.26</version>
+        <version>2.28</version>
       </dependency>
 
       <dependency>

test/src/test/java/hudson/triggers/TriggerStartTest.java

@@ -73,7 +73,7 @@ public class TriggerStartTest {
     @Test public void updateByXmlCallsStartTrue() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
         String xml = p.getConfigFile().asString();
-        xml = xml.replace("  <triggers class=\"vector\"/>\n", triggersSection());
+        xml = xml.replace("  <triggers/>\n", triggersSection());
         Source newXML = new StreamSource(new StringReader(xml));
         p.updateByXml(newXML);
         MockTrigger t = p.getTrigger(MockTrigger.class);