File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,12 @@ kolla_image_tags:
4242 ironic_neutron_agent :
4343 rocky-9 : 2024.1-rocky-9-20241023T143407
4444 ubuntu-jammy : 2024.1-ubuntu-jammy-20241023T143407
45+ <<<<<<< HEAD
4546 letsencrypt :
4647 rocky-9 : 2024.1-rocky-9-20241206T090120
4748 ubuntu-jammy : 2024.1-ubuntu-jammy-20241206T090120
49+ =======
50+ grafana :
51+ rocky-9 : 2024.1-rocky-9-20241128T123708
52+ ubuntu-jammy : 2024.1-ubuntu-jammy-20241128T123708
53+ >>>>>>> 5192fc70 (Bump tag for new grafana images)
Original file line number Diff line number Diff line change 1414# - CVE-2023-31047
1515fluentd_allowed_vulnerabilities :
1616 - CVE-2024-27280
17+ grafana_allowed_vulnerabilities :
18+ - CVE-2024-8986
19+
1720
1821# ##############################################################################
1922# Dummy variable to allow Ansible to accept this file.
You can’t perform that action at this time.
0 commit comments