Merge branch 'master' into master

This commit is contained in:
Mehdy Bohlool 2018-01-08 11:06:25 -08:00 committed by GitHub
commit e052af3998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,3 @@
## Kubernetes Community Code of Conduct
# Kubernetes Community Code of Conduct
Kubernetes follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]()
Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md)

View File

@ -6,6 +6,6 @@ urllib3>=1.19.1,!=1.21 # MIT
pyyaml>=3.12 # MIT
google-auth>=1.0.1 # Apache-2.0
ipaddress>=1.0.17 # PSF
websocket-client>=0.32.0,<=0.40.0 # LGPLv2+
websocket-client>=0.32.0,!=0.40.0,!=0.41.*,!=0.42.* # LGPLv2+
requests # Apache-2.0
requests-oauthlib # ISC