github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59470 from liubin/fix6

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove duplicated comment
This commit is contained in:
Kubernetes Submit Queue 2018-02-07 07:20:30 -08:00 committed by GitHub
commit 3c6392985f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/resource/get.go
View File

@ -402,7 +402,7 @@ func (options *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []str
} }
objToPrint := typedObj objToPrint := typedObj
if printer.IsGeneric() { if printer.IsGeneric() {
// use raw object as recieved from the builder when using generic // use raw object as received from the builder when using generic
// printer instead of decodedObj // printer instead of decodedObj
objToPrint = original objToPrint = original
} }
@ -573,7 +573,6 @@ func (options *GetOptions) printGeneric(printer printers.ResourcePrinter, r *res
var obj runtime.Object var obj runtime.Object
if !singleItemImplied || len(infos) > 1 { if !singleItemImplied || len(infos) > 1 {
// we have more than one item, so coerce all items into a list
// we have more than one item, so coerce all items into a list. // we have more than one item, so coerce all items into a list.
// we don't want an *unstructured.Unstructured list yet, as we // we don't want an *unstructured.Unstructured list yet, as we
// may be dealing with non-unstructured objects. Compose all items // may be dealing with non-unstructured objects. Compose all items