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

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"

controllers/nginx/pkg/template/template.go

@@ -30,6 +30,7 @@ import (
 	text_template "text/template"
 
 	"github.com/golang/glog"
+
 	"github.com/pborman/uuid"
 
 	apiv1 "k8s.io/api/core/v1"

controllers/nginx/pkg/template/template_test.go

@@ -19,6 +19,7 @@ package template
 import (
 	"encoding/json"
 	"io/ioutil"
+	"net"
 	"os"
 	"path"
 	"reflect"
@@ -29,7 +30,6 @@ import (
 	"k8s.io/ingress/core/pkg/ingress"
 	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
 	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
-	"net"
 )
 
 var (