Commit graph

995 commits

Author SHA1 Message Date
Morgan Haskel
cd37fc34f2 MODULES-2190 - Fix anchor issues 2015-07-21 10:19:15 -07:00
Daniele Sluijters
428c044be5 Merge pull request #548 from leoarnold/README
Corrected documentation warning about `purge` parameters to fit v2.1.0 syntax
2015-07-19 18:34:12 +02:00
Leo Arnold
97a14dd6a4 Corrected documentation warning about purge parameters to fit v2.1.0 syntax 2015-07-18 21:58:23 +02:00
Raoul Bhatia
b8462bdc43 Use Debian's new official mirrors redirector
See https://www.debian.org/News/weekly/2015/05/#httpredir
2015-07-05 09:17:12 +02:00
Bryan Jen
5594aa10d2 Merge pull request #543 from puppetlabs/revert-542-fix_apt_params
Revert "Fix use of $::apt::params::backports and $::apt::params::xfac…
2015-06-22 10:27:52 -07:00
Morgan Haskel
70c18639c1 Revert "Fix use of $::apt::params::backports and $::apt::params::xfacts." 2015-06-22 09:30:15 -07:00
JT (Jonny)
8f5cb7341a Merge pull request #542 from infopro-digital/fix_apt_params
Fix use of $::apt::params::backports and $::apt::params::xfacts.
2015-06-22 16:00:39 +01:00
Farzad FARID
93f40ca892 Fix use of $::apt::params::backports and $::apt::params::xfacts. 2015-06-22 15:27:44 +02:00
Daniele Sluijters
a1907ff5a6 Merge pull request #540 from szynaka/apt_conf_comments
Added additional header template for apt.conf style comments
2015-06-22 09:23:01 +02:00
Ed Szynaka
ec1c50a4ad Added additional header template for apt.conf style comments 2015-06-19 02:01:48 -04:00
Bryan Jen
5dafbd514d Merge pull request #539 from mhaskel/lucid_fix
hashes are not supported in selectors
2015-06-17 15:02:45 -07:00
Morgan Haskel
74bb26d148 hashes are not supported in selectors 2015-06-17 14:56:22 -07:00
Bryan Jen
6dc3b7a61d Merge pull request #538 from mhaskel/lucid_fix
typo
2015-06-17 13:26:28 -07:00
Morgan Haskel
a09dcafb32 typo 2015-06-17 13:24:49 -07:00
Bryan Jen
7971ec26d7 Merge pull request #537 from mhaskel/lucid_fix
Don't add puppetlabs sources for lucid
2015-06-17 12:01:31 -07:00
Morgan Haskel
8d98105774 Don't add puppetlabs sources for lucid
They no longer exist
2015-06-17 11:59:40 -07:00
Daniele Sluijters
eaf5794502 Merge pull request #536 from Vincent--/patch-1
Update update.pp
2015-06-17 19:40:45 +02:00
Vincent
c1d49048c0 Update update.pp
Corrected typo
2015-06-17 12:05:37 +01:00
Bryan Jen
b2e6ba8781 Merge pull request #535 from mhaskel/merge_2.1.x_to_master
Merge 2.1.x to master
2015-06-16 15:21:41 -07:00
Morgan Haskel
f1a5499541 Apt::key doesn't have priority. 2015-06-16 15:05:07 -07:00
jbondpdx
2bba5d7167 DOCS: Edits to README.md
Just mostly commas and wording and other edit-y stuff.
2015-06-16 15:05:07 -07:00
Morgan Haskel
f766663643 2.1.0 prep 2015-06-16 15:05:06 -07:00
Daniele Sluijters
88eb872e45 Merge pull request #534 from mhaskel/remove_bad_example
Apt::key doesn't have priority.
2015-06-15 22:55:05 +02:00
Morgan Haskel
3f6248046a Apt::key doesn't have priority. 2015-06-15 13:48:38 -07:00
Daniele Sluijters
c3c0e8c6b4 Merge pull request #533 from jbondpdx/2.1.x
DOCS: Edits to README.md
2015-06-15 21:23:46 +02:00
jbondpdx
b3697f7ccd DOCS: Edits to README.md
Just mostly commas and wording and other edit-y stuff.
2015-06-15 11:45:59 -07:00
Daniele Sluijters
d86edc66c8 Merge pull request #532 from hunner/add_helper
Add helper to install puppet/pe/puppet-agent
2015-06-14 20:17:27 +02:00
Hunter Haugen
40c130c4cf Add helper to install puppet/pe/puppet-agent 2015-06-11 16:53:42 -07:00
Bryan Jen
a9d2ecd8d5 Merge pull request #530 from mhaskel/2.1.0-prep
2.1.0 prep
2015-06-09 10:42:34 -07:00
Morgan Haskel
083bed3437 2.1.0 prep 2015-06-09 10:37:28 -07:00
Daniele Sluijters
ee230d111b Merge pull request #531 from justinstoller/maint/master/set-puppet-version
(maint) allow setting PUPPET_VERSION in acceptance
2015-06-09 08:23:08 +02:00
Justin Stoller
6dba810090 (maint) allow setting PUPPET_VERSION in acceptance 2015-06-08 21:50:05 -07:00
Morgan Haskel
f1fe05ec2b Merge pull request #525 from ianmacl/MODULES-2070
Backwards compatibility with older versions of puppet
2015-06-08 15:08:48 -07:00
Bryan Jen
0ca555f552 Merge pull request #529 from mhaskel/source_compatibility
API compatibility between 1.8.x and 2.x for apt::source
2015-06-08 14:37:32 -07:00
Morgan Haskel
396f308e6a Compatibility between 1.8.x and 2.x for apt::source 2015-06-08 11:19:45 -07:00
Hunter Haugen
b55dd49b17 Merge pull request #527 from mhaskel/key_compatibility
Make apt::key compatible with 1.8.x
2015-06-04 10:58:51 -07:00
Morgan Haskel
d50fef82e8 Make apt::key compatible with 1.8.x 2015-06-04 09:41:27 -07:00
Morgan Haskel
8649fb4aa6 Merge pull request #526 from hunner/fix_travis
Fix travis.yml for puppet 4
2015-05-27 09:48:24 -07:00
Hunter Haugen
a467f1b978 Fix travis.yml for puppet 4
I accidentally pushed a commit with modulesync that made puppet 4 a
non-voting job. This should make it more in line with modulesync.

