Merged revisions 22846,22861-22862,22864,22868 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r22846 | kohsuke | 2009-10-16 12:20:23 -0700 (Fri, 16 Oct 2009) | 1 line
  
  [FIXED HUDSON-4456] This problem is fixed toward 1.329.
........
  r22861 | kohsuke | 2009-10-16 16:45:02 -0700 (Fri, 16 Oct 2009) | 1 line
  
  this is now done asynchronously by Hudson
........
  r22862 | kohsuke | 2009-10-16 17:41:53 -0700 (Fri, 16 Oct 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_329
........
  r22864 | kohsuke | 2009-10-16 17:42:13 -0700 (Fri, 16 Oct 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r22868 | kohsuke | 2009-10-16 18:20:51 -0700 (Fri, 16 Oct 2009) | 1 line
  
  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22919 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2009-10-19 17:10:29 +00:00
1 parent b54cc02c4d
commit d3c2d48518
13 files changed
+33 -15

No files matched your search

+6 -1
View File
@@ -1105,6 +1105,11 @@ public class CVSSCM extends SCM implements Serializable {
return cvsExe;
}
public void setCvsExe(String value) {
this.cvsExe = value;
save();
}
public String getCvsExeOrDefault() {
if(Util.fixEmpty(cvsExe)==null) return "cvs";
else return cvsExe;
@@ -1121,7 +1126,7 @@ public class CVSSCM extends SCM implements Serializable {
@Override
public boolean configure( StaplerRequest req, JSONObject o ) {
cvsPassFile = fixEmptyAndTrim(req.getParameter("cvspassFile"));
cvsPassFile = fixEmptyAndTrim(o.getString("cvspassFile"));
cvsExe = fixEmptyAndTrim(o.getString("cvsExe"));
noCompression = req.getParameter("cvs_noCompression")!=null;
save();