Return-Path: 
 <commits-return-6914-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 0C686102D4
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Fri,  6 Dec 2013 06:39:35 +0000 (UTC)
Received: (qmail 3683 invoked by uid 500); 6 Dec 2013 03:52:53 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 3639 invoked by uid 500); 6 Dec 2013 03:52:52 -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 3626 invoked by uid 99); 6 Dec 2013 03:52: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; Fri, 06 Dec 2013 03:52:52 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E65B582CF9E; Fri,  6 Dec 2013 03:52:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Fri, 06 Dec 2013 03:52:51 -0000
Message-Id: <764b95d761c542358a1a92140b7dc941@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: ACCUMULO-1793 updates Hadoop 2 profile to match
 version used in other dev branches. Includes updating slf4j based on what
 comes with Hadoop 2.2.0.

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 975881c10 -> f65becad0


ACCUMULO-1793 updates Hadoop 2 profile to match version used in other dev branches. Includes updating slf4j based on what comes with Hadoop 2.2.0.

Signed-off-by: Josh Elser <elserj@apache.org>


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1d5ed48f94fbbac3b10d18db4148b4dae79f2880
Parents: 00fb08b
Author: Sean Busbey <busbey@clouderagovt.com>
Authored: Thu Dec 5 12:38:52 2013 -0600
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Dec 5 22:33:23 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d5ed48f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a46609..bda5076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -932,9 +932,9 @@
         </property>
       </activation>
       <properties>
-        <hadoop.version>2.0.4-alpha</hadoop.version>
+        <hadoop.version>2.2.0</hadoop.version>
         <httpclient.version>3.1</httpclient.version>
-        <slf4j.version>1.6.1</slf4j.version>
+        <slf4j.version>1.7.5</slf4j.version>
       </properties>
     </profile>
   </profiles>