falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject git commit: Removing undesirable diff file.
Date Sun, 26 Oct 2014 04:39:00 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master fd774c93d -> b80f1b165


Removing undesirable diff file.


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

Branch: refs/heads/master
Commit: b80f1b1653ea2af2e0e1fecf6cc1b0c3d977e838
Parents: fd774c9
Author: Raghav Kumar Gautam <raghav@apache.org>
Authored: Sat Oct 25 21:38:33 2014 -0700
Committer: Raghav Kumar Gautam <raghav@apache.org>
Committed: Sat Oct 25 21:38:33 2014 -0700

----------------------------------------------------------------------
 falcon-833.diff | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b80f1b16/falcon-833.diff
----------------------------------------------------------------------
diff --git a/falcon-833.diff b/falcon-833.diff
deleted file mode 100644
index 899bf58..0000000
--- a/falcon-833.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From bcedcd91b763c68e887acc97db94a0f1a980435c Mon Sep 17 00:00:00 2001
-From: pisaychuk <pisaychuk@hortonworks.com>
-Date: Thu, 23 Oct 2014 16:30:41 +0300
-Subject: [PATCH] separate availability flag file added
-
----
- .../test/java/org/apache/falcon/regression/FeedReplicationTest.java  | 5 +++--
- falcon-regression/merlin/src/test/resources/availabilityFlag.txt     | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
- create mode 100644 falcon-regression/merlin/src/test/resources/availabilityFlag.txt
-
-diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
-index 3526e46..6cbb9ab 100644
---- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
-+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
-@@ -274,7 +274,7 @@ public class FeedReplicationTest extends BaseTestClass {
-         LOGGER.info("Time range between : " + startTime + " and " + endTime);
- 
-         //configure feed
--        String availabilityFlagName = "README.md";
-+        String availabilityFlagName = "availabilityFlag.txt";
-         String feedName = Util.readEntityName(bundles[0].getDataSets().get(0));
-         FeedMerlin feedElement = bundles[0].getFeedElement(feedName);
-         feedElement.setAvailabilityFlag(availabilityFlagName);
-@@ -332,7 +332,8 @@ public class FeedReplicationTest extends BaseTestClass {
-         LOGGER.info("Replication didn't start.");
- 
-         //create availability flag on source
--        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation, availabilityFlagName);
-+        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation,
-+            OSUtil.RESOURCES + availabilityFlagName);
- 
-         //check if instance become running
-         InstanceUtil.waitTillInstanceReachState(cluster2OC, Util.readEntityName(feed), 1,
-diff --git a/falcon-regression/merlin/src/test/resources/availabilityFlag.txt b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
-@@ -0,0 +1 @@
-+
--- 
-1.9.1
-


Mime
View raw message