github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28242 from philips/patch-7

Browse Source 
Automatic merge from submit-queue

code-of-conduct: provide concrete points of contact
This commit is contained in:
k8s-merge-robot 2016-07-18 21:40:30 -07:00 committed by GitHub
commit 648ec14390
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code-of-conduct.md
View File

@ -32,8 +32,7 @@ Conduct may be permanently removed from the project team.
This code of conduct applies both within project spaces and in public spaces This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. when an individual is representing the project or its community.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a Kubernetes maintainer, Sarah Novotny <sarahnovotny@google.com>, and/or Dan Kohn <dan@linuxfoundation.org>.
opening an issue or contacting one or more of the project maintainers.
This Code of Conduct is adapted from the Contributor Covenant This Code of Conduct is adapted from the Contributor Covenant
(http://contributor-covenant.org), version 1.2.0, available at (http://contributor-covenant.org), version 1.2.0, available at