diff options
3 files changed, 7 insertions, 6 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java index f0dde55b285..ed1af514e88 100644 --- a/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java @@ -29,7 +29,7 @@ import com.yahoo.search.searchchain.Execution; * Check whether the query tree seems to be "well formed". In other words, run heurestics against * the input data to see whether the query should sent to the search backend. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class InputCheckingSearcher extends Searcher { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 63711b55d27..ae8ab305701 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -248,7 +248,7 @@ public class ApplicationController { DeploymentJobs.JobType jobType = DeploymentJobs.JobType.from(controller.zoneRegistry().system(), zone); ApplicationRevision revision = toApplicationPackageRevision(applicationPackage, options.screwdriverBuildJob); - if( ! options.deployCurrentVersion) { + if ( ! options.deployCurrentVersion) { // Add missing information to application (unless we're deploying the previous version (initial staging step) application = application.with(applicationPackage.deploymentSpec()); application = application.with(applicationPackage.validationOverrides()); @@ -264,14 +264,14 @@ public class ApplicationController { application = application.with(application.deploymentJobs().withTriggering(jobType, version, Optional.of(revision), clock.instant())); } - store(application, lock); // store missing information even if we fail deployment below - // Delete zones not listed in DeploymentSpec, if allowed // We do this at deployment time to be able to return a validation failure message when necessary application = deleteRemovedDeployments(application); // Clean up deployment jobs that are no longer referenced by deployment spec application = deleteUnreferencedDeploymentJobs(application); + + store(application, lock); // store missing information even if we fail deployment below } // Carry out deployment @@ -280,7 +280,8 @@ public class ApplicationController { applicationPackage)); options = withVersion(version, options); ConfigServerClient.PreparedApplication preparedApplication = - configserverClient.prepare(deploymentId, options, rotationInDns.cnames(), rotationInDns.rotations(), applicationPackage.zippedContent()); + configserverClient.prepare(deploymentId, options, rotationInDns.cnames(), rotationInDns.rotations(), + applicationPackage.zippedContent()); preparedApplication.activate(); application = application.with(new Deployment(zone, revision, version, clock.instant())); store(application, lock); diff --git a/vespajlib/src/main/java/com/yahoo/net/HostName.java b/vespajlib/src/main/java/com/yahoo/net/HostName.java index 00e63516459..4c51a5e1ba1 100644 --- a/vespajlib/src/main/java/com/yahoo/net/HostName.java +++ b/vespajlib/src/main/java/com/yahoo/net/HostName.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; /** * Utilities for getting the hostname of the system running the JVM. * - * @author lulf + * @author Ulf Lilleengen * @author bratseth * @author hakon */ |