You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by bu...@apache.org on 2014/03/20 09:41:02 UTC
svn commit: r902497 - in /websites/staging/deltaspike/trunk/content: ./
steps_for_a_release.html
Author: buildbot
Date: Thu Mar 20 08:41:01 2014
New Revision: 902497
Log:
Staging update by buildbot for deltaspike
Modified:
websites/staging/deltaspike/trunk/content/ (props changed)
websites/staging/deltaspike/trunk/content/steps_for_a_release.html
Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 20 08:41:01 2014
@@ -1 +1 @@
-1579558
+1579560
Modified: websites/staging/deltaspike/trunk/content/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/steps_for_a_release.html (original)
+++ websites/staging/deltaspike/trunk/content/steps_for_a_release.html Thu Mar 20 08:41:01 2014
@@ -209,9 +209,9 @@
</ul>
<p>Always do a merge in this case (not a rebase):</p>
<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">master</span>
-<span class="n">git</span> <span class="n">merge</span> <span class="n">deltaspike</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
-<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
-<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-</span><span class="n">project</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">merge</span> <span class="n">deltaspike</span><span class="o">-</span><span class="p">[</span><span class="n">version</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-</span><span class="p">[</span><span class="n">version</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-</span><span class="n">project</span><span class="o">-</span><span class="p">[</span><span class="n">version</span><span class="p">]</span>
</pre></div>
@@ -226,18 +226,19 @@
<h3 id="e-mails">E-Mails</h3>
<div class="codehilite"><pre><span class="k">[ANNOUNCE] Release of Apache DeltaSpike [version]</span>
-<span class="err">The</span> <span class="err">Apache</span> <span class="err">DeltaSpike</span> <span class="err">team</span> <span class="err">is</span> <span class="err">pleased</span> <span class="err">to</span> <span class="err">announce</span> <span class="err">the</span> <span class="err">...</span> <span class="err">release</span> <span class="err">of</span> <span class="err">DeltaSpike.</span>
+<span class="err">The</span> <span class="err">Apache</span> <span class="err">DeltaSpike</span> <span class="err">team</span> <span class="err">is</span> <span class="err">pleased</span> <span class="err">to</span> <span class="err">announce</span> <span class="err">the</span> <span class="err">6th</span> <span class="err">release</span> <span class="err">of</span> <span class="err">DeltaSpike.</span>
-<span class="err">Apache</span> <span class="err">DeltaSpike</span> <span class="err">is</span> <span class="err">not</span> <span class="err">a</span> <span class="err">CDI-container,</span> <span class="err">but</span> <span class="err">a</span> <span class="err">portable</span> <span class="err">CDI</span> <span class="err">extension</span> <span class="err">(see</span> <span class="err">[1]).</span>
+<span class="err">Apache</span> <span class="err">DeltaSpike</span> <span class="err">is</span> <span class="err">not</span> <span class="err">a</span> <span class="err">CDI-container,</span> <span class="err">but</span> <span class="err">a</span> <span class="err">portable</span> <span class="err">CDI</span> <span class="err">extension.</span>
+
+<span class="err">Documentation:</span>
+<span class="err">http://deltaspike.apache.org/documentation.html</span>
<span class="err">Release</span> <span class="err">Notes:</span>
-<span class="err">http://s.apache.org/DeltaSpike_</span><span class="k">[version]</span>
+<span class="err">http://s.apache.org/DeltaSpike_06</span>
<span class="err">Enjoy!</span>
<span class="k">[name]</span>
-
-<span class="err">[1]</span> <span class="err">http://deltaspike.apache.org/documentation.html</span>
</pre></div>