Added TODO:

3 files changed, 6 insertions, 6 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index 818f7498af4..4d370ba5039 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -14,7 +14,6 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeployOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeployOptions.java
index d8551898f7c..55215456379 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeployOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeployOptions.java
@@ -14,6 +14,7 @@ import java.util.Optional;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DeployOptions {
 
+    // TODO: Add build number here, so we can replace job timeout (12 hours) with triggering timeout (a few minutes?)
     public final Optional<ScrewdriverBuildJob> screwdriverBuildJob;
     public final Optional<String> vespaVersion;
     public final boolean ignoreValidationErrors;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 8704722fa72..86e563f7d25 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -65,7 +65,11 @@ public class DeploymentTrigger {
     
     /** Returns the time in the past before which jobs are at this moment considered unresponsive */
     public Instant jobTimeoutLimit() { return clock.instant().minus(jobTimeout); }
-    
+
+    public BuildSystem buildSystem() { return buildSystem; }
+
+    public DeploymentOrder deploymentOrder() { return order; }
+
     //--- Start of methods which triggers deployment jobs -------------------------
 
     /** 
@@ -385,8 +389,4 @@ public class DeploymentTrigger {
         return false;
     }
     
-    public BuildSystem buildSystem() { return buildSystem; }
-
-    public DeploymentOrder deploymentOrder() { return order; }
-
 }