Author: markt
Date: Thu Jul 6 17:12:09 2017
New Revision: 1801082
URL: http://svn.apache.org/viewvc?rev=1801082&view=rev
Log:
Fix broken merge
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1801082&r1=1801081&r2=1801082&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jul 6 17:12:09 2017
@@ -2202,7 +2202,6 @@
clearly. When handling shutdown payload, verification completion
message
is not required. (kfujino)
</scode>
-<<<<<<< .working
<fix>
When starting the <code>StaticMembershipInterceptor</code>,
<code>StaticMembershipInterceptor</code> checks the required
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
