You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/10/02 12:43:48 UTC
hadoop git commit: HADOOP-12230. hadoop-project declares duplicate,
conflicting curator dependencies. Contributed by Rakesh R.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 07f940569 -> 966f9508c
HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/966f9508
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/966f9508
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/966f9508
Branch: refs/heads/branch-2
Commit: 966f9508c3ce9dcc63dd2b169150f573699f94a7
Parents: 07f9405
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Oct 2 12:40:05 2015 +0200
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Oct 2 12:40:05 2015 +0200
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-project/pom.xml | 11 -----------
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/966f9508/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 176cc11..b873ba6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -713,6 +713,9 @@ Release 2.7.2 - UNRELEASED
HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)
+ HADOOP-12230. hadoop-project declares duplicate, conflicting curator
+ dependencies. (Rakesh R via aajisaka)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/966f9508/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 0024b0e..dbb2544 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -932,17 +932,6 @@
<version>2.9.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>2.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <version>2.6.0</version>
- </dependency>
-
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>