From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rhug-cvs-return-460-listarch-rhug-cvs=sources.redhat.com@sources.redhat.com>
Received: (qmail 20666 invoked by alias); 4 Aug 2003 10:30:37 -0000
Mailing-List: contact rhug-cvs-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:rhug-cvs-subscribe@sources.redhat.com>
List-Post: <mailto:rhug-cvs@sources.redhat.com>
List-Help: <mailto:rhug-cvs-help@sources.redhat.com>, <http://sources.redhat.com/lists.html#faqs>
Sender: rhug-cvs-owner@sources.redhat.com
Received: (qmail 20656 invoked by uid 9364); 4 Aug 2003 10:30:37 -0000
Date: Mon, 04 Aug 2003 10:30:00 -0000
Message-ID: <20030804103037.20654.qmail@sources.redhat.com>
From: gary@sources.redhat.com
To: rhug-cvs@sources.redhat.com
Subject: rhug/jakarta-tomcat-4/upstream/tomcat/catalina ...
X-SW-Source: 2003/txt/msg00167.txt.bz2
List-Id: <rhug-cvs.sourceware.org>

CVSROOT:	/cvs/rhug
Module name:	rhug
Changes by:	gary@sourceware.org	2003-08-04 10:30:37

Modified files:
	jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/core: 
	                                                                              StandardContext.java 
	jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/loader: 
	                                                                                WebappClassLoader.java 
	jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/servlets: 
	                                                                                  HTMLManagerServlet.java 

Log message:
	Resolve conflicts

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/rhug/jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/core/StandardContext.java.diff?cvsroot=rhug&r1=1.2&r2=1.3
http://sources.redhat.com/cgi-bin/cvsweb.cgi/rhug/jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java.diff?cvsroot=rhug&r1=1.3&r2=1.4
http://sources.redhat.com/cgi-bin/cvsweb.cgi/rhug/jakarta-tomcat-4/upstream/tomcat/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java.diff?cvsroot=rhug&r1=1.2&r2=1.3