Fix the next envconsul problem we have

Mergesx in fix from hashicorp/consul-template#1141
zendesk · Sep 21, 2018 · 320af0d · 320af0d
1 parent 4dc065e
commit 320af0d
Show file tree

Hide file tree

Showing 4,073 changed files with 1,063,819 additions and 1,252 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -4,7 +4,7 @@
   version = "0.9.0"
 
 [[constraint]]
-  branch = "ktsanaktsidis/envconsul_release_patch/fix_kill_splay_when_process_dead"
+  branch = "ktsanaktsidis/no_splay_on_kill"
   name = "github.com/hashicorp/consul-template"
   source = "https://github.com/zendesk/consul-template"
 

diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ define make-xc-target
 		@printf "%s%20s %s\n" "-->" "${1}/${2}:" "${PROJECT} (excluded)"
   else
 		@printf "%s%20s %s\n" "-->" "${1}/${2}:" "${PROJECT}"
-		@docker run \
+		docker run \
 			--interactive \
 			--rm \
 			--dns="8.8.8.8" \

diff --git a/envconsul-0.7.3.zendesk1 b/envconsul-0.7.3.zendesk1
@@ -0,0 +1,2 @@
+<h1>Unauthorized</h1>
+<h2>Error 401</h2>
diff --git a/vendor/github.com/burntsushi/toml/_examples/example.go b/vendor/github.com/burntsushi/toml/_examples/example.go
diff --git a/vendor/github.com/burntsushi/toml/_examples/example.toml b/vendor/github.com/burntsushi/toml/_examples/example.toml
diff --git a/vendor/github.com/burntsushi/toml/_examples/hard.toml b/vendor/github.com/burntsushi/toml/_examples/hard.toml