Fix duplicate stanza in database_ini.pp#8
Merged
cprice404 merged 1 commit intopuppetlabs:masterfrom Sep 21, 2012
Merged
Conversation
There was a minor problem with a merge conflict in the previous commit. This commit should fix it.
cprice404
added a commit
that referenced
this pull request
Sep 21, 2012
Fix duplicate stanza in database_ini.pp
mcanevet
added a commit
to mcanevet/puppet-puppetdb
that referenced
this pull request
Jul 10, 2013
Use postgresql::database_user instead of postgresql::user in puppetdb::d...
This file contains hidden or 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
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.
There was a minor problem with a merge conflict in the previous
commit. This commit should fix it.