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 master to 2.1.x #549

Merged
merged 28 commits into from Jul 22, 2015
Merged

Conversation

underscorgan
Copy link

No description provided.

justinstoller and others added 28 commits June 8, 2015 21:50
…-puppet-version

(maint) allow setting PUPPET_VERSION in acceptance
Add helper to install puppet/pe/puppet-agent
Just mostly commas and wording and other edit-y stuff.
Corrected typo
Don't add puppetlabs sources for lucid
hashes are not supported in selectors
Added additional header template for apt.conf style comments
Fix use of $::apt::params::backports and $::apt::params::xfacts.
…params

Revert "Fix use of $::apt::params::backports and $::apt::params::xfac…
Corrected documentation warning about `purge` parameters to fit v2.1.0 syntax
@underscorgan
Copy link
Author

Not sure why git couldn't figure out how to ff this, but these were all bug fixes

bmjen added a commit that referenced this pull request Jul 22, 2015
@bmjen bmjen merged commit 1f7cff5 into puppetlabs:2.1.x Jul 22, 2015
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