summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / /
* | | Merge pull request #4029 from chef/ssd/search-pagination-fixSteven Danna2015-10-092-3/+35
|\ \ \ | | | | | | | | Fix search result pagination
| * | | Fix search result paginationssd/search-pagination-fixSteven Danna2015-10-092-3/+35
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The start and rows parameter that are passed as part of the search request are passed directly to Solr on the backend. Results from Solr may contain deleted nodes no longer in the erchef database. Erchef will filter such nodes from the results. Thus, a user may receive fewer rows than they asked for. Incrementing 'start' only by the number of rows received will then result in the next Solr response overlapping the first, which can lead to duplicate results. In the case of a Solr results page that was completely filtered, it would lead to an infinite loop. This commit changes the code to always increment by the requested page size (args[:rows]) when it is non-nil. Incrementing by the length of the response set is still wrong in the case when the args[:rows] is nil, but the server doesn't give us anything else to increment by. Fixes #4027
* | | 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
|\ \ \ | | | | | | | | ignore gid in the user resource on windows
| * | | fixing typoMatt Wrock2015-10-081-1/+1
| | | |
| * | | fix unit testsMatt Wrock2015-10-081-2/+2
| | | |
| * | | fix spacingmwrock/no_win_groupMatt Wrock2015-10-081-1/+1
| | | |
| * | | ignore gid on windows and warn to use groupMatt Wrock2015-10-082-4/+14
|/ / /
* | | Bump revision to 12.5.112.5.1stable12.5-stableJohn Keiser2015-10-074-4/+4
| | |
* | | Merge pull request #3936 from chef/adamedx/windows-color-defaultsAdam Edwards2015-10-065-9/+9
|\ \ \ | | | | | | | | Windows cli tools should have color true by default
| * | | Windows cli tools should have color true by defaultadamedx/windows-color-defaultsAdam Edwards2015-10-065-9/+9
|/ / /
* | | Merge pull request #4036 from chef/mcquin/chef-3883Claire McQuin2015-10-063-10/+46
|\ \ \ | | | | | | | | Quote paths.
View Lorry Controller Status