---

aozarov · aozarov · commit 3f9d97ca44bb · 2015-08-26T12:53:55.000-07:00
yaml --- r: 577 b: refs/heads/master c: 6595ed3 h: refs/heads/master i: 575: 68a2ac3 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 075e1a58711a1c8706ac60f85a351743dcee7a12
+refs/heads/master: 6595ed3a3a0f24643f99c2629f3ffea582a297a5
 refs/heads/travis: f6a7282f13bbc41cf256f07b6f75ad1425aebd75
 refs/heads/gh-pages: 2cc964c1ecc5d653c449b81ee9e924182b221d18
diff --git a/trunk/CONTRIBUTING.md b/trunk/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
diff --git a/trunk/README.md b/trunk/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
