You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/04/04 13:06:06 UTC
[1/3] storm git commit: STORM-2451: windows storm.cmd does not set
log4j2 config file correctly by default
Repository: storm
Updated Branches:
refs/heads/1.x-branch ca66b1a3a -> 7bda27381
STORM-2451: windows storm.cmd does not set log4j2 config file correctly by default
the dir from the default config is log4j2 and that should be relative to STORM_HOME, however this is check was missing
Signed-off-by: alexlehm <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f0fac1db
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f0fac1db
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f0fac1db
Branch: refs/heads/1.x-branch
Commit: f0fac1dbc772474ec5f00dd78fb6949ad6d680bb
Parents: ca66b1a
Author: alexlehm <al...@gmail.com>
Authored: Sun Apr 2 15:04:10 2017 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Apr 4 22:05:21 2017 +0900
----------------------------------------------------------------------
bin/storm-config.cmd | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f0fac1db/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 0a9ae5e..f5e677f 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -102,6 +102,16 @@ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
)
@rem
+@rem if we have a dir with relative path, make it absolute
+@rem
+
+if not %STORM_LOG4J2_CONFIGURATION_DIR% == nil (
+ if exist %STORM_HOME%\%STORM_LOG4J2_CONFIGURATION_DIR% (
+ set STORM_LOG4J2_CONFIGURATION_DIR=%STORM_HOME%\%STORM_LOG4J2_CONFIGURATION_DIR%
+ )
+)
+
+@rem
@rem if STORM_LOG4J2_CONFIGURATION_DIR was defined, also set STORM_LOG4J2_CONFIGURATION_FILE
@rem
[2/3] storm git commit: Merge branch 'STORM-2451-1.x-merge' into
1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2451-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f348f306
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f348f306
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f348f306
Branch: refs/heads/1.x-branch
Commit: f348f306c9a846904568f349b8fc91e03b31976c
Parents: ca66b1a f0fac1d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Apr 4 22:05:25 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Apr 4 22:05:25 2017 +0900
----------------------------------------------------------------------
bin/storm-config.cmd | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-2451: CHANGELOG
Posted by ka...@apache.org.
STORM-2451: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7bda2738
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7bda2738
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7bda2738
Branch: refs/heads/1.x-branch
Commit: 7bda27381659d1045150a2aca5150ab7e7734822
Parents: f348f30
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Apr 4 22:05:55 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Apr 4 22:05:55 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7bda2738/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32e1a8f..a816dc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-\ufeff## 1.1.0
+\ufeff## 1.1.1
+ * STORM-2451: windows storm.cmd does not set log4j2 config file correctly by default
+
+## 1.1.0
* STORM-2432: Storm-Kafka-Client Trident Spout Seeks Incorrect Offset With UNCOMMITTED_LATEST Strategy
* STORM-2425: Storm Hive Bolt not closing open transactions
* STORM-2409: Storm-Kafka-Client KafkaSpout Support for Failed and NullTuples