This is an automated email from the ASF dual-hosted git repository. srowen pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/spark-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 2e8ba9d Update contributing to include code of conduct section 2e8ba9d is described below commit 2e8ba9d295de9028c865f918c11006fac6a4a70c Author: Denny Lee <denny.g....@gmail.com> AuthorDate: Wed May 5 19:35:52 2021 -0500 Update contributing to include code of conduct section Updates to contributing.md and contributing.html to include call out to ASF code of conduct. Author: Denny Lee <denny.g....@gmail.com> Closes #335 from dennyglee/asf-site. --- contributing.md | 9 +++++++++ site/contributing.html | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/contributing.md b/contributing.md index 9e8d67d..5489926 100644 --- a/contributing.md +++ b/contributing.md @@ -467,3 +467,12 @@ Scala guidelines below. The latter is preferred. If you're not sure about the right style for something, try to follow the style of the existing codebase. Look at whether there are other examples in the code that use your feature. Feel free to ask on the `d...@spark.apache.org` list as well and/or ask committers. + +<h2>Code of Conduct</h2> +The Apache Spark project follows the <a href="https://www.apache.org/foundation/policies/conduct.html">Apache Software Foundation Code of Conduct</a>. The <a href="https://www.apache.org/foundation/policies/conduct.html">code of conduct</a> applies to all spaces managed by the Apache Software Foundation, including IRC, all public and private mailing lists, issue trackers, wikis, blogs, Twitter, and any other communication channel used by our communities. A code of conduct which is speci [...] + +We expect this code of conduct to be honored by everyone who participates in the Apache community formally or informally, or claims any affiliation with the Foundation, in any Foundation-related activities and especially when representing the ASF, in any role. + +This code <u>is not exhaustive or complete</u>. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate. + +For more information and specific guidelines, refer to the <a href="https://www.apache.org/foundation/policies/conduct.html">Apache Software Foundation Code of Conduct</a>. \ No newline at end of file diff --git a/site/contributing.html b/site/contributing.html index ab8f21d..542df9d 100644 --- a/site/contributing.html +++ b/site/contributing.html @@ -734,6 +734,15 @@ Scala guidelines below. The latter is preferred.</li> codebase. Look at whether there are other examples in the code that use your feature. Feel free to ask on the <code class="language-plaintext highlighter-rouge">d...@spark.apache.org</code> list as well and/or ask committers.</p> +<h2>Code of Conduct</h2> +<p>The Apache Spark project follows the <a href="https://www.apache.org/foundation/policies/conduct.html">Apache Software Foundation Code of Conduct</a>. The <a href="https://www.apache.org/foundation/policies/conduct.html">code of conduct</a> applies to all spaces managed by the Apache Software Foundation, including IRC, all public and private mailing lists, issue trackers, wikis, blogs, Twitter, and any other communication channel used by our communities. A code of conduct which is sp [...] + +<p>We expect this code of conduct to be honored by everyone who participates in the Apache community formally or informally, or claims any affiliation with the Foundation, in any Foundation-related activities and especially when representing the ASF, in any role.</p> + +<p>This code <u>is not exhaustive or complete</u>. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.</p> + +<p>For more information and specific guidelines, refer to the <a href="https://www.apache.org/foundation/policies/conduct.html">Apache Software Foundation Code of Conduct</a>.</p> + </div> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org