summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Using master of kitchen-ec2 because https://github.com/test-kitchen/kitchen-e...tball/kitchen-ec2tyler-ball2015-06-081-1/+1
* Merge pull request #3438 from chef/tc/api-versioningTyler Cloke2015-06-0547-447/+3346
|\
| * Update changelog with V1 API support and OSC 11 user deprecation note.tylercloke2015-06-051-0/+2
| * Better API version error handling helper code.tylercloke2015-06-0513-62/+191
| * Backwards compatible support for OSC 11 in knife user commands.tylercloke2015-06-0530-197/+521
| * Use Chef::ServerAPI to create versioned API requests in Chef::(User|Client).tylercloke2015-06-054-41/+22
| * Reregister V0 support for Chef::Client.tylercloke2015-06-057-23/+131
| * Fixed bug where boolean fields would not be populated in Chef::User/ApiClient.tylercloke2015-06-053-28/+34
| * Chef::ApiClient.update supports V1.tylercloke2015-06-055-22/+296
| * API V1 support for client creation.tylercloke2015-06-059-256/+410
| * Move old Chef::*User and related commands to Chef::Osc*User for backwards com...tylercloke2015-06-0514-0/+1184
| * Small updates to Chef::User.list.tylercloke2015-06-052-36/+10
| * Use version 1 as the default API version if not specified.tylercloke2015-06-051-1/+1
| * Made Chef::User.reregister give sane error message if no V0 on server.tylercloke2015-06-052-10/+28
| * Added V1 support to Chef::User.update and removed admin field.tylercloke2015-06-055-101/+189
| * Added versioned Chef Object API support code and repaired Chef::User.create.tylercloke2015-06-0515-207/+864
|/
* Remove leftover debug statementdanielsdeleo2015-06-051-1/+0
* Merge pull request #3483 from chef/lcg/lwrp-calling-include-recipeLamont Granquist2015-06-045-0/+92
|\
| * add CHANGELOG.mdlcg/lwrp-calling-include-recipeLamont Granquist2015-06-041-0/+1
| * allow include_recipe from LWRP provider codeLamont Granquist2015-06-044-0/+91
|/
* Merge pull request #3481 from chef/lcg/bundle-cacheLamont Granquist2015-06-041-0/+1
|\
| * add bundler cacheLamont Granquist2015-06-041-0/+1
|/
* Merge pull request #3488 from chef/lcg/hvm-ssd-amiLamont Granquist2015-06-042-2/+3
|\
| * pin kitchen-ec2 to working versionLamont Granquist2015-06-041-1/+1
| * switch to an HVM ssd based AMILamont Granquist2015-06-031-1/+2
* | Merge pull request #3489 from chef/hyphenated-lwrpSteven Danna2015-06-043-40/+164
|\ \ | |/ |/|
| * Fix hyphenated LWRP nameshyphenated-lwrpJohn Keiser2015-06-033-6/+84
| * Add regression test for LWRP in hyphenated cookbookdanielsdeleo2015-06-031-1/+32
| * Convert LWRP provider tests to let bindingsdanielsdeleo2015-06-031-37/+52
|/
* Merge pull request #3480 from chef/jdm/travisDan DeLeo2015-06-031-1/+0
|\
| * We don't need to run ruby 2.0 in travis.jdm/travisJay Mundrawala2015-06-031-1/+0
* | Merge branch 'jk/3463'John Keiser2015-06-033-22/+173
|\ \
| * | Move deprecated LWRP class override to the deprecation method registrarJohn Keiser2015-06-032-6/+16
| * | Fix issue #3463: use real constants instead of const_missingJohn Keiser2015-06-033-24/+165
|/ /
* | Merge pull request #3479 from chef/lcg/e2e-faster-instance-typeLamont Granquist2015-06-031-0/+1
|\ \ | |/ |/|
| * try m3.medium over m1.smalllcg/e2e-faster-instance-typeLamont Granquist2015-06-031-0/+1
* | Merge pull request #3478 from chef/lcg/retry-bundle-installLamont Granquist2015-06-031-1/+1
|\ \
| * | rubygems is horriblelcg/retry-bundle-installLamont Granquist2015-06-031-1/+1
* | | Merge pull request #3477 from chef/lcg/zypper-packageLamont Granquist2015-06-035-17/+51
|\ \ \ | |/ / | | / | |/ |/|
| * add CHANGELOG.mdlcg/zypper-packageLamont Granquist2015-06-031-2/+3
| * finish wiring up to DSLLamont Granquist2015-06-031-0/+2
| * wire zypper_package up to the DSLLamont Granquist2015-06-034-15/+46
|/
* Merge pull request #3475 from chef/lcg/package-timeoutsLamont Granquist2015-06-0238-312/+403
|\
| * add CHANGELOG.mdlcg/package-timeoutsLamont Granquist2015-06-021-6/+7
| * fix package timeout attributeLamont Granquist2015-06-0237-306/+396
|/
* Merge pull request #3467 from chef/jdm/shelloutJay Mundrawala2015-06-021-0/+2
|\
| * Add missing requirejdm/shelloutJay Mundrawala2015-06-021-0/+2
* | Update CHANGELOG for #3066Jay Mundrawala2015-06-021-0/+2
* | Merge pull request #3471 from chef/jdm/3066Jay Mundrawala2015-06-022-6/+76
|\ \
| * | Fix copying ntfs dacl and sacl when nulljdm/3066SteveLowe2015-06-022-6/+76
View Lorry Controller Status