diff options
Diffstat (limited to 'multi-platform.md')
| -rw-r--r-- | multi-platform.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/multi-platform.md b/multi-platform.md index f278ee10..1d3633fb 100644 --- a/multi-platform.md +++ b/multi-platform.md @@ -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. |