You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/04/23 23:05:21 UTC
ambari git commit: AMBARI-10710. Storm Rest API server will not start
when used in conjunction with Ambari metrics on HDP 2.1. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk aa3bd6e2b -> d951909c1
AMBARI-10710. Storm Rest API server will not start when used in conjunction with Ambari metrics on HDP 2.1. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d951909c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d951909c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d951909c
Branch: refs/heads/trunk
Commit: d951909c1c491a23952ab505cd4812ee3f1f9669
Parents: aa3bd6e
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Apr 23 13:40:08 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Apr 23 13:49:17 2015 -0700
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/templates/config.yaml.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d951909c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2
index af7d8e3..460e391 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2
@@ -46,7 +46,7 @@ ganglia:
#spoof: "192.168.1.1:storm"
{% endif %}
-{% if has_metric_collector %}
+{% if has_metric_collector and stack_is_hdp22_or_further %}
enableGanglia: False
ganglia: