Merge remote-tracking branch 'origin/master'

Conflicts:
	weed-fs/src/cmd/weed/master.go

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})
 	}
 }