more vendoring

hashicorp · Oct 6, 2016 · 1c24f59 · 1c24f59
1 parent 39b9c47
commit 1c24f59
Show file tree

Hide file tree

Showing 55 changed files with 11,507 additions and 30 deletions.
diff --git a/client/consul_template.go b/client/consul_template.go
@@ -355,15 +355,15 @@ func parseTemplateConfigs(tmpls []*structs.Template, taskDir string, taskEnv *en
 			dest = filepath.Join(taskDir, taskEnv.ReplaceEnv(tmpl.DestPath))
 		}
 
-		ct := &ctconf.ConfigTemplate{
+		ct := ctconf.ConfigTemplate{
 			Source:           src,
 			Destination:      dest,
 			EmbeddedTemplate: tmpl.EmbeddedTmpl,
 			Perms:            ctconf.DefaultFilePerms,
 			Wait:             &watch.Wait{},
 		}
 
-		ctmpls[*ct] = tmpl
+		ctmpls[ct] = tmpl
 	}
 
 	return ctmpls

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -1753,12 +1753,12 @@ func (sc *ServiceCheck) validate() error {
 
 	switch sc.InitialStatus {
 	case "":
-	case api.HealthUnknown:
+		// case api.HealthUnknown: TODO: Add when Consul releases 0.7.1
 	case api.HealthPassing:
 	case api.HealthWarning:
 	case api.HealthCritical:
 	default:
-		return fmt.Errorf(`invalid initial check state (%s), must be one of %q, %q, %q, %q or empty`, sc.InitialStatus, api.HealthUnknown, api.HealthPassing, api.HealthWarning, api.HealthCritical)
+		return fmt.Errorf(`invalid initial check state (%s), must be one of %q, %q, %q, %q or empty`, sc.InitialStatus, api.HealthPassing, api.HealthWarning, api.HealthCritical)
 
 	}