[3/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-03-14 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/422815aa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/422815aa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/422815aa

Branch: refs/heads/master
Commit: 422815aa2090ffaccc51ab5c3efee482548e318b
Parents: 37857c5 ecfd95c
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:45:56 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:45:56 2016 -0400

--
 .../java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/422815aa/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
index 527efe6,000..2fc87b0
mode 100644,00..100644
--- 
a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
+++ 
b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
@@@ -1,63 -1,0 +1,62 @@@
 +/*
 + * 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.
 + */
 +package org.apache.accumulo.shell.commands;
 +
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.shell.Shell.Command;
 +import org.apache.commons.cli.CommandLine;
 +import org.apache.commons.cli.Option;
 +import org.apache.commons.cli.Options;
 +import org.apache.hadoop.io.Text;
 +
 +public class DeleteRowsCommand extends Command {
 +  private Option forceOpt;
-   private Option startRowOptExclusive;
 +
 +  @Override
 +  public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {
 +final String tableName = OptUtil.getTableOpt(cl, shellState);
 +final Text startRow = OptUtil.getStartRow(cl);
 +final Text endRow = OptUtil.getEndRow(cl);
 +if (!cl.hasOption(forceOpt.getOpt()) && (startRow == null || endRow == 
null)) {
 +  shellState.getReader().println("Not deleting unbounded range. Specify 
both ends, or use --force");
 +  return 1;
 +}
 +shellState.getConnector().tableOperations().deleteRows(tableName, 
startRow, endRow);
 +return 0;
 +  }
 +
 +  @Override
 +  public String description() {
 +return "deletes a range of rows in a table.  Note that rows matching the 
start row ARE NOT deleted, but rows matching the end row ARE deleted.";
 +  }
 +
 +  @Override
 +  public int numArgs() {
 +return 0;
 +  }
 +
 +  @Override
 +  public Options getOptions() {
 +final Options o = new Options();
 +forceOpt = new Option("f", "force", false, "delete data even if start or 
end are not specified");
 +o.addOption(OptUtil.startRowOpt());
 +o.addOption(OptUtil.endRowOpt());
 +o.addOption(OptUtil.tableOpt("table to delete a row range from"));
 +o.addOption(forceOpt);
 +return o;
 +  }
 +}

[2/5] accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii 
ACCUMULO-4138 Remove unused option


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecfd95ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecfd95ce

Branch: refs/heads/master
Commit: ecfd95ce36161a7558a89cd284fc16d8e9110771
Parents: b8836be
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:15:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:15:28 2016 -0400

--
 .../apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecfd95ce/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
index 6ffa3f4..42ab36a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.io.Text;
 
 public class DeleteRowsCommand extends Command {
   private Option forceOpt;
-  private Option startRowOptExclusive;
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {

[1/5] accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/1.7 37857c532 -> 422815aa2
  refs/heads/master 0f2f80d97 -> 5cb5b9372


ACCUMULO-4138 Remove unused option


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecfd95ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecfd95ce

Branch: refs/heads/1.7
Commit: ecfd95ce36161a7558a89cd284fc16d8e9110771
Parents: b8836be
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:15:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:15:28 2016 -0400

--
 .../apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecfd95ce/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
index 6ffa3f4..42ab36a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.io.Text;
 
 public class DeleteRowsCommand extends Command {
   private Option forceOpt;
-  private Option startRowOptExclusive;
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {

[5/5] accumulo git commit: Merge branch '1.7'

2016-03-14 Thread ctubbsii 
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cb5b937
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cb5b937
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5cb5b937

Branch: refs/heads/master
Commit: 5cb5b9372103761c829403c03007b9f53241400f
Parents: 0f2f80d 422815a
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:46:03 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:46:03 2016 -0400

--
 .../java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java  | 1 -
 1 file changed, 1 deletion(-)
--

[4/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-03-14 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/422815aa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/422815aa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/422815aa

Branch: refs/heads/1.7
Commit: 422815aa2090ffaccc51ab5c3efee482548e318b
Parents: 37857c5 ecfd95c
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:45:56 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:45:56 2016 -0400

--
 .../java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/422815aa/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
index 527efe6,000..2fc87b0
mode 100644,00..100644
--- 
a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
+++ 
b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java
@@@ -1,63 -1,0 +1,62 @@@
 +/*
 + * 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.
 + */
 +package org.apache.accumulo.shell.commands;
 +
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.shell.Shell.Command;
 +import org.apache.commons.cli.CommandLine;
 +import org.apache.commons.cli.Option;
 +import org.apache.commons.cli.Options;
 +import org.apache.hadoop.io.Text;
 +
 +public class DeleteRowsCommand extends Command {
 +  private Option forceOpt;
-   private Option startRowOptExclusive;
 +
 +  @Override
 +  public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {
 +final String tableName = OptUtil.getTableOpt(cl, shellState);
 +final Text startRow = OptUtil.getStartRow(cl);
 +final Text endRow = OptUtil.getEndRow(cl);
 +if (!cl.hasOption(forceOpt.getOpt()) && (startRow == null || endRow == 
null)) {
 +  shellState.getReader().println("Not deleting unbounded range. Specify 
both ends, or use --force");
 +  return 1;
 +}
 +shellState.getConnector().tableOperations().deleteRows(tableName, 
startRow, endRow);
 +return 0;
 +  }
 +
 +  @Override
 +  public String description() {
 +return "deletes a range of rows in a table.  Note that rows matching the 
start row ARE NOT deleted, but rows matching the end row ARE deleted.";
 +  }
 +
 +  @Override
 +  public int numArgs() {
 +return 0;
 +  }
 +
 +  @Override
 +  public Options getOptions() {
 +final Options o = new Options();
 +forceOpt = new Option("f", "force", false, "delete data even if start or 
end are not specified");
 +o.addOption(OptUtil.startRowOpt());
 +o.addOption(OptUtil.endRowOpt());
 +o.addOption(OptUtil.tableOpt("table to delete a row range from"));
 +o.addOption(forceOpt);
 +return o;
 +  }
 +}

accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 b8836be25 -> ecfd95ce3


ACCUMULO-4138 Remove unused option


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecfd95ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecfd95ce

Branch: refs/heads/1.6
Commit: ecfd95ce36161a7558a89cd284fc16d8e9110771
Parents: b8836be
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:15:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:15:28 2016 -0400

--
 .../apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecfd95ce/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
index 6ffa3f4..42ab36a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.io.Text;
 
 public class DeleteRowsCommand extends Command {
   private Option forceOpt;
-  private Option startRowOptExclusive;
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {

accumulo git commit: Jekyll build from gh-pages:3de6faf

2016-03-14 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/asf-site 4f9846846 -> 30999fdbe


Jekyll build from gh-pages:3de6faf

Remove conflicting index file from 'jekyll new' and use jekyll --safe
Update site instructions


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30999fdb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/30999fdb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/30999fdb

Branch: refs/heads/asf-site
Commit: 30999fdbe3b391ce9797cc1d5cae76dc9d23faa2
Parents: 4f98468
Author: Christopher Tubbs 
Authored: Mon Mar 14 18:53:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 19:47:47 2016 -0400

--
 css/main.css   | 637 +++-
 feed.xml   |   4 +-
 releasing.html |  12 +-
 source.html|  41 +++-
 4 files changed, 225 insertions(+), 469 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/30999fdb/css/main.css
--
diff --git a/css/main.css b/css/main.css
index 1fb1692..abcaccb 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,457 +1,180 @@
-/**
- * Reset some basic elements
- */
-body, h1, h2, h3, h4, h5, h6,
-p, blockquote, pre, hr,
-dl, dd, ol, ul, figure {
-  margin: 0;
-  padding: 0; }
-
-/**
- * Basic styling
- */
-body {
-  font: 400 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: #111;
-  background-color: #fdfdfd;
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-feature-settings: "kern" 1;
-  -moz-font-feature-settings: "kern" 1;
-  -o-font-feature-settings: "kern" 1;
-  font-feature-settings: "kern" 1;
-  font-kerning: normal; }
-
-/**
- * Set `margin-bottom` to maintain vertical rhythm
- */
-h1, h2, h3, h4, h5, h6,
-p, blockquote, pre,
-ul, ol, dl, figure,
-.highlight {
-  margin-bottom: 15px; }
-
-/**
- * Images
- */
-img {
-  max-width: 100%;
-  vertical-align: middle; }
-
-/**
- * Figures
- */
-figure > img {
-  display: block; }
-
-figcaption {
-  font-size: 14px; }
-
-/**
- * Lists
- */
-ul, ol {
-  margin-left: 30px; }
-
-li > ul,
-li > ol {
-  margin-bottom: 0; }
-
-/**
- * Headings
- */
-h1, h2, h3, h4, h5, h6 {
-  font-weight: 400; }
-
-/**
- * Links
- */
-a {
-  color: #2a7ae2;
-  text-decoration: none; }
-  a:visited {
-color: #1756a9; }
-  a:hover {
-color: #111;
-text-decoration: underline; }
-
-/**
- * Blockquotes
- */
-blockquote {
-  color: #828282;
-  border-left: 4px solid #e8e8e8;
-  padding-left: 15px;
-  font-size: 18px;
-  letter-spacing: -1px;
-  font-style: italic; }
-  blockquote > :last-child {
-margin-bottom: 0; }
-
-/**
- * Code formatting
- */
-pre,
-code {
-  font-size: 15px;
-  border: 1px solid #e8e8e8;
-  border-radius: 3px;
-  background-color: #eef; }
-
-code {
-  padding: 1px 5px; }
-
-pre {
-  padding: 8px 12px;
-  overflow-x: auto; }
-  pre > code {
-border: 0;
-padding-right: 0;
-padding-left: 0; }
-
-/**
- * Wrapper
- */
-.wrapper {
-  max-width: -webkit-calc(800px - (30px * 2));
-  max-width: calc(800px - (30px * 2));
-  margin-right: auto;
-  margin-left: auto;
-  padding-right: 30px;
-  padding-left: 30px; }
-  @media screen and (max-width: 800px) {
-.wrapper {
-  max-width: -webkit-calc(800px - (30px));
-  max-width: calc(800px - (30px));
-  padding-right: 15px;
-  padding-left: 15px; } }
-
-/**
- * Clearfix
- */
-.wrapper:after, .footer-col-wrapper:after {
-  content: "";
-  display: table;
-  clear: both; }
-
-/**
- * Icons
- */
-.icon > svg {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  vertical-align: middle; }
-  .icon > svg path {
-fill: #828282; }
-
-/**
- * Site header
- */
-.site-header {
-  border-top: 5px solid #424242;
-  border-bottom: 1px solid #e8e8e8;
-  min-height: 56px;
-  position: relative; }
-
-.site-title {
-  font-size: 26px;
-  font-weight: 300;
-  line-height: 56px;
-  letter-spacing: -1px;
-  margin-bottom: 0;
-  float: left; }
-  .site-title, .site-title:visited {
-color: #424242; }
-
-.site-nav {
-  float: right;
-  line-height: 56px; }
-  .site-nav .menu-icon {
-display: none; }
-  .site-nav .page-link {
-color: #111;
-line-height: 1.5; }
-.site-nav .page-link:not(:last-child) {
-  margin-right: 20px; }
-  @media screen and (max-width: 600px) {
-.site-nav {
-  position: absolute;
-  top: 9px;
-  right: 15px;
-  background-color: #fdfdfd;
-  border: 1px solid #e8e8e8;
-  border-radius: 5px;
-  text-align: right; }
-  .site-nav .menu-icon {
-display: block;
-float: right;
-width: 36px;
-height: 26px;
-line-height: 0;
-padding-top: 10px;
-text-align: center; }
-.site-nav .menu-icon > svg

[2/2] accumulo git commit: Update site instructions

2016-03-14 Thread ctubbsii 
Update site instructions


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3de6faf8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3de6faf8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3de6faf8

Branch: refs/heads/gh-pages
Commit: 3de6faf86bcf4cd6f416765801c789b607b7ed05
Parents: 0908bb7
Author: Christopher Tubbs 
Authored: Mon Mar 14 19:44:50 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 19:44:50 2016 -0400

--
 releasing.md | 15 +--
 source.md| 77 ++-
 2 files changed, 60 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3de6faf8/releasing.md
--
diff --git a/releasing.md b/releasing.md
index e706885..132e043 100644
--- a/releasing.md
+++ b/releasing.md
@@ -117,13 +117,13 @@ to avoid known [vulnerabilities][7]), follow these steps:
 1. Unpack the source release tarball and change to its root directory, or 
checkout the SCM tag for the release
 2. Build the javadocs with `mvn clean package javadoc:aggregate -DskipTests 
-Paggregate-javadocs`
 3. Take note that the javadocs you will need to copy are the entire contents 
of `./target/site/apidocs/`
-4. Checkout the [Accumulo CMS repository][9]
-5. Remove any existing apidocs from the appropriate version folder in the CMS 
repository (e.g. content/1.6/apidocs for a 1.6.x release)
-6. Copy the entire contents of the new apidocs directory (identified in step 
3) to the CMS repository (e.g. to content/1.6/apidocs)
-7. Commit the changes
-8. Wait for the staging build to complete
-9. Verify the javadocs have been published to the staging site (e.g. 
https://accumulo.staging.apache.org/1.6/apidocs)
-10. Continue updating the staging site, as needed, and publish when done
+4. Checkout the `gh-pages` branch (you may need to move the contents of 
`./target/site/apidocs` outside your git workspace to switch branches)
+5. Remove any existing apidocs from the appropriate version folder (e.g. 
1.6/apidocs for a 1.6.x release)
+6. Copy the entire contents of the new apidocs directory (identified in step 
3) to the destination (e.g. to 1.6/apidocs)
+7. Continue updating the site content, as needed
+8. Commit the changes
+9. Update the site using jekyll with `./_devtools/git-hooks/post-commit` (if 
you don't have the commit hook already configured)
+10. Don't forget to push both the `gh-pages` and `asf-site` branches
 11. Verify that javadocs have been updated on the production site (e.g. 
https://accumulo.apache.org/1.6/apidocs)
 
 ## References
@@ -144,5 +144,4 @@ Some good references that explain a few things:
 [6]: http://accumulo.apache.org/governance/releasing.html
 [7]: http://www.kb.cert.org/vuls/id/225657
 [8]: http://www.apache.org/dev/cmsref#extpaths
-[9]: https://svn.apache.org/repos/asf/accumulo/site/trunk
 [addrelease]: https://reporter.apache.org/addrelease.html?accumulo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3de6faf8/source.md
--
diff --git a/source.md b/source.md
index 61823f8..fe1a3fd 100644
--- a/source.md
+++ b/source.md
@@ -28,9 +28,34 @@ Accumulo has a number of [contrib projects][contrib] that 
maintain their own cod
 
 ### Website
 
-Accumulo's web site is maintained with [Apache Subversion][subversion] 
[here][sitesvn] using Apache's [Content Management System][cms].
-Committers may edit the site by following [these instructions][cmsusage].  
Non-committers should follow
-[this FAQ entry][cmsanon].
+Accumulo's web site is developed using [Jekyll][jekyll]. Development is
+performed by editing the contents of the [gh-pages][gh-pages] branch, either
+directly by a committer, with a pull request to [GitHub][github], or a patch
+submitted to [JIRA][jiraloc]. The rendered site can be previewed locally or on
+[GitHub][site-mirror], and the rendered site (in the `_site` directory) will be
+merged into the `asf-site` branch to update our [official/canonical
+site][site-canon] after being built with the `_config-asf.yml` configuration.
+
+To get help with jekyll:
+
+jekyll help
+
+To test the site locally (usually on http://localhost:4000):
+
+jekyll serve --config _config-asf.yml --safe
+
+To build for updating the `asf-site` branch:
+
+jekyll build --config _config-asf.yml --safe
+
+For preview convenience and consistent builds and testing, build using a
+version which looks the same locally and on GitHub.
+
+A [post-commit hook][hook] is available for you to automatically create a
+commit in the `asf-site` branch locally each time you commit to the `gh-pages`
+branch. You can also run this command

[1/2] accumulo git commit: Remove conflicting index file from 'jekyll new' and use jekyll --safe

2016-03-14 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/gh-pages 01abb4be6 -> 3de6faf86


Remove conflicting index file from 'jekyll new' and use jekyll --safe


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0908bb74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0908bb74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0908bb74

Branch: refs/heads/gh-pages
Commit: 0908bb7415894b22f71abe54431edd03478d53e5
Parents: 01abb4b
Author: Christopher Tubbs 
Authored: Mon Mar 14 18:53:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 18:53:18 2016 -0400

--
 _devtools/git-hooks/post-commit |  2 +-
 index.html  | 23 ---
 2 files changed, 1 insertion(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0908bb74/_devtools/git-hooks/post-commit
--
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index 627b02e..6c400c2 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -48,7 +48,7 @@ build_jekyll_site() {
   trap "rm -rf '""$workdir""'" 0 1 2 3 15
 
   # actually generate the site
-  jekyll build --config "$config" --destination "$workdir/_site" || die 
"fatal: jekyll build failure"
+  jekyll build --config "$config" --destination "$workdir/_site" --safe || die 
"fatal: jekyll build failure"
 
   # prepare and commit to the target branch
   export GIT_INDEX_FILE="$workdir/index"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0908bb74/index.html
--
diff --git a/index.html b/index.html
deleted file mode 100644
index 83d9398..000
--- a/index.html
+++ /dev/null
@@ -1,23 +0,0 @@

-layout: default

-
-
-
-  Posts
-
-  
-{% for post in site.posts %}
-  
-{{ post.date | date: "%b %-d, %Y" }}
-
-
-  {{ post.title }}
-
-  
-{% endfor %}
-  
-
-  subscribe via RSS
-
-

[2/2] accumulo git commit: Merge branch '1.7'

2016-03-14 Thread kturner 
Merge branch '1.7'

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java

server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f2f80d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f2f80d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f2f80d9

Branch: refs/heads/master
Commit: 0f2f80d973585dbf5b1a2dc0544420bdbdc03335
Parents: db21315 37857c5
Author: Keith Turner 
Authored: Mon Mar 14 18:46:37 2016 -0400
Committer: Keith Turner 
Committed: Mon Mar 14 18:46:37 2016 -0400

--
 .../apache/accumulo/tserver/TabletServer.java   | 17 --
 .../apache/accumulo/tserver/log/DfsLogger.java  | 24 
 .../tserver/log/TabletServerLogger.java | 18 +++
 3 files changed, 43 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f2f80d9/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index b854a53,71ad6bc..d19dfa9
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2940,10 -2966,21 +2940,22 @@@ public class TabletServer extends Accum
  }
}
  
+   private Durability getMincEventDurability(KeyExtent extent) {
+ TableConfiguration conf;
+ if (extent.isMeta()) {
+   conf = confFactory.getTableConfiguration(RootTable.ID);
+ } else {
+   conf = confFactory.getTableConfiguration(MetadataTable.ID);
+ }
+ Durability durability = 
DurabilityImpl.fromString(conf.get(Property.TABLE_DURABILITY));
+ return durability;
+   }
+ 
public void minorCompactionFinished(CommitSession tablet, String 
newDatafile, int walogSeq) throws IOException {
+ Durability durability = getMincEventDurability(tablet.getExtent());
  totalMinorCompactions.incrementAndGet();
- logger.minorCompactionFinished(tablet, newDatafile, walogSeq);
+ logger.minorCompactionFinished(tablet, newDatafile, walogSeq, durability);
 +markUnusedWALs();
}
  
public void minorCompactionStarted(CommitSession tablet, int 
lastUpdateSequence, String newMapfileLocation) throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f2f80d9/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f2f80d9/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 04f4e50,11585f2..b76b9cd
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -398,13 -316,17 +398,11 @@@ public class TabletServerLogger 
seq = seqGen.incrementAndGet();
if (seq < 0)
  throw new RuntimeException("Logger sequence generator wrapped!  
Onos!!!11!eleven");
 -  ArrayList queuedOperations = new 
ArrayList(copy.size());
 -  for (DfsLogger wal : copy) {
 -queuedOperations.add(writer.write(wal, seq));
 -  }
 -
 -  for (LoggerOperation lop : queuedOperations) {
 -lop.await();
 -  }
 +  LoggerOperation lop = writer.write(copy, seq);
-   if (lop != null) {
- lop.await();
-   }
++  lop.await();
  
// double-check: did the log set change?
 -  success = (currentLogSet == logSetId.get());
 +  success = (currentLogId == logId.get());
  }
} catch (DfsLogger.LogClosedException ex) {
  log.debug("Logs closed while writing, retrying " + attempt);
@@@ -526,7 -449,8 +525,7 @@@
  int seq = write(commitSession, true, new Writer() {
@Override
public LoggerOperation write(DfsLogger logger, int ignored) throws 
Exception {
- return logger.minorCompactionFinished(walogSeq, 
commitSession.getLogId(), fullyQualifiedFileName);
 -logger.minorCompactionFinished(walogSeq, commitSession.getLogId(), 
fullyQualifiedFileName, durability).await();
 -return DfsLogger.NO_WAIT_LOGGER_OP;
++

[1/2] accumulo git commit: ACCUMULO-4112 use metadata table durability config when writing minc events to walog

2016-03-14 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/master db2131598 -> 0f2f80d97


ACCUMULO-4112 use metadata table durability config when writing minc events to 
walog


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/37857c53
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/37857c53
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/37857c53

Branch: refs/heads/master
Commit: 37857c5325ff189413a86a073a7a70f8a23d3104
Parents: e52d547
Author: Keith Turner 
Authored: Mon Mar 14 15:30:28 2016 -0400
Committer: Keith Turner 
Committed: Mon Mar 14 15:30:28 2016 -0400

--
 .../apache/accumulo/tserver/TabletServer.java   | 17 --
 .../apache/accumulo/tserver/log/DfsLogger.java  | 24 
 .../tserver/log/TabletServerLogger.java | 22 +-
 3 files changed, 45 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/37857c53/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 038d3e8..71ad6bc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2966,13 +2966,26 @@ public class TabletServer extends AccumuloServerContext 
implements Runnable {
 }
   }
 
+  private Durability getMincEventDurability(KeyExtent extent) {
+TableConfiguration conf;
+if (extent.isMeta()) {
+  conf = confFactory.getTableConfiguration(RootTable.ID);
+} else {
+  conf = confFactory.getTableConfiguration(MetadataTable.ID);
+}
+Durability durability = 
DurabilityImpl.fromString(conf.get(Property.TABLE_DURABILITY));
+return durability;
+  }
+
   public void minorCompactionFinished(CommitSession tablet, String 
newDatafile, int walogSeq) throws IOException {
+Durability durability = getMincEventDurability(tablet.getExtent());
 totalMinorCompactions.incrementAndGet();
-logger.minorCompactionFinished(tablet, newDatafile, walogSeq);
+logger.minorCompactionFinished(tablet, newDatafile, walogSeq, durability);
   }
 
   public void minorCompactionStarted(CommitSession tablet, int 
lastUpdateSequence, String newMapfileLocation) throws IOException {
-logger.minorCompactionStarted(tablet, lastUpdateSequence, 
newMapfileLocation);
+Durability durability = getMincEventDurability(tablet.getExtent());
+logger.minorCompactionStarted(tablet, lastUpdateSequence, 
newMapfileLocation, durability);
   }
 
   public void recover(VolumeManager fs, KeyExtent extent, TableConfiguration 
tconf, List logEntries, Set tabletFiles,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/37857c53/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 8512690..a36463d 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -237,6 +237,20 @@ public class DfsLogger {
 }
   }
 
+  private static class NoWaitLoggerOperation extends LoggerOperation {
+
+public NoWaitLoggerOperation() {
+  super(null);
+}
+
+@Override
+public void await() throws IOException {
+  return;
+}
+  }
+
+  static final LoggerOperation NO_WAIT_LOGGER_OP = new NoWaitLoggerOperation();
+
   @Override
   public boolean equals(Object obj) {
 // filename is unique
@@ -545,7 +559,7 @@ public class DfsLogger {
 }
 
 if (durability == Durability.LOG)
-  return null;
+  return NO_WAIT_LOGGER_OP;
 
 synchronized (closeLock) {
   // use a different lock for close check so that adding to work queue 
does not need
@@ -587,21 +601,21 @@ public class DfsLogger {
 return result;
   }
 
-  public LoggerOperation minorCompactionFinished(int seq, int tid, String 
fqfn) throws IOException {
+  public LoggerOperation minorCompactionFinished(int seq, int tid, String 
fqfn, Durability durability) throws IOException {
 LogFileKey key = new LogFileKey();
 key.event = COMPACTION_FINISH;
 key.seq = seq;
 key.tid = tid;
-return logFileData(Collections.singletonList(new 
Pair(key, EMPTY)), Durability.SYNC);
+return logFileData(Collections.singletonList(new

accumulo git commit: Use asf-site for published branch name

2016-03-14 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/gh-pages 3afd48d9b -> 01abb4be6


Use asf-site for published branch name


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01abb4be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01abb4be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/01abb4be

Branch: refs/heads/gh-pages
Commit: 01abb4be61ef00d7211fe80b9afe8a8ab22bfaa2
Parents: 3afd48d
Author: Christopher Tubbs 
Authored: Mon Mar 14 13:34:46 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 13:34:46 2016 -0400

--
 _devtools/git-hooks/post-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/01abb4be/_devtools/git-hooks/post-commit
--
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index 5546aed..627b02e 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -60,4 +60,4 @@ build_jekyll_site() {
   return 0
 }
 
-build_jekyll_site 'gh-pages' 'accumulo.apache.org' '_config-asf.yml'
+build_jekyll_site 'gh-pages' 'asf-site' '_config-asf.yml'