ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: AMBARI-6843 Bad log statement in upgrade log (Iryna Kuzmenko via dsen)
Date Wed, 13 Aug 2014 09:01:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 4c41d45f3 -> acd7908d9


AMBARI-6843 Bad log statement in upgrade log (Iryna Kuzmenko via dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acd7908d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acd7908d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acd7908d

Branch: refs/heads/trunk
Commit: acd7908d997fe6734aa2f90cb5867dcca003e11d
Parents: 4c41d45
Author: Dmytro Sen <dsen@hortonworks.com>
Authored: Wed Aug 13 12:01:06 2014 +0300
Committer: Dmytro Sen <dsen@hortonworks.com>
Committed: Wed Aug 13 12:01:06 2014 +0300

----------------------------------------------------------------------
 .../ambari/server/upgrade/AbstractUpgradeCatalog.java       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/acd7908d/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 6df6e94..4d68402 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -22,9 +22,7 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
-
 import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.ConfigurationRequest;
@@ -34,15 +32,12 @@ import org.apache.ambari.server.orm.entities.MetainfoEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
-import org.apache.ambari.server.state.DesiredConfig;
 import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
-
 import java.sql.SQLException;
-import java.text.MessageFormat;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
@@ -218,8 +213,8 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog
{
               mergeProperties(oldConfigProperties, properties, updateIfExists);
 
             if (!Maps.difference(oldConfigProperties, mergedProperties).areEqual()) {
-              LOG.info("Applying configuration with tag '%s' to " +
-                "cluster '%s'", newTag, cluster.getClusterName());
+              LOG.info("Applying configuration with tag '{}' to " +
+                "cluster '{}'", newTag, cluster.getClusterName());
 
               ConfigurationRequest cr = new ConfigurationRequest();
               cr.setClusterName(cluster.getClusterName());


Mime
View raw message