Conflict resolved

1 files changed, 13 insertions, 1 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java
index 77faa45ebe5..111073aca77 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java
@@ -11,8 +11,20 @@ import java.util.Optional;
  */
 public interface Deployer {
 
+
+    /**
+     * Creates a new deployment from the active application, if available. Will use the default timeout for deployment.
+     *
+     * @param application the active application to be redeployed
+     * @return a new deployment from the local active, or empty if a local active application
+     * was not present for this id (meaning it either is not active or active on another
+     * node in the config server cluster)
+     */
+    Optional<Deployment> deployFromLocalActive(ApplicationId application);
+
     /**
-     * Creates a new deployment from the active application, if available.
+     * Creates a new deployment from the active application, if available. Prefer {@link #deployFromLocalActive(ApplicationId)}
+     * if possible, this method is for testing and will override the default timeout for deployment.
      *
      * @param application the active application to be redeployed
      * @param timeout the timeout to use for each individual deployment operation