[Pkg-puppet-devel] [facter] 163/180: Merge branch 'pull-664' 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 ef50ea9fa989be5f3294a049bfe09c7c938b3c22
Merge: ab66542 46eac60
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Fri Jun 20 14:37:40 2014 -0700

    Merge branch 'pull-664' into facter-2

 lib/facter/util/memory.rb                            |  2 +-
 spec/fixtures/unit/memory/smartos_zone_swap_l-single |  2 ++
 spec/unit/memory_spec.rb                             | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

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