summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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 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.mcquin/chef-3883Claire McQuin2015-10-063-10/+46
* | Merge pull request #3999 from tas50/unshare_warningThom May2015-10-061-2/+2
|\ \
| * | Better warning for unsharingTim Smith2015-09-291-2/+2
* | | Merge pull request #3998 from tas50/chefThom May2015-10-061-18/+18
|\ \ \
| * | | Update URLs to chef.ioTim Smith2015-09-291-18/+18
| |/ /
* | | Merge pull request #4023 from higanworks/part_of_3959Thom May2015-10-061-0/+2
|\ \ \ | |_|/ |/| |
| * | pass ssh_password to sessionsawanoboly2015-10-051-0/+2
* | | Fix dispatch when there are different receiversJohn Keiser2015-10-052-4/+50
* | | Merge pull request #4032 from chef/mcquin/nano/disable-32-bitClaire McQuin2015-10-055-21/+49
|\ \ \
| * | | Raise error when running 32-bit scripts on Windows Nano.mcquin/nano/disable-32-bitClaire McQuin2015-10-055-21/+49
| |/ /
* | | Merge pull request #4000 from chef/ad/3992-redhat-serviceThom May2015-10-051-2/+4
|\ \ \
| * | | REALLY adding explicit error msg if init.d script or custom command is not fo...ad/3992-redhat-serviceandy-dufour2015-09-291-1/+1
| * | | Adding check for custom command in redhat service provider and providing more...andy-dufour2015-09-291-1/+3
| | |/ | |/|
* | | Merge pull request #4003 from chef/tm/duplicate_recipesThom May2015-10-054-2/+23
|\ \ \
| * | | Ensure that our list of recipes is backwards compattm/duplicate_recipesThom May2015-09-294-2/+23
| |/ /
* | | Fix forward module.to_sjk/forwarder-to_sJohn Keiser2015-10-052-1/+6
| |/ |/|
* | Merge pull request #4016 from chef/mcquin/nano-ps-scriptClaire McQuin2015-10-026-59/+145
|\ \
| * | Mark tests assuming 32-bit architecture as not support on nanomcquin/nano-ps-scriptClaire McQuin2015-10-011-18/+6
| * | Resolve resource_architecture and guard_architecture stubs.Claire McQuin2015-10-013-32/+32
| * | Use -Command flag on NanoClaire McQuin2015-10-014-32/+130
* | | Merge pull request #4005 from chef/salam/template-fixSalim Alam2015-10-013-15/+65
|\ \ \
| * | | Fix AppVeyorsalam/template-fixSalim Alam2015-10-011-1/+1
| * | | Clean up tests, fix bug in tempfile_openSalim Alam2015-09-302-9/+13
| * | | Get rid of truthy/falseySalim Alam2015-09-301-8/+8
| * | | Use accessor instead of class variable (cleanup)Salim Alam2015-09-301-12/+12
| * | | Use Chef::FileContentManagement::Tempfile to create temp fileSalim Alam2015-09-292-1/+47
| |/ /
* | | Un-remove ExpandNodeObject#load_node, deprecate itpolicybuilder-load-node-unremovedanielsdeleo2015-10-012-0/+59
* | | Merge branch 'jk/external-tests'John Keiser2015-09-3010-70/+96
|\ \ \
| * | | Ship our Gemfile so people can run our tests from the gemjk/external-testsJohn Keiser2015-09-303-11/+11
| * | | Don't add the external tests stuff to the main GemfileJohn Keiser2015-09-302-11/+22
| * | | Add cheffish, chef-zero, chef-provisioning and chef-provisioning-aws specsJohn Keiser2015-09-303-14/+30
| * | | Add external tests for chefspec, chef-sugar, chef-rewind, foodcritic and poiseJohn Keiser2015-09-309-65/+64
* | | | Bump revision to 12.5.0jk/12.5.0-updateJohn Keiser2015-09-304-4/+4
|/ / /
* | | Add ability for default to override name_propertyjk/name-defaultJohn Keiser2015-09-292-4/+19