[Pkg-puppet-devel] [facter] 249/352: Merge pull request #624 from adrienthebo/feature/facter-2/fact-239-aggregate-resolution-dsl

[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 619df151c0280ac2ae409963eda30b9dfc2644e6
Merge: 39c139c 71f650f
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Tue Feb 11 20:02:32 2014 -0800

    Merge pull request #624 from adrienthebo/feature/facter-2/fact-239-aggregate-resolution-dsl
    
    Feature/facter 2/fact 239 aggregate resolution dsl

 lib/facter.rb                     |  13 ++++
 lib/facter/core/aggregate.rb      |  12 +++-
 lib/facter/util/collection.rb     |  11 +--
 lib/facter/util/fact.rb           |  67 ++++++++++-------
 lib/facter/util/resolution.rb     |  24 +++++++
 spec/unit/core/aggregate_spec.rb  |  34 +++------
 spec/unit/facter_spec.rb          | 148 +++++++++++++++-----------------------
 spec/unit/util/collection_spec.rb |  20 ++----
 spec/unit/util/fact_spec.rb       |  90 ++++++++++++-----------
 spec/unit/util/resolution_spec.rb |  16 +++++
 10 files changed, 223 insertions(+), 212 deletions(-)

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