Repository: bigtop Updated Branches: refs/heads/master 2b0d4a56f -> 0f0e8842b
BIGTOP-2405: Rollback BIGTOP-2049 as the original issue was fixed in the upstream Revert "BIGTOP-2049. patch to add io.netty dependency to hadoop-common pom for Hadoop 2.7.1, fixes broken Hadoop package build" This reverts commit f3edc60c65b567423599aa7ab3370ad4d874c953. Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0f0e8842 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0f0e8842 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0f0e8842 Branch: refs/heads/master Commit: 0f0e8842b735683617f934656c576a4e2ad0d1db Parents: 2b0d4a5 Author: Kengo Seki <[email protected]> Authored: Sat Oct 1 20:58:51 2016 +0900 Committer: Konstantin Boudnik <[email protected]> Committed: Thu Oct 13 13:13:20 2016 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hadoop/patch0.diff | 15 --------------- 1 file changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0f0e8842/bigtop-packages/src/common/hadoop/patch0.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/patch0.diff b/bigtop-packages/src/common/hadoop/patch0.diff deleted file mode 100644 index ff6ec14..0000000 --- a/bigtop-packages/src/common/hadoop/patch0.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr hadoop-2.7.1-src/hadoop-common-project/hadoop-common/pom.xml hadoop-2.7.1-srcp/hadoop-common-project/hadoop-common/pom.xml ---- hadoop-2.7.1-src/hadoop-common-project/hadoop-common/pom.xml 2015-09-15 15:48:18.410962019 -0700 -+++ hadoop-2.7.1-srcp/hadoop-common-project/hadoop-common/pom.xml 2015-09-15 15:50:52.059389201 -0700 -@@ -238,6 +238,11 @@ - <artifactId>jsr305</artifactId> - <scope>compile</scope> - </dependency> -+ <dependency> -+ <groupId>io.netty</groupId> -+ <artifactId>netty</artifactId> -+ <scope>compile</scope> -+ </dependency> - - <dependency> - <groupId>org.apache.htrace</groupId>
