Showing with 14 additions and 10 deletions.

+1 −1 .fixtures.yml

+6 −3 .travis.yml

+2 −2 Gemfile

+1 −1 README.md

+1 −0 Rakefile

+1 −1 metadata.json

+2 −2 templates/limits.conf.erb
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -7,7 +7,7 @@ fixtures:
       repo: 'https://github.com/ghoneycutt/puppet-module-common.git'
       ref: 'v1.4.1'
     nsswitch:
-      repo: 'git://github.com/ghoneycutt/puppet-module-nsswitch.git'
+      repo: 'https://github.com/ghoneycutt/puppet-module-nsswitch.git'
       ref: 'v1.5.0'
   symlinks:
     pam: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
@@ -22,12 +22,13 @@ env:
     - PUPPET_GEM_VERSION="~> 4.1.0"
     - PUPPET_GEM_VERSION="~> 4.2.0"
     - PUPPET_GEM_VERSION="~> 4.3.0"
-    - PUPPET_GEM_VERSION="~> 4"
+    - PUPPET_GEM_VERSION="~> 4.4.0"
+    - PUPPET_GEM_VERSION="~> 4.5.0"
     - PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
 
 sudo: false
 
-script: 'bundle exec metadata-json-lint metadata.json && bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
 
 matrix:
   fast_finish: true
@@ -51,7 +52,9 @@ matrix:
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.3.0"
     - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 4"
+      env: PUPPET_GEM_VERSION="~> 4.4.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
     - rvm: 1.9.3

diff --git a/Gemfile b/Gemfile
@@ -7,8 +7,8 @@ else
 end
 
 gem 'metadata-json-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint', '>= 1.0.0'
+gem 'puppetlabs_spec_helper', '>= 1.1.1'
+gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet', '~> 2.0'
 gem 'puppet-lint-absolute_classname-check'

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ EL no longer requires the `redhat-lsb` package.
 
 allowed_users
 -------------
-Array or Hash of strings and/or arrays to configure users and origins in access.conf. The default allows the root user/group from origin 'ALL'.
+String, Array or Hash of strings and/or arrays to configure users and origins in access.conf. The default allows the root user/group from origin 'ALL'.
 
 - *Default*: 'root'
 

diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ghoneycutt-pam",
-  "version": "2.22.0",
+  "version": "2.23.0",
   "author": "ghoneycutt",
   "summary": "Manage PAM",
   "license": "Apache-2.0",

diff --git a/templates/limits.conf.erb b/templates/limits.conf.erb
@@ -9,7 +9,7 @@
 #
 #Where:
 #<domain> can be:
-#        - an user name
+#        - a user name
 #        - a group name, with @group syntax
 #        - the wildcard *, for default entry
 #        - the wildcard %, can be also used with %group syntax,
@@ -24,7 +24,7 @@
 #        - data - max data size (KB)
 #        - fsize - maximum filesize (KB)
 #        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open files
+#        - nofile - max number of open file descriptors
 #        - rss - max resident set size (KB)
 #        - stack - max stack size (KB)
 #        - cpu - max CPU time (MIN)