Skip to content

Commit

Permalink
Update Community Code of Conduct (kubernetes-sigs#1530)
Browse files Browse the repository at this point in the history
Update Community Code of Conduct from kubernetes/kubernetes-template-project
  • Loading branch information
mbssaiakhil authored and mattymo committed Aug 15, 2017
1 parent bc5159a commit 9a3c6f2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
opening an issue or contacting one or more of the project maintainers.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a Kubernetes maintainer, Sarah Novotny <[email protected]>, and/or Dan Kohn <[email protected]>.

This Code of Conduct is adapted from the Contributor Covenant
(http://contributor-covenant.org), version 1.2.0, available at
Expand All @@ -53,7 +52,7 @@ The Kubernetes team does not condone any statements by speakers contrary to thes
team reserves the right to deny entrance and/or eject from an event (without refund) any individual found to
be engaging in discriminatory or offensive speech or actions.

Please bring any concerns to the immediate attention of Kubernetes event staff
Please bring any concerns to the immediate attention of Kubernetes event staff.


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]()

0 comments on commit 9a3c6f2

Please sign in to comment.