Repository: ambari Updated Branches: refs/heads/trunk 2fbbfb370 -> ae4801519
AMBARI-7279 Config History: capacity-scheduler properties from service_config_version should be in same order as before (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae480151 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae480151 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae480151 Branch: refs/heads/trunk Commit: ae4801519645b960f66fd6a97a5f4819f9ee2a89 Parents: 2fbbfb3 Author: Dmytro Sen <d...@hortonworks.com> Authored: Fri Sep 12 17:25:15 2014 +0300 Committer: Dmytro Sen <d...@hortonworks.com> Committed: Fri Sep 12 17:42:14 2014 +0300 ---------------------------------------------------------------------- .../controller/internal/ServiceConfigVersionResourceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ae480151/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java index f284030..f055375 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java @@ -170,7 +170,7 @@ public class ServiceConfigVersionResourceProvider extends configMap.put("type", config.getType()); configMap.put("tag", config.getVersionTag()); configMap.put("version", config.getVersion()); - configMap.put("properties", config.getConfigs()); + configMap.put("properties", new TreeMap(config.getConfigs())); configMap.put("properties_attributes", config.getConfigAttributes()); result.add(configMap); }