From cc3d17ff2b0c7bb998615d494bf770a2e5769441 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 22 Oct 2018 12:33:36 -0400 Subject: [PATCH 1/6] changelog++ --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9cbc25a7f..b7e8e5dba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,6 @@ BUG FIXES: * agent: Fix potential hang during agent shutdown [GH-5026] * auth/ldap: Fix listing of users/groups that contain slashes [GH-5537] - * command/migration: Don't copy HA locks [GH-5503] * core: Fix memory leak during some expiration calls [GH-5505] * core: Fix generate-root operations requiring empty `otp` to be provided instead of an empty body [GH-5495] From ba028e0884a6ef22548bba5777442ba1dc894f65 Mon Sep 17 00:00:00 2001 From: Vishal Nayak Date: Mon, 22 Oct 2018 12:22:43 -0700 Subject: [PATCH 2/6] Fix flag name for kv help text (#5580) --- command/kv_metadata_put.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/kv_metadata_put.go b/command/kv_metadata_put.go index 77d82b0d45..7afef5cadb 100644 --- a/command/kv_metadata_put.go +++ b/command/kv_metadata_put.go @@ -41,7 +41,7 @@ Usage: vault metadata kv put [options] KEY Require Check-and-Set for this key: - $ vault kv metadata put -require-cas secret/foo + $ vault kv metadata put -cas-required secret/foo Additional flags and more advanced use cases are detailed below. From 8a5e45e2e13c530a600a9905056026fc0fe08ca5 Mon Sep 17 00:00:00 2001 From: Thomas Kula Date: Mon, 22 Oct 2018 15:48:16 -0400 Subject: [PATCH 3/6] Document that periodic tokens do expire unless explicitly renewed (#5581) --- website/source/docs/commands/token/create.html.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/source/docs/commands/token/create.html.md b/website/source/docs/commands/token/create.html.md index 7b19df1335..91712a3400 100644 --- a/website/source/docs/commands/token/create.html.md +++ b/website/source/docs/commands/token/create.html.md @@ -97,9 +97,10 @@ flags](/docs/commands/index.html) included on all commands. value requires sudo permissions. - `-period` `(duration: "")` - If specified, every renewal will use the given - period. Periodic tokens do not expire (unless `-explicit-max-ttl` is also - provided). Setting this value requires sudo permissions. This is specified as - a numeric string with suffix like "30s" or "5m". + period. Periodic tokens do not expire as long as they are actively being + renewed (unless `-explicit-max-ttl` is also provided). Setting this value + requires sudo permissions. This is specified as a numeric string with suffix + like "30s" or "5m". - `-policy` `(string: "")` - Name of a policy to associate with this token. This can be specified multiple times to attach multiple policies. From 2fe91f1a07396211fa2220f03b7527fed25dc67c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 23 Oct 2018 02:46:13 -0400 Subject: [PATCH 4/6] Prep for 0.11.4 --- CHANGELOG.md | 2 +- terraform/aws/variables.tf | 2 +- version/version_base.go | 2 +- website/config.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7e8e5dba3..0da59eb664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.11.4 (Unreleased) +## 0.11.4 (October 23rd, 2018) CHANGES: diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf index cee50dfe3f..1590131bfe 100644 --- a/terraform/aws/variables.tf +++ b/terraform/aws/variables.tf @@ -3,7 +3,7 @@ //------------------------------------------------------------------- variable "download-url" { - default = "https://releases.hashicorp.com/vault/0.11.3/vault_0.11.3_linux_amd64.zip" + default = "https://releases.hashicorp.com/vault/0.11.4/vault_0.11.4_linux_amd64.zip" description = "URL to download Vault" } diff --git a/version/version_base.go b/version/version_base.go index 8df2bf6b49..e3490debe8 100644 --- a/version/version_base.go +++ b/version/version_base.go @@ -2,7 +2,7 @@ package version func init() { // The main version number that is being run at the moment. - Version = "0.11.3" + Version = "0.11.4" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release diff --git a/website/config.rb b/website/config.rb index 9a1727b1b7..5a83bae115 100644 --- a/website/config.rb +++ b/website/config.rb @@ -6,7 +6,7 @@ use ReshapeMiddleware, component_file: "assets/reshape.js" activate :hashicorp do |h| h.name = "vault" - h.version = "0.11.3" + h.version = "0.11.4" h.github_slug = "hashicorp/vault" h.website_root = "website" h.releases_enabled = true From becd10f43eb3deac3d6f9694ca25358b2fe3d50f Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 23 Oct 2018 03:13:47 -0400 Subject: [PATCH 5/6] Make fmt --- builtin/credential/radius/path_config.go | 2 +- vault/identity_store_entities_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/credential/radius/path_config.go b/builtin/credential/radius/path_config.go index be31877d71..85d60a3d68 100644 --- a/builtin/credential/radius/path_config.go +++ b/builtin/credential/radius/path_config.go @@ -50,7 +50,7 @@ func pathConfig(b *backend) *framework.Path { Type: framework.TypeString, Default: "", Description: "RADIUS NAS Identifier field (optional)", - }, + }, }, ExistenceCheck: b.configExistenceCheck, diff --git a/vault/identity_store_entities_test.go b/vault/identity_store_entities_test.go index e6a379fe30..c90baafc8a 100644 --- a/vault/identity_store_entities_test.go +++ b/vault/identity_store_entities_test.go @@ -342,8 +342,8 @@ func TestIdentityStore_EntityCreateUpdate(t *testing.T) { func TestIdentityStore_CloneImmutability(t *testing.T) { alias := &identity.Alias{ - ID: "testaliasid", - Name: "testaliasname", + ID: "testaliasid", + Name: "testaliasname", MergedFromCanonicalIDs: []string{"entityid1"}, } From 612120e76de651ef669c9af5e77b27a749b0dba3 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 23 Oct 2018 03:13:53 -0400 Subject: [PATCH 6/6] Cut version 0.11.4