summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version number for RC.7.0.0.rc.2sersut2014-03-311-1/+1
* Merge pull request #306 from opscode/adamed/7-stable-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
| * Merge branch 'OHAI-554' into adamed/merge-2014-03-31adamedx2014-03-312-0/+4
| * Merge branch 'OHAI-551' into adamed/merge-2014-03-31adamedx2014-03-312-0/+108
| * Merge branch 'OHAI-550' into adamed/merge-2014-03-31adamedx2014-03-312-10/+10
| * Merge branch 'OHAI-542' into adamed/merge-2014-03-31adamedx2014-03-312-0/+581
|/
* Bump version number for RC release.7.0.0.rc.1sersut2014-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
* | | | | Merge pull request #233 from tas50/OHAI-497Serdar Sutay2014-03-202-10/+59
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update darwin tests for the new attributesTim Smith2013-12-171-10/+44
| * | | | Add new CPU attributes for OS X to match those of LinuxTim Smith2013-12-171-0/+15
* | | | | Merge pull request #299 from opscode/OHAI-339Serdar Sutay2014-03-204-39/+51
|\ \ \ \ \
| * | | | | Contribution info for OHAI-339.sersut2014-03-202-0/+2
| * | | | | Fix the broken tests post merge.sersut2014-03-202-5/+10
| * | | | | Merge branch 'OHAI-339' of github.com:mvidner/ohaisersut2014-03-192-34/+39
| |\ \ \ \ \ |/ / / / / /
| * | | | | [OHAI-339] distinguish openSUSE from SUSE Linux EnterpriseMartin Vidner2013-03-212-9/+17
| * | | | | suse platform: read /etc/SuSE-release only once.Martin Vidner2013-03-192-6/+7
* | | | | | Merge pull request #294 from jaymzh/hostnamefix_7Phil Dibowitz2014-03-144-3/+49
|\ \ \ \ \ \
| * | | | | | Handle `hostname --fqdn` stupidityPhil Dibowitz2014-03-134-3/+49
|/ / / / / /
* | | | | | Add OHAI MVPsBryan McLellan2014-02-281-0/+37
* | | | | | Merge pull request #292 from opscode/new-policy-filesSerdar Sutay2014-02-275-144/+37
|\ \ \ \ \ \
| * | | | | | New policy files for OHAI.new-policy-filessersut2014-02-275-144/+37
|/ / / / / /
* | | | | | update man page for versionjamescott2014-01-311-7/+9
* | | | | | Bump the version number for RC release.7.0.0.rc.0sersut2014-01-201-1/+1
* | | | | | Merge pull request #282 from opscode/adamed-ms-c-fixAdam Edwards2014-01-171-1/+1
|\ \ \ \ \ \
| * | | | | | OC-11083 MS C compiler plugin regression -- trailing return character removalAdam Edwards2014-01-171-1/+1
|/ / / / / /
* | | | | | Merge pull request #281 from opscode/windows-ohai-verifierSerdar Sutay2014-01-174-12/+50
|\ \ \ \ \ \
| * | | | | | Unit test for windows kernel plugin.sersut2014-01-162-2/+47
| * | | | | | Fix the ohai-verifier issues on windows.sersut2014-01-161-3/+1
| * | | | | | Initialize the attribute correctly in kernel plugin for windows.sersut2014-01-161-1/+1
| * | | | | | Move the mixlib-shellout version constraint to the gemspec.sersut2014-01-162-6/+1
|/ / / / / /