RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #179 from puppetlabs/modulesync

Browse Source 
{maint} modulesync 0794b2c
This commit is contained in:
Greg Hardy
2016-06-30 15:45:09 +01:00
committed by GitHub
parent a5c137d735 c99b28bab0
commit 5c2e3528bb
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@@ -208,11 +208,9 @@ review.
Additional Resources 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) * [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
* [Patchwork](https://patchwork.puppetlabs.com)
* [General GitHub documentation](http://help.github.com/) * [General GitHub documentation](http://help.github.com/)

4
Rakefile
View File

@@ -4,11 +4,11 @@ require 'puppetlabs_spec_helper/rake_tasks'
PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('relative') 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_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_documentation') PuppetLint.configuration.send('disable_documentation')
PuppetLint.configuration.send('disable_single_quote_string_with_variables') 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' desc 'Generate pooler nodesets'
task :gen_nodeset do task :gen_nodeset do

2
manifests/init.pp
View File

@@ -52,7 +52,7 @@ class java(
include java::params include java::params
validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:~-]+$') validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:~-]+$')
if $package_options != undef { if $package_options != undef {
validate_array($package_options) validate_array($package_options)
} }