diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-08-18 12:26:31 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-08-23 10:56:17 -0400 |
| commit | c60ae2dc1a4008cef074ab113163ed407fac6350 (patch) | |
| tree | a6d7bcb0a9c01ba7c1467a11f538786007d2ab53 /README.md | |
| parent | 417a962a8f7af764d2107b1432a391649cd078bb (diff) | |
| download | sos-c60ae2dc1a4008cef074ab113163ed407fac6350.tar.gz | |
[collect,docs] Drop `--master` and update internal references
This commit follows up on the previous changes from #2555 by fully
dropping the `--master` option in favor of `--primary`, `--manager`, and
`--controller`.
Internal references have been updated as well, using the term `primary`
across all instances. Note that within OCP cluster profile, 'primary'
labeling and option setting still relies on the 'master' label/role
reported by the environment, as that remains the term used to identify
such nodes.
Resolves: #2329
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -[](https://cirrus-ci.com/github/sosreport/sos) [](https://sos.readthedocs.io/en/master/?badge=master) [](https://lgtm.com/projects/g/sosreport/sos/context:python) +[](https://cirrus-ci.com/github/sosreport/sos) [](https://sos.readthedocs.io/en/main/?badge=main) [](https://lgtm.com/projects/g/sosreport/sos/context:python) # SoS @@ -12,7 +12,7 @@ This project is hosted at: For the latest version, to contribute, and for more information, please visit the project pages or join the mailing list. -To clone the current master (development) branch run: +To clone the current main (development) branch run: ``` git clone git://github.com/sosreport/sos.git @@ -42,9 +42,9 @@ discussion. Patch submissions and reviews are welcome too. ## Patches and pull requests Patches can be submitted via the mailing list or as GitHub pull requests. If -using GitHub please make sure your branch applies to the current master as a +using GitHub please make sure your branch applies to the current main as a 'fast forward' merge (i.e. without creating a merge commit). Use the `git -rebase` command to update your branch to the current master if necessary. +rebase` command to update your branch to the current main if necessary. Please refer to the [contributor guidelines][0] for guidance on formatting patches and commit messages. |