summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update comment describing working rubygems bundler configurationjdm/fix-travisJay Mundrawala2015-12-071-2/+2
* Get rid of bundler cachingJay Mundrawala2015-12-071-1/+0
* Install newer bundlerJay Mundrawala2015-12-071-1/+1
* Merge pull request #4247 from chef/tm/fix_reg_testsThom May2015-12-071-4/+2
|\
| * fix registration teststm/fix_reg_testsThom May2015-12-071-4/+2
* | Merge pull request #4243 from chef/jk/fix-resource-superThom May2015-12-071-1/+12
|\ \ | |/ |/|
| * Fix resource `super` (broken because of test :focus)jk/fix-resource-superJohn Keiser2015-12-061-1/+12
* | Merge pull request #4239 from chef/bjfish-patch-1Thom May2015-12-071-0/+4
|\ \ | |/ |/|
| * Add Rubinius to Build Matrix with Allowed Failurebjfish-patch-1Brandon Fish2015-12-041-0/+4
* | Merge pull request #4241 from chef/lcg/32-bit-dpkg-test-brokeLamont Granquist2015-12-041-1/+1
|\ \
| * | disable tests on 32-bitlcg/32-bit-dpkg-test-brokeLamont Granquist2015-12-041-1/+1
|/ /
* | Merge pull request #4240 from chef/lcg/remove-focusLamont Granquist2015-12-042-1/+6
|\ \
| * | raise if we see a test with :focus set on it in CIlcg/remove-focusLamont Granquist2015-12-041-0/+5
| * | focus snuck into a PRLamont Granquist2015-12-041-1/+1
| |/
* | Merge pull request #4238 from chef/tc/fix-api-client-registrationTyler Cloke2015-12-041-3/+7
|\ \ | |/ |/|
| * Revert lib/chef/api_client/registration.rb to use API V0 since it doesn't sup...tc/fix-api-client-registrationTyler Cloke2015-12-041-3/+7
|/
* Merge pull request #4234 from chef/rn_typoBryan McLellan2015-12-031-1/+1
|\
| * Fix minor typoTim Smith2015-12-031-1/+1
|/
* Merge pull request #4225 from chef/salam/relnoteSalim Alam2015-12-031-0/+25
|\
| * Review updates, add FastMSI noteSalim Alam2015-12-031-2/+6
| * Update RELEASE_NOTESSalim Alam2015-12-031-0/+21
|/
* Merge pull request #4196 from chef/lcg/dpkg-multipackageLamont Granquist2015-12-0242-114/+1662
|\
| * another note on dpkg_package changeslcg/dpkg-multipackageLamont Granquist2015-12-021-0/+2
| * add changelog and release notesLamont Granquist2015-12-022-0/+5
| * quick spec for subclass directiveLamont Granquist2015-12-021-0/+45
| * add unit test for a_to_sLamont Granquist2015-12-021-0/+4
| * just use extendLamont Granquist2015-12-022-15/+10
| * dpkg multipackage and bonus fixesLamont Granquist2015-12-0239-116/+1613
* | Merge branch 'jk/4127'John Keiser2015-12-022-256/+276
|\ \
| * | Make to_hash include properties with defaults (fixes #4127)jk/4127John Keiser2015-12-022-3/+21
| * | Use let instead of instance variablesJohn Keiser2015-12-021-253/+255
|/ /
* | Converge actions all together instead of in action :x (fixes #4124)jk/4124John Keiser2015-12-022-57/+108
|/
* Merge pull request #4219 from chef/salam/chef-releaseSalim Alam2015-12-016-12/+54
|\
| * Bump version to 12.6.0Salim Alam2015-12-014-4/+4
| * Update DOC_CHANGES: remove chocolatey_package, add info for ksh resourceSalim Alam2015-12-011-6/+16
| * Update CHANGELOGSalim Alam2015-12-011-2/+34
* | Merge pull request #4218 from chef/lcg/release-notesLamont Granquist2015-12-011-68/+26
|\ \ | |/ |/|
| * add some 12.6.0 release notes [ci skip]lcg/release-notesLamont Granquist2015-12-011-68/+26
|/
* Merge pull request #3790 from chef/jdm/travis-sudoJay Mundrawala2015-12-014-3/+11
|\
| * Add note as to why ifconfig_spec is disabled in travisjdm/travis-sudoJay Mundrawala2015-11-301-0/+2
| * Add note as to why mount_spec is not running in travisJay Mundrawala2015-11-301-0/+2
| * Only run as sudo for tests that need itJay Mundrawala2015-11-251-0/+3
| * Skip mount test in travisJay Mundrawala2015-11-251-1/+1
| * Skip ifconfig tests in travisJay Mundrawala2015-11-251-1/+1
| * Add tag to skip travisJay Mundrawala2015-11-251-0/+1
| * Run tests as sudoJay Mundrawala2015-11-251-2/+2
* | Merge pull request #4183 from chef/lcg/extract-declare-resource-mixinLamont Granquist2015-12-015-91/+152
|\ \
| * | add CHANGLOG.mdlcg/extract-declare-resource-mixinLamont Granquist2015-12-011-0/+1
| * | extract declare_resource to a mixin and extend APILamont Granquist2015-12-014-91/+151
|/ /
* | Merge pull request #4206 from chef/lcg/fix-rspec-ctrl-cLamont Granquist2015-11-252-2/+8
|\ \
View Lorry Controller Status