Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.2.x to master #581

Merged
merged 9 commits into from
Mar 11, 2015

Conversation

underscorgan
Copy link
Contributor

No description provided.

Morgan Haskel and others added 9 commits March 6, 2015 15:49
You don't have access to parameters within the parameter list.
Rework defaults for `$object_name` in `postgresql::server::grant`
This reverts commit d92b254.

Conflicts:
	spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
Revert "(MODULES-661) Add host parameter to psql commands"
Remove references to host parameter since the vote was to revert that
jonnytdevops added a commit that referenced this pull request Mar 11, 2015
@jonnytdevops jonnytdevops merged commit 1f88cc3 into puppetlabs:master Mar 11, 2015
@underscorgan underscorgan deleted the merge_4.2.x_to_master branch March 11, 2015 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants