accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r915598 - in /websites/staging/accumulo/trunk/content: ./ source.html
Date Wed, 09 Jul 2014 19:16:22 GMT
Author: buildbot
Date: Wed Jul  9 19:16:21 2014
New Revision: 915598

Log:
Staging update by buildbot for accumulo

Modified:
    websites/staging/accumulo/trunk/content/   (props changed)
    websites/staging/accumulo/trunk/content/source.html

Propchange: websites/staging/accumulo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul  9 19:16:21 2014
@@ -1 +1 @@
-1606853
+1609270

Modified: websites/staging/accumulo/trunk/content/source.html
==============================================================================
--- websites/staging/accumulo/trunk/content/source.html (original)
+++ websites/staging/accumulo/trunk/content/source.html Wed Jul  9 19:16:21 2014
@@ -231,13 +231,37 @@ need to install or modify the Thrift def
 <p>For older branches, "mvn package &amp;&amp; mvn assembly:single" may be
required instead, and the tar will be built in the target directory.</p>
 <p>If you regularly switch between major development branches, you may receive errors
about improperly licensed files from the <a href="http://creadur.apache.org/rat/apache-rat-plugin/">RAT
plugin</a>. This is caused by modules that exist in one branch and not the other leaving
Maven build files that the RAT plugin no longer understands how to ignore.</p>
 <p>The easiest fix is to ensure all of your current changes are stored in git and then
cleaning your workspace.</p>
-<div class="codehilite"><pre><span class="n">git</span> <span
class="n">add</span> <span class="n">path</span><span class="o">/</span><span
class="n">to</span><span class="o">/</span><span class="n">file</span><span
class="o">/</span><span class="n">that</span><span class="o">/</span><span
class="n">has</span><span class="o">/</span><span class="n">changed</span>
-<span class="n">git</span> <span class="n">add</span> <span class="n">path</span><span
class="o">/</span><span class="n">to</span><span class="o">/</span><span
class="n">other</span><span class="o">/</span><span class="n">file</span>
-<span class="n">git</span> <span class="n">clean</span> <span
class="o">-</span><span class="n">xdf</span>
+<div class="codehilite"><pre>$<span class="o">&gt;</span> <span
class="n">git</span> <span class="n">add</span> <span class="n">path</span><span
class="o">/</span><span class="n">to</span><span class="o">/</span><span
class="n">file</span><span class="o">/</span><span class="n">that</span><span
class="o">/</span><span class="n">has</span><span class="o">/</span><span
class="n">changed</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">add</span> <span class="n">path</span><span class="o">/</span><span
class="n">to</span><span class="o">/</span><span class="n">other</span><span
class="o">/</span><span class="n">file</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">clean</span> <span class="o">-</span><span class="n">df</span>
+</pre></div>
+
+
+<p>Note that this git clean command will delete any files unknown to git in a way that
is irreversible. You should check that no important files will be included by first looking
at the "untracked files" section in a <code>git status</code> command.</p>
+<div class="codehilite"><pre>$<span class="o">&gt;</span> <span
class="n">git</span> <span class="n">status</span>
+# <span class="n">On</span> <span class="n">branch</span> <span
class="n">master</span>
+<span class="n">nothing</span> <span class="n">to</span> <span
class="n">commit</span> <span class="p">(</span><span class="n">working</span>
<span class="n">directory</span> <span class="n">clean</span><span
class="p">)</span>
+$<span class="o">&gt;</span> <span class="n">mvn</span> <span
class="n">package</span>
+<span class="p">{</span> <span class="n">maven</span> <span class="n">output</span>
<span class="n">elided</span> <span class="p">}</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">checkout</span> 1<span class="p">.</span>6<span class="p">.</span>1<span
class="o">-</span><span class="n">SNAPSHOT</span>
+<span class="n">Switched</span> <span class="n">to</span> <span
class="n">branch</span> <span class="s">&#39;1.6.1-SNAPSHOT&#39;</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">status</span>
+# <span class="n">On</span> <span class="n">branch</span> 1<span
class="p">.</span>6<span class="p">.</span>1<span class="o">-</span><span
class="n">SNAPSHOT</span>
+# <span class="n">Untracked</span> <span class="n">files</span><span
class="p">:</span>
+#   <span class="p">(</span><span class="n">use</span> &quot;<span
class="n">git</span> <span class="n">add</span> <span class="o">&lt;</span><span
class="n">file</span><span class="o">&gt;</span><span class="p">...</span>&quot;
<span class="n">to</span> <span class="n">include</span> <span
class="n">in</span> <span class="n">what</span> <span class="n">will</span>
<span class="n">be</span> <span class="n">committed</span><span
class="p">)</span>
+#
+#   <span class="n">mapreduce</span><span class="o">/</span>
+#   <span class="n">shell</span><span class="o">/</span>
+<span class="n">nothing</span> <span class="n">added</span> <span
class="n">to</span> <span class="n">commit</span> <span class="n">but</span>
<span class="n">untracked</span> <span class="n">files</span> <span
class="n">present</span> <span class="p">(</span><span class="n">use</span>
&quot;<span class="n">git</span> <span class="n">add</span>&quot;
<span class="n">to</span> <span class="n">track</span><span class="p">)</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">clean</span> <span class="o">-</span><span class="n">df</span>
+<span class="n">Removing</span> <span class="n">mapreduce</span><span
class="o">/</span>
+<span class="n">Removing</span> <span class="n">shell</span><span
class="o">/</span>
+$<span class="o">&gt;</span> <span class="n">git</span> <span
class="n">status</span>
+# <span class="n">On</span> <span class="n">branch</span> 1<span
class="p">.</span>6<span class="p">.</span>1<span class="o">-</span><span
class="n">SNAPSHOT</span>
+<span class="n">nothing</span> <span class="n">to</span> <span
class="n">commit</span> <span class="p">(</span><span class="n">working</span>
<span class="n">directory</span> <span class="n">clean</span><span
class="p">)</span>
 </pre></div>
 
 
-<p>Note that this git clean command will delete any files unknown to git in a way that
is irreversible. This includes files and directories created by IDEs in the workspace, even
if git is normally configured to ignore them.</p>
 <h3 id="continuous-integration">Continuous Integration</h3>
 <p>Accumulo uses <a href="http://jenkins-ci.org/">Jenkins</a> for automatic
builds.</p>
 <p><img src="https://builds.apache.org/job/Accumulo-Master/lastBuild/buildStatus"
style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-Master/">Master</a></p>



Mime
View raw message