Return-Path: 
 <commits-return-11774-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 99033 invoked from network); 31 Mar 2010 18:11:18 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 31 Mar 2010 18:11:18 -0000
Received: (qmail 29578 invoked by uid 500); 31 Mar 2010 18:11:17 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 29515 invoked by uid 500); 31 Mar 2010 18:11:17 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 29508 invoked by uid 99); 31 Mar 2010 18:11:17 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 18:11:17 +0000
X-ASF-Spam-Status: No, hits=-1346.9 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 18:11:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7217723889F1; Wed, 31 Mar 2010 18:10:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929647 - in /commons/proper/net/branches/NET_2_0:
 RELEASE-NOTES.txt src/changes/changes.xml
Date: Wed, 31 Mar 2010 18:10:56 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100331181056.7217723889F1@eris.apache.org>

Author: sebb
Date: Wed Mar 31 18:10:56 2010
New Revision: 929647

URL: http://svn.apache.org/viewvc?rev=929647&view=rev
Log:
Synch. changes list with JIRA

Modified:
    commons/proper/net/branches/NET_2_0/RELEASE-NOTES.txt
    commons/proper/net/branches/NET_2_0/src/changes/changes.xml

Modified: commons/proper/net/branches/NET_2_0/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/RELEASE-NOTES.txt?rev=929647&r1=929646&r2=929647&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/RELEASE-NOTES.txt (original)
+++ commons/proper/net/branches/NET_2_0/RELEASE-NOTES.txt Wed Mar 31 18:10:56 2010
@@ -1,4 +1,4 @@
-                        
+
 
               Apache Commons Net 2.1 RELEASE NOTES
 
@@ -46,13 +46,13 @@ o NET-279:  Fix copying of reply lines c
 o NET-277:  Fix incorrect NNTP constant 
 o NET-276:  Use long instead of int for newsgroup counts 
 o NET-274:  Restore socket state after CCC command 
+o NET-275:  Example code in FTPClient doesn't compile 
 o Fix inconsistent handling of socket read/write buffer size 
 o NET-294:  UnixFTPEntryParser fails to parse some entries 
 
 Changes:
 o NET-261:  SubnetUtils.SubnetInfo.isInRange(...) behaviour not documented 
 o NET-251:  Moved class "ThreadContainer" from Threader.java into its own source file 
-o NET-252:  Get rid of using deprecated API in VMSFTPEntryParser 
 o Refactor examples package. 
 
 Removed:

Modified: commons/proper/net/branches/NET_2_0/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/changes/changes.xml?rev=929647&r1=929646&r2=929647&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/changes/changes.xml (original)
+++ commons/proper/net/branches/NET_2_0/src/changes/changes.xml Wed Mar 31 18:10:56 2010
@@ -126,9 +126,6 @@ This is primarily a maintenance release,
             <action dev="rwinston" type="update" issue="NET-251">
                 Moved class "ThreadContainer" from Threader.java into its own source file
             </action>
-            <action dev="rwinston" type="update" issue="NET-252">
-                Get rid of using deprecated API in VMSFTPEntryParser
-            </action>
             <action dev="rwinston" type="fix" issue="NET-256">
                 FTPSClient should accept a pre-configured SSLContext
             </action>
@@ -163,6 +160,9 @@ This is primarily a maintenance release,
             <action dev="rwinston" type="fix" issue="NET-274">
                 Restore socket state after CCC command
             </action>
+            <action dev="rwinston" type="fix" issue="NET-275">
+                Example code in FTPClient doesn't compile
+            </action>
             <action dev="rwinston" type="fix">
                 Fix inconsistent handling of socket read/write buffer size
             </action>
@@ -172,6 +172,9 @@ This is primarily a maintenance release,
         </release>
 
         <release version="2.0" date="October 20, 2008" description="Java 5.0 release">
+            <action dev="rwinston" type="fix" issue="NET-307">
+                One of the "connect" method in class org.apache.commons.net.SocketClient doesn't handle connection timeout properly
+            </action>
             <action dev="rwinston" type="update">
                 Add null check in TelnetClient::disconnect().
             </action>