diff --git a/ee/17.06/index.md b/ee/17.06/index.md index 174df5328a..443c605758 100644 --- a/ee/17.06/index.md +++ b/ee/17.06/index.md @@ -299,7 +299,7 @@ adopted as quickly for consistency and compatibility reasons. + Add Support swarm-mode services with node-local networks such as macvlan, ipvlan, bridge, host [#32981](https://github.com/moby/moby/pull/32981) + Pass driver-options to network drivers on service creation [#32981](https://github.com/moby/moby/pull/33130) + Isolate Swarm Control-plane traffic from Application data traffic using --data-path-addr [#32717](https://github.com/moby/moby/pull/32717) -* Several improvments to Service Discovery [#docker/libnetwork/1796](https://github.com/docker/libnetwork/pull/1796) +* Several improvements to Service Discovery [#docker/libnetwork/1796](https://github.com/docker/libnetwork/pull/1796) + Allow user to replace, and customize the ingress network [#31714](https://github.com/moby/moby/pull/31714) - Fix UDP traffic in containers not working after the container is restarted [#32505](https://github.com/moby/moby/pull/32505) - Fix files being written to `/var/lib/docker` if a different data-root is set [#32505](https://github.com/moby/moby/pull/32505) diff --git a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md index 22406ad942..b62d81acae 100644 --- a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md +++ b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md @@ -66,7 +66,7 @@ Jobs can be in one of the following status: | done | The job has successfully completed | | error | The job has completed with errors | | cancel_request | The worker monitors the job statuses in the database. If the status for a job changes to `cancel_request`, the worker will cancel the job | -| cancel | The job has been cancelled and not fully executed | +| cancel | The job has been canceled and not fully executed | | deleted | The job and logs have been removed | | worker_dead | The worker for this job has been declared `dead` and the job will not continue | | worker_shutdown | The worker that was running this job has been gracefully stopped | @@ -236,4 +236,4 @@ see those jobs using the `GET /api/v0/crons` endpoint: The `schedule` uses a Unix crontab syntax. -{% endif %} \ No newline at end of file +{% endif %}