From 3786339ddd5c7e1a98ecd16273212ea53e7c64a6 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 25 Aug 2015 11:59:18 -0600 Subject: [PATCH 1/2] Add Code of Conduct to the readme [closes #143] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index bbd11ff360a8..1ca31ed3f4f0 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,8 @@ Contributions to this library are always welcome and highly encouraged. See [CONTRIBUTING] for more information on how to get started. +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + Java Versions ------------- @@ -114,6 +116,7 @@ Apache 2.0 - See [LICENSE] for more information. [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md +[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE [cloud-platform]: https://cloud.google.com/ [cloud-datastore]: https://cloud.google.com/datastore/docs From 7bf5e7b626f05de45fea058a3e53b946b5961c59 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 25 Aug 2015 12:00:16 -0600 Subject: [PATCH 2/2] Add Code of Conduct to the contributing guide --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df4129b3ed6d..167bf18e5082 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,6 +45,11 @@ then you'll need to sign a [corporate CLA][corpcla]. You can sign these electronically (just scroll to the bottom). After that, we'll be able to accept your pull requests. +## Code of Conduct + +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + [gcloudcli]: https://developers.google.com/cloud/sdk/gcloud/ [indvcla]: https://developers.google.com/open-source/cla/individual [corpcla]: https://developers.google.com/open-source/cla/corporate +[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md