Merge branch 'master' into TEZ-3334-MERGE1
authorJonathan Eagles <jeagles@yahoo-inc.com>
Mon, 27 Mar 2017 22:30:53 +0000 (17:30 -0500)
committerJonathan Eagles <jeagles@yahoo-inc.com>
Mon, 27 Mar 2017 22:30:53 +0000 (17:30 -0500)
commitbe0d01f6add2bbb20af73ae44909f2510e37eff9
tree93670256dbc0380358ba4d9d210beaa76a5eb0c9
parentc3a7c21271d2038ae2a7b4006b6452ac05dd5eee
parente375b9d348f702093e9753f186dff5527c0f121c
Merge branch 'master' into TEZ-3334-MERGE1
16 files changed:
docs/src/site/site.xml
tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
tez-api/src/main/java/org/apache/tez/dag/api/TezConstants.java
tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java
tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.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/FetcherOrderedGrouped.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/sort/impl/PipelinedSorter.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/sort/impl/TestPipelinedSorter.java