Skip to content

Commit 598599e

Browse files
authored
Merge pull request #770 from puppetlabs/release-prep
Release prep v8.0.0
2 parents 8b396ca + 97695d1 commit 598599e

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

CHANGELOG.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
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).
44

5+
## [v8.0.0](https://github.com/puppetlabs/puppetlabs-concat/tree/v8.0.0) (2023-04-12)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.4.0...v8.0.0)
8+
9+
### Changed
10+
11+
- \(CONT-775\) Puppet 8 support [\#768](https://github.com/puppetlabs/puppetlabs-concat/pull/768) ([LukasAud](https://github.com/LukasAud))
12+
513
## [v7.4.0](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.4.0) (2023-04-12)
614

715
[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.3.3...v7.4.0)
@@ -69,15 +77,12 @@ All notable changes to this project will be documented in this file. The format
6977
- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 16.04 [\#728](https://github.com/puppetlabs/puppetlabs-concat/pull/728) ([david22swan](https://github.com/david22swan))
7078
- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#723](https://github.com/puppetlabs/puppetlabs-concat/pull/723) ([david22swan](https://github.com/david22swan))
7179
- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#718](https://github.com/puppetlabs/puppetlabs-concat/pull/718) ([david22swan](https://github.com/david22swan))
80+
- \(maint\) Allow stdlib 8.0.0 [\#716](https://github.com/puppetlabs/puppetlabs-concat/pull/716) ([smortex](https://github.com/smortex))
7281

7382
## [v7.1.1](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.1.1) (2021-08-25)
7483

7584
[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.1.0...v7.1.1)
7685

77-
### Fixed
78-
79-
- \(maint\) Allow stdlib 8.0.0 [\#716](https://github.com/puppetlabs/puppetlabs-concat/pull/716) ([smortex](https://github.com/smortex))
80-
8186
## [v7.1.0](https://github.com/puppetlabs/puppetlabs-concat/tree/v7.1.0) (2021-08-23)
8287

8388
[Full Changelog](https://github.com/puppetlabs/puppetlabs-concat/compare/v7.0.2...v7.1.0)
@@ -188,7 +193,6 @@ All notable changes to this project will be documented in this file. The format
188193
### Fixed
189194

190195
- \(FM-7725\) - Remove OSX testing/support for concat [\#561](https://github.com/puppetlabs/puppetlabs-concat/pull/561) ([lionce](https://github.com/lionce))
191-
- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#550](https://github.com/puppetlabs/puppetlabs-concat/pull/550) ([tphoney](https://github.com/tphoney))
192196

193197
## [5.2.0](https://github.com/puppetlabs/puppetlabs-concat/tree/5.2.0) (2018-12-10)
194198

@@ -202,6 +206,7 @@ All notable changes to this project will be documented in this file. The format
202206

203207
### Fixed
204208

209+
- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#550](https://github.com/puppetlabs/puppetlabs-concat/pull/550) ([tphoney](https://github.com/tphoney))
205210
- \(FM-7581\) - Fix CI failures for Windows 2016 and 10 Enterprise [\#540](https://github.com/puppetlabs/puppetlabs-concat/pull/540) ([eimlav](https://github.com/eimlav))
206211
- \(MODULES-8287\) - Fix fomat=\>'yaml' allowing only hashes [\#535](https://github.com/puppetlabs/puppetlabs-concat/pull/535) ([eimlav](https://github.com/eimlav))
207212
- \(FM-7513\) - Removing Windows 2016-core from our support matrix [\#534](https://github.com/puppetlabs/puppetlabs-concat/pull/534) ([pmcmaw](https://github.com/pmcmaw))
@@ -216,7 +221,6 @@ All notable changes to this project will be documented in this file. The format
216221

217222
- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#525](https://github.com/puppetlabs/puppetlabs-concat/pull/525) ([pmcmaw](https://github.com/pmcmaw))
218223
- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#524](https://github.com/puppetlabs/puppetlabs-concat/pull/524) ([tphoney](https://github.com/tphoney))
219-
- pdksync - \(MODULES-7658\) use beaker4 in puppet-module-gems [\#518](https://github.com/puppetlabs/puppetlabs-concat/pull/518) ([tphoney](https://github.com/tphoney))
220224

221225
## [5.0.0](https://github.com/puppetlabs/puppetlabs-concat/tree/5.0.0) (2018-08-24)
222226

REFERENCE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Default value: `false`
8787

8888
##### <a name="-concat--format"></a>`format`
8989

90-
Data type: `Optional[String]`
90+
Data type: `Enum['plain', 'yaml', 'json', 'json-array', 'json-pretty', 'json-array-pretty']`
9191

9292
Specify what data type to merge the fragments as. Valid options: 'plain', 'yaml', 'json', 'json-array', 'json-pretty',
9393
'json-array-pretty'.
@@ -96,7 +96,7 @@ Default value: `'plain'`
9696

9797
##### <a name="-concat--force"></a>`force`
9898

99-
Data type: `Optional[Boolean]`
99+
Data type: `Boolean`
100100

101101
Specifies whether to merge data structures, keeping the values with higher order. Used when format is specified as a value other than
102102
'plain'.
@@ -474,7 +474,7 @@ Manages the fragment.
474474
```puppet
475475
# The example is based on exported resources.
476476
477-
concat_fragment { \"uniqe_name_${::fqdn}\":
477+
concat_fragment { "uniqe_name_${::fqdn}":
478478
tag => 'unique_name',
479479
order => 10, # Optional. Default to 10
480480
content => 'some content' # OR

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-concat",
3-
"version": "7.4.0",
3+
"version": "8.0.0",
44
"author": "puppetlabs",
55
"summary": "Construct files from multiple fragments.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)