diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index ad9033d139abaa68750e3457547e40d1a0a28465..0000000000000000000000000000000000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,17 +0,0 @@ -# Welcome all contributors - -Please observe the following rules: -* All bugs and features are managed in the [**Issues Page**](https://github.com/wu-sheng/sky-walking/issues). -* All descriptions of features and bugs should be in English. - -## For All Contributors -1. Create new issue, whether you want to report bugs or propose new features. -1. Send a pr for your bugs or features. -1. @mention us(@wu-sheng or @sky-walking) to review your issue/pr. - - -**Anyone, who contributes at least one plugin or new feature, can ask for joinging [sky-walking contributor organizations](https://github.com/sky-walking), by @mention us(@wu-sheng or @sky-walking) in your merged pr.** - ---- - -All features or bug-fix codes have been merged into this repo, they belong to sky-walking team, with [GPL-3.0](https://github.com/wu-sheng/sky-walking/blob/master/LICENSE) protocol. diff --git a/README.md b/README.md index dd3f4c5c155866e6b9885e979aface8f4a051ef5..e3799f4f9c49025aac6c6cf4fba94c305a95c89d 100644 --- a/README.md +++ b/README.md @@ -25,17 +25,17 @@ Sky Walking | [中文](README_ZH.md) * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) -# Contributors -_In chronological order_ -* 吴晟 [**PMC Member**] [@wu-sheng](https://github.com/wu-sheng) -* 张鑫 [**PMC Member**] [@ascrutae](https://github.com/ascrutae) -* 谭真 [@mircoteam](https://github.com/mircoteam) Advanced R&D Engineers, Creative & Interactive Group. -* 徐妍 [@TastySummer](https://github.com/TastySummer) -* 彭勇升 [**PMC Member**] [@pengys5](https://github.com/pengys5) R&D director,Tydic -* 戴文 +# PMC, Project Management Committee +* 吴晟 [@wu-sheng](https://github.com/wu-sheng) +* 张鑫 [@ascrutae](https://github.com/ascrutae) +* 彭勇升 [@peng-yongsheng](https://github.com/peng-yongsheng) R&D director,Tydic + +# Committer * 柏杨 [@bai-yang](https://github.com/bai-yang) Senior Engineer, Alibaba Group. -* 陈凤 [@trey03](https://github.com/trey03) -* [More contributors](https://github.com/wu-sheng/sky-walking/graphs/contributors) + +# Contributors +* [Contributor List](https://github.com/wu-sheng/sky-walking/graphs/contributors) +* A special thanks to the contributors: 徐妍[@TastySummer](https://github.com/TastySummer) and 戴文, you offer huge helps for this project. This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. @@ -76,3 +76,6 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU * [Gitter](https://gitter.im/sky-walking/Lobby) * [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm) * QQ Group: 392443393 + +# License +By contributing your code, you agree to license your contribution under the terms of the [sky-walking license](/LICENSE). diff --git a/README_ZH.md b/README_ZH.md index c484a6f26ec842c46ea66c55d5d79276f3ccba79..ed1a96897d77d178174e77a18668325f95f141d4 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -25,21 +25,19 @@ Sky Walking | [English](README.md) * UI工程请查看 [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) * 中文QQ群:392443393 +# PMC - Project Management Committee +* 吴晟 [@wu-sheng](https://github.com/wu-sheng) +* 张鑫 [@ascrutae](https://github.com/ascrutae) +* 彭勇升 [@peng-yongsheng](https://github.com/peng-yongsheng) R&D director,Tydic -# Contributors -_按首次加入时间排序_ -* 吴晟 [**PMC Member**] [@wu-sheng](https://github.com/wu-sheng) -* 张鑫 [**PMC Member**] [@ascrutae](https://github.com/ascrutae) -* 谭真 [@mircoteam](https://github.com/mircoteam) Advanced R&D Engineers, Creative & Interactive Group. -* 徐妍 [@TastySummer](https://github.com/TastySummer) -* 彭勇升 [**PMC Member**] [@pengys5](https://github.com/pengys5) R&D director,Tydic -* 戴文 +# Committer * 柏杨 [@bai-yang](https://github.com/bai-yang) Senior Engineer, Alibaba Group. -* 陈凤 [@trey03](https://github.com/trey03) -* [其他贡献者](https://github.com/wu-sheng/sky-walking/graphs/contributors) -This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. +# Contributors +* [Contributor List](https://github.com/wu-sheng/sky-walking/graphs/contributors) +* 特别感谢徐妍[@TastySummer](https://github.com/TastySummer) 和 戴文, 给予项目的大量的帮助. +This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. # Architecture * 3.2+版本架构图 @@ -79,3 +77,6 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU * [Gitter](https://gitter.im/sky-walking/Lobby) * [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm) * QQ群: 392443393 + +# License +所有贡献的代码,和 [sky-walking license](/LICENSE) 保持一致.