merge master

CHANGELOG.md

@@ -21,6 +21,9 @@ BUG FIXES:
    not being applied to tokens generated using the OIDC login flow [JWT-67]
  * storage/couchdb: Fix a file descriptor leak [GH-7345]
  * ui: Fix a bug where the status menu would disappear when trying to revoke a token [GH-7337]
+ * ui: Fix a regression that prevented input of custom items in search-select [GH-7338]
+ * ui: Fix an issue with the namespace picker being unable to render nested
+   namespaces named with numbers and sorting of namespaces in the picker [GH-7333]
 
 ## 1.2.2 (August 15, 2019)
 

command/server.go

@@ -63,6 +63,11 @@ var _ cli.CommandAutocomplete = (*ServerCommand)(nil)
 
 var memProfilerEnabled = false
 
+var enableFourClusterDev = func(c *ServerCommand, base *vault.CoreConfig, info map[string]string, infoKeys []string, devListenAddress, tempDir string) int {
+	c.logger.Error("-dev-four-cluster only supported in enterprise Vault")
+	return 1
+}
+
 const storageMigrationLock = "core/migration"
 
 type ServerCommand struct {
@@ -705,7 +710,7 @@ func (c *ServerCommand) Run(args []string) int {
 	}
 
 	if c.flagDevFourCluster {
-		return c.enableFourClusterDev(coreConfig, info, infoKeys, c.flagDevListenAddr, os.Getenv("VAULT_DEV_TEMP_DIR"))
+		return enableFourClusterDev(c, coreConfig, info, infoKeys, c.flagDevListenAddr, os.Getenv("VAULT_DEV_TEMP_DIR"))
 	}
 
 	var disableClustering bool