summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* prep for 8.4.0tm/8.4.0Thom May2015-05-212-1/+6
|
* Merge pull request #541 from chef/tm/solaris_dmiThom May2015-05-212-4/+173
|\ | | | | make DMI work on solaris
| * make DMI work on solaristm/solaris_dmiThom May2015-05-202-4/+173
| |
* | Merge pull request #540 from chef/tm/ignore_unwanted_dmiThom May2015-05-202-1/+18
|\ \ | |/ |/| Correctly ignore unwanted DMI data
| * Correctly ignore unwanted DMI datatm/ignore_unwanted_dmiThom May2015-05-201-1/+4
| | | | | | | | Closes #538 and closes #500
| * Add failing test for ignored DMI informationThom May2015-05-201-0/+14
|/
* Ohai 8.3.0Thom May2015-05-202-2/+2
|
* Update CHANGELOG for #534Jay Mundrawala2015-05-151-0/+2
|
* Merge pull request #534 from chef/jdm/oem-bitmapJay Mundrawala2015-05-151-1/+6
|\ | | | | OEM logo is large and completely useless. Remove
| * OEM logo is large and completely useless. Removejdm/oem-bitmapJay Mundrawala2015-05-011-1/+6
|/
* Merge pull request #521 from chef/jjasghar-patch-1Thom May2015-04-271-6/+6
|\ | | | | Update README.md
| * Update README.mdjjasghar-patch-1JJ Asghar2015-04-071-6/+6
| | | | | | Updating to the new urls and chef instead of opscode.
* | Merge pull request #526 from chef/jdm/minimal-ohaiJay Mundrawala2015-04-273-20/+48
|\ \ | | | | | | Move windows drivers out of kernel
| * | Move windows drivers out of kerneljdm/minimal-ohaiJay Mundrawala2015-04-213-20/+48
| | | | | | | | | | | | | | | With the introduction of minimal-ohai in chef, we don't want to grab a bunch of garbage
* | | Merge pull request #527 from chef/tm/avoid_v6Thom May2015-04-272-3/+21
|\ \ \ | |/ / |/| | Work correctly when IPv6 is disabled on Linux
| * | Ensure we test v6 correctlytm/avoid_v6Thom May2015-04-241-1/+13
| | |
| * | Work correctly when IPv6 is disabled on LinuxThom May2015-04-231-2/+8
|/ / | | | | | | | | Right now, ohai will return v4 addresses and routes for v6, rather than just not returning anything. Fixes #380
* | Update CHANGELOGThom May2015-04-211-0/+2
| |
* | Merge pull request #510 from tas50/gentoo_ipThom May2015-04-161-1/+1
|\ \ | |/ |/| Update ip binary detection logic to work on Gentoo/CoreOS
| * Update ip binary detection logic to work on Gentoo/CoreOSTim Smith2015-03-241-1/+1
| |
* | Update CHANGELOGBryan McLellan2015-03-271-0/+3
| |
* | Removing trailing space and '\r' for windowsJeremy MAURO2015-03-274-1/+13
| |
* | Merge pull request #509 from chef/jdm/8.2.0Jay Mundrawala2015-03-252-1/+4
|\ \ | |/ |/| Ohai 8.2.0
| * Bump version for 8.2.0jdm/8.2.0Jay Mundrawala2015-03-241-1/+1
| |
| * Update CHANGELOG for 8.2.0Jay Mundrawala2015-03-241-0/+3
|/
* Changelog updateBryan McLellan2015-03-191-0/+4
| | | | | * Closes #506: Reverting #354 because change bring in GPLv3 dependency * Closes #479: Remove redundant if statement
* Remove redundant if statementManiacal2015-03-191-3/+1
|
* Reverting #354 because change bring in GPLv3 dependencyjdm/354Jay Mundrawala2015-03-187-404/+0
| | | | | | | Revert "Merge pull request #354 from lndbrg/cloudstack-support" This reverts commit ca805e6952eae39bc53113d2da798b1dcd0d51de, reversing changes made to 0779baf28aa230c134877122dbafa8eacb7b29bd.
* Merge pull request #505 from chef/lcg/drop-travis-193Lamont Granquist2015-03-181-1/+0
|\ | | | | remove 1.9.3 from travis
| * remove 1.9.3 from travisLamont Granquist2015-03-171-1/+0
|/
* Merge pull request #502 from chef/lcg/bump-ffi-yajlLamont Granquist2015-03-171-1/+1
|\ | | | | bumping ffi-yajl to pick up 2.x
| * bumping ffi-yajl to pick up 2.xlcg/bump-ffi-yajlLamont Granquist2015-03-171-1/+1
|/ | | | 1.x still works fine, so leaving the lower floor in place.
* Merge pull request #495 from cmluciano/cml/addtravisbadgeLamont Granquist2015-03-161-1/+4
|\ | | | | Add travis badge for build status to readme
| * Add appveyor badge for build status to readmecmluciano2015-03-111-0/+2
| |
| * Add travis badge for build status to readmecmluciano2015-03-111-1/+2
|/
* Merge pull request #490 from chef/jdm/fasterJay Mundrawala2015-02-281-0/+4
|\ | | | | Try to use travis container thingys
| * Try to use travis container thingysjdm/fasterJay Mundrawala2015-02-171-0/+4
|/
* Bump version to 8.1.1Jay Mundrawala2015-02-171-1/+1
|
* Update CHANGELOG for 8.1.1Jay Mundrawala2015-02-171-0/+3
|
* Merge pull request #489 from chef/jdm/fixJay Mundrawala2015-02-174-2/+7
|\ | | | | Ohai 8.1 is broken
| * Don't redefine constant that causes warningJay Mundrawala2015-02-171-1/+1
| |
| * Need to require ipaddressJay Mundrawala2015-02-171-0/+2
| |
| * Travis.yml should run ohaiJay Mundrawala2015-02-171-1/+3
| |
| * Appveyor should run ohaiJay Mundrawala2015-02-171-0/+1
|/
* Fix changelogJay Mundrawala2015-02-171-0/+3
|
* Merge pull request #486 from chef/jdm/version-bump-8.1Jay Mundrawala2015-02-171-1/+1
|\ | | | | Bump version to 8.1.0
| * Bump version to 8.1.0Jay Mundrawala2015-02-171-1/+1
|/
* Merge pull request #484 from chef/jdm/merge-into-masterJay Mundrawala2015-02-171-1/+1
|\ | | | | Jdm/merge into master
| * Merge remote-tracking branch 'origin/8-stable' into HEADJay Mundrawala2015-02-171-1/+1
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | * origin/8-stable: Rename build Added appveyor.yml bumping version to 8.0.1 restrict to ruby >= 2.0.0 to match chef add require resolv to work around missing constant issue in cvt testers Conflicts: appveyor.yml ohai.gemspec
| * Merge pull request #465 from chef/jdm/appveyor-8-stableJay Mundrawala2015-01-221-0/+32
| |\ | | | | | | Added appveyor.yml