[Pkg-puppet-devel] [facter] 130/180: Merge remote-tracking branch 'origin/ticket/facter-2/FACT-550-cfpropertylist-windows' into facter-2

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit aaea68103bec8eb13bda297c17765a5c27aeff0c
Merge: d62f3bc 02bffa5
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Thu Jun 12 17:23:02 2014 -0700

    Merge remote-tracking branch 'origin/ticket/facter-2/FACT-550-cfpropertylist-windows' into facter-2
    
    * origin/ticket/facter-2/FACT-550-cfpropertylist-windows:
      (FACT-550) Skip macosx and posix specific tests on windows

 spec/unit/core/execution/posix_spec.rb | 4 ++--
 spec/unit/util/macosx_spec.rb          | 5 +++--
 spec/unit/virtual_spec.rb              | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git