summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2009-12-22fix some merge problemsMicah Anderson
2009-12-22Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'Micah Anderson
Conflicts: README lib/facter/acpi_available.rb lib/facter/interfaces.rb lib/facter/munin_interfaces.rb manifests/client.pp manifests/host.pp manifests/init.pp manifests/plugin.pp plugins/facter/interfaces.rb templates/defaultclient.erb templates/munin-node.conf.Debian.lenny
2009-11-23move plugin directory to fit new 0.25.x style and update file paths accordinglyMicah Anderson
2009-10-31move plugin directory to fit new 0.25 stylemh