Merge pull request #16614 from pmorie/ro-managed

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-16 10:46:44 -08:00
34 changed files with 235 additions and 269 deletions

View File

@@ -515,8 +515,8 @@ func (f *stubVolume) GetPath() string {
return f.path
}
func (f *stubVolume) IsReadOnly() bool {
return false
func (f *stubVolume) GetAttributes() volume.Attributes {
return volume.Attributes{}
}
func (f *stubVolume) SetUp() error {
@@ -527,14 +527,6 @@ func (f *stubVolume) SetUpAt(dir string) error {
return nil
}
func (f *stubVolume) SupportsSELinux() bool {
return false
}
func (f *stubVolume) SupportsOwnershipManagement() bool {
return false
}
func TestMakeVolumeMounts(t *testing.T) {
container := api.Container{
VolumeMounts: []api.VolumeMount{