summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4330 from chef/shain/disable_aix_mount_tests12.6.012.6-releaseSalim Alam2015-12-184-3/+9
* Merge pull request #4327 from chef/jdm/aix-watJay Mundrawala2015-12-181-1/+3
* Actually that's win32-eventlog 0.6.3Kartik Null Cating-Subramanian2015-12-171-1/+1
* Pin win32-eventlog to 0.6.2 to avoid clashing CreateEvent definitionKartik Null Cating-Subramanian2015-12-171-1/+1
* Only warn about potentially duplicate properties during the resource initializerJohn Keiser2015-12-144-12/+53
* Don't warn when setting a property to nil unless its value wouldJohn Keiser2015-12-142-20/+25
* Fix no_proxy setting in chef-configJay Mundrawala2015-12-112-1/+12
* Merge pull request #4276 from chef/lcg/ruby-prof-gem-groupLamont Granquist2015-12-101-2/+5
|\
| * add ruby-prof to its own gem groupLamont Granquist2015-12-101-2/+5
* | Merge branch 'jk/error-on-property-with-block'John Keiser2015-12-102-118/+143
|\ \ | |/ |/|
| * Get rid of ambiguity with `template 'x' do ...`jk/error-on-property-with-blockJohn Keiser2015-12-102-118/+143
|/
* Merge branch 'jk/warn-dup-property'John Keiser2015-12-106-17/+108
|\
| * Improve commentsjk/warn-dup-propertyJohn Keiser2015-12-102-3/+17
| * Warn when user sets a property of an inline resource to itself.John Keiser2015-12-106-17/+94
|/
* Merge pull request #4272 from chef/salam/relnote-fixSalim Alam2015-12-101-1/+1
|\
| * Add CHANGELOG linkSalim Alam2015-12-101-1/+1
|/
* Merge pull request #4270 from chef/lcg/rspec-timeoutsLamont Granquist2015-12-101-1/+1
|\
| * fix rspec timeouts in tinyserverLamont Granquist2015-12-101-1/+1
|/
* Merge pull request #4248 from chef/tm/fix_reg_tests_2Thom May2015-12-102-0/+5
|\
| * expose HTTP optionstm/fix_reg_tests_2Thom May2015-12-092-0/+5
* | Merge pull request #4265 from chef/lcg/ask-for-stacktracesLamont Granquist2015-12-091-1/+2
|\ \
| * | Ask for stacktrace.out in bug reportslcg/ask-for-stacktracesLamont Granquist2015-12-091-1/+2
|/ /
* | CHANGELOG for https://github.com/chef/chef/pull/4237tyler-ball2015-12-091-1/+1
* | Merge pull request #4237 from chef/tball/proxifierTyler Ball2015-12-0915-284/+328
|\ \
| * | Moving the proxy export to environment varibles into Chef::Configtyler-ball2015-12-0910-271/+267
| * | Adding proxifier dependency and leveraging its ability to make TCPSocket.new ...tyler-ball2015-12-098-104/+152
|/ /
* | Don't activate cheffish and chef-provisioning until its DSL is usedjk/lazy-activationJohn Keiser2015-12-095-8/+191
* | Merge pull request #4263 from chef/lcg/fix-ubuntu-1004-dpkg-testLamont Granquist2015-12-0932-966/+222
|\ \
| * | rebuilt deb fixtures on 10.04 to fix 10.04Lamont Granquist2015-12-0932-966/+222
| |/
* | Merge pull request #4261 from chef/jdm/missing-varJay Mundrawala2015-12-091-1/+1
|\ \
| * | Add missing exception variableJay Mundrawala2015-12-091-1/+1
| |/
* | Add release notes for :before notification timingJohn Keiser2015-12-091-0/+20
* | Work with cheffish (which has no before_notifications)John Keiser2015-12-091-2/+4
* | immediately_before -> beforeJohn Keiser2015-12-095-38/+38
* | Fix testsJohn Keiser2015-12-091-0/+6
* | Add immediately_before notificationJohn Keiser2015-12-094-5/+159
|/
* Require what you useJohn Keiser2015-12-081-0/+1
* Merge pull request #4258 from chef/jdm/dpkg-spec-fixesLamont Granquist2015-12-081-22/+25
|\
| * Fix dpkg specs to run on debian 6jdm/dpkg-spec-fixesJay Mundrawala2015-12-081-22/+25
* | Reinstate Halite and Poise bundler cachingjk/remove-halit-cacheJohn Keiser2015-12-081-3/+0
* | Merge pull request #4236 from chef/jdm/dsc_resource_timeoutThom May2015-12-083-3/+17
|\ \
| * | Add timeout attribute to dsc_resourcejdm/dsc_resource_timeoutJay Mundrawala2015-12-033-3/+17
* | | Remove doc change note about changes to how an unspecified source is defaulte...Matt Wrock2015-12-081-2/+0
* | | Merge pull request #4193 from chef/mwrock/packageSalim Alam2015-12-0816-64/+1343
|\ \ \ | |_|/ |/| |
| * | adds support to installer types inno, nsis, wise and installshield top the wi...Matt Wrock2015-12-0716-64/+1343
* | | Merge pull request #4256 from chef/lcg/dpkg-s-return-codesThom May2015-12-082-4/+39
|\ \ \
| * | | restore handling of dpkg -s returns codes (w/tests)lcg/dpkg-s-return-codesLamont Granquist2015-12-072-4/+39
|/ / /
* | | Use latest bundler and rubygemsjk/reenable-bundler-cacheJohn Keiser2015-12-073-19/+13
|/ /
* | Merge pull request #4251 from chef/salam/relnote-updateSalim Alam2015-12-071-0/+5
|\ \
| * | Add note for OpenSSL updateSalim Alam2015-12-071-0/+5
|/ /