Clone
 

andrew wang <andrew.wang@cloudera.com> in hadoop

HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)

(cherry picked from commit 7673d4f205b26a6a26cfc47d999ece96f3c42782)

Conflicts:

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml

hadoop-mapreduce-project/pom.xml

    • -2
    • +2
    /hadoop-common-project/hadoop-kms/pom.xml
    • -1
    • +1
    /hadoop-hdfs-project/hadoop-hdfs/pom.xml
HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)

    • -2
    • +2
    /hadoop-common-project/hadoop-kms/pom.xml
    • -1
    • +1
    /hadoop-hdfs-project/hadoop-hdfs/pom.xml
HDFS-7979. Initialize block report IDs with a random number.

HDFS-7979. Initialize block report IDs with a random number.

(cherry picked from commit b1e059089d6a5b2b7006d7d384c6df81ed268bd9)

HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu.

(cherry picked from commit 7119bd49c870cf1e6b8c091d87025b439b9468df)

HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu.