ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

contrib: update backport script to reflect stable branch 

Since we now do backports on stable-3.0 and stable-3.1 we have to use
the name of the stable branch in the backport branch name. If we don't
do this we will end up with conflicting branch names.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2574/head
Sébastien Han 2018-05-09 14:30:12 -07:00
parent 26f6a65042
commit 0b803fc16a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/backport_to_stable_branch.sh
View File

@ -11,7 +11,7 @@ stable_branch=$1
commit=$2
bkp_branch_name=$3
bkp_branch_name_prefix=bkp
bkp_branch=$bkp_branch_name-$bkp_branch_name_prefix
bkp_branch=$bkp_branch_name-$bkp_branch_name_prefix-$stable_branch
#############
@ -89,8 +89,8 @@ checkout
cherry_pick
push
create_pr <<MSG
Backport of ${3}
Backport of ${3} in $stable_branch
Backport of #${3}
Backport of #${3} in $stable_branch
MSG
cleanup