Merge pull request #26510 from AdoHe/patch_test

Automatic merge from submit-queue

update strategic patch test for merge list of maps

Refer #26418 for more details. @janetkuo the test case is added, ptal.
This commit is contained in:
Kubernetes Submit Queue 2016-08-15 20:38:22 -07:00 committed by GitHub
commit 096dd4df50

View File

@ -636,8 +636,12 @@ testCases:
mergingList:
- name: 3
value: 3
- name: 4
value: 4
modified:
mergingList:
- name: 4
value: 4
- name: 1
- name: 2
value: 2
@ -654,6 +658,8 @@ testCases:
mergingList:
- name: 3
value: 3
- name: 4
value: 4
result:
mergingList:
- name: 1
@ -663,6 +669,8 @@ testCases:
other: b
- name: 3
value: 3
- name: 4
value: 4
- description: merge lists of maps with conflict
original:
mergingList: