This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-wskdebug.git

commit 0f00fb627bdfa87bc160f158751d67fb44a37e47
Author: Alexander Klimetschek <[email protected]>
AuthorDate: Tue Feb 25 18:51:08 2020 -0800

    remove code of conduct and switch to openwhisk contributing guidelines
---
 .github/CONTRIBUTING.md | 85 ++++++++++++++++++++++++++++++-------------------
 CODE_OF_CONDUCT.md      | 74 ------------------------------------------
 2 files changed, 53 insertions(+), 106 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9132c36..5906a2b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,47 +1,68 @@
-# Contributing
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
-Thanks for choosing to contribute!
+# Contributing to Apache OpenWhisk
 
-The following are a set of guidelines to follow when contributing to this 
project.
+Anyone can contribute to the OpenWhisk project and we welcome your 
contributions.
 
-## Code Of Conduct
+There are multiple ways to contribute: report bugs, improve the docs, and
+contribute code, but you must follow these prerequisites and guidelines:
 
-This project adheres to the Adobe [code of conduct](../CODE_OF_CONDUCT.md). By 
participating,
-you are expected to uphold this code. Please report unacceptable behavior to
-[[email protected]](mailto:[email protected]).
+ - [Contributor License Agreement](#contributor-license-agreement)
+ - [Raising issues](#raising-issues)
+ - [Coding Standards](#coding-standards)
 
-## Have A Question?
+### Contributor License Agreement
 
-Start by filing an issue. The existing committers on this project work to reach
-consensus around project direction and issue solutions within issue threads
-(when appropriate).
+All contributors must sign and submit an Apache CLA (Contributor License 
Agreement).
 
-## Contributor License Agreement
+Instructions on how to do this can be found here:
+[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
 
-All third-party contributions to this project must be accompanied by a signed 
contributor
-license agreement. This gives Adobe permission to redistribute your 
contributions
-as part of the project. [Sign our CLA](http://opensource.adobe.com/cla.html). 
You
-only need to submit an Adobe CLA one time, so if you have submitted one 
previously,
-you are good to go!
+Once submitted, you will receive a confirmation email from the Apache Software 
Foundation (ASF) and be added to
+the following list: http://people.apache.org/unlistedclas.html.
 
-## Code Reviews
+Project committers will use this list to verify pull requests (PRs) come from 
contributors that have signed a CLA.
 
-All submissions should come in the form of pull requests and need to be 
reviewed
-by project committers. Read [GitHub's pull request 
documentation](https://help.github.com/articles/about-pull-requests/)
-for more information on sending pull requests.
+We look forward to your contributions!
 
-Lastly, please follow the [pull request template](PULL_REQUEST_TEMPLATE.md) 
when
-submitting a pull request!
+## Raising issues
 
-## From Contributor To Committer
+Please raise any bug reports on the respective project repository's GitHub 
issue tracker. Be sure to search the
+list to see if your issue has already been raised.
 
-We love contributions from our community! If you'd like to go a step beyond 
contributor
-and become a committer with full write access and a say in the project, you 
must
-be invited to the project. The existing committers employ an internal 
nomination
-process that must reach lazy consensus (silence is approval) before invitations
-are issued. If you feel you are qualified and want to get more deeply involved,
-feel free to reach out to existing committers to have a conversation about 
that.
+A good bug report is one that make it easy for us to understand what you were 
trying to do and what went wrong.
+Provide as much context as possible so we can try to recreate the issue.
 
-## Security Issues
+### Discussion
 
-Security issues shouldn't be reported on this issue tracker. Instead, [file an 
issue to our security experts](https://helpx.adobe.com/security/alertus.html)
\ No newline at end of file
+Please use the project's developer email list to engage our community:
+[[email protected]]([email protected])
+
+In addition, we provide a "dev" Slack team channel for conversations at:
+https://openwhisk-team.slack.com/messages/dev/
+
+### Coding standards
+
+Please ensure you follow the coding standards used throughout the existing
+code base. Some basic rules include:
+
+ - all files must have the Apache license in the header.
+ - all PRs must have passing builds for all operating systems.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 730fe24..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Adobe Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, 
body
-size, disability, ethnicity, gender identity and expression, level of 
experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an 
appointed
-representative at an online or offline event. Representation of a project may 
be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an 
incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], 
version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
\ No newline at end of file

Reply via email to