diff options
author | James Turnbull <james@lovedthanlost.net> | 2011-04-06 02:15:32 +1000 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2011-04-06 02:15:32 +1000 |
commit | 68a125c56b65ecadcbe92ecb4bafb28731706e57 (patch) | |
tree | 12a7848a374fb363acd4df5b1b310ae78e2d197c /spec/unit/virtual_spec.rb | |
parent | cf029c3d59b583afd2ce26ec335c6d5b49b166ba (diff) | |
parent | f6c9927b6450894fc7036881eab5ff2fb9524e71 (diff) | |
download | facter-68a125c56b65ecadcbe92ecb4bafb28731706e57.tar.gz facter-68a125c56b65ecadcbe92ecb4bafb28731706e57.tar.xz facter-68a125c56b65ecadcbe92ecb4bafb28731706e57.zip |
Merge remote branch 'adrien/tickets/next/6719' into next
* adrien/tickets/next/6719:
(#6719) Corrected faulty logic in bugfix
Conflicts:
lib/facter/virtual.rb
Diffstat (limited to 'spec/unit/virtual_spec.rb')
0 files changed, 0 insertions, 0 deletions