Merge pull request #317 from thockin/release-3.x

Change CONTRIBUTING.md to CNCF CLA

CONTRIBUTING.md

@@ -1,19 +1,17 @@
-# Contributing guidelines
+# Contributing
 
-We'd love to accept your patches! Before we can take them, we have to jump a couple of legal hurdles.
+Welcome to git-sync!
 
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
+The [Kubernetes community repo](https://github.com/kubernetes/community) contains information about how to get started, how the community organizes, and more.
 
-  * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](http://code.google.com/legal/individual-cla-v1.0.html).
-  * If you work for a company that wants to allow you to contribute your work, then you'll need to sign a [corporate CLA](http://code.google.com/legal/corporate-cla-v1.0.html).
+## Sign the CLA
 
-Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests.
+We'd love to accept your patches, but before we can do that, you must sign the CNCF [Contributor License Agreement](https://git.k8s.io/community/contributors/guide/README.md#sign-the-cla).
 
-***NOTE***: Only original source code from you and other people that have signed the CLA can be accepted into the main repository. This policy does not apply to [third_party](third_party/).
 
-### Contributing A Patch
+## Contributing A Patch
 
 1. Submit an issue describing your proposed change.
-1. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
+1. If your proposal is accepted, and you haven't already done so, sign the Contributor License Agreement (see details above).
+1. Fork the repo, develop and test your code changes.  Don't forget tests!
 1. Submit a pull request.