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 <[email protected]> Authored: Sun Mar 6 23:01:38 2016 +0900 Committer: Cazen <[email protected]> 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>
