summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Contribution information for backport of https://github.com/opscode/chef/pull...sersut/backport-12.0.1Serdar Sutay2014-12-081-0/+1
* Merge pull request #2574 from opscode/jdm/evt-log-constSerdar Sutay2014-12-081-3/+5
* Merge pull request #2572 from opscode/sersut/win-fork-intervalSerdar Sutay2014-12-083-1/+16
* Merge pull request #2573 from opscode/sersut/bootstrap-context-aritySerdar Sutay2014-12-083-1/+6
* Merge pull request #2571 from opscode/sersut/restore-pathSerdar Sutay2014-12-083-0/+22
* Added CHANGELOG entry for Issue #2552Jay Mundrawala2014-12-081-0/+3
* Merge pull request #2554 from opscode/jdm/lwrp-providesJay Mundrawala2014-12-084-4/+4
* bumping version to 12.0.012.0.0Lamont Granquist2014-12-031-1/+1
* pinning ohai to 8.xLamont Granquist2014-12-031-2/+2
* Fix knife plugin path searchingLamont Granquist2014-12-034-6/+23
* Force TK to install prerelease Chef pkg for nowdanielsdeleo2014-11-261-1/+1
* Remove 1.9 from travis, bump 2.1 to .5 patch releasedanielsdeleo2014-11-261-4/+3
* update docs for dropping support of 1.9.3Lamont Granquist2014-11-263-3/+4
* drop ruby 1.9.x support for Chef-12Lamont Granquist2014-11-261-1/+1
* suppress locale -a warnings on windowsLamont Granquist2014-11-252-3/+3
* Version tag for 12.0.0.rc.3.12.0.0.rc.3Serdar Sutay2014-11-241-1/+1
* Bump version for 12.0.0.rc.2 release.12.0.0.rc.2Serdar Sutay2014-11-231-1/+1
* Merge pull request #2477 from opscode/sersut/port-immut-mergeSerdar Sutay2014-11-238-94/+109
|\
| * Merge pull request #2462 from opscode/lcg/remove-knockout-mergeSerdar Sutay2014-11-238-94/+109
|/
* Merge pull request #2454 from opscode/sersut/port-attr-perfSerdar Sutay2014-11-195-107/+132
|\
| * Merge pull request #2447 from opscode/lcg/lazy-deep-merge2Serdar Sutay2014-11-195-107/+132
|/
* Merge pull request #2450 from opscode/sersut/port-chef-2073Serdar Sutay2014-11-192-0/+67
|\
| * Merge pull request #2073 from opscode/ryan/group_post-masterSerdar Sutay2014-11-192-0/+67
|/
* Merge pull request #2440 from opscode/sersut/port-destdir-autoSerdar Sutay2014-11-194-11/+69
|\
| * Merge pull request #2424 from opscode/sersut/chef-2356Serdar Sutay2014-11-194-11/+69
* | stop recomputing locale -a constantlyLamont Granquist2014-11-182-36/+36
|/
* Merge pull request #2427 from opscode/jdmundrawala/path-sep-refactorJay Mundrawala2014-11-171-10/+2
* Pin version for 12.0.0.rc.1.12.0.0.rc.1Serdar Sutay2014-11-121-1/+1
* Merge pull request #2410 from opscode/sersut/port-sparc-fixSerdar Sutay2014-11-121-1/+7
|\
| * Merge pull request #2407 from opscode/sersut/ci-fix-sparcSerdar Sutay2014-11-121-1/+7
|/
* Changelog entry for Issue 2380Jay Mundrawala2014-11-111-0/+1
* Merge pull request #2395 from opscode/jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-111-2/+10
* Merge pull request #2394 from opscode/jdmundrawala/win-cookbook-ns-colJay Mundrawala2014-11-101-6/+5
* Merge pull request #2389 from opscode/sersut/serv-prov-portSerdar Sutay2014-11-0922-286/+553
|\
| * Merge pull request #2336 from opscode/lcg/12-systemd-fixessersut/serv-prov-portSerdar Sutay2014-11-0822-286/+553
|/
* Merge pull request #2388 from opscode/sersut/port-nil-attr-revertSerdar Sutay2014-11-082-20/+3
|\
| * Merge pull request #2387 from opscode/sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
|/
* Merge pull request #2386 from opscode/sersut/12-attr-portSerdar Sutay2014-11-087-44/+540
|\
| * Merge pull request #2097 from opscode/lcg/chef-12-attrLamont Granquist2014-11-087-44/+540
|/
* Merge pull request #2381 from opscode/sersut/12-port-follow-symlinkSerdar Sutay2014-11-073-1/+25
|\
| * Merge pull request #2370 from opscode/ryan/follow_symlinksSerdar Sutay2014-11-073-1/+25
|/
* Merge pull request #2377 from opscode/sersut/12-port-knife-ec2Serdar Sutay2014-11-073-9/+36
|\
| * Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-optionsSerdar Sutay2014-11-073-9/+36
|/
* Bring in cheffish and provisioning resources if they are installedchef-provisioning-12-stableJohn Keiser2014-11-051-0/+7
* cherry picking https://github.com/opscode/chef/pull/2326 to 12-stabletyler-ball2014-10-311-0/+1
* Merge pull request #2330 from opscode/sersut/cherry-pick-win-spec12.0.0.rc.0Serdar Sutay2014-10-301-2/+2
|\
| * Merge pull request #2328 from opscode/sersut/win-spec-fixSerdar Sutay2014-10-301-2/+2
|/
* Merge pull request #2327 from opscode/sersut/rc-spec-fixesSerdar Sutay2014-10-3011-62/+74
|\
| * windows_package installer_type should be a symbolBryan McLellan2014-10-302-4/+4
| * Merge pull request #2313 from opscode/sersut/win-res-lookup-fixSerdar Sutay2014-10-3011-58/+70