Merge pull request #351 from DavidS/release-fixes

Release fixes
puppetlabs · Oct 25, 2016 · 41074fa · 41074fa
2 parents 3545542 + 11ba2c8
commit 41074fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,6 +32,7 @@ group :development, :unit_tests do
 end
 group :system_tests do
   gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
+  gem 'beaker-pe' if RUBY_VERSION >= '2.3.0'
   gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
   gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
   gem 'serverspec'

diff --git a/data/SLES-12.yaml b/data/SLES-12.yaml
@@ -1 +1,2 @@
+ntp::service_name: ntpd
 ntp::service_provider: systemd
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		ntp::service_name: ntpd
		ntp::service_provider: systemd