From 277d54b7c9d2c489be1bb9f7f37b96933e0f8a5a Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 20 Mar 2019 13:18:21 +0800 Subject: [PATCH 1/2] Update version matrix --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c2ec5147a4..da5c72c3fe 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ Version matrix: | Kubernetes Version | cri-tools Version | cri-tools branch | |--------------------|-------------------|------------------| -| 1.13.X | v1.13.0 | master | +| 1.14.X | N/A | master | +| 1.13.X | v1.13.0 | release-1.13 | | 1.12.X | v1.12.0 | release-1.12 | | 1.11.X | v1.11.1 | release-1.11 | | 1.10.X | v1.0.0-beta.2 | release-1.10 | From 19362c45acf4ba7ece5fba41271c02fd0a0643ff Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 20 Mar 2019 13:18:34 +0800 Subject: [PATCH 2/2] update go version to 1.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e40614479..ecee8713ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required dist: xenial go: - - 1.11.x + - 1.12.x os: - linux