Return-Path: 
 <commits-return-6502-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-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 4B255109A3
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 26 Nov 2013 15:48:20 +0000 (UTC)
Received: (qmail 36061 invoked by uid 500); 26 Nov 2013 15:48:11 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 35321 invoked by uid 500); 26 Nov 2013 15:48:00 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 35024 invoked by uid 99); 26 Nov 2013 15:47:52 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 15:47:52 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 78E26918636; Tue, 26 Nov 2013 15:47:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ecn@apache.org
To: commits@accumulo.apache.org
Date: Tue, 26 Nov 2013 15:48:23 -0000
Message-Id: <8a2cd0ed3b3d4a21bba161a3f59b02d0@git.apache.org>
In-Reply-To: <89c1e3cc8846473eb32a965a81fdfd1c@git.apache.org>
References: <89c1e3cc8846473eb32a965a81fdfd1c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [34/39] git commit: ACCUMULO-1876 default for slf4j.version

ACCUMULO-1876 default for slf4j.version

Sets default to 1.4.3 as hadoop-1.0 is default in parent pom for 1.5.1-SNAPSHOT
(cherry picked from commit c93872afd3e191ea81e353e609749128d3b5c417)

Reason: bugfix
Author: Michael Wall <mjwall@gmail.com>
Ref: ACCUMULO-1792

Signed-off-by: Eric Newton <eric.newton@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0939746
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0939746
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0939746

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c093974647a93f70320c5d62eeff00e27fa3149d
Parents: 5e3967f
Author: Michael Wall <mjwall@gmail.com>
Authored: Fri Nov 15 16:29:46 2013 -0600
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:44 2013 -0500

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0939746/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca550d5..eda8390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,6 +868,8 @@
 
   <properties>
     <targetJdk>1.6</targetJdk>
+    <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+    <slf4j.version>1.4.3</slf4j.version>
     <zookeeper.version>3.3.1</zookeeper.version>
   </properties>