diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-09 16:04:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-09 16:04:15 -0800 |
| commit | ee5f78a94e0aa1e12945e90f8c47d8be78ed00f8 (patch) | |
| tree | 6d430e20f3acc22dd855bc20eda5753b206a838d /ext/facter-diff | |
| parent | 54d742235279863ba455900e053ecdc2b764e564 (diff) | |
| parent | 43e203c688399ac86d337514aecb6fa0c9def683 (diff) | |
| download | facter-ee5f78a94e0aa1e12945e90f8c47d8be78ed00f8.tar.gz facter-ee5f78a94e0aa1e12945e90f8c47d8be78ed00f8.tar.xz facter-ee5f78a94e0aa1e12945e90f8c47d8be78ed00f8.zip | |
Merge remote branch 'stschulte/feature/master/5040' into next
Manually resolved conflicts:
lib/facter/virtual.rb
spec/unit/virtual.rb
Diffstat (limited to 'ext/facter-diff')
0 files changed, 0 insertions, 0 deletions