summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|/ / /
* | | bumping to 7.6.0.rc.07.6.0.rc.0Lamont Granquist2014-09-091-1/+1
* | | drop 1.8.7 and 1.9.2 from travis, remove 1.8.7 hackLamont Granquist2014-09-091-14/+3
* | | Merge pull request #408 from opscode/lcg/mixlib-shellout-bumplamont-granquist2014-09-093-8/+6
|\ \ \
| * | | bump mixlib-shellout + misc gemspecLamont Granquist2014-09-083-8/+6
|/ / /
* | | Merge pull request #407 from opscode/sersut/fix-rake-gemSerdar Sutay2014-09-081-0/+3
|\ \ \
| * | | Add rake to the bundle to be able to run 'bundle exec rake gem' in build.Serdar Sutay2014-09-081-0/+3
|/ / /
* | | Add license to gemspecBryan McLellan2014-09-031-0/+1
* | | Merge pull request #404 from opscode/lcg/fix-rake-installlamont-granquist2014-09-031-2/+2
|\ \ \
| * | | fix busted rake installLamont Granquist2014-08-291-2/+2
|/ / /
* | | Merge pull request #403 from opscode/btm/passwd-spec-fixBryan McLellan2014-08-292-1/+5
|\ \ \
| * | | Ignore passwd plugin on WindowsBryan McLellan2014-08-282-1/+5
|/ / /
* | | Merge pull request #402 from opscode/btm/fix-master-changelogBryan McLellan2014-08-281-9/+15
|\ \ \
| * | | Update CHANGELOG for the last two releasesBryan McLellan2014-08-281-9/+15
|/ / /
* | | Merge pull request #322 from opscode/lcg/python-parenslamont-granquist2014-08-262-23/+25
|\ \ \
| * | | remove empty before blockLamont Granquist2014-08-261-4/+0
| * | | modernize specs with expect()Lamont Granquist2014-08-261-3/+3
| * | | fix specsLamont Granquist2014-08-261-18/+24
| * | | Encapsulate print command in functionLamont Granquist2014-08-261-3/+3
* | | | Merge pull request #398 from opscode/lcg/remove-json-monkeypatchinglamont-granquist2014-08-267-15/+9
|\ \ \ \ | |/ / / |/| | |
| * | | remove ffi_yajl monkeypatchingLamont Granquist2014-08-267-15/+9
|/ / /
* | | Changelog update.Serdar Sutay2014-08-221-1/+3
* | | Merge pull request #393 from jaymzh/fix_lsblk-7Phil Dibowitz2014-08-212-45/+74
|\ \ \
| * | | [Ohai 7] Fix lsblk callsPhil Dibowitz2014-08-212-45/+74
|/ / /
* | | Merge pull request #390 from jaymzh/7-ecmp-routesPhil Dibowitz2014-08-164-6/+21
|\ \ \
| * | | [Ohai 7] Add support for ECMP routes to linux::networkPhil Dibowitz2014-08-154-6/+21
|/ / /
* | | Merge pull request #386 from juliandunn/getlogin-liesJulian C. Dunn2014-08-152-2/+3
|\ \ \
| * | | getlogin() often lies, especially when run under "su" -- it still returns theJulian C. Dunn2014-08-142-2/+3
* | | | Merge pull request #387 from juliandunn/readme-typosJulian C. Dunn2014-08-151-8/+8
|\ \ \ \
| * | | | Fix README errors (grammar, links, formatting)Julian C. Dunn2014-08-151-8/+8
|/ / / /