Merge pull request puppetlabs#1904 from puppetlabs/release

(MODULES-8841) - Release Merge back 4.1.0

Author: david22swan

CHANGELOG.md

@@ -2,9 +2,29 @@
 
 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).
 
-## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/3.6.0) (2019-01-07)
+## [4.1.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.1.0) (2019-04-03)
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...3.6.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/4.0.0...4.1.0)
+
+### Added
+
+- \(MODULES-7196\) Allow setting CASRootProxiedAs per virtualhost \(replaces \#1857\) [\#1900](https://github.com/puppetlabs/puppetlabs-apache/pull/1900) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
+- \(feat\) - Amazon Linux 2 compatibility added [\#1898](https://github.com/puppetlabs/puppetlabs-apache/pull/1898) ([david22swan](https://github.com/david22swan))
+- \(MODULES-8731\) Allow CIDRs for proxy\_ips/internal\_proxy in remoteip [\#1891](https://github.com/puppetlabs/puppetlabs-apache/pull/1891) ([JAORMX](https://github.com/JAORMX))
+- Manage all mod\_remoteip parameters supported by Apache [\#1882](https://github.com/puppetlabs/puppetlabs-apache/pull/1882) ([johanfleury](https://github.com/johanfleury))
+- MODULES-8541 : Allow HostnameLookups to be modified [\#1881](https://github.com/puppetlabs/puppetlabs-apache/pull/1881) ([k2patel](https://github.com/k2patel))
+- Add support for mod\_http2 [\#1867](https://github.com/puppetlabs/puppetlabs-apache/pull/1867) ([smortex](https://github.com/smortex))
+- Added code to paramertize the libphp prefix [\#1852](https://github.com/puppetlabs/puppetlabs-apache/pull/1852) ([grahamuk2018](https://github.com/grahamuk2018))
+- Added WSGI Options WSGIApplicationGroup and WSGIPythonOptimize [\#1847](https://github.com/puppetlabs/puppetlabs-apache/pull/1847) ([emetriqLikedeeler](https://github.com/emetriqLikedeeler))
+
+### Fixed
+
+- \(bugfix\) set kernel for facter version test [\#1895](https://github.com/puppetlabs/puppetlabs-apache/pull/1895) ([tphoney](https://github.com/tphoney))
+- \(MODULES-5990\) - Managing conf\_enabled [\#1875](https://github.com/puppetlabs/puppetlabs-apache/pull/1875) ([david22swan](https://github.com/david22swan))
+
+## [4.0.0](https://github.com/puppetlabs/puppetlabs-apache/tree/4.0.0) (2019-01-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apache/compare/3.5.0...4.0.0)
 
 ### Changed
 

README.md

@@ -1130,7 +1130,7 @@ Default: '100'.
 
 ##### `hostname_lookups`
 
-This directive enables DNS lookups so that host names can be logged (and passed to CGIs/SSIs in REMOTE_HOST). Values:'On','Off','Double'.
+This directive enables DNS lookups so that host names can be logged and passed to CGIs/SSIs in REMOTE_HOST. Values:'On','Off','Double'.
 
 Default: 'Off'.
 > **Note**: If enabled, it impacts performance significantly.
@@ -1308,7 +1308,7 @@ Default: `undef`
 
 ##### `protocols_honor_order`
 
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines whether the order of Protocols sets precedence during negotiation.
 
 Default: `undef`
 
@@ -2324,7 +2324,7 @@ HTTP/2 session that the server allows.
   Default: `undef`
 
 * `h2_tls_cool_down_secs`: Sets the number of seconds of idle time on a TLS
-  connection before the TLS write size falls back to small (~1300 bytes)
+  connection before the TLS write size falls back to a small (~1300 bytes)
   length.
 
   Integer.
@@ -3940,20 +3940,20 @@ directive which declares resources for early pushing to the client.
 ##### `h2_serialize_headers`
 
 Sets the [H2SerializeHeaders](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2serializeheaders)
-directive which toggles if HTTP/2 requests shall be serialized in HTTP/1.1
+directive which toggles if HTTP/2 requests are serialized in HTTP/1.1
 format for processing by httpd core.
 
 ##### `h2_stream_max_mem_size`
 
 Sets the [H2StreamMaxMemSize](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2streammaxmemsize)
 directive which sets the maximum number of outgoing data bytes buffered in
-memory for an active streams.
+memory for an active stream.
 
 ##### `h2_tls_cool_down_secs`
 
 Sets the [H2TLSCoolDownSecs](https://httpd.apache.org/docs/current/mod/mod_http2.html#h2tlscooldownsecs)
 directive which sets the number of seconds of idle time on a TLS connection
-before the TLS write size falls back to small (~1300 bytes) length.
+before the TLS write size falls back to a small (~1300 bytes) length.
 
 ##### `h2_tls_warm_up_size`
 
@@ -4473,7 +4473,7 @@ Default: `undef`
 
 ##### `protocols_honor_order`
 
-Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines if order of Protocols determines precedence during negotiation.
+Sets the [ProtocolsHonorOrder](https://httpd.apache.org/docs/current/en/mod/core.html#protocolshonororder) directive which determines wether the order of Protocols sets precedence during negotiation.
 
 Default: `undef`
 
@@ -6027,9 +6027,9 @@ The [`apache::mod::suphp`][] class is untested since repositories are missing co
 
 ### Testing
 
-Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have moved those acceptance tests into unit tests as much as possible.
+Due to the difficult and specialised nature of acceptance testing mods in apache IE (high OS specificity), we have replaced  acceptance tests with unit tests.
 
-To run the unit tests you have to install all the necessary gems:
+To run the unit tests, install the necessary gems:
 
 ```
 bundle install
@@ -6041,7 +6041,7 @@ And then execute the command:
 bundle exec rake parallel_spec
 ```
 
-To check the code coverage you can run the command:
+To check the code coverage, run:
 
 ```
 COVERAGE=yes bundle exec rake parallel_spec

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",