Skip to content

Commit 4d5c48a

Browse files
authored
Merge pull request #463 from puppetlabs/release
Release mergeback version 6.0.0
2 parents 0a86900 + ac9f981 commit 4d5c48a

File tree

3 files changed

+28
-2
lines changed

3 files changed

+28
-2
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
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+
## [v6.0.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.0.0) (2021-07-26)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v5.1.0...v6.0.0)
8+
9+
### Changed
10+
11+
- \[IAC-1690\] - Remove tomcat7 as is EOL [\#459](https://github.com/puppetlabs/puppetlabs-tomcat/pull/459) ([daianamezdrea](https://github.com/daianamezdrea))
12+
13+
### Added
14+
15+
- \(MODULES-9520\) Allow removal of webapps [\#456](https://github.com/puppetlabs/puppetlabs-tomcat/pull/456) ([daianamezdrea](https://github.com/daianamezdrea))
16+
- Accept Datatype Sensitive for Secrets [\#454](https://github.com/puppetlabs/puppetlabs-tomcat/pull/454) ([cocker-cc](https://github.com/cocker-cc))
17+
18+
### Fixed
19+
20+
- \[MODULES-9781\] - Add examples for catalina attributes and properties [\#453](https://github.com/puppetlabs/puppetlabs-tomcat/pull/453) ([daianamezdrea](https://github.com/daianamezdrea))
21+
522
## [v5.1.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v5.1.0) (2021-05-24)
623

724
[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v5.0.0...v5.1.0)

REFERENCE.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1769,7 +1769,7 @@ Default value: ``undef``
17691769

17701770
##### <a name="password"></a>`password`
17711771

1772-
Data type: `Any`
1772+
Data type: `Optional[Variant[String, Sensitive[String]]]`
17731773

17741774
Specifies a password for user elements. Valid options: a string.
17751775

@@ -1923,6 +1923,7 @@ The following parameters are available in the `tomcat::install` defined type:
19231923
* [`package_ensure`](#package_ensure)
19241924
* [`package_name`](#package_name)
19251925
* [`package_options`](#package_options)
1926+
* [`remove_default_webapps`](#remove_default_webapps)
19261927

19271928
##### <a name="catalina_home"></a>`catalina_home`
19281929

@@ -2046,6 +2047,14 @@ Data type: `Any`
20462047

20472048
Specify additional options to use on the generated package resource. See the documentation of the [package](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) for possible values.
20482049

2050+
Default value: ``undef``
2051+
2052+
##### <a name="remove_default_webapps"></a>`remove_default_webapps`
2053+
2054+
Data type: `Optional[Array[String]]`
2055+
2056+
2057+
20492058
Default value: ``undef``
20502059

20512060
### <a name="tomcatinstance"></a>`tomcat::instance`

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-tomcat",
3-
"version": "5.1.0",
3+
"version": "6.0.0",
44
"author": "puppetlabs",
55
"summary": "Installs, deploys, and configures Apache Tomcat web services.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)