aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-07-11 11:35:25 +0200
committerGitHub <noreply@github.com>2018-07-11 11:35:25 +0200
commit0d5ef0c562710395b17fe10b6a1096ed43f58bed (patch)
treec9631727a660198fda08da6230598ae7ad351914
parentaca9f33812d353aed4d8a35b2e59e2b1c3cf1375 (diff)
parente41276c02467480f2bb84684caa3a8ee97253031 (diff)
downloadpuppet-ferm-0d5ef0c562710395b17fe10b6a1096ed43f58bed.tar.gz
puppet-ferm-0d5ef0c562710395b17fe10b6a1096ed43f58bed.tar.bz2
Merge pull request #18 from voxpupuli/modulesync
modulesync 1.9.3
-rw-r--r--.msync.yml2
-rw-r--r--Gemfile7
2 files changed, 6 insertions, 3 deletions
diff --git a/.msync.yml b/.msync.yml
index 1a13211..9984f8f 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '1.9.2'
+modulesync_config_version: '1.9.3-rc0'
diff --git a/Gemfile b/Gemfile
index 1527b39..8da95fb 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.6.0', :require => false
+ gem 'puppetlabs_spec_helper', '~> 2.6', :require => false
gem 'rspec-puppet', '~> 2.5', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'rspec-puppet-utils', :require => false
@@ -55,13 +55,16 @@ group :system_tests do
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
gem 'beaker-puppet_install_helper', :require => false
gem 'beaker-module_install_helper', :require => false
+ gem 'rbnacl', '~> 4', :require => false if RUBY_VERSION >= '2.2.6'
+ gem 'rbnacl-libsodium', :require => false if RUBY_VERSION >= '2.2.6'
+ gem 'bcrypt_pbkdf', :require => false
end
group :release do
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
gem 'puppet-blacksmith', :require => false
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
- gem 'puppet-strings', '~> 1.0', :require => false
+ gem 'puppet-strings', '>= 1.0', :require => false
end