directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r987490 - in /directory/apacheds/branches/apacheds-codec-merge: interceptor-kerberos/ jdbm-partition/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ jdbm-partition/src/test/java/org/apache/directory/server/cor...
Date Fri, 20 Aug 2010 13:01:01 GMT
Author: elecharny
Date: Fri Aug 20 13:01:00 2010
New Revision: 987490

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

Modified:
    directory/apacheds/branches/apacheds-codec-merge/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/kerberos-test/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/ldif-partition/   (props changed)

Propchange: directory/apacheds/branches/apacheds-codec-merge/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
-/directory/apacheds/trunk/interceptor-kerberos:982368-982970
+/directory/apacheds/trunk/interceptor-kerberos:982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
-/directory/apacheds/trunk/jdbm:980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
-/directory/apacheds/trunk/jdbm-partition:980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm-partition:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:809853-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:00 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,980025-980137,982368-982970
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,980025-980137,982368-987479

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

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

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



Mime
View raw message