summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ryan/group_post-11-stable' of github.com:opscode/chef into ryan...ryan/group_post-11-stableRyan Cragun2014-11-030-0/+0
|\
| * Populate the actors when creating groupsRyan Cragun2014-09-171-0/+4
* | Add unit test for group normalization in ChefFSRyan Cragun2014-11-031-0/+63
* | Populate the actors when creating groupsRyan Cragun2014-11-031-0/+4
* | 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
|\ \
| * | Update changelog for issue 2027jdmundrawala/11-stableJay Mundrawala2014-10-081-0/+1
| * | Merge pull request #2103 from opscode/jdmundrawala/issue-2027-masterJay Mundrawala2014-10-084-153/+167
* | | Merge pull request #2217 from opscode/jdmundrawala/11-stable-env-path-spec-fixJay Mundrawala2014-10-131-4/+3
|\ \ \
| * | | Merge pull request #2208 from opscode/jdmundrawala/env-path-spec-fixjdmundrawala/11-stable-env-path-spec-fixJay Mundrawala2014-10-131-4/+3
|/ / /
* | | Merge pull request #2205 from opscode/tball/11-stable-latest-ffi-yajlTyler Ball2014-10-102-3/+1
|\ \ \
| * | | Upgrading to latest ffi-yajl which contains fixes for Object#to_jsontball/11-stable-latest-ffi-yajltyler-ball2014-10-102-3/+1
|/ / /
* | | Exclude knife integration tests on server platformsBryan McLellan2014-10-0917-16/+19
|/ /
* | Merge pull request #2120 from opscode/tball/11-stable-yajl-replace-jsonTyler Ball2014-10-0879-187/+346
|\ \
| * | Adding back to prevent breaking people who use Hash.to_jsontball/11-stable-yajl-replace-jsontyler-ball2014-10-083-10/+6
| * | Using my ffi-yajl branch where I fixed Objects that do not support to_jsontyler-ball2014-10-081-0/+2
| * | Removing old .to_json monkeypatching for all objectstyler-ball2014-10-081-1/+0
| * | Moving documentation to CHANGELOG since no online documentation needs to upda...tyler-ball2014-10-082-5/+2
| * | Ruby 1.8.7 does some weird hash printing where it gives different ordering - ...tyler-ball2014-10-081-2/+2
| * | Fixing integration tests I didn't check last time I committedtyler-ball2014-10-085-10/+25
| * | First pass at removing JSON dependency, switching it for ffi-yajltyler-ball2014-10-0874-176/+326
* | | Add the forgotten change for 11.16.2 in to the CHANGELOG.Serdar Sutay2014-10-081-1/+2
|/ /
* | Merge pull request #2183 from opscode/sersut/travis-fixSerdar Sutay2014-10-071-1/+0
|\ \
| * | Remove Ruby 1.8.7 from travis config.sersut/travis-fixSerdar Sutay2014-10-071-1/+0
|/ /
* | Merge pull request #2182 from opscode/sersut/rel-11.16.411.16.4Serdar Sutay2014-10-073-41/+12
|\ \
| * | CHANGELOG and version updates for 11.16.4.Serdar Sutay2014-10-073-41/+12
|/ /
* | Merge pull request #2179 from opscode/sersut/port-policyfile-fixSerdar Sutay2014-10-0717-23/+128
|\ \
| * | Make FileVendor configuration specific to the two implementationssersut/port-policyfile-fixdanielsdeleo2014-10-0717-23/+128
|/ /
* | Merge pull request #2142 from opscode/jdmundrawala/11-windows-env-fixJay Mundrawala2014-10-066-187/+329
|\ \
| * | Updated CHANGELOG for env resource changejdmundrawala/11-windows-env-fixJay Mundrawala2014-09-301-2/+6
| * | Merge pull request #2024 from opscode/jdmundrawala/windows_env_pathJay Mundrawala2014-09-305-185/+323
* | | Merge pull request #2151 from opscode/sersut/backport-chef-1912Serdar Sutay2014-10-022-13/+23
|\ \ \ | |/ / |/| |
| * | Merge pull request #1912 from jessehu/CHEF-ISSUE-1904sersut/backport-chef-1912Claire McQuin2014-10-022-13/+23
|/ /
* | Add the pending() guard to the 'when there's no reboot keys present' spec.Chris Doherty2014-09-291-2/+5
View Lorry Controller Status