Merge pull request #6 from chrislusf/master

merge seaweed master
2019-09-12 11:44:09 +01:00
parent c1a928887a ae53f63680
commit d8c34b032f
12 changed files with 130 additions and 118 deletions
--- a/weed/filer2/memdb/memdb_store_test.go
+++ b/weed/filer2/memdb/memdb_store_test.go
@@ -139,7 +139,7 @@ func TestCreateFileAndList(t *testing.T) {
 	}

 	// delete file and count
-	filer.DeleteEntryMetaAndData(ctx, file3Path, false, false)
+	filer.DeleteEntryMetaAndData(ctx, file3Path, false, false, false)
 	entries, _ = filer.ListDirectoryEntries(ctx, filer2.FullPath("/home/chris/this/is"), "", false, 100)
 	if len(entries) != 1 {
 		t.Errorf("list entries count: %v", len(entries))