Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 44040 invoked from network); 3 Feb 2011 19:21:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Feb 2011 19:21:51 -0000 Received: (qmail 41423 invoked by uid 500); 3 Feb 2011 19:21:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41361 invoked by uid 500); 3 Feb 2011 19:21:51 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 41353 invoked by uid 99); 3 Feb 2011 19:21:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 19:21:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 19:21:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9585823889E3; Thu, 3 Feb 2011 19:21:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066914 - in /directory/apacheds/branches/m1: ./ all/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-avl/ core-constants/ core-integ/ core-integ/src/test/java/org/apache/directory/server/core/coll... Date: Thu, 03 Feb 2011 19:21:26 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110203192127.9585823889E3@eris.apache.org> Author: akarasulu Date: Thu Feb 3 19:21:25 2011 New Revision: 1066914 URL: http://svn.apache.org/viewvc?rev=1066914&view=rev Log: merging from trunk to m1 Modified: directory/apacheds/branches/m1/ (props changed) directory/apacheds/branches/m1/all/ (props changed) directory/apacheds/branches/m1/core/ (props changed) directory/apacheds/branches/m1/core-annotations/ (props changed) directory/apacheds/branches/m1/core-api/ (props changed) directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java (props changed) directory/apacheds/branches/m1/core-avl/ (props changed) directory/apacheds/branches/m1/core-constants/ (props changed) directory/apacheds/branches/m1/core-integ/ (props changed) directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed) directory/apacheds/branches/m1/core-jndi/ (props changed) directory/apacheds/branches/m1/http-integration/ (props changed) directory/apacheds/branches/m1/i18n/ (props changed) directory/apacheds/branches/m1/installers/ (props changed) directory/apacheds/branches/m1/installers-maven-plugin/ (props changed) directory/apacheds/branches/m1/interceptor-kerberos/ (props changed) directory/apacheds/branches/m1/jdbm/ (props changed) directory/apacheds/branches/m1/jdbm-partition/ (props changed) directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed) directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed) directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed) directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed) directory/apacheds/branches/m1/kerberos-codec/ (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed) directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed) directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed) directory/apacheds/branches/m1/kerberos-test/ (props changed) directory/apacheds/branches/m1/ldif-partition/ (props changed) directory/apacheds/branches/m1/protocol-changepw/ (props changed) directory/apacheds/branches/m1/protocol-dhcp/ (props changed) directory/apacheds/branches/m1/protocol-dns/ (props changed) directory/apacheds/branches/m1/protocol-kerberos/ (props changed) directory/apacheds/branches/m1/protocol-ldap/ (props changed) directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (props changed) directory/apacheds/branches/m1/protocol-ntp/ (props changed) directory/apacheds/branches/m1/protocol-shared/ (props changed) directory/apacheds/branches/m1/server-annotations/ (props changed) directory/apacheds/branches/m1/server-config/ (props changed) directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed) directory/apacheds/branches/m1/server-config/src/main/resources/ (props changed) directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed) directory/apacheds/branches/m1/server-integ/ (props changed) directory/apacheds/branches/m1/server-jndi/ (props changed) directory/apacheds/branches/m1/server-replication/ (props changed) directory/apacheds/branches/m1/server-tools/ (props changed) directory/apacheds/branches/m1/service-builder/ (props changed) directory/apacheds/branches/m1/test-framework/ (props changed) directory/apacheds/branches/m1/xdbm-partition/ (props changed) directory/apacheds/branches/m1/xdbm-tools/ (props changed) Propchange: directory/apacheds/branches/m1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -5,4 +5,4 @@ /directory/apacheds/branches/apacheds-schema:806623-896441 /directory/apacheds/branches/apacheds-subtree:965203-965686 /directory/apacheds/branches/xdbm-refactoring:945827-946347 -/directory/apacheds/trunk:1066126-1066269 +/directory/apacheds/trunk:1066126-1066913 Propchange: directory/apacheds/branches/m1/all/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/all:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765 -/directory/apacheds/trunk/all:1066126-1066501 +/directory/apacheds/trunk/all:1066126-1066913 Propchange: directory/apacheds/branches/m1/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -3,4 +3,4 @@ /directory/apacheds/branches/apacheds-config/core:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765 -/directory/apacheds/trunk/core:1066126-1066269 +/directory/apacheds/trunk/core:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-annotations/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -3,4 +3,4 @@ /directory/apacheds/branches/apacheds-config/core-annotations:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765 -/directory/apacheds/trunk/core-annotations:1066126-1066269 +/directory/apacheds/trunk/core-annotations:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-api/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/core-api:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765 -/directory/apacheds/trunk/core-api:1066126-1066269 +/directory/apacheds/trunk/core-api:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -6,4 +6,4 @@ /directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:806623-896441 /directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686 /directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347 -/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1066269 +/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-avl/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/core-avl:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765 -/directory/apacheds/trunk/core-avl:1066126-1066269 +/directory/apacheds/trunk/core-avl:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-constants/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/core-constants:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765 -/directory/apacheds/trunk/core-constants:1066126-1066269 +/directory/apacheds/trunk/core-constants:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-integ/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/core-integ:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765 -/directory/apacheds/trunk/core-integ:1066126-1066269 +/directory/apacheds/trunk/core-integ:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -7,4 +7,4 @@ /directory/apacheds/branches/apacheds-subtree/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:965202-966561 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347 -/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1066269 +/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/core-jndi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/core-jndi:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765 -/directory/apacheds/trunk/core-jndi:1066126-1066269 +/directory/apacheds/trunk/core-jndi:1066126-1066913 Propchange: directory/apacheds/branches/m1/http-integration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/http-integration:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765 -/directory/apacheds/trunk/http-integration:1066126-1066269 +/directory/apacheds/trunk/http-integration:1066126-1066913 Propchange: directory/apacheds/branches/m1/i18n/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/i18n:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765 -/directory/apacheds/trunk/i18n:1066126-1066269 +/directory/apacheds/trunk/i18n:1066126-1066913 Propchange: directory/apacheds/branches/m1/installers/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-config/installers:1023442-1029077 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765 -/directory/apacheds/trunk/installers:1066126-1066269 +/directory/apacheds/trunk/installers:1066126-1066913 /directory/installers/branches/installers-schema/apacheds:806631-896441 Propchange: directory/apacheds/branches/m1/installers-maven-plugin/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765 -/directory/apacheds/trunk/installers-maven-plugin:1066126-1066269 +/directory/apacheds/trunk/installers-maven-plugin:1066126-1066913 /directory/daemon/branches/daemon-schema/plugin:806630-896441 Propchange: directory/apacheds/branches/m1/interceptor-kerberos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/interceptor-kerberos:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765 -/directory/apacheds/trunk/interceptor-kerberos:1066126-1066269 +/directory/apacheds/trunk/interceptor-kerberos:1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/jdbm:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765 -/directory/apacheds/trunk/jdbm:1066126-1066269 +/directory/apacheds/trunk/jdbm:1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/jdbm-partition:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765 -/directory/apacheds/trunk/jdbm-partition:1066126-1066269 +/directory/apacheds/trunk/jdbm-partition:1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -6,4 +6,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*,1066126-1066269 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -6,4 +6,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,1066126-1066269 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -6,4 +6,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*,1066126-1066269 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1066913 Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -6,4 +6,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,1066126-1066269 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/ ('svn:mergeinfo' removed) Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:982369-987590 /directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:982369-987590 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -5,4 +5,4 @@ /directory/apacheds/branches/apacheds-schema/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:806623-896441 /directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-shared/src/test/java/org/apache/directory/server:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765 -/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1066504 +/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1066913 Propchange: directory/apacheds/branches/m1/kerberos-test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/kerberos-test:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765 -/directory/apacheds/trunk/kerberos-test:1066126-1066269 +/directory/apacheds/trunk/kerberos-test:1066126-1066913 Propchange: directory/apacheds/branches/m1/ldif-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/ldif-partition:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765 -/directory/apacheds/trunk/ldif-partition:1066126-1066269 +/directory/apacheds/trunk/ldif-partition:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-changepw/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-changepw:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765 -/directory/apacheds/trunk/protocol-changepw:1066126-1066269 +/directory/apacheds/trunk/protocol-changepw:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-dhcp/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-dhcp:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765 -/directory/apacheds/trunk/protocol-dhcp:1066126-1066269 +/directory/apacheds/trunk/protocol-dhcp:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-dns/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-dns:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765 -/directory/apacheds/trunk/protocol-dns:1066126-1066269 +/directory/apacheds/trunk/protocol-dns:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-kerberos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-kerberos:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765 -/directory/apacheds/trunk/protocol-kerberos:1066126-1066269 +/directory/apacheds/trunk/protocol-kerberos:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-ldap/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -3,4 +3,4 @@ /directory/apacheds/branches/apacheds-config/protocol-ldap:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765 -/directory/apacheds/trunk/protocol-ldap:1066126-1066269 +/directory/apacheds/trunk/protocol-ldap:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -7,4 +7,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,1066126-1066269 +/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-ntp/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-ntp:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765 -/directory/apacheds/trunk/protocol-ntp:1066126-1066269 +/directory/apacheds/trunk/protocol-ntp:1066126-1066913 Propchange: directory/apacheds/branches/m1/protocol-shared/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/protocol-shared:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765 -/directory/apacheds/trunk/protocol-shared:1066126-1066269 +/directory/apacheds/trunk/protocol-shared:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-annotations/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/server-annotations:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765 -/directory/apacheds/trunk/server-annotations:1066126-1066269 +/directory/apacheds/trunk/server-annotations:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -4,4 +4,4 @@ /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868 -/directory/apacheds/trunk/server-config:1066126-1066269 +/directory/apacheds/trunk/server-config:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -8,4 +8,4 @@ /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347 -/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1066269 +/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-config/src/main/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -11,4 +11,4 @@ /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347 -/directory/apacheds/trunk/server-config/src/main/resources:1066126-1066269 +/directory/apacheds/trunk/server-config/src/main/resources:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -10,4 +10,4 @@ /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347 -/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1066269 +/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-integ/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -3,4 +3,4 @@ /directory/apacheds/branches/apacheds-config/server-integ:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765 -/directory/apacheds/trunk/server-integ:1066126-1066269 +/directory/apacheds/trunk/server-integ:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-jndi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/server-jndi:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765 -/directory/apacheds/trunk/server-jndi:1066126-1066269 +/directory/apacheds/trunk/server-jndi:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-replication/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/server-replication:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765 -/directory/apacheds/trunk/server-replication:1066126-1066269 +/directory/apacheds/trunk/server-replication:1066126-1066913 Propchange: directory/apacheds/branches/m1/server-tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/server-tools:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765 -/directory/apacheds/trunk/server-tools:1066126-1066269 +/directory/apacheds/trunk/server-tools:1066126-1066913 Propchange: directory/apacheds/branches/m1/service-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -1,2 +1,2 @@ /directory/apacheds/branches/antoine/service-builder:1038305-1044163 -/directory/apacheds/trunk/service-builder:1066126-1066269 +/directory/apacheds/trunk/service-builder:1066126-1066913 Propchange: directory/apacheds/branches/m1/test-framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -8,4 +8,4 @@ /directory/apacheds/branches/apacheds-schema/test-framework:806623-893782 /directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347 -/directory/apacheds/trunk/test-framework:1066126-1066269 +/directory/apacheds/trunk/test-framework:1066126-1066913 Propchange: directory/apacheds/branches/m1/xdbm-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/xdbm-partition:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765 -/directory/apacheds/trunk/xdbm-partition:1066126-1066269 +/directory/apacheds/trunk/xdbm-partition:1066126-1066913 Propchange: directory/apacheds/branches/m1/xdbm-tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 19:21:25 2011 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-config/xdbm-tools:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765 -/directory/apacheds/trunk/xdbm-tools:1066126-1066269 +/directory/apacheds/trunk/xdbm-tools:1066126-1066913