{maint} modulesync 0794b2c

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bfeaa701cae5b418a5f863343e48765330df476e..3c3f1e79997c90de7e3b08202667ef8c72c65bac 100644 (file)
--- 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 7e9a13d5df14cdfc0d62033bdb154801c4455120..8906d23cd84bcc05501e0b829e45f12035a53aff 100644 (file)
--- 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