diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-17 17:09:22 -0600 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-17 17:09:22 -0600 |
| commit | d080ef7a6b1cbb174f47cd0e354c2a1d621e5785 (patch) | |
| tree | 4d8d19319b12206cb76a659f01b07f2c898a4992 | |
| parent | 5808b790b37037b187122ff0b22c32a094fc7b14 (diff) | |
| parent | 88e630bca769a45e167d6c20760e795048c3ed8b (diff) | |
| download | ohai-8.1.1.tar.gz | |
Merge branch 'master' into 8-stable8.1.1
* master:
Bump version to 8.1.1
Update CHANGELOG for 8.1.1
Don't redefine constant that causes warning
Need to require ipaddress
Travis.yml should run ohai
Appveyor should run ohai
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | lib/ohai/plugins/digital_ocean.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/util/ip_helper.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 |
6 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index ac384a9f..fa1af3dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,6 @@ rvm: - 1.9.3 - 2.0.0 - 2.1.2 -script: bundle exec rake spec +script: + - bundle exec rake spec + - bundle exec ohai diff --git a/CHANGELOG.md b/CHANGELOG.md index da8ae431..9d7049c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased: +## Release 8.1.1 +* Fix broken DigitalOcean plugin + ## Release 8.1.0 * [**Warren Bain**](https://github.com/thoughtcroft) diff --git a/appveyor.yml b/appveyor.yml index ea82eb56..83e19722 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,3 +30,4 @@ build_script: test_script: - bundle exec rspec + - bundle exec ohai diff --git a/lib/ohai/plugins/digital_ocean.rb b/lib/ohai/plugins/digital_ocean.rb index e42be4f0..f637e748 100644 --- a/lib/ohai/plugins/digital_ocean.rb +++ b/lib/ohai/plugins/digital_ocean.rb @@ -19,7 +19,7 @@ require 'ohai/util/ip_helper' Ohai.plugin(:DigitalOcean) do include Ohai::Util::IpHelper - DIGITALOCEAN_FILE = '/etc/digitalocean' + DIGITALOCEAN_FILE = '/etc/digitalocean' unless defined?(DIGITALOCEAN_FILE) provides "digital_ocean" diff --git a/lib/ohai/util/ip_helper.rb b/lib/ohai/util/ip_helper.rb index 92da9956..3195dd7b 100644 --- a/lib/ohai/util/ip_helper.rb +++ b/lib/ohai/util/ip_helper.rb @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +require 'ipaddress' + module Ohai module Util module IpHelper diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index 0769a1bb..8bde3b75 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -18,5 +18,5 @@ module Ohai OHAI_ROOT = File.expand_path(File.dirname(__FILE__)) - VERSION = '8.1.0' + VERSION = '8.1.1' end |