Use progress formatter on Travis
Add timeout attribute to scm resource
Use timeout attribute in git and subversion providers
Update the deploy resource to meet extended scm interface
Update specs to encompass scm timeout attribute
Remove stray :focus from spec
Fix botched rebase
Add spec for new timeout attribute on deploy resource
Extend deploy provider spec to cover timeout
CHEF-4248: Fix Ruby 1.8 incompatibilities
Merge branch 'CHEF-4248'
CHEF-4538 Support --ssh-config option to override, suppress or customize knife SSH behavior
Merge pull request #870 from opscode/sethvargo/fix_travis

[CHEF-4342] Use progress formatter on Travis
Use progress formatter on Travis
Fix typo in chef solo config file option default
Merge branch 'CHEF-4554'
Merge branch 'master' of github.com:opscode/chef into feature/CHEF-4538
[CHEF-4538] Spec for unit testing --ssh-config
CHEF-4538 Support --ssh-config option to override, suppress or customize knife SSH behavior