Merge branch 'master' into noacceptancedocs

voxpupuli · Dec 24, 2018 · e813c1d · e813c1d
2 parents ed0f20b + 4264d63
commit e813c1d
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