Repository: ambari Updated Branches: refs/heads/branch-2.4 93c3c77a2 -> 2f38893c8 refs/heads/trunk 00a47c4c5 -> 30899abc0
AMBARI-16897. Sorting works incorrectly for config groups in Config History tab. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30899abc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30899abc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30899abc Branch: refs/heads/trunk Commit: 30899abc069d6e9afcd92b2630d71d1f3fe5a4a3 Parents: 00a47c4 Author: Myroslav Papirkovskyi <[email protected]> Authored: Thu May 26 16:55:15 2016 +0300 Committer: Myroslav Papirkovskyi <[email protected]> Committed: Thu May 26 16:55:42 2016 +0300 ---------------------------------------------------------------------- .../ambari/server/controller/ServiceConfigVersionResponse.java | 4 ++-- .../java/org/apache/ambari/server/state/cluster/ClusterTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/30899abc/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java index 638e747..69b35f8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java @@ -40,12 +40,12 @@ public class ServiceConfigVersionResponse { /** * Name used for default config group. */ - public static final String DEFAULT_CONFIG_GROUP_NAME = "default"; + public static final String DEFAULT_CONFIG_GROUP_NAME = "Default"; /** * Name used for config groups that were deleted in the service config version response. */ - public static final String DELETED_CONFIG_GROUP_NAME = "deleted"; + public static final String DELETED_CONFIG_GROUP_NAME = "Deleted"; @JsonProperty("cluster_name") http://git-wip-us.apache.org/repos/asf/ambari/blob/30899abc/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java index 826ea65..9a12a1b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java @@ -1370,7 +1370,7 @@ public class ClusterTest { Assert.assertEquals("HDFS", hdfsResponse.getServiceName()); Assert.assertEquals("c1", hdfsResponse.getClusterName()); Assert.assertEquals("admin", hdfsResponse.getUserName()); - Assert.assertEquals("default", hdfsResponse.getGroupName()); + Assert.assertEquals("Default", hdfsResponse.getGroupName()); Assert.assertEquals(Long.valueOf(-1), hdfsResponse.getGroupId()); Assert.assertEquals(Long.valueOf(1), hdfsResponse.getVersion());
