You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/06/21 17:52:15 UTC

svn commit: r1352582 - /directory/apacheds/branches/apacheds-txns-merge/

Author: elecharny
Date: Thu Jun 21 15:52:15 2012
New Revision: 1352582

URL: http://svn.apache.org/viewvc?rev=1352582&view=rev
Log:
Created a new branch to merge the trunk into the branch

Added:
    directory/apacheds/branches/apacheds-txns-merge/   (props changed)
      - copied from r1352581, directory/apacheds/branches/apacheds-txns/

Propchange: directory/apacheds/branches/apacheds-txns-merge/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Jun 21 15:52:15 2012
@@ -0,0 +1 @@
+

Propchange: directory/apacheds/branches/apacheds-txns-merge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 21 15:52:15 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 Thu Jun 21 15:52:15 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