Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create CODE_OF_CONDUCT.md #841

Merged
merged 2 commits into from Mar 21, 2018
Merged

Create CODE_OF_CONDUCT.md #841

merged 2 commits into from Mar 21, 2018

Conversation

jmrodri
Copy link
Contributor

@jmrodri jmrodri commented Mar 20, 2018

Adapted from the CNCF Code of Conduct.

Adapted from the CNCF Code of Conduct.
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 20, 2018
@jmrodri jmrodri added the docs label Mar 20, 2018
@mhrivnak
Copy link
Member

When you say this was "adapted", what exactly is different?

@mhrivnak
Copy link
Member

Nevermind, I made a diff:

< ## CNCF Community Code of Conduct v1.0
---
> ## Automation Broker Community Code of Conduct v1.0
35c35
< Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a CNCF project maintainer, Sarah Novotny <sarahnovotny@google.com>, and/or Dan Kohn <dan@linuxfoundation.org>.
---
> Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a Automation Broker project maintainer <ansible-service-broker@redhat.com>.
37,43c37,39
< 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/
< 
< ### CNCF Events Code of Conduct
< 
< CNCF events are governed by the Linux Foundation [Code of Conduct](http://events.linuxfoundation.org/events/cloudnativecon/attend/code-of-conduct) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents.
---
> This Code of Conduct is adapted from the CNCF Code of Conduct v1.0 ( https://github.com/cncf/foundation/blob/master/code-of-conduct.md ),
> which is based on the Contributor Covenant ( http://contributor-covenant.org ), version 1.2.0, available at http://contributor-covenant.org/version/1/2/0/ ,
> and licensed under CC BY 4.0 ( https://creativecommons.org/licenses/by/4.0/legalcode ).

@fabianvf
Copy link
Member

lgtm

Copy link
Member

@djzager djzager left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@jmrodri
Copy link
Contributor Author

jmrodri commented Mar 20, 2018

@mhrivnak thanks for verifying the diff.

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 contacting a Automation Broker project maintainer <ansible-service-broker@redhat.com>.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to have specific people that someone could go to rather than a group-wide list.

@eriknelson
Copy link
Contributor

So who do we want as the point of contact for this?

@jmrodri jmrodri added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 20, 2018
@jmrodri
Copy link
Contributor Author

jmrodri commented Mar 20, 2018

I'm working on getting an answer to whom should be the contact point.

@jmrodri jmrodri removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 21, 2018
@jmrodri
Copy link
Contributor Author

jmrodri commented Mar 21, 2018

@shawn-hurley updated with real contact information.

@jmrodri jmrodri removed the request for review from eriknelson March 21, 2018 15:05
@jmrodri jmrodri merged commit 7473537 into master Mar 21, 2018
@jmrodri jmrodri deleted the add-code-of-conduct-1 branch March 21, 2018 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants