Return-Path: 
 <commits-return-14210-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org
Delivered-To: apmail-jackrabbit-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 734D99A70
	for <apmail-jackrabbit-commits-archive@www.apache.org>;
 Tue, 21 May 2013 10:00:01 +0000 (UTC)
Received: (qmail 99449 invoked by uid 500); 21 May 2013 10:00:01 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 99389 invoked by uid 500); 21 May 2013 10:00:01 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 99367 invoked by uid 99); 21 May 2013 10:00:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 10:00:00 +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, 21 May 2013 09:59:59 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1783023889DE;
	Tue, 21 May 2013 09:59:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1484728 - in /jackrabbit/branches/2.6: ./
 jackrabbit-core/src/test/repository/repository.xml
Date: Tue, 21 May 2013 09:59:40 -0000
To: commits@jackrabbit.apache.org
From: tommaso@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130521095940.1783023889DE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tommaso
Date: Tue May 21 09:59:39 2013
New Revision: 1484728

URL: http://svn.apache.org/r1484728
Log:
2.6: Merged revision 1484727 (JCR-3534)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-core/src/test/repository/repository.xml

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1484727

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/test/repository/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/test/repository/repository.xml?rev=1484728&r1=1484727&r2=1484728&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/test/repository/repository.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/test/repository/repository.xml Tue May 21 09:59:39 2013
@@ -30,9 +30,7 @@
     <!--
         data store configuration
     -->
-    <DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
-        <param name="secret" value="a very well kept secret"/>
-    </DataStore>
+    <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
     <!--
         sample database data store configuration
         <DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">