summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #547 from MichaelSp/masterThom May2015-08-141-190/+245
|\
| * move halfway back and stay thereMichaelSp2015-07-091-3/+3
| * move over the ocean: neighbours -> neighborsMichaelSp2015-07-091-6/+6
| * return correct ipaddress for openvz guests (fixes #415)Michael Sprauer2015-05-261-13/+27
| * linux/network refactoredMichael Sprauer2015-05-261-177/+218
* | Merge pull request #448 from akarpik/add_softlayer_cloud_supportThom May2015-08-143-3/+145
|\ \
| * | Iterate on review. We do not create softlayer node, if we get error on reques...Alexey Karpik2015-03-201-1/+1
| * | Iterate on code review, and revert GemfileAlexey Karpik2015-03-201-1/+1
| * | Iterate on code reviewAlexey Karpik2015-03-202-20/+16
| * | Rebase on latest masterAlexey Karpik2015-03-203-3/+149
* | | Merge pull request #602 from sh9189/aix_swap_infoThom May2015-08-141-0/+5
|\ \ \
| * | | Add swap space attributes for AIXShahul Hameed2015-08-131-0/+5
* | | | Merge pull request #599 from sh9189/solaris_swap_changesThom May2015-08-141-0/+7
|\ \ \ \
| * | | | Add swap space attributes for solaris memory pluginShahul Hameed2015-08-131-0/+7
* | | | | Merge pull request #504 from chef/sh/ohai-issues-503Thom May2015-08-141-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ec2 plugin should handle binary toosh/ohai-issues-503Sean Horn2015-03-181-0/+6
* | | | | Merge pull request #598 from sh9189/aix_memory_pluginIrving Popovetsky2015-08-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Define aix memory plugin mash correctlyShahul Hameed2015-08-111-1/+1
* | | | | Fix #531: Docker changed their cgroups formatJean Baptiste Favre2015-08-131-1/+3
* | | | | Merge pull request #591 from sh9189/solaris_memory_pluginThom May2015-08-131-1/+2
|\ \ \ \ \
| * | | | | Fix memory plugin on solarisShahul Hameed2015-07-301-1/+2
* | | | | | Merge pull request #551 from cmluciano/cml/addvmwareThom May2015-08-131-0/+73
|\ \ \ \ \ \
| * | | | | | add tests for vmware plugincmluciano2015-06-191-10/+7
| * | | | | | Create vmware.rbdrobinson4402015-06-191-0/+76
* | | | | | | Merge pull request #597 from chef/lcg/cisco-refactorLamont Granquist2015-08-111-15/+50
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | moar cisco refactoringLamont Granquist2015-08-111-32/+45
| * | | | | | Set the guestshell to 'nexus_centos' and catch 'cisco-wrlinux' as the ID_LIKEMatt Ray2015-08-041-6/+8
| * | | | | | Refactor Cisco /etc/os-release checking and parse into 2 methodsMatt Ray2015-08-041-21/+20
| * | | | | | simplified Cisco Nexus logic based on feedback from Lamont & ClaireMatt Ray2015-07-301-9/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #593 from chef/mcquin/ohai-config/loggingClaire McQuin2015-08-072-8/+12
|\ \ \ \ \ \
| * | | | | | Resolve :auto log levelmcquin/ohai-config/loggingClaire McQuin2015-08-062-3/+11
| * | | | | | Don't set config logger to ohai log.Claire McQuin2015-07-281-5/+1
| |/ / / / /
* | | | | | Merge pull request #594 from chef/issues/590Claire McQuin2015-08-071-1/+1
|\ \ \ \ \ \
| * | | | | | Detect KVM guest from dmidecodeClaire McQuin2015-08-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #583 from juliandunn/remove-annoying-constant-warningThom May2015-08-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't break backcompat.Julian C. Dunn2015-07-201-7/+8
| * | | | | Remove definition of ETHERNET_ENCAPS as a constant and move it intoJulian C. Dunn2015-07-181-8/+7
* | | | | | Update Ohai::VERSIONohai-version/8.6.0.current.0Claire McQuin2015-07-241-1/+1
* | | | | | Allow system to accept configuration options and configure ohai on initializemcquin/ohai-config/load-configClaire McQuin2015-07-242-17/+19
* | | | | | Load workstation configClaire McQuin2015-07-241-0/+20
* | | | | | Use Ohai.configClaire McQuin2015-07-216-11/+11
* | | | | | Add ohai config context and deprecate top-level config.Claire McQuin2015-07-212-18/+101
* | | | | | Make Ohai::Log usable by Ohai::Config.Claire McQuin2015-07-213-8/+11
|/ / / / /
* | | | | better KVM virtualization detectionDavide Cavalca2015-07-101-0/+4
* | | | | Merge pull request #546 from rmoriz/RFC4192_link_localThom May2015-07-091-2/+3
|\ \ \ \ \
| * | | | | fixes #545Roland Moriz2015-05-251-2/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #573 from jaymzh/fs2_bugfixPhil Dibowitz2015-07-081-2/+2
|\ \ \ \ \
| * | | | | Readability optimizationsPhil Dibowitz2015-07-071-2/+2
| * | | | | filesystem2 bugfixPhil Dibowitz2015-07-031-2/+2
* | | | | | [filesystem2] Minor linux bugPhil Dibowitz2015-06-291-0/+1
|/ / / / /