Merge pull request #15210 from brendandburns/docs

Auto commit by PR queue bot

Merge pull request #15210 from brendandburns/docs
6815cbf7 · k8s-merge-robot · 837a070d · 601faebf · 6815cbf7
Commit 6815cbf7 authored Dec 21, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

printing.go pkg/kubectl/cmd/util/printing.go +3 -1

No files found.
--- a/pkg/kubectl/cmd/util/printing.go
+++ b/pkg/kubectl/cmd/util/printing.go
@@ -102,7 +102,9 @@ func PrinterForCommand(cmd *cobra.Command) (kubectl.ResourcePrinter, bool, error
 		outputFormat = "template"
 	}

-	templateFormat := []string{"go-template=", "go-template-file=", "jsonpath=", "jsonpath-file="}
+	templateFormat := []string{
+		"go-template=", "go-template-file=", "jsonpath=", "jsonpath-file=", "custom-columns=", "custom-columns-file=",
+	}
 	for _, format := range templateFormat {
 		if strings.HasPrefix(outputFormat, format) {
 			templateFile = outputFormat[len(format):]