Skip to content

Commit

Permalink
Merge pull request #5781 from hashicorp/b-revert-release-sup
Browse files Browse the repository at this point in the history
Revert 0.9.2 release super script tags
  • Loading branch information
preetapan committed Jun 5, 2019
2 parents 613235d + b84d0b7 commit 8ba7e52
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 33 deletions.
2 changes: 1 addition & 1 deletion website/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

activate :hashicorp do |h|
h.name = "nomad"
h.version = "0.9.1"
h.version = "0.9.2"
h.github_slug = "hashicorp/nomad"
end

Expand Down
4 changes: 2 additions & 2 deletions website/source/api/allocations.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ $ curl \

Depending on the type the event will have applicable annotations.

## Stop Allocation <sup>0.9.2</sup>
## Stop Allocation

This endpoint stops and reschedules a specific allocation.

Expand Down Expand Up @@ -606,7 +606,7 @@ $ curl -X POST \
}
```

## Signal Allocation <sup>0.9.2</sup>
## Signal Allocation

This endpoint sends a signal to an allocation or task.

Expand Down
4 changes: 2 additions & 2 deletions website/source/api/jobs.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ The table below shows this endpoint's support for
- `:job_id` `(string: <required>)` - Specifies the ID of the job (as specified in
the job file during submission). This is specified as part of the path.

- `all` <sup>0.9.2</sup> `(bool: false)` - Specifies whether the list of deployments should
- `all` `(bool: false)` - Specifies whether the list of deployments should
include deployments from a previously registered job with the same ID. This is
possible if the job is deregistered and reregistered.

Expand Down Expand Up @@ -1299,7 +1299,7 @@ The table below shows this endpoint's support for
job's version. This is checked and acts as a check-and-set value before
reverting to the specified job.

- `VaultToken`<sup>0.9.2</sup> `(string: "")` - Optional value specifying the [vault token](/docs/commands/job/revert.html)
- `VaultToken` `(string: "")` - Optional value specifying the [vault token](/docs/commands/job/revert.html)
used for Vault [policy authentication checking](/docs/configuration/vault.html#allow_unauthenticated).

### Sample Payload
Expand Down
2 changes: 1 addition & 1 deletion website/source/api/json-jobs.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ determined. The potential values are:
they can be promoted which unblocks a rolling update of the remaining
allocations at a rate of `max_parallel`.

- `AutoPromote` <sup>0.9.2</sup> - Specifies if the job should automatically promote to
- `AutoPromote` - Specifies if the job should automatically promote to
the new deployment if all canaries become healthy.

- `Stagger` - Specifies the delay between migrating allocations off nodes marked
Expand Down
8 changes: 4 additions & 4 deletions website/source/api/operator.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,9 @@ $ curl \
- `PreemptionConfig` `(PreemptionConfig)` - Options to enable preemption for various schedulers.
- `SystemSchedulerEnabled` `(bool: true)` - Specifies whether preemption for system jobs is enabled. Note that
this defaults to true.
- `BatchSchedulerEnabled` <sup>0.9.2</sup> `(bool: false)` (Enterprise Only) - Specifies whether preemption for batch jobs is enabled. Note that
- `BatchSchedulerEnabled` `(bool: false)` (Enterprise Only) - Specifies whether preemption for batch jobs is enabled. Note that
this defaults to false and must be explicitly enabled.
- `ServiceSchedulerEnabled` <sup>0.9.2</sup> `(bool: false)` (Enterprise Only) - Specifies whether preemption for service jobs is enabled. Note that
- `ServiceSchedulerEnabled` `(bool: false)` (Enterprise Only) - Specifies whether preemption for service jobs is enabled. Note that
this defaults to false and must be explicitly enabled.
- `CreateIndex` - The Raft index at which the config was created.
- `ModifyIndex` - The Raft index at which the config was modified.
Expand Down Expand Up @@ -425,7 +425,7 @@ The table below shows this endpoint's support for
- `PreemptionConfig` `(PreemptionConfig)` - Options to enable preemption for various schedulers.
- `SystemSchedulerEnabled` `(bool: true)` - Specifies whether preemption for system jobs is enabled. Note that
if this is set to true, then system jobs can preempt any other jobs.
- `BatchSchedulerEnabled` <sup>0.9.2</sup> `(bool: false)` (Enterprise Only) - Specifies whether preemption for batch jobs is enabled. Note that
- `BatchSchedulerEnabled` `(bool: false)` (Enterprise Only) - Specifies whether preemption for batch jobs is enabled. Note that
if this is set to true, then batch jobs can preempt any other jobs.
- `ServiceSchedulerEnabled` <sup>0.9.2</sup> `(bool: false)` (Enterprise Only) - Specifies whether preemption for service jobs is enabled. Note that
- `ServiceSchedulerEnabled` `(bool: false)` (Enterprise Only) - Specifies whether preemption for service jobs is enabled. Note that
if this is set to true, then service jobs can preempt any other jobs.
2 changes: 1 addition & 1 deletion website/source/docs/commands/acl/token-list.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
The token list command is used to list existing ACL tokens.
---

# Command: acl token list <sup>0.9.2</sup>
# Command: acl token list

The `acl token list` command is used to list existing ACL tokens.

Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/agent.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ via CLI arguments. The `agent` command accepts the following arguments:
integration.
* `vault-cert-file=<path>`: The path to the certificate for Vault communication.
* `vault-key-file=<path>`: The path to the private key for Vault communication.
* `vault-namespace=<namespace>` <sup>0.9.2</sup>: The Vault namespace used for the integration.
* `vault-namespace=<namespace>`: The Vault namespace used for the integration.
Required for servers and clients. Overrides the Vault namespace read from the
VAULT_NAMESPACE environment variable.
* `vault-tls-skip-verify`: A boolean that determines whether to skip SSL
Expand Down
6 changes: 3 additions & 3 deletions website/source/docs/commands/alloc.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ subcommands are available:

* [`alloc fs`][fs] - Inspect the contents of an allocation directory
* [`alloc logs`][logs] - Streams the logs of a task
* [`alloc restart`][restart] <sup>0.9.2</sup> - Restart a running allocation or task
* [`alloc signal`][signal] <sup>0.9.2</sup> - Signal a running allocation
* [`alloc restart`][restart] - Restart a running allocation or task
* [`alloc signal`][signal] - Signal a running allocation
* [`alloc status`][status] - Display allocation status information and metadata
* [`alloc stop`][stop] <sup>0.9.2</sup> - Stop and reschedule a running allocation
* [`alloc stop`][stop] - Stop and reschedule a running allocation

[fs]: /docs/commands/alloc/fs.html "Inspect the contents of an allocation directory"
[logs]: /docs/commands/alloc/logs.html "Streams the logs of a task"
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/alloc/exec.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Runs a command in a container.
---

# Command: alloc exec <sup>0.9.2</sup>
# Command: alloc exec
**Alias: `nomad exec`**

The `alloc exec` command runs a command in a running allocation.
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/alloc/restart.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Restart a running allocation or task
---

# Command: alloc restart <sup>0.9.2</sup>
# Command: alloc restart

The `alloc restart` command allows a user to perform an in place restart of an
an entire allocation or individual task.
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/alloc/signal.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Signal a running allocation or task
---

# Command: alloc signal <sup>0.9.2</sup>
# Command: alloc signal

The `alloc signal` command allows a user to perform an in place signal of an
an entire allocation or individual task.
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/alloc/stop.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Stop and reschedule a running allocation
---

# Command: alloc stop <sup>0.9.2</sup>
# Command: alloc stop

The `alloc stop` command allows a user to perform an in-place restart of an
entire allocation or individual task.
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/commands/job/deployments.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ of a job to display the list of deployments for.

* `-verbose`: Show full information.

* `-all` <sup>0.9.2</sup>: Display all deployments matching the job ID, even those from an
* `-all`: Display all deployments matching the job ID, even those from an
older instance of the job.

## Examples
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
The job periodic force command is used to force the evaluation of a periodic job.
---

# Command: job periodic force <sup>0.9.2</sup>
# Command: job periodic force

The `job periodic force` command is used to [force the evaluation](/api/jobs.html#force-new-periodic-instance)
of a [periodic job](/docs/job-specification/periodic.html).
Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/configuration/vault.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ vault {
- `key_file` `(string: "")` - Specifies the path to the private key used for
Vault communication. If this is set then you need to also set `cert_file`.

- `namespace` <sup>0.9.2</sup> `(string: "")` - Specifies the [Vault namespace](https://www.vaultproject.io/docs/enterprise/namespaces/index.html)
- `namespace` `(string: "")` - Specifies the [Vault namespace](https://www.vaultproject.io/docs/enterprise/namespaces/index.html)
used by the Vault integration. If non-empty, this namespace will be used on
all Vault API calls.

Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/job-specification/update.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ job "docs" {
last stable job on deployment failure. A job is marked as stable if all the
allocations as part of its deployment were marked healthy.

- `auto_promote` <sup>0.9.2</sup> `(bool: false)` - Specifies if the job should auto-promote to the
- `auto_promote` `(bool: false)` - Specifies if the job should auto-promote to the
canary version when all canaries become healthy during a deployment. Defaults to
false which means canaries must be manually updated with the `nomad deployment promote`
command.
Expand Down
4 changes: 0 additions & 4 deletions website/source/downloads.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ description: |-
<p>
Check out the <a href="https://github.com/hashicorp/nomad/blob/v<%= latest_version %>/CHANGELOG.md">v<%= latest_version %> CHANGELOG</a> for information on the latest release.
</p>
<h3>Nomad 0.9.2 RC</h3>
<p>
A release candidate for Nomad 0.9.2 is also available! The release candidate can be <a href="https://releases.hashicorp.com/nomad/0.9.2-rc1/">downloaded on the Nomad releases page</a>.
</p>
</div>
</div>

Expand Down
12 changes: 6 additions & 6 deletions website/source/layouts/docs.erb
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<a href="/docs/commands/acl/token-info.html">token info</a>
</li>
<li<%= sidebar_current("docs-commands-acl-token-list") %>>
<a href="/docs/commands/acl/token-list.html">token list <sup>0.9.2</sup></a>
<a href="/docs/commands/acl/token-list.html">token list</a>
</li>
<li<%= sidebar_current("docs-commands-acl-token-self") %>>
<a href="/docs/commands/acl/token-self.html">token self</a>
Expand All @@ -136,7 +136,7 @@
<a href="/docs/commands/alloc.html">alloc</a>
<ul class="nav">
<li<%= sidebar_current("docs-commands-alloc-exec") %>>
<a href="/docs/commands/alloc/exec.html">exec <sup>0.9.2</sup></a>
<a href="/docs/commands/alloc/exec.html">exec</a>
</li>
<li<%= sidebar_current("docs-commands-alloc-fs") %>>
<a href="/docs/commands/alloc/fs.html">fs</a>
Expand All @@ -145,16 +145,16 @@
<a href="/docs/commands/alloc/logs.html">logs</a>
</li>
<li<%= sidebar_current("docs-commands-alloc-restart") %>>
<a href="/docs/commands/alloc/restart.html">restart <sup>0.9.2</sup></a>
<a href="/docs/commands/alloc/restart.html">restart</a>
</li>
<li<%= sidebar_current("docs-commands-alloc-signal") %>>
<a href="/docs/commands/alloc/signal.html">signal <sup>0.9.2</sup></a>
<a href="/docs/commands/alloc/signal.html">signal</a>
</li>
<li<%= sidebar_current("docs-commands-alloc-status") %>>
<a href="/docs/commands/alloc/status.html">status</a>
</li>
<li<%= sidebar_current("docs-commands-alloc-stop") %>>
<a href="/docs/commands/alloc/stop.html">stop <sup>0.9.2</sup></a>
<a href="/docs/commands/alloc/stop.html">stop</a>
</li>
</ul>
</li>
Expand Down Expand Up @@ -209,7 +209,7 @@
<a href="/docs/commands/job/plan.html">plan</a>
</li>
<li<%= sidebar_current("docs-commands-job-periodic-force") %>>
<a href="/docs/commands/job/periodic-force.html">periodic force <sup>0.9.2</sup></a>
<a href="/docs/commands/job/periodic-force.html">periodic force</a>
</li>
<li<%= sidebar_current("docs-commands-job-promote") %>>
<a href="/docs/commands/job/promote.html">promote</a>
Expand Down

0 comments on commit 8ba7e52

Please sign in to comment.