| commit | 86b4f34a784863b7c5bc9f6e7a0bb68e8eb08bb0 | [log] [tgz] |
|---|---|---|
| author | Cazen <Cazen@korea.com> | Sun Mar 06 23:01:38 2016 +0900 |
| committer | Cazen <Cazen@korea.com> | Sun Mar 06 23:01:38 2016 +0900 |
| tree | 08971acfa2713ea96ec9ef806e498e5b40b0ad67 | |
| parent | 583c69b37817f9ee76403805657d6650f2efc6d3 [diff] |
resolve conflict
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>