From dfca0d9138c1725e18a91cacf1fbe432b93d3879 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 28 Feb 2020 11:01:15 -0800 Subject: Update how approvals / builds happen This was a bit dated. Signed-off-by: Tim Smith --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CONTRIBUTING.md') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 692f526ea7..75fb782970 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 . +1. Approvals by two or more members of the owners, approvers, or reviewers groups. 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 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). -- cgit v1.2.1