summaryrefslogtreecommitdiff
path: root/lib/ohai/exception.rb
diff options
context:
space:
mode:
authorAdam Jacob <adam@hjksolutions.com>2009-03-06 00:48:16 -0800
committerAdam Jacob <adam@hjksolutions.com>2009-03-06 00:48:16 -0800
commitb6f3827d52444c4730d515ee6e8ca1755c16b5f2 (patch)
tree01317d568f6a87586a6a834472cbb46860b012b5 /lib/ohai/exception.rb
parentd39e61acf9f9a0132d50dd51ec762ec7e5316065 (diff)
parent00b4c5f7d302d0cf8cea81b3d4b5fafeef261ce3 (diff)
downloadohai-windows.tar.gz
Merge branch 'master' into jgartrel/masterwindows
Conflicts: lib/ohai/plugins/python.rb
Diffstat (limited to 'lib/ohai/exception.rb')
0 files changed, 0 insertions, 0 deletions