Merge branch 'master' into TEZ-3334-MERGE1
authorJonathan Eagles <jeagles@yahoo-inc.com>
Fri, 19 May 2017 19:57:08 +0000 (14:57 -0500)
committerJonathan Eagles <jeagles@yahoo-inc.com>
Fri, 19 May 2017 19:57:08 +0000 (14:57 -0500)
commita496252e8d527689b7530094780fb28ce25b6b09
tree539505a70b061874652e5dc071446e221fb334c5
parent251ca1c3600f5ecbcf65eb8f367988c44c86a97e
parent11767338d00067239c49ea60923f2c5fb8c41992
Merge branch 'master' into TEZ-3334-MERGE1
tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/ShuffleUtils.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/MergeManager.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java
tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/TestShuffleUtils.java
tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java