puppet-modules/puppetlabs-apt.git
8 years agoUpdate to newest modulesync_configs [9ca280f] update-msync
David Schmitt [Wed, 13 Apr 2016 19:49:37 +0000 (20:49 +0100)]
Update to newest modulesync_configs [9ca280f]

8 years agoMerge pull request #596 from danielhoherd/master
TP Honey [Tue, 12 Apr 2016 09:46:39 +0000 (10:46 +0100)]
Merge pull request #596 from danielhoherd/master

Expose notify_update to apt::source

8 years agoMerge pull request #599 from DavidS/fix-strict-var-testing
TP Honey [Thu, 7 Apr 2016 18:09:05 +0000 (19:09 +0100)]
Merge pull request #599 from DavidS/fix-strict-var-testing

Fix STRICT_VARIABLE testing

8 years ago(maint) clean up key_compat_specs
David Schmitt [Thu, 7 Apr 2016 17:33:55 +0000 (18:33 +0100)]
(maint) clean up key_compat_specs

8 years ago(maint) Update ke_compat_spec to run under STRICT_VARIABLES
David Schmitt [Thu, 7 Apr 2016 17:31:58 +0000 (18:31 +0100)]
(maint) Update ke_compat_spec to run under STRICT_VARIABLES

8 years agoMerge pull request #581 from robinelfrink/master
Hunter Haugen [Thu, 7 Apr 2016 17:13:46 +0000 (10:13 -0700)]
Merge pull request #581 from robinelfrink/master

Make apt_updates facts use /usr/bin/apt-get.

8 years agoExposing notify_update to apt::source
Daniel Hoherd [Fri, 18 Mar 2016 17:08:30 +0000 (10:08 -0700)]
Exposing notify_update to apt::source

8 years agoMerge pull request #595 from danielhoherd/master
Daniele Sluijters [Thu, 17 Mar 2016 09:53:42 +0000 (10:53 +0100)]
Merge pull request #595 from danielhoherd/master

Typo: missing colon

8 years agoTypo: missing colon
Daniel Hoherd [Thu, 17 Mar 2016 00:58:08 +0000 (17:58 -0700)]
Typo: missing colon

8 years agoMerge pull request #593 from puppetlabs/2.2.x
Hunter Haugen [Mon, 29 Feb 2016 21:52:36 +0000 (13:52 -0800)]
Merge pull request #593 from puppetlabs/2.2.x

Mergeback 2.2.x

8 years agoMerge pull request #592 from HelenCampbell/2.2.2 2.2.x 2.2.2
David Schmitt [Thu, 25 Feb 2016 13:45:59 +0000 (13:45 +0000)]
Merge pull request #592 from HelenCampbell/2.2.2

Prep for 2.2.2 Release

8 years agoPrep for 2.2.2 Release
Helen Campbell [Thu, 25 Feb 2016 12:50:12 +0000 (12:50 +0000)]
Prep for 2.2.2 Release

8 years agoMerge pull request #590 from DavidS/debian-8-support
Helen [Wed, 17 Feb 2016 12:13:16 +0000 (12:13 +0000)]
Merge pull request #590 from DavidS/debian-8-support

Update metadata to note Debian 8 support

8 years agoUpdate metadata to note Debian 8 support
David Schmitt [Wed, 17 Feb 2016 11:52:31 +0000 (11:52 +0000)]
Update metadata to note Debian 8 support

8 years agoMerge pull request #589 from DavidS/fm-4046-update-msync
TP Honey [Tue, 16 Feb 2016 17:04:03 +0000 (17:04 +0000)]
Merge pull request #589 from DavidS/fm-4046-update-msync

(FM-4046) Update to current msync configs [006831f]

8 years ago(FM-4046) Update to current msync configs [006831f]
David Schmitt [Tue, 16 Feb 2016 15:59:57 +0000 (15:59 +0000)]
(FM-4046) Update to current msync configs [006831f]

This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license.

8 years agoMake apt_updates facts use /usr/bin/apt-get.
Robin Elfrink [Fri, 12 Feb 2016 22:21:28 +0000 (23:21 +0100)]
Make apt_updates facts use /usr/bin/apt-get.

/usr/lib/update-notifier/apt-check is not available on all systems,
but /usr/bin/apt-get is.

8 years agoMerge pull request #582 from imphil/master
Bryan Jen [Thu, 4 Feb 2016 19:29:15 +0000 (12:29 -0700)]
Merge pull request #582 from imphil/master

Look for correct sources.list.d file for apt::ppa

8 years agoLook for correct sources.list.d file for apt::ppa
Philipp Wagner [Wed, 3 Feb 2016 16:13:46 +0000 (17:13 +0100)]
Look for correct sources.list.d file for apt::ppa

In Ubuntu 15.10 the path of the apt sources file, which is generated by
apt-add-repository, changed to include the distid. This breaks apt::ppa
idempotency, since it does not recognize the repository is already
added.

Reported on puppet-users as well:
https://groups.google.com/forum/#!topic/puppet-users/YzeMyZYUo98

8 years agoEnsure PPAs in tests have valid form
Philipp Wagner [Wed, 3 Feb 2016 16:09:40 +0000 (17:09 +0100)]
Ensure PPAs in tests have valid form

"man apt-add-repository" notes: "REPOSITORY can be either a line that
can be added directly to sources.list(5), in the form ppa:<user>/<ppa-name>
for adding Personal  Package  Archives".

Fix the tests to always use the format ppa:<user>/<ppa-name> when adding
PPAs.

8 years agoMerge pull request #588 from werekraken/modules2873
Daniele Sluijters [Tue, 2 Feb 2016 19:04:23 +0000 (20:04 +0100)]
Merge pull request #588 from werekraken/modules2873

MODULES-2873 - Avoid multiple package resource declarations

8 years agoMODULES-2873 - Avoid duplicate package resources when package_manage => true
matt.cover [Tue, 2 Feb 2016 15:54:43 +0000 (08:54 -0700)]
MODULES-2873 - Avoid duplicate package resources when package_manage => true

8 years agoMerge pull request #587 from jbondpdx/master
Helen [Fri, 29 Jan 2016 19:25:06 +0000 (19:25 +0000)]
Merge pull request #587 from jbondpdx/master

MODULES-2941: add example to README

8 years agoMODULES-2941: added more info about replacing sources.list
jbondpdx [Fri, 29 Jan 2016 19:11:46 +0000 (11:11 -0800)]
MODULES-2941: added more info about replacing sources.list

8 years agoMODULES-2941: add example to README
jbondpdx [Thu, 28 Jan 2016 19:45:35 +0000 (11:45 -0800)]
MODULES-2941: add example to README

8 years agoMerge pull request #585 from DavidS/fm-4049-update-msync
Helen [Wed, 27 Jan 2016 16:16:25 +0000 (16:16 +0000)]
Merge pull request #585 from DavidS/fm-4049-update-msync

(FM-4049) update to modulesync_configs

8 years ago(FM-4049) Update to current msync configs [2c99161]
David Schmitt [Mon, 25 Jan 2016 15:42:27 +0000 (15:42 +0000)]
(FM-4049) Update to current msync configs [2c99161]

8 years agoMerge pull request #583 from tdb/fix_ppa_pluses
JT (Jonny) [Tue, 19 Jan 2016 16:09:39 +0000 (16:09 +0000)]
Merge pull request #583 from tdb/fix_ppa_pluses

Handle PPA names that contain a plus character.

8 years agoHandle PPA names that contain a plus character.
Tim Bishop [Mon, 18 Jan 2016 21:47:32 +0000 (21:47 +0000)]
Handle PPA names that contain a plus character.

It looks like add-apt-repository changes pluses to underscores when
creating the sources.list.d file. So the name it creates doesn't match
what Puppet expects, and the resource keeps applying on every Puppet
run.

This works around that problem.

8 years agoMerge pull request #572 from twc-openstack/master-tempfile-race-condition
Bryan Jen [Wed, 6 Jan 2016 21:38:31 +0000 (14:38 -0700)]
Merge pull request #572 from twc-openstack/master-tempfile-race-condition

Fix apt_key tempfile race condition

8 years agoMerge pull request #578 from phervieux/15.10
Bryan Jen [Tue, 15 Dec 2015 17:25:01 +0000 (10:25 -0700)]
Merge pull request #578 from phervieux/15.10

Add ubuntu 15.10 support

8 years agoMerge pull request #577 from syseleven/pp-2587
TP Honey [Mon, 14 Dec 2015 11:27:00 +0000 (11:27 +0000)]
Merge pull request #577 from syseleven/pp-2587

fix whitespace in source.list

8 years agoMODULES-2889 - remove unneeded whitespace in source.list template
Andreas Mauf [Mon, 14 Dec 2015 09:20:40 +0000 (10:20 +0100)]
MODULES-2889 - remove unneeded whitespace in source.list template

