Merge branch 'trunk' into HADOOP-13345
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/11e5f54f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/11e5f54f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/11e5f
Merge branch 'trunk' into HADOOP-13345
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f02de2e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f02de2e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f02d
Merge branch 'trunk' into HADOOP-13345
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/566c8b74
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/566c8b74
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/566c8
Merge branch 'trunk' into HADOOP-13345
After HADOOP-14040, we use shaded aws sdk uber-JAR so we don't have to
bring DynamoDB dependency explicitly. However, for tests we do need the
DynamoDBLocal dependency from its Maven repository.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Co
Merge branch 'trunk' into HADOOP-13345
Only conflicts were from HADOOP-13989, which was straightforward (remove source
jar option).
Conflicts:
hadoop-client-modules/hadoop-client-minicluster/pom.xml
hadoop-client-modules/hadoop-client-runtime/pom.xml
Project: http://git-wip-us.apache.org/repos/
Merge branch 'trunk' into HADOOP-13345
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86a67ffa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86a67ffa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86a67
