summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Changelog for OHAI-562 and reformat for releaseOHAI-562danielsdeleo2014-04-091-3/+5
* Skip v7 plugins when refreshing a v6 plugindanielsdeleo2014-04-092-0/+34
* update man pagejamescott2014-04-041-4/+8
* Merge pull request #310 from opscode/adamed/OHAI-551-rebaseAdam Edwards2014-04-012-3/+23
|\
| * Use less greedy inverse set match.Eric G. Wolfe2014-04-011-2/+2
| * OHAI-551Eric G. Wolfe2014-04-012-2/+22
|/
* OHAI-558: Add contribution documentationBryan McLellan2014-04-012-0/+3
* Clean up tabs and whitespaceBryan McLellan2014-04-011-10/+10
* Add 'ibm_powerkvm' platformLance Bragstad2014-04-012-1/+15
* Empty UPPER_CASE files for next releaseBryan McLellan2014-04-012-21/+2
* Merge pull request #305 from opscode/adamed/merge-2014-03-31Serdar Sutay2014-03-3111-10/+774
|\
| * CHANGELOG update for OHAI-542, OHAI-550, OHAI-551, OHAI-554, OHAI-557adamedx2014-03-311-0/+5
| * Merge branch 'freebsd-version' into adamed/merge-2014-03-31adamedx2014-03-312-0/+66
| |\
| | * Move capture of __FreeBSD_version to OS pluginRichard Manyanza2014-03-314-10/+67
| | * Capture __FreeBSD_version on FreeBSD systemsRichard Manyanza2014-03-312-1/+10
| |/
| * Merge branch 'OHAI-554' into adamed/merge-2014-03-31adamedx2014-03-312-0/+4
| |\
| | * Update cloud unit tests to check for new azure attrs.Jeff Mendoza2014-03-311-0/+2
| | * OHAI-554 Normalize cloud attributes for azureJeff Mendoza2014-03-311-0/+2
| |/
| * Merge branch 'OHAI-551' into adamed/merge-2014-03-31adamedx2014-03-312-0/+108
| |\
| | * Check specifically for /lxc/ cgroupEric G. Wolfe2014-03-312-15/+36
| | * Change \w+ to .+, since cgroup names could include dashesEric G. Wolfe2014-03-311-1/+1
| | * Add lxc host supportEric G. Wolfe2014-03-312-3/+11
| | * Add coverage for arbitrarily named cgroupsEric G. Wolfe2014-03-312-2/+24
| | * OHAI-551Eric G. Wolfe2014-03-312-11/+36
| | * OHAI-551Eric G. Wolfe2014-03-312-0/+32
| |/
| * Merge branch 'OHAI-550' into adamed/merge-2014-03-31adamedx2014-03-312-10/+10
| |\
| | * go with 64mb instead because that was the old defaultKC Braunschweig2014-03-312-10/+10
| | * Updated tests for new commandKC Braunschweig2014-03-311-9/+9
| | * OHAI-550 java -version wastes memoryKC Braunschweig2014-03-311-1/+1
| |/
| * Merge branch 'OHAI-542' into adamed/merge-2014-03-31adamedx2014-03-312-0/+581
| |\ |/ /
| * OHAI-542 defined cloud_v2 plugin interface objectcaryp2014-03-312-0/+581
|/
* Bump the version number to alpha for 7.2.0.sersut2014-03-301-4/+3
* Lock rake to 10.1.x for ruby 1.8 compatdanielsdeleo2014-03-261-1/+4
* ignore the .bundle directorydanielsdeleo2014-03-261-0/+1
* Merge pull request #301 from opscode/OHAI-420-2Serdar Sutay2014-03-214-0/+83
|\
| * Update the init_package spec based on PR comments.sersut2014-03-211-13/+21
| * Contribution info for OHAI-420.OHAI-420sersut2014-03-202-0/+2
| * Port init_package to Ohai 7.sersut2014-03-202-23/+28
| * Add a new init_package ohai piece, so Chef service providers can determine wh...Caleb Tennis2014-03-202-0/+68
|/
* Merge pull request #300 from opscode/CC-55Serdar Sutay2014-03-202-0/+7
|\
| * Contribution info for OHAI-461.sersut2014-03-202-0/+2
| * Contribution info for OHAI-467.sersut2014-03-202-0/+2
| * Contribution info for OHAI-536.sersut2014-03-201-0/+1
| * Contribution info for OHAI-497.sersut2014-03-202-0/+2
* | Merge pull request #284 from paulczar/rackspace_private_networksSerdar Sutay2014-03-202-6/+95
|\ \
| * | rackspace private network discoveryPaul Czarkowski2014-01-272-6/+95
* | | Merge pull request #244 from mpasternacki/OHAI-467Serdar Sutay2014-03-202-1/+14
|\ \ \
| * | | Prevents fe80:: link-local address from becoming ip6address (seems to fix OHA...Maciej Pasternacki2013-12-172-1/+14
* | | | Merge pull request #234 from juliandunn/OHAI-536Serdar Sutay2014-03-202-3/+3
|\ \ \ \
| * | | | [OHAI-536] Turn down ip6address logging to debugJulian C. Dunn2013-12-072-3/+3