Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8C86F9306 for ; Tue, 25 Oct 2011 16:00:34 +0000 (UTC) Received: (qmail 22362 invoked by uid 500); 25 Oct 2011 16:00:34 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22320 invoked by uid 500); 25 Oct 2011 16:00:34 -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 22311 invoked by uid 99); 25 Oct 2011 16:00:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 16:00:34 +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; Tue, 25 Oct 2011 16:00:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E2BA02388B4E for ; Tue, 25 Oct 2011 16:00:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188749 [3/3] - in /directory/shared/branches/shared-txns: all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/repons... Date: Tue, 25 Oct 2011 16:00:06 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025160012.E2BA02388B4E@eris.apache.org> Propchange: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -7,7 +7,7 @@ /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351 -/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1177670-1187277 +/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1177670-1188738 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-txns/ldap/net/mina/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -6,6 +6,6 @@ /directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351 /directory/shared/trunk/ldap:1066124-1067784 -/directory/shared/trunk/ldap/net/mina:1177670-1187277 +/directory/shared/trunk/ldap/net/mina:1177670-1188738 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636 /directory/shared/trunk/ldap-protocol-codec:1074637-1075328 Propchange: directory/shared/branches/shared-txns/ldap/schema/converter/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -6,4 +6,4 @@ /directory/shared/branches/shared-schema/ldap/schema/converter:806622-896441 /directory/shared/branches/shared-subtree/ldap/schema/converter:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap/schema/converter:945830-946347 -/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187277 +/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1188739 Propchange: directory/shared/branches/shared-txns/ldap/schema/data/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -10,5 +10,5 @@ /directory/shared/branches/shared-subtree/ldap-schema:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351 -/directory/shared/trunk/ldap/schema/data:1177670-1187277 +/directory/shared/trunk/ldap/schema/data:1177670-1188739 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -9,6 +9,6 @@ /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351 -/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1177670-1187277 +/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1177670-1188739 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844* Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -9,6 +9,6 @@ /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351 -/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1177670-1187277 +/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1177670-1188739 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844 Propchange: directory/shared/branches/shared-txns/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 16:00:02 2011 @@ -6,4 +6,4 @@ /directory/shared/branches/shared-schema/util:806622-896441 /directory/shared/branches/shared-subtree/util:965208-965686 /directory/shared/branches/xdbm-refactoring/util:945830-946347 -/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187277 +/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1188739