docs: merge refusal names an agent's own service (#15)
This commit is contained in:
@@ -224,7 +224,7 @@ version, auto mode or jobs) while the new one has none, the service page suggest
|
|||||||
moved. **Merge** moves the old row, with its history, mode and desired version, to the new
|
moved. **Merge** moves the old row, with its history, mode and desired version, to the new
|
||||||
location and deletes the duplicate. Merging is never automatic. It can also be done by
|
location and deletes the duplicate. Merging is never automatic. It can also be done by
|
||||||
hand for any removed service of the same kind (Compose or Swarm, names may differ), but
|
hand for any removed service of the same kind (Compose or Swarm, names may differ), but
|
||||||
not for plain containers, the updater itself, or a service with a queued or running job.
|
not for plain containers, an agent's own service, or a service with a queued or running job.
|
||||||
A merge keeps the old row's mode and desired version, so a manually merged target with its
|
A merge keeps the old row's mode and desired version, so a manually merged target with its
|
||||||
own history may show drift right after the merge and can be accepted.
|
own history may show drift right after the merge and can be accepted.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user