acu152132 fixed broken repose_downloader_spec
Merge pull request #298 from rightscale/ivory_14_01_acu132203_remove_ohai_from_cloud_definition_library

Ivory 14 01 acu132203 remove ohai from cloud definition library
acu141275 - resolve merge conflicts
acu141275 - fix broken specs, possible bad merge
acu152174 remove unnecessary code
acu152174 add empty vscale plugin
acu141082 static IP support for Ubuntu 12.04
acu141082 NAT routing support for Ubuntu 12.04
acu141082 don't save gateway in config if gateway is not provided
acu152174 gather basic network information in vscale plugin
acu152174 gather basic network information in softlayer plugin
acu152174 make ::Ohai::Mixin::RightLink::CloudUtilities independent from ohai
acu152174 add ::Ohai::Mixin::RightLink::CloudUtilities specs
acu141082 persist routes to correct config file
acu152174 fix ips detection on Windows
acu141082 fix exception in default gw route existence check
Merge pull request #304 from rightscale/ivory_14_02_acu141082_ubuntu_12_04_support

Vscale Ubuntu 12.04 support
Merge pull request #302 from rightscale/ivory_14_02_acu152174_vscale_ohai_plugin

Vscale ohai plugin
Merge branch 'v6.0'

* v6.0:
  acu141082 fix exception in default gw route existence check
  acu152174 fix ips detection on Windows
  acu141082 persist routes to correct config file
  acu152174 add ::Ohai::Mixin::RightLink::CloudUtilities specs
  acu152174 make ::Ohai::Mixin::RightLink::CloudUtilities independent from ohai
  acu152174 gather basic network information in softlayer plugin
  acu152174 gather basic network information in vscale plugin
  acu141082 don't save gateway in config if gateway is not provided
  acu141082 NAT routing support for Ubuntu 12.04
  acu141082 static IP support for Ubuntu 12.04
  acu152174 add empty vscale plugin
  acu152174 remove unnecessary code
  acu141275 - fix broken specs, possible bad merge
  acu152132 fixed broken repose_downloader_spec
acu154292 - Merge branch 'master' into ivory_14_03_acu154292_fix_ohai_specs

* master:
  acu141082 fix exception in default gw route existence check
  acu152174 fix ips detection on Windows
  acu141082 persist routes to correct config file
  acu152174 add ::Ohai::Mixin::RightLink::CloudUtilities specs
  acu152174 make ::Ohai::Mixin::RightLink::CloudUtilities independent from ohai
  acu152174 gather basic network information in softlayer plugin
  acu152174 gather basic network information in vscale plugin
  acu141082 don't save gateway in config if gateway is not provided
  acu141082 NAT routing support for Ubuntu 12.04
  acu141082 static IP support for Ubuntu 12.04
  acu152174 add empty vscale plugin
  acu152174 remove unnecessary code
  acu141275 - fix broken specs, possible bad merge
  acu152132 fixed broken repose_downloader_spec

Conflicts:
	spec/chef/plugins/softlayer_spec.rb