brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject brooklyn-library git commit: Remove YAML tags from CM output
Date Sun, 11 Dec 2016 13:57:49 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/0.10.0 1a1962382 -> 9fbc78cb4


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/9fbc78cb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/9fbc78cb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/9fbc78cb

Branch: refs/heads/0.10.0
Commit: 9fbc78cb4a9d1dccdbdbb70a1ee48f2afddfe067
Parents: 1a19623
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 13:56:46 2016 +0000

----------------------------------------------------------------------
 .../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/9fbc78cb/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