tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1041259 - /tomcat/tc6.0.x/trunk/STATUS.txt
Date Thu, 02 Dec 2010 02:46:56 GMT
Author: kkolinko
Date: Thu Dec  2 02:46:56 2010
New Revision: 1041259

URL: http://svn.apache.org/viewvc?rev=1041259&view=rev
Log:
Updated the patch: added r1038975

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1041259&r1=1041258&r2=1041259&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec  2 02:46:56 2010
@@ -114,8 +114,6 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Backport Windows installer improvements from Tomcat 7.0.5.
 
-  - Add default --PidFile (new with daemon 1.0.3) (r982157, mturk)
-
   - Use *modern* types of nsis install/uninstall icons (r999976, mturk)
 
   - Create service-install.log file during installation with params that
@@ -156,7 +154,7 @@ PATCHES PROPOSED TO BACKPORT:
   Backported revisions:
   964211,982151,982157,999976,1003840,1027504,1033856,1033882,1034911,1034924,
   1034926,1035051,1035062,1035068,1035071,1035083,1035088,1035093,1035094,
-  1035132
+  1035132, 1038975
 
   1. Run the following SVN commands:
    svn del res/config.ini
@@ -167,13 +165,13 @@ PATCHES PROPOSED TO BACKPORT:
    svn copy ../../trunk/res/main.ico res/
    svn copy ../../trunk/res/uninst.ico res/
   2. Apply patch:
-   http://people.apache.org/~kkolinko/patches/2010-11-15_tc6_tomcat-nsi.patch
+   http://people.apache.org/~kkolinko/patches/2010-12-02_tc6_tomcat-nsi.patch
   (
-   For reference: here is the diff of tomcat.nsi of trunk @1035132 if I copy
+   For reference: here is the diff of tomcat.nsi of trunk @1041257 if I copy
    this patched tc6 version on top of it:
-   http://people.apache.org/~kkolinko/patches/2010-11-15_tc6_tomcat-nsi-of-tc7_vs_tc6.diff
+   http://people.apache.org/~kkolinko/patches/2010-12-02_tc6_tomcat-nsi-of-tc7_vs_tc6.diff
   )
-   +1: kkolinko, markt - with r1038975 to remove use of PID file
+   +1: kkolinko, markt
    -1: 
 
 * Backport JSP unloading patch (BZ48358).



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message