From cada70dd91b6dfcb94a6a1609fed3e64043b34a3 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Thu, 6 May 2021 09:09:00 -0400 Subject: [PATCH] annotate 1.1 beta fields --- website/content/api-docs/operator/scheduler.mdx | 4 ++-- website/content/docs/job-specification/resources.mdx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/api-docs/operator/scheduler.mdx b/website/content/api-docs/operator/scheduler.mdx index f7fdc7609..cb44b2d0f 100644 --- a/website/content/api-docs/operator/scheduler.mdx +++ b/website/content/api-docs/operator/scheduler.mdx @@ -64,7 +64,7 @@ $ curl \ - `SchedulerAlgorithm` `(string: "binpack")` - Specifies whether scheduler binpacks or spreads allocations on available nodes. - - `MemoryOversubscriptionEnabled` `(bool: false)` - When `true`, tasks may exceed their reserved memory limit, if the client has excess memory capacity. Tasks must specify [`memory_max`](/docs/job-specification/resources#memory_max) to take advantage of memory oversubscription. + - `MemoryOversubscriptionEnabled` `(bool: false)` 1.1 Beta - When `true`, tasks may exceed their reserved memory limit, if the client has excess memory capacity. Tasks must specify [`memory_max`](/docs/job-specification/resources#memory_max) to take advantage of memory oversubscription. - `PreemptionConfig` `(PreemptionConfig)` - Options to enable preemption for various schedulers. @@ -126,7 +126,7 @@ server state is authoritative. binpacks or spreads allocations on available nodes. Possible values are `"binpack"` and `"spread"` -- `MemoryOversubscriptionEnabled` `(bool: false)` - When `true`, tasks may exceed their reserved memory limit, if the client has excess memory capacity. Tasks must specify [`memory_max`](/docs/job-specification/resources#memory_max) to take advantage of memory oversubscription. +- `MemoryOversubscriptionEnabled` `(bool: false)` 1.1 Beta - When `true`, tasks may exceed their reserved memory limit, if the client has excess memory capacity. Tasks must specify [`memory_max`](/docs/job-specification/resources#memory_max) to take advantage of memory oversubscription. - `PreemptionConfig` `(PreemptionConfig)` - Options to enable preemption for various schedulers. diff --git a/website/content/docs/job-specification/resources.mdx b/website/content/docs/job-specification/resources.mdx index fb898b4da..8ab13abc6 100644 --- a/website/content/docs/job-specification/resources.mdx +++ b/website/content/docs/job-specification/resources.mdx @@ -34,12 +34,12 @@ job "docs" { - `cpu` `(int: 100)` - Specifies the CPU required to run this task in MHz. -- `cores` (`int`: <optional>) - Specifies the number of CPU cores to reserve +- `cores` (`int`: <optional>) 1.1 Beta - Specifies the number of CPU cores to reserve for the task. This may not be used with `cpu`. - `memory` `(int: 300)` - Specifies the memory required in MB. -- `memory_max` (`int`: <optional>) - Optionally, specifies the maximum memory the task may use, if the client has excess memory capacity, in MB. +- `memory_max` (`int`: <optional>) 1.1 Beta - Optionally, specifies the maximum memory the task may use, if the client has excess memory capacity, in MB. - `device` ([Device][]: <optional>) - Specifies the device requirements. This may be repeated to request multiple device types.