diff --git a/.gitattributes b/.gitattributes index caed7b1d..c473b1a2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ Gemfile linguist-vendored Rakefile linguist-vendored +/.mdl/* linguist-vendored /spec/* linguist-vendored diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d07c0df..9af12f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## 2016-05-24 - Maintenance release 1.2.2 + +Published at [Puppet Forge](https://forge.puppet.com/leoarnold/cups/1.2.2) +and [GitHub](https://github.com/leoarnold/puppet-cups/releases/tag/1.2.2). + +### Summary + +This release fixes package installation on Debian derivatives shipping with CUPS 2.x. + +### Changes + +- On Debian derivatives shipping with CUPS 2.x, the package `cups-ipp-utils` will now be installed automatically +- Acceptance tests were adapted to work on Ruby 2.x + ## 2016-05-17 - Maintenance release 1.2.1 Published at [Puppet Forge](https://forge.puppet.com/leoarnold/cups/1.2.1) diff --git a/README.md b/README.md index cd38c2a1..3e033df6 100644 --- a/README.md +++ b/README.md @@ -336,17 +336,7 @@ The corresponding `cups_queue` properties are: * `enabled`: Should pending jobs be sent to the device or kept pending? -If you want your print queues to "just work", you should set both to `true` by default using - - ```puppet - # Default values for all 'cups_queue' resources in the current scope: - # Use 'Cups_queue' with upper case first letter and without resource name - Cups_queue { - accepting => 'true', - enabled => 'true', - } - ``` - +If you want your print queues to "just work", you should set both to `true`. This module does not set default values by itself, since it might be of disadvantage in a professional copy shop environment. **Option defaults:** diff --git a/metadata.json b/metadata.json index 86989941..e1a26dec 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "leoarnold-cups", - "version": "1.2.1", + "version": "1.2.2", "author": "Leo Arnold", "summary": "Puppet module for the Common Unix Printing System (CUPS)", "license": "MIT",