Author: rjung
Date: Wed Nov 26 17:36:17 2014
New Revision: 1641867
URL: http://svn.apache.org/r1641867
Log:
Fix merge error in r1641866.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java?rev=1641867&r1=1641866&r2=1641867&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java
Wed Nov 26 17:36:17 2014
@@ -25,9 +25,10 @@ import java.util.regex.Pattern;
import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.Loader;
-import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.cluster.session.ReplicationStream;
+import org.apache.catalina.cluster.session.ReplicationStream;
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