Also, we should look at bumping these ORDERING="random" changes back to
msync if they are valuable.
2015-05-27 08:25:44 -07:00
Hunter Haugen
8260d7a95c Add ability to unittest puppet 4 2015-05-27 08:11:16 -07:00
Ian MacLennan
e52145110c Backwards compatibility with older versions of puppet 2015-05-25 09:28:04 -04:00
Daniele Sluijters
535a5b6dad Merge pull request #524 from mhaskel/better_defined_check
Only use the strict variables workaround if using strict variables
2015-05-11 20:33:39 +02:00
Morgan Haskel
3838c666f5 Only use the strict variables workaround if using strict variables
This should avoid issues with defined on earlier versions of puppet
2015-05-11 10:55:46 -07:00
Daniele Sluijters
5d62ceb20e Merge pull request #523 from puppetlabs/modulesync_updates
Modulesync updates
2015-05-08 08:20:08 +02:00
Morgan Haskel
cbaf43d7a1 have the right gems 2015-05-07 10:09:21 -07:00
Morgan Haskel
9699b42d97 Add gem to sync.yml 2015-05-07 10:07:20 -07:00
Morgan Haskel
b9822c6eb7 sync via modulesync 2015-05-07 10:07:20 -07:00
Morgan Haskel
3e64758ca7 Merge pull request #521 from hunner/fix_stubs
Don't stub puppetversion
2015-05-06 15:15:26 -07:00
Hunter Haugen
48152d4a89 Don't stub puppetversion
The puppetversion fact still needs to represent puppet's version that is being used to test
2015-05-06 15:10:05 -07:00
Hunter Haugen
424b7540bf Merge pull request #520 from mhaskel/sync
test against puppet4
2015-05-06 14:44:50 -07:00