summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-09 10:38:25 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-09 10:38:25 +0200
commit1e4782e68ab25755ed2598a2fc104ea9eabf0437 (patch)
tree6b467995c9a52caf8a5f31165194ee2c96c810e0 /configserver
parent557c942a6cfee933140eef893889e2218897b26c (diff)
Whitespace changes only
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java8
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index f055887c77a..30aff7a3486 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -78,9 +78,9 @@ public class ZooKeeperClient {
}
} catch (Exception e) {
throw new IllegalStateException("Unable to initialize vespa model writing to config server(s) " +
- System.getProperty("configsources") + "\n" +
- "Please ensure that cloudconfig_server is started on the config server node(s), " +
- "and check the vespa log for configserver errors. ", e);
+ System.getProperty("configsources") + "\n" +
+ "Please ensure that cloudconfig_server is started on the config server node(s), " +
+ "and check the vespa log for configserver errors. ", e);
}
}
@@ -103,7 +103,7 @@ public class ZooKeeperClient {
/**
* Feeds def files and user config into ZK.
*
- * @param app the application package to feed to zookeeper
+ * @param app the application package to feed to zookeeper
*/
void feedZooKeeper(ApplicationPackage app) {
trace("Feeding application config into ZooKeeper");
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index ad7bf55c086..40f50be2b7f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -273,7 +273,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
String fullPath = ConfigCurator.USERAPP_ZK_SUBPATH + "/" + dirName;
if (!liveApp.exists(fullPath)) {
throw new IllegalArgumentException("Cannot include directory '" + dirName +
- "', as it does not exist in ZooKeeper!");
+ "', as it does not exist in ZooKeeper!");
}
}