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 2011/12/14 15:27:36 UTC
svn commit: r1214254 - in /directory: apacheds/branches/apacheds-txns/
apacheds/branches/apacheds-txns/interceptors/
apacheds/branches/apacheds-txns/protocol-changepw/
apacheds/branches/apacheds-txns/server-tools/ shared/branches/shared-txns/
Author: elecharny
Date: Wed Dec 14 14:27:36 2011
New Revision: 1214254
URL: http://svn.apache.org/viewvc?rev=1214254&view=rev
Log:
merged back trunk into the txns branch
Modified:
directory/apacheds/branches/apacheds-txns/ (props changed)
directory/apacheds/branches/apacheds-txns/interceptors/ (props changed)
directory/apacheds/branches/apacheds-txns/protocol-changepw/ (props changed)
directory/apacheds/branches/apacheds-txns/server-tools/ (props changed)
directory/shared/branches/shared-txns/ (props changed)
Propchange: directory/apacheds/branches/apacheds-txns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:27:36 2011
@@ -6,5 +6,5 @@
/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
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1209070-1214194
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-txns/interceptors/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:27:36 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors:1183435-1186978
+/directory/apacheds/trunk/interceptors:1183435-1186978,1209070-1214194
Propchange: directory/apacheds/branches/apacheds-txns/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:27:36 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
/directory/apacheds/branches/milestones/protocol-changepw:1072812-1075328
/directory/apacheds/trunk/interceptors/protocol-changepw:1183435-1186974
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1209070-1214194
/directory/studio/trunk/protocol-changepw:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-txns/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:27:36 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
/directory/apacheds/branches/milestones/server-tools:1072812-1075328
/directory/apacheds/trunk/interceptors/server-tools:1183435-1186974
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1209070-1214194
/directory/studio/trunk/server-tools:1067786-1067997
Propchange: directory/shared/branches/shared-txns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:27:36 2011
@@ -6,4 +6,4 @@
/directory/shared/branches/shared-schema:806622-896441
/directory/shared/branches/shared-subtree:965208-965686
/directory/shared/branches/xdbm-refactoring:945830-946347
-/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328
+/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328,1209073-1214195