summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix the route support for IPV6 routes ending in ::ipv6_colon_regexTim Smith2017-09-151-1/+2
| | | | | | | | | Removing the ending word boundary in the regex allows is to capture the :: endings while still properly parsing other routes. I added a rubular comment as well so we know what this regex is actually trying to capture. Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #1057 from chef/134v13.4.0Tim Smith2017-09-113-6/+115
|\ | | | | Release Ohai 13.4
| * Release Ohai 13.4Tim Smith2017-09-113-6/+115
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #1042 from oslerw/masterTim Smith2017-09-104-2/+120
|\ | | | | Add Arch Linux support to package plugin
| * Add Arch Linux support to package pluginWilliam Osler2017-09-104-2/+120
| | | | | | | | Signed-off-by: William Osler <oslerw@fb.com>
* | Merge pull request #1055 from jeunito/bug/833Tim Smith2017-09-082-0/+16
|\ \ | | | | | | Detect LXC if LXC and Docker are on the same host
| * | change expressionJose Asuncion2017-09-081-1/+1
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | refactoringJose Asuncion2017-09-081-3/+1
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | detect lxc guest using /proc/1/environJose Asuncion2017-09-072-0/+18
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
* | | Merge pull request #1033 from chef/azureTim Smith2017-09-088-20/+313
|\ \ \ | | | | | | | | Add Azure metadata endpoint support
| * | | Move the require into the pluginTim Smith2017-09-081-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add azure plugin specs for metadataTim Smith2017-09-071-0/+81
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Return nils on error instead of an empty hashTim Smith2017-09-073-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Chefstyle fixesTim Smith2017-09-071-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Minor tweaks to the ec2 / softlayer specsTim Smith2017-09-072-5/+3
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add a simple spec for the azure mixinTim Smith2017-09-071-0/+67
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Warn in the mixin when things go wrongTim Smith2017-09-071-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Fix cloud specs for azure changesTim Smith2017-08-111-5/+37
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Update the cloud plugin to use the Azure metadata informationTim Smith2017-08-111-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add Azure metadata endpoint supportTim Smith2017-08-112-8/+120
| | | | | | | | | | | | | | | | | | | | | | | | The Azure metadata endpoint has gone GA. This pulls instance information straight from the source. Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #1045 from chef/requiresTim Smith2017-09-0717-43/+30
|\ \ \ \ | | | | | | | | | | Move all requires into the plugin definitions
| * | | | Move all requires into the plugin definitionsTim Smith2017-08-1618-47/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | Avoid requiring all these things if we're skipping these plugins Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #1052 from chef/ec2_windowsTim Smith2017-09-072-24/+56
|\ \ \ \ | | | | | | | | | | Improve detection of Windows EC2 nodes by using UUID information
| * | | | Move windows detect to its own method and add specsTim Smith2017-09-072-12/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Remove specs for the org detection method on Windowsec2_windowsTim Smith2017-09-061-10/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Remove the org detection since it's less reliable that UUIDTim Smith2017-09-061-16/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Detect EC2 using UUIDs on Windows as well as LinuxTim Smith2017-09-061-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually how Amazon recommends doing it. It works no matter how the VM was built. Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Improve the existing commentsTim Smith2017-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Move the queries into the actual pluginTim Smith2017-09-061-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | Merge pull request #1051 from chef/loggingTim Smith2017-09-062-3/+3
|\ \ \ \ \ | |/ / / / | | | | | Use standard logging in Filesystem
| * | | | Fix spec that counted on specific log outputloggingTim Smith2017-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Use standard logging in FilesystemTim Smith2017-09-061-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #1047 from jeunito/bug/1011Tim Smith2017-09-062-39/+59
|\ \ \ \ | | | | | | | | | | Add error handling in Linux filesystem plugin
| * | | | rescue shell_out exceptions as error handling instead of whichJose Asuncion2017-08-232-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | | | improve descriptionJose Asuncion2017-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | | | add error handlingJose Asuncion2017-08-212-39/+59
| |/ / / | | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
* | | | Merge pull request #1049 from rmcleod8/aix_uptime_is_wrong_afTim Smith2017-09-012-19/+32
|\ \ \ \ | | | | | | | | | | changing method to gather AIX uptime
| * | | | whitespace is the bane of my existencerichard mcleod2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: richard mcleod <rmcleod8@bloomberg.net>
| * | | | not sure why these style changes werent savedrichard mcleod2017-09-012-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: richard mcleod <rmcleod8@bloomberg.net>
| * | | | fixing some whitespace issuesrichard mcleod2017-09-011-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: richard mcleod <rmcleod8@bloomberg.net>
| * | | | changing method to gather AIX uptimerichard mcleod2017-09-012-19/+34
|/ / / / | | | | | | | | | | | | Signed-off-by: richard mcleod <richard.mcleod@gmail.com>
* | | | Merge pull request #1048 from chef/tm/codeownersThom May2017-08-311-0/+1
|\ \ \ \ | |_|/ / |/| | | add codeowners
| * | | add codeownerstm/codeownersThom May2017-08-311-0/+1
|/ / / | | | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | | Merge pull request #1038 from chef/slesTim Smith2017-08-222-89/+156
|\ \ \ | |/ / |/| | Handle situations where /proc/cpuinfo lacks core data
| * | Update testing for systems w/o core count in /proc/cpuinfoslesTim Smith2017-08-152-101/+141
| | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | Handle situations where /proc/cpuinfo lacks core dataTim Smith2017-07-301-2/+29
| |/ | | | | | | | | | | This works around failures to collect core data on SLES <= 12 SP1. We need to support SLES and core counts are used in several of our product cookbooks. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #1044 from chef/133v13.3.0Tim Smith2017-08-102-3/+3
|\ \ | | | | | | Release 13.3
| * | Release 13.3Tim Smith2017-08-102-3/+3
|/ / | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #1043 from rmcleod8/lsblk_timeoutTim Smith2017-08-072-9/+12
|\ \ | |/ |/| bumping timeout for lsblk and blkid to 60s
| * no need for the case statement since lsblk or blkid will only be called hereRichard Mcleod2017-08-071-6/+4
| | | | | | | | Signed-off-by: Richard Mcleod <richard.mcleod@gmail.com>