From a61d89d0e66c6698d4b166aa457bf020d5c383cc Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Wed, 25 Nov 2015 17:59:16 -0800
Subject: [PATCH] Removes the GOMAXPROCS warnings which are obsolete for Go
 1.5+.

---
 command/agent/command.go                          |  5 -----
 command/info.go                                   | 15 ---------------
 .../intro/getting-started/agent.html.markdown     |  1 -
 3 files changed, 21 deletions(-)

diff --git a/command/agent/command.go b/command/agent/command.go
index 165a73994a..0993ccfa15 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -565,11 +565,6 @@ func (c *Command) Run(args []string) int {
 		return 1
 	}
 
-	// Check GOMAXPROCS
-	if runtime.GOMAXPROCS(0) == 1 {
-		c.Ui.Error("WARNING: It is highly recommended to set GOMAXPROCS higher than 1")
-	}
-
 	// Setup the log outputs
 	logGate, logWriter, logOutput := c.setupLoggers(config)
 	if logWriter == nil {
diff --git a/command/info.go b/command/info.go
index 8d9bad776d..b69f35ee8b 100644
--- a/command/info.go
+++ b/command/info.go
@@ -48,21 +48,6 @@ func (i *InfoCommand) Run(args []string) int {
 		return 1
 	}
 
-	// Check for specific warnings
-	didWarn := false
-	runtime, ok := stats["runtime"]
-	if ok {
-		if maxprocs := runtime["max_procs"]; maxprocs == "1" {
-			i.Ui.Output("WARNING: It is highly recommended to set GOMAXPROCS higher than 1")
-			didWarn = true
-		}
-	}
-
-	// Add a blank line if there are any warnings
-	if didWarn {
-		i.Ui.Output("")
-	}
-
 	// Get the keys in sorted order
 	keys := make([]string, 0, len(stats))
 	for key := range stats {
diff --git a/website/source/intro/getting-started/agent.html.markdown b/website/source/intro/getting-started/agent.html.markdown
index e745fd3790..28ddff23db 100644
--- a/website/source/intro/getting-started/agent.html.markdown
+++ b/website/source/intro/getting-started/agent.html.markdown
@@ -28,7 +28,6 @@ For simplicity, we'll run a single Consul agent in server mode:
 $ consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul
 ==> WARNING: BootstrapExpect Mode is specified as 1; this is the same as Bootstrap mode.
 ==> WARNING: Bootstrap mode enabled! Do not enable unless necessary
-==> WARNING: It is highly recommended to set GOMAXPROCS higher than 1
 ==> Starting Consul agent...
 ==> Starting Consul agent RPC...
 ==> Consul agent running!