blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
ArrisLee
2021-09-20 14:18:16 +12:00
parent c83082f447 dc769b4c4d
commit a77f189b45
399 changed files with 7237 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/stacks/deploy.go
View File

@@ -55,7 +55,7 @@ func RedeployWhenChanged(stackID portainer.StackID, deployer StackDeployer, data
endpoint, err := datastore.Endpoint().Endpoint(stack.EndpointID)
if err != nil {
return errors.WithMessagef(err, "failed to find the endpoint %v associated to the stack %v", stack.EndpointID, stack.ID)
return errors.WithMessagef(err, "failed to find the environment %v associated to the stack %v", stack.EndpointID, stack.ID)
}
author := stack.UpdatedBy