mirror of
https://github.com/prometheus/prometheus.git
synced 2026-02-19 02:29:16 -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`.
|
||
|---|---|---|
| .. | ||
| check-go-mod-version.sh | ||
| compress_assets.sh | ||
| genproto.sh | ||
| get_module_version.sh | ||
| golangci-lint.yml | ||
| npm-deps.sh | ||
| package_assets.sh | ||
| sync_repo_files.sh | ||
| tools.go | ||
| ui_release.sh | ||