From 7073356eb36ac7154b1abc1ae2aeda5855c31772 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 9 Jun 2015 09:59:29 -0700 Subject: [PATCH] Expand explanation of auto tag merge Add more explanation about the reasoning for the auto tag merge. Change-Id: Ibeda9a8a5d4788fdc4571c6cea5231265a651003 --- jenkins/scripts/merge_tags.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/merge_tags.sh b/jenkins/scripts/merge_tags.sh index e9faf89a05..4ae1693477 100755 --- a/jenkins/scripts/merge_tags.sh +++ b/jenkins/scripts/merge_tags.sh @@ -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