You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sh...@apache.org on 2014/03/20 10:45:51 UTC
[2/2] git commit: FALCON-98 starting embedded hadoop fails sometimes.
Contributed by Shwetha GS
FALCON-98 starting embedded hadoop fails sometimes. Contributed by Shwetha GS
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/8f7c0dce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/8f7c0dce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/8f7c0dce
Branch: refs/heads/master
Commit: 8f7c0dce361d5ec700c82d0828ed5560b9c6f27a
Parents: 0310e95
Author: Shwetha GS <sh...@gmail.com>
Authored: Thu Mar 20 15:15:37 2014 +0530
Committer: Shwetha GS <sh...@gmail.com>
Committed: Thu Mar 20 15:15:37 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
hadoop-webapp/pom.xml | 10 ++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8f7c0dce/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 91f74da..91d2ad9 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -82,6 +82,8 @@ Trunk (Unreleased)
FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
BUG FIXES
+ FALCON-98 starting embedded hadoop fails sometimes. (Shwetha GS)
+
FALCON-28 unable to submit/delete feed or process which had been attempted submit
with wrong cluster. (Shwetha GS)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8f7c0dce/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-webapp/pom.xml b/hadoop-webapp/pom.xml
index 846a43e..17a7550 100644
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@ -114,6 +114,16 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-oozie-el-extension</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>