Skip to content

Commit b9ac34c

Browse files
authored
Merge pull request #2539 from puppetlabs/release-prep
Release prep v12.1.0
2 parents dcc3072 + e6a720d commit b9ac34c

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

Diff for: CHANGELOG.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@ All notable changes to this project will be documented in this file.
55

66
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).
77

8-
## [v12.0.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.3) - 2024-03-01
8+
## [v12.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.1.0) - 2024-04-03
9+
10+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.3...v12.1.0)
11+
12+
### Added
13+
14+
- vhost: Allow customizing show_diff [#2536](https://github.com/puppetlabs/puppetlabs-apache/pull/2536) ([kajinamit](https://github.com/kajinamit))
15+
16+
### Fixed
17+
18+
- Stop managing mime support package on Debian [#2526](https://github.com/puppetlabs/puppetlabs-apache/pull/2526) ([jcharaoui](https://github.com/jcharaoui))
19+
20+
## [v12.0.3](https://github.com/puppetlabs/puppetlabs-apache/tree/v12.0.3) - 2024-03-02
921

1022
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/v12.0.2...v12.0.3)
1123

Diff for: REFERENCE.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -3887,7 +3887,7 @@ The following parameters are available in the `apache::mod::mime` class:
38873887

38883888
##### <a name="-apache--mod--mime--mime_support_package"></a>`mime_support_package`
38893889

3890-
Data type: `String`
3890+
Data type: `Optional[String]`
38913891

38923892
Name of the MIME package to be installed.
38933893

@@ -7544,6 +7544,7 @@ The following parameters are available in the `apache::vhost` defined type:
75447544
* [`error_log_format`](#-apache--vhost--error_log_format)
75457545
* [`error_documents`](#-apache--vhost--error_documents)
75467546
* [`ensure`](#-apache--vhost--ensure)
7547+
* [`show_diff`](#-apache--vhost--show_diff)
75477548
* [`fallbackresource`](#-apache--vhost--fallbackresource)
75487549
* [`filters`](#-apache--vhost--filters)
75497550
* [`h2_copy_files`](#-apache--vhost--h2_copy_files)
@@ -8158,6 +8159,14 @@ Specifies if the virtual host is present or absent.<br />
81588159

81598160
Default value: `'present'`
81608161

8162+
##### <a name="-apache--vhost--show_diff"></a>`show_diff`
8163+
8164+
Data type: `Boolean`
8165+
8166+
Specifies whether to set the show_diff parameter for the file resource.
8167+
8168+
Default value: `true`
8169+
81618170
##### <a name="-apache--vhost--fallbackresource"></a>`fallbackresource`
81628171

81638172
Data type: `Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]]`

Diff for: metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-apache",
3-
"version": "12.0.3",
3+
"version": "12.1.0",
44
"author": "puppetlabs",
55
"summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)