openstack/project-config
Code Issues Proposed changes

Merge "Expand explanation of auto tag merge"

Browse Source
This commit is contained in:
Jenkins 2015-06-09 17:28:57 +00:00 committed by Gerrit Code Review
commit 6bad24a27c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/scripts/merge_tags.sh
View File

@ -46,8 +46,9 @@ fi
COMMIT_MSG="Merge tag '$TAG'
This is a null-merge of the $TAG release tag back into the
master branch. It contains no actual changes to the master branch,
This is a null-merge of the $TAG release tag back into the master
branch so that the $TAG tag will appear in the git commit history of
the master branch. It contains no actual changes to the master branch,
regardless of how our code review system's UI represents it. Please
ask in #openstack-infra if you have any questions, and otherwise try
to merge this as quickly as possible to avoid later conflicts on the