Revert "Bratseth/apply on restart take 5"

1 files changed, 2 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
index 11e97bc8a95..a8404b076d4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
@@ -31,8 +31,7 @@ import java.util.Map;
  *
  * @author Vegard Havdal
  */
-// TODO: Most of this has been copied to ConfigInstance.Builder.buildInstance() and can be removed from here
-//       when Model.getConfig is removed
+// TODO  This functionality should be on VespaModel itself, but we don't have a way right now to apply a config override to a ConfigInstance.Builder
 class InstanceResolver {
 
     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InstanceResolver.class.getName());
@@ -139,6 +138,7 @@ class InstanceResolver {
         return packagePrefix.value + cKey.getNamespace();
     }
 
+
     enum PackagePrefix {
         COM_YAHOO("com.yahoo."),
         NONE("");
@@ -148,5 +148,4 @@ class InstanceResolver {
             this.value = value;
         }
     }
-
 }