You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2016/12/12 10:17:06 UTC
[1/2] brooklyn-library git commit: Remove YAML tags from CM output
Repository: brooklyn-library
Updated Branches:
refs/heads/master e5252dcd0 -> 3c25ff5bd
Remove YAML tags from CM output
What "adaptForSaltYamlTypes" does is pass a string to the "java.lang.String" constructor. No point in that, use the argument string directly.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/67192ef2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/67192ef2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/67192ef2
Branch: refs/heads/master
Commit: 67192ef2c09296600ebe985d2b03c256283011c4
Parents: 0c059cb
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Dec 11 15:12:25 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Sun Dec 11 15:12:25 2016 +0200
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/67192ef2/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
index e48c0b2..fdae93b 100644
--- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
+++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
@@ -73,7 +73,7 @@ public class SaltHighstate {
private static String adaptForSaltYamlTypes(String description) {
- return description.replaceAll("!!python/unicode", "!!java.lang.String");
+ return description.replaceAll("!!python/unicode\\s+", "");
}
@SuppressWarnings("unchecked")
[2/2] brooklyn-library git commit: This closes #82 Remove YAML tags
from CM output
Posted by ge...@apache.org.
This closes #82 Remove YAML tags from CM output
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/3c25ff5b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3c25ff5b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3c25ff5b
Branch: refs/heads/master
Commit: 3c25ff5bde3e0d57c5e22fe7fb1ef49bb11e22c2
Parents: e5252dc 67192ef
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Dec 12 10:14:59 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Dec 12 10:14:59 2016 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------