Updated Branches: refs/heads/trunk 5ccaaa2e4 -> 50a7a50a9
AMBARI-4669. Tweak command_detail message Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/50a7a50a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50a7a50a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50a7a50a Branch: refs/heads/trunk Commit: 50a7a50a95974d4f92f67e146748973c83bdee10 Parents: 5ccaaa2 Author: Sumit Mohanty <[email protected]> Authored: Thu Feb 13 18:14:31 2014 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Thu Feb 13 18:14:31 2014 -0800 ---------------------------------------------------------------------- .../server/controller/AmbariCustomCommandExecutionHelper.java | 2 +- .../ambari/server/controller/AmbariManagementControllerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/50a7a50a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java index caa4c9a..7f2d1fb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java @@ -212,7 +212,7 @@ public class AmbariCustomCommandExecutionHelper { StringBuffer sb = new StringBuffer(); sb.append(actionRequest.getCommandName()); if (actionRequest.getServiceName() != null && !actionRequest.getServiceName().equals("")) { - sb.append(" for " + actionRequest.getServiceName()); + sb.append(" " + actionRequest.getServiceName()); } if (actionRequest.getComponentName() != null && !actionRequest.getComponentName().equals("")) { sb.append("/" + actionRequest.getComponentName()); http://git-wip-us.apache.org/repos/asf/ambari/blob/50a7a50a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index 54d9a23..9ecb127 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -3971,6 +3971,7 @@ public class AmbariManagementControllerTest { } } Assert.assertNotNull(hrc); + Assert.assertEquals("RESTART HDFS/HDFS_CLIENT", hrc.getCommandDetail()); Map<String, String> roleParams = hrc.getExecutionCommandWrapper() .getExecutionCommand().getRoleParams();
