mirror of https://github.com/prometheus/prometheus
fa318711f4
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`.
|
||
|---|---|---|
| .. | ||
| testdata | ||
| clientprotobuf.go | ||
| helpers_test.go | ||
| manager.go | ||
| manager_test.go | ||
| metrics.go | ||
| scrape.go | ||
| scrape_test.go | ||
| target.go | ||
| target_test.go | ||