summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* re-sync with masterNathan Williams2015-10-23235-3119/+7136
|\
| * Merge pull request #4097 from chef/lcg/3192Lamont Granquist2015-10-233-3/+14
| |\ | | | | | | provider/user/dscl: Set default gid to 20
| | * add CHANGELOG.md fileLamont Granquist2015-10-231-1/+2
| | |
| | * provider/user/dscl: Set default gid to 20Mikhail Zholobov2015-10-232-2/+12
| |/ | | | | | | | | gid should always be defined to create user account properly on OS X. "staff" (gid 20) is a default group for regular user accounts.
| * Merge pull request #4096 from chef/lcg/3187Lamont Granquist2015-10-233-56/+157
| |\ | | | | | | overhaul solaris SMF service provider
| | * add CHANGELOG.md fileLamont Granquist2015-10-231-0/+4
| | |
| | * overhaul solaris SMF service providerlcg/3187Dave Eddy2015-10-232-56/+153
| |/
| * Merge pull request #4079 from chef/service_loggerMatt Wrock2015-10-232-3/+15
| |\ | | | | | | add logger to windows service shellout
| | * add logger to windows service shelloutservice_loggerMatt Wrock2015-10-202-3/+15
| | |
| * | Merge pull request #4091 from chef/ssd/download-root-filesSteven Danna2015-10-233-3/+13
| |\ \ | | | | | | | | Allow downloading of root_files in a chef repository
| | * | Allow downloading of root_files in a chef repositoryssd/download-root-filesSteven Danna2015-10-233-3/+13
| |/ / | | | | | | | | | | | | | | | | | | A FileSystemEntry with a nil parent is a "root directory" and thus should exists so long as its filesystem path exists. This was preventing the download of files such as invitation.json whose parent directory is a root directory.
| * | Merge pull request #3966 from chef/kyleen/addExpandedRunListKyleen2015-10-227-3/+83
| |\ \ | | | | | | | | Report expanded run list json tree to reporting
| | * | Added run list expansion json conversion. Creates a json tree from the run ↵kyleen/addExpandedRunListKyleen MacGugan2015-10-217-3/+83
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | list expansion trace. Added event to report expanded run list Updated json conversion to use chef compat json. Remove RunListExpansion from JsonCompat
| * | Merge pull request #4087 from chef/smurawski/changelog_pr3597Steven Murawski2015-10-212-0/+4
| |\ \ | | | | | | | | Add CHANGELOG for PR #3597
| | * | add CHANGELOG for PR #3597smurawski/changelog_pr3597Steven Murawski2015-10-211-0/+1
| | | |
| | * | print STDOUT from the powershell wrapper. fixes issue #3596Alex Pop2015-10-211-0/+3
| |/ /
| * | Merge pull request #4086 from chef/smurawski/changelog_pr4021Steven Murawski2015-10-212-0/+7
| |\ \ | | | | | | | | Add CHANGELOG for PR #4021
| | * | updated CHANGELOG for PR #4021Steven Murawski2015-10-211-0/+6
| | | |
| | * | add missing requires for Chef::DSL::RecipeNathan Williams2015-10-211-0/+1
| |/ /
| * | Merge pull request #4085 from chef/smurawski/changelog_pr4068Steven Murawski2015-10-213-7/+8
| |\ \ | | | | | | | | Add CHANGELOG entry for #4068
| | * | Add CHANGELOG entry for #4068Steven Murawski2015-10-211-0/+1
| | | |
| | * | Update messaging to match LWRP -> Custom Resource renameTim Smith2015-10-212-7/+7
| |/ / | | | | | | | | | If you showed up in a post-LWRP world these would be confusing
| * | Merge pull request #4082 from jaymzh/changelog_pr3119Phil Dibowitz2015-10-201-0/+1
| |\ \ | | | | | | | | Add CHANGELOG entry for #3119
| | * | Add CHANGELOG entry for #3119Phil Dibowitz2015-10-201-0/+1
| | | |
| * | | Merge pull request #3119 from cmluciano/cml/bug1586Phil Dibowitz2015-10-203-2/+11
| |\ \ \ | | |/ / | |/| | Fix condition of removing a group before user error.
| | * | Add recommended test from btmChristopher M. Luciano2015-10-121-0/+9
| | | |
| | * | Fix condition of removing a group before user error.cmluciano2015-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix [issue 1586](https://github.com/chef/chef/issues/1586). The issue is that if a group is removed before the user, the GID remained and causes an error. This should remove the check for remove actions.
| * | | Merge branch 'jk/property_mixin'John Keiser2015-10-203-310/+428
| |\ \ \ | | |_|/ | |/| |
| | * | Make modules with properties work and inherit as expectedjk/property_mixinJohn Keiser2015-10-202-8/+104
| | | |
| | * | Move properties into a mixin module (verbatim move)John Keiser2015-10-202-310/+332
| |/ /
| * | Merge pull request #4069 from tas50/messagingjk/coerce-nilLamont Granquist2015-10-2023-42/+42
| |\ \ | | | | | | | | Improvements to log messages
| | * | Fix spelling errorTim Smith2015-10-181-1/+1
| | | |
| | * | Improve sentencesTim Smith2015-10-183-3/+3
| | | |
| | * | Unnecessary capitalizationTim Smith2015-10-182-3/+3
| | | |
| | * | Use why-run vs. why_run or whyrunTim Smith2015-10-184-4/+4
| | | |
| | * | Capitalize sentencesTim Smith2015-10-1813-31/+31
| | | |
| * | | Merge pull request #4066 from pwelch/2372-fix-chef-apply-usage-bannerLamont Granquist2015-10-201-1/+1
| |\ \ \ | | | | | | | | | | Fix chef-apply usage banner
| | * | | Fix chef-apply usage bannerpwelch2015-10-171-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chef-apply option flags should trail the recipe or recipe text that is being applied. This updates the chef-apply banner to show the correct usage. Fixes #2372
| * | | Merge pull request #4061 from chef/ksubrama/win32-processKartik Null Cating-Subramanian2015-10-191-1/+1
| |\ \ \ | | |/ / | |/| | Bump win32-process pin
| | * | Bump win32-process pinksubrama/win32-processKartik Null Cating-Subramanian2015-10-151-1/+1
| |/ / | | | | | | Pulls in fixes for https://github.com/djberg96/win32-process/issues/19
| * | add ChangeLogLamont Granquist2015-10-131-0/+6
| | |
| * | Merge pull request #4034 from chef/lcg/ruby-profilingLamont Granquist2015-10-136-2/+66
| |\ \ | | | | | | | | add optional ruby-profiling with --profile-ruby
| | * | fix PR feedbacklcg/ruby-profilingLamont Granquist2015-10-133-7/+5
| | | |
| | * | lazy load ruby-profLamont Granquist2015-10-061-6/+3
| | | |
| | * | make description of option scarierLamont Granquist2015-10-061-1/+1
| | | |
| | * | add optional ruby-profiling with --profile-rubyLamont Granquist2015-10-056-2/+71
| | | | | | | | | | | | | | | | dumps a large call graph into /var/chef/cache/graph_profile.out
| * | | Merge pull request #4049 from chef/ksubrama/gemspecjk/notification_blocksKartik Null Cating-Subramanian2015-10-093-3/+3
| |\ \ \ | | | | | | | | | | Add gemspec files to allow bundler to run from the gem
| | * | | Have Gemspec not always expect chef-config to exist beside it.Kartik Null Cating-Subramanian2015-10-091-1/+1
| | | | |
| | * | | Change chef-config's gemspec to include itselfksubrama/gemspecKartik Null Cating-Subramanian2015-10-091-1/+1
| | | | |
| | * | | Add gemspec files to allow bundler to run from the gemKartik Null Cating-Subramanian2015-10-091-1/+1
| |/ / /