tez git commit: TEZ-3374. Change TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP conf key name. (Tsuyoshi Ozawa via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 8fe465037 -> 169546703


TEZ-3374. Change TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP conf key name. 
(Tsuyoshi Ozawa via hitesh)

(cherry picked from commit 244b1f19e344be721e81b39db03e7f35ee62389b)

Conflicts:
        CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/16954670
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/16954670
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/16954670

Branch: refs/heads/branch-0.8
Commit: 1695467032119ef5e35dc5e0c4a46ab121e51bb8
Parents: 8fe4650
Author: Hitesh Shah <hit...@apache.org>
Authored: Tue Jul 26 06:22:28 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Tue Jul 26 06:25:01 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/16954670/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4038eea..9071576 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3374. Change TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP conf key 
name.
   TEZ-3358. Support using the same TimelineGroupId for multiple DAGs.
   TEZ-3357. Change TimelineCachePlugin to handle DAG grouping.
   TEZ-3348. NullPointerException in Tez MROutput while trying to write using 
Parquet's DeprecatedParquetOutputFormat.

http://git-wip-us.apache.org/repos/asf/tez/blob/16954670/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java 
b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index 11c50cf..005304a 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -1257,7 +1257,7 @@ public class TezConfiguration extends Configuration {
   @ConfigurationScope(Scope.AM)
   @ConfigurationProperty(type="integer")
   public static final String TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP =
-      TEZ_PREFIX + "history.timeline.num-dags-per-group";
+      TEZ_PREFIX + "history.logging.timeline.num-dags-per-group";
   public static final int 
TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP_DEFAULT = 1;
 
   /**