HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe)
(cherry picked from commit 55302ccfba199ddf070119be30df06afd2511e05)
YARN-2577. Clarify ACL delimiter and how to configure ACL groups only (Mikos Christine via aw)
HADOOP-8808. Update FsShell documentation to mention deprecation of some of the commands, and mention alternatives (Akira AJISAKA via aw)
MAPREDUCE-6073. Description of mapreduce.job.speculative.slowtaskthreshold in mapred-default should be moved into description tags (Tsuyoshi OZAWA via aw)
HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw)
HDFS-6664. HDFS permissions guide documentation states incorrect default group mapping class. (Ray Chiang via aw)
YARN-2372. There are Chinese Characters in the FairScheduler's document (Fengdong Yu via aw)
HADOOP-11048. user/custom LogManager fails to load if the client classloader is enabled. Contributed by Sangjin Lee
(cherry picked from commit f154ebe8c44e41edc443198a14e0491604cc613f)
MAPREDUCE-5796. Use current version of the archive name in DistributedCacheDeploy document (Akira AJISAKA via aw)
MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw)
HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry Saputra via aw)
HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm (Kenji Kikushima via aw)
YARN-668. Changed NMTokenIdentifier/AMRMTokenIdentifier/ContainerTokenIdentifier to use protobuf object as the payload. Contributed by Junping Du.
(cherry picked from commit 5391919b09ce9549d13c897aa89bb0a0536760fe)
MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA
(cherry picked from commit 5f16c98ad66b562760d5d947151a38f14875d21a)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2