linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change docs references from "master" to "main" (#571)

This commit is contained in:
Oliver Gould 2020-06-16 12:43:16 -07:00 committed by GitHub
parent 1b3e899efa
commit ef7e1258ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -33,7 +33,7 @@ Do you have an improvement?
1. Submit an [issue][issue] describing your proposed change. 1. Submit an [issue][issue] describing your proposed change.
2. We will try to respond to your issue promptly. 2. We will try to respond to your issue promptly.
3. Fork this repo, develop and test your code changes. See the project's [README](README.md) for further information about working in this repository. 3. Fork this repo, develop and test your code changes. See the project's [README](README.md) for further information about working in this repository.
4. Submit a pull request against this repo's `master` branch. 4. Submit a pull request against this repo's `main` branch.
5. Your branch may be merged once all configured checks pass, including: 5. Your branch may be merged once all configured checks pass, including:
- The branch has passed tests in CI. - The branch has passed tests in CI.
- A review from appropriate maintainers (see [MAINTAINERS.md](MAINTAINERS.md) and [GOVERNANCE.md](GOVERNANCE.md)) - A review from appropriate maintainers (see [MAINTAINERS.md](MAINTAINERS.md) and [GOVERNANCE.md](GOVERNANCE.md))
@ -41,7 +41,7 @@ Do you have an improvement?
## Committing ## ## Committing ##
We prefer squash or rebase commits so that all changes from a branch are We prefer squash or rebase commits so that all changes from a branch are
committed to master as a single commit. All pull requests are squashed when committed to `main` as a single commit. All pull requests are squashed when
merged, but rebasing prior to merge gives you better control over the commit merged, but rebasing prior to merge gives you better control over the commit
message. message.

6
profiling/README.md
View File

@ -102,12 +102,12 @@ different test runs. For example:
```console ```console
$ cd profiling/ $ cd profiling/
$ ./benchmark.sh ; git checkout master && ./benchmark.sh $ ./benchmark.sh ; git checkout main && ./benchmark.sh
$ ./plot.sh \ $ ./plot.sh \
../target/profile/2019Jun19_15h13m12s/summary.txt \ ../target/profile/2019Jun19_15h13m12s/summary.txt \
../target/profile/.2019Jun19_15h34m26s/summary.txt \ ../target/profile/.2019Jun19_15h34m26s/summary.txt \
mybranch-vs-master- mybranch-vs-main-
$ eog mybranch-vs-master-*png $ eog mybranch-vs-main-*png
``` ```
Consider using `./plot.sh --logy ...` to switch the Y-axis to a logarithmic Consider using `./plot.sh --logy ...` to switch the Y-axis to a logarithmic