aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-10-13 13:35:39 +0200
committerGitHub <noreply@github.com>2018-10-13 13:35:39 +0200
commitdcb600f17c41fb88b4ad04eb918bd703730e6c41 (patch)
tree953205c07bf585aa954f36c792357c76ee3d3192
parent6b51f9e3362f0be4c329ec141e593c0d4a410bb4 (diff)
parent83397cdc759494b838022a878b417ad0323487b5 (diff)
downloadpuppet-ferm-dcb600f17c41fb88b4ad04eb918bd703730e6c41.tar.gz
puppet-ferm-dcb600f17c41fb88b4ad04eb918bd703730e6c41.tar.bz2
Merge pull request #30 from voxpupuli/modulesync
modulesync 2.1.0
-rw-r--r--.github/CONTRIBUTING.md5
-rw-r--r--.msync.yml2
-rw-r--r--Gemfile2
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 67b063c..832578e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -16,8 +16,9 @@ By participating in this project you agree to abide by its terms.
runs the tests for us. You can also execute them locally. This is explained
in a later section.
-1. Checkout the docs we use to review a module. They provide some guidance for
- new code that might help you before you submit a pull request.
+1. Checkout [our docs](https://voxpupuli.org/docs/#reviewing-a-module-pr) we
+ use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html).
+ They provide some guidance for new code that might help you before you submit a pull request.
1. Add a test for your change. Only refactoring and documentation
changes require no new tests. If you are adding functionality
diff --git a/.msync.yml b/.msync.yml
index 45b7d7c..e1f48ca 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.0.0-rc0'
+modulesync_config_version: '2.1.0'
diff --git a/Gemfile b/Gemfile
index 7e14df4..dd1b03a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
end
group :test do
- gem 'puppetlabs_spec_helper', '~> 2.11.0', :require => false
+ gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'rspec-puppet-utils', :require => false
gem 'puppet-lint-leading_zero-check', :require => false