RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SubmittingPatches.rst: PRs should target "main"

Browse Source 
Signed-off-by: Huber-ming <zhangsm01@inspur.com>
This commit is contained in:
Huber-ming 2022-06-13 09:36:39 +08:00
parent 784f5bb9bf
commit a892525c71
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull_request_template.md vendored
View File

@ -20,7 +20,7 @@
-->
## Contribution Guidelines
- To sign and title your commits, please refer to [Submitting Patches to Ceph](https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst).
- To sign and title your commits, please refer to [Submitting Patches to Ceph](https://github.com/ceph/ceph/blob/main/SubmittingPatches.rst).
- If you are submitting a fix for a stable branch (e.g. "pacific"), please refer to [Submitting Patches to Ceph - Backports](https://github.com/ceph/ceph/blob/master/SubmittingPatches-backports.rst) for the proper workflow.

10
SubmittingPatches.rst
View File

@ -5,7 +5,7 @@ Submitting Patches to Ceph
Patches to Ceph can be divided into three categories:
1. patches targeting Ceph kernel code
2. patches targeting the "master" branch
2. patches targeting the "main" branch
3. patches targeting stable branches (e.g.: "nautilus")
Some parts of Ceph - notably the RBD and CephFS kernel clients - are maintained
@ -16,7 +16,7 @@ The rest of this document assumes that your patch relates to Ceph code that is
maintained in the GitHub repository https://github.com/ceph/ceph
If you have a patch that fixes an issue, feel free to open a GitHub pull request
("PR") targeting the "master" branch, but do read this document first, as it
("PR") targeting the "main" branch, but do read this document first, as it
contains important information for ensuring that your PR passes code review
smoothly.
@ -128,7 +128,7 @@ should start with "doc". For instance, a commit fixing a typo in
doc/mgr/dashboard: fix a typo
More positive examples can be obtained from the git history of the ``master``
More positive examples can be obtained from the git history of the ``main``
branch::
git log
@ -151,7 +151,7 @@ In the body of your commit message, be as specific as possible. If the commit
message title was too short to fully state what the commit is doing, use the
body to explain not just the "what", but also the "why".
For positive examples, peruse ``git log`` in the ``master`` branch. A negative
For positive examples, peruse ``git log`` in the ``main`` branch. A negative
example would be a commit message that merely states the obvious. For example:
"this patch includes updates for subsystem X. Please apply."
@ -195,7 +195,7 @@ PRs should be opened on branches contained in your fork of
https://github.com/ceph/ceph.git - do not push branches directly to
``ceph/ceph.git``.
PRs should target "master". If you need to add a patch to a stable branch, such
PRs should target "main". If you need to add a patch to a stable branch, such
as "nautilus", see the file ``SubmittingPatches-backports.rst``.
In addition to a base, or "target" branch, PRs have several other components: