You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ha...@apache.org on 2018/05/10 13:40:13 UTC
[ambari] branch trunk updated: AMBARI-23785 Download client configs
fails at Oozie client with AttributeError (dgrinenko)
This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new c9d5064 AMBARI-23785 Download client configs fails at Oozie client with AttributeError (dgrinenko)
c9d5064 is described below
commit c9d506450d6b89fe9cf49bc0d6fba4770991daa7
Author: Dmitry Grinenko <ha...@gmail.com>
AuthorDate: Tue May 8 09:01:39 2018 +0300
AMBARI-23785 Download client configs fails at Oozie client with AttributeError (dgrinenko)
---
.../main/java/org/apache/ambari/server/agent/ExecutionCommand.java | 2 +-
.../src/main/java/org/apache/ambari/server/agent/StatusCommand.java | 4 ++--
.../server/controller/internal/ClientConfigResourceProvider.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 41af327..592c893 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -104,7 +104,7 @@ public class ExecutionCommand extends AgentCommand {
@JsonIgnore
private Map<String, Map<String, String>> configurations;
- @SerializedName("configuration_attributes")
+ @SerializedName("configurationAttributes")
@JsonIgnore
private Map<String, Map<String, Map<String, String>>> configurationAttributes;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
index f6bfdcf..ffadb50 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
@@ -52,8 +52,8 @@ public class StatusCommand extends AgentCommand {
@com.fasterxml.jackson.annotation.JsonProperty("configurations")
private Map<String, Map<String, String>> configurations;
- @SerializedName("configuration_attributes")
- @com.fasterxml.jackson.annotation.JsonProperty("configuration_attributes")
+ @SerializedName("configurationAttributes")
+ @com.fasterxml.jackson.annotation.JsonProperty("configurationAttributes")
private Map<String, Map<String, Map<String, String>>> configurationAttributes;
@SerializedName("commandParams")
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 0dfb5dc..cc927e5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -413,7 +413,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
Map<String, Object> jsonContent = new TreeMap<>();
jsonContent.put("configurations", configurations);
- jsonContent.put("configuration_attributes", configurationAttributes);
+ jsonContent.put("configurationAttributes", configurationAttributes);
jsonContent.put("commandParams", commandParams);
jsonContent.put("clusterHostInfo", clusterHostInfo);
jsonContent.put("ambariLevelParams", ambariLevelParams);
--
To stop receiving notification emails like this one, please contact
hapylestat@apache.org.