Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08AC37A43 for ; Tue, 23 Aug 2011 19:53:20 +0000 (UTC) Received: (qmail 34301 invoked by uid 500); 23 Aug 2011 19:53:19 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 34058 invoked by uid 500); 23 Aug 2011 19:53:18 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 34048 invoked by uid 99); 23 Aug 2011 19:53:18 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2011 19:53:18 +0000 Received: from localhost (HELO [192.168.23.9]) (127.0.0.1) (smtp-auth username markt, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2011 19:53:17 +0000 Message-ID: <4E54052B.5060905@apache.org> Date: Tue, 23 Aug 2011 20:53:15 +0100 From: Mark Thomas User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: svn commit: r1159673 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml References: <20110819162345.2A07823889C5@eris.apache.org> <4E4E93CE.9060300@christopherschultz.net> <4E5054E5.2060407@christopherschultz.net> In-Reply-To: <4E5054E5.2060407@christopherschultz.net> X-Enigmail-Version: 1.3.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 21/08/2011 01:44, Christopher Schultz wrote: > Konstantin, > > On 8/19/2011 3:11 PM, Konstantin Kolinko wrote: >> Mark cleared the changelog file after creating the branch. >> >> The idea is that * work is done on trunk * it is merged to >> tc7.0.x * items merged to tc7.0.x go into TC7's changelog file >> and those that won't be merged go into TC8's changelog. >> >> There is a comment at the top of trunk's changelog.xml: (...) >> Until the first Tomcat 8.0.0 release, only changes not >> back-ported to 7.0.x should be listed here. --> > > Thanks for the clarification. I'll go ahead and forward-port the > patch to trunk. Did this happen? Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org