X Tutup
Skip to content

Commit bc4cea4

Browse files
author
Kazuyoshi Kato
committed
docs: rename main to master
containerd and opencontainers/image-spec have renamed its main branch from "master" to "main" Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
1 parent 9d07f8d commit bc4cea4

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If you are interested in trying out containerd see our example at [Getting Start
4141
## Nightly builds
4242

4343
There are nightly builds available for download [here](https://github.com/containerd/containerd/actions?query=workflow%3ANightly).
44-
Binaries are generated from `master` branch every night for `Linux` and `Windows`.
44+
Binaries are generated from `main` branch every night for `Linux` and `Windows`.
4545

4646
Please be aware: nightly builds might have critical bugs, it's not recommended for use in production and no support provided.
4747

‎RELEASES.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ considered "pre-releases".
2727

2828
### Major and Minor Releases
2929

30-
Major and minor releases of containerd will be made from master. Releases of
30+
Major and minor releases of containerd will be made from main. Releases of
3131
containerd will be marked with GPG signed tags and announced at
3232
https://github.com/containerd/containerd/releases. The tag will be of the
3333
format `v<major>.<minor>.<patch>` and should be made with the command `git tag
@@ -43,7 +43,7 @@ done against that branch.
4343

4444
Pre-releases, such as alphas, betas and release candidates will be conducted
4545
from their source branch. For major and minor releases, these releases will be
46-
done from master. For patch releases, these pre-releases should be done within
46+
done from main. For patch releases, these pre-releases should be done within
4747
the corresponding release branch.
4848

4949
While pre-releases are done to assist in the stabilization process, no
@@ -132,18 +132,18 @@ If there are important fixes that need to be backported, please let use know in
132132
one of three ways:
133133

134134
1. Open an issue.
135-
2. Open a PR with cherry-picked change from master.
135+
2. Open a PR with cherry-picked change from main.
136136
3. Open a PR with a ported fix.
137137

138138
__If you are reporting a security issue, please reach out discreetly at security@containerd.io__.
139139
Remember that backported PRs must follow the versioning guidelines from this document.
140140

141141
Any release that is "active" can accept backports. Opening a backport PR is
142142
fairly straightforward. The steps differ depending on whether you are pulling
143-
a fix from master or need to draft a new commit specific to a particular
143+
a fix from main or need to draft a new commit specific to a particular
144144
branch.
145145

146-
To cherry pick a straightforward commit from master, simply use the cherry pick
146+
To cherry pick a straightforward commit from main, simply use the cherry pick
147147
process:
148148

149149
1. Pick the branch to which you want backported, usually in the format
@@ -167,19 +167,19 @@ process:
167167
```
168168

169169
Make sure to replace `stevvooe` with whatever fork you are using to open
170-
the PR. When you open the PR, make sure to switch `master` with whatever
170+
the PR. When you open the PR, make sure to switch `main` with whatever
171171
release branch you are targeting with the fix. Make sure the PR title has
172172
`[<release branch>]` prefixed. e.g.:
173173

174174
```
175175
[release/1.4] Fix foo in bar
176176
```
177177

178-
If there is no existing fix in master, you should first fix the bug in master,
178+
If there is no existing fix in main, you should first fix the bug in main,
179179
or ask us a maintainer or contributor to do it via an issue. Once that PR is
180180
completed, open a PR using the process above.
181181

182-
Only when the bug is not seen in master and must be made for the specific
182+
Only when the bug is not seen in main and must be made for the specific
183183
release branch should you open a PR with new code.
184184

185185
## Public API Stability

‎archive/tar.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var errInvalidArchive = errors.New("invalid archive")
4848
// Produces a tar using OCI style file markers for deletions. Deleted
4949
// files will be prepended with the prefix ".wh.". This style is
5050
// based off AUFS whiteouts.
51-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md
51+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md
5252
func Diff(ctx context.Context, a, b string) io.ReadCloser {
5353
r, w := io.Pipe()
5454

@@ -68,7 +68,7 @@ func Diff(ctx context.Context, a, b string) io.ReadCloser {
6868
// Produces a tar using OCI style file markers for deletions. Deleted
6969
// files will be prepended with the prefix ".wh.". This style is
7070
// based off AUFS whiteouts.
71-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md
71+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md
7272
func WriteDiff(ctx context.Context, w io.Writer, a, b string, opts ...WriteDiffOpt) error {
7373
var options WriteDiffOptions
7474
for _, opt := range opts {
@@ -89,7 +89,7 @@ func WriteDiff(ctx context.Context, w io.Writer, a, b string, opts ...WriteDiffO
8989
// Produces a tar using OCI style file markers for deletions. Deleted
9090
// files will be prepended with the prefix ".wh.". This style is
9191
// based off AUFS whiteouts.
92-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md
92+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md
9393
func writeDiffNaive(ctx context.Context, w io.Writer, a, b string, _ WriteDiffOptions) error {
9494
cw := NewChangeWriter(w, b)
9595
err := fs.Changes(ctx, a, b, cw.HandleChange)
@@ -102,7 +102,7 @@ func writeDiffNaive(ctx context.Context, w io.Writer, a, b string, _ WriteDiffOp
102102
const (
103103
// whiteoutPrefix prefix means file is a whiteout. If this is followed by a
104104
// filename this means that file has been removed from the base layer.
105-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md#whiteouts
105+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md#whiteouts
106106
whiteoutPrefix = ".wh."
107107

108108
// whiteoutMetaPrefix prefix means whiteout has a special meaning and is not
@@ -118,7 +118,7 @@ const (
118118
)
119119

120120
// Apply applies a tar stream of an OCI style diff tar.
121-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md#applying-changesets
121+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md#applying-changesets
122122
func Apply(ctx context.Context, root string, r io.Reader, opts ...ApplyOpt) (int64, error) {
123123
root = filepath.Clean(root)
124124

@@ -140,7 +140,7 @@ func Apply(ctx context.Context, root string, r io.Reader, opts ...ApplyOpt) (int
140140

141141
// applyNaive applies a tar stream of an OCI style diff tar to a directory
142142
// applying each file as either a whole file or whiteout.
143-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md#applying-changesets
143+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md#applying-changesets
144144
func applyNaive(ctx context.Context, root string, r io.Reader, options ApplyOptions) (size int64, err error) {
145145
var (
146146
dirs []*tar.Header
@@ -469,7 +469,7 @@ func mkparent(ctx context.Context, path, root string, parents []string) error {
469469
// This should be used combining with continuity's diff computing functionality
470470
// (e.g. `fs.Change` of github.com/containerd/continuity/fs).
471471
//
472-
// See also https://github.com/opencontainers/image-spec/blob/master/layer.md for details
472+
// See also https://github.com/opencontainers/image-spec/blob/main/layer.md for details
473473
// about OCI layers
474474
type ChangeWriter struct {
475475
tw *tar.Writer

‎archive/tar_opts_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
// applyWindowsLayer applies a tar stream of an OCI style diff tar of a Windows layer
27-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md#applying-changesets
27+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md#applying-changesets
2828
func applyWindowsLayer(ctx context.Context, root string, r io.Reader, options ApplyOptions) (size int64, err error) {
2929
return ociwclayer.ImportLayerFromTar(ctx, r, root, options.Parents)
3030
}
@@ -45,7 +45,7 @@ func AsWindowsContainerLayer() ApplyOpt {
4545
// Produces a tar using OCI style file markers for deletions. Deleted
4646
// files will be prepended with the prefix ".wh.". This style is
4747
// based off AUFS whiteouts.
48-
// See https://github.com/opencontainers/image-spec/blob/master/layer.md
48+
// See https://github.com/opencontainers/image-spec/blob/main/layer.md
4949
func writeDiffWindowsLayers(ctx context.Context, w io.Writer, _, layer string, options WriteDiffOptions) error {
5050
return ociwclayer.ExportLayerToTar(ctx, w, layer, options.ParentLayers)
5151
}

0 commit comments

Comments
 (0)
X Tutup