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 2.0.x to master #502

Merged
merged 125 commits into from
Apr 22, 2015
Merged

Conversation

underscorgan
Copy link

No description provided.

Morgan Haskel and others added 30 commits February 15, 2015 09:09
…_upgrades_remains

Remove some vars for unattended_upgrades.
I'm not entirely clear on the history behind this feature, and this
feels sort of hack-y. If you could explain why this is needed that would
be awesome, or if it isn't just merge this :)
…-param-and-naming

apt::params: Add two missing entries, use them.
It is included in `class apt`, and there are no promises about anything
working without that.
This is a 'base' type. It's a simple wrapper around a file which takes
`type`, `ensure`, `content`, `source` and `file_perms`. It is intended
for usage by `apt::conf`, `apt::source` and an upcoming `apt::pref`.
So replace `type` with `setting_type` in apt::setting
daenney and others added 25 commits March 26, 2015 08:48
Add missing examples for 'removed' functionality
This adds support for passing in a full pin declaration as the pin
parameter on a source declaration.

It keeps the old behaviour intact, you can still simply do `pin => '10'`
and it will pin on origin with a priority of 10.

Should that not be what you want you can now pass in a full pin
declaration instead. We make no assumptions here, whatever you pass in
will be passed through to pin as-is with the exception of the values for
`ensure` and `before` which are always overridden by us to ensure
everything keeps working as designed.
This is currently lacking tests.
NOTE: While out-of-the box support is disabled, it is still possible to
get the same configurations, it will just require explicitly setting the
necessary codename-munging.

This should only affect `apt::ppa`
Remove default support for Linux Mint and Cumulus Networks
…-conf

apt::conf: Don't require content `ensure=>absent`.
Don't purge by default. That seems unnecessarily destructive.
MODULES-1934: Iterate through multiple keys
bmjen added a commit that referenced this pull request Apr 22, 2015
@bmjen bmjen merged commit bca85cd into puppetlabs:master Apr 22, 2015
@daenney
Copy link

daenney commented Apr 22, 2015

Hurray!

@underscorgan underscorgan deleted the merge_2.0.x_to_master branch April 22, 2015 17:37
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.

10 participants