diff options
| author | Adam Jacob <adam@hjksolutions.com> | 2009-03-06 00:48:16 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@hjksolutions.com> | 2009-03-06 00:48:16 -0800 |
| commit | b6f3827d52444c4730d515ee6e8ca1755c16b5f2 (patch) | |
| tree | 01317d568f6a87586a6a834472cbb46860b012b5 /lib/ohai.rb | |
| parent | d39e61acf9f9a0132d50dd51ec762ec7e5316065 (diff) | |
| parent | 00b4c5f7d302d0cf8cea81b3d4b5fafeef261ce3 (diff) | |
| download | ohai-windows.tar.gz | |
Merge branch 'master' into jgartrel/masterwindows
Conflicts:
lib/ohai/plugins/python.rb
Diffstat (limited to 'lib/ohai.rb')
| -rw-r--r-- | lib/ohai.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai.rb b/lib/ohai.rb index 10417009..d62491b4 100644 --- a/lib/ohai.rb +++ b/lib/ohai.rb @@ -23,5 +23,5 @@ require 'ohai/config' require 'ohai/system' module Ohai - VERSION = '0.1.5' + VERSION = '0.2.1' end |