summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added appveyor.ymljdm/appveyor-7-stableJay Mundrawala2015-01-221-0/+33
* back to mixlib-shellout ~> 1.2 for 7-stable7-stableLamont Granquist2014-12-031-1/+1
* Version bump for 7.6.0 release.7.6.0Serdar Sutay2014-12-011-1/+1
* Version bump for new RC.7.6.0.rc.1Serdar Sutay2014-10-272-1/+3
* Merge pull request #437 from opscode/sersut/7.6.0-rel-mergeSerdar Sutay2014-10-2757-609/+1591
|\
| * Merge branch 'master' into 7-stablesersut/7.6.0-rel-mergeSerdar Sutay2014-10-2757-609/+1591
| |\ |/ /
| * 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
| | |/ / / / /
| * | | | | | Merge pull request #421 from opscode/schisamo/freebsd-cpu-total-fixSeth Chisamore2014-10-012-2/+2
| |\ \ \ \ \ \
| | * | | | | | Ensure CPU total is an integer on FreeBSDschisamo/freebsd-cpu-total-fixSeth Chisamore2014-09-302-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #417 from ClogenyTechnologies/kd/aixjavapluginJulian C. Dunn2014-09-301-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix regexkaustubh-d2014-09-291-1/+1
| | * | | | | aix - fix regex to get java versionkaustubh-d2014-09-291-1/+1
| |/ / / / /
| * | | | | Merge pull request #410 from opscode/lcg/remove-github-brancheslamont-granquist2014-09-101-2/+0
| |\ \ \ \ \
| | * | | | | mixlib-shellout gem releasedLamont Granquist2014-09-101-2/+0
| |/ / / / /