From a4b1e4c35bcbfeb527f1f2ec026ef7e519cb6ba7 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 5 Dec 2016 13:46:20 -0800 Subject: [PATCH] Merge pull request #29083 from cpuguy83/fix_volume_rm_metadata [1.12.x] Fix issue where volume metadata was not removed (cherry picked from commit 7613b23a583dba87f18005076ecbc84b408ebc5c) Signed-off-by: Sebastiaan van Stijn Conflicts: volume/store/store.go volume/store/store_test.go Upstream-commit: 9ffbc8b8144917deed71a35d2f044f6e674c66f5 Component: engine --- components/engine/volume/store/store_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/volume/store/store_test.go b/components/engine/volume/store/store_test.go index c94237ac33..f5f00255a1 100644 --- a/components/engine/volume/store/store_test.go +++ b/components/engine/volume/store/store_test.go @@ -212,7 +212,7 @@ func TestDerefMultipleOfSameRef(t *testing.T) { if err != nil { t.Fatal(err) } - + defer os.RemoveAll(dir) s, err := New(dir) if err != nil { t.Fatal(err)