summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2424 from opscode/sersut/chef-2356sersut/port-destdir-autoSerdar Sutay2014-11-174-11/+69
* 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
* | Fixing documentation errortyler-ball2014-10-301-3/+1
|/
* Merge pull request #2320 from ClogenyTechnologies/kd-aix-fixes-wrktnScott Hain2014-10-291-1/+1
* add 'class Chef' outer scopeLamont Granquist2014-10-281-302/+304
* Merge pull request #2314 from opscode/adamedx/32-bit-windows-spec-fixAdam Edwards2014-10-281-1/+1
* Merge pull request #2309 from ClogenyTechnologies/kd-aix-fixes-28octScott Hain2014-10-283-2/+5
* Pick up latest ohai and mixlib-shellout.Serdar Sutay2014-10-271-2/+2
* Bump version for 12.0.0 RC.Serdar Sutay2014-10-272-2/+2
* Merge pull request #2301 from juliandunn/cleanup-old-initscriptsJulian C. Dunn2014-10-2642-2048/+0
|\
| * Remove old, outdated distro initscripts.Julian C. Dunn2014-10-2442-2048/+0
* | Merge pull request #2300 from opscode/lcg/rspec3-updatesLamont Granquist2014-10-26146-4782/+4779
|\ \ | |/ |/|
| * fix more solaris provider lolwutlcg/rspec3-updatesLamont Granquist2014-10-241-2/+2
| * remove lolwut from testsLamont Granquist2014-10-241-3/+0
| * updating resources/providers unit tests to rpsec3Lamont Granquist2014-10-24146-4781/+4781
|/
* Merge pull request #2296 from opscode/sersut/last-contrib-infoSerdar Sutay2014-10-242-1/+39
|\
| * Contribution info for https://github.com/opscode/chef/pull/2277.Serdar Sutay2014-10-241-1/+2
| * Contribution info for https://github.com/opscode/chef/pull/2270.Serdar Sutay2014-10-241-0/+2
| * Contribution info for https://github.com/opscode/chef/pull/2251.Serdar Sutay2014-10-241-0/+3
| * Contribution info for https://github.com/opscode/chef/pull/2196.Serdar Sutay2014-10-241-0/+2
| * Add missing changelog notes after 11.14.2.Serdar Sutay2014-10-242-1/+31
* | Merge pull request #2295 from opscode/lcg/provider-resolver-mdsLamont Granquist2014-10-242-0/+29
|\ \
| * | add md files for ProviderResolver featureslcg/provider-resolver-mdsLamont Granquist2014-10-242-0/+29
| |/
* | Merge pull request #2277 from liseki/fix-freebsd-service-status-loadSerdar Sutay2014-10-241-0/+1
|\ \
| * | Properly load FreeBSD service statusRichard Manyanza2014-10-221-0/+1
* | | Merge pull request #2270 from liseki/fix-whiny-freebsd-serviceSerdar Sutay2014-10-241-1/+2
|\ \ \
| * | | Maintain init_command as nil in why-run when missing init scriptRichard Manyanza2014-10-211-10/+2