From: Travis Fields <travis@puppetlabs.com>
Date: Tue, 4 Nov 2014 22:17:03 +0000 (-0800)
Subject: Merge branch '4.3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4bff0d2d61b8b31cd132fdc7896f115ef2b96770;p=puppet-stdlib.git

Merge branch '4.3.x'

Conflicts:
	spec/acceptance/ensure_packages_spec.rb
	spec/acceptance/ensure_resource_spec.rb
---

4bff0d2d61b8b31cd132fdc7896f115ef2b96770
diff --cc spec/acceptance/ensure_resource_spec.rb
index c3d72fc,26409fe..f1bfa54
--- a/spec/acceptance/ensure_resource_spec.rb
+++ b/spec/acceptance/ensure_resource_spec.rb
@@@ -1,7 -1,8 +1,7 @@@
  #! /usr/bin/env ruby -S rspec
  require 'spec_helper_acceptance'
  
- describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) && fact('osfamily') != 'windows') do
 -
+ describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') do
    describe 'success' do
      it 'ensure_resource a package' do
        apply_manifest('package { "rake": ensure => absent, provider => "gem", }')