accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r870045 [16/24] - in /websites/staging/accumulo/trunk/content: ./ 1.4/examples/ 1.4/user_manual/ 1.5/examples/ css/ downloads/ example/ governance/ user_manual_1.3-incubating/ user_manual_1.3-incubating/examples/
Date Thu, 18 Jul 2013 22:46:39 GMT
Modified: websites/staging/accumulo/trunk/content/1.5/examples/visibility.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/visibility.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/visibility.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo Visibility, Authorizations, and Permissions Example</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,41 +84,41 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
     <h1 class="title">Apache Accumulo Visibility, Authorizations, and Permissions Example</h1>
     <h2 id="creating-a-new-user">Creating a new user</h2>
-<div class="codehilite"><pre><span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
-<span class="n">Please</span> <span class="n">confirm</span> <span class="k">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
-<span class="mo">06</span> <span class="mi">10</span><span class="p">:</span><span class="mi">48</span><span class="p">:</span><span class="mi">47</span><span class="p">,</span><span class="mi">931</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</s
 pan> <span class="n">action</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
-<span class="n">System</span> <span class="n">permissions:</span>
+<div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createuser</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">Please</span> <span class="n">confirm</span> <span class="n">new</span> <span class="n">password</span> <span class="k">for</span> <span class="s">&#39;username&#39;</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
+06 10<span class="p">:</span>48<span class="p">:</span>47<span class="p">,</span>931 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</span> <span class="n">action</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
+<span class="n">System</span> <span class="n">permissions</span><span class="p">:</span>
 
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="o">!</span><span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span>
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span>!<span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>A user does not by default have permission to create a table.</p>
 <h2 id="granting-permissions-to-a-user">Granting permissions to a user</h2>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="o">-</span><span class="n">s</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span> 
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
-<span class="n">username</span><span class="nv">@instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
-<span class="n">System</span> <span class="n">permissions:</span> <span class="n">System</span><span class="o">.</span><span class="n">CREATE_TABLE</span>
-
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="o">!</span><span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span>
-<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="n">vistest</span><span class="p">):</span> <span class="n">Table</span><span class="o">.</span><span class="n">READ</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">WRITE</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">BULK_IMPORT</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">ALTER_TABLE</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">GRANT</span><span class="p">,</span> <span class="n">Table</span><span class="o">.</span><span class="n">DROP_TABLE</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">grant</span> <span class="o">-</span><span class="n">s</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span> 
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">createtable</span> <span class="n">vistest</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span><span class="o">&gt;</span> <span class="n">userpermissions</span>
+<span class="n">System</span> <span class="n">permissions</span><span class="p">:</span> <span class="n">System</span><span class="p">.</span><span class="n">CREATE_TABLE</span>
+
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span>!<span class="n">METADATA</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span>
+<span class="n">Table</span> <span class="n">permissions</span> <span class="p">(</span><span class="n">vistest</span><span class="p">):</span> <span class="n">Table</span><span class="p">.</span><span class="n">READ</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">WRITE</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">BULK_IMPORT</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">ALTER_TABLE</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">GRANT</span><span class="p">,</span> <span class="n">Table</span><span class="p">.</span><span class="n">DROP_TABLE</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -126,14 +127,14 @@
 tokens.  Authorization tokens are arbitrary strings taken from a restricted 
 ASCII character set.  Parentheses are required to specify order of operations 
 in visibilities.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f1</span> <span class="n">q1</span> <span class="n">v1</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f2</span> <span class="n">q2</span> <span class="n">v2</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span><span class="o">&amp;</span><span class="n">B</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">19</span><span class="p">:</span><span class="mo">01</span><span class="p">,</span><span class="mi">432</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">BadArgumentException:</span> <span class="n">cannot</span> <span class="n">mix</span> <span class="o">|</span> <span class="ow">and</span> <span class="o">&amp;</span> <span class="n">near</span> <span class="nb">index</span> <span class="mi">12</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f1</span> <span class="n">q1</span> <span class="n">v1</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f2</span> <span class="n">q2</span> <span class="n">v2</span> <span class="o">-</span><span class="n">l</span> <span class="n">A</span><span class="o">&amp;</span><span class="n">B</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
