Merge pull request #3037 from pmorie/upstream-9384

Merged by openshift-bot
openshift · Jun 10, 2015 · 39b2789 · 39b2789
2 parents 87277ef + 92f11fa
commit 39b2789
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir/empty_dir.go b/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir/empty_dir.go