From cbbabadddbaa188cdeb1a1c9c0fef9e419f26a78 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 12 Apr 2018 17:06:43 -0700 Subject: [PATCH 1/2] docs: use middleman-hashicorp 0.3.35 --- website/Gemfile | 2 +- website/Gemfile.lock | 10 +++++----- website/Makefile | 2 +- website/packer.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website/Gemfile b/website/Gemfile index 177bf1774..975949205 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "middleman-hashicorp", "0.3.34" +gem "middleman-hashicorp", "0.3.35" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index d1b532862..ef7ba08e8 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -6,7 +6,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (8.2.0) + autoprefixer-rails (8.1.0.1) execjs bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -78,7 +78,7 @@ GEM rack (>= 1.4.5, < 2.0) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-hashicorp (0.3.34) + middleman-hashicorp (0.3.35) bootstrap-sass (~> 3.3) builder (~> 3.2) middleman (~> 3.4) @@ -113,9 +113,9 @@ GEM padrino-support (0.12.9) activesupport (>= 3.1) rack (1.6.9) - rack-livereload (0.3.17) + rack-livereload (0.3.16) rack - rack-test (1.0.0) + rack-test (0.8.3) rack (>= 1.0, < 3) rb-fsevent (0.10.3) rb-inotify (0.9.10) @@ -153,7 +153,7 @@ PLATFORMS ruby DEPENDENCIES - middleman-hashicorp (= 0.3.34) + middleman-hashicorp (= 0.3.35) BUNDLED WITH 1.16.1 diff --git a/website/Makefile b/website/Makefile index 0991a7753..7497725e4 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,4 +1,4 @@ -VERSION?="0.3.34" +VERSION?="0.3.35" build: @echo "==> Starting build in Docker..." diff --git a/website/packer.json b/website/packer.json index 4d8b752ae..c57fa74ef 100644 --- a/website/packer.json +++ b/website/packer.json @@ -9,7 +9,7 @@ "builders": [ { "type": "docker", - "image": "hashicorp/middleman-hashicorp:0.3.28", + "image": "hashicorp/middleman-hashicorp:0.3.35", "discard": "true", "volumes": { "{{ pwd }}": "/website" From be86ee4025fd004bd94c102cac314cb0e91fa1be Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 12 Apr 2018 17:28:26 -0700 Subject: [PATCH 2/2] docs: fix broken links --- .../source/docs/job-specification/reschedule.html.md | 2 +- .../failure-handling-strategies/index.html.md | 2 +- website/source/docs/upgrade/upgrade-specific.html.md | 12 +++++++----- website/source/guides/ui.html.md | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/website/source/docs/job-specification/reschedule.html.md b/website/source/docs/job-specification/reschedule.html.md index af956ca19..71b1703cc 100644 --- a/website/source/docs/job-specification/reschedule.html.md +++ b/website/source/docs/job-specification/reschedule.html.md @@ -112,7 +112,7 @@ defaults by job type: ### Rescheduling during deployments -The [update stanza](docs/job-specification/update.html) controls rolling updates and canary deployments. A task +The [update stanza](/docs/job-specification/update.html) controls rolling updates and canary deployments. A task group's reschedule stanza does not take affect during a deployment. For example, if a new version of the job is rolled out and the deployment failed due to a failing allocation, Nomad will not reschedule it. diff --git a/website/source/docs/operating-a-job/failure-handling-strategies/index.html.md b/website/source/docs/operating-a-job/failure-handling-strategies/index.html.md index 0b6aa3deb..fbd3aa772 100644 --- a/website/source/docs/operating-a-job/failure-handling-strategies/index.html.md +++ b/website/source/docs/operating-a-job/failure-handling-strategies/index.html.md @@ -22,4 +22,4 @@ Please see one of the guides below or use the navigation on the left for details 1. [Local Restarts](/docs/operating-a-job/failure-handling-strategies/restart.html) 1. [Check Restarts](/docs/operating-a-job/failure-handling-strategies/check-restart.html) -1. [Rescheduling](/docs/operating-a-job/failure-handling-strategies/rescheduling.html) +1. [Rescheduling](/docs/operating-a-job/failure-handling-strategies/reschedule.html) diff --git a/website/source/docs/upgrade/upgrade-specific.html.md b/website/source/docs/upgrade/upgrade-specific.html.md index 836c8166b..4409cfe4a 100644 --- a/website/source/docs/upgrade/upgrade-specific.html.md +++ b/website/source/docs/upgrade/upgrade-specific.html.md @@ -19,11 +19,13 @@ standard upgrade flow. ### Raft Protocol Version Compatibility -When upgrading to Nomad 0.8.0 from a version lower than 0.7.0, users will need to -set the [`-raft-protocol`](/docs/agent/options.html#_raft_protocol) option to 1 in -order to maintain backwards compatibility with the old servers during the upgrade. -After the servers have been migrated to version 0.8.0, `-raft-protocol` can be moved -up to 2 and the servers restarted to match the default. +When upgrading to Nomad 0.8.0 from a version lower than 0.7.0, users will need +to set the +[`raft_protocol`](/docs/agent/configuration/server.html#raft_protocol) option +in their `server` stanza to 1 in order to maintain backwards compatibility with +the old servers during the upgrade. After the servers have been migrated to +version 0.8.0, `raft_protocol` can be moved up to 2 and the servers restarted +to match the default. The Raft protocol must be stepped up in this way; only adjacent version numbers are compatible (for example, version 1 cannot talk to version 3). Here is a table of the diff --git a/website/source/guides/ui.html.md b/website/source/guides/ui.html.md index ff77b6d69..d8c9f6b7b 100644 --- a/website/source/guides/ui.html.md +++ b/website/source/guides/ui.html.md @@ -156,7 +156,7 @@ for pausing and playing log streaming, jumping to the head or tail of the log, a [![Task Logs][img-task-logs]][img-task-logs] ~> **Note.** Only `stdout` and `stderr` are available in the UI. Any logs written to a file are available from the -~> CLI using the [`nomad alloc fs`]('/docs/commands/alloc/fs.html'), but filesystem access is not yet in the Web UI. +~> CLI using the [`nomad alloc fs`](/docs/commands/alloc/fs.html), but filesystem access is not yet in the Web UI. ## Reviewing Clients