You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/03/13 02:41:01 UTC
[1/3] storm git commit: STORM-1618: Add the option of passing config
directory
Repository: storm
Updated Branches:
refs/heads/master f463a2450 -> 9081a7d0f
STORM-1618: Add the option of passing config directory
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ede8ec24
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ede8ec24
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ede8ec24
Branch: refs/heads/master
Commit: ede8ec24d9091c68df08fafe8cdcae1aebfe6635
Parents: b477939
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Fri Mar 11 16:28:17 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Fri Mar 11 16:28:17 2016 +0530
----------------------------------------------------------------------
bin/storm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ede8ec24/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 0963065..e684df4 100755
--- a/bin/storm
+++ b/bin/storm
@@ -51,12 +51,15 @@ fi
STORM_BIN_DIR=`dirname ${PRG}`
export STORM_BASE_DIR=`cd ${STORM_BIN_DIR}/..;pwd`
-#check to see if the conf dir is given as an optional argument
+#check to see if the conf dir or file is given as an optional argument
if [ $# -gt 1 ]; then
if [ "--config" = "$1" ]; then
conf_file=$2
+ if [ -d "$conf_file" ]; then
+ conf_file=$conf_file/storm.yaml
+ fi
if [ ! -f "$conf_file" ]; then
- echo "Error: Cannot find configuration directory: $conf_file"
+ echo "Error: Cannot find configuration file: $conf_file"
exit 1
fi
STORM_CONF_FILE=$conf_file
[3/3] storm git commit: Added STORM-1618 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1618 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9081a7d0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9081a7d0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9081a7d0
Branch: refs/heads/master
Commit: 9081a7d0f3218e5276fd04ac9f7da88da35e50da
Parents: 011e483
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sat Mar 12 17:40:14 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sat Mar 12 17:40:14 2016 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9081a7d0/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57d6a6..4912f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1618: Add the option of passing config directory
* STORM-1269: port backtype.storm.daemon.common to java
* STORM-1270: port drpc to java
* STORM-1274: port LocalDRPC to java
[2/3] storm git commit: Merge branch 'STORM-1618' of
https://github.com/abhishekagarwal87/storm into STORM-1618
Posted by sr...@apache.org.
Merge branch 'STORM-1618' of https://github.com/abhishekagarwal87/storm into STORM-1618
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/011e4838
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/011e4838
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/011e4838
Branch: refs/heads/master
Commit: 011e48380c19ddbf5ee12f704e1ee14f3b35e21a
Parents: f463a24 ede8ec2
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sat Mar 12 17:29:46 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sat Mar 12 17:29:46 2016 -0800
----------------------------------------------------------------------
bin/storm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------