Merge branch 'master' of https://camlistore.googlesource.com/camlistore

pkg/blobserver/protocol/protocol.go

@@ -51,7 +51,7 @@ func (p *StatResponse) MarshalJSON() ([]byte, error) {
 // See doc/protocol/blob-upload-protocol.txt.
 type UploadResponse struct {
 	Received  []*RefAndSize `json:"received"`
-	ErrorText string        `json:"errortext,omitempty"`
+	ErrorText string        `json:"errorText,omitempty"`
 }
 
 func (p *UploadResponse) MarshalJSON() ([]byte, error) {

pkg/client/upload.go

@@ -488,6 +488,7 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, error) {
 		}
 	}
 
+	// TODO(mpl): use struct type instead of map for res.
 	ures, err := c.responseJSONMap("upload", resp)
 	if err != nil {
 		return errorf("json parse from upload error: %v", err)