summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* style fix from peer reviewlcg/3450Lamont Granquist2015-10-231-2/+2
* Fix 'knife cookbook show' to work on root filesScott Mcgillivray2015-10-231-1/+5
* Merge pull request #4079 from chef/service_loggerMatt Wrock2015-10-232-3/+15
|\
| * 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 repositoryssd/download-root-filesSteven Danna2015-10-233-3/+13
|/ /
* | Merge pull request #3966 from chef/kyleen/addExpandedRunListKyleen2015-10-227-3/+83
|\ \
| * | Added run list expansion json conversion. Creates a json tree from the run li...kyleen/addExpandedRunListKyleen MacGugan2015-10-217-3/+83
|/ /
* | Merge pull request #4087 from chef/smurawski/changelog_pr3597Steven Murawski2015-10-212-0/+4
|\ \
| * | 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
|\ \
| * | 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 #4068Steven Murawski2015-10-211-0/+1
| * | Update messaging to match LWRP -> Custom Resource renameTim Smith2015-10-212-7/+7
|/ /
* | Merge pull request #4082 from jaymzh/changelog_pr3119Phil Dibowitz2015-10-201-0/+1
|\ \
| * | Add CHANGELOG entry for #3119Phil Dibowitz2015-10-201-0/+1
* | | Merge pull request #3119 from cmluciano/cml/bug1586Phil Dibowitz2015-10-203-2/+11
|\ \ \ | |/ / |/| |
| * | 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
* | | 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
|\ \
| * | 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 bannerpwelch2015-10-171-1/+1
| |/ /
* | | Merge pull request #4061 from chef/ksubrama/win32-processKartik Null Cating-Subramanian2015-10-191-1/+1
|\ \ \ | |/ / |/| |
| * | Bump win32-process pinksubrama/win32-processKartik Null Cating-Subramanian2015-10-151-1/+1
|/ /
* | add ChangeLogLamont Granquist2015-10-131-0/+6
* | Merge pull request #4034 from chef/lcg/ruby-profilingLamont Granquist2015-10-136-2/+66
|\ \
| * | 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
* | | Merge pull request #4049 from chef/ksubrama/gemspecjk/notification_blocksKartik Null Cating-Subramanian2015-10-093-3/+3
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #4029 from chef/ssd/search-pagination-fixSteven Danna2015-10-092-3/+35
|\ \ \
| * | | Fix search result paginationssd/search-pagination-fixSteven Danna2015-10-092-3/+35
|/ / /
* | | Accept coercion as a way to accept nil valuesJohn Keiser2015-10-082-1/+12
* | | Merge pull request #4046 from chef/mwrock/no_win_groupMatt Wrock2015-10-083-5/+15
|\ \ \
| * | | fixing typoMatt Wrock2015-10-081-1/+1