aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffan Olsson <staffan@repos.se>2017-08-03 14:24:05 +0200
committerStaffan Olsson <staffan@repos.se>2017-08-03 14:24:05 +0200
commita8db336c1a03d01e8aacd4f811bebc5ab9542b26 (patch)
treea02e656a1821b398d337935703217134853b875d
parenta39d09d820c0f6f5892021f44326629ed8f96a6e (diff)
downloadkubernetes-kafka-a8db336c1a03d01e8aacd4f811bebc5ab9542b26.tar.gz
kubernetes-kafka-a8db336c1a03d01e8aacd4f811bebc5ab9542b26.tar.bz2
kubernetes-kafka-a8db336c1a03d01e8aacd4f811bebc5ab9542b26.zip
Rack awareness is candidate for merge
-rwxr-xr-xqa-yolean.sh (renamed from prod-yolean.sh)5
1 files changed, 3 insertions, 2 deletions
diff --git a/prod-yolean.sh b/qa-yolean.sh
index 2f9b775..8940128 100755
--- a/prod-yolean.sh
+++ b/qa-yolean.sh
@@ -29,15 +29,16 @@ function annotate {
git checkout ${FROM}$START
REVS="$START:$(git rev-parse --short ${FROM}$START)"
-git checkout -b prod-yolean-$(date +"%Y%m%dT%H%M%S")
+git checkout -b qa-yolean-$(date +"%Y%m%dT%H%M%S")
for BRANCH in \
+ multizone-rack-awareness \
addon-storage-classes \
rolling-update \
addon-metrics \
addon-kube-events-topic
do
- git merge --no-ff ${FROM}$BRANCH -m "prod-yolean merge ${FROM}$BRANCH" && \
+ git merge --no-ff ${FROM}$BRANCH -m "qa-yolean merge ${FROM}$BRANCH" && \
REVS="$REVS $BRANCH:$(git rev-parse --short ${FROM}$BRANCH)"
done