8 years agoMerge pull request #575 from ryayon/master
Daniele Sluijters [Thu, 10 Dec 2015 22:55:07 +0000 (23:55 +0100)]
Merge pull request #575 from ryayon/master

MODULES-2861: run stages limitation added to the documentation.

8 years agoMODULES-2861: run stages limitation added to the documentation
Rudy YAYON [Thu, 10 Dec 2015 10:22:22 +0000 (11:22 +0100)]
MODULES-2861: run stages limitation added to the documentation

8 years agoMerge pull request #576 from puppetlabs/2.2.x
David Schmitt [Tue, 8 Dec 2015 15:09:12 +0000 (15:09 +0000)]
Merge pull request #576 from puppetlabs/2.2.x

Mergeback 2.2.x

8 years agoMerge pull request #573 from HelenCampbell/release2.2.1 2.2.1
Bryan Jen [Tue, 24 Nov 2015 19:04:29 +0000 (12:04 -0700)]
Merge pull request #573 from HelenCampbell/release2.2.1

Release 2.2.1

8 years agoRelease 2.2.1
Helen Campbell [Mon, 23 Nov 2015 12:31:23 +0000 (12:31 +0000)]
Release 2.2.1

8 years agoFix apt_key tempfile race condition
Clayton O'Neill [Wed, 11 Nov 2015 20:11:24 +0000 (20:11 +0000)]
Fix apt_key tempfile race condition

The Ruby Tempfile class has a finalizer that removes the file when the
GC runs.  It's not predictible when the GC will run, so you have to
ensure that the instance of the class stays in scope for as long as you
need it.

Unfortunately the tempfile method is returning just the filename of the
temporary file, which means it goes out of scope when that method
returns.  This allows the GC to reap it at any time after return.

In both CI and production environments we've seen this race fail,
causing apt-key add to fail a small (2-3%) amount of the time.

This changes the tempfile and source_to_file methods to return the
underlying Tempfile object, pushing it up into the caller's scope.  Both
of the callers immediately use the object to get its filename and then
open the file, eliminating the race.

Tested this by adding 'GC.start; sleep(1)' immediately before the
command is run, to give the GC plenty of time to remove the tempfile if
it was going to.

8 years agoAdd 15.10 support
Patrick Hervieux [Wed, 4 Nov 2015 15:48:22 +0000 (16:48 +0100)]
Add 15.10 support

8 years agoMerge pull request #569 from DavidS/improve-readme
Bryan Jen [Fri, 9 Oct 2015 19:21:53 +0000 (12:21 -0700)]
Merge pull request #569 from DavidS/improve-readme

(MAINT) improve hiera description

8 years ago(MAINT) improve hiera description
David Schmitt [Fri, 9 Oct 2015 12:07:32 +0000 (13:07 +0100)]
(MAINT) improve hiera description

8 years agoMerge pull request #567 from puppetlabs/2.2.x
Hunter Haugen [Tue, 29 Sep 2015 16:47:13 +0000 (09:47 -0700)]
Merge pull request #567 from puppetlabs/2.2.x

Mergeback 2.2.x to master

8 years agoMerge pull request #566 from bmjen/2.2.0-prep 2.2.0
Hunter Haugen [Fri, 25 Sep 2015 23:28:11 +0000 (16:28 -0700)]
Merge pull request #566 from bmjen/2.2.0-prep

Release prep for 2.2.0

8 years agoRelease prep for 2.2.0
Bryan Jen [Fri, 25 Sep 2015 23:07:57 +0000 (16:07 -0700)]
Release prep for 2.2.0

8 years agoMerge pull request #564 from rfdrake/apt_pin
David Schmitt [Mon, 7 Sep 2015 11:11:31 +0000 (12:11 +0100)]
Merge pull request #564 from rfdrake/apt_pin

Add support for creating pins from main class

8 years agoAdd support for creating pins from main class
Robert Drake [Tue, 1 Sep 2015 16:00:24 +0000 (12:00 -0400)]
Add support for creating pins from main class

This lets you create apt::pin resources as an apt param hash.  It also
supplies appropriate tests and documentation.

8 years agoMerge pull request #562 from RewardGateway/preference_file_name
Morgan Haskel [Wed, 2 Sep 2015 20:26:28 +0000 (13:26 -0700)]
Merge pull request #562 from RewardGateway/preference_file_name

Corrected regression with preference files name

