[Pkg-puppet-devel] [facter] 04/61: Merge branch 'ticket/stable/20989-windows-x86-reported-wrong' into stable

[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 5d2bd579482f3a6610e283d3c5252eb72dc5d13c
Merge: 4b3a085 0cb1ff1
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon Jul 8 14:39:30 2013 -0700

    Merge branch 'ticket/stable/20989-windows-x86-reported-wrong' into stable
    
    * ticket/stable/20989-windows-x86-reported-wrong:
      (#20989) x86 windows hardware model show i686 not i1586
      Adding a windows fact for i686 to architecture specs

 lib/facter/hardwaremodel.rb     |    9 +++++++--
 spec/unit/architecture_spec.rb  |    1 +
 spec/unit/hardwaremodel_spec.rb |   17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

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