Merge pull request #3458 from mib-kd743naq/master

Switch unixfs.Metadata.MimeType to optional
ipfs · Dec 2, 2016 · ac16ac5 · ac16ac5
2 parents a542dea + 8ee4280
commit ac16ac5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/blocks/blockstore/util/remove.go b/blocks/blockstore/util/remove.go
@@ -29,7 +29,7 @@ type RmBlocksOpts struct {
 
 func RmBlocks(blocks bs.GCBlockstore, pins pin.Pinner, cids []*cid.Cid, opts RmBlocksOpts) (<-chan interface{}, error) {
 	// make the channel large enough to hold any result to avoid
-	// blocking while holding the GCLock	
+	// blocking while holding the GCLock
 	out := make(chan interface{}, len(cids))
 	go func() {
 		defer close(out)

diff --git a/unixfs/pb/unixfs.pb.go b/unixfs/pb/unixfs.pb.go
diff --git a/unixfs/pb/unixfs.proto b/unixfs/pb/unixfs.proto
@@ -16,5 +16,5 @@ message Data {
 }
 
 message Metadata {
-	required string MimeType = 1;
+	optional string MimeType = 1;
 }