summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppet.com>2016-07-01 10:06:47 +0100
committerGitHub <noreply@github.com>2016-07-01 10:06:47 +0100
commit15d273e155f699bec640fbf9cc02a985a0ca4f99 (patch)
treecc4ab72d68b14a7af0ddf7d9cc2f6e571f022194
parent51c8303f29d3dac4f723a2e94b15a12405525d76 (diff)
parent514276023afe9fff17ce82d4ae8c9a06a7eb4a22 (diff)
Merge pull request #288 from puppetlabs/modulesync
{maint} modulesync 0794b2c
-rw-r--r--CONTRIBUTING.md6
-rwxr-xr-xRakefile4
2 files changed, 4 insertions, 6 deletions
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 100755
--- 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