Merge remote-tracking branch 'master/master' into refactor-template-headers

2017-09-17 16:48:31 -03:00 · 2017-09-17 16:48:31 -03:00 · 669428e2a8
commit 669428e2a8
parent f38f49e770 1a68536e29
29 changed files with 264 additions and 280 deletions
--- a/controllers/nginx/pkg/template/configmap.go
+++ b/controllers/nginx/pkg/template/configmap.go
@ -24,6 +24,7 @@ import (
 	"strings"

 	"github.com/golang/glog"
+
 	"github.com/mitchellh/mapstructure"

 	"k8s.io/ingress/controllers/nginx/pkg/config"