summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add require resolv to work around missing constant issue in cvt testerslcg/add-hacky-requreLamont Granquist2014-12-031-0/+2
* use mixlib-shellout 2.0 releas8.0.0Lamont Granquist2014-12-031-1/+1
* CHANGELOG updates for releaseLamont Granquist2014-12-031-2/+8
* bumping version for 8.0.0Lamont Granquist2014-12-031-1/+1
* Merge pull request #438 from opscode/mcquin/rspec-3Claire McQuin2014-11-1797-2045/+2046
|\
| * Update for rspec3mcquin/rspec-3Claire McQuin2014-11-041-1/+1
| * Explicitly disable :should syntax.Claire McQuin2014-11-031-2/+2
| * uncomment out things needed to comment out for transpecClaire McQuin2014-10-302-2/+2
| * Convert skipped transpec conversionClaire McQuin2014-10-301-2/+2
| * Convert specs to RSpec 3.1.7 syntax with TranspecClaire McQuin2014-10-3096-2040/+2041
| * Disable for transpecClaire McQuin2014-10-301-1/+1
| * Temporarily disable one of the chef dependenciesClaire McQuin2014-10-301-1/+1
|/
* Bump version number after branching 7.6.0.Serdar Sutay2014-10-272-1/+4
* Contribution info for https://github.com/opscode/ohai/pull/345.Serdar Sutay2014-10-271-0/+2
* Merge pull request #345 from squaresurf/pr-215-fixSerdar Sutay2014-10-272-2/+26
|\
| * This adds a Resolv stub to the top scope for all the tests.Daniel Paul Searles2014-10-241-0/+1
| * Splitting Resolv exception test into multiple tests.Daniel Paul Searles2014-06-301-8/+6
| * Stub out and test Resolv exceptions for rackspace hostname attribute.Daniel Paul Searles2014-06-251-0/+11
| * Catch specific Resolv exceptions when getting hostname for rackspace.Daniel Paul Searles2014-06-251-1/+1
| * [OHAI-518] remove *.static.cloud-ips.comDaniel Paul Searles2014-06-232-3/+12
| * Merge branch 'master' of github.com:gtmanfred/ohaiDaniel Paul Searles2014-06-231-1/+6
| |\
| | * remove *.static.cloud-ips.comDaniel Wallace2013-10-181-1/+6
* | | Add release information for 7.4.0.Serdar Sutay2014-10-211-0/+4
* | | Merge pull request #418 from ClogenyTechnologies/kd/aixfixnwJulian C. Dunn2014-10-142-20/+11
|\ \ \
| * | | aix - fix network plugin to use netstat instead of route.kaustubh-d2014-09-302-20/+11
* | | | Merge pull request #430 from opscode/mcquin/community-mergesClaire McQuin2014-10-141-0/+10
|\ \ \ \
| * | | | Update contribution info for https://github.com/opscode/ohai/pull/411.mcquin/community-mergesClaire McQuin2014-10-131-0/+2
| * | | | Update contribution info for https://github.com/opscode/ohai/pull/368Claire McQuin2014-10-131-0/+2
| * | | | Update contribution info for https://github.com/opscode/ohai/pull/427.Claire McQuin2014-10-131-0/+2
| * | | | Update contribution info for https://github.com/opscode/ohai/pull/379.Claire McQuin2014-10-131-0/+2
| * | | | Update contribution info for https://github.com/opscode/ohai/pull/346.Claire McQuin2014-10-131-0/+2
* | | | | Merge pull request #429 from opscode/nshahzad-patch-1Claire McQuin2014-10-132-3/+21
|\ \ \ \ \
| * | | | | detect any whitespacenshahzad-patch-1Claire McQuin2014-10-132-4/+13
| * | | | | Merge branch 'patch-1' of github.com:nshahzad/ohai into nshahzad-patch-1Claire McQuin2014-10-132-1/+10
| |\ \ \ \ \
| | * | | | | Added unit tests for multiple spaces in Linux VServer specNabeel Shahzad2014-10-091-0/+9
| | * | | | | Look for any number of spaces between the VxID and the valueNabeel Shahzad2014-09-111-1/+1
| | | |/ / / | | |/| | |
* | | | | | Merge pull request #368 from opscode/btm/eucalyptus_404Claire McQuin2014-10-133-5/+9
|\ \ \ \ \ \
| * | | | | | Don't hardcode XML return from API server on 404, just look for a 404btm/eucalyptus_404Bryan McLellan2014-10-043-5/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #427 from barnabear/masterClaire McQuin2014-10-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update platform.rbbarnabear2014-10-101-1/+1
| |/ / / /
* | | | | Merge pull request #379 from carck/masterClaire McQuin2014-10-131-1/+1
|\ \ \ \ \
| * | | | | this blocks local for 10 minuteslance.zhou2014-08-051-1/+1
* | | | | | Merge branch 'cread-trusty_network'Claire McQuin2014-10-132-429/+444
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'trusty_network' of github.com:cread/ohai into cread-trusty_networkClaire McQuin2014-10-132-429/+444
| |\ \ \ \ \ |/ / / / / /
| * | | | | Refactor the network tests to rspec 3, merge in test for new vlan outputChris Read2014-07-013-1285/+368
| * | | | | Add support for ip version ss131122Chris Read2014-06-252-2/+934
* | | | | | Merge pull request #413 from glensc/patch-1Serdar Sutay2014-10-081-2/+2
|\ \ \ \ \ \
| * | | | | | Update CHANGELOG.mdElan Ruusamäe2014-09-181-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #419 from ClogenyTechnologies/kd/aixuptimefixJulian C. Dunn2014-10-012-8/+9
|\ \ \ \ \ \
| * | | | | | aix - fix uptime timezone issue.kaustubh-d2014-09-302-8/+9
| |/ / / / /