From commits-return-34236-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jun 6 14:38:59 2012 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 1AD82C597 for ; Wed, 6 Jun 2012 14:38:59 +0000 (UTC) Received: (qmail 8805 invoked by uid 500); 6 Jun 2012 14:38:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 8740 invoked by uid 500); 6 Jun 2012 14:38:58 -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 8733 invoked by uid 99); 6 Jun 2012 14:38:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 14:38:58 +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; Wed, 06 Jun 2012 14:38:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ACCAF2388865 for ; Wed, 6 Jun 2012 14:38:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346919 - /directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Date: Wed, 06 Jun 2012 14:38:37 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606143837.ACCAF2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Jun 6 14:38:37 2012 New Revision: 1346919 URL: http://svn.apache.org/viewvc?rev=1346919&view=rev Log: Merged commit rev1299608 Modified: directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Modified: directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1346919&r1=1346918&r2=1346919&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original) +++ directory/apacheds/branches/apacheds-txns-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Wed Jun 6 14:38:37 2012 @@ -83,9 +83,11 @@ import org.junit.runner.RunWith; */ @RunWith(FrameworkRunner.class) @CreateLdapServer(transports = - { @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") }) -// disable changelog, for more info see DIRSERVER-1528 -@CreateDS(enableChangeLog = false, name = "PasswordPolicyTest") + { + @CreateTransport(protocol = "LDAP"), + @CreateTransport(protocol = "LDAPS") }) + // disable changelog, for more info see DIRSERVER-1528 + @CreateDS(enableChangeLog = false, name = "PasswordPolicyTest") public class PasswordPolicyTest extends AbstractLdapTestUnit { private PasswordPolicyConfiguration policyConfig;