From a3ef4c4357a6280abc5acd79d462a49fad2afc85 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Wed, 13 Dec 2017 01:19:49 -0600 Subject: [PATCH 1/2] make websocket-client dependency more open fixes: https://github.com/kubernetes-incubator/client-python/issues/413 The issue as reported in https://github.com/kubernetes-incubator/client-python/issues/262 was not reproduced in versions of websocketclient over 0.43.0, so just mask the known bad versions. This allows consumption of possible security fixes and allows the client to be co-installable with more python libraries. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 93ec625e8..79801e1cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From e87b35225016b2c6377e8098a679f176c4a53200 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 20 Dec 2017 14:11:09 -0500 Subject: [PATCH 2/2] Update code-of-conduct.md Refer to kubernetes/community as authoritative source for code of conduct --- code-of-conduct.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index 622d4c1d1..0d15c00cf 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -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)