Undo gem changes that broke most Puppet versions

Change-Id: Ibaf3016065a4f486aa4f1447ac00de84aa4928b7
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/Gemfile b/Gemfile
index 2f0dddd924ccc115a570717f1cb292f9135584aa..457436e968a11eb03aa9f17b8577ad9ce00b85f3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ end
 group :development do
   gem "travis"
   gem "travis-lint"
-  gem "beaker", ">=2.2.0"
+  gem "beaker"
   gem "beaker-rspec"
   gem "vagrant-wrapper"
   gem "puppet-blacksmith"

diff --git a/Rakefile b/Rakefile
index 2d42da9cd8f7971d145857e2f1b0b99e2f1d0a8f..75f235acc36d56bc247a17b83b06bae1c8cab946 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,3 @@
-require 'puppet/vendor/semantic/lib/semantic'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'