Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 293A9C356 for ; Wed, 6 Jun 2012 08:32:34 +0000 (UTC) Received: (qmail 90999 invoked by uid 500); 6 Jun 2012 08:32:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90952 invoked by uid 500); 6 Jun 2012 08:32:33 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 90937 invoked by uid 99); 6 Jun 2012 08:32:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 08:32:33 +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; Wed, 06 Jun 2012 08:32:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4728223889E0 for ; Wed, 6 Jun 2012 08:32:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346779 - /directory/apacheds/branches/apacheds-txns-merge/ Date: Wed, 06 Jun 2012 08:32:12 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606083212.4728223889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Jun 6 08:32:11 2012 New Revision: 1346779 URL: http://svn.apache.org/viewvc?rev=1346779&view=rev Log: Created a branch to merge trunk into the branch Added: directory/apacheds/branches/apacheds-txns-merge/ (props changed) - copied from r1346778, directory/apacheds/branches/apacheds-txns/ Propchange: directory/apacheds/branches/apacheds-txns-merge/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Wed Jun 6 08:32:11 2012 @@ -0,0 +1 @@ + Propchange: directory/apacheds/branches/apacheds-txns-merge/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 6 08:32:11 2012 @@ -0,0 +1,10 @@ +target +.project +.classpath +.settings +eclipse-classes +*.log +*.iml +*.ipr +dependency-reduced-pom.xml +META-INF Propchange: directory/apacheds/branches/apacheds-txns-merge/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jun 6 08:32:11 2012 @@ -0,0 +1,10 @@ +/directory/apacheds/branches/apacheds-codec-merge:982369-987590 +/directory/apacheds/branches/apacheds-config:1023442-1029077 +/directory/apacheds/branches/apacheds-kerberos-codec-2.0:1040956-1043765 +/directory/apacheds/branches/apacheds-replication:749790-764110 +/directory/apacheds/branches/apacheds-schema:806623-896441 +/directory/apacheds/branches/apacheds-subtree:965203-965686 +/directory/apacheds/branches/milestones:1072812-1075328 +/directory/apacheds/branches/xdbm-refactoring:945827-946347 +/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1177663-1183434,1209070-1214194 +/directory/studio/trunk:1067786-1067997