summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-04-06 02:13:54 +1000
committerJames Turnbull <james@lovedthanlost.net>2011-04-06 02:13:54 +1000
commitcf029c3d59b583afd2ce26ec335c6d5b49b166ba (patch)
tree007583c4515f9d3075076ba46919932005302893 /man
parentfc930d8c26c81075eb35ae728777f190d5af1402 (diff)
parent7f3e89de2d9da14bc7bef33709b79f48434eec6a (diff)
downloadfacter-cf029c3d59b583afd2ce26ec335c6d5b49b166ba.tar.gz
facter-cf029c3d59b583afd2ce26ec335c6d5b49b166ba.tar.xz
facter-cf029c3d59b583afd2ce26ec335c6d5b49b166ba.zip
Merge remote branch 'adrien/tickets/next/2714' into next
* adrien/tickets/next/2714: (#2714) Fixed faulty test (#2714) Added timeout to prtdiag resulution
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions