directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r987487 - in /directory/apacheds/branches/apacheds-codec-merge: protocol-changepw/ protocol-dhcp/ protocol-dns/ protocol-kerberos/ protocol-ldap/ protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ protocol-ntp/ protoc...
Date Fri, 20 Aug 2010 13:00:12 GMT
Author: elecharny
Date: Fri Aug 20 13:00:12 2010
New Revision: 987487

URL: http://svn.apache.org/viewvc?rev=987487&view=rev
Log:
Merged trunk into the codec branch

Modified:
    directory/apacheds/branches/apacheds-codec-merge/protocol-changepw/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-dhcp/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-dns/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-ntp/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/protocol-shared/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-annotations/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-integ/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-jndi/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-replication/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-tools/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/test-framework/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/xdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/xdbm-tools/   (props changed)

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
-/directory/apacheds/trunk/protocol-changepw:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-changepw:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
-/directory/apacheds/trunk/protocol-dhcp:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-dhcp:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
-/directory/apacheds/trunk/protocol-dns:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-dns:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
-/directory/apacheds/trunk/protocol-kerberos:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-kerberos:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
-/directory/apacheds/trunk/protocol-ldap:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-ldap:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
-/directory/apacheds/trunk/protocol-ntp:982368-982970
+/directory/apacheds/trunk/protocol-ntp:982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
-/directory/apacheds/trunk/protocol-shared:980025-980137,982368-982970
+/directory/apacheds/trunk/protocol-shared:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
-/directory/apacheds/trunk/server-annotations:980025-980137,982368-982970
+/directory/apacheds/trunk/server-annotations:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
-/directory/apacheds/trunk/server-integ:982368-982971
+/directory/apacheds/trunk/server-integ:982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
-/directory/apacheds/trunk/server-jndi:980025-980137,982368-982971
+/directory/apacheds/trunk/server-jndi:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
-/directory/apacheds/trunk/server-replication:980025-980137,982368-982971
+/directory/apacheds/trunk/server-replication:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
-/directory/apacheds/trunk/server-tools:980025-980137,982368-982972
+/directory/apacheds/trunk/server-tools:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -4,4 +4,4 @@
 /directory/apacheds/branches/apacheds-schema/test-framework:806623-896441
 /directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:980025-980137,982368-982973
+/directory/apacheds/trunk/test-framework:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
-/directory/apacheds/trunk/xdbm-partition:980025-980137,982368-982973
+/directory/apacheds/trunk/xdbm-partition:980025-980137,982368-987480

Propchange: directory/apacheds/branches/apacheds-codec-merge/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:00:12 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
-/directory/apacheds/trunk/xdbm-tools:980025-980137,982368-982973
+/directory/apacheds/trunk/xdbm-tools:980025-980137,982368-987481



Mime
View raw message