Merge branch '2.7.x'
- 2.7.x: (#10722) Add spec to verify that an error is logged on bad http (#10722) Refactor http_spec to use expectations Updating CHANGELOG for 2.7.12rc2 (#7592) Remove redundant call to String#to_s (#11988) Work around Augeas reload bug when changing save modes (#11988) Don't overwrite symlinks in augeas provider (#8312) Fix zypper provider so ensure => 'latest' now works (#12844) Fix a unit test relating to lockfiles (#12914) Allow puppet to be interrupted while waiting for child (#12933) Better error message when agent is administratively disabled (#7592) Remove redundant call to String#to_s (#12844) Agent lockfiles: backwards compatibility with 2.7.10/2.7.11 (#10722) Display errors on HTTP report submission failures Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x" Revert "(#12844) Backwards compatibility for 'puppet agent --enable'" (#11988) Work around Augeas reload bug when changing save modes (#11988) Don't overwrite symlinks in augeas provider (#12881) Fix cron type default name error on windows (#12844) Backwards compatibility for 'puppet agent --enable' (#8312) Fix zypper provider so ensure => 'latest' now works
Conflicts:
lib/puppet/provider/augeas/augeas.rb
lib/puppet/reports/http.rb
lib/puppet/util/pidlock.rb
spec/unit/application/agent_spec.rb
spec/unit/provider/augeas/augeas_spec.rb
spec/unit/reports/http_spec.rb