directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1201361 - in /directory/apacheds/branches/apacheds-osgi: jdbm-partition/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ jdbm/
Date Sat, 12 Nov 2011 23:56:12 GMT
Author: elecharny
Date: Sat Nov 12 23:56:12 2011
New Revision: 1201361

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

Modified:
    directory/apacheds/branches/apacheds-osgi/jdbm/   (props changed)
    directory/apacheds/branches/apacheds-osgi/jdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
  (props changed)
    directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
  (props changed)

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:56:12 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/jdbm:1160768-1164076
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm:1072812-1075328
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
 /directory/studio/trunk/jdbm:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:56:12 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/jdbm-partition:1160768-1164080
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
 /directory/studio/trunk/jdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:56:12 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072812-1075328
 /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*,1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:56:12 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072812-1075328
 /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,1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997



Mime
View raw message