github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

The VS and dot is seprated

Browse Source 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
This commit is contained in:
YuPengZTE
2016-09-26 17:05:53 +08:00
parent 3aa8abd687
commit d0f69ee0f9
11 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/proposals/multi-platform.md
View File

@@ -227,7 +227,7 @@ These addons should also be converted to multiple platforms:
### Conflicts
What should we do if there's a conflict between keeping e.g. `linux/ppc64le` builds vs merging a release blocker?
What should we do if there's a conflict between keeping e.g. `linux/ppc64le` builds vs. merging a release blocker?
In fact, we faced this problem while this proposal was being written; in [#25243](https://github.com/kubernetes/kubernetes/pull/25243). It is quite obvious that the release blocker is of higher priority.