From fcab455ca7166125922f8c5c7a0d08bda7639526 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 21 Oct 2019 22:30:09 -0600 Subject: [PATCH] Update Governance and Code of Conduct verbiage. (#120) The old governance doc does not apply to the Hyperledger project, so it is deleted. Added a note that there is also a HLP code of conduct that also applies. Signed-off-by: Danno Ferrin --- CONTRIBUTING.md | 8 ++++++++ GOVERNANCE.md | 39 --------------------------------------- 2 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 GOVERNANCE.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20ab21368f..13d33e71f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,6 +29,14 @@ and feel free to propose changes to this document in a pull request. This project and everyone participating in it is governed by the [Besu Code of Conduct](CODE-OF-CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [private@pegasys.tech]. +The [Hyperledger Code of Conduct](https://wiki.hyperledger.org/community/hyperledger-project-code-of-conduct) +also applies to participants in this project. + +## Governance + +Hyperledger Besu is managed under an open governance model as described in the [HyperLedger +charter](https://www.hyperledger.org/about/charter). Hyperledger Besu is lead by a set of [maintainers](MAINTAINERS.md). + ## I just have a quick question > **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below. diff --git a/GOVERNANCE.md b/GOVERNANCE.md deleted file mode 100644 index c91a54a133..0000000000 --- a/GOVERNANCE.md +++ /dev/null @@ -1,39 +0,0 @@ -# Overview -This project is led by a benevolent dictator (PegaSys) and managed by the community. That is, the community actively contributes to the day-to-day maintenance of the project, but the general strategic line is drawn by the benevolent dictator. In case of disagreement, they have the last word. It is the benevolent dictator’s job to resolve disputes within the community and to ensure that the project is able to progress in a coordinated way. In turn, it is the community’s job to guide the decisions of the benevolent dictator through active engagement and contribution. - - -# Principles - -The community adheres to the following principles: -* Open: Besu is open source. See repository guidelines and CLA, below. -* Welcoming and respectful: See Code of Conduct, below. -* Transparent and accessible: Work and collaboration should be done in public. -* Merit: Ideas and contributions are accepted according to their technical merit and alignment with project objectives and design principles. - -# Code of Conduct -See [code of conduct] - -# Community membership - -See [community membership] - -# Decision Making -Decision making will be handled by the Approvers (see [community membership]). If consensus cannot be reached, the Benevolent Dictator will provide the final word on the decision. - - -# DCO - -All contributors must send commits with sign-off to comply with [DCO](DCO.md) -## Attribution - -This document was influenced by the following: -- Kubernetes community-membership.md, available at [kub community membership]. -- Kubernetes governance.md, available at [kub governance] -- OSSWatch Benevolent Dictator Governance Model, available at [oss watch benevolent dictator]. - -[CLA.md]: /CLA.md -[community membership]: /docs/community/community-membership.md -[code of conduct]: /CODE-OF-CONDUCT.md -[oss watch benevolent dictator]: http://oss-watch.ac.uk/resources/benevolentdictatorgovernancemodel -[kub community membership]: https://raw.githubusercontent.com/kubernetes/community/master/community-membership.md -[kub governance]:https://github.com/kubernetes/community/blob/master/governance.md