summaryrefslogtreecommitdiff
path: root/multi-platform.md
diff options
context:
space:
mode:
authorYuPengZTE <yu.peng36@zte.com.cn>2016-09-26 17:05:53 +0800
committerYuPengZTE <yu.peng36@zte.com.cn>2016-09-26 17:05:53 +0800
commit3ffd54b1316a087550806116a23f5cd1edebd19f (patch)
treefc048baf4d1da7ba239ebf1d0a36ded56f6f473d /multi-platform.md
parent30ff069e6484007c665c735f180a272075d243ce (diff)
The VS and dot is seprated
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Diffstat (limited to 'multi-platform.md')
-rw-r--r--multi-platform.md2
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.