merged back the RC branch

Conflicts:
	changelog.html
This commit is contained in:
Kohsuke Kawaguchi committed 2011-10-09 17:05:07 -07:00
commit 951d169d93
3 files changed
+11 -2

No files matched your search

+4 -1
View File
@@ -69,7 +69,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.434>What's new in 1.434</a> <!--=DATE=--></h3>
<h3><a name=v1.435>What's new in 1.435</a> <!--=DATE=--></h3>
<!--=RC-CHANGES=-->
</div><!--=END=-->
<h3><a name=v1.434>What's new in 1.434</a> (2011/10/09)</h3>
<ul class=image>
<li class=bug>
Add support for android-maven-plugin integration test reports and fix an error with 2.x maven-android-plugin
@@ -49,7 +49,7 @@ import hudson.model.User;
* </pre>
*
* @author Erik Ramfelt
* @since 1.433
* @since 1.434
*/
public abstract class UserAvatarResolver implements ExtensionPoint {
+6
View File
@@ -1,3 +1,9 @@
jenkins (1.434) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Sun, 09 Oct 2011 15:55:38 -0700
jenkins (1.433) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.