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 2018/01/12 19:45:42 UTC
[1/2] storm git commit: [STORM-2892] fix PATH substitution in flux
tests
Repository: storm
Updated Branches:
refs/heads/master bdcfb5fe2 -> b612c09d0
[STORM-2892] fix PATH substitution in flux tests
The tests fail when the PATH environment variable has a trailing colon, despite that being a valid PATH.
This happens because it is substituted directly into the resultant YAML file, which results in invalid
YAML (since you cannot end a map's value with ":" in the raw text).
So the solution is to wrap the map value with double-quotes.
Also fix 2 typos in comments in this file.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b070bd10
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b070bd10
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b070bd10
Branch: refs/heads/master
Commit: b070bd1077398910ee3f818980d1d1705969485c
Parents: 466a7ad
Author: Erik Weathers <er...@gmail.com>
Authored: Tue Jan 9 22:10:42 2018 -0800
Committer: Erik Weathers <er...@gmail.com>
Committed: Tue Jan 9 22:10:44 2018 -0800
----------------------------------------------------------------------
.../src/test/resources/configs/substitution-test.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b070bd10/flux/flux-core/src/test/resources/configs/substitution-test.yaml
----------------------------------------------------------------------
diff --git a/flux/flux-core/src/test/resources/configs/substitution-test.yaml b/flux/flux-core/src/test/resources/configs/substitution-test.yaml
index 3d521e1..9707936 100644
--- a/flux/flux-core/src/test/resources/configs/substitution-test.yaml
+++ b/flux/flux-core/src/test/resources/configs/substitution-test.yaml
@@ -22,7 +22,7 @@
name: "${topology.name}"
# Components
-# Components are analagous to Spring beans. They are meant to be used as constructor,
+# Components are analogous to Spring beans. They are meant to be used as constructor,
# property(setter), and builder arguments.
#components:
# - id: "myComponent"
@@ -41,8 +41,8 @@ name: "${topology.name}"
#
config:
topology.workers: 1
- # test environent variable substitution
- test.env.value: ${ENV-PATH}
+ # test environment variable substitution
+ test.env.value: "${ENV-PATH}"
# test variable substitution for list type
list.property.target: ${a.list.property}
[2/2] storm git commit: Merge branch 'STORM-2892' of
https://github.com/erikdw/storm into asfgit-master
Posted by sr...@apache.org.
Merge branch 'STORM-2892' of https://github.com/erikdw/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b612c09d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b612c09d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b612c09d
Branch: refs/heads/master
Commit: b612c09d0deba7a6c0f68ab4fcd2e8af22b192a2
Parents: bdcfb5f b070bd1
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Fri Jan 12 20:44:39 2018 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri Jan 12 20:44:39 2018 +0100
----------------------------------------------------------------------
.../src/test/resources/configs/substitution-test.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------