summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow ohai to load a plugin pathtm/load_additional_pluginsThom May2017-04-044-2/+89
* Merge pull request #972 from coderanger/freeze-stringsNoah Kantrowitz2017-04-032-0/+27
|\
| * Make Rubocop happy.Noah Kantrowitz2017-04-031-2/+2
| * Freeze all string values coming out of Ohai.Noah Kantrowitz2017-04-032-0/+27
* | Merge pull request #971 from chef/lcg/amazon-platform-familyLamont Granquist2017-04-032-5/+7
|\ \ | |/ |/|
| * add amazon platform_familylcg/amazon-platform-familyLamont Granquist2017-04-012-5/+7
|/
* Merge pull request #969 from chef/dmi_typesTim Smith2017-03-281-0/+3
|\
| * Add DMI type 40,41, and 42 from the latest man pageTim Smith2017-03-281-0/+3
* | Merge pull request #964 from webframp/ec2/region-and-zoneTim Smith2017-03-212-0/+45
|\ \ | |/ |/|
| * [ec2] Add additional data from identity documentSean Escriva2017-03-172-0/+45
|/
* Merge pull request #958 from chef/luaTim Smith2017-03-092-3/+11
|\
| * Fix lua detection on new versions of lualuaTim Smith2017-03-012-3/+11
* | Merge pull request #959 from chef/scalaTim Smith2017-03-091-2/+3
|\ \
| * | Properly detect scalascalaTim Smith2017-03-011-2/+3
| |/
* | Merge pull request #961 from chef/lcg/kinda-hate-github-changelog-generatorLamont Granquist2017-03-031-8/+11
|\ \ | |/ |/|
| * rescue github-changelog-generator in RakefileLamont Granquist2017-03-031-8/+11
* | Merge pull request #957 from chef/chefstyleTim Smith2017-03-011-1/+1
|\ \ | |/
| * Fix a chefstyle warningTim Smith2017-03-011-1/+1
|/
* Merge pull request #823 from chef/GenPage-digitalocean_metadataTim Smith2017-03-015-172/+147
|\
| * Use the new http helper for socket checksGenPage-digitalocean_metadataTim Smith2017-02-232-31/+4
| * Fix bad rebaseTim Smith2017-02-231-131/+35
| * Update cloud plugin to parse new digital_ocean dataTim Smith2017-02-232-19/+36
| * Add spec for digital ocean DMI data flowTim Smith2017-02-232-1/+9
| * Log consistencyTim Smith2017-02-231-3/+3
| * Exclude vendor data and don't depend on the network pluginTim Smith2017-02-231-1/+1
| * Parse the JSON so that we can do .each on it laterTim Smith2017-02-231-5/+6
| * Detect DigitalOcean via DMI dataTim Smith2017-02-231-14/+14
| * Use the correct IP address for metadataTim Smith2017-02-231-1/+1
| * Match the format of the other loggersTim Smith2017-02-231-2/+2
| * Chefstyle fixes and fix a bad hashTim Smith2017-02-232-9/+9
| * Remove debug code/add proper has_do_init check. Attempt to fix failing testsGenPage2017-02-232-3/+21
| * Setup DigitalOcean plugin to use Metadata APIGenPage2017-02-232-41/+95
* | Merge pull request #955 from chef/lcg/fix-loggerTim Smith2017-02-284-19/+29
|\ \
| * | refactor to use the config flag because the initalizer is awfullcg/fix-loggerLamont Granquist2017-02-283-19/+22
| * | add some comments to the codeLamont Granquist2017-02-272-0/+6
| * | fix ohai logger problems.Lamont Granquist2017-02-273-5/+6
|/ /
* | bump ohai version to 13.0.0 for chef-13 developmentLamont Granquist2017-02-231-2/+2
|/
* Merge pull request #951 from chef/http_helperTim Smith2017-02-105-62/+62
|\
| * Move duplicate http logic into a helperhttp_helperTim Smith2017-02-035-62/+62
* | Merge pull request #954 from chef/lcg/chefstyleLamont Granquist2017-02-0921-54/+62
|\ \
| * | autofixing new chefstyle issueslcg/chefstyleLamont Granquist2017-02-0921-54/+62
|/ /
* | Merge pull request #947 from chef/require_configThom May2017-01-271-0/+1
|\ \ | |/ |/|
| * Config is used in system so require it there.require_configTim Smith2017-01-261-0/+1
* | Merge pull request #949 from chef/dead_codeThom May2017-01-263-11/+0
|\ \
| * | Remove a bit of dead codedead_codeTim Smith2017-01-253-11/+0
* | | Merge pull request #950 from chef/more_minor_specThom May2017-01-261-7/+0
|\ \ \ | |/ / |/| |
| * | Remove rescue loading plist in the specs as this is a depmore_minor_specTim Smith2017-01-251-7/+0
|/ /
* | Merge pull request #948 from chef/minor_spec_cleanupThom May2017-01-25152-181/+247
|\ \ | |/ |/|
| * Minor spec file cleanupminor_spec_cleanupTim Smith2017-01-24152-181/+247
|/
* Merge pull request #946 from chef/fix_travisTim Smith2017-01-243-6/+8
|\