…Eddy) Xu.

…e default dfs.journalnode.http-address port 8480 is in use. (Contributed by Xiaoyu Yao)

…er. Contributed by Haohui Mai.

(cherry picked from commit 8234fd0)
(cherry picked from commit 79c07bb)

…an the preferred block size. Contributed by Jing Zhao.

(cherry picked from commit bee5a6a)
(cherry picked from commit 6dcc795)

…a violation. Contributed by Jing Zhao.

(cherry picked from commit c7c71cd)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit 5a5b244)

…grade starts (Zhe Zhang via Colin P. McCabe)

(cherry picked from commit 43b41f2)
(cherry picked from commit 219eb22)

…y Bhat via Colin P. McCabe)

(cherry picked from commit bf6295b)
(cherry picked from commit b02f775)

…ntributed by Benoy Antony.

…ui Mai

(cherry picked from commit e79be0e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(cherry picked from commit ceb39c1)

… upgrade ( Contributed by J.Andreina )

(cherry picked from commit 5be5129)

…atake Iwasaki.

(cherry picked from commit 522c897)

…Contributed by Kihwal Lee.

(cherry picked from commit 61a4c7f)

…cified task output subdirs. Contributed by Gera Shegalov and Siqi Li

(cherry picked from commit 91baca1)

…liu)

…able in RM WebUI. Contributed by Xuan Gong

(cherry picked from commit 4e886eb)

by Varun Saxena

(cherry picked from commit 1a4b528)

Conflicts:
	hadoop-yarn-project/CHANGES.txt

…o die. (Brahma Reddy Battula via wangda)

(cherry picked from commit 6bc7710)

…buted by Jing Zhao.

(cherry picked from commit d368d36)
(cherry picked from commit 6be52e4)

…e.now(). Contributed by Vinayakumar B

(cherry picked from commit 99a8dcd19528b265d4fda9ae09a17e4af52f2782)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
(cherry picked from commit 63b7870aec007081c82427587cb6e1d38e2c70f8)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java

…h causes counter limits are not reset correctly. Contributed by Zhihai Xu.

…ARN-2777. Contributed by Naganarasimha G R.

(cherry picked from commit 82eda77)

… Contributed by Brandon Li

(cherry picked from commit 36af4a9)
(cherry picked from commit 503d8e4)

(cherry picked from commit 6ca1f12)
(cherry picked from commit 342c525)

… by Brahma Reddy Battula.

(cherry picked from commit fad8c78)

…ailure. Contributed by Lei (Eddy) Xu.

(cherry picked from commit 2c238ae)
(cherry picked from commit 01c0bcb)

starting the attempt. Contributed by Zhijie Shen

(cherry picked from commit 9fae455)

…n stamp provided by the client is larger than the one stored in the datanode. Contributed by Brahma Reddy Battula

… they're not empty. Contributed by Colin McCabe and Eddy Xu.

(cherry picked from commit 50ee8f4)

…lamen Jeliazkov.

…#credential. Contributed by Varun Saxena.

(cherry picked from commit 6e891a9)

…ationException. Contributed by Jonathan Eagles.

(cherry picked from commit 4170c99)

…uted by Eddy Xu.

(cherry picked from commit 6413d34)

…or avoid reordered writes. Contributed by Brandon Li

(cherry picked from commit 51f1f49)
(cherry picked from commit 95bde88)

…ndon Li

(cherry picked from commit 570a83a)
(cherry picked from commit 260dbe9)

…n assertions. Contributed by Arun Suresh.

(cherry picked from commit 456cec1)

…unclosed stream. (ozawa)

(cherry picked from commit b351086)

…DING.txt. (ozawa)

(cherry picked from commit 323945b)

…estCombineFileInputFormat. (aajisaka)

(cherry picked from commit c770df4)
(cherry picked from commit 2e50990)

Contributed by Varun Saxena

(cherry picked from commit e556198)

…re secret files. Contributed by Kai Zheng.

…Masatake Iwasaki.

…Storage Type Quota/Usage. (Contributed by Xiaoyu Yao)

…ppending streams (Vinayakumar B via Colin P. McCabe)

(cherry picked from commit 61df1b2)
(cherry picked from commit 2a750c9)

…configuration in clear text. Contributed by Li Lu and Haohui Mai.

… it for launching yarn jars, addendum to print warning to stderr. Contributed by Masatake Iwasaki.

(cherry picked from commit 1fd350f)

…n Kumar M R.

(cherry picked from commit af618f2)
(cherry picked from commit 36371cd)

