You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/02/18 12:59:08 UTC
[2/4] storm git commit: capital DevZookeeper
capital DevZookeeper
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99ecc4b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99ecc4b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99ecc4b4
Branch: refs/heads/master
Commit: 99ecc4b42a14c607905441f9284f3716d7b350a7
Parents: 930014b
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Tue Feb 16 20:06:48 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Tue Feb 16 20:06:48 2016 +0800
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
bin/storm.py | 2 +-
storm-core/src/jvm/org/apache/storm/Config.java | 2 +-
storm-core/src/jvm/org/apache/storm/command/devZookeeper.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 8b89fd6..42d1875 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -139,7 +139,7 @@
goto :eof
:dev-zookeeper
- set CLASS=org.apache.storm.command.devZookeeper
+ set CLASS=org.apache.storm.command.DevZookeeper
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
goto :eof
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 0dfed26..f02a72b 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -651,7 +651,7 @@ def dev_zookeeper():
"""
cppaths = [CLUSTER_CONF_DIR]
exec_storm_class(
- "org.apache.storm.command.devZookeeper",
+ "org.apache.storm.command.DevZookeeper",
jvmtype="-server",
extrajars=[CLUSTER_CONF_DIR])
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index 951e524..74231a0 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -2086,7 +2086,7 @@ public class Config extends HashMap<String, Object> {
/**
* The path to use as the zookeeper dir when running a zookeeper server via
- * "storm devZookeeper". This zookeeper instance is only intended for development;
+ * "storm dev-zookeeper". This zookeeper instance is only intended for development;
* it is not a production grade zookeeper setup.
*/
@isString
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
index e9ad554..846b0f1 100644
--- a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
+++ b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
@@ -24,7 +24,7 @@ import org.apache.storm.zookeeper.Zookeeper;
import java.util.Map;
-public class devZookeeper {
+public class DevZookeeper {
public static void main(String[] args) throws Exception {
Map<String, Object> conf = ConfigUtils.readStormConfig();
Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);