Skip to content

Commit

Permalink
Merge pull request kubernetes-client#367 from mbohlool/master
Browse files Browse the repository at this point in the history
Update documents for 4.0.0a release
  • Loading branch information
mbohlool authored Oct 17, 2017
2 parents c7152b3 + ca71ff7 commit 640c2aa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Master
# v4.0.0a1
- Update to Kubernetes 1.8 cluster
- IntOrString is now object thus it can be int or string. #18 #359
- Adding stream package to support calls like exec. The old way of calling them is deprecated. See [Troubleshooting](README.md#why-execattach-calls-doesnt-work)).
- config.http_proxy_url is deprecated. use configuration.proxy instead.
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ supported versions of Kubernetes clusters.

#### Compatibility matrix

| | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 |
| | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 | Kubernetes 1.8 |
|--------------------|----------------|----------------|----------------|----------------|----------------|
| client-python 1.0 | + | + | | - | - |
| client-python 2.0 | + | + | + | | - |
| client-python 3.0 | + | + | + | + | |
| client-python HEAD | + | + | + | + | + |
| client-python 1.0 | + | | - | - |- |
| client-python 2.0 | + | + | | - |- |
| client-python 3.0 | + | + | + | | |
| client-python HEAD | + | + | + | + | |

Key:

Expand All @@ -110,6 +110,7 @@ between client-python versions.
| 2.0.x | Kubernetes main repo, 1.6 branch ||
| 3.0 Alpha/Beta | Kubernetes main repo, 1.7 branch ||
| 3.0 | Kubernetes main repo, 1.7 branch ||
| 4.0 Alpha/Beta | Kubernetes main repo, 1.8 branch ||


Key:
Expand Down

0 comments on commit 640c2aa

Please sign in to comment.