…ed to Windows Secure Container Executor. Contributed by Remus Rusanu.

(cherry picked from commit 3836ad6)
(cherry picked from commit eb7068c)

…block to stay

underreplicated for long periods. Contributed by Nathan Roberts.
(cherry picked from commit 04ee18e)

…use and removing inconsistencies in the default values. Contributed by Junping Du and Karthik Kambatla.

(cherry picked from commit c358368)

…tory so that user's client can load the conf files directly. Contributed by Robert Kanter.

(cherry picked from commit 5358b83)

…hentication. Contributed by Li Lu.

…ion filter failure. Contributed by Haohui Mai.

…lineAck. Contributed by Anu Engineer and Haohui Mai.

…ne directory so that user's client can load the conf files directly. Contributed by Robert Kanter."

This reverts commit 5358b83.

(cherry picked from commit cc0a01c)

…ss, which causes counter limits are not reset correctly. Contributed by Zhihai Xu."

This reverts commit 929b04c.

…deserialization (adhoot via rkanter)"

This reverts commit f9341c1.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt

…nt, MRAppMaster, and YarnChild. (Gera Shegalov via kasha)"

This reverts commit 7bfd9e0.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt

…APIs for public use and removing inconsistencies in the default values. (Junping Du and Karthik Kambatla via vinodkv)

(cherry picked from commit 7610925)

…re is wrong on 32-bit Mac. Contributed by Kiran Kumar M R.

(cherry picked from commit a3a96a0)
(cherry picked from commit 726024f)

…UI. Contributed by Xuan Gong.

(cherry picked from commit 8366a36)

…f RM WebUI. Contributed by Xuan Gong."

This reverts commit e4059b9.

…t in DistCp. Contributed by Jing Zhao.

…TCP server. Contributed by Brandon Li

(cherry picked from commit 60ce825)
(cherry picked from commit 8e2f1a9)

…d by Remi Catherinot

(cherry picked from commit 4d14816)
(cherry picked from commit 27970b3)

…ecuted on Windows. Contributed by Xiaoyu Yao

… to a reducer. Contributed by Jason Lowe.

(cherry picked from commit eccb7d4)

…teQuotaUsage. Contributed by Xiaoyu Yao and Jing Zhao.

(cherry picked from commit 72f6bd4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit 2c1f33d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

…cksumCommand on Windows. Contributed by Xiaoyu Yao.

(cherry picked from commit db80e42)
(cherry picked from commit 28e0602)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

…oundException (Lei (Eddy) Xu via Colin P. McCabe)

(cherry picked from commit 023133c)
(cherry picked from commit 0c5069c)

…not put it into BlockScanner. (Lei (Eddy) Xu via Colin P. McCabe)

(cherry picked from commit ef591b1)
(cherry picked from commit b26ba22)

…ontributed by Tsuyoshi Ozawa.

(cherry picked from commit 5370e71)

… by Li Lu.

(cherry picked from commit 4b3948e)

…tImpl lock for a very long time (sinago via cmccabe)

(cherry picked from commit 28bebc8)
(cherry picked from commit a827089)

… debugging. Contributed Rohith Sharmaks

(cherry picked from commit 658097d)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java

…UI. Contributed by Xuan Gong.

(cherry picked from commit 8366a36)

…lock(). Contributed by Konstantin Shvachko.

…atform-specific format. Contributed by Xiaoyu Yao.

(cherry picked from commit 672ed462965ea7da10ce3df48c02e2a3bd13f0ae)
(cherry picked from commit 950dc1b1995191327e6b919ee17a87e59b749264)

…dows. Contributed by Xiaoyu Yao.

(cherry picked from commit bd77a7c)
(cherry picked from commit 6e70611)

…iptak)

…ile writing block. (Arpit Agarwal)

…n complete without blocks being replicated. Contributed by Ming Ma.

(cherry picked from commit 5a540c3)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

… stops. Contributed by Rohith.

…asaki via Colin P. McCabe)

(cherry picked from commit 61dc2ea)
(cherry picked from commit 8dac245)

… token renewal of applications part of a bigger workflow. Contributed by Daryn Sharp.

(cherry picked from commit 9c59112)

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 623fd46)

…y Konstantin Shvachko

…iners and node-label column. (Jason Lowe via wangda)

(cherry picked from commit 73d9e4c)

Conflicts:

	hadoop-yarn-project/CHANGES.txt

… Li.

(cherry picked from commit 4cec9975c0e2c2fcca090888dc2c5e149c5be1e9)
(cherry picked from commit f267fe567cab1db6508412509743e80f59ea69da)