Merge branch 'master' into support_ssd_volume

weed/operation/delete_content.go

@@ -4,12 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"google.golang.org/grpc"
 	"net/http"
 	"strings"
 	"sync"
 
-	"google.golang.org/grpc"
-
 	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
 )
 

weed/operation/submit.go

@@ -33,7 +33,7 @@ type FilePart struct {
 
 type SubmitResult struct {
 	FileName string `json:"fileName,omitempty"`
-	FileUrl  string `json:"fileUrl,omitempty"`
+	FileUrl  string `json:"url,omitempty"`
 	Fid      string `json:"fid,omitempty"`
 	Size     uint32 `json:"size,omitempty"`
 	Error    string `json:"error,omitempty"`