hadoop

Clone Tools
  • last updated 17 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68

MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463221 13f79535-47bb-0310-9956-ffa450edef68

Complete commit of prior merge.

The previous merge accidentally only committed the hdfs project instead of common and MR

as well.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68

HDFS-4637. INodeDirectory#replaceSelf4Quota may incorrectly convert a newly created directory to an INodeDirectoryWithSnapshot. Contributed by Jing Zhao

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1463075 13f79535-47bb-0310-9956-ffa450edef68

YARN-475. Remove a unused constant in the public API - ApplicationConstants.AM_APP_ATTEMPT_ID_ENV. Contributed by Hitesh Shah. svn merge --ignore-ancestry -c 1463033 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463034 13f79535-47bb-0310-9956-ffa450edef68

YARN-475. Remove a unused constant in the public API - ApplicationConstants.AM_APP_ATTEMPT_ID_ENV. Contributed by Hitesh Shah.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463033 13f79535-47bb-0310-9956-ffa450edef68

HDFS-4651. Adding missed CHANGES.txt in the previous commit.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1462879 13f79535-47bb-0310-9956-ffa450edef68

HDFS-4651. Adding missed CHANGES.txt in the previous commit.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1462878 13f79535-47bb-0310-9956-ffa450edef68

HDFS-4651. Merge changes 1462875 and 1462876 from branch-1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1462877 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +231
    /src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java
  1. … 13 more files in changeset.
HDFS-4651. Adding missed files in the previous commit.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1462876 13f79535-47bb-0310-9956-ffa450edef68

HDFS-4651. Offline Image Viewer backport to branch-1. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1462875 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +231
    /src/hdfs/org/apache/hadoop/hdfs/protocol/LayoutVersion.java
  1. … 12 more files in changeset.
HDFS-4648. For snapshot deletion, when merging the diff from to-delete snapshot to the prior snapshot, make sure files/directories created after the prior snapshot get deleted. Contributed by Jing Zhao

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462865 13f79535-47bb-0310-9956-ffa450edef68

Merge r1460409 through r1462697 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462698 13f79535-47bb-0310-9956-ffa450edef68

Merge trunk into branch.

Conflicts resolved:

C hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java

! C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/SocketCache.java

C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java

C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java

C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java

(thanks to Colin for help resolving)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1462652 13f79535-47bb-0310-9956-ffa450edef68

    • -5
    • +31
    /hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
  1. … 98 more files in changeset.
svn merge -c 1462632 FIXES: YARN-515. Node Manager not getting the master key. Contributed by Robert Joseph Evans

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462634 13f79535-47bb-0310-9956-ffa450edef68

YARN-515. Node Manager not getting the master key. Contributed by Robert Joseph Evans

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462632 13f79535-47bb-0310-9956-ffa450edef68

MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1462527 13f79535-47bb-0310-9956-ffa450edef68

  1. … 7 more files in changeset.
YARN-460. CS user left in list of active users for the queue even when application finished (tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462500 13f79535-47bb-0310-9956-ffa450edef68

YARN-460. CS user left in list of active users for the queue even when application finished (tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1462497 13f79535-47bb-0310-9956-ffa450edef68

YARN-460. CS user left in list of active users for the queue even when application finished (tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462486 13f79535-47bb-0310-9956-ffa450edef68

HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a default value of '*'. Contributed by Roman Shaposhnik. svn merge --ignore-ancestry -c 1462417 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1462419 13f79535-47bb-0310-9956-ffa450edef68

HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a default value of '*'. Contributed by Roman Shaposhnik. svn merge --ignore-ancestry -c 1462417 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462418 13f79535-47bb-0310-9956-ffa450edef68

HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a default value of '*'. Contributed by Roman Shaposhnik.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462417 13f79535-47bb-0310-9956-ffa450edef68

HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462303 13f79535-47bb-0310-9956-ffa450edef68

HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462301 13f79535-47bb-0310-9956-ffa450edef68

Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68

  1. … 13 more files in changeset.
YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462271 13f79535-47bb-0310-9956-ffa450edef68

  1. … 13 more files in changeset.
HDFS-4636. Update quota usage when deleting files/dirs that were created after taking the latest snapshot. Contributed by Jing Zhao

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462192 13f79535-47bb-0310-9956-ffa450edef68

svn merge -c 1461952 from branch-1 for MAPREDUCE-5081. Backport DistCpV2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1461953 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +673
    /src/docs/src/documentation/content/xdocs/distcp2.xml
    • -0
    • +143
    /src/test/org/apache/hadoop/tools/distcp2/StubContext.java
  1. … 26 more files in changeset.
MAPREDUCE-5081. Backport DistCpV2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1461952 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +673
    /src/docs/src/documentation/content/xdocs/distcp2.xml
    • -0
    • +143
    /src/test/org/apache/hadoop/tools/distcp2/StubContext.java
  1. … 26 more files in changeset.