Merge pull request #769 from puppetlabs/release-prep

Release prep v7.4.0

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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).
 
+## [v7.4.0](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.4.0) (2023-04-12)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.3.3...v7.4.0)
+
+### Added
+
+- Add parameter to not create empty files when no fragments are defined [\#766](https://github.com/puppetlabs/puppetlabs-concat/pull/766) ([JonasVerhofste](https://github.com/JonasVerhofste))
+
+### Fixed
+
+- puppet5: drop remnants of puppet5 code [\#761](https://github.com/puppetlabs/puppetlabs-concat/pull/761) ([b4ldr](https://github.com/b4ldr))
+- Allow content parameter of concat\_fragment to be Sensitive [\#757](https://github.com/puppetlabs/puppetlabs-concat/pull/757) ([baurmatt](https://github.com/baurmatt))
+
 ## [v7.3.3](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.3.3) (2023-03-13)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.3.2...v7.3.3)
@@ -56,7 +69,6 @@ All notable changes to this project will be documented in this file. The format
 - pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#728](https://github.com/puppetlabs/puppetlabs-concat/pull/728) ([david22swan](https://github.com/david22swan))
 - pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#723](https://github.com/puppetlabs/puppetlabs-concat/pull/723) ([david22swan](https://github.com/david22swan))
 - pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#718](https://github.com/puppetlabs/puppetlabs-concat/pull/718) ([david22swan](https://github.com/david22swan))
-- fix merge nil hashes [\#708](https://github.com/puppetlabs/puppetlabs-concat/pull/708) ([thde](https://github.com/thde))
 
 ## [v7.1.1](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.1.1) (2021-08-25)
 
@@ -70,16 +82,17 @@ All notable changes to this project will be documented in this file. The format
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.0.2...v7.1.0)
 
-## [v7.0.2](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.0.2) (2021-06-21)
-
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.0.1...v7.0.2)
-
 ### Added
 
 - pdksync - \(IAC-1709\) - Add Support for Debian 11 [\#713](https://github.com/puppetlabs/puppetlabs-concat/pull/713) ([david22swan](https://github.com/david22swan))
 
+## [v7.0.2](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.0.2) (2021-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.0.1...v7.0.2)
+
 ### Fixed
 
+- fix merge nil hashes [\#708](https://github.com/puppetlabs/puppetlabs-concat/pull/708) ([thde](https://github.com/thde))
 - Do not modify metaparams in place [\#705](https://github.com/puppetlabs/puppetlabs-concat/pull/705) ([ekohl](https://github.com/ekohl))
 
 ## [v7.0.1](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.0.1) (2021-03-29)

REFERENCE.md

@@ -246,7 +246,7 @@ The following parameters are available in the `concat::fragment` defined type:
 
 ##### <a name="-concat--fragment--content"></a>`content`
 
-Data type: `Optional[Variant[String, Deferred]]`
+Data type: `Optional[Variant[Sensitive[String], String, Deferred]]`
 
 Supplies the content of the fragment. Note: You must supply either a content parameter or a source parameter.
 Allows a String or a Deferred function which returns a String.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-concat",
-  "version": "7.3.3",
+  "version": "7.4.0",
   "author": "puppetlabs",
   "summary": "Construct files from multiple fragments.",
   "license": "Apache-2.0",