You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/08/10 21:09:14 UTC
[accumulo-website] branch main updated: Update references to 'main'
branch
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 <ct...@apache.org>
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 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/_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.com/apache/accumulo-examples/blob/main/docs/tabletofile.md
[uniquecols]: https://github.com/apache/accumulo-examples/blob/main/docs/uniquecols.md
diff --git a/contributor/advanced-contributor.md b/contributor/advanced-contributor.md
index a368d86..d5f47af 100644
--- a/contributor/advanced-contributor.md
+++ b/contributor/advanced-contributor.md
@@ -29,7 +29,7 @@ contributors:
6. Merge where appropriate:
- `git checkout master && git merge 1.9`
+ `git checkout main && git merge 1.9`
## Merging change to multiple versions
diff --git a/contributor/building.md b/contributor/building.md
index b7766f4..04ab88e 100644
--- a/contributor/building.md
+++ b/contributor/building.md
@@ -47,7 +47,7 @@ The easiest fix is to ensure all of your current changes are stored in git and t
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/contributor/making-release.md b/contributor/making-release.md
index 7a3bab9..bdfe2e7 100644
--- a/contributor/making-release.md
+++ b/contributor/making-release.md
@@ -176,13 +176,13 @@ Javadocs are easy to update. Using the latest JDK8 or later, 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. In a different directory, checkout the `master` branch of the accumulo-website repo
+4. In a different directory, checkout the `main` branch of the accumulo-website repo
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 in the website branch (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 `master` and `asf-site` branches back to the accumulo-website repo
+10. Don't forget to push both the `main` and `asf-site` branches back to the accumulo-website repo
11. Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)
## Update Accumulo Examples
diff --git a/contributor/release-management.md b/contributor/release-management.md
index c31472c..3660259 100644
--- a/contributor/release-management.md
+++ b/contributor/release-management.md
@@ -92,9 +92,9 @@ For the sake of clarity, some examples of common situations are included below.
## Releasing 1.6.0
-1. Branch from `master` to `1.6`
+1. Branch from `main` to `1.6`
- `git checkout master && git branch 1.6`
+ `git checkout main && git branch 1.6`
2. Tag `1.6.0-RC1` from the just created `1.6` branch
@@ -108,11 +108,11 @@ For the sake of clarity, some examples of common situations are included below.
`git tag -d 1.6.0-RC1 && git push --delete origin 1.6.0-RC1`
-5. Ensure `master` contains all features and fixes from `1.6.0`
+5. Ensure `main` contains all features and fixes from `1.6.0`
- `git checkout master && git merge 1.6`
+ `git checkout main && git merge 1.6`
-6. Update the project version in `master` to 1.7.0-SNAPSHOT
+6. Update the project version in `main` to 1.7.0-SNAPSHOT
[1]: https://cwiki.apache.org/confluence/display/KAFKA/Patch+submission+and+review#Patchsubmissionandreview-Simplecontributorworkflow