Reverting all commit booboos made on HADOOP-8290. Resetting to state before that. Sorry for so much noise. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1327616 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -63,8 +63,6 @@ Trunk (unreleased changes)
 
     HADOOP-8117. Upgrade test build to Surefire 2.12 (todd)
 
-    HADOOP-8290. Remove remaining references to hadoop.native.lib (harsh)
-
   BUG FIXES
 
     HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java

@@ -756,8 +756,7 @@ public class TestCodec {
 
     // Don't use native libs for this test.
     Configuration conf = new Configuration();
-    conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY,
-                    false);
+    conf.setBoolean("hadoop.native.lib", false);
     assertFalse("ZlibFactory is using native libs against request",
                 ZlibFactory.isNativeZlibLoaded(conf));
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java

@@ -33,7 +33,6 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -238,8 +237,7 @@ public class TestTFileSeqFileComparison extends TestCase {
     public SeqFileAppendable(FileSystem fs, Path path, int osBufferSize,
         String compress, int minBlkSize) throws IOException {
       Configuration conf = new Configuration();
-      conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY,
-                      true);
+      conf.setBoolean("hadoop.native.lib", true);
 
       CompressionCodec codec = null;
       if ("lzo".equals(compress)) {

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

@@ -1126,15 +1126,6 @@
   </description>
 </property>
 
-<property>
-  <name>mapreduce.shuffle.port</name>
-  <value>8080</value>
-  <description>Default port that the ShuffleHandler will run on. ShuffleHandler 
-   is a service run at the NodeManager to facilitate transfers of intermediate 
-   Map outputs to requesting Reducers.
-  </description>
-</property>
-
 <!--  Node health script variables -->
 
 <property>