summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change --yum-lock-timeout option action to store.mcquin/yum-dump-parser-paramsClaire McQuin2014-06-261-1/+1
* Merge pull request #1520 from curiositycasualty/knife-ssh-identity-fileSerdar Sutay2014-06-251-0/+5
|\
| * Allow csshX to respect identity_filecuriositycasualty2014-06-191-0/+5
* | Merge pull request #1547 from juliandunn/confusing-json-commentSerdar Sutay2014-06-251-1/+0
|\ \
| * | Remove confusing gemspec comment about the no-longer-used json gemJulian C. Dunn2014-06-251-1/+0
|/ /
* | Merge pull request #1525 from opscode/mcquin/chefdk-69Claire McQuin2014-06-244-8/+24
|\ \
| * | Update for new FFI binding.Claire McQuin2014-06-241-0/+1
| * | include module on windows onlyClaire McQuin2014-06-191-4/+2
| * | Use FFI binders to attach :SendMessageTimeout instead of Win32API in order to...sersut2014-06-193-6/+23
* | | Merge pull request #1528 from opscode/sersut/bump-ffi-versionSerdar Sutay2014-06-245-10/+12
|\ \ \
| * | | Misc spec fixes for windows.sersut2014-06-242-4/+6
| * | | 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