diff --git a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm index 5ca5c2c5eb..1e76bafec5 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm @@ -314,35 +314,6 @@ Administration Commands Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#dfsadmin} <<>>}} instead. -* <<>> - - Runs MR admin client - - Usage: <<>> - -*-------------------+-----------------------------------------------------------+ -|| COMMAND_OPTION || Description -*-------------------+-----------------------------------------------------------+ -| -refreshQueueAcls | Refresh the queue acls used by hadoop, to check access - | during submissions and administration of the job by the - | user. The properties present in mapred-queue-acls.xml is - | reloaded by the queue manager. -*-------------------+-----------------------------------------------------------+ - -* <<>> - - Runs the MapReduce job Tracker node. - - Usage: <<>> - -*--------------------+-----------------------------------------------------------+ -|| COMMAND_OPTION || Description -*--------------------+-----------------------------------------------------------+ -| -dumpConfiguration | Dumps the configuration used by the JobTracker alongwith - | queue configuration in JSON format into Standard output - | used by the jobtracker and exits. -*--------------------+-----------------------------------------------------------+ - * <<>> Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#namenode} @@ -352,9 +323,3 @@ Administration Commands Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#secondarynamenode} <<>>}} instead. - -* <<>> - - Runs a MapReduce task Tracker node. - - Usage: <<>> diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 5bb579745a..a683526ae6 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -151,6 +151,9 @@ Trunk (Unreleased) MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to ProportionalCapacityPreemptionPolicy (Sunil G via devaraj) + MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm + (Akira AJISAKA via aw) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES