diff options
| author | Chris Lu <chris.lu@gmail.com> | 2012-10-09 21:10:47 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2012-10-09 21:10:47 -0700 |
| commit | 1d0be87e0e5739090032ec8ad09ecc9429fc26b5 (patch) | |
| tree | 07e916ea6537766f03f402846c7bad6d36b0235d | |
| parent | ce615b4e6f5b8d76e5bd76c33042b454b24082f4 (diff) | |
| parent | 8c2c5986c8e7ec7e7a2a7022e82685d8231faab9 (diff) | |
| download | seaweedfs-1d0be87e0e5739090032ec8ad09ecc9429fc26b5.tar.xz seaweedfs-1d0be87e0e5739090032ec8ad09ecc9429fc26b5.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
weed-fs/src/cmd/weed/master.go
| -rw-r--r-- | weed-fs/src/cmd/weed/master.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go index d9418daa4..08134f3bf 100644 --- a/weed-fs/src/cmd/weed/master.go +++ b/weed-fs/src/cmd/weed/master.go @@ -138,6 +138,7 @@ func volumeGrowHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotAcceptable) writeJson(w, r, map[string]string{"error": err.Error()}) } else { + w.WriteHeader(http.StatusNotAcceptable) writeJson(w, r, map[string]interface{}{"count": count}) } } |