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 06:50:51 UTC
git commit: FALCON-269 Mistake in the embedded ActiveMQ port property. Contributed by Jean-Baptiste Onofré
Repository: incubator-falcon
Updated Branches:
refs/heads/master 652e4a157 -> 1b60ebd1d
FALCON-269 Mistake in the embedded ActiveMQ port property. Contributed by Jean-Baptiste Onofré
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/1b60ebd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/1b60ebd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/1b60ebd1
Branch: refs/heads/master
Commit: 1b60ebd1d0b2ebb501a3558d9a5f7afc2a0717ec
Parents: 652e4a1
Author: Shwetha GS <sh...@gmail.com>
Authored: Thu Mar 20 11:20:40 2014 +0530
Committer: Shwetha GS <sh...@gmail.com>
Committed: Thu Mar 20 11:20:40 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
docs/src/site/twiki/InstallationSteps.twiki | 2 +-
prism/src/main/java/org/apache/falcon/Main.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1b60ebd1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index adf5c7b..419d5cd 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -82,6 +82,9 @@ Trunk (Unreleased)
FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
BUG FIXES
+ FALCON-269 Mistake in the embedded ActiveMQ port property. (Jean-Baptiste Onofré
+ via Shwetha GS)
+
FALCON-344 FeedEvictorTest. (Shaik Idris Ali via Shwetha GS)
FALCON-302 Issues with distributed package properties. (Shwetha GS)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1b60ebd1/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 2e34e54..9819461 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -169,7 +169,7 @@ By default,
* falcon server starts at port 15000. To change the port, use -port option
* falcon server starts embedded active mq. To control this behaviour, set the following system properties using -D option in environment variable FALCON_OPTS:
* falcon.embeddedmq=<true/false> - Should server start embedded active mq, default true
- * falcon.emeddedmq.port=<port> - Port for embedded active mq, default 61616
+ * falcon.embeddedmq.port=<port> - Port for embedded active mq, default 61616
* falcon.embeddedmq.data=<path> - Data path for embedded active mq, default {package dir}/logs/data
* falcon server starts with conf from {package dir}/conf. To override this (to use the same conf with multiple falcon upgrades), set environment variable FALCON_CONF to the path of conf dir
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1b60ebd1/prism/src/main/java/org/apache/falcon/Main.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/Main.java b/prism/src/main/java/org/apache/falcon/Main.java
index ed619ae..35eb103 100644
--- a/prism/src/main/java/org/apache/falcon/Main.java
+++ b/prism/src/main/java/org/apache/falcon/Main.java
@@ -74,7 +74,7 @@ public final class Main {
boolean startActiveMq = Boolean.valueOf(System.getProperty("falcon.embeddedmq", "true"));
if (startActiveMq) {
String dataDir = System.getProperty("falcon.embeddedmq.data", "target/");
- int mqport = Integer.valueOf(System.getProperty("falcon.emeddedmq.port", "61616"));
+ int mqport = Integer.valueOf(System.getProperty("falcon.embeddedmq.port", "61616"));
LOG.info("Starting activemq at port " + mqport + " with data dir " + dataDir);
BrokerService broker = new BrokerService();