Return-Path: Delivered-To: apmail-jakarta-jmeter-dev-archive@www.apache.org Received: (qmail 17679 invoked from network); 6 Oct 2004 13:33:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Oct 2004 13:33:17 -0000 Received: (qmail 25591 invoked by uid 500); 6 Oct 2004 13:33:16 -0000 Delivered-To: apmail-jakarta-jmeter-dev-archive@jakarta.apache.org Received: (qmail 25448 invoked by uid 500); 6 Oct 2004 13:33:14 -0000 Mailing-List: contact jmeter-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "JMeter Developers List" Reply-To: "JMeter Developers List" Delivered-To: mailing list jmeter-dev@jakarta.apache.org Received: (qmail 25433 invoked by uid 99); 6 Oct 2004 13:33:14 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FORGED_RCVD_HELO X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from [24.24.2.58] (HELO ms-smtp-04.nyroc.rr.com) (24.24.2.58) by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 06 Oct 2004 06:33:12 -0700 Received: from 192.168.1.100 (roc-69-201-79-10.rochester.rr.com [69.201.79.10]) by ms-smtp-04.nyroc.rr.com (8.12.10/8.12.10) with ESMTP id i96DX7Ih023178 for ; Wed, 6 Oct 2004 09:33:07 -0400 (EDT) Subject: merging 2.0 -> HEAD From: Michael Stover Reply-To: mstover1@apache.org To: JMeter Developers List Content-Type: text/plain Organization: Apache Software Foundation Message-Id: <1097069683.2851.6.camel@DaVinci> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5-4mdk Date: Wed, 06 Oct 2004 09:34:43 -0400 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N I'm doing the merge now. It's going to take a little while. Once I'm done, we should be able to do a release of 2.0.2 from the 2.0 branch. -- Michael Stover Apache Software Foundation --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org