mirror of
https://github.com/prometheus/prometheus.git
synced 2026-07-01 21:46:10 -04: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`.
|
||
|---|---|---|
| .. | ||
| public | ||
| src | ||
| .env | ||
| .eslintrc.json | ||
| .gitignore | ||
| package-lock.json | ||
| package.json | ||
| tsconfig.json | ||