mirror of
https://github.com/prometheus/prometheus.git
synced 2026-02-20 00:10:23 -05:00
Conflicts:
cmd/prometheus/main.go
docs/command-line/prometheus.md
docs/feature_flags.md
web/ui/build_ui.sh
web/web.go
Resolved by dropping the UTF-8 feature flag and adding the
`auto-reload-config` feature flag.
For the new web ui pick all changes from `main`.
|
||
|---|---|---|
| .. | ||
| api.md | ||
| basics.md | ||
| examples.md | ||
| functions.md | ||
| index.md | ||
| operators.md | ||
| remote_read_api.md | ||