Rebase on 2.12 (#5488)

This commit is contained in:
Maxime Guyot 2020-01-17 11:10:56 +01:00 committed by Kubernetes Prow Robot
parent 370a0635fa
commit 86365d61e3

View file

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