github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4365 from pierresouchay/fix_test_warning 

Fixed compilation warning about wrong type
pull/4375/head
Matt Keeler 2018-07-10 16:53:29 -04:00 committed by GitHub
parent 6da4cd8fea 7d2e4b77ec
commit bd76a34002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/config/builder.go
View File

@ -1198,7 +1198,7 @@ func (b *Builder) expandAddrs(name string, s *string) []net.Addr {
x, err := template.Parse(*s) x, err := template.Parse(*s)
if err != nil { if err != nil {
b.err = multierror.Append(b.err, fmt.Errorf("%s: error parsing %q: %s", name, s, err)) b.err = multierror.Append(b.err, fmt.Errorf("%s: error parsing %q: %s", name, *s, err))
return nil return nil
} }
@ -1237,7 +1237,7 @@ func (b *Builder) expandOptionalAddrs(name string, s *string) []string {
x, err := template.Parse(*s) x, err := template.Parse(*s)
if err != nil { if err != nil {
b.err = multierror.Append(b.err, fmt.Errorf("%s: error parsing %q: %s", name, s, err)) b.err = multierror.Append(b.err, fmt.Errorf("%s: error parsing %q: %s", name, *s, err))
return nil return nil
} }

2
testutil/server.go
View File

@ -314,7 +314,7 @@ type failer struct {
failed bool failed bool
} }
func (f *failer) Log(args ...interface{}) { fmt.Println(args) } func (f *failer) Log(args ...interface{}) { fmt.Println(args...) }
func (f *failer) FailNow() { f.failed = true } func (f *failer) FailNow() { f.failed = true }
// waitForAPI waits for only the agent HTTP endpoint to start // waitForAPI waits for only the agent HTTP endpoint to start