add guestfs for nova
Set loglevel to warn instead of debug for modwsgi_vhost
Apply patch for lp bug 1235220
Fix nova-osapi-patch recipe name
Merge remote-tracking branch 'origin/master' into havana
version bump
Add SSL configuration for nova-novncproxy
Add blank index pages to prevent file listing from novncproxy
setting rpc_backend config to use kombou
rename quantum->neutron attrs in conf provider
Merge pull request #355 from odyssey4me/ssl-novncproxy

Add SSL configuration for nova-novncproxy
rebasing https://github.com/rcbops-cookbooks/nova/pull/356
fixing syntax error.
Merge pull request #360 from jcannava/odyssey4me-novncproxy-filelistfix

Merged automatically by jenkins after successful build test
Use package_options instead of package_overrides
issue603: fix monit config madness

added new node['nova']['platform']['nova_*_procmatch'] regular
expression for daemons.  replaces old *_process_name attribute, where
applicable (not all process names were extracted into attributes--many
were hard-coded into openstack-monitoring recipes).

clean up and organize all the platform attributes
(found some extra bugs by doing this).
issue603: fix monit config madness

added new node['nova']['platform']['nova_*_procmatch'] regular
expressions for daemons.  replaces old *_process_name attribute, where
applicable (not all process names were extracted into attributes--many
were hard-coded into openstack-monitoring recipes).

clean up and organize all the platform attributes
(found some extra bugs by doing this).
Merge pull request #361 from invsblduck/issue603_monit_master

Merged automatically by jenkins after successful build test
Merge branch 'havana' of github.com:rcbops-cookbooks/nova

Conflicts:
	attributes/default.rb
	metadata.rb
	templates/default/nova.conf.erb
Issue #618: Make disk_cachemodes a list in nova.conf