Skip to content

Commit c9f4997

Browse files
committed
Merge remote-tracking branch 'upstream/6.x' into merge_6x_jan26
* upstream/6.x: (maint) Update rubygems and remove unnecessary step (PA-4133) Add phoenix to CODEOWNERS Preserved the GH workflows in main, since all supported rubygems support the `--silent` flag.
2 parents 389dbf6 + 5bbd883 commit c9f4997

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# defaults
2-
* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers @puppetlabs/night-s-watch
2+
* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers
33

44
# PAL
55
/lib/puppet/pal @puppetlabs/bolt

0 commit comments

Comments
 (0)