Merge branch 'master' of github.com:kubernetes-client/python into release-6.0

roycaihw · roycaihw · commit 0aef63d46928 · 2018-04-11T15:40:26.000-07:00
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
@@ -1 +1 @@
-Subproject commit 11da619c9ef7b2e26fe162e5feeb72d5bedcc5c9
+Subproject commit 789de6a60dea9442ee47601a788d92c653ea69e9
