gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	weed-fs/src/cmd/weed/master.go
This commit is contained in:
Chris Lu
2012-10-09 21:10:47 -07:00
parent ce615b4e6f 8c2c5986c8
commit 1d0be87e0e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
weed-fs/src/cmd/weed/master.go
View File

@@ -138,6 +138,7 @@ func volumeGrowHandler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNotAcceptable) w.WriteHeader(http.StatusNotAcceptable)
writeJson(w, r, map[string]string{"error": err.Error()}) writeJson(w, r, map[string]string{"error": err.Error()})
} else { } else {
w.WriteHeader(http.StatusNotAcceptable)
writeJson(w, r, map[string]interface{}{"count": count}) writeJson(w, r, map[string]interface{}{"count": count})
} }
} }