[accumulo-website] branch master updated: Update company information for dlmarion (#238)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 577d670  Update company information for dlmarion (#238)
577d670 is described below

commit 577d670b9fcb339f7ef0045dee9b409fa2267779
Author: Dave Marion 
AuthorDate: Mon Aug 10 14:31:42 2020 -0400

Update company information for dlmarion (#238)
---
 pages/people.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/people.md b/pages/people.md
index 7c3583e..44eb004 100644
--- a/pages/people.md
+++ b/pages/people.md
@@ -23,7 +23,7 @@ permalink: /people/
 | cjnolet   | Corey J. Nolet| [Tetra 
Concepts LLC][TETRA]| [ET][ET] |
 | ctubbsii  | [Christopher Tubbs](https://github.com/ctubbsii)  | 
[NSA][NSA] | [ET][ET] |
 | dhutchis  | Shana Hutchison   | 
[University of Washington][UW] | [PT][PT] |
-| dlmarion  | Dave Marion   | [Arctic 
Slope Regional Corp.][ASRC]| [ET][ET] |
+| dlmarion  | Dave Marion   | 
[Wrench.io, LLC][WRENCH]   | [ET][ET] |
 | drew  | Drew Farris   | [Booz 
Allen Hamilton][BOOZ]| [ET][ET] |
 | ecn   | Eric Newton   | [SW 
Complete Inc.][SWC]| [ET][ET] |
 | elserj| Josh Elser| 
[Hortonworks][HORTONWORKS] | [ET][ET] |
@@ -201,6 +201,7 @@ GitHub also has a [contributor list][github-contributors] 
based on commits.
 [TIBER]: http://www.tibertechnologies.com
 [UW]: https://www.washington.edu/
 [WAVE]: http://www.wavestrike.com/
+[WRENCH]: https://wrench.io/
 [BST]: http://www.timeanddate.com/time/zones/bst
 [IST]: http://www.timeanddate.com/time/zones/ist-ireland
 [CT]: http://www.timeanddate.com/time/zones/ct

Buildbot success in on jekyll_websites

2020-08-10 Thread buildbot 
The Buildbot has detected a passing build on builder jekyll_websites while 
building accumulo.
Full details are available at:
https://ci2.apache.org/#builders/7/builds/157

Buildbot URL: https://ci2.apache.org/

Worker for this Build: bb_slave10_ubuntu

Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii
Blamelist: asfinfra, commits@accumulo.apache.org

Build succeeded!

Sincerely,
 -The Buildbot

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2020-08-10 Thread git-site-role 
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 9d01dc5  Automatic Site Publish by Buildbot
9d01dc5 is described below

commit 9d01dc52f51321e9be0763134c8bbf70c8af9f2d
Author: buildbot 
AuthorDate: Mon Aug 10 18:32:13 2020 +

Automatic Site Publish by Buildbot
---
 output/feed.xml  | 4 ++--
 output/people/index.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/output/feed.xml b/output/feed.xml
index 023064f..4a8e20f 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml"; rel="self" 
type="application/rss+xml"/>
-Fri, 31 Jul 2020 18:43:08 +
-Fri, 31 Jul 2020 18:43:08 +
+Mon, 10 Aug 2020 18:32:07 +
+Mon, 10 Aug 2020 18:32:07 +
 Jekyll v4.1.1
 
 
diff --git a/output/people/index.html b/output/people/index.html
index 54bb85e..ff78975 100644
--- a/output/people/index.html
+++ b/output/people/index.html
@@ -237,7 +237,7 @@
 
   dlmarion
   Dave Marion
-  http://www.asrc.com";>Arctic Slope Regional Corp.
+  https://wrench.io/";>Wrench.io, LLC
   http://www.timeanddate.com/time/zones/et";>ET

[accumulo-website] branch main updated (7a69af1 -> 577d670)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


from 7a69af1  Added benkelly to Contributors (#235)
 add 577d670  Update company information for dlmarion (#238)

No new revisions were added by this update.

Summary of changes:
 pages/people.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[accumulo-bsp] branch master created (now 28339e6)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-bsp.git.


  at 28339e6  ACCUMULO-769 Fix bsp contrib build due to mapreduce changes 
in previous commit

No new revisions were added by this update.

[accumulo-website] branch asf-site updated (7cdee78 -> 9d01dc5)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


from 7cdee78  Automatic Site Publish by Buildbot
 add 9d01dc5  Automatic Site Publish by Buildbot

No new revisions were added by this update.

Summary of changes:
 output/feed.xml  | 4 ++--
 output/people/index.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[accumulo-website] branch main updated: Update links to point to main branches in git

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/main by this push:
 new 474a1e0  Update links to point to main branches in git
474a1e0 is described below

commit 474a1e08cb89a6a77a5169f575ec488e4b6f077e
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 16:38:47 2020 -0400

Update links to point to main branches in git
---
 .asf.yaml|  2 +-
 .../apache/accumulo/core/client/admin/TableOperations.html   |  2 +-
 _docs-2/development/high_speed_ingest.md |  2 +-
 _docs-2/development/mapreduce.md | 10 +-
 _docs-2/development/proxy.md |  6 +++---
 _docs-2/development/sampling.md  |  2 +-
 _docs-2/development/spark.md |  6 +++---
 _docs-2/getting-started/clients.md   |  6 +++---
 _docs-2/getting-started/quickstart.md|  3 +--
 _docs-2/getting-started/table_configuration.md   |  6 +++---
 _layouts/docs-2.html |  4 ++--
 _posts/blog/2016-11-16-simpler-scripts-and-config.md |  3 +--
 _posts/blog/2017-04-21-introducing-uno-and-muchos.md |  3 +--
 _posts/blog/2019-04-24-using-spark-with-accumulo.md  |  2 +-
 _posts/blog/2019-08-12-why-upgrade.md|  2 +-
 contributor/contrib-projects.md  |  2 +-
 contributor/verifying-release.md |  2 +-
 contributor/versioning.md|  2 +-
 pages/how-to-contribute.md   | 12 ++--
 pages/related-projects.md|  2 +-
 20 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index d85c77d..8604f21 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -19,6 +19,6 @@ github:
 projects: true
 
 jekyll:
-  whoami: master
+  whoami: main
   target: asf-staging
 
diff --git 
a/_docs-2/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html 
b/_docs-2/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
index 8bd3ae8..e530aa0 100644
--- a/_docs-2/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
+++ b/_docs-2/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
@@ -864,7 +864,7 @@ default void create​(https://docs.oracle.com/javase/8/d
  To avoid losing access to a table it can be cloned and the clone taken 
offline for export.
 
  
- See 
https://github.com/apache/accumulo-examples/blob/master/docs/export.md
+ See https://github.com/apache/accumulo-examples/blob/main/docs/export.md
 
 Parameters:
 tableName - Name of the table to export.
diff --git a/_docs-2/development/high_speed_ingest.md 
b/_docs-2/development/high_speed_ingest.md
index 3147454..3bf35de 100644
--- a/_docs-2/development/high_speed_ingest.md
+++ b/_docs-2/development/high_speed_ingest.md
@@ -110,7 +110,7 @@ MapReduce job. Typically, a MapReduce job will process data 
that lives in HDFS
 and write mutations to Accumulo using [AccumuloOutputFormat]. For more 
information
 on how use to use MapReduce with Accumulo, see the [MapReduce 
documentation][mapred-docs].
 
-[bulk-example]: 
https://github.com/apache/accumulo-examples/blob/master/docs/bulkIngest.md
+[bulk-example]: 
https://github.com/apache/accumulo-examples/blob/main/docs/bulkIngest.md
 [AccumuloOutputFormat]: {% jurl 
org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat %}
 [AccumuloFileOutputFormat]: {% jurl 
org.apache.accumulo.hadoop.mapreduce.AccumuloFileOutputFormat %}
 [mapred-docs]: {% durl development/mapreduce %}
diff --git a/_docs-2/development/mapreduce.md b/_docs-2/development/mapreduce.md
index c312183..b348b51 100644
--- a/_docs-2/development/mapreduce.md
+++ b/_docs-2/development/mapreduce.md
@@ -186,8 +186,8 @@ The [Accumulo Examples repo][examples-repo] has several 
MapReduce examples:
 [AccumuloOutputFormat]: {% jurl 
org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat %}
 [AccumuloFileOutputFormat]: {% jurl 
org.apache.accumulo.hadoop.mapreduce.AccumuloFileOutputFormat %}
 [examples-repo]: https://github.com/apache/accumulo-examples/
-[wordcount]: 
https://github.com/apache/accumulo-examples/blob/master/docs/wordcount.md
-[regex]: https://github.com/apache/accumulo-examples/blob/master/docs/regex.md
-[rowhash]: 
https://github.com/apache/accumulo-examples/blob/master/docs/rowhash.md
-[tablettofile]: 
https://github.com/apache/accumulo-examples/blob/master/docs/tablettofile.md
-[uniquecols]: 
https://github.com/apache/accumulo-examples/blob/master/docs/uniquecols.md
+[wordcount]: 
https://github.com/apache/accumulo-examples/blob/main/docs/wordcount.md
+[regex]: https://github.co

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2020-08-10 Thread git-site-role 
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new d9f7d57  Automatic Site Publish by Buildbot
d9f7d57 is described below

commit d9f7d57425dab847490cb25c39324f93c8b186d2
Author: buildbot 
AuthorDate: Mon Aug 10 20:39:59 2020 +

Automatic Site Publish by Buildbot
---
 output/blog/2016/11/16/simpler-scripts-and-config.html |  2 +-
 output/blog/2017/04/21/introducing-uno-and-muchos.html |  2 +-
 output/blog/2019/04/24/using-spark-with-accumulo.html  |  2 +-
 output/blog/2019/08/12/why-upgrade.html|  2 +-
 output/contributor/contrib-projects.html   |  2 +-
 output/contributor/verifying-release.html  |  2 +-
 output/contributor/versioning.html |  2 +-
 output/docs/2.x/administration/caching.html|  4 ++--
 output/docs/2.x/administration/erasure-coding.html |  4 ++--
 output/docs/2.x/administration/fate.html   |  4 ++--
 output/docs/2.x/administration/in-depth-install.html   |  4 ++--
 output/docs/2.x/administration/monitoring-metrics.html |  4 ++--
 output/docs/2.x/administration/multivolume.html|  4 ++--
 output/docs/2.x/administration/replication.html|  4 ++--
 output/docs/2.x/administration/scan-executors.html |  4 ++--
 output/docs/2.x/administration/upgrading.html  |  4 ++--
 .../apache/accumulo/core/client/admin/TableOperations.html |  2 +-
 output/docs/2.x/configuration/client-properties.html   |  4 ++--
 output/docs/2.x/configuration/files.html   |  4 ++--
 output/docs/2.x/configuration/overview.html|  4 ++--
 output/docs/2.x/configuration/server-properties.html   |  4 ++--
 output/docs/2.x/development/development_tools.html |  4 ++--
 output/docs/2.x/development/high_speed_ingest.html |  6 +++---
 output/docs/2.x/development/iterators.html |  4 ++--
 output/docs/2.x/development/mapreduce.html | 14 +++---
 output/docs/2.x/development/proxy.html | 10 +-
 output/docs/2.x/development/sampling.html  | 10 +-
 output/docs/2.x/development/spark.html | 12 ++--
 output/docs/2.x/development/summaries.html |  4 ++--
 output/docs/2.x/getting-started/clients.html   | 12 ++--
 output/docs/2.x/getting-started/design.html|  4 ++--
 output/docs/2.x/getting-started/features.html  |  4 ++--
 output/docs/2.x/getting-started/glossary.html  |  4 ++--
 output/docs/2.x/getting-started/quickstart.html|  6 +++---
 output/docs/2.x/getting-started/shell.html |  4 ++--
 output/docs/2.x/getting-started/table_configuration.html   | 10 +-
 output/docs/2.x/getting-started/table_design.html  |  4 ++--
 output/docs/2.x/security/authentication.html   |  4 ++--
 output/docs/2.x/security/authorizations.html   |  4 ++--
 output/docs/2.x/security/kerberos.html |  4 ++--
 output/docs/2.x/security/on-disk-encryption.html   |  4 ++--
 output/docs/2.x/security/overview.html |  4 ++--
 output/docs/2.x/security/permissions.html  |  4 ++--
 output/docs/2.x/security/wire-encryption.html  |  4 ++--
 output/docs/2.x/troubleshooting/advanced.html  |  4 ++--
 output/docs/2.x/troubleshooting/basic.html |  4 ++--
 output/docs/2.x/troubleshooting/performance.html   |  4 ++--
 .../docs/2.x/troubleshooting/system-metadata-tables.html   |  4 ++--
 output/docs/2.x/troubleshooting/tools.html |  4 ++--
 output/docs/2.x/troubleshooting/tracing.html   |  4 ++--
 output/feed.xml|  8 
 output/how-to-contribute/index.html| 12 ++--
 output/related-projects/index.html |  2 +-
 53 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/output/blog/2016/11/16/simpler-scripts-and-config.html 
b/output/blog/2016/11/16/simpler-scripts-and-config.html
index b710173..65a4373 100644
--- a/output/blog/2016/11/16/simpler-scripts-and-config.html
+++ b/output/blog/2016/11/16/simpler-scripts-and-config.html
@@ -148,7 +148,7 @@
 
 For the upcoming 2.0.0 release, Accumulo’s scripts and configuration https://issues.apache.org/jira/browse/ACCUMULO-4490";>were refactored
 to make Accumulo easier to use. While Accumulo’s documentation (i.e. the user
-manual and https://github.com/apache/accumulo/blob/master/INSTALL.md";>INSTALL.md)
 were updated with any changes that were made, this blog post provides
+manual and IN

Buildbot success in on jekyll_websites

2020-08-10 Thread buildbot 
The Buildbot has detected a passing build on builder jekyll_websites while 
building accumulo.
Full details are available at:
https://ci2.apache.org/#builders/7/builds/159

Buildbot URL: https://ci2.apache.org/

Worker for this Build: bb_slave10_ubuntu

Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii
Blamelist: asfinfra, commits@accumulo.apache.org

Build succeeded!

Sincerely,
 -The Buildbot

[accumulo-website] branch main updated: Update references to 'main' branch

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/main by this push:
 new 103b6fa  Update references to 'main' branch
103b6fa is described below

commit 103b6faee53a431e708c30c2f8b9ea325e92f8a9
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 17:08:46 2020 -0400

Update references to 'main' branch
---
 README.md  | 10 +-
 _config.yml|  2 +-
 _docs-2/administration/in-depth-install.md |  1 -
 _docs-2/development/mapreduce.md   |  4 ++--
 contributor/advanced-contributor.md|  2 +-
 contributor/building.md|  2 +-
 contributor/making-release.md  |  4 ++--
 contributor/release-management.md  | 10 +-
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 8a4c2d6..76d04da 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Building Accumulo  generates `server-properties.md` and 
`client-properties.md`.
 To regenerate these, do the following.
 
 ```bash
-ACCUMULO_SITE_CLONE=
+ACCUMULO_SITE_CLONE=
 ACCUMULO_CLONE=
 cd "$ACCUMULO_CLONE"
 mvn package -DskipTests
@@ -83,7 +83,7 @@ gem install bundler
 
 Next, use [Bundler] to install [Jekyll] and other dependencies needed to run
 the website (this command assumes your current working directory is your clone
-of this repository with the `master` branch checked out, because that's where
+of this repository with the `main` branch checked out, because that's where
 the Gemfile dependency list exists).
 
 ```bash
@@ -112,7 +112,7 @@ Jekyll will print a local URL where the site can be viewed 
(usually,
 
 ### Automatic Staging
 
-Changes pushed to our `master` branch will automatically trigger Jekyll to
+Changes pushed to our `main` branch will automatically trigger Jekyll to
 build our site from that branch and push the result to our `asf-staging`
 branch, where they will be served on [our default staging site][staging].
 
@@ -133,8 +133,8 @@ Next, publish the staging site to production by updating 
the `asf-site` branch
 to match the contents in the `asf-staging` branch:
 
 ```bash
-# Step 0: stay in master branch; you never need to switch
-git checkout master
+# Step 0: stay in main branch; you never need to switch
+git checkout main
 
 # Step 1: update your upstream remote
 git remote update upstream
diff --git a/_config.yml b/_config.yml
index f674a52..8c55bc2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -71,7 +71,7 @@ defaults:
   docs_baseurl: "/docs/2.x"
   javadoc_base: "https://static.javadoc.io/org.apache.accumulo";
   skiph1fortitle: "true"
-  gh_branch: "master"
+  gh_branch: "main"
 
 #whitelist: [jekyll-redirect-from]
 #plugins_dir: ./_plugins
diff --git a/_docs-2/administration/in-depth-install.md 
b/_docs-2/administration/in-depth-install.md
index 09a53d6..ce7280e 100644
--- a/_docs-2/administration/in-depth-install.md
+++ b/_docs-2/administration/in-depth-install.md
@@ -749,7 +749,6 @@ mailing lists at https://accumulo.apache.org for more info.
 [accumulo.properties]: {% durl configuration/files#accumuloproperties %}
 [accumulo-client.properties]: {% durl 
configuration/files#accumulo-clientproperties %}
 [gc]: {% durl configuration/files#gc %}
-[master]: {% durl configuration/files#gc %}
 [monitor-host]: {% durl configuration/files#monitor %}
 [masters]: {% durl configuration/files#masters %}
 [tservers]: {% durl configuration/files#tservers %}
diff --git a/_docs-2/development/mapreduce.md b/_docs-2/development/mapreduce.md
index b348b51..400e433 100644
--- a/_docs-2/development/mapreduce.md
+++ b/_docs-2/development/mapreduce.md
@@ -178,7 +178,7 @@ The [Accumulo Examples repo][examples-repo] has several 
MapReduce examples:
 * [wordcount] - Uses MapReduce and Accumulo to do a word count on text files
 * [regex] - Uses MapReduce and Accumulo to find data using regular expressions
 * [rowhash] - Uses MapReduce to read a table and write to a new column in the 
same table
-* [tablettofile] - Uses MapReduce to read a table and write one of its columns 
to a file in HDFS
+* [tabletofile] - Uses MapReduce to read a table and write one of its columns 
to a file in HDFS
 * [uniquecols] - Uses MapReduce to count unique columns in Accumulo
 
 [shaded jar]: https://maven.apache.org/plugins/maven-shade-plugin/index.html
@@ -189,5 +189,5 @@ The [Accumulo Examples repo][examples-repo] has several 
MapReduce examples:
 [wordcount]: 
https://github.com/apache/accumulo-examples/blob/main/docs/wordcount.md
 [regex]: https://github.com/apache/accumulo-examples/blob/main/docs/regex.md
 [rowhash]: 
https://github.com/apache/accumulo-examples/blob/main/docs/rowhash.md
-[tablettofile]: 
https://github.com/apache/accumulo-examples/blob/main/docs/tablettofile.md
+[tabletofile]: 
https://github.co

Buildbot success in on jekyll_websites

2020-08-10 Thread buildbot 
The Buildbot has detected a passing build on builder jekyll_websites while 
building accumulo.
Full details are available at:
https://ci2.apache.org/#builders/7/builds/160

Buildbot URL: https://ci2.apache.org/

Worker for this Build: bb_slave10_ubuntu

Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii
Blamelist: asfinfra, commits@accumulo.apache.org

Build succeeded!

Sincerely,
 -The Buildbot

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2020-08-10 Thread git-site-role 
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 8a675d7  Automatic Site Publish by Buildbot
8a675d7 is described below

commit 8a675d7ccc18127bb7ee0301b302aeeb6da9cca5
Author: buildbot 
AuthorDate: Mon Aug 10 21:09:33 2020 +

Automatic Site Publish by Buildbot
---
 output/README.md | 10 +-
 output/contributor/advanced-contributor.html |  2 +-
 output/contributor/building.html |  2 +-
 output/contributor/making-release.html   |  4 ++--
 output/contributor/release-management.html   | 10 +-
 output/docs/2.x/configuration/files.html | 10 +-
 output/docs/2.x/development/mapreduce.html   |  2 +-
 output/feed.xml  |  4 ++--
 output/search_data.json  |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/output/README.md b/output/README.md
index 8a4c2d6..76d04da 100644
--- a/output/README.md
+++ b/output/README.md
@@ -32,7 +32,7 @@ Building Accumulo  generates `server-properties.md` and 
`client-properties.md`.
 To regenerate these, do the following.
 
 ```bash
-ACCUMULO_SITE_CLONE=
+ACCUMULO_SITE_CLONE=
 ACCUMULO_CLONE=
 cd "$ACCUMULO_CLONE"
 mvn package -DskipTests
@@ -83,7 +83,7 @@ gem install bundler
 
 Next, use [Bundler] to install [Jekyll] and other dependencies needed to run
 the website (this command assumes your current working directory is your clone
-of this repository with the `master` branch checked out, because that's where
+of this repository with the `main` branch checked out, because that's where
 the Gemfile dependency list exists).
 
 ```bash
@@ -112,7 +112,7 @@ Jekyll will print a local URL where the site can be viewed 
(usually,
 
 ### Automatic Staging
 
-Changes pushed to our `master` branch will automatically trigger Jekyll to
+Changes pushed to our `main` branch will automatically trigger Jekyll to
 build our site from that branch and push the result to our `asf-staging`
 branch, where they will be served on [our default staging site][staging].
 
@@ -133,8 +133,8 @@ Next, publish the staging site to production by updating 
the `asf-site` branch
 to match the contents in the `asf-staging` branch:
 
 ```bash
-# Step 0: stay in master branch; you never need to switch
-git checkout master
+# Step 0: stay in main branch; you never need to switch
+git checkout main
 
 # Step 1: update your upstream remote
 git remote update upstream
diff --git a/output/contributor/advanced-contributor.html 
b/output/contributor/advanced-contributor.html
index b4d7eb4..debe663 100644
--- a/output/contributor/advanced-contributor.html
+++ b/output/contributor/advanced-contributor.html
@@ -174,7 +174,7 @@ contributors:
   
 Merge where appropriate:
 
-git checkout master 
&& git merge 1.9
+git checkout main 
&& git merge 1.9
   
 
 
diff --git a/output/contributor/building.html b/output/contributor/building.html
index e48ebdc..4e50759 100644
--- a/output/contributor/building.html
+++ b/output/contributor/building.html
@@ -190,7 +190,7 @@ $> git clean -df
 Note that this git clean command will delete any files unknown to git in a 
way that is irreversible. You should check that no important files will be 
included by first looking at the “untracked files” section in a git status command.
 
 $> git status
-# On branch master
+# On branch main
 nothing to commit (working directory clean)
 $> mvn package
 { maven output elided }
diff --git a/output/contributor/making-release.html 
b/output/contributor/making-release.html
index 4952534..831d270 100644
--- a/output/contributor/making-release.html
+++ b/output/contributor/making-release.html
@@ -334,13 +334,13 @@ releases.
   Unpack the source release tarball and change to its root directory, or 
checkout the SCM tag for the release
   Build the javadocs with mvn clean package javadoc:aggregate -DskipTests 
-Paggregate-javadocs
   Take note that the javadocs you will need to copy are the entire 
contents of ./target/site/apidocs/
-  In a different directory, checkout the master branch of the accumulo-website repo
+  In a different directory, checkout the main branch of the accumulo-website repo
   Remove any existing apidocs from the appropriate version folder (e.g. 
1.6/apidocs for a 1.6.x release)
   Copy the entire contents of the new apidocs directory (identified in 
step 3) to the destination in the website branch (e.g. to 1.6/apidocs)
   Continue updating the site content, as needed
   Commit the changes
   Update the site using jekyll with ./_devtools/git-hooks/post-commit (if you don’t have 
the commit hook already configured)
-  Don’t forget to push both the master and asf-site branches back to the accumulo-website 
repo
+  Don’t forget to push both the main and asf-site branches

[accumulo-website] branch asf-site updated (9d01dc5 -> 8a675d7)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


from 9d01dc5  Automatic Site Publish by Buildbot
 add d9f7d57  Automatic Site Publish by Buildbot
 add 8a675d7  Automatic Site Publish by Buildbot

No new revisions were added by this update.

Summary of changes:
 output/README.md   | 10 +-
 output/blog/2016/11/16/simpler-scripts-and-config.html |  2 +-
 output/blog/2017/04/21/introducing-uno-and-muchos.html |  2 +-
 output/blog/2019/04/24/using-spark-with-accumulo.html  |  2 +-
 output/blog/2019/08/12/why-upgrade.html|  2 +-
 output/contributor/advanced-contributor.html   |  2 +-
 output/contributor/building.html   |  2 +-
 output/contributor/contrib-projects.html   |  2 +-
 output/contributor/making-release.html |  4 ++--
 output/contributor/release-management.html | 10 +-
 output/contributor/verifying-release.html  |  2 +-
 output/contributor/versioning.html |  2 +-
 output/docs/2.x/administration/caching.html|  4 ++--
 output/docs/2.x/administration/erasure-coding.html |  4 ++--
 output/docs/2.x/administration/fate.html   |  4 ++--
 output/docs/2.x/administration/in-depth-install.html   |  4 ++--
 output/docs/2.x/administration/monitoring-metrics.html |  4 ++--
 output/docs/2.x/administration/multivolume.html|  4 ++--
 output/docs/2.x/administration/replication.html|  4 ++--
 output/docs/2.x/administration/scan-executors.html |  4 ++--
 output/docs/2.x/administration/upgrading.html  |  4 ++--
 .../apache/accumulo/core/client/admin/TableOperations.html |  2 +-
 output/docs/2.x/configuration/client-properties.html   |  4 ++--
 output/docs/2.x/configuration/files.html   | 14 +++---
 output/docs/2.x/configuration/overview.html|  4 ++--
 output/docs/2.x/configuration/server-properties.html   |  4 ++--
 output/docs/2.x/development/development_tools.html |  4 ++--
 output/docs/2.x/development/high_speed_ingest.html |  6 +++---
 output/docs/2.x/development/iterators.html |  4 ++--
 output/docs/2.x/development/mapreduce.html | 14 +++---
 output/docs/2.x/development/proxy.html | 10 +-
 output/docs/2.x/development/sampling.html  | 10 +-
 output/docs/2.x/development/spark.html | 12 ++--
 output/docs/2.x/development/summaries.html |  4 ++--
 output/docs/2.x/getting-started/clients.html   | 12 ++--
 output/docs/2.x/getting-started/design.html|  4 ++--
 output/docs/2.x/getting-started/features.html  |  4 ++--
 output/docs/2.x/getting-started/glossary.html  |  4 ++--
 output/docs/2.x/getting-started/quickstart.html|  6 +++---
 output/docs/2.x/getting-started/shell.html |  4 ++--
 output/docs/2.x/getting-started/table_configuration.html   | 10 +-
 output/docs/2.x/getting-started/table_design.html  |  4 ++--
 output/docs/2.x/security/authentication.html   |  4 ++--
 output/docs/2.x/security/authorizations.html   |  4 ++--
 output/docs/2.x/security/kerberos.html |  4 ++--
 output/docs/2.x/security/on-disk-encryption.html   |  4 ++--
 output/docs/2.x/security/overview.html |  4 ++--
 output/docs/2.x/security/permissions.html  |  4 ++--
 output/docs/2.x/security/wire-encryption.html  |  4 ++--
 output/docs/2.x/troubleshooting/advanced.html  |  4 ++--
 output/docs/2.x/troubleshooting/basic.html |  4 ++--
 output/docs/2.x/troubleshooting/performance.html   |  4 ++--
 .../docs/2.x/troubleshooting/system-metadata-tables.html   |  4 ++--
 output/docs/2.x/troubleshooting/tools.html |  4 ++--
 output/docs/2.x/troubleshooting/tracing.html   |  4 ++--
 output/feed.xml|  8 
 output/how-to-contribute/index.html| 12 ++--
 output/related-projects/index.html |  2 +-
 output/search_data.json|  2 +-
 59 files changed, 147 insertions(+), 147 deletions(-)

[accumulo] branch main updated: Update links to main branch in git

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new 9f29f37  Update links to main branch in git
9f29f37 is described below

commit 9f29f37d87809ac6a86f185348c517a104b7dec6
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 17:38:38 2020 -0400

Update links to main branch in git
---
 .../java/org/apache/accumulo/core/client/admin/TableOperations.java | 2 +-
 .../org/apache/accumulo/core/iterators/user/IntersectingIterator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 38f0ebf..866f4cc 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -204,7 +204,7 @@ public interface TableOperations {
* To avoid losing access to a table it can be cloned and the clone taken 
offline for export.
*
* 
-   * See https://github.com/apache/accumulo-examples/blob/master/docs/export.md
+   * See https://github.com/apache/accumulo-examples/blob/main/docs/export.md
*
* @param tableName
*  Name of the table to export.
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 989d1b9..a3afa4e 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -60,7 +60,7 @@ import org.apache.hadoop.io.Text;
  * {@link #init(SortedKeyValueIterator, Map, IteratorEnvironment)} method.
  *
  * An example of using the IntersectingIterator is available at
- * https://github.com/apache/accumulo-examples/blob/master/docs/shard.md
+ * https://github.com/apache/accumulo-examples/blob/main/docs/shard.md
  */
 public class IntersectingIterator implements SortedKeyValueIterator 
{

[accumulo-docker] branch main updated: Update reference to main branch in git

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-docker.git


The following commit(s) were added to refs/heads/main by this push:
 new dc955c2  Update reference to main branch in git
dc955c2 is described below

commit dc955c22806a79b8c0462df824c4bf850aeeeaf8
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 17:42:23 2020 -0400

Update reference to main branch in git
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 811ee38..a28a5a6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Apache Accumulo Docker Image
 
 This is the first release of this project. Eventually, this project will 
create an `apache/accumulo` image at DockerHub.
-Until then, you will need to build your own image. The master branch of this 
repo creates a Docker image for
+Until then, you will need to build your own image. The main branch of this 
repo creates a Docker image for
 Accumulo 2.0+. If you want to create a Docker image for Accumulo 1.9, there is 
a
 [1.9 branch](https://github.com/apache/accumulo-docker/tree/1.9) for that.

[accumulo-examples] branch main updated: Update references to main branch and update CI

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/main by this push:
 new b4e3dea  Update references to main branch and update CI
b4e3dea is described below

commit b4e3deacf8e000e6693c2800638b93bfd1b6b4b0
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 17:52:29 2020 -0400

Update references to main branch and update CI

* Update references to main branch
* Update CI configuration to use GitHub Actions instead of Travis CI
---
 .github/workflows/maven.yaml | 76 
 .travis.yml  | 25 ---
 README.md|  3 +-
 3 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
new file mode 100644
index 000..91530bf
--- /dev/null
+++ b/.github/workflows/maven.yaml
@@ -0,0 +1,76 @@
+#
+# 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.
+#
+
+# This workflow will build a Java project with Maven
+# For more information see: 
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: QA
+
+on:
+  push:
+branches: [ '*' ]
+  pull_request:
+branches: [ '*' ]
+
+jobs:
+  mvn:
+strategy:
+  matrix:
+profile:
+  - {name: 'verify', args: 'verify'}
+  fail-fast: false
+timeout-minutes: 60
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+- name: Set up JDK 11
+  uses: actions/setup-java@v1
+  with:
+java-version: 11
+- name: Cache local maven repository
+  uses: actions/cache@v2
+  with:
+path: |
+  ~/.m2/repository/
+  !~/.m2/repository/org/apache/accumulo
+key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+restore-keys: ${{ runner.os }}-m2
+- name: Build with Maven (${{ matrix.profile.name }})
+  run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }}
+  env:
+MAVEN_OPTS: -Djansi.force=true
+- name: Upload unit test results
+  uses: actions/upload-artifact@v2
+  with:
+name: surefire-reports-${{ matrix.profile.name }}
+path: ./**/target/surefire-reports/
+if-no-files-found: ignore
+- name: Upload integration test results
+  uses: actions/upload-artifact@v2
+  with:
+name: failsafe-reports-${{ matrix.profile.name }}
+path: ./**/target/failsafe-reports/
+if-no-files-found: ignore
+- name: Upload mini test logs
+  uses: actions/upload-artifact@v2
+  with:
+name: mini-tests-logs-${{ matrix.profile.name }}
+path: ./**/target/**/mini-tests/**/logs/
+if-no-files-found: ignore
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ea39f49..000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-#  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.
-language: java
-cache:
-  directories:
-- $HOME/.m2
-jdk:
-  - openjdk8
-install: echo NOOP Skipping pre-fetch of Maven dependencies
-env:
-  - BUILD_CMD="mvn clean verify -q"  # main build of unit tests
-script:
-  - $BUILD_CMD
diff --git a/README.md b/README.md
index 3eebca8..7690b1c 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,6 @@ This repository can be used to test Accumulo release 
candidates.  See

[accumulo-examples] branch main updated: Make sure to copy accumulo-examples.jar as well as accumulo-examples-shaded.jar (#54)

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/main by this push:
 new a026e96  Make sure to copy accumulo-examples.jar as well as 
accumulo-examples-shaded.jar (#54)
a026e96 is described below

commit a026e961fa2e216449c40e2ca5334846968a2961
Author: Jeffrey Zeiberg 
AuthorDate: Mon Aug 10 17:56:49 2020 -0400

Make sure to copy accumulo-examples.jar as well as 
accumulo-examples-shaded.jar (#54)
---
 docs/bulkIngest.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/bulkIngest.md b/docs/bulkIngest.md
index b13edad..d581b41 100644
--- a/docs/bulkIngest.md
+++ b/docs/bulkIngest.md
@@ -24,9 +24,9 @@ This tutorial uses the following Java classes.
  * [BulkIngestExample.java] - ingest the data using map reduce
  * [VerifyIngest.java] - checks that the data was ingested
  
-Remember to copy the accumulo-examples-\*.jar to Accumulo's 'lib/ext' 
directory.
+Remember to copy the accumulo-examples\*.jar to Accumulo's 'lib/ext' directory.
 
-$ cp target/accumulo-examples-*.jar /path/accumulo/lib/ext
+$ cp target/accumulo-examples*.jar /path/accumulo/lib/ext
 
 The following commands show how to run this example. This example creates a
 table called test_bulk which has two initial split points. Then 1000 rows of

[accumulo-examples] branch main updated: Update badge on README for CI build status

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/main by this push:
 new d829d5f  Update badge on README for CI build status
d829d5f is described below

commit d829d5f2c534e86eef5f3704f2939ed1676df4b3
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 18:05:45 2020 -0400

Update badge on README for CI build status
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7690b1c..5564bbf 100644
--- a/README.md
+++ b/README.md
@@ -127,5 +127,5 @@ This repository can be used to test Accumulo release 
candidates.  See
 [uniquecols]: docs/uniquecols.md
 [visibility]: docs/visibility.md
 [wordcount]: docs/wordcount.md
-[ti]: https://travis-ci.org/apache/accumulo-examples.svg?branch=main
-[tl]: https://travis-ci.org/apache/accumulo-examples
+[ti]: https://github.com/apache/accumulo-examples/workflows/QA/badge.svg
+[tl]: https://github.com/apache/accumulo-examples/actions

[accumulo-instamo-archetype] branch main updated: Update instamo archetype for 2.0.0

2020-08-10 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-instamo-archetype.git


The following commit(s) were added to refs/heads/main by this push:
 new 322e8ac  Update instamo archetype for 2.0.0
322e8ac is described below

commit 322e8ac0461db74260e60f1e703cbbed7948f3ad
Author: Christopher Tubbs 
AuthorDate: Mon Aug 10 22:51:43 2020 -0400

Update instamo archetype for 2.0.0

* Drop Travis in favor of GitHub Actions for CI
* Simplify example project built from the archetype
---
 .github/workflows/maven.yaml   |  76 +++
 .travis.yml|  37 
 README.md  |  16 +-
 pom.xml|  27 +--
 .../META-INF/maven/archetype-metadata.xml  |  12 +-
 src/main/resources/archetype-resources/README.md   |  42 +---
 src/main/resources/archetype-resources/pom.xml | 229 +
 .../src/main/java/MapReduceExample.java|  71 ---
 .../src/main/java/ReadData.java|  38 
 .../src/main/java/ShellExample.java|  84 
 .../src/main/java/WriteData.java   |  45 
 .../src/main/resources/log4j.properties|  29 ---
 .../src/test/java/ExampleAccumuloUnitTest.java | 129 
 .../src/test/java/WriteReadIT.java |  34 +++
 .../src/test/resources/log4j.properties|   7 +-
 15 files changed, 275 insertions(+), 601 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
new file mode 100644
index 000..91530bf
--- /dev/null
+++ b/.github/workflows/maven.yaml
@@ -0,0 +1,76 @@
+#
+# 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.
+#
+
+# This workflow will build a Java project with Maven
+# For more information see: 
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: QA
+
+on:
+  push:
+branches: [ '*' ]
+  pull_request:
+branches: [ '*' ]
+
+jobs:
+  mvn:
+strategy:
+  matrix:
+profile:
+  - {name: 'verify', args: 'verify'}
+  fail-fast: false
+timeout-minutes: 60
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+- name: Set up JDK 11
+  uses: actions/setup-java@v1
+  with:
+java-version: 11
+- name: Cache local maven repository
+  uses: actions/cache@v2
+  with:
+path: |
+  ~/.m2/repository/
+  !~/.m2/repository/org/apache/accumulo
+key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+restore-keys: ${{ runner.os }}-m2
+- name: Build with Maven (${{ matrix.profile.name }})
+  run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }}
+  env:
+MAVEN_OPTS: -Djansi.force=true
+- name: Upload unit test results
+  uses: actions/upload-artifact@v2
+  with:
+name: surefire-reports-${{ matrix.profile.name }}
+path: ./**/target/surefire-reports/
+if-no-files-found: ignore
+- name: Upload integration test results
+  uses: actions/upload-artifact@v2
+  with:
+name: failsafe-reports-${{ matrix.profile.name }}
+path: ./**/target/failsafe-reports/
+if-no-files-found: ignore
+- name: Upload mini test logs
+  uses: actions/upload-artifact@v2
+  with:
+name: mini-tests-logs-${{ matrix.profile.name }}
+path: ./**/target/**/mini-tests/**/logs/
+if-no-files-found: ignore
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c835afc..000
--- a/.travis.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-#  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:/