You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/12/16 13:20:37 UTC
incubator-falcon git commit: FALCON-947 Ignore hadoop configs in
merlin/src/test/resources/hadoop-conf. Contributed by Ruslan Ostafiychuk
Repository: incubator-falcon
Updated Branches:
refs/heads/master 0d608aa73 -> 59e036398
FALCON-947 Ignore hadoop configs in merlin/src/test/resources/hadoop-conf. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/59e03639
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/59e03639
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/59e03639
Branch: refs/heads/master
Commit: 59e036398040da1e97706160dc5a1b2cdcb0d84d
Parents: 0d608aa
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Mon Dec 15 17:45:31 2014 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Tue Dec 16 14:15:15 2014 +0200
----------------------------------------------------------------------
falcon-regression/.gitignore | 3 +++
falcon-regression/CHANGES.txt | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/59e03639/falcon-regression/.gitignore
----------------------------------------------------------------------
diff --git a/falcon-regression/.gitignore b/falcon-regression/.gitignore
index 7e3b748..67de4a6 100644
--- a/falcon-regression/.gitignore
+++ b/falcon-regression/.gitignore
@@ -44,6 +44,9 @@ bin/
.DS_Store
*/DS_Store
+#hadoop-conf
+merlin/src/test/resources/hadoop-conf
+
#prop files
merlin/src/main/resources/Merlin.properties
Merlin.properties
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/59e03639/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 04781f8..8927790 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -36,6 +36,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-947 Ignore hadoop configs in merlin/src/test/resources/hadoop-conf (Ruslan Ostafiychuk)
+
FALCON-940 Avoid NPE in getAllEntitiesOfOneType() for zero elements
(Ruslan Ostafiychuk via Raghav Kumar Gautam)