summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Nate Walck2015-07-20183-3268/+6038
|\
| * 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
| |\ \ \ \ \ \
| | * | | | | | Update changelog.tc/fix-chef-usertylercloke2015-07-061-0/+1
| | * | | | | | Allow cookbooks_dir to use chef_rest instead of rest for now.tylercloke2015-07-062-10/+2
| | * | | | | | Remove all the stupid json magic from Chef::ApiClientV1.tylercloke2015-07-066-111/+44
| | * | | | | | Fix automated object generation from HTTP layer in ApiClient.tylercloke2015-07-061-0/+5
| | * | | | | | Fixed old ApiClient tests.tylercloke2015-07-061-8/+3
| | * | | | | | Set Chef::ApiClient to use API V0.tylercloke2015-07-061-2/+3
| | * | | | | | Cleanup.tylercloke2015-07-062-1/+2
| | * | | | | | Move ApiClient V1 supported code to Chef::ApiClientV1 and restore Chef::ApiCl...tylercloke2015-07-0619-352/+944
| | * | | | | | Default Chef::ChefFS::...::ChefServerRootDir.rest to use API V0 and deprecate...tylercloke2015-07-062-3/+11
| | * | | | | | Remove _rest from http methods.tylercloke2015-07-062-14/+14
| | * | | | | | Move Chef::OscUser back to Chef::User namespace and new user code to Chef::Us...tylercloke2015-07-0631-1118/+1122
| |/ / / / / /
| * | | | | | Merge branch 'jk/3634'John Keiser2015-07-062-4/+34
| |\ \ \ \ \ \
| | * | | | | | Deprecate passing more than 1 argument to create a resourcejk/3634John Keiser2015-07-062-8/+18
| | * | | | | | Don't accept multiple parameters in recipe DSL (just name)John Keiser2015-07-062-4/+24
| |/ / / / / /
| * | | | | | Merge branch 'jk/separate-priority-map'John Keiser2015-07-0634-517/+832
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Memoize enabled_handlers so it is not recomputedjk/separate-priority-mapJohn Keiser2015-07-064-3/+39