Merge pull request #19502 from swagiaal/internalize-ownership

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-26 23:06:39 -08:00
43 changed files with 219 additions and 227 deletions

View File

@@ -524,7 +524,7 @@ func TestGetPodVolumesFromDisk(t *testing.T) {
expectedPaths := []string{}
for i := range volsOnDisk {
fv := volume.FakeVolume{PodUID: volsOnDisk[i].podUID, VolName: volsOnDisk[i].volName, Plugin: plug}
fv.SetUp()
fv.SetUp(nil)
expectedPaths = append(expectedPaths, fv.GetPath())
}
@@ -559,11 +559,11 @@ func (f *stubVolume) GetAttributes() volume.Attributes {
return volume.Attributes{}
}
func (f *stubVolume) SetUp() error {
func (f *stubVolume) SetUp(fsGroup *int64) error {
return nil
}
func (f *stubVolume) SetUpAt(dir string) error {
func (f *stubVolume) SetUpAt(dir string, fsGroup *int64) error {
return nil
}