Merge pull request #551 from ekohl/spec-helper-acceptance
Clean up acceptance spec helper
Add a note about Hiera merging lookup_options
Not that many people know this is an option and can get confused as to why their resources are missing bits and pieces that are in fact defined in their Hiera sources. This should clear all of that up.
Add an example of lookup_options
More details and explanatory examples in use for `lookup_options`.
Merge pull request #553 from bastelfreak/inifile
allow puppetlabs/inifile 4.x
Merge pull request #550 from sigv/536
Do a `deep` merge on `fpm` lookup
Fix running apt update on Debian family
Fix os::family name for Debian.
Merge pull request #554 from Hexta/fix_debian_apt_update
Fix running apt update on Debian family
Merge pull request #513 from voxpupuli/modulesync
modulesync 2.12.0 and drop puppet 4
Merge pull request #571 from CyberLine/master
add ability to define composer update channel
Merge pull request #556 from bastelfreak/travis
delete legacy travis directory
Merge pull request #557 from bovy89/master
add pool_purge option to init.pp
Use the correct prefix for pear on FreeBSD
As of 2018-03-08, pear is flavored/prefixed in FreeBSD[1]. Remove the special handling and use the configured prefix as for most other distributions. [1] See UPDATING note e.g. on https://www.freshports.org/devel/pear/
Auto-determine FreeBSD package prefix from version
If the php version has been set in globals, use it to determine the default package prefix on FreeBSD. This should be a compatible change, since the package prefix can still be overridden, and has to match the selected version anyway.
Merge pull request #552 from oxc/freebsd_prefix
Improve package prefix selection on FreeBSD
Merge pull request #567 from coreyralph/zend-ext-enable
Fix enabling of zend extensions