Mergeback 4.4.x to master #670
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Once puppetlabs-apt 2.1.0 is released (2015-06-16) the postgresql module will be compatible with apt 1.x (>= 1.8.0) and 2.x (>= 2.1.0). This will *not* work with puppetlabs-apt 2.0.x.
Since concat 2.0.x releases have been removed
Update dependencies
Release 4.4.0 prep
Unpins apt 1.8 dependency in fixtures.yml and spec_helper_acceptance.
- Issue with fact() was being called against default instead of using fact_on when iterating against each host, also was installing 3.8.1 despite specifying PUPPET_VERSION=1.1.1 so updated to use beaker-puppet_install_helper
Since postgresql-9.1_9.1.16-0+deb7u1 on wheezy, postgresql can't read snakeoil certificate as symlink anymore, so server does not restart. This patch copies cert and key instead of symlinking so that it works again.
Sync with master
serverspec's be_listening uses net-tools' netstat utility to check for open ports. This was puleld in until recently by puppet-agent packages. Now this has changed and we need to install this manually.
(FM-2923) install net-tools for tests
updates release date on CHANGELOG
adds acceptance tests for postgresql::server::recovery resource
fixes postgresql::server:recovery acceptance tests
$manage_package_repo wasn't in scope for the template systemd-override.erb This was causing all RHEL7 systems with manage_package_repo on to fail on startup using systemctl, as the proper path to the original service file is set incorrectly. This patch adds the manage_package_repo to the top of the ::config class, and adds some basic tests in config_spec.rb to ensure we don't regress on this. Signed-off-by: Ken Barber <ken@bob.sh>
…d_override_for_manage_package_repo (MODULES-2181) Fix variable scope for systemd-override
Increment version number for 4.4.1
When executing a command with environment variables, the withenv helper under Puppet 2.7 is on Puppet::Util::Execution and on 3.0 to 3.3, it's on Puppet::Util.
updates metadata.json to include support for pe 2015.2
Fix incorrect metadata
underscorgan
pushed a commit
that referenced
this pull request
Jul 13, 2015
Mergeback 4.4.x to master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.