Merge branch 'CHEF-1410'
use the hash syntax to set solo mode, require 'chef' in solo app
Merge branch 'CHEF-1404'
fix more broken method stubs/expectations, remove spurious debugging
[CHEF-1404] add explicit requires to shef/ext
Merge branch 'CHEF-1021'
Pass environment, group and cwd to run on deploy
bump version to 0.9.5 for development
Bump version to 0.9.4 for release
Merge branch 'CHEF-1400'
[CHEF-1400] support deprecated @node usage in resources
left a tag in the cucumber feature from development
bump to version 0.9.2 for release
Merge branch 'cuke-include-default-attribute'
test that include_attribute 'COOKBOOK_NAME' w/ implicit default works
Merge branch 'CHEF-1396'
remove redundant method stub
[CHEF-1396] use mv not cp to move staged templates into place
Merge branch 'CHEF-1394'
[CHEF-1394] pass the correct variable to notification handlers
[CHEF-1390] start webui not API w/ the webui startup script
also use port 4040
Merge branch 'CHEF-1388'
speed up features by not running ohai so much
Removing unnecessary require
Adding licenses to files in monkey_patches
More dependency management
Merge branch 'CHEF-1380'
require merb 1.1.x in the webui gemspec
bonus: allow the rakefile to run when merb is not installed, so it's
easier to install from source checkout on a bare system
Merge branch 'CHEF-1378'
[CHEF-1378] Add upstart config to chef/distro
Merge branch 'CHEF-1366'
CHEF-1366 Add slicehost support to knife
Merge branch 'CHEF-1373'
Merge branch 'CHEF-1384'