From 7eadb2cac3d6071f752c2e646d9a9d5865847407 Mon Sep 17 00:00:00 2001 From: Nick Josevski Date: Tue, 16 Jun 2026 17:49:01 +1000 Subject: [PATCH 1/3] fix: include --waitfordeployment when a deployment timeout is set (#195) From ecd43e4867fdcbf43f9b1768b89887d850601689 Mon Sep 17 00:00:00 2001 From: Nick Josevski Date: Wed, 17 Jun 2026 14:45:22 +1000 Subject: [PATCH 2/3] actual file changes in case a 0 file merge also doesn't work --- .../server/OctopusBuildInformationBuildStartProcessor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java index a8231672..00aa7ce1 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java @@ -1,7 +1,5 @@ package octopus.teamcity.server; - import java.util.List; - import com.intellij.openapi.diagnostic.Logger; import jetbrains.buildServer.ExtensionHolder; import jetbrains.buildServer.log.Loggers; From 0eb654a12254da32803f00d2368e0d87724d0bf8 Mon Sep 17 00:00:00 2001 From: Nick Josevski Date: Wed, 17 Jun 2026 14:49:15 +1000 Subject: [PATCH 3/3] revert --- .../server/OctopusBuildInformationBuildStartProcessor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java index 00aa7ce1..a8231672 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java @@ -1,5 +1,7 @@ package octopus.teamcity.server; + import java.util.List; + import com.intellij.openapi.diagnostic.Logger; import jetbrains.buildServer.ExtensionHolder; import jetbrains.buildServer.log.Loggers;