8 years agoCorrected regression with preference files name
Vincent [Mon, 24 Aug 2015 16:53:02 +0000 (17:53 +0100)]
Corrected regression with preference files name

Signed-off-by: Vincent Deygas <Vincent.Deygas@rewardgateway.com>
8 years agoMerge pull request #560 from mhaskel/MODULES-2446
Bryan Jen [Wed, 26 Aug 2015 23:45:09 +0000 (16:45 -0700)]
Merge pull request #560 from mhaskel/MODULES-2446

MODULES-2446 - Fix pinning for backports

8 years agoMODULES-2446 - Fix pinning for backports
Morgan Haskel [Wed, 26 Aug 2015 23:29:54 +0000 (16:29 -0700)]
MODULES-2446 - Fix pinning for backports

The 2.x series added a changed behavior for backport pinning to pin to
origin instead of release. Pinning to release is the correct behavior
for backports though.

8 years agoMerge pull request #551 from bdellegrazie/MODULES-2269
Morgan Haskel [Mon, 17 Aug 2015 17:57:37 +0000 (10:57 -0700)]
Merge pull request #551 from bdellegrazie/MODULES-2269

Expose notify_update to apt::conf

8 years agoMerge pull request #557 from fbarbeira/patch-1
Daniele Sluijters [Mon, 17 Aug 2015 14:15:04 +0000 (16:15 +0200)]
Merge pull request #557 from fbarbeira/patch-1

Fix path to 'preferences' and 'preferences.d'.

8 years agoFix path to 'preferences' and 'preferences.d'.
Félix Barbeira [Mon, 17 Aug 2015 12:52:25 +0000 (14:52 +0200)]
Fix path to 'preferences' and 'preferences.d'.

If you follow the documentacion, the hiera file does not work.

8 years agoMODULES-2269: Expose notify_update setting
Brett Delle Grazie [Thu, 23 Jul 2015 16:15:53 +0000 (17:15 +0100)]
MODULES-2269: Expose notify_update setting

* Expose the underlying notify_update setting of the apt::settings resource
This is because not all configuration file changes should trigger an apt::update notification
* apt::pin also shouldn't result in an apt-update call
Adding a pin configuration should apply to the next apt-get update call it shouldn't trigger one itself.
* Added documentation
* Add tests for apt::conf notify_update

8 years agoMerge pull request #556 from callahm3/master
Morgan Haskel [Wed, 5 Aug 2015 20:19:17 +0000 (13:19 -0700)]
Merge pull request #556 from callahm3/master

Proxy ensure parameter.

8 years agoAdded an ensure parameter for user control of proxy presence. Defaults to undef to...
Callahan, Michael Joseph [Tue, 4 Aug 2015 19:58:32 +0000 (15:58 -0400)]
Added an ensure parameter for user control of proxy presence. Defaults to undef to resist breaking any current setup.

added spec entry

Added validation

fixed ensure hash

8 years agoMerge pull request #553 from bmjen/2.1.x_mergeback
David Schmitt [Tue, 28 Jul 2015 15:40:30 +0000 (16:40 +0100)]
Merge pull request #553 from bmjen/2.1.x_mergeback

2.1.x mergeback

8 years agoMerge pull request #552 from jbondpdx/2.1.x 2.1.x 4.0.0 2.1.1
Bryan Jen [Mon, 27 Jul 2015 21:14:31 +0000 (14:14 -0700)]
Merge pull request #552 from jbondpdx/2.1.x

light edits to apt README

8 years agolight edits to apt README
jbondpdx [Mon, 27 Jul 2015 17:29:01 +0000 (10:29 -0700)]
light edits to apt README

8 years agoMerge pull request #545 from raoulbhatia/master
Daniele Sluijters [Thu, 23 Jul 2015 12:10:47 +0000 (14:10 +0200)]
Merge pull request #545 from raoulbhatia/master

Use Debian's new official mirrors redirector

8 years agoMerge pull request #550 from mhaskel/2.1.1-prep
Bryan Jen [Thu, 23 Jul 2015 00:32:38 +0000 (17:32 -0700)]
Merge pull request #550 from mhaskel/2.1.1-prep

2.1.1 prep

8 years ago2.1.1 prep
Morgan Haskel [Thu, 23 Jul 2015 00:29:56 +0000 (17:29 -0700)]
2.1.1 prep

8 years agoMerge pull request #549 from mhaskel/merge_master_to_2.1.x
Bryan Jen [Wed, 22 Jul 2015 23:51:27 +0000 (16:51 -0700)]
Merge pull request #549 from mhaskel/merge_master_to_2.1.x

