From 44f979024753c67b18fa8c4ce931b6fd3bb9644c Mon Sep 17 00:00:00 2001
From: Haohui Mai <wheat9@apache.org>
Date: Wed, 5 Nov 2014 11:15:28 -0800
Subject: [PATCH] HADOOP-11266. Remove no longer supported activation
 properties for packaging from pom. Contributed by Masatake Iwasaki.

---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-dist/pom.xml                             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index dd393ce300d..b2ba4ddd923 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -57,6 +57,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11271. Use Time.monotonicNow() in Shell.java instead of Time.now()
     (vinayakumarb)
 
+    HADOOP-11266. Remove no longer supported activation properties for packaging
+    from pom. (Masatake Iwasaki via wheat9)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 4af964c9f9b..d94a192a614 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -77,7 +77,7 @@
       <activation>
         <activeByDefault>false</activeByDefault>
         <property>
-          <name>tar|rpm|deb</name>
+          <name>tar</name>
         </property>
       </activation>
       <build>