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 <us...@infra.apache.org>
AuthorDate: Mon Aug 10 21:09:33 2020 +0000
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 website clone location, with master branch
checked out>
+ACCUMULO_SITE_CLONE=<accumulo website clone location, with main branch checked
out>
ACCUMULO_CLONE=<accumulo clone location>
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:</p>
<li>
<p>Merge where appropriate:</p>
- <p><code class="language-plaintext highlighter-rouge">git checkout master
&& git merge 1.9</code></p>
+ <p><code class="language-plaintext highlighter-rouge">git checkout main
&& git merge 1.9</code></p>
</li>
</ol>
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
<p>Note that this git clean command will delete any files unknown to git in a
way that is irreversible. You should check that no important files will be
included by first looking at the “untracked files” section in a <code
class="language-plaintext highlighter-rouge">git status</code> command.</p>
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code>$> 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.</p>
<li>Unpack the source release tarball and change to its root directory, or
checkout the SCM tag for the release</li>
<li>Build the javadocs with <code class="language-plaintext
highlighter-rouge">mvn clean package javadoc:aggregate -DskipTests
-Paggregate-javadocs</code></li>
<li>Take note that the javadocs you will need to copy are the entire
contents of <code class="language-plaintext
highlighter-rouge">./target/site/apidocs/</code></li>
- <li>In a different directory, checkout the <code class="language-plaintext
highlighter-rouge">master</code> branch of the accumulo-website repo</li>
+ <li>In a different directory, checkout the <code class="language-plaintext
highlighter-rouge">main</code> branch of the accumulo-website repo</li>
<li>Remove any existing apidocs from the appropriate version folder (e.g.
1.6/apidocs for a 1.6.x release)</li>
<li>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)</li>
<li>Continue updating the site content, as needed</li>
<li>Commit the changes</li>
<li>Update the site using jekyll with <code class="language-plaintext
highlighter-rouge">./_devtools/git-hooks/post-commit</code> (if you don’t have
the commit hook already configured)</li>
- <li>Don’t forget to push both the <code class="language-plaintext
highlighter-rouge">master</code> and <code class="language-plaintext
highlighter-rouge">asf-site</code> branches back to the accumulo-website
repo</li>
+ <li>Don’t forget to push both the <code class="language-plaintext
highlighter-rouge">main</code> and <code class="language-plaintext
highlighter-rouge">asf-site</code> branches back to the accumulo-website
repo</li>
<li>Verify that javadocs have been updated on the production site (e.g.
https://accumulo.apache.org/1.6/apidocs/)</li>
</ol>
diff --git a/output/contributor/release-management.html
b/output/contributor/release-management.html
index 283a4e4..a74bd8c 100644
--- a/output/contributor/release-management.html
+++ b/output/contributor/release-management.html
@@ -239,9 +239,9 @@ variables</a>.</p>
<ol>
<li>
- <p>Branch from <code class="language-plaintext
highlighter-rouge">master</code> to <code class="language-plaintext
highlighter-rouge">1.6</code></p>
+ <p>Branch from <code class="language-plaintext
highlighter-rouge">main</code> to <code class="language-plaintext
highlighter-rouge">1.6</code></p>
- <p><code class="language-plaintext highlighter-rouge">git checkout master
&& git branch 1.6</code></p>
+ <p><code class="language-plaintext highlighter-rouge">git checkout main
&& git branch 1.6</code></p>
</li>
<li>
<p>Tag <code class="language-plaintext highlighter-rouge">1.6.0-RC1</code>
from the just created <code class="language-plaintext
highlighter-rouge">1.6</code> branch</p>
@@ -259,12 +259,12 @@ variables</a>.</p>
<p><code class="language-plaintext highlighter-rouge">git tag -d 1.6.0-RC1
&& git push --delete origin 1.6.0-RC1</code></p>
</li>
<li>
- <p>Ensure <code class="language-plaintext highlighter-rouge">master</code>
contains all features and fixes from <code class="language-plaintext
highlighter-rouge">1.6.0</code></p>
+ <p>Ensure <code class="language-plaintext highlighter-rouge">main</code>
contains all features and fixes from <code class="language-plaintext
highlighter-rouge">1.6.0</code></p>
- <p><code class="language-plaintext highlighter-rouge">git checkout master
&& git merge 1.6</code></p>
+ <p><code class="language-plaintext highlighter-rouge">git checkout main
&& git merge 1.6</code></p>
</li>
<li>
- <p>Update the project version in <code class="language-plaintext
highlighter-rouge">master</code> to 1.7.0-SNAPSHOT</p>
+ <p>Update the project version in <code class="language-plaintext
highlighter-rouge">main</code> to 1.7.0-SNAPSHOT</p>
</li>
</ol>
diff --git a/output/docs/2.x/configuration/files.html
b/output/docs/2.x/configuration/files.html
index f36477d..b042ac2 100644
--- a/output/docs/2.x/configuration/files.html
+++ b/output/docs/2.x/configuration/files.html
@@ -427,7 +427,7 @@
<h2 id="accumuloproperties">accumulo.properties</h2>
-<p>The <a
href="https://github.com/apache/accumulo/blob/master/assemble/conf/accumulo.properties";>accumulo.properties</a>
file configures Accumulo server processes using
+<p>The <a
href="https://github.com/apache/accumulo/blob/main/assemble/conf/accumulo.properties";>accumulo.properties</a>
file configures Accumulo server processes using
<a href="/docs/2.x/configuration/server-properties">server properties</a>.
This file can be found in the <code class="language-plaintext
highlighter-rouge">conf/</code>
direcory. It is needed on every host that runs Accumulo processes. Therfore,
any configuration should be
replicated to all hosts of the Accumulo cluster. If a property is not
configured here, it might have been
@@ -449,23 +449,23 @@ in Java using the following code:</p>
<h2 id="accumulo-envsh">accumulo-env.sh</h2>
-<p>The <a
href="https://github.com/apache/accumulo/blob/master/assemble/conf/accumulo-env.sh";>accumulo-env.sh</a>
file configures the Java classpath and JVM options needed to run
+<p>The <a
href="https://github.com/apache/accumulo/blob/main/assemble/conf/accumulo-env.sh";>accumulo-env.sh</a>
file configures the Java classpath and JVM options needed to run
Accumulo processes. See the [quick install] for help with configuring this
file.</p>
<h2 id="log-configuration-files">Log configuration files</h2>
<h3 id="log4j-serviceproperties">log4j-service.properties</h3>
-<p>The <a
href="https://github.com/apache/accumulo/blob/master/assemble/conf/log4j-service.properties";>log4j-service.properties</a>
file configures logging for most Accumulo services
+<p>The <a
href="https://github.com/apache/accumulo/blob/main/assemble/conf/log4j-service.properties";>log4j-service.properties</a>
file configures logging for most Accumulo services
(i.e <a href="/docs/2.x/getting-started/design#master">Master</a>, <a
href="/docs/2.x/getting-started/design#tablet-server">Tablet Server</a>, <a
href="/docs/2.x/getting-started/design#garbage-collector">Garbage
Collector</a>) except for the Monitor.</p>
<h3 id="log4j-monitorproperties">log4j-monitor.properties</h3>
-<p>The <a
href="https://github.com/apache/accumulo/blob/master/assemble/conf/log4j-monitor.properties";>log4j-monitor.properties</a>
file configures logging for the <a
href="/docs/2.x/getting-started/design#monitor">Monitor</a>.</p>
+<p>The <a
href="https://github.com/apache/accumulo/blob/main/assemble/conf/log4j-monitor.properties";>log4j-monitor.properties</a>
file configures logging for the <a
href="/docs/2.x/getting-started/design#monitor">Monitor</a>.</p>
<h3 id="log4jproperties">log4j.properties</h3>
-<p>The <a
href="https://github.com/apache/accumulo/blob/master/assemble/conf/log4j.properties";>log4j.properties</a>
file configures logging for Accumulo commands (i.e <code
class="language-plaintext highlighter-rouge">accumulo init</code>,
+<p>The <a
href="https://github.com/apache/accumulo/blob/main/assemble/conf/log4j.properties";>log4j.properties</a>
file configures logging for Accumulo commands (i.e <code
class="language-plaintext highlighter-rouge">accumulo init</code>,
<code class="language-plaintext highlighter-rouge">accumulo shell</code>,
etc).</p>
<h2 id="host-files">Host files</h2>
diff --git a/output/docs/2.x/development/mapreduce.html
b/output/docs/2.x/development/mapreduce.html
index d27ffee..d3559c4 100644
--- a/output/docs/2.x/development/mapreduce.html
+++ b/output/docs/2.x/development/mapreduce.html
@@ -610,7 +610,7 @@ can then be bulk imported into Accumulo:</p>
<li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/wordcount.md";>wordcount</a>
- Uses MapReduce and Accumulo to do a word count on text files</li>
<li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/regex.md";>regex</a>
- Uses MapReduce and Accumulo to find data using regular expressions</li>
<li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/rowhash.md";>rowhash</a>
- Uses MapReduce to read a table and write to a new column in the same
table</li>
- <li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/tablettofile.md";>tablettofile</a>
- Uses MapReduce to read a table and write one of its columns to a file in
HDFS</li>
+ <li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/tabletofile.md";>tabletofile</a>
- Uses MapReduce to read a table and write one of its columns to a file in
HDFS</li>
<li><a
href="https://github.com/apache/accumulo-examples/blob/main/docs/uniquecols.md";>uniquecols</a>
- Uses MapReduce to count unique columns in Accumulo</li>
</ul>
diff --git a/output/feed.xml b/output/feed.xml
index 67e5654..e671508 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>https://accumulo.apache.org/</link>
<atom:link href="https://accumulo.apache.org/feed.xml"; rel="self"
type="application/rss+xml"/>
- <pubDate>Mon, 10 Aug 2020 20:39:54 +0000</pubDate>
- <lastBuildDate>Mon, 10 Aug 2020 20:39:54 +0000</lastBuildDate>
+ <pubDate>Mon, 10 Aug 2020 21:09:28 +0000</pubDate>
+ <lastBuildDate>Mon, 10 Aug 2020 21:09:28 +0000</lastBuildDate>
<generator>Jekyll v4.1.1</generator>
diff --git a/output/search_data.json b/output/search_data.json
index 1095b0f..0882882 100644
--- a/output/search_data.json
+++ b/output/search_data.json
@@ -114,7 +114,7 @@
"docs-2-x-development-mapreduce": {
"title": "MapReduce",
- "content" : "Accumulo tables can be used as the source and
destination of MapReduce jobs.General MapReduce configurationAdd Accumulo’s
MapReduce API to your dependenciesIf you are using Maven, add the following
dependency to your pom.xml to use Accumulo’s MapReduce
API:&lt;dependency&gt;
&lt;groupId&gt;org.apache.accumulo&lt;/groupId&gt;
&lt;artifactId&gt;accumulo-hadoop-mapreduce&lt;/artifactId&gt;
&lt;version&gt;2.0.0&lt;/ve [...]
+ "content" : "Accumulo tables can be used as the source and
destination of MapReduce jobs.General MapReduce configurationAdd Accumulo’s
MapReduce API to your dependenciesIf you are using Maven, add the following
dependency to your pom.xml to use Accumulo’s MapReduce
API:&lt;dependency&gt;
&lt;groupId&gt;org.apache.accumulo&lt;/groupId&gt;
&lt;artifactId&gt;accumulo-hadoop-mapreduce&lt;/artifactId&gt;
&lt;version&gt;2.0.0&lt;/ve [...]
"url": " /docs/2.x/development/mapreduce",
"categories": "development"
},
