move version out of metadata.rb into VERSION
Merge pull request #354 from rackerjoe/master

Merged automatically by jenkins after successful build test
Add SSL configuration for nova-novncproxy
Add blank index pages to prevent file listing from novncproxy
Add reserved_host_disk_mb attribute
Merge pull request #358 from DavidWittman/reserved-host-disk-mb

Merged automatically by jenkins after successful build test
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
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