From cc214d45b653e0e3e04830531d170483956dbb02 Mon Sep 17 00:00:00 2001
From: Kyle Havlovitz <kylehav@gmail.com>
Date: Mon, 7 May 2018 16:19:13 -0700
Subject: [PATCH] Remove support for EnableTagOverride in config files

---
 agent/config/config.go                     | 1 -
 agent/config/runtime_test.go               | 4 ++--
 website/source/docs/agent/services.html.md | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/agent/config/config.go b/agent/config/config.go
index 8d4aa62552..5447f95c4a 100644
--- a/agent/config/config.go
+++ b/agent/config/config.go
@@ -102,7 +102,6 @@ func Parse(data string, format string) (c Config, err error) {
 	TranslateKeys(m, map[string]string{
 		"deregistercriticalserviceafter": "deregister_critical_service_after",
 		"dockercontainerid":              "docker_container_id",
-		"enabletagoverride":              "enable_tag_override",
 		"scriptargs":                     "args",
 		"serviceid":                      "service_id",
 		"tlsskipverify":                  "tls_skip_verify",
diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go
index 9e7463a759..55a3c4d504 100644
--- a/agent/config/runtime_test.go
+++ b/agent/config/runtime_test.go
@@ -1986,7 +1986,7 @@ func TestConfigFlagsAndEdgecases(t *testing.T) {
 					"service": {
 						"name": "a",
 						"port": 80,
-						"EnableTagOverride": true,
+						"enable_tag_override": true,
 						"check": {
 							"id": "x",
 							"name": "y",
@@ -2001,7 +2001,7 @@ func TestConfigFlagsAndEdgecases(t *testing.T) {
 				`service = {
 					name = "a"
 					port = 80
-					EnableTagOverride = true
+					enable_tag_override = true
 					check = {
 						id = "x"
 						name = "y"
diff --git a/website/source/docs/agent/services.html.md b/website/source/docs/agent/services.html.md
index 0cd13740e1..4cb6873a09 100644
--- a/website/source/docs/agent/services.html.md
+++ b/website/source/docs/agent/services.html.md
@@ -48,7 +48,7 @@ unique IDs should be provided.
 
 For Consul 0.9.3 and earlier you need to use `enableTagOverride`. Consul 1.0
 supports both `enable_tag_override` and `enableTagOverride` but the latter is
-deprecated and will be removed in Consul 1.1.
+deprecated and has been removed in Consul 1.1.
 
 The `tags` property is a list of values that are opaque to Consul but
 can be used to distinguish between `primary` or `secondary` nodes,
@@ -115,7 +115,7 @@ syncs](/docs/internals/anti-entropy.html) for more info.
 
 For Consul 0.9.3 and earlier you need to use `enableTagOverride`. Consul 1.0
 supports both `enable_tag_override` and `enableTagOverride` but the latter is
-deprecated and will be removed in Consul 1.1.
+deprecated and has been removed as of Consul 1.1.
 
 To configure a service, either provide it as a `-config-file` option to
 the agent or place it inside the `-config-dir` of the agent. The file