Author: joewitt
Date: Thu Jan 23 03:32:15 2020
New Revision: 1873051
URL: http://svn.apache.org/viewvc?rev=1873051&view=rev
Log:
NIFI-7021 testing something with asfinfra
Modified:
nifi/site/trunk/release-guide.html
Modified: nifi/site/trunk/release-guide.html
URL:
http://svn.apache.org/viewvc/nifi/site/trunk/release-guide.html?rev=1873051&r1=1873050&r2=1873051&view=diff
==============================================================================
--- nifi/site/trunk/release-guide.html (original)
+++ nifi/site/trunk/release-guide.html Thu Jan 23 03:32:15 2020
@@ -482,7 +482,7 @@ Here is the PMC vote thread: ${VOTE_THRE
<pre><code>$ svn move -m "${JIRA_TICKET}"
https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}
https://dist.apache.org/repos/dist/release/nifi/${NIFI_VERSION}
</code></pre></li>
<li><p>In repository.apache.org go to the staging repository and select
<code>release</code> and follow the instructions on the site.</p></li>
-<li><p>Merge the release branch into master.</p>
+<li><p>Merge the release branch into master. (this will result in a merge
commit)</p>
<pre><code>$ git checkout master
$ git merge --no-ff ${JIRA_TICKET}-RC${RC}
$ git push asf master
