From: Tim Skirvin <tskirvin@fnal.gov>
Date: Sun, 1 May 2022 23:39:30 +0000 (-0500)
Subject: Merge branch 'main' into rhel9
X-Git-Tag: v3.5.0~1^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=299ab104eaa75e8ff98b8153dcbf134be00b5e79;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'main' into rhel9
---

299ab104eaa75e8ff98b8153dcbf134be00b5e79
diff --cc CHANGELOG.md
index f3bde21,600aa10..822000e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -2,13 -2,18 +2,25 @@@
  
  All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
  
 +## Uncommitted
 +
 +- Initial CentOS Stream 9/RHEL9 Support
 +- Added a hook (not good enough yet) for deciding whether we try to remove
 +  the firewalld package (we were removing it before, but it's necessary
 +  on CS9/RHEL9 hosts)
 +
+ ## [v3.4.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.4.0) (2022-02-28)
+ 
+ [Full Changelog](https://github.com/puppetlabs/puppetlabs-firewall/compare/v3.3.0...v3.4.0)
+ 
+ ### Added
+ 
+ - \(SEC-944\) Handle duplicate system rules [\#1030](https://github.com/puppetlabs/puppetlabs-firewall/pull/1030) ([chelnak](https://github.com/chelnak))
+ 
+ ### Fixed
+ 
+ - pdksync - \(IAC-1787\) - Remove Support for CentOS 6 [\#1027](https://github.com/puppetlabs/puppetlabs-firewall/pull/1027) ([david22swan](https://github.com/david22swan))
+ 
  ## [v3.3.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.3.0) (2021-12-15)
  
  [Full Changelog](https://github.com/puppetlabs/puppetlabs-firewall/compare/v3.2.0...v3.3.0)