Merge pull request #49475 from jsafrane/fix-gluster-make

Automatic merge from submit-queue (batch tested with PRs 48911, 49475, 49438, 49362, 49274)

Fixed glusterfs mount options

Capacity of a slice is the third argument, not the second one.
We use append() to fill the slice, so it should be empty at the beginning
and with the right capacity.

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-07-24 20:39:13 -07:00
committed by GitHub

View File

@@ -353,7 +353,7 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
// Give a try without `auto_unmount` mount option, because
// it could be that gluster fuse client is older version and
// mount.glusterfs is unaware of `auto_unmount`.
noAutoMountOptions := make([]string, len(mountOptions))
noAutoMountOptions := make([]string, 0, len(mountOptions))
for _, opt := range mountOptions {
if opt != "auto_unmount" {
noAutoMountOptions = append(noAutoMountOptions, opt)