ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-8233. Blueprint fails when %HOSTGROUP::name% followed by another % (alejandro)
Date Mon, 10 Nov 2014 00:12:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c17597141 -> b5a3d2ab3


AMBARI-8233. Blueprint fails when %HOSTGROUP::name% followed by another % (alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5a3d2ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5a3d2ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5a3d2ab

Branch: refs/heads/trunk
Commit: b5a3d2ab3e26a20751076b3a051c56787ef09eb0
Parents: c175971
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Sat Nov 8 17:39:58 2014 -0800
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Sun Nov 9 16:12:13 2014 -0800

----------------------------------------------------------------------
 .../controller/internal/BlueprintConfigurationProcessor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a3d2ab/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index f1a6110..f183141 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -79,7 +79,7 @@ public class BlueprintConfigurationProcessor {
   /**
    * Compiled regex for hostgroup token.
    */
-  private static Pattern HOSTGROUP_REGEX = Pattern.compile("%HOSTGROUP::(\\S+)%");
+  private static Pattern HOSTGROUP_REGEX = Pattern.compile("%HOSTGROUP::(\\S+?)%");
 
   /**
    * Compiled regex for hostgroup token with port information.


Mime
View raw message