Preparing a 2.11.1 release - kubernetes 1.15.5 (#5278)

* add checksums for 1.15.4 and 1.15.5 and set 1.15.5 to default

* Upgrade nodelocaldns to 1.15.5 (#5191)

* do not rebase from master for 2.11 release branch
This commit is contained in:
Hugo Blom
2019-10-30 09:56:52 +01:00
committed by Kubernetes Prow Robot
parent 86cc703c75
commit 73097aa39d
5 changed files with 19 additions and 7 deletions

View File

@@ -5,5 +5,5 @@ set -euxo pipefail
if [[ $CI_COMMIT_REF_NAME == pr-* ]]; then
git config user.email "ci@kubespray.io"
git config user.name "CI"
git pull --rebase origin master
git pull --rebase origin release-2.11
fi