opscode/chef — pull request #2471 by mcquin (2014-11-21 22:37:18+00:00)
Title: Play catchup with master

@tyler-ball @sersut