Merge branch 'master' into yml-unquoted-numerics

Author: tylerjl

.travis.yml

@@ -17,20 +17,20 @@ env:
   - TEST_SUITE=integration
   - DISTRO=centos-6-x64
   - DISTRO=centos-6-x64 PE=true
-  - DISTRO=centos-6-x64 PE=true PE_VER=2016.1.1
+  - DISTRO=centos-6-x64 PE=true PE_VER=2016.1.2
   - DISTRO=centos-7-x64
   - DISTRO=centos-7-x64 PE=true
-  - DISTRO=centos-7-x64 PE=true PE_VER=2016.1.1
+  - DISTRO=centos-7-x64 PE=true PE_VER=2016.1.2
   - DISTRO=debian-7-x64
   - DISTRO=debian-7-x64 PE=true
     # No 2016.x release for debian 7
   - DISTRO=debian-8-x64
   - DISTRO=ubuntu-server-1204-x64
   - DISTRO=ubuntu-server-1204-x64 PE=true
-  - DISTRO=ubuntu-server-1204-x64 PE=true PE_VER=2016.1.1
+  - DISTRO=ubuntu-server-1204-x64 PE=true PE_VER=2016.1.2
   - DISTRO=ubuntu-server-1404-x64
   - DISTRO=ubuntu-server-1404-x64 PE=true
-  - DISTRO=ubuntu-server-1404-x64 PE=true PE_VER=2016.1.1
+  - DISTRO=ubuntu-server-1404-x64 PE=true PE_VER=2016.1.2
   - DISTRO=opensuse-13-x64
   - DISTRO=sles-12-x64
   - DISTRO=sles-12-x64 PE=true

Gemfile

@@ -4,11 +4,11 @@ puppetversion = ENV['PUPPET_VERSION'] || '~> 3.8.0'
 gem 'puppet', puppetversion, :require => false
 
 gem 'beaker'
-gem 'beaker-pe', '~> 0.7.0'
-gem 'beaker-rspec'
+gem 'beaker-pe', '~> 1.1'
+gem 'beaker-rspec', '~> 5.0'
 gem 'metadata-json-lint'
 gem 'rspec-puppet'
-gem 'specinfra', '>= 2.59.3'
+gem 'specinfra', '~> 2.60'
 gem 'infrataster'
 
 gem 'pry'

Makefile

@@ -3,7 +3,7 @@ PE ?= false
 STRICT_VARIABLES ?= yes
 
 ifeq ($(PE), true)
-	PE_VER ?= 3.8.3
+	PE_VER ?= 3.8.6
 	BEAKER_PE_VER := $(PE_VER)
 	BEAKER_IS_PE := $(PE)
 	export BEAKER_PE_VER