Return-Path: 
 <commits-return-3581-apmail-hama-commits-archive=hama.apache.org@hama.apache.org>
X-Original-To: apmail-hama-commits-archive@www.apache.org
Delivered-To: apmail-hama-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 AEE1E181BF
	for <apmail-hama-commits-archive@www.apache.org>;
 Tue, 22 Mar 2016 01:19:35 +0000 (UTC)
Received: (qmail 84325 invoked by uid 500); 22 Mar 2016 01:19:35 -0000
Delivered-To: apmail-hama-commits-archive@hama.apache.org
Received: (qmail 84279 invoked by uid 500); 22 Mar 2016 01:19:35 -0000
Mailing-List: contact commits-help@hama.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hama.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hama.apache.org>
List-Post: <mailto:commits@hama.apache.org>
List-Id: <commits.hama.apache.org>
Reply-To: dev@hama.apache.org
Delivered-To: mailing list commits@hama.apache.org
Received: (qmail 84254 invoked by uid 99); 22 Mar 2016 01:19:35 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2016 01:19:35 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 651A1DFA6C; Tue, 22 Mar 2016 01:19:35 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: edwardyoon@apache.org
To: commits@hama.apache.org
Date: Tue, 22 Mar 2016 01:19:35 -0000
Message-Id: <a9800fd618874468b2e02ddf74487d7f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] hama git commit: resolve conflict

Repository: hama
Updated Branches:
  refs/heads/master bed9af081 -> b67823bdf


resolve conflict


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

Branch: refs/heads/master
Commit: 86b4f34a784863b7c5bc9f6e7a0bb68e8eb08bb0
Parents: 583c69b
Author: Cazen <Cazen@korea.com>
Authored: Sun Mar 6 23:01:38 2016 +0900
Committer: Cazen <Cazen@korea.com>
Committed: Sun Mar 6 23:01:38 2016 +0900

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


http://git-wip-us.apache.org/repos/asf/hama/blob/86b4f34a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ed4d99..a679506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-auth</artifactId>
+          <artifactId>hadoop-aws</artifactId>
           <version>${hadoop.version}</version>
         </dependency>
         <dependency>