From 3ffd54b1316a087550806116a23f5cd1edebd19f Mon Sep 17 00:00:00 2001 From: YuPengZTE Date: Mon, 26 Sep 2016 17:05:53 +0800 Subject: The VS and dot is seprated Signed-off-by: YuPengZTE --- multi-platform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'multi-platform.md') 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. -- cgit v1.2.3