summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update version to 12.5.0.alpha.0 for gem release.mcquin/12.5.0.alpha.0Claire McQuin2015-07-233-3/+3
* Merge pull request #3594 from natewalck/masterPhil Dibowitz2015-07-232-5/+9
|\
| * Fixed platform_Version logicNate Walck2015-07-211-3/+3
| * Merge branch 'elcap-service'Nate Walck2015-07-211-2/+2
| |\
| | * Add 10.11 to macosx_spec.rbNate Walck2015-07-211-2/+2
| * | Merge remote-tracking branch 'upstream/master'Nate Walck2015-07-20183-3268/+6038
| |\ \ | | |/ | |/|
| * | Added support for 10.11 and added function for evaluating OS X versions for f...Nate Walck2015-06-251-1/+5
* | | Merge pull request #3684 from coderanger/remove-warningNoah Kantrowitz2015-07-233-24/+0
|\ \ \
| * | | Missed a test.Noah Kantrowitz2015-07-191-2/+0
| * | | Remove warnings from tests too.Noah Kantrowitz2015-07-192-17/+0
| * | | Remove warnings about hander overrides.Noah Kantrowitz2015-07-191-5/+0
* | | | Merge pull request #3693 from margueritepd/issue-3232-template-verify-to-use-...Thom May2015-07-232-6/+40
|\ \ \ \
| * | | | Warn about deprecation `%{file}` interpolation in verify commandmarguerite2015-07-222-0/+22
| * | | | Interpolate `%{path}` in verify commandmarguerite2015-07-212-6/+18
|/ / / /
* | | | Merge pull request #3668 from chef/mcquin/first-boot-chef-environmentClaire McQuin2015-07-213-0/+42
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update documentation for chef-client -j JSONmcquin/first-boot-chef-environmentClaire McQuin2015-07-161-0/+16
| * | | Set chef_environment in attributes JSONClaire McQuin2015-07-142-0/+26
* | | | Updated changelog for PR #3683Steven Murawski2015-07-201-0/+1
* | | | Merge pull request #3683 from jimmymccrory/windows_rebooter_minutesSteven Murawski2015-07-202-2/+2
|\ \ \ \
| * | | | Correct Windows reboot command to delay in minutesJimmy McCrory2015-07-192-2/+2
| | |/ / | |/| |
* | | | Update gemspec for win32-service bugfix.Kartik Null Cating-Subramanian2015-07-202-1/+2
* | | | Make service manager tests pass.Kartik Null Cating-Subramanian2015-07-203-3/+4
* | | | Add flag to windows_service_manager to delay start.Kartik Null Cating-Subramanian2015-07-202-13/+19
* | | | Merge pull request #3682 from chef/jdm/json-nested-testThom May2015-07-201-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Rewrite nested json test to not use stackjdm/json-nested-testJay Mundrawala2015-07-171-3/+4
* | | | Merge pull request #3666 from juliandunn/support-sni-in-knifeJulian C. Dunn2015-07-183-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Update changelog for merge.Julian C. Dunn2015-07-181-0/+1
| * | | Update test.Julian C. Dunn2015-07-131-0/+4
| * | | Support SNI in 'knife ssl check'.Julian C. Dunn2015-07-131-2/+3
* | | | Merge pull request #3680 from chef/tm/service_appveyor_onlyThom May2015-07-172-1/+2
|\ \ \ \
| * | | | avoid windows service spec unless we're on appveyortm/service_appveyor_onlyThom May2015-07-172-1/+2
|/ / / /
* | | | Update the URL in user agent string12.5.0.current.0danielsdeleo2015-07-161-1/+1
* | | | Merge pull request #3242 from ranjib/chef_handlerRanjib Dey2015-07-166-1/+183
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into chef_handlerRanjib Dey2015-07-0692-1611/+3399
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into chef_handlerRanjib Dey2015-06-2469-765/+4290
| |\ \ \ \ \
| * | | | | | add name class attribute for user defined handlers. more readable invalid eve...Ranjib Dey2015-06-235-18/+70
| * | | | | | fix typoRanjib Dey2015-06-181-1/+1
| * | | | | | add spec for eventhandler dslRanjib Dey2015-06-131-0/+35
| * | | | | | use Chef.run_context to register handler if setRanjib Dey2015-06-131-1/+9
| * | | | | | Merge remote-tracking branch 'origin/master' into HEADRanjib Dey2015-06-12500-5875/+19315
| |\ \ \ \ \ \
| * | | | | | | [RFC-039] chef handler dslRanjib Dey2015-04-185-1/+77
* | | | | | | | Fix issue where DSL is not emitted if state_properties happens before propertyjk/state_attrsJohn Keiser2015-07-152-2/+18
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #3592 from chef/ryan/archThom May2015-07-142-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add Ryan Cragun to Archlinux maintainersryan/archRyan Cragun2015-07-012-1/+7
* | | | | | | Merge pull request #3646 from chef/jdm/config-workstation-specJay Mundrawala2015-07-081-5/+10
|\ \ \ \ \ \ \
| * | | | | | | Try fix for failing config testjdm/config-workstation-specJay Mundrawala2015-07-081-5/+10
|/ / / / / / /
* | | | | | | Merge pull request #3641 from grubernaut/issue_3640Noah Kantrowitz2015-07-072-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Decommission 12-stableJake Champlin2015-07-072-2/+1
|/ / / / / / /
* | | | | | | Update CHANGELOG for Chef 12.4.1Jay Mundrawala2015-07-061-3/+14
* | | | | | | Merge pull request #3630 from chef/tc/fix-chef-userJay Mundrawala2015-07-0651-1477/+2009
|\ \ \ \ \ \ \