Ver Fonte

Documentation/op-guide: remove git merge line in monitoring.md

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
Gyu-Ho Lee há 8 anos atrás
pai
commit
9f49665284
1 ficheiros alterados com 0 adições e 1 exclusões
  1. 0 1
      Documentation/op-guide/monitoring.md

+ 0 - 1
Documentation/op-guide/monitoring.md

@@ -44,7 +44,6 @@ When	Elapsed (s)
 ## Metrics endpoint
 ## Metrics endpoint
 
 
 Each etcd server exports metrics under the `/metrics` path on its client port and optionally on interfaces given by `--listen-metrics-urls`.
 Each etcd server exports metrics under the `/metrics` path on its client port and optionally on interfaces given by `--listen-metrics-urls`.
->>>>>>> 607d0762e... Documentation/op-guide: remove grafana demo link
 
 
 The metrics can be fetched with `curl`:
 The metrics can be fetched with `curl`: