Cherry picks for Foreman 3.12.0-rc2

theforeman · Sep 4, 2024 · 18c5583 · 18c5583
1 parent 0808f97
commit 18c5583
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -9,8 +9,8 @@ mod 'theforeman/dns',                  '~> 11.0.0'
 mod 'theforeman/puppetserver_foreman', '~> 4.0.0'
 mod 'theforeman/tftp',                 '~> 9.1.0'
 mod 'katello/candlepin',               '~> 16.1.0'
-mod 'theforeman/pulpcore',             '~> 10.3.0'
-mod 'theforeman/foreman',              '~> 25.2.0'
+mod 'theforeman/pulpcore',             '~> 10.4.0'
+mod 'theforeman/foreman',              '~> 25.2.1'
 mod 'theforeman/foreman_proxy',        '~> 26.1.0'
 mod 'theforeman/puppet',               '~> 20.0.0'
 mod 'katello/foreman_proxy_content',   '~> 29.0.1'

diff --git a/Puppetfile.lock b/Puppetfile.lock
@@ -61,7 +61,7 @@ FORGE
     theforeman-dns (11.0.0)
       puppetlabs-concat (>= 4.1.0, < 10.0.0)
       puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
-    theforeman-foreman (25.2.0)
+    theforeman-foreman (25.2.1)
       puppet-extlib (>= 3.0.0, < 8.0.0)
       puppet-redis (>= 5.0.0, < 12.0.0)
       puppet-systemd (>= 3.1.0, < 8.0.0)
@@ -79,7 +79,7 @@ FORGE
       theforeman-dns (>= 11.0.0, < 12.0.0)
       theforeman-foreman (>= 19.0.0, < 26.0.0)
       theforeman-tftp (>= 3.0.0, < 10.0.0)
-    theforeman-pulpcore (10.3.0)
+    theforeman-pulpcore (10.4.0)
       puppet-extlib (>= 3.0.0, < 8.0.0)
       puppet-redis (>= 5.0.0, < 12.0.0)
       puppet-systemd (>= 2.2.0, < 8.0.0)
@@ -108,9 +108,9 @@ DEPENDENCIES
   puppetlabs-vcsrepo (>= 5.2.0)
   theforeman-dhcp (~> 9.2.0)
   theforeman-dns (~> 11.0.0)
-  theforeman-foreman (~> 25.2.0)
+  theforeman-foreman (~> 25.2.1)
   theforeman-foreman_proxy (~> 26.1.0)
-  theforeman-pulpcore (~> 10.3.0)
+  theforeman-pulpcore (~> 10.4.0)
   theforeman-puppet (~> 20.0.0)
   theforeman-puppetserver_foreman (~> 4.0.0)
   theforeman-tftp (~> 9.1.0)