Merge pull request #16069 from zmerlynn/nfs-1.1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-28 22:39:09 -07:00
17 changed files with 217 additions and 219 deletions

View File

@@ -308,9 +308,13 @@ func TestExampleObjectSchemas(t *testing.T) {
"wordpress": &api.Pod{},
},
"../examples/nfs": {
"nfs-server-pod": &api.Pod{},
"nfs-busybox-rc": &api.ReplicationController{},
"nfs-server-rc": &api.ReplicationController{},
"nfs-server-service": &api.Service{},
"nfs-web-pod": &api.Pod{},
"nfs-pv": &api.PersistentVolume{},
"nfs-pvc": &api.PersistentVolumeClaim{},
"nfs-web-rc": &api.ReplicationController{},
"nfs-web-service": &api.Service{},
},
"../docs/user-guide/node-selection": {
"pod": &api.Pod{},