svn commit: r1444293 - in /tomcat/tc6.0.x/branches/tomcat6-testing: ./ BRANCH-README.txt

[kk...@apache.org]

Author: kkolinko
Date: Sat Feb  9 00:04:48 2013
New Revision: 1444293

URL: http://svn.apache.org/r1444293
Log:
Record-only merge of r1417826,1444292 from 6.0.x/trunk

Those are revisions that have been merged from this branch to trunk.
Thus all those changes are already present in this branch and cannot be merged back.

Updated BRANCH-README.txt

Modified:
    tomcat/tc6.0.x/branches/tomcat6-testing/   (props changed)
    tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
------------------------------------------------------------------------------
  Merged /tomcat/tc6.0.x/trunk:r1417826,1444292

Modified: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt?rev=1444293&r1=1444292&r2=1444293&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Sat Feb  9 00:04:48 2013
@@ -5,7 +5,9 @@ merges from tc6.0.x/trunk.
 
 Created: 2012-11-12 from r1408230
 Last catch-up merge: 2013-02-04 (r1442376), merged up to r1442373
- (skipping r1417826)
+
+Revisions in 6.0.x/trunk that are merges from this branch:
+r1417826,1444292
 
 
 TODO:



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org