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
app/portainer/services/api/stackService.js
View File

@@ -57,7 +57,7 @@ angular.module('portainer.app').factory('StackService', [
.then(function success(data) {
var swarm = data;
if (swarm.Id === stack.SwarmId) {
deferred.reject({ msg: 'Target endpoint is located in the same Swarm cluster as the current endpoint', err: null });
deferred.reject({ msg: 'Target environment is located in the same Swarm cluster as the current environment', err: null });
return;
}
return Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId, SwarmID: swarm.Id, Name: newName }).$promise;