Author: kkolinko
Date: Tue Jan 21 18:43:32 2014
New Revision: 1560136
URL: http://svn.apache.org/r1560136
Log:
Add Jeremy's patch.
These changes were overwritten by a subsequent commit, but they may be needed
to make a clean svn merge.
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=1560136&r1=1560135&r2=1560136&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 21 18:43:32 2014
@@ -40,6 +40,7 @@ PATCHES PROPOSED TO BACKPORT:
Regression in fix for BZ55198 broke parsing of some ternary expressions
https://svn.apache.org/r1559555
https://svn.apache.org/r1559708 (excluding test case)
+ https://svn.apache.org/r1559820 (overwritten by r1560023, may be needed for
a clean svn merge)
https://svn.apache.org/r1560023 (excluding test case)
+1: markt
-1:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
