This is an automated email from the ASF dual-hosted git repository. kenn pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 6bca647a160246a036e86fa60f7a5bcefb910c8a Author: Kenneth Knowles <[email protected]> AuthorDate: Fri May 4 13:09:07 2018 -0700 Remove/correct references to Team page --- src/_includes/footer.html | 4 +++- src/contribute/contribution-guide.md | 30 ------------------------------ src/contribute/feature-branches.md | 8 ++++---- src/contribute/maturity-model.md | 6 ++++-- src/contribute/release-guide.md | 2 +- 5 files changed, 12 insertions(+), 38 deletions(-) diff --git a/src/_includes/footer.html b/src/_includes/footer.html index e2786ab..bab23db 100644 --- a/src/_includes/footer.html +++ b/src/_includes/footer.html @@ -25,7 +25,9 @@ <div class="footer__cols__col footer__cols__col--md"> <div class="footer__cols__col__title">Community</div> <div class="footer__cols__col__link"><a href="{{'/contribute/'|prepend:site.baseurl}}">Contribute</a></div> - <div class="footer__cols__col__link"><a href="{{'/contribute/team/'|prepend:site.baseurl}}">Team</a></div> + <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam"; target="_blank">Team<img src="{{ site.baseurl }}/images/external-link-icon.png" + width="14" height="14" + alt="External link."></a></div> <div class="footer__cols__col__link"><a href="{{'/contribute/presentation-materials/'|prepend:site.baseurl}}">Media</a></div> </div> <div class="footer__cols__col footer__cols__col--md"> diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md index 3c16092..fa08ba7 100644 --- a/src/contribute/contribution-guide.md +++ b/src/contribute/contribution-guide.md @@ -385,33 +385,3 @@ healthy. A pull request becomes stale after its author fails to respond to actionable comments for 60 days. Author of a closed pull request is welcome to reopen the same pull request again in the future. The associated JIRAs will be unassigned from the author but will stay open. - -## Granting more rights to a contributor - -The project management committee (PMC) can grant more rights to a contributor, -such as commit access or decision power, and recognize them as new [committers -or PMC members]({{ site.baseurl }}/contribute/team/). - -The PMC periodically discusses this topic and privately votes to grant more -rights to a contributor. If the vote passes, the contributor is invited to -accept or reject the nomination. Once accepted, the PMC announces the decision -publicly and updates the list of team member accordingly. - -The key to the selection process is -[Meritocracy](http://apache.org/foundation/how-it-works.html#meritocracy), -literally government by merit. Contributors earn merit in many ways: -contributing code, testing releases, participating in documentation effort, -answering user questions, debating design proposals, triaging issues, -evangelizing the project, growing user base, and any other action that benefits -the project as a whole. - -Therefore, there isn’t a single committer bar, e.g., a specific number of -commits. In most cases, new committers will have a combination of different -types of contributions that are hard to compare to each other. Similarly, there -isn’t a single PMC bar either. The PMC discusses all contributions from an -individual, and evaluates the overall impact across all the dimensions above. - -Nothing gives us greater joy than recognizing new committers or PMC members -- -that's the only way we can grow. If there’s ever any doubt about this topic, -please email dev@ or private@ and we’ll gladly discuss. - diff --git a/src/contribute/feature-branches.md b/src/contribute/feature-branches.md index b27ae87..844b9f7 100644 --- a/src/contribute/feature-branches.md +++ b/src/contribute/feature-branches.md @@ -38,10 +38,10 @@ To contribute code on a feature branch, use the same process as in the replace `master` with the name of the feature branch. Since feature branches are often used for new components, you may find that -there is no [committer]({{ site.baseurl }}/contribute/team/) familiar with all -the details of the new language or runner. In that case, consider asking -someone else familiar with the technology to do an initial review before -looping in a committer for a final review and merge. +there is no committer familiar with all the details of the new language or +runner. In that case, consider asking someone else familiar with the technology +to do an initial review before looping in a committer for a final review and +merge. If you are working on a feature branch, you'll also want to frequently merge in changes from `master`. This prevents the feature branch from diff --git a/src/contribute/maturity-model.md b/src/contribute/maturity-model.md index 8f8cc04..db9e050 100644 --- a/src/contribute/maturity-model.md +++ b/src/contribute/maturity-model.md @@ -168,7 +168,7 @@ The following table summarizes project's self-assessment against the Apache Matu <tr> <td><p>CO50</p></td> <td><p>The way in which contributors can be granted more rights such as commit access or decision power is clearly documented and is the same for all contributors.</p></td> - <td><p><b>YES.</b> The criteria is documented in the <a href="{{ site.baseurl }}/contribute/contribution-guide/#granting-more-rights-to-a-contributor">contribution guide</a>.</p></td> + <td><p><b>YES.</b> The criteria is documented in the page <a href="{{ site.baseurl }}/contribute/become-a-committer">"Become a Committer"</a>.</p></td> </tr> <tr> <td><p>CO60</p></td> @@ -187,7 +187,9 @@ The following table summarizes project's self-assessment against the Apache Matu <tr> <td><p>CS10</p></td> <td><p>The project maintains a public list of its contributors who have decision power -- the project's PMC (Project Management Committee) consists of those contributors.</p></td> - <td><p><b>YES.</b> The website contains the <a href="{{ site.baseurl }}/contribute/team/">list of committers and PPMC members</a>.</p></td> + <td><p><b>YES.</b> The website links to the ASF's summary of the <a href="https://projects.apache.org/committee.html?beam"; target="_blank">Team<img src="{{ site.baseurl }}/images/external-link-icon.png" + width="14" height="14" + alt="External link."></a>.</p></td> </tr> <tr> <td><p>CS20</p></td> diff --git a/src/contribute/release-guide.md b/src/contribute/release-guide.md index e48981c..76bdb12 100644 --- a/src/contribute/release-guide.md +++ b/src/contribute/release-guide.md @@ -16,7 +16,7 @@ The Apache Beam project periodically declares and publishes releases. A release The Beam community treats releases with great importance. They are a public face of the project and most users interact with the project only through the releases. Releases are signed off by the entire Beam community in a public vote. -Each release is executed by a *Release Manager*, who is selected among the [Beam committers]({{ site.baseurl }}/contribute/team). This document describes the process that the Release Manager follows to perform a release. Any changes to this process should be discussed and adopted on the [dev@ mailing list]({{ site.baseurl }}/get-started/support/). +Each release is executed by a *Release Manager*, who is selected among the Beam committers. This document describes the process that the Release Manager follows to perform a release. Any changes to this process should be discussed and adopted on the [dev@ mailing list]({{ site.baseurl }}/get-started/support/). Please remember that publishing software has legal consequences. This guide complements the foundation-wide [Product Release Policy](http://www.apache.org/dev/release.html) and [Release Distribution Policy](http://www.apache.org/dev/release-distribution). -- To stop receiving notification emails like this one, please contact [email protected].
