Merge pull request #194 from dylanratcliffe/update_ruby_version

Updated ruby versions and controlrepo
voxpupuli · Dec 24, 2018 · 4264d63 · 4264d63
2 parents f3b7db3 + 05b5665
commit 4264d63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,6 @@ script: bundle exec rake full_tests
 bundler_args: --path vendor/bundle
 
 rvm:
-  - 2.1.6
-  - 2.1.7
-  - 2.1.8
-  - 2.1.9
-  - 2.2.7
-  - 2.3.4
-  - 2.4.0
-  - 2.4.1
-  - 2.4.2
+  - 2.3.8
+  - 2.4.4
+  - 2.5.3
diff --git a/spec/fixtures/controlrepos/puppet_controlrepo b/spec/fixtures/controlrepos/puppet_controlrepo
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,12 +9,6 @@ script: bundle exec rake full_tests @@
     bundler_args: --path vendor/bundle
     rvm:
-      - 2.1.6
-      - 2.1.7
-      - 2.1.8
-      - 2.1.9
-      - 2.2.7
-      - 2.3.4
-      - 2.4.0
-      - 2.4.1
-      - 2.4.2
+      - 2.3.8
+      - 2.4.4
+      - 2.5.3
+1 −1		.ruby-version
+4 −3		Gemfile
+53 −56		Gemfile.lock
+77 −66		Puppetfile
+0 −5		README.md
+29 −1		data/common.yaml
+4 −0		site/profile/files/motd
+13 −0		site/profile/manifests/base.pp
+45 −0		site/profile/manifests/base/rhel.pp
+165 −0		site/profile/manifests/file_sync/client.pp
+37 −0		site/profile/manifests/file_sync/master_patch.pp
+0 −8		site/profile/manifests/mysql_server.pp
+4 −0		site/role/manifests/file_sync.pp
+1 −0		site/role/manifests/puppetmaster/basic.pp
+16 −0		spec/matchers/file_matchers.rb
+31 −0		spec/pre_conditions/site.pp
+91 −0		spec/shared_examples/helper.rb