Merge with master

2 files changed, 3 insertions, 0 deletions

diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java
index 64faeeefb0b..94695cd712e 100644
--- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java
+++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java
@@ -16,6 +16,7 @@ import com.yahoo.cloud.config.ZookeepersConfig;
 import java.util.logging.Logger;
 
 public class ClusterControllerConfigFetcher {
+
     private static Logger log = Logger.getLogger(ClusterControllerConfigFetcher.class.getName());
 
     private final ConfigSubscriber configSubscriber = new ConfigSubscriber();
@@ -93,4 +94,5 @@ public class ClusterControllerConfigFetcher {
     boolean configUpdated(long timeoutMillis) {
         return configSubscriber.nextConfig(timeoutMillis);
     }
+
 }
diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java
index a32039a07d2..2d6880e0551 100644
--- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java
+++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java
@@ -12,6 +12,7 @@ import java.util.logging.Logger;
  * This is the class containing the main method used to run fleet controller as a stand-alone program.
  */
 public class StandAloneClusterController {
+
     private static Logger log = Logger.getLogger(StandAloneClusterController.class.getName());
 
     private final ClusterControllerConfigFetcher config;