summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #394 from jaymzh/6-lsblk6-stablePhil Dibowitz2014-08-212-8/+2
|\
| * Docs for last commitPhil Dibowitz2014-08-212-8/+2
|/
* Bump the version for 6.24.2 release.6.24.2Serdar Sutay2014-08-211-1/+1
* Merge pull request #392 from jaymzh/fix_lsblk-6Phil Dibowitz2014-08-212-37/+66
|\
| * [Ohai 6] Fix lsblk callsPhil Dibowitz2014-08-212-37/+66
|/
* Bump version for 6.24.0 release.6.24.0Serdar Sutay2014-08-191-1/+1
* Merge pull request #389 from jaymzh/6-ecmp-routesPhil Dibowitz2014-08-163-6/+20
|\
| * [Ohai 6] Add support for ECMP routes to linux::networkPhil Dibowitz2014-08-153-6/+20
|/
* Merge branch 'jaymzh-lsblk-6' into 6-stableClaire McQuin2014-08-074-10/+148
|\
| * Merge branch 'lsblk-6' of github.com:jaymzh/ohai into jaymzh-lsblk-6Claire McQuin2014-08-074-15/+147
| |\
| | * [ohai 6] Linux::filesystems should prefer lsblk to blkid when availablePhil Dibowitz2014-07-034-15/+147
* | | Merge pull request #376 from jaymzh/mounts_6Phil Dibowitz2014-07-314-25/+46
|\ \ \
| * | | Fix reading /proc/mounts harderPhil Dibowitz2014-07-314-25/+46
|/ / /
* | | Revert "Fix linux::filesystem reading of /proc/mounts"Lamont Granquist2014-07-312-2/+2
* | | Merge pull request #372 from jaymzh/mounts_6Phil Dibowitz2014-07-312-2/+2
|\ \ \
| * | | Fix linux::filesystem reading of /proc/mountsPhil Dibowitz2014-07-312-2/+2
|/ / /
* | | Version tag for 6.24.0 Release Candidate.6.24.0.rc.0sersut2014-07-171-1/+1
* | | Update CHANGELOG for release.sersut2014-07-171-2/+2
* | | Merge pull request #359 from opscode/mcquin/pin-rspecClaire McQuin2014-07-071-3/+3
|\ \ \ | |/ / |/| |
| * | pin rspec version to 2.14mcquin/pin-rspecClaire McQuin2014-07-071-3/+3
| |/
* | Merge pull request #357 from opscode/revert-355-mcquin/pin-rspecClaire McQuin2014-07-071-3/+3
|\ \
| * | Revert "pin rspec version to 2.14"revert-355-mcquin/pin-rspecClaire McQuin2014-07-071-3/+3
|/ /
* | Merge pull request #355 from opscode/mcquin/pin-rspecClaire McQuin2014-07-071-3/+3
|\ \ | |/ |/|
| * pin rspec version to 2.14Claire McQuin2014-07-071-3/+3
|/
* Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.sersut2014-05-232-12/+6
* Bump up the version number for release.6.22.0sersut2014-04-081-1/+1
* Merge pull request #308 from jaymzh/df_6Phil Dibowitz2014-04-024-39/+55
|\
| * Use a timeout when running 'df' and 'mount'Phil Dibowitz2014-04-014-39/+55
|/
* OHAI-550: Reduce memory footprint of java in pluginBryan McLellan2014-04-013-10/+11
* Version bump for RC release.6.22.0.rc.0sersut2014-03-301-4/+3
* Merge pull request #296 from jaymzh/hostnamefix_6Phil Dibowitz2014-03-144-5/+29
|\
| * Fix `hostname --fqdn` stupidity on linuxPhil Dibowitz2014-03-134-5/+29
|/
* Merge pull request #292 from opscode/new-policy-filesSerdar Sutay2014-03-135-144/+37
* Merge pull request #212 from opscode/lcg/java-stdout-buglamont-granquist2014-01-081-4/+4
|\
| * swap order of redirectsLamont Granquist2013-10-111-4/+4
* | Clean up `jenkins_run_tests.bat`Seth Chisamore2013-12-051-4/+11
* | Merge pull request #235 from opscode/OHAI-537Bryan McLellan2013-12-042-2/+13
|\ \
| * | OHAI-537: Require the os plugin in the hostname pluginBryan McLellan2013-12-042-2/+13
|/ /
* | CHEF-4714jamescott2013-11-041-1/+1
* | fix to say "The version of Ohai."jamescott2013-10-311-1/+1
* | Bump the version number to 6.20.0 for release.6.20.0sersut2013-10-311-1/+1
* | update man page per OHAI-515jamescott2013-10-282-3/+10
* | update Ohai man pagejamescott2013-10-221-18/+80
* | Bump the version to 6.20.0.rc.16.20.0.rc.1sersut2013-10-211-1/+1
* | Merge pull request #216 from opscode/systemu-version-pinSerdar Sutay2013-10-181-9/+1
|\ \
| * | Pin version of systemu to the same version included in chef.systemu-version-pinsersut2013-10-181-9/+1
* | | OHAI-412 was reverted on the 6-stable branchBryan McLellan2013-10-180-0/+0
|/ /
* | Bump version for 6.20.0 RC.6.20.0.rc.0sersut2013-10-171-1/+1
* | Merge pull request #213 from opscode/lcg/force-encodelamont-granquist2013-10-172-5/+26
|\ \
| * | force encode all strings to UTF-8lcg/force-encodeLamont Granquist2013-10-172-7/+8