[31/32] hadoop git commit: Merge branch 'trunk' into HDFS-12943

2018-07-17 Thread xkrogen
Merge branch 'trunk' into HDFS-12943 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f9c3ca8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f9c3ca8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f9c3ca

[31/32] hadoop git commit: Merge branch 'trunk' into HDFS-12943

2018-06-29 Thread shv
Merge branch 'trunk' into HDFS-12943 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f37c0a89 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f37c0a89 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f37c0a8