summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Testing more thingsshain/whatishthis2Scott Hain2017-06-231-1/+1
* Made chef 11 compatible on Suse12dh/chef11_compatible__suse12Eike Waldt2017-06-231-6/+6
* release 11.18.1211.18.12Thom May2015-04-302-2/+5
* Push on to 11.18.1011.18.10Thom May2015-04-301-1/+4
* Mark all functional reboot tests as pendingThom May2015-04-301-52/+54
* Merge pull request #3288 from chef/jdm/reboot-pendingJay Mundrawala2015-04-271-15/+15
|\
| * Fix the after blocks in reboot_pending specs.Serdar Sutay2015-04-271-4/+4
| * Fix the logic that checks for existing reboot pending in reboot pending tests.Serdar Sutay2015-04-271-15/+15
|/
* Merge pull request #3259 from chef/tm/11.18.811.18.8Thom May2015-04-222-1/+6
|\
| * prepare 11.18.8tm/11.18.8Thom May2015-04-222-1/+6
|/
* Merge pull request #2811 from chef/jdm/11.18.6Jay Mundrawala2015-01-262-2/+5
|\
| * Prepare 11.18.611.18.6Jay Mundrawala2015-01-262-2/+5
|/
* Merge pull request #2792 from chef/jdm/11.18.411.18.4Jay Mundrawala2015-01-231-2/+5
|\
| * Prepare 11.18.4Jay Mundrawala2015-01-231-2/+5
|/
* Merge pull request #2791 from chef/jdm/11.18.211.18.2Jay Mundrawala2015-01-231-0/+4
|\
| * Prepare 11.18.2 releaseJay Mundrawala2015-01-231-0/+4
|/
* Merge pull request #2750 from opscode/jdm/prepare-11.18.011.18.0Jay Mundrawala2015-01-132-2/+4
|\
| * Bump version for 11.18.0 releaseJay Mundrawala2015-01-131-1/+1
| * Update Changelog to reflect resolution of #2345Jay Mundrawala2015-01-131-1/+3
|/
* Merge pull request #2749 from opscode/jdm/metadata-error-infoJay Mundrawala2015-01-133-4/+12
* Merge pull request #2748 from opscode/jdm/2345-11-backportJay Mundrawala2015-01-133-126/+198
|\
| * Allow knife to install cookbooks with metadata.jsonJay Mundrawala2015-01-133-126/+198
|/
* Merge pull request #2074 from opscode/ryan/group_post-11-stableSerdar Sutay2014-11-192-1/+68
|\
| * Add unit test for group normalization in ChefFSRyan Cragun2014-11-192-1/+64
| * Populate the actors when creating groupsRyan Cragun2014-11-031-0/+4
* | Bump version for 11.18.0.rc.111.18.0.rc.1danielsdeleo2014-11-131-2/+1
* | Fix conflicting data in test casesdanielsdeleo2014-11-131-4/+4
* | Update version and changelog for 11.18.0 RC011.18.0.rc.0danielsdeleo2014-11-132-2/+4
* | Merge branch 'chef-dk-227' into 11-stabledanielsdeleo2014-11-132-1/+90
|\ \ | |/ |/|
| * Add test data for chef-dk#227 regex strictnessdanielsdeleo2014-11-131-2/+19
| * Add regression test for #chef-dk#227 extraneous load issuedanielsdeleo2014-11-131-1/+49
| * Ignore knife subcommands from other chef installsdanielsdeleo2014-11-131-0/+24
* | Merge pull request #2297 from opscode/tball/updating-chef-zeroTyler Ball2014-10-291-1/+1
|\ \
| * | Using released chef-zero which uses ffi-yajl instead of JSON gemtball/updating-chef-zerotyler-ball2014-10-241-1/+1
* | | Merge pull request #2236 from opscode/adamedx/dsc-params-11-stableAdam Edwards2014-10-292-50/+94
|\ \ \
| * | | Remove unnecessary contexts in DSC functional specsadamedx/dsc-params-11-stableAdam Edwards2014-10-271-44/+36
| * | | DSC terminology correction in insufficient powershell version messageAdam Edwards2014-10-271-1/+1
| * | | DSC parameters should be passed even when there is no config data fileAdam Edwards2014-10-272-6/+58
|/ / /
* | | Merge pull request #2305 from opscode/jdmundrawala/11-env-splitJay Mundrawala2014-10-273-23/+103
|\ \ \
| * | | Merge pull request #2252 from opscode/jdmundrawala/env-splitjdmundrawala/11-env-splitJay Mundrawala2014-10-263-23/+103
|/ / /
* | | Merge pull request #2298 from opscode/jdmundrawala/11-issue-2225Jay Mundrawala2014-10-252-9/+18
|\ \ \
| * | | Merge pull request #2264 from opscode/jdmundrawala/issue-2225jdmundrawala/11-issue-2225Jay Mundrawala2014-10-242-9/+18
|/ / /
* | | Merge pull request #2294 from opscode/jdmundrawala/11-lcm-renamesJay Mundrawala2014-10-242-7/+7
|\ \ \ | |/ / |/| |
| * | Merge pull request #2281 from opscode/jdmundrawala/lcm-renamesjdmundrawala/11-lcm-renamesJay Mundrawala2014-10-242-7/+7
|/ /
* | Merge pull request #2240 from opscode/sersut/backport-supermarket-switchSerdar Sutay2014-10-178-12/+13
|\ \
| * | Merge pull request #1871 from opscode/lcg/supermarket-urlssersut/backport-supermarket-switchlamont-granquist2014-10-168-12/+13
|/ /
* | Merge pull request #2218 from opscode/jdmundrawala/11-stable-issue-2169Jay Mundrawala2014-10-133-7/+8
|\ \
| * | Updated changelog to reflect solution for issue 2169jdmundrawala/11-stable-issue-2169Jay Mundrawala2014-10-131-0/+1
| * | Merge pull request #2190 from opscode/jdmundrawala/issue-2169Jay Mundrawala2014-10-132-7/+7
|/ /
* | Merge pull request #2188 from opscode/jdmundrawala/11-stableJay Mundrawala2014-10-135-153/+168
|\ \