mirror of
https://github.com/kemko/nomad.git
synced 2026-01-04 17:35:43 +03:00
docs: fix upgrade specific broken link and conflict tag (#12521)
This commit is contained in:
@@ -94,7 +94,6 @@ be removed in future releases.
|
||||
|
||||
The previous `Protocol` value can be viewed using the `-verbose` flag.
|
||||
|
||||
<<<<<<< HEAD
|
||||
#### Linux Control Groups Version 2
|
||||
|
||||
Starting with Nomad 1.3.0, Linux systems configured to use [cgroups v2][cgroups2]
|
||||
@@ -1331,7 +1330,7 @@ deleted and then Nomad 0.3.0 can be launched.
|
||||
[preemption]: /docs/internals/scheduling/preemption
|
||||
[proxy_concurrency]: /docs/job-specification/sidecar_task#proxy_concurrency
|
||||
[`sidecar_task.config`]: /docs/job-specification/sidecar_task#config
|
||||
[raft protocol version]: /docs/configuration/server#raft_protocol
|
||||
[`raft_protocol_version`]: /docs/configuration/server#raft_protocol
|
||||
[`raft protocol`]: /docs/configuration/server#raft_protocol
|
||||
[reserved]: /docs/configuration/client#reserved-parameters
|
||||
[task-config]: /docs/job-specification/task#config
|
||||
|
||||
Reference in New Issue
Block a user