From fc2f74f461fe2a049f3c7c362f83b48c0d3ae68b Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@yahoo-inc.com>
Date: Mon, 28 Aug 2017 09:33:13 +0200
Subject: Allocation consistency between model versions

---
 .../yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'node-repository')

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 914658302b6..e2ff17ba782 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -24,7 +24,6 @@ public class CapacityPolicies {
         this.flavors = flavors;
     }
 
-    /** provides capacity defaults for various environments */
     public int decideSize(Capacity requestedCapacity) {
         int requestedNodes = requestedCapacity.nodeCount();
         if (requestedCapacity.isRequired()) return requestedNodes;
@@ -39,10 +38,10 @@ public class CapacityPolicies {
     }
 
     public Flavor decideFlavor(Capacity requestedCapacity, ClusterSpec cluster, Optional<String> defaultFlavorOverride) {
-        // for now, always use requested docker flavor when requested
+        // for now, always use the requested flavor if a docker flavor is requested
         Optional<String> requestedFlavor = requestedCapacity.flavor();
         if (requestedFlavor.isPresent() &&
-                flavors.getFlavorOrThrow(requestedFlavor.get()).getType() == Flavor.Type.DOCKER_CONTAINER)
+            flavors.getFlavorOrThrow(requestedFlavor.get()).getType() == Flavor.Type.DOCKER_CONTAINER)
             return flavors.getFlavorOrThrow(requestedFlavor.get());
 
         String defaultFlavorName = defaultFlavorOverride.isPresent() ?
-- 
cgit v1.2.3