github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a comment

Browse Source
This commit is contained in:
Chao Xu 2015-06-04 10:35:10 -07:00
parent 854b8034ab
commit 080da97e1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/util/helpers_test.go
View File

@ -55,7 +55,7 @@ func TestMerge(t *testing.T) {
}, },
}, },
/* TODO: uncomment this test once Merge is updated to use /* TODO: uncomment this test once Merge is updated to use
strategic-merge-patch. See #844. strategic-merge-patch. See #8449.
{ {
kind: "Pod", kind: "Pod",
obj: &api.Pod{ obj: &api.Pod{
@ -193,7 +193,7 @@ func TestMerge(t *testing.T) {
}, },
}, },
/* TODO: uncomment this test once Merge is updated to use /* TODO: uncomment this test once Merge is updated to use
strategic-merge-patch. See #844. strategic-merge-patch. See #8449.
{ {
kind: "Pod", kind: "Pod",
obj: &api.Pod{ obj: &api.Pod{