From: David Schmitt <david.schmitt@puppet.com>
Date: Thu, 30 Jun 2016 12:43:26 +0000 (+0100)
Subject: Merge pull request #612 from puppetlabs/modulesync
X-Git-Tag: 2.3.0~9
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ae8f96a0935538ab9974e2c0b40192fa77b55cb7;hp=ad6c6073d3185f6b354e35e85d16caae7ec24b01;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #612 from puppetlabs/modulesync

{maint} modulesync 0794b2c
---

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bfeaa70..3c3f1e7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -208,11 +208,9 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://puppetlabs.com/community/get-help)
+* [Getting additional help](http://puppet.com/community/get-help)
 
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
 
 * [General GitHub documentation](http://help.github.com/)
 
diff --git a/Rakefile b/Rakefile
index 7e9a13d..8906d23 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,11 +4,11 @@ require 'puppetlabs_spec_helper/rake_tasks'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "bundle/**/*", "vendor/**/*"]
 
 desc 'Generate pooler nodesets'
 task :gen_nodeset do