Return-Path: X-Original-To: apmail-axis-java-commits-archive@minotaur.apache.org Delivered-To: apmail-axis-java-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 055B649E0 for ; Fri, 10 Jun 2011 21:37:14 +0000 (UTC) Received: (qmail 33874 invoked by uid 500); 10 Jun 2011 21:37:14 -0000 Delivered-To: apmail-axis-java-commits-archive@axis.apache.org Received: (qmail 33850 invoked by uid 500); 10 Jun 2011 21:37:13 -0000 Mailing-List: contact java-commits-help@axis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@axis.apache.org Delivered-To: mailing list java-commits@axis.apache.org Received: (qmail 33843 invoked by uid 99); 10 Jun 2011 21:37:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jun 2011 21:37:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 10 Jun 2011 21:37:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D484D23889F7; Fri, 10 Jun 2011 21:36:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1134448 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/documentation/src/site/resources/download/ modules/documentation/src/site/resources/download/1.1/ modules/documentation/src/site/resources/download/1.2/ modules/documentation/s... Date: Fri, 10 Jun 2011 21:36:49 -0000 To: java-commits@axis.apache.org From: veithen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110610213649.D484D23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: veithen Date: Fri Jun 10 21:36:48 2011 New Revision: 1134448 URL: http://svn.apache.org/viewvc?rev=1134448&view=rev Log: Merged r1134446 to the 1.6 branch. Added: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.1/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.1/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.1/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.1/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.2/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.2/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.2/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.2/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.3/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.3/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.3/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.3/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.4/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.4/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.4/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.4/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5.1/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5.1/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5.1/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5.1/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.0/ - copied from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.0/ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.0/download.cgi - copied unchanged from r1134446, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.0/download.cgi Removed: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.1/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.2/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.3/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.4/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5/download.cgi axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.cgi Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) Propchange: axis/axis2/java/rampart/branches/1_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 10 21:36:48 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564 +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446