whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master to 1.10, with fixes (#7682)

Browse Source
This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by zacharysarah
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference/index.md
+6
View File
@@ -23,12 +23,18 @@ client libraries:
- [Kubernetes Go client library](https://github.com/kubernetes/client-go/)
<<<<<<< HEAD
<<<<<<< HEAD
- [Kubernetes Python client library](https://github.com/kubernetes-client/python)
||||||| merged common ancestors
- [Kubernetes Python client libary](https://github.com/kubernetes-incubator/client-python)
=======
- [Kubernetes Python client library](https://github.com/kubernetes-incubator/client-python)
>>>>>>> fix description about client library (#7634)
||||||| merged common ancestors
- [Kubernetes Python client library](https://github.com/kubernetes-incubator/client-python)
=======
- [Kubernetes Python client library](https://github.com/kubernetes-client/python)
>>>>>>> merge master to 1.10, with fixes (#7682)
## CLI Reference