summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump the version number for release.7.0.4sersut2014-04-291-1/+1
* Merge pull request #326 from opscode/sersut/disable-fixSerdar Sutay2014-04-294-49/+45
|\
| * Currently we check the :disabled_plugins in Ohai::Runner#run_plugin. Dependen...sersut2014-04-294-49/+45
|/
* Bump version for 7.0.4.rc.07.0.4.rc.0adamedx2014-04-231-1/+1
* Update changelog to include OHAI-558, add missing detailsadamedx2014-04-231-7/+11
* Merge remote-tracking branch 'origin/master' into 7-stableadamedx2014-04-238-50/+81
|\
| * Merge pull request #314 from opscode/plugin-name-fixlamont-granquist2014-04-233-29/+43
| |\
| | * remove capitalize from v7 name methodClaire McQuin2014-04-103-29/+43
| |/
| * 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
* | Bump the version number for release.7.0.2sersut2014-04-091-1/+1
* | Update changelog for OHAI-568.sersut2014-04-091-3/+7
* | Skip v7 plugins when refreshing a v6 plugindanielsdeleo2014-04-092-0/+34
* | Bump version number for release.7.0.0sersut2014-04-081-1/+1
* | Bump the version number for RC.7.0.0.rc.3sersut2014-04-041-1/+1
* | Merge pull request #311 from opscode/adamed/7-stable-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
|/ /
* | 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
|\ \