Update generated docs

contrib/completions/bash/kubectl

@@ -2195,7 +2195,7 @@ _kubectl_config_view()
     flags_completion=()
 
     flags+=("--flatten")
-    flags+=("--merge")
+    flags+=("--merge=")
     flags+=("--minify")
     flags+=("--no-headers")
     flags+=("--output=")
@@ -2249,8 +2249,8 @@ _kubectl_config_set-cluster()
 
     flags+=("--api-version=")
     flags+=("--certificate-authority=")
-    flags+=("--embed-certs")
-    flags+=("--insecure-skip-tls-verify")
+    flags+=("--embed-certs=")
+    flags+=("--insecure-skip-tls-verify=")
     flags+=("--server=")
     flags+=("--alsologtostderr")
     flags+=("--client-certificate=")
@@ -2288,7 +2288,7 @@ _kubectl_config_set-credentials()
 
     flags+=("--client-certificate=")
     flags+=("--client-key=")
-    flags+=("--embed-certs")
+    flags+=("--embed-certs=")
     flags+=("--password=")
     flags+=("--token=")
     flags+=("--username=")

pkg/storage/etcd/etcd_helper.go

@@ -34,8 +34,8 @@ import (
 	"k8s.io/kubernetes/pkg/storage/etcd/metrics"
 	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
 	"k8s.io/kubernetes/pkg/util"
-	utilnet "k8s.io/kubernetes/pkg/util/net"
 	utilcache "k8s.io/kubernetes/pkg/util/cache"
+	utilnet "k8s.io/kubernetes/pkg/util/net"
 	"k8s.io/kubernetes/pkg/watch"
 
 	etcd "github.com/coreos/etcd/client"