Merge branch 'master' of github.com:kubernetes-client/python into rel…

…ease-6.0
kubernetes-client · Apr 11, 2018 · 0aef63d · 0aef63d
2 parents 73afbbc + 74ade9c
commit 0aef63d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v6.0.0
+- Config loader now supports OIDC auth [kubernetes-client/python-base#48](https://github.com/kubernetes-client/python-base/pull/48)
+- Bug fix: fix expiry time checking in API token refresh [kubernetes-client/python-base#55](https://github.com/kubernetes-client/python-base/pull/55)
+
 # v6.0.0b1
 - Update to Kubernetes 1.10 cluster
 - Config loader now raises exception on duplicated name in kubeconfig [kubernetes-client/python-base#47](https://github.com/kubernetes-client/python-base/pull/47)

diff --git a/kubernetes/base b/kubernetes/base