Skip to content

Commit

Permalink
Merge a25dda0 into 0cfd6a5
Browse files Browse the repository at this point in the history
  • Loading branch information
dhoppe authored May 5, 2020
2 parents 0cfd6a5 + a25dda0 commit 61ad8a9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v7.0.1](https://github.com/voxpupuli/puppet-php/tree/v7.0.1) (2020-01-21)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v7.0.0...v7.0.1)

**Fixed bugs:**

- Do a `deep` merge on `fpm` lookup [\#550](https://github.com/voxpupuli/puppet-php/pull/550) ([sigv](https://github.com/sigv))

**Closed issues:**

- Fpm config results in "expects a Hash value, got Tuple" [\#536](https://github.com/voxpupuli/puppet-php/issues/536)
- composer created as folder not binary file [\#535](https://github.com/voxpupuli/puppet-php/issues/535)
- Forge Release [\#528](https://github.com/voxpupuli/puppet-php/issues/528)

**Merged pull requests:**

- allow puppetlabs/inifile 4.x [\#553](https://github.com/voxpupuli/puppet-php/pull/553) ([bastelfreak](https://github.com/bastelfreak))
- Clean up acceptance spec helper [\#551](https://github.com/voxpupuli/puppet-php/pull/551) ([ekohl](https://github.com/ekohl))

## [v7.0.0](https://github.com/voxpupuli/puppet-php/tree/v7.0.0) (2019-09-12)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v6.0.2...v7.0.0)
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-php",
"version": "7.0.1-rc0",
"version": "7.0.1",
"author": "Vox Pupuli",
"summary": "Generic PHP module that supports many platforms",
"license": "MIT",
Expand Down

0 comments on commit 61ad8a9

Please sign in to comment.