Merge branch 'master' into add_s3

2018-07-21 15:59:18 -07:00
parent 8480008a9a c98df05ed0
commit dc8dd8b486
5 changed files with 200 additions and 112 deletions
--- a/weed/server/master_ui/templates.go
+++ b/weed/server/master_ui/templates.go
@@ -39,7 +39,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
                <td><a href="http://{{ .Leader }}">{{ .Leader }}</a></td>
              </tr>
              <tr>
-                <td class="col-sm-2 field-label"><label>Peers:</label></td>
+                <td class="col-sm-2 field-label"><label>Other Masters:</label></td>
                <td class="col-sm-10"><ul class="list-unstyled">
                {{ range $k, $p := .Peers }}
                  <li><a href="{{ $p.ConnectionString }}">{{ $p.Name }}</a></li>