Repository: hadoop Updated Branches: refs/heads/branch-2.6 f3b9f5e3d -> eedbd033d
HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R. (cherry picked from commit 966f9508c3ce9dcc63dd2b169150f573699f94a7) (cherry picked from commit 3249c3ce56cc7b719599b4b0100cf6dfdeabb4df) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eedbd033 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eedbd033 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eedbd033 Branch: refs/heads/branch-2.6 Commit: eedbd033d35e77733952606d47d6c8b823235218 Parents: f3b9f5e Author: Akira Ajisaka <[email protected]> Authored: Fri Oct 2 12:40:05 2015 +0200 Committer: Sangjin Lee <[email protected]> Committed: Fri Oct 30 14:02:44 2015 -0700 ---------------------------------------------------------------------- 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/eedbd033/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 56a1dee..ea39ebb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -12,6 +12,9 @@ Release 2.6.3 - UNRELEASED BUG FIXES + HADOOP-12230. hadoop-project declares duplicate, conflicting curator + dependencies. (Rakesh R via aajisaka) + Release 2.6.2 - 2015-10-21 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/eedbd033/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 010ecff..fd4956e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -891,17 +891,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>
