brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [1/2] brooklyn-library git commit: Remove YAML tags from CM output
Date Mon, 12 Dec 2016 10:17:06 GMT
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 <svetoslav.neykov@cloudsoftcorp.com>
Authored: Sun Dec 11 15:12:25 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@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")


Mime
View raw message