summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix windows specs.sersut2014-06-241-2/+2
| * | | | Use FFI::LastError instead of GetLastError for ffi 1.9.x compatibility.sersut2014-06-242-6/+6
| * | | | Bump ffi version since chef-dk depends on chef and dep-selector and dep-selec...sersut2014-06-241-1/+1
|/ / / /
* | | | Merge pull request #1540 from opscode/lcg/ffi-yajl-gemlamont-granquist2014-06-249-29/+19
|\ \ \ \
| * | | | remove another commentLamont Granquist2014-06-241-2/+0
| * | | | remove commented linesLamont Granquist2014-06-231-2/+0
| * | | | we can still emit JSON::ParserErrors in compat modeLamont Granquist2014-06-232-2/+2
| * | | | fix another Yajl referenceLamont Granquist2014-06-231-2/+2
| * | | | convert to using ffi_yajlLamont Granquist2014-06-231-1/+3
| * | | | replace yajl and json gem with ffi-yajlLamont Granquist2014-06-236-24/+16
|/ / / /
* | | | Merge pull request #1530 from opscode/btm/CHEF-5158Bryan McLellan2014-06-223-21/+18
|\ \ \ \
| * | | | CHEF-5158: Contribution notesBryan McLellan2014-06-201-1/+2
| * | | | CHEF-5158: Add some debugging information for knife ssh attributeBryan McLellan2014-06-201-0/+3
| * | | | CHEF-5158: Make the former override_attribute's purpose a bit more clearBryan McLellan2014-06-202-18/+12
| * | | | [CHEF-5158] knife[:attribute] in knife.rb should not override --attribute in ...Hui Hu2014-06-202-3/+2
* | | | | Merge pull request #1531 from opscode/adamed/chef-5287-rebaseAdam Edwards2014-06-204-5/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CHEF-5287 Change log updateAdam Edwards2014-06-201-0/+1
| * | | | Restore check for Windows platform in windows_architecture_helper to fix spec...adamedx2014-06-201-10/+14
| * | | | Fix undefined Windows constants on non-Windows platformsadamedx2014-06-201-2/+4
| * | | | CHEF-5287: Use IsWow64Process instead of ENV hash to determine 32-bit process...Adam Edwards2014-06-203-5/+20
|/ / / /
* | | | Merge pull request #1526 from opscode/mcquin/windows_serviceClaire McQuin2014-06-201-1/+0
|\ \ \ \
| * | | | remove setting proxy environment variablesClaire McQuin2014-06-191-1/+0
| | |/ / | |/| |
* | | | Merge pull request #1519 from opscode/ssd/purge-ignore-missing-on-purgeSteven Danna2014-06-201-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | [chef_fs/file_system] Ignore missing entry at destination when purgingssd/purge-ignore-missing-on-purgeSteven Danna2014-06-181-2/+6
* | | | contribution info for https://github.com/opscode/chef/pull/1165Claire McQuin2014-06-181-0/+2
* | | | Merge pull request #1483 from opscode/CHEF-4600Claire McQuin2014-06-183-12/+40
|\ \ \ \ | |/ / / |/| | |
| * | | add worker threadCHEF-4600Claire McQuin2014-06-181-8/+10
| * | | fix indentingClaire McQuin2014-06-183-21/+27
| * | | CHEF-4600 Add timeout for Chef::Provider::Service::WindowsMatt2014-06-183-13/+33
| |/ /
* | | contribution info for https://github.com/opscode/chef/pull/506Claire McQuin2014-06-181-0/+3
* | | Merge pull request #506 from ctennis/CHEF-3637Claire McQuin2014-06-182-0/+18
|\ \ \ | |/ / |/| |
| * | Add support for automatically using the Systemd service provider if it's in useCaleb Tennis2012-11-292-0/+18
* | | contribution info for https://github.com/opscode/chef/pull/1494Claire McQuin2014-06-181-0/+2
* | | Merge pull request #1494 from brettcave/CHEF-5365_masterClaire McQuin2014-06-182-2/+7
|\ \ \
| * | | CHEF-5365 - added a unit test to ensure fallback of Dir.pwd works without env...brettcave2014-06-171-0/+5
| * | | CHEF-5365 - if user home directory is not set via environment, then default u...brettcave2014-06-131-2/+2
* | | | Contribution info for https://github.com/opscode/chef/pull/1166sersut2014-06-181-0/+2
* | | | Merge branch 'CHEF-4791' of github.com:deployable/chefsersut2014-06-182-6/+91
|\ \ \ \
| * | | | Fixed whitespace in changes.deployable2014-05-212-57/+98
| * | | | CHEF-4791 Add more windows service states to the start/stop control flowMatt2013-12-052-6/+50
* | | | | Merge pull request #1502 from opscode/shain/changelogBryan McLellan2014-06-181-0/+2
|\ \ \ \ \
| * | | | | Updated changelogScott Hain2014-06-171-0/+2
* | | | | | update for mergesClaire McQuin2014-06-171-0/+6
* | | | | | Merge pull request #1487 from aespinosa/CHEF-5366-properly-bootstrap-gem-on-a...Serdar Sutay2014-06-171-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Install on ArchLinux as a system gem explicitlyAllan Espinosa2014-06-121-2/+2
* | | | | | Merge pull request #1501 from opscode/shain/rpm_version_regexScott Hain2014-06-172-37/+37
|\ \ \ \ \ \
| * | | | | | Updated tests with more complicated data, fixed regex. Resolves CHEF-4893Scott Hain2014-06-172-37/+37
* | | | | | | Merge pull request #1500 from opscode/shain/spaces_in_selinux_pathScott Hain2014-06-172-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Updated selinux path check to allow for directories that have a space in the ...Scott Hain2014-06-172-5/+5
| |/ / / / / /
* | | | | | | Merge pull request #1477 from MarkGibbons/CHEF-5347Claire McQuin2014-06-172-3/+24
|\ \ \ \ \ \ \