Merge branch 'master' into shuning/bootstrap-time

tikv · May 18, 2017 · a62739b · a62739b
2 parents b413bae + d72a30d
commit a62739b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/typeutil/size.go b/pkg/typeutil/size.go
@@ -25,7 +25,7 @@ type ByteSize uint64
 
 // MarshalJSON returns the size as a JSON string.
 func (b ByteSize) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + gh.Bytes(uint64(b)) + `"`), nil
+	return []byte(`"` + gh.IBytes(uint64(b)) + `"`), nil
 }
 
 // UnmarshalJSON parses a JSON string into the bytesize.