From: BogdanIrimie <bogdan.irimie@puppet.com>
Date: Mon, 14 Sep 2020 14:07:11 +0000 (+0300)
Subject: Merge branch 'main' into IAC-1143
X-Git-Tag: v7.6.0~1^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0e75ab7ce4b9ebeca33348b19c2957d5870af690;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'main' into IAC-1143
---

0e75ab7ce4b9ebeca33348b19c2957d5870af690
diff --cc Gemfile
index c65a5be,582e584..3373f01
--- a/Gemfile
+++ b/Gemfile
@@@ -30,12 -30,10 +30,10 @@@ group :development d
    gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
    gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
    gem "puppet-lint-i18n",                                        require: false
-   gem 'ed25519', '>= 1.2', '< 2.0'
-   gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
  end
  
 -puppet_version = ENV['PUPPET_GEM_VERSION']
 -facter_version = ENV['FACTER_GEM_VERSION']
 +# puppet_version = ENV['PUPPET_GEM_VERSION']
 +# facter_version = ENV['FACTER_GEM_VERSION']
  hiera_version = ENV['HIERA_GEM_VERSION']
  
  gems = {}