Skip to content

K
k3s
Commit 080da97e authored by Chao Xu's avatar Chao Xu
Browse files
Options

fix a comment

parent 854b8034
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/kubectl/cmd/util/helpers_test.go
View file @ 080da97e
...@@ -55,7 +55,7 @@ func TestMerge(t *testing.T) { ...@@ -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) { ...@@ -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{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment