kubernetes
/
community
mirror of https://github.com/kubernetes/community.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1274 from chenhonggc/some-misspelling 

Automatic merge from submit-queue.

some mistake spelling

some mistake spelling.
This commit is contained in:
Kubernetes Submit Queue 2017-10-26 05:07:46 -07:00 committed by GitHub
parent 4bd7aa353c ba600760db
commit 425e57bb34
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contributors/design-proposals/cli/apply_refactor.md
View File

@ -150,7 +150,7 @@ Because of the way diff is implemented with 2-way diffs, a simple bit of logic
is also executed to compare last-applied to local, but with the local argument differing in location.
To compare local to remote means understanding what will happen when the same code is executed
comparing last-applied to local, and then putting in the appropriate guards to short-circuit the
logic in one context or the other as needed. last-appied and remote are not compared directly, and instead
logic in one context or the other as needed. last-applied and remote are not compared directly, and instead
are only compared indirectly when the 2 diff results are merged. Information that is redundant or
should be checked for consistency across all 3 sources (e.g. checking for conflicts) is spread across
3 logic locations - the first 2-way diff, the second 2-way diff and the merge of the 2 diffs.

2
contributors/design-proposals/cli/multi-fields-merge-key.md
View File

@ -35,7 +35,7 @@ That part will be addressed by [#476](https://github.com/kubernetes/community/pu
### API Change
If a merge key has multiple fields, it will be a string of merge key fields seperated by ",", i.e. `patchMergeKey:"<key1>,<key2>,<key3>"`.
If a merge key has multiple fields, it will be a string of merge key fields separated by ",", i.e. `patchMergeKey:"<key1>,<key2>,<key3>"`.
If a merge key only has one field, it will be the same as before, i.e. `patchMergeKey:"<key1>"`.