Merge branch 'master-oss' into 1.0-beta-oss

CHANGELOG.md

@@ -10,9 +10,9 @@ CHANGES:
 
 IMPROVEMENTS:
 
- * auth/token: New tokens are salted using SHA2-256 HMAC instead of SHA1 hash
+ * auth/token: New tokens are indexed in storage HMAC-SHA256 instead of SHA1
 
-## 0.11.4 (Unreleased)
+## 0.11.4 (October 23rd, 2018)
 
 CHANGES:
 

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.
 

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"
 }
 

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

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

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.