Merge master to 2.1.x

8 years agoMerge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x
Morgan Haskel [Wed, 22 Jul 2015 23:27:54 +0000 (16:27 -0700)]
Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x

8 years agoMerge pull request #547 from mhaskel/MODULES-2190
TP Honey [Tue, 21 Jul 2015 17:59:19 +0000 (18:59 +0100)]
Merge pull request #547 from mhaskel/MODULES-2190

Fix anchor issues

8 years agoAdd limitations note
Morgan Haskel [Tue, 21 Jul 2015 17:46:34 +0000 (10:46 -0700)]
Add limitations note

8 years agoMODULES-2190 - Fix anchor issues
Morgan Haskel [Fri, 17 Jul 2015 23:19:33 +0000 (16:19 -0700)]
MODULES-2190 - Fix anchor issues

8 years agoMerge pull request #548 from leoarnold/README
Daniele Sluijters [Sun, 19 Jul 2015 16:34:12 +0000 (18:34 +0200)]
Merge pull request #548 from leoarnold/README

Corrected documentation warning about `purge` parameters to fit v2.1.0 syntax

8 years agoCorrected documentation warning about `purge` parameters to fit v2.1.0 syntax
Leo Arnold [Sat, 18 Jul 2015 19:58:23 +0000 (21:58 +0200)]
Corrected documentation warning about `purge` parameters to fit v2.1.0 syntax

8 years agoUse Debian's new official mirrors redirector
Raoul Bhatia [Sun, 5 Jul 2015 06:56:38 +0000 (08:56 +0200)]
Use Debian's new official mirrors redirector

See https://www.debian.org/News/weekly/2015/05/#httpredir

9 years agoMerge pull request #543 from puppetlabs/revert-542-fix_apt_params
Bryan Jen [Mon, 22 Jun 2015 17:27:52 +0000 (10:27 -0700)]
Merge pull request #543 from puppetlabs/revert-542-fix_apt_params

Revert "Fix use of $::apt::params::backports and $::apt::params::xfac…

9 years agoRevert "Fix use of $::apt::params::backports and $::apt::params::xfacts."
Morgan Haskel [Mon, 22 Jun 2015 16:30:15 +0000 (09:30 -0700)]
Revert "Fix use of $::apt::params::backports and $::apt::params::xfacts."

9 years agoMerge pull request #542 from infopro-digital/fix_apt_params
JT (Jonny) [Mon, 22 Jun 2015 15:00:39 +0000 (16:00 +0100)]
Merge pull request #542 from infopro-digital/fix_apt_params

Fix use of $::apt::params::backports and $::apt::params::xfacts.

9 years agoFix use of $::apt::params::backports and $::apt::params::xfacts.
Farzad FARID [Mon, 22 Jun 2015 12:32:58 +0000 (14:32 +0200)]
Fix use of $::apt::params::backports and $::apt::params::xfacts.

9 years agoMerge pull request #540 from szynaka/apt_conf_comments
Daniele Sluijters [Mon, 22 Jun 2015 07:23:01 +0000 (09:23 +0200)]
Merge pull request #540 from szynaka/apt_conf_comments

Added additional header template for apt.conf style comments

9 years agoAdded additional header template for apt.conf style comments
Ed Szynaka [Fri, 19 Jun 2015 06:01:48 +0000 (02:01 -0400)]
Added additional header template for apt.conf style comments

9 years agoMerge pull request #539 from mhaskel/lucid_fix
Bryan Jen [Wed, 17 Jun 2015 22:02:45 +0000 (15:02 -0700)]
Merge pull request #539 from mhaskel/lucid_fix

hashes are not supported in selectors

9 years agohashes are not supported in selectors
Morgan Haskel [Wed, 17 Jun 2015 21:56:22 +0000 (14:56 -0700)]
hashes are not supported in selectors

9 years agoMerge pull request #538 from mhaskel/lucid_fix
Bryan Jen [Wed, 17 Jun 2015 20:26:28 +0000 (13:26 -0700)]
Merge pull request #538 from mhaskel/lucid_fix

typo

9 years agotypo
Morgan Haskel [Wed, 17 Jun 2015 20:24:49 +0000 (13:24 -0700)]
typo

9 years agoMerge pull request #537 from mhaskel/lucid_fix
Bryan Jen [Wed, 17 Jun 2015 19:01:31 +0000 (12:01 -0700)]
Merge pull request #537 from mhaskel/lucid_fix