+06 11<span class="p">:</span>19<span class="p">:</span>01<span class="p">,</span>432 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">BadArgumentException</span><span class="p">:</span> <span class="n">cannot</span> <span class="n">mix</span> <span class="o">|</span> <span class="n">and</span> <span class="o">&amp;</span> <span class="n">near</span> <span class="n">index</span> 12
 <span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-            <span class="o">^</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="p">(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+            ^
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f3</span> <span class="n">q3</span> <span class="n">v3</span> <span class="o">-</span><span class="n">l</span> <span class="p">(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -142,73 +143,73 @@ in visibilities.</p>
 authorizations and each Accumulo scan has authorizations.  Scan authorizations 
 are only allowed to be a subset of the user's authorizations.  By default, a 
 user's authorizations set is empty.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">43</span><span class="p">:</span><span class="mi">14</span><span class="p">,</span><span class="mi">951</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">java</span><span class="o">.</span><span class="n">lang</span><span class="o">.</span><span class="n">RuntimeException:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">BAD_AUTHORIZATIONS</span> <span class="o">-</span> <span class="n">The</span> <span class="n">user</span> <span class="n">does</span>
  <span class="ow">not</span> <span class="n">have</span> <span class="n">the</span> <span class="n">specified</span> <span class="n">authorizations</span> <span class="n">assigned</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+06 11<span class="p">:</span>43<span class="p">:</span>14<span class="p">,</span>951 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">RuntimeException</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">BAD_AUTHORIZATIONS</span> <span class="o">-</span> <span class="n">The</span> <span class="n">user</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</s
 pan> <span class="n">the</span> <span class="n">specified</span> <span class="n">authorizations</span> <span class="n">assigned</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <h2 id="setting-authorizations-for-a-user">Setting authorizations for a user</h2>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="mo">06</span> <span class="mi">11</span><span class="p">:</span><span class="mi">53</span><span class="p">:</span><span class="mi">42</span><span class="p">,</span><span class="mo">056</span> <span class="p">[</span><span class="n">shell</span><span class="o">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">AccumuloSecurityException:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</s
 pan> <span class="n">action</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+06 11<span class="p">:</span>53<span class="p">:</span>42<span class="p">,</span>056 <span class="p">[</span><span class="n">shell</span><span class="p">.</span><span class="n">Shell</span><span class="p">]</span> <span class="n">ERROR</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">client</span><span class="p">.</span><span class="n">AccumuloSecurityException</span><span class="p">:</span> <span class="n">Error</span> <span class="n">PERMISSION_DENIED</span> <span class="o">-</span> <span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">permission</span> <span class="n">to</span> <span class="n">perform</span> <span class="n">this</span> <span class="n">action</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>A user cannot set authorizations unless the user has the System.ALTER_USER permission.
 The root user has this permission.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>The default authorizations for a scan are the user's entire set of authorizations.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">********</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span><span class="p">,</span><span class="n">B</span><span class="p">,</span><span class="n">broccoli</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">row</span> <span class="n">f2:q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
-<span class="n">row</span> <span class="n">f3:q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">B</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">setauths</span> <span class="o">-</span><span class="n">s</span> <span class="n">A</span><span class="p">,</span><span class="n">B</span><span class="p">,</span><span class="n">broccoli</span> <span class="o">-</span><span class="n">u</span> <span class="n">username</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">row</span> <span class="n">f2</span><span class="p">:</span><span class="n">q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
+<span class="n">row</span> <span class="n">f3</span><span class="p">:</span><span class="n">q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span> <span class="o">-</span><span class="n">s</span> <span class="n">B</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p>If you want, you can limit a user to only be able to insert data which they can read themselves.
 It can be set with the following constraint.</p>
-<div class="codehilite"><pre><span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root:</span> <span class="o">******</span>
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">vistest</span> <span class="o">-</span><span class="n">s</span> <span class="n">table</span><span class="o">.</span><span class="n">constraint</span><span class="mf">.1</span><span class="o">=</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">VisibilityConstraint</span>    
-<span class="n">root</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
-<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username:</span> <span class="o">********</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span>                                                                
-    <span class="n">Constraint</span> <span class="n">Failures:</span>
-        <span class="n">ConstraintViolationSummary</span><span class="p">(</span><span class="n">constrainClass:org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">accumulo</span><span class="o">.</span><span class="n">core</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">VisibilityConstraint</span><span class="p">,</span> <span class="n">violationCode:2</span><span class="p">,</span> <span class="n">violationDescription:User</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">have</span> <span class="n">authorization</span> <span class="n">on</span> <span class="n">column</span> <span class="n">visibility</span><span class="p">,</span> <span class="n">numberOfViolatingMutations:1</span><span class="p">)</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
-<span class="n">row</span> <span class="n">f1:q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
-<span class="n">row</span> <span class="n">f2:q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
-<span class="n">row</span> <span class="n">f3:q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
-<span class="n">row</span> <span class="n">f4:q4</span> <span class="p">[</span><span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span><span class="p">]</span>    <span class="n">v4</span>
-<span class="n">username</span><span class="nv">@instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">root</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">root</span><span class="p">:</span> <span class="o">******</span>
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">config</span> <span class="o">-</span><span class="n">t</span> <span class="n">vistest</span> <span class="o">-</span><span class="n">s</span> <span class="n">table</span><span class="p">.</span><span class="n">constraint</span><span class="p">.</span>1<span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">VisibilityConstraint</span>    
+<span class="n">root</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">user</span> <span class="n">username</span>
+<span class="n">Enter</span> <span class="n">password</span> <span class="k">for</span> <span class="n">user</span> <span class="n">username</span><span class="p">:</span> <span class="o">********</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span>                                                                
+    <span class="n">Constraint</span> <span class="n">Failures</span><span class="p">:</span>
+        <span class="n">ConstraintViolationSummary</span><span class="p">(</span><span class="n">constrainClass</span><span class="p">:</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">accumulo</span><span class="p">.</span><span class="n">core</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">VisibilityConstraint</span><span class="p">,</span> <span class="n">violationCode</span><span class="p">:</span>2<span class="p">,</span> <span class="n">violationDescription</span><span class="p">:</span><span class="n">User</span> <span class="n">does</span> <span class="n">not</span> <span class="n">have</span> <span class="n">authorization</span> <span class="n">on</span> <span class="n">column</span> <span class="n">visibility</span><span class="p">,</span> <span class="n">numberOfViolatingMutations</span><span class="p">:</span>1<span class="p">)</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">insert</span> <span class="n">row</span> <span class="n">f4</span> <span class="n">q4</span> <span class="n">v4</span> <span class="o">-</span><span class="n">l</span> <span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span> <span class="n">scan</span>
+<span class="n">row</span> <span class="n">f1</span><span class="p">:</span><span class="n">q1</span> <span class="p">[</span><span class="n">A</span><span class="p">]</span>    <span class="n">v1</span>
+<span class="n">row</span> <span class="n">f2</span><span class="p">:</span><span class="n">q2</span> <span class="p">[</span><span class="n">A</span><span class="o">&amp;</span><span class="n">B</span><span class="p">]</span>    <span class="n">v2</span>
+<span class="n">row</span> <span class="n">f3</span><span class="p">:</span><span class="n">q3</span> <span class="p">[(</span><span class="n">apple</span><span class="o">&amp;</span><span class="n">carrot</span><span class="p">)</span><span class="o">|</span><span class="n">broccoli</span><span class="o">|</span><span class="n">spinach</span><span class="p">]</span>    <span class="n">v3</span>
+<span class="n">row</span> <span class="n">f4</span><span class="p">:</span><span class="n">q4</span> <span class="p">[</span><span class="n">spinach</span><span class="o">|</span><span class="n">broccoli</span><span class="p">]</span>    <span class="n">v4</span>
+<span class="n">username</span><span class="p">@</span><span class="n">instance</span> <span class="n">vistest</span><span class="o">&gt;</span>
 </pre></div>
   </div>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/css/accumulo.css
==============================================================================
--- websites/staging/accumulo/trunk/content/css/accumulo.css (original)
+++ websites/staging/accumulo/trunk/content/css/accumulo.css Thu Jul 18 22:46:37 2013
@@ -61,7 +61,8 @@ h1, h2, h3, h4, h5, h6 {
 }
 #content h1 {
     font-size: 1.4em;
-    padding: 15px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 }
 #content h2 {
     border-bottom: 1px dashed #666666;

Modified: websites/staging/accumulo/trunk/content/downloads/index.html
==============================================================================
--- websites/staging/accumulo/trunk/content/downloads/index.html (original)
+++ websites/staging/accumulo/trunk/content/downloads/index.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Apache Accumulo Downloads</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,7 +84,7 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
@@ -136,7 +137,7 @@ Be sure to verify your downloads by thes
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/example/wikisearch.html
==============================================================================
--- websites/staging/accumulo/trunk/content/example/wikisearch.html (original)
+++ websites/staging/accumulo/trunk/content/example/wikisearch.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>The wikipedia search example explained, with performance numbers.</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,7 +84,7 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
@@ -204,10 +205,10 @@ td {
 
 <p>The resulting tables:</p>
 <div class="codehilite"><pre><span class="o">&gt;</span> <span class="n">du</span> <span class="o">-</span><span class="n">p</span> <span class="n">wiki</span><span class="o">.*</span>
-      <span class="mi">47</span><span class="p">,</span><span class="mi">325</span><span class="p">,</span><span class="mi">680</span><span class="p">,</span><span class="mi">634</span> <span class="p">[</span><span class="n">wiki</span><span class="p">]</span>
-       <span class="mi">5</span><span class="p">,</span><span class="mi">125</span><span class="p">,</span><span class="mi">169</span><span class="p">,</span><span class="mi">305</span> <span class="p">[</span><span class="n">wikiIndex</span><span class="p">]</span>
-                 <span class="mi">413</span> <span class="p">[</span><span class="n">wikiMetadata</span><span class="p">]</span>
-       <span class="mi">5</span><span class="p">,</span><span class="mi">521</span><span class="p">,</span><span class="mi">690</span><span class="p">,</span><span class="mi">682</span> <span class="p">[</span><span class="n">wikiReverseIndex</span><span class="p">]</span>
+      47<span class="p">,</span>325<span class="p">,</span>680<span class="p">,</span>634 <span class="p">[</span><span class="n">wiki</span><span class="p">]</span>
+       5<span class="p">,</span>125<span class="p">,</span>169<span class="p">,</span>305 <span class="p">[</span><span class="n">wikiIndex</span><span class="p">]</span>
+                 413 <span class="p">[</span><span class="n">wikiMetadata</span><span class="p">]</span>
+       5<span class="p">,</span>521<span class="p">,</span>690<span class="p">,</span>682 <span class="p">[</span><span class="n">wikiReverseIndex</span><span class="p">]</span>
 </pre></div>
 
 
@@ -379,6 +380,7 @@ For comparison, these are the cold start
 
 Random queries were generated using common english words.  A uniform random sample of 3 to 5 words taken from the 10000 most common words in the Project Gutenberg's online text collection were joined with “and”.  Words containing anything other than letters (such as contractions) were not used.  A client was started simultaneously on each of the 10 servers and each ran 100 random queries (1000 queries total).
 
+
 <table>
 <tr>
 <th>Time
@@ -401,6 +403,7 @@ Random queries were generated using comm
 
 The English wikipedia data was re-ingested on top of the existing, compacted data. The following  query samples were taken in 5 minute intervals while ingesting 132 articles/second:
 
+
 <table>
 <tr>
 <th>Query
@@ -452,7 +455,7 @@ The English wikipedia data was re-ingest
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Modified: websites/staging/accumulo/trunk/content/get_involved.html
==============================================================================
--- websites/staging/accumulo/trunk/content/get_involved.html (original)
+++ websites/staging/accumulo/trunk/content/get_involved.html Thu Jul 18 22:46:37 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>Get Involved</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -48,30 +48,31 @@
   <h1 id="project">Project</h1>
 <ul>
 <li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
 </ul>
 <h1 id="development">Development</h1>
 <ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
 <li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
 <li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
 </ul>
 <h1 id="documentation">Documentation</h1>
 <ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
 </ul>
 <h1 id="asf-links">ASF links</h1>
 <ul>
@@ -83,7 +84,7 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
@@ -150,7 +151,7 @@ to approve a release. </p>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>

Added: websites/staging/accumulo/trunk/content/git.html
==============================================================================
--- websites/staging/accumulo/trunk/content/git.html (added)
+++ websites/staging/accumulo/trunk/content/git.html Thu Jul 18 22:46:37 2013
@@ -0,0 +1,556 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
+  <title>Apache Accumulo Git WIP</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  
+  <script type="text/javascript">
+
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-21103458-6']);
+    _gaq.push(['_setDomainName', 'apache.org']);
+    _gaq.push(['_setAllowLinker', true]);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+
+  </script>
+
+
+</head>
+
+<body>
+  <div id="banner">&nbsp;
+  </div>
+
+  <div id="navigation">
+  <h1 id="project">Project</h1>
+<ul>
+<li><a href="/">Home</a></li>
+<li><a href="downloads">Downloads</a></li>
+<li><a href="notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="get_involved.html">Get Involved</a></li>
+<li><a href="mailing_list.html">Mailing Lists</a></li>
+<li><a href="people.html">People</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="source.html">Source &amp; Guide</a></li>
+<li><a href="git.html">Git WIP</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</ul>
+<h1 id="documentation">Documentation</h1>
+<ul>
+<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="1.5/accumulo_user_manual.html">1.5</a></li>
+<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="1.5/apidocs">1.5</a></li>
+<li>Examples <a href="/1.4/examples">1.4</a> / <a href="1.5/examples">1.5</a></li>
+<li><a href="screenshots.html">Screenshots</a></li>
+<li><a href="papers.html">Papers &amp; Other Links</a></li>
+<li><a href="glossary.html">Glossary</a></li>
+</ul>
+<h1 id="asf-links">ASF links</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/">Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</ul>
+  </div>
+
+  <div id="bannertext">
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
+  </div>
+
+  <div id="content">
+    <h1 class="title">Apache Accumulo Git WIP</h1>
+    <h1 id="git">Git</h1>
+<p><a href="http://git-scm.com">Git</a> is an open source, distributed version control system
+which has become very popular in large, complicated software projects due to
+its efficient handling of multiple, simultaneously and independently developed
+branches of source code.</p>
+<h1 id="the-plan">The plan</h1>
+<p>There are multiple steps that are required of us to fully transition from
+active development against Subversion to Git. Each of these requires consensus
+(lazy or not) from the team along with documentation that developers, both
+existing and current, can reference to understand how and what to do.</p>
+<h2 id="workflow-background">Workflow Background</h2>
+<p>Likely the most contested subject matter regarding switching an active team
+from one SCM tool to another is a shift in the development paradigm.</p>
+<p>Some background, the common case, as is present with this team, is that
+developers coming from a Subversion history are very light on merging being a
+critical consideration on how to perform development. Because merging in
+Subversion is typically of no consequence to the complete view of history, not
+to mention that Subversion allows "merging" of specific revisions instead of
+sub-trees. As such, a transition to Git typically requires a shift in mindset
+in which a fix is not arbitrarily applied to trunk (whatever the main
+development is called), but the fix should be applied to the earliest, non
+end-of-life (EOL) version of the application.</p>
+<p>For example, say there is a hypothetical application which has just released
+version-3 of their software and have shifted their development to a version-4
+WIP. Version-2 is still supported, while version-1 was just EOL'ed. Each
+version still has a branch. A bug was just found which affects all released
+versions of this application. In Subversion, considering the history in the
+repository, it is of no consequence where the change is initially applied,
+because a Subversion merge is capable of merging it to any other version.
+History does not suffer because Subversion doesn't have the capacities to
+accurately track the change across multiple branches. In Git, to maintain a
+non-duplicative history, it is imperative that the developer choose the correct
+branch to fix the bug in. In this case, since version-1 is EOL'ed, version-2,
+version-3 and the WIP version-4 are candidates. The earliest version is
+obviously version-2; so, the change should be applied in version-2, merged to
+version-3 and then the version-4 WIP.</p>
+<p>The importance of this example is making a best-attempt to preserve history
+when using Git. While Git does have commands like cherry-pick which allow the
+contents of a commit to be applied from one branch to another which are not
+candidates to merge without conflict (which is typically the case when merging
+a higher version into a lower version), this results in a duplication of that
+commit in history when the two trees are eventually merged together. While Git
+is smart enough to not attempt to re-apply the changes, history still contains
+the blemish.</p>
+<p>The purpose of this extravagant example is to outline, in the trivial case, how
+the workflow decided upon for development is very important and has direct
+impact on the efficacy of the advanced commands bundled with Git.</p>
+<h2 id="proposed-workflow">Proposed Workflow</h2>
+<p>This is a summary of what has been agreed upon by vocal committers/PMC members
+on <a href="mailto:dev@accumulo.apache.org">dev@accumulo.apache.org</a>. Enumeration of
+every possible situation out of the scope of this document. This document
+intends to lay the ground work to define the correct course of action regardless
+of circumstances. Some concrete examples will be provided to ensure the
+explanation is clear.</p>
+<ol>
+<li>
+<p>Active development is performed concurrently over no less than two versions
+   of Apache Accumulo at any one point in time. As such, the workflow must
+   provide guidance on how and where changes should be made which apply to
+   multiple versions and how to ensure that such changes are contained in all
+   applicable versions.</p>
+</li>
+<li>
+<p>Releases are considered extremely onerous and time-consuming so no emphasis
+   is placed on rapid iterations or development-cycles.</p>
+</li>
+<li>
+<p>New features typically have lengthy development cycles in which more than
+   one developer contributes to the creation of the new feature from planning,
+   to implementation, to scale testing. Mechanisms/guidance should be provided
+   for multiple developers to teach contribute to a remote-shared resource.</p>
+</li>
+<li>
+<p>The repository should be the irrefutable, sole source of information
+   regarding the development of Apache Accumulo, and, as such, should have
+   best-efforts given in creating a clean, readable history without any single
+   entity having to control all write access and changes (a proxy). In other
+   words, the developers are the ones responsible for ensuring that previous
+   releases are preserved to meet ASF policy, for not rewriting any public
+   history of code not yet officially released (also ASF policy relevant) and
+   for a best-effort to be given to avoid duplicative commits appearing in
+    history created by the application of multiple revisions which have
+    different identifying attributes but the same contents (git-rebase and
+    git-cherry-pick).</p>
+</li>
+</ol>
+<h1 id="the-implementation">The implementation</h1>
+<h2 id="contributors">Contributors</h2>
+<p>Use the following steps, original derived from Apache Kafka's <a href="https://cwiki.apache.org/confluence/display/KAFKA/Git+Workflow#GitWorkflow-Simplecontributorworkflow">simple
+contributor
+workflow</a>.</p>
+<p>To be specific, let's consider a contributor wanting to work on a fix for the
+Jira issue ACCUMULO-12345 that affects 1.5.0 release.</p>
+<ol>
+<li>
+<p>Ensure you configured Git with your information</p>
+<p><code>git config --global user.name 'My Name' &amp;&amp; git config --global user.email
+'myname@mydomain.com'</code></p>
+</li>
+<li>
+<p>Clone the Accumulo repository:</p>
+<p><code>git clone https://git-wip-us.apache.org/repos/asf/accumulo.git accumulo</code></p>
+</li>
+<li>
+<p>or update your local copy:</p>
+<p><code>git fetch &amp;&amp; git fetch --tags</code></p>
+</li>
+<li>
+<p>For the given issue you intend to work on, choose the 'lowest' fixVersion
+   and create a branch for yourself to work in.</p>
+<p><code>git checkout -b ACCUMULO-12345-my-work origin/1.5.1-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Make commits as you see fit as you fix the issue, referencing the issue name
+   in the commit message:</p>
+<p><code>git commit -av</code></p>
+</li>
+<li>
+<p>Assuming others are developing against the version you also are, as you
+   work, or before you create your patch, rebase your branch against the remote
+   to lift your changes to the top of your branch.</p>
+<p><code>git pull --rebase origin 1.5.1-SNAPSHOT</code></p>
+</li>
+<li>
+<p>At this point, you can create a patch file from the upstream branch to
+   attach to the ACCUMULO-12345 Jira issue.</p>
+<p><code>git format-patch 1.5.1-SNAPSHOT --stdout &gt; ACCUMULO-12345.patch</code></p>
+</li>
+</ol>
+<p>An alternative to creating a patch is submitting a request to pull your changes
+from some repository, e.g. Github. Please include the repository and branch
+name merge in the notice to the Jira issue, e.g.</p>
+<div class="codehilite"><pre><span class="n">repo</span><span class="p">=</span><span class="n">git</span><span class="p">:</span><span class="o">//</span><span class="n">github</span><span class="p">.</span><span class="n">com</span><span class="o">/&lt;</span><span class="n">username</span><span class="o">&gt;/</span><span class="n">accumulo</span><span class="p">.</span><span class="n">git</span> <span class="n">branch</span><span class="p">=</span><span class="n">ACCUMULO</span><span class="o">-</span>12345
+</pre></div>
+
+
+<p>A second alternative is to use Github's "Pull Requests" feature against the
+<a href="https://github.com/apache/accumulo">Apache Accumulo account</a>. Notifications of
+new pull-requests from Github should automatically be sent to
+<a href="mailto:dev@accumulo.apache.org">dev@accumulo.apache.org</a>.</p>
+<p>Ignoring specifics, contributors should be sure to make their changes against
+the earlier version in which the fix is intended, <code>git-rebase</code>'ing their
+changes against the upstream branch so as to keep their changes co-located and
+free of unnecessary merges.</p>
+<h2 id="developers">Developers</h2>
+<h3 id="primary-development">Primary Development</h3>
+<p>Primary development should take place in <code>master</code> which is to contain the most
+recent, un-released version of Apache Accumulo.</p>
+<p>For changes staged for the next minor release of Apache Accumulo, it has been
+suggested that a branch is created for the purpose of containing the bug-fixes,
+API-compatible improvements and backported-features. This provides the
+following:</p>
+<ol>
+<li>Avoids many long-running 'SNAPSHOT' branches to force the developer to best
+   consider where his/her changes should be applied.</li>
+<li>Better ties a branch containing commits for a minor release to Jira issues
+   fixed in said minor release.</li>
+</ol>
+<p>If said short-lived branch doesn't yet exist, the developer should create said
+branch off of the last minor release in the targeted major version.</p>
+<p>For example, if a developer finds a fix that needs to be made against the 1.4.3
+release of Apache Accumulo, the developer should create a new branch from the
+1.4.3 tag, apply the changes, and push the branch remotely with an appropriate
+name. It has been suggested to name the branch in the same manner in which
+Maven releases are named. In other words, the branch just created would be
+named <code>1.4.4-snapshot</code> or similar.</p>
+<h3 id="reviewing-contributor-changes">Reviewing contributor changes</h3>
+<p><strong>Patches</strong> -- Developers should use the following steps to apply patches from
+contributors:</p>
+<ol>
+<li>
+<p>Checkout the branch which the patch is submitted for:</p>
+<p><code>git checkout 1.5.1-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Verify the changes introduced by the patch:</p>
+<p><code>git apply --stat ACCUMULO-12345.patch</code></p>
+</li>
+<li>
+<p>Verify that the patch applies cleanly:</p>
+<p><code>git apply --check ACCUMULO-12345.patch</code></p>
+</li>
+<li>
+<p>If all is well, apply the patch:</p>
+<p><code>git am --signoff &lt; ACCUMULO-12345.patch</code></p>
+</li>
+<li>
+<p>When finished, push the changes:</p>
+<p><code>git push origin 1.5.1-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Merge where appropriate:</p>
+<p><code>git checkout master &amp;&amp; git merge 1.5.1-SNAPSHOT</code></p>
+</li>
+</ol>
+<p><strong>Pull-Requests</strong> -- If the contributor submits a repository and branch to pull
+from, the steps are even easier:</p>
+<ol>
+<li>
+<p>Add their repository as a remote to your repository</p>
+<p><code>git remote add some_name ${repository}</code></p>
+</li>
+<li>
+<p>Fetch the refs from the given repository</p>
+<p><code>git fetch ${repository}</code></p>
+</li>
+<li>
+<p>Merge in the given branch to your local branch</p>
+<p><code>git merge some_name/${branch}</code></p>
+</li>
+<li>
+<p>Delete the remote:</p>
+<p><code>git remote remove some_name</code></p>
+</li>
+</ol>
+<p>If the branch doesn't fast-forward merge, you likely want to inform the
+contributor to update their branch to avoid the conflict resolution and merge
+commit. See the <a href="http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging">Git
+manual</a>
+for more information on merging.</p>
+<h3 id="feature-branches">Feature Branches</h3>
+<p>Ease in creating and using feature branches is a desirable merit which Git
+provides with little work. Feature branches are a great way in which developers
+to work on multiple, long-running features concurrently, without worry of
+mixing code ready for public-review and code needing more internal work.
+Additionally, this creates an easily consumable series of commits in which
+other developers can track changes, and see how the feature itself evolved.</p>
+<p>To prevent developers' feature branches from colliding with one another, it was
+suggested to impose a "hierarchy" in which shared feature branches are prefixed
+with <code>&lt;apache_id&gt;/ACCUMULO-&lt;issue#&gt;[-description]</code>.</p>
+<ol>
+<li>
+<p>Create a branch off of <code>master</code>.</p>
+<p><code>git checkout &lt;apache_id&gt;/ACCUMULO-&lt;issue#&gt; master</code></p>
+</li>
+<li>
+<p>Create the feature, commiting early and often to appropriately outline the
+"story" behind the feature and it's implementation.</p>
+</li>
+<li>
+<p>As long as you have not collaborating with others, <code>git-rebase</code> your feature
+branch against upstream changes in <code>master</code></p>
+<p><code>git fetch &amp;&amp; git rebase origin/master</code></p>
+</li>
+<li>
+<p>If you are actively collaborating with others, you should be nice and not
+change their history. Use <code>git-merge</code> instead.</p>
+<p><code>git fetch &amp;&amp; git merge origin/master</code></p>
+</li>
+<li>
+<p>Continue steps 2 through 4 until the feature is complete.</p>
+</li>
+<li>
+<p>Depending on the nature, duration and history of the changes in your feature
+branch, you can choose to:</p>
+<ul>
+<li>
+<p><strong>'Simple' Merge</strong>: </p>
+<p><code>git checkout master &amp;&amp; git merge &lt;apache_id&gt;/ACCUMULO-&lt;issue#&gt;</code></p>
+</li>
+<li>
+<p><strong>Rebase and merge</strong> -- keeps all feature-branch commits
+  co-located: </p>
+<p><code>git fetch &amp;&amp; git rebase origin/master &amp;&amp; git checkout master &amp;&amp; git merge &lt;apache_id&gt;/ACCUMULO-&lt;issue#&gt;</code></p>
+</li>
+<li>
+<p><strong>Merge with squash</strong> -- feature branch history is a mess, just make one commit
+  with the lump-sum of your feature branch changes: </p>
+<p><code>git checkout master &amp;&amp; git merge --squash &lt;apache_id&gt;/ACCUMULO-&lt;issue#&gt;</code></p>
+</li>
+</ul>
+</li>
+</ol>
+<h3 id="changes-which-affect-multiple-versions-aka-merging">Changes which affect multiple versions (a.k.a. merging)</h3>
+<p>Merging can be a very confusing topic for users switching to Git, but it can be
+summarized fairly easily.</p>
+<ol>
+<li>
+<p><strong>Precondition</strong>: choose the right branch to start! (lowest, applicable version
+   for the change)</p>
+</li>
+<li>
+<p>Get your changes fixed for that earliest version.</p>
+</li>
+<li>
+<p>Switch to the next highest version which future minor versions will be
+   released (non-EOL major release series).</p>
+</li>
+<li>
+<p><code>git-merge</code> the branch from #1 into the current.</p>
+</li>
+<li>
+<p>In the face of conflicts, use options from <code>git-merge</code> to help you.</p>
+<ul>
+<li><code>git checkout new-version &amp;&amp; git merge --stat old-version</code></li>
+<li><code>git checkout new-version &amp;&amp; git merge --no-commit old-version</code></li>
+</ul>
+</li>
+<li>
+<p>Treat your current branch as the branch from #2, and repeat from #2.</p>
+</li>
+</ol>
+<p>When merging changes across major releases, there is always the possibility of
+changes which are applicable/necessary in one release, but not in any future
+releases, changes which are different in implementation due to API changes, or
+any number of other cases. Whatever the actual case is, the developer who made
+the first set of changes (you) is the one responsible for performing the merge
+through the rest of the active versions. Even when the merge may results in a
+zero-length change in content, this is incredibly important to record as you
+are the one who knows that this zero-length change in content is correct!</p>
+<h2 id="release-management">Release Management</h2>
+<p>Releases, although not a day to day task, have their own unique steps which are
+to be followed. Releases can be categorized in to minor and major releases.</p>
+<h3 id="a-minor-release">A minor release</h3>
+<p>A minor release is some set of changes <code>z'</code> on top of a version <code>x.y.z</code>.
+Typically, <code>z'</code> is simply <code>z + 1</code>, e.g. given a release named '1.6.0', and the
+next minor release is '1.6.1'. These changes for <code>z'</code> should not break any
+client code which works against <code>z</code> and should absolutely not change the public
+API.</p>
+<p>By convention, the branch containing the changes <code>z'</code> should be named
+<code>x.y.z'-SNAPSHOT</code>. The steps to take are as follows:</p>
+<ol>
+<li>Prepare the release candidate. <a href="http://accumulo.apache.org/governance/releasing.html">Release
+   Guide</a>, <a href="http://accumulo.apache.org/foobar">Maven
+   Instructions -- doesn't exist yet!</a></li>
+<li>Create a tag of the release candidate from the <code>x.y.z'-SNAPSHOT</code> branch,
+   named something like <code>x.y.z'-RC-N</code>.</li>
+<li>Test and Vote</li>
+<li>Create a tag with the correct final name: <code>x.y.z'</code></li>
+<li>Push a delete of the remote branch <code>x.y.z'-SNAPSHOT</code></li>
+</ol>
+<h3 id="a-major-release">A major release</h3>
+<p>A major release is a release in which multiple new features are introduced
+and/or the public API are modified. The major release <code>y'</code>, even when the
+client API is not modified, will typically contain many new features and
+functionality above the last release series <code>y</code>. A major release also resets
+the <code>z</code> value back to <code>0</code>.</p>
+<p>The steps to create a new major release are very similar to a minor release:</p>
+<ol>
+<li>Prepare the release candidate. <em>reference release instructions</em></li>
+<li>Create a tag of the release candidate from the <code>x.y.0'-SNAPSHOT</code> branch,
+   named something like <code>x.y.0-RC-N</code>.</li>
+<li>Test and Vote</li>
+<li>Create a tag with the correct final name: <code>x.y.0</code></li>
+<li>Push a delete of the remote branch <code>x.y.0-SNAPSHOT</code></li>
+</ol>
+<h1 id="the-infrastructure">The infrastructure</h1>
+<p>This section deals with the changes that must be requested through INFRA. As
+with any substantial INFRA request, the VOTE and result from the mailing should
+be referenced so INFRA knows that the request has been acknowledged. Likely, a
+PMC member should be the one to submit the request.</p>
+<h2 id="repositories">Repositories</h2>
+<p>I believe that we will need multiple repositories to best align ourselves with
+how we currently track "Accumulo" projects. The repositories follow:</p>
+<ol>
+<li>
+<p>The main source tree. This will track the standard trunk, branches, tags
+   structure from Subversion for Apache Accumulo.</p>
+</li>
+<li>
+<p>One repository for every project in
+   <a href="https://svn.apache.org/repos/asf/accumulo/contrib">contrib</a>: Accumulo-BSP,
+   Instamo Archetype, Accumulo Pig, and the Wikisearch project. Each of these
+   are considered disjoint from one another, and the main source tree, so they
+   each deserve their own repository.</p>
+</li>
+</ol>
+<p>Given the list of repositories that currently exist on the <a href="https://git-wip-us.apache.org/repos/asf">ASF
+site</a> and a brief search over INFRA
+tickets, multiple repositories for a single Apache project is not an issue.
+Having this list when making the initial ticket will likely reduce the amount
+of work necessary in opening multiple INFRA tickets.</p>
+<h2 id="mirroring">Mirroring</h2>
+<p>It should be noted in the INFRA requst that each repository will also need to
+be configured to properly mirror to the <a href="https://github.com/apache">ASF Github</a>
+account to provide the same functionality with current have via the git+svn
+mirror. This should be noted in the INFRA request. Same change needs to be
+applied for the <a href="http://git.apache.org">Apache hosted</a> mirror'ing.</p>
+<h2 id="mailing-lists">Mailing lists</h2>
+<p>It should be noted in the INFRA request that commit messages should be sent to
+<a href="mailto:commits@accumulo.apache.org">commits@accumulo.apache.org</a>. The subject
+can be decided on using the <a href="https://git-wip-us.apache.org/docs/switching-to-git.html#contents">provided
+variables</a>.</p>
+<h1 id="examples">Examples</h1>
+<p>For the sake of clarity, some examples of common situations are included below.</p>
+<h2 id="releasing-160">Releasing 1.6.0</h2>
+<ol>
+<li>
+<p>Branch from <code>master</code> to <code>1.6.0-SNAPSHOT</code></p>
+<p><code>git checkout master &amp;&amp; git branch 1.6.0-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Tag <code>1.6.0-RC1</code> from the just created <code>1.6.0-SNAPSHOT</code> branch</p>
+<p><code>git tag 1.6.0-RC1 1.6.0-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Test, vote, etc. and tag from 1.6.0-RC1</p>
+<p><code>git tag 1.6.0 1.6.0-RC1</code></p>
+</li>
+<li>
+<p>Delete the RC tag, if desired.</p>
+<p><code>git tag -d 1.6.0-RC1 &amp;&amp; git push --delete origin 1.6.0-RC1</code></p>
+</li>
+<li>
+<p>Delete the <code>1.6.0-SNAPSHOT</code> branch</p>
+<p><code>git branch -d 1.6.0-SNAPSHOT &amp;&amp; git push --delete origin 1.6.0-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Ensure <code>master</code> contains all features and fixes from <code>1.6.0</code></p>
+<p><code>git checkout master &amp;&amp; git merge 1.6.0</code></p>
+</li>
+<li>
+<p>Update the project version in <code>master</code> to 1.7.0-SNAPSHOT</p>
+</li>
+</ol>
+<h2 id="found-urgent-bug-in-160">Found urgent bug in 1.6.0</h2>
+<ol>
+<li>
+<p>Determine earliest, still-supported release which bug affects.</p>
+<ul>
+<li>Assume 1.4 is said version with 1.4.3 being the last released version</li>
+<li>For 1.5, use 1.5.1 and 1.6, use 1.6.0.</li>
+</ul>
+</li>
+<li>
+<p>Verify bug does affect 1.4.3</p>
+</li>
+<li>
+<p>Make a branch for each SNAPSHOT version, where one does not already exist</p>
+<p><code>git branch 1.4.4-SNAPSHOT 1.4.3 &amp;&amp; git branch 1.5.2-SNAPSHOT 1.5.1 &amp;&amp; git
+branch 1.6.1-SNAPSHOT 1.6.0</code></p>
+</li>
+<li>
+<p>Fix the bug in <code>1.4.4-SNAPSHOT</code></p>
+<p><code>git commit -av &amp;&amp; git push origin 1.4.4-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Merge from <code>1.4.4-SNAPSHOT</code> to <code>1.5.1-SNAPSHOT</code></p>
+<p><code>git checkout 1.5.1-SNAPSHOT &amp;&amp; git merge 1.4.4-SNAPSHOT</code></p>
+</li>
+<li>
+<p>Merge from <code>1.5.1-SNAPSHOT</code> to <code>1.6.1-SNAPSHOT</code></p>
+<p><code>git checkout 1.6.1-SNAPSHOT &amp;&amp; git merge 1.5.1-SNAPSHOT</code></p>
+</li>
+</ol>
+  </div>
+
+  <div id="footer">
+    <a alt="Apache Software Foundation" href="http://www.apache.org">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
+    </a>
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
+        <br />
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+      </p>
+    </div> 
+  </div>
+
+</body>
+</html>



Mime
View raw message