Merge pull request puppetlabs#315 from david22swan/MODULES-8142

(MODULES-8142) - Addition of support for SLES 15
jeannegreulich · Dec 17, 2018 · 44ff961 · 44ff961
2 parents c1b6b11 + 38aa751
commit 44ff961
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -12,11 +12,6 @@
 Gemfile:
   optional:
     ':development':
-      - gem: net-telnet
-        version: '0.1.0'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')"
-      - gem: net-telnet
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
       - gem: 'github_changelog_generator'
         git: 'https://github.com/skywinder/github-changelog-generator'
         ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'

diff --git a/Gemfile b/Gemfile
@@ -27,8 +27,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-lint-i18n",                              require: false
-  gem "net-telnet", '0.1.0',                           require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')
-  gem "net-telnet",                                    require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
   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')
 end
 group :system_tests do

diff --git a/metadata.json b/metadata.json
@@ -49,7 +49,8 @@
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "11 SP1",
-        "12"
+        "12",
+        "15"
       ]
     },
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,8 @@ @@
           "operatingsystem": "SLES",
           "operatingsystemrelease": [
             "11 SP1",
-            "12"
+            "12",
+            "15"
           ]
         },
         {
@@ Expand Down @@