Merge branch 'issue/flanders/pe-19049-add-meep-classification-feature…

…-flag' into pe-modules-next
jpartlow · Mar 10, 2017 · 98d4a9b · 98d4a9b
2 parents f22ac7f + 1353f7b
commit 98d4a9b
Show file tree

Hide file tree

Showing 10 changed files with 607 additions and 48 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,8 +2,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
 
-
-
 def location_for(place, fake_version = nil)
   if place =~ /^(git:[^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
@@ -14,7 +12,6 @@ def location_for(place, fake_version = nil)
   end
 end
 
-
 # We don't put beaker in as a test dependency because we
 # don't want to create a transitive dependency
 group :acceptance_testing do
@@ -25,7 +22,6 @@ if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
   gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 3.0')
 end
 
-
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
diff --git a/lib/beaker-pe.rb b/lib/beaker-pe.rb
@@ -18,7 +18,6 @@ module PE
   end
 end
 
-
 # Boilerplate DSL inclusion mechanism:
 # First we register our module with the Beaker DSL
 Beaker::DSL.register( Beaker::DSL::PE )

diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ module PE @@
       end
     end
     # Boilerplate DSL inclusion mechanism:
     # First we register our module with the Beaker DSL
     Beaker::DSL.register( Beaker::DSL::PE )
@@ Expand Down @@