Skip to content

Commit

Permalink
Merge pull request #169 from njuettner/master
Browse files Browse the repository at this point in the history
Use templateData instead of empty interface
  • Loading branch information
Jing Dong committed Oct 13, 2015
2 parents 417f442 + 7cd4760 commit 191d72e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions services/haproxy/haproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type templateData struct {
Services map[string]service.Service
}

func GetTemplateData(config *conf.Configuration, conn *zk.Conn) (interface{}, error) {
func GetTemplateData(config *conf.Configuration, conn *zk.Conn) (*templateData, error) {

apps, err := marathon.FetchApps(config.Marathon, config)

Expand All @@ -26,5 +26,5 @@ func GetTemplateData(config *conf.Configuration, conn *zk.Conn) (interface{}, er
return nil, err
}

return templateData{apps, services}, nil
return &templateData{apps, services}, nil
}

0 comments on commit 191d72e

Please sign in to comment.