aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-07-16 16:20:23 +0200
committerGitHub <noreply@github.com>2019-07-16 16:20:23 +0200
commitd6b200d25df1387eea9ef5001e2bc3cdc0ab8d4c (patch)
tree5763b61a3e8c2676a5a28772305158811dbb9e10
parent42ddcf1448be94f0db216f20d552f1a00623a783 (diff)
parent0da5af2f98f170b1fc45e50496fc53638097477b (diff)
Merge pull request #10047 from vespa-engine/mpolden/fix-todo
Remove temporary cleanup
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index d704d701cf0..b7b64b9cda2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -106,10 +106,6 @@ public class CuratorDb {
CuratorDb(Curator curator, Duration tryLockTimeout) {
this.curator = curator;
this.tryLockTimeout = tryLockTimeout;
-
- // TODO: Remove after 7.60
- curator.delete(root.append("openStackServerPool"));
- curator.delete(root.append("vespaServerPool"));
}
/** Returns all hosts configured to be part of this ZooKeeper cluster */