This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 344ceebc7268a32f3fc26037eb6a176c26af2389
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Thu Feb 22 12:22:35 2018 +0200
AMBARI-23049. Minor post merge fixes (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py | 2 +-
.../java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
index d4e049e..1414481 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
@@ -92,7 +92,7 @@ class BaseAlert(object):
def set_cluster(self, cluster_name, cluster_id, host_name, public_host_name
= None):
""" sets cluster information for the alert """
self.cluster_name = cluster_name
- self.cluster_id = cluster_id
+ self.cluster_id = str(cluster_id)
self.host_name = host_name
self.public_host_name = host_name
if public_host_name:
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
index 4c6cb74..6e44124 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyCluster.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.SetUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class TopologyCluster {
@JsonProperty("components")
private Set<TopologyComponent> topologyComponents = new HashSet<>();
--
To stop receiving notification emails like this one, please contact
aonis...@apache.org.
