summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use bundle rake taskstm/bundle_rakeThom May2015-08-141-12/+1
* Minor spelling fixesTim Smith2015-08-143-17/+15
* update changelogThom May2015-08-141-0/+2
* update changelogThom May2015-08-141-0/+5
* Merge pull request #547 from MichaelSp/masterThom May2015-08-142-190/+285
|\
| * 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-262-13/+67
| * linux/network refactoredMichael Sprauer2015-05-261-177/+218
* | Merge pull request #448 from akarpik/add_softlayer_cloud_supportThom May2015-08-146-3/+277
|\ \
| * | Update test description to meet latest code changeAlexey Karpik2015-07-101-1/+1
| * | Iterate on review. We do not create softlayer node, if we get error on reques...Alexey Karpik2015-03-203-3/+3
| * | Iterate on code review, and revert GemfileAlexey Karpik2015-03-203-3/+3
| * | Iterate on code reviewAlexey Karpik2015-03-204-43/+36
| * | Rebase on latest masterAlexey Karpik2015-03-206-3/+284
* | | Merge pull request #602 from sh9189/aix_swap_infoThom May2015-08-142-0/+17
|\ \ \
| * | | Add swap space attributes for AIXShahul Hameed2015-08-132-0/+17
* | | | Merge pull request #599 from sh9189/solaris_swap_changesThom May2015-08-142-0/+20
|\ \ \ \
| * | | | Add swap space attributes for solaris memory pluginShahul Hameed2015-08-132-0/+20
* | | | | update changelogThom May2015-08-141-0/+2
* | | | | Merge pull request #504 from chef/sh/ohai-issues-503Thom May2015-08-142-13/+41
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ec2 plugin should handle binary toosh/ohai-issues-503Sean Horn2015-03-182-13/+41
* | | | | Merge pull request #598 from sh9189/aix_memory_pluginIrving Popovetsky2015-08-132-1/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add unit test for aix memory pluginShahul Hameed2015-08-111-0/+35
| * | | | Define aix memory plugin mash correctlyShahul Hameed2015-08-111-1/+1
* | | | | Fix #531: Docker changed their cgroups formatJean Baptiste Favre2015-08-132-1/+24
* | | | | update changelogThom May2015-08-131-1/+7
* | | | | Merge pull request #591 from sh9189/solaris_memory_pluginThom May2015-08-132-2/+3
|\ \ \ \ \
| * | | | | Update solaris2 memory spec to match memory commandShahul Hameed2015-08-061-1/+1
| * | | | | Fix memory plugin on solarisShahul Hameed2015-07-301-1/+2
* | | | | | Merge pull request #551 from cmluciano/cml/addvmwareThom May2015-08-132-0/+135
|\ \ \ \ \ \
| * | | | | | Use path attribute/remove useless lines in vmware testscmluciano2015-06-221-13/+11
| * | | | | | add tests for vmware plugincmluciano2015-06-192-10/+71
| * | | | | | Create vmware.rbdrobinson4402015-06-191-0/+76
* | | | | | | missed a CHANGELOG updateLamont Granquist2015-08-111-0/+2
* | | | | | | Merge pull request #597 from chef/lcg/cisco-refactorLamont Granquist2015-08-112-21/+112
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix spec derplcg/cisco-refactorLamont Granquist2015-08-111-1/+0
| * | | | | | moar cisco refactoringLamont Granquist2015-08-112-33/+46
| * | | | | | Set the guestshell to 'nexus_centos' and catch 'cisco-wrlinux' as the ID_LIKEMatt Ray2015-08-042-7/+9
| * | | | | | Refactor Cisco /etc/os-release checking and parse into 2 methodsMatt Ray2015-08-042-23/+22
| * | | | | | updated Cisco support to match current Nexus buildsMatt Ray2015-07-311-3/+3
| * | | | | | refactor to match latest Cisco releaseMatt Ray2015-07-311-6/+63
| * | | | | | 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-073-9/+20
|\ \ \ \ \ \
| * | | | | | Resolve :auto log levelmcquin/ohai-config/loggingClaire McQuin2015-08-063-4/+19
| * | | | | | Don't set config logger to ohai log.Claire McQuin2015-07-281-5/+1
| |/ / / / /
* | | | | | Merge pull request #594 from chef/issues/590Claire McQuin2015-08-072-217/+237
|\ \ \ \ \ \
| * | | | | | Update spec language for RSpec 3issues/590Claire McQuin2015-08-061-221/+222
| * | | | | | Detect KVM guest from dmidecodeClaire McQuin2015-08-062-1/+20
| |/ / / / /
* | | | | | Merge pull request #583 from juliandunn/remove-annoying-constant-warningThom May2015-08-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |