summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-02-28 14:26:47 -0800
committerGitHub <noreply@github.com>2020-02-28 14:26:47 -0800
commita60b4aec184b97986dde9ed577b9558d10fea951 (patch)
tree7c2f954e817e3eb85a47f729e71c9e9d2492bc72
parent56a6308c7dd78a8b378c1b1e645efd996bf4e0b1 (diff)
parent15158600e70de7c6bd415066e768972adc5dd0c5 (diff)
downloadchef-a60b4aec184b97986dde9ed577b9558d10fea951.tar.gz
Merge pull request #9414 from chef/contributing
Update how approvals / builds happen
-rw-r--r--CONTRIBUTING.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 692f526ea7..51a2d34c36 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,9 +33,9 @@ Code review takes place in GitHub pull requests. See [this article](https://help
Once you open a pull request, project maintainers will review your code and respond to your pull request with any feedback they might have. The process at this point is as follows:
-1. Two thumbs-up (:+1:) are required from project maintainers. See the master maintainers document for Chef projects at <https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md>.
+1. Two or more members of the owners, approvers, or reviewers groups must approve your PR. See the [Chef Infra OSS Project](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md) for a list of all members.
2. Your change will be merged into the project's `master` branch
-3. Our Expeditor bot will automatically update the project's changelog with your contribution. For projects such as Chef and Chef-DK the version will be automatically incremented and a build kicked off to the project's `current` channel.
+3. Our Expeditor bot will automatically increment the version and update the project's changelog with your contribution. For projects that ship as a package, Expeditor will kick off a build which will publish the package to the project's `current` channel.
If you would like to learn about when your code will be available in a release of Chef, read more about [Chef Release Cycles](#release-cycles).