Merge branch 'master' into mq

weed/shell/command_fs_merge_volumes.go

@@ -90,7 +90,7 @@ func (c *commandFsMergeVolumes) Do(args []string, commandEnv *CommandEnv, writer
 				"volume %d (%d MB) cannot merge into volume %d (%d MB_ due to volume size limit (%d MB)",
 				fromVolumeId, fromSize/1024/1024,
 				toVolumeId, toSize/1024/1024,
-				c.volumeSizeLimit/1024/102,
+				c.volumeSizeLimit/1024/1024,
 			)
 		}
 	}