Don't add puppetlabs sources for lucid

9 years agoDon't add puppetlabs sources for lucid
Morgan Haskel [Wed, 17 Jun 2015 18:59:40 +0000 (11:59 -0700)]
Don't add puppetlabs sources for lucid

They no longer exist

9 years agoMerge pull request #536 from Vincent--/patch-1
Daniele Sluijters [Wed, 17 Jun 2015 17:40:45 +0000 (19:40 +0200)]
Merge pull request #536 from Vincent--/patch-1

Update update.pp

9 years agoUpdate update.pp
Vincent [Wed, 17 Jun 2015 11:05:37 +0000 (12:05 +0100)]
Update update.pp

Corrected typo

9 years agoMerge pull request #535 from mhaskel/merge_2.1.x_to_master
Bryan Jen [Tue, 16 Jun 2015 22:21:41 +0000 (15:21 -0700)]
Merge pull request #535 from mhaskel/merge_2.1.x_to_master

Merge 2.1.x to master

9 years agoApt::key doesn't have priority.
Morgan Haskel [Mon, 15 Jun 2015 20:48:38 +0000 (13:48 -0700)]
Apt::key doesn't have priority.

9 years agoDOCS: Edits to README.md
jbondpdx [Mon, 15 Jun 2015 18:45:59 +0000 (11:45 -0700)]
DOCS: Edits to README.md

Just mostly commas and wording and other edit-y stuff.

9 years ago2.1.0 prep
Morgan Haskel [Mon, 8 Jun 2015 23:13:59 +0000 (16:13 -0700)]
2.1.0 prep

9 years agoMerge pull request #534 from mhaskel/remove_bad_example 2.1.0
Daniele Sluijters [Mon, 15 Jun 2015 20:55:05 +0000 (22:55 +0200)]
Merge pull request #534 from mhaskel/remove_bad_example

Apt::key doesn't have priority.

9 years agoApt::key doesn't have priority.
Morgan Haskel [Mon, 15 Jun 2015 20:48:38 +0000 (13:48 -0700)]
Apt::key doesn't have priority.

9 years agoMerge pull request #533 from jbondpdx/2.1.x
Daniele Sluijters [Mon, 15 Jun 2015 19:23:46 +0000 (21:23 +0200)]
Merge pull request #533 from jbondpdx/2.1.x

DOCS: Edits to README.md

9 years agoDOCS: Edits to README.md
jbondpdx [Mon, 15 Jun 2015 18:45:59 +0000 (11:45 -0700)]
DOCS: Edits to README.md

Just mostly commas and wording and other edit-y stuff.

9 years agoMerge pull request #532 from hunner/add_helper
Daniele Sluijters [Sun, 14 Jun 2015 18:17:27 +0000 (20:17 +0200)]
Merge pull request #532 from hunner/add_helper

Add helper to install puppet/pe/puppet-agent

9 years agoAdd helper to install puppet/pe/puppet-agent
Hunter Haugen [Thu, 11 Jun 2015 22:26:17 +0000 (15:26 -0700)]
Add helper to install puppet/pe/puppet-agent

9 years agoMerge pull request #530 from mhaskel/2.1.0-prep
Bryan Jen [Tue, 9 Jun 2015 17:42:34 +0000 (10:42 -0700)]
Merge pull request #530 from mhaskel/2.1.0-prep

2.1.0 prep

9 years ago2.1.0 prep
Morgan Haskel [Mon, 8 Jun 2015 23:13:59 +0000 (16:13 -0700)]
2.1.0 prep

9 years agoMerge pull request #531 from justinstoller/maint/master/set-puppet-version
Daniele Sluijters [Tue, 9 Jun 2015 06:23:08 +0000 (08:23 +0200)]
Merge pull request #531 from justinstoller/maint/master/set-puppet-version

(maint) allow setting PUPPET_VERSION in acceptance

9 years ago(maint) allow setting PUPPET_VERSION in acceptance
Justin Stoller [Tue, 9 Jun 2015 04:50:05 +0000 (21:50 -0700)]
(maint) allow setting PUPPET_VERSION in acceptance

9 years agoMerge pull request #525 from ianmacl/MODULES-2070
Morgan Haskel [Mon, 8 Jun 2015 22:08:48 +0000 (15:08 -0700)]
Merge pull request #525 from ianmacl/MODULES-2070

Backwards compatibility with older versions of puppet