Merge remote-tracking branch 'origin' into release-1.4

This commit is contained in:
Devin Donnelly
2016-09-23 16:57:30 -07:00
21 changed files with 155 additions and 43 deletions
+1 -1
View File
@@ -372,7 +372,7 @@ writers simultaneously.
__Important: You must have your own Ceph server running with the share exported
before you can use it__
See the [CephFS example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/cephfs/) for more details.
See the [CephFS example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/cephfs/) for more details.
### gitRepo