diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-01-14 09:56:13 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-01-14 09:56:13 -0800 |
| commit | 41bd5179f349c4ca424ccefe8e3541037510be8a (patch) | |
| tree | 7642d05344e05c9c390db94099a40e6ca8e0a1ce /go/weed | |
| parent | af416189f1dfdb621bb0ecc5483b915fb179ac6f (diff) | |
| parent | 996a1789e8ecb0254e87f8da7066813fdbf1df30 (diff) | |
| download | seaweedfs-41bd5179f349c4ca424ccefe8e3541037510be8a.tar.xz seaweedfs-41bd5179f349c4ca424ccefe8e3541037510be8a.zip | |
Resolve Conflicts
Diffstat (limited to 'go/weed')
| -rw-r--r-- | go/weed/weed_server/volume_server_handlers_helper.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/go/weed/weed_server/volume_server_handlers_helper.go b/go/weed/weed_server/volume_server_handlers_helper.go index 6d21ffb62..2bab35e45 100644 --- a/go/weed/weed_server/volume_server_handlers_helper.go +++ b/go/weed/weed_server/volume_server_handlers_helper.go @@ -93,7 +93,7 @@ func (w *countingWriter) Write(p []byte) (n int, err error) { return len(p), nil } -// rangesMIMESize returns the nunber of bytes it takes to encode the +// rangesMIMESize returns the number of bytes it takes to encode the // provided ranges as a multipart response. func rangesMIMESize(ranges []httpRange, contentType string, contentSize int64) (encSize int64) { var w countingWriter |