| commit | 6c17d315287020368689fa078a40a1eaedf89d5b | [log] [tgz] |
|---|---|---|
| author | Zhe Zhang <zhezhang@cloudera.com> | Wed Sep 30 08:39:13 2015 -0700 |
| committer | Zhe Zhang <zhezhang@cloudera.com> | Wed Sep 30 08:39:13 2015 -0700 |
| tree | a2f32e6c639d7150d7a9104dc5cd0f89dec68f60 | |
| parent | 8fd55202468b28422b0df888641c9b08906fe4a7 [diff] | |
| parent | 854d25b0c30fd40f640c052e79a8747741492042 [diff] |
Merge remote-tracking branch 'apache/trunk' into HDFS-7285 Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java Change-Id: I53ec1c426dc988d6c4a2c87b00caef49c4057010