Repository: incubator-falcon Updated Branches: refs/heads/master aace8f484 -> 34533f285
FALCON-860 Add label-types for labels added as part of EntitySummaryTest. Contributed by Raghav Kumar Gautam Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/34533f28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/34533f28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/34533f28 Branch: refs/heads/master Commit: 34533f285a6d732dcb44caca4b14b3db217cccbc Parents: aace8f4 Author: Ruslan Ostafiychuk <rostafiyc...@apache.org> Authored: Tue Nov 4 12:11:04 2014 +0200 Committer: Ruslan Ostafiychuk <rostafiyc...@apache.org> Committed: Tue Nov 4 12:11:10 2014 +0200 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../org/apache/falcon/regression/core/response/lineage/Edge.java | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/34533f28/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 512067a..4ef0c24 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -129,6 +129,9 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-860 Add label-types for labels added as part of EntitySummaryTest (Raghav Kumar Gautam + via Ruslan Ostafiychuk) + FALCON-852 Merlin function testProcessOrderBy() needs to use string ordering instead of enum ordering (Raghav Kumar Gautam via Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/34533f28/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java index 5520cfa..ee98e51 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java @@ -47,6 +47,10 @@ public class Edge extends GraphEntity { //custom labels for test tags @SerializedName("test")TEST, @SerializedName("testname")TESTNAME, + @SerializedName("first")FIRST, + @SerializedName("second")SECOND, + @SerializedName("third")THIRD, + @SerializedName("value")VALUE, } private String _id;
