mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
prometheus/cmd
History
Jan Fajerski fa318711f4 Merge branch 'main' into 3.0-main-sync-24-09-09 
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`.
2024-09-09 15:44:22 +02:00
..
prometheus Merge branch 'main' into 3.0-main-sync-24-09-09 2024-09-09 15:44:22 +02:00
promtool Merge branch 'main' into 3.0-main-sync-24-09-09 2024-09-09 15:44:22 +02:00