Author: kkolinko
Date: Mon Dec 26 07:19:20 2011
New Revision: 1224688
URL: http://svn.apache.org/viewvc?rev=1224688&view=rev
Log:
Update to Apache Commons Daemon 1.0.8
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1224688&r1=1224687&r2=1224688&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 26 07:19:20 2011
@@ -87,11 +87,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko,funkman
-1:
-* Update Commons Daemon to 1.0.8
- Change is trivial so no patch provided
- +1: mturk, markt,funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
Only handle <\% and not \% as escaped in template text.
http://svn.apache.org/viewvc?rev=1215121&view=rev
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1224688&r1=1224687&r2=1224688&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Dec 26 07:19:20 2011
@@ -149,7 +149,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.version=1.0.7
+commons-daemon.version=1.0.8
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1224688&r1=1224687&r2=1224688&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 26 07:19:20 2011
@@ -44,6 +44,13 @@
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 6.0.36 (jfclere)" rtext="">
+ <subsection name="General">
+ <changelog>
+ <update>
+ Update Apache Commons Daemon to 1.0.8. (mturk)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
