summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changelog for https://github.com/opscode/chef/pull/2621tball/12-changelogtyler-ball2014-12-151-0/+1
* Merge pull request #2647 from opscode/sersut/contrib-portSerdar Sutay2014-12-151-0/+5
|\
| * Merge pull request #2645 from opscode/sersut/contrib-2634Serdar Sutay2014-12-151-0/+5
|/
* Merge pull request #2621 from opscode/tball/notificationTyler Ball2014-12-1513-313/+582
|\
| * Fixing homebrew package to use provider resolver per code reviewtball/notificationtyler-ball2014-12-152-3/+4
| * Adding unit test coverage and updating per github reviewtyler-ball2014-12-156-207/+284
| * Removing TODOs which are not necessarytyler-ball2014-12-151-3/+0
| * Fixing some code I changed unecessarilytyler-ball2014-12-151-2/+10
| * First pass at fixing broken notificationstyler-ball2014-12-158-115/+301
* | Merge pull request #2643 from opscode/sersut/svn-portSerdar Sutay2014-12-152-8/+8
|\ \
| * | Merge pull request #2634 from BackSlasher/repair-subversion-commandSerdar Sutay2014-12-152-8/+8
|/ /
* | Update CHANGELOG for #2630danielsdeleo2014-12-151-0/+1
* | Use rspec-2 compatible assertiondanielsdeleo2014-12-151-1/+1
* | Merge branch 'knife-ssl-error-messaging'danielsdeleo2014-12-152-78/+115
|/
* Merge pull request #2639 from opscode/sersut/port-2623Serdar Sutay2014-12-155-41/+55
|\
| * Merge pull request #2623 from opscode/sersut/revert-1901Serdar Sutay2014-12-155-41/+55
|/
* Added CHANGELOG for issue 2625Jay Mundrawala2014-12-151-0/+1
* Merge pull request #2637 from opscode/jdm/issue-2626-rebaseJay Mundrawala2014-12-152-3/+20
* Merge pull request #2629 from opscode/jdm/shellout-specJay Mundrawala2014-12-152-42/+44
* Merge pull request #2631 from opscode/jdm/kitchen-testsJay Mundrawala2014-12-151-1/+1
* Merge pull request #2616 from jaymzh/whitelistSerdar Sutay2014-12-102-1/+37
* Fix #2596: parse instead of from_jsonJohn Keiser2014-12-102-1/+2
* Merge pull request #2610 from opscode/sersut/circular-dep-fixSerdar Sutay2014-12-102-1/+6
* Merge pull request #2588 from opscode/sersut/port-mac-packageSerdar Sutay2014-12-103-1/+38
|\
| * Merge pull request #2582 from jtimberman/jtimberman/brew-info-installedsersut/port-mac-packageJoshua Timberman2014-12-093-1/+38
|/
* Add information about rpm package signing to CHANGELOG.Serdar Sutay2014-12-091-0/+1
* Bump the version number for 12.0.1.12.0.1Serdar Sutay2014-12-091-1/+1
* Merge pull request #2576 from opscode/sersut/backport-12.0.1Serdar Sutay2014-12-098-5/+46
|\
| * Fix the unit test with missing rspec filter.Serdar Sutay2014-12-081-5/+1
| * Contribution information for backport of https://github.com/opscode/chef/pull...sersut/backport-12.0.1Serdar Sutay2014-12-081-0/+1
| * Merge pull request #2574 from opscode/jdm/evt-log-constSerdar Sutay2014-12-081-3/+5
| * Merge pull request #2572 from opscode/sersut/win-fork-intervalSerdar Sutay2014-12-083-1/+16
| * Merge pull request #2573 from opscode/sersut/bootstrap-context-aritySerdar Sutay2014-12-083-1/+6
| * Merge pull request #2571 from opscode/sersut/restore-pathSerdar Sutay2014-12-083-0/+22
|/
* Added CHANGELOG entry for Issue #2552Jay Mundrawala2014-12-081-0/+3
* Merge pull request #2554 from opscode/jdm/lwrp-providesJay Mundrawala2014-12-084-4/+4
* bumping version to 12.0.012.0.0Lamont Granquist2014-12-031-1/+1
* pinning ohai to 8.xLamont Granquist2014-12-031-2/+2
* Fix knife plugin path searchingLamont Granquist2014-12-034-6/+23
* Force TK to install prerelease Chef pkg for nowdanielsdeleo2014-11-261-1/+1
* Remove 1.9 from travis, bump 2.1 to .5 patch releasedanielsdeleo2014-11-261-4/+3
* update docs for dropping support of 1.9.3Lamont Granquist2014-11-263-3/+4
* drop ruby 1.9.x support for Chef-12Lamont Granquist2014-11-261-1/+1
* suppress locale -a warnings on windowsLamont Granquist2014-11-252-3/+3
* Version tag for 12.0.0.rc.3.12.0.0.rc.3Serdar Sutay2014-11-241-1/+1
* Bump version for 12.0.0.rc.2 release.12.0.0.rc.2Serdar Sutay2014-11-231-1/+1
* Merge pull request #2477 from opscode/sersut/port-immut-mergeSerdar Sutay2014-11-238-94/+109
|\
| * Merge pull request #2462 from opscode/lcg/remove-knockout-mergeSerdar Sutay2014-11-238-94/+109
|/
* Merge pull request #2454 from opscode/sersut/port-attr-perfSerdar Sutay2014-11-195-107/+132
|\
| * Merge pull request #2447 from opscode/lcg/lazy-deep-merge2Serdar Sutay2014-11-195-107/+132
|/