Clone
 

arun c. murthy <acmurthy@apache.org> in hadoop

YARN-1537. Fix race condition in TestLocalResourcesTrackerImpl.testLocalResourceCache. Contributed by Xuan Gong.

YARN-1537. Fix race condition in TestLocalResourcesTrackerImpl.testLocalResourceCache. Contributed by Xuan Gong.

YARN-1904. Ensure exceptions thrown in ClientRMService & ApplicationHistoryClientService are uniform when application-attempt is not found. Contributed by Zhijie Shen.

YARN-1904. Ensure exceptions thrown in ClientRMService & ApplicationHistoryClientService are uniform when application-attempt is not found. Contributed by Zhijie Shen.

Preparing to release hadoop-2.6.0-rc1.

(cherry picked from commit 9ff7315cbe9804bebcd1ec093fac7828a72ddf59)

Preparing to release hadoop-2.6.0-rc1.

(cherry picked from commit 9ff7315cbe9804bebcd1ec093fac7828a72ddf59)

Conflicts:

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

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

hadoop-mapreduce-project/CHANGES.txt

hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 98a4538cf4b4fd87409fe364487825a4f9df2872)

Preparing to release hadoop-2.6.0-rc1.

Preparing to release hadoop-2.6.0-rc1.

(cherry picked from commit 9ff7315cbe9804bebcd1ec093fac7828a72ddf59)

Conflicts:

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

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

hadoop-mapreduce-project/CHANGES.txt

hadoop-yarn-project/CHANGES.txt

YARN-1964. Adding changelog back in.

YARN-1964. Adding changelog back in.

(cherry picked from commit 4e9b46da11f79b4ca59c18769925b477ec1bf354)

YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9)

Conflicts:

hadoop-yarn-project/CHANGES.txt

YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9)

YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9)

Conflicts:

hadoop-yarn-project/CHANGES.txt

YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)

Conflicts:

hadoop-yarn-project/CHANGES.txt

YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)

YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)

Conflicts:

hadoop-yarn-project/CHANGES.txt

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

Conflicts:

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

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

(cherry picked from commit 9f0319bba1788e4c579ce533b14c0deab63f28ee)

Conflicts:

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

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

Conflicts:

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

HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 09f36b1688a375f45c19889e326d5d35249882b1)

Conflicts:

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

(cherry picked from commit 42849e5077bd659ac1244c4710a9858215d8abcc)

HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 09f36b1688a375f45c19889e326d5d35249882b1)

Conflicts:

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

HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.

HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.

YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.

YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 51957ca81886ac3553c44848631fdf53766a25ae)

Conflicts:

hadoop-yarn-project/CHANGES.txt

YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 51957ca81886ac3553c44848631fdf53766a25ae)

Conflicts:

hadoop-yarn-project/CHANGES.txt

YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.