You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2016/03/22 02:19:35 UTC
[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 <Ca...@korea.com>
Authored: Sun Mar 6 23:01:38 2016 +0900
Committer: Cazen <Ca...@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>
[2/2] hama git commit: Merge branch 'HAMA-984' of
https://github.com/Cazen/hama This closes #9
Posted by ed...@apache.org.
Merge branch 'HAMA-984' of https://github.com/Cazen/hama This closes #9
Project: http://git-wip-us.apache.org/repos/asf/hama/repo
Commit: http://git-wip-us.apache.org/repos/asf/hama/commit/b67823bd
Tree: http://git-wip-us.apache.org/repos/asf/hama/tree/b67823bd
Diff: http://git-wip-us.apache.org/repos/asf/hama/diff/b67823bd
Branch: refs/heads/master
Commit: b67823bdf8baea15fae6e2f951876ffee50a0ca2
Parents: bed9af0 86b4f34
Author: Edward J. Yoon <ed...@apache.org>
Authored: Tue Mar 22 10:19:00 2016 +0900
Committer: Edward J. Yoon <ed...@apache.org>
Committed: Tue Mar 22 10:19:00 2016 +0900
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hama/blob/b67823bd/pom.xml
----------------------------------------------------------------------