Merge branch 'master' into fix-guestbook-go-build

This commit is contained in:
Matthias Luebken
2016-03-24 13:37:16 +01:00
2366 changed files with 174197 additions and 66105 deletions

View File

@@ -21,7 +21,7 @@ refer to the docs that go with that version.
<!-- TAG RELEASE_LINK, added by the munger automatically -->
<strong>
The latest release of this document can be found
[here](http://releases.k8s.io/release-1.1/examples/guestbook-go/README.md).
[here](http://releases.k8s.io/release-1.2/examples/guestbook-go/README.md).
Documentation for other releases can be found at
[releases.k8s.io](http://releases.k8s.io).

View File

@@ -21,7 +21,7 @@ refer to the docs that go with that version.
<!-- TAG RELEASE_LINK, added by the munger automatically -->
<strong>
The latest release of this document can be found
[here](http://releases.k8s.io/release-1.1/examples/guestbook-go/_src/README.md).
[here](http://releases.k8s.io/release-1.2/examples/guestbook-go/_src/README.md).
Documentation for other releases can be found at
[releases.k8s.io](http://releases.k8s.io).