Updating VERSION
Add HA bits for OS metadata service
Merge pull request #376 from rackerjoe/v4.2.2rc

Merged automatically by jenkins after successful build test
Add libvirt_cpu_mode/libvirt_cpu_model attributes
Enable block_migration_flag

Cherry-picking commits from
https://github.com/gapinc/nova/commit/ee57e7b0dc2066bf81fcaf3f3d4bff141cb82591
add a flag for config_drive_format, default to iso9660
Merge pull request #386 from rackerjoe/v4.2.2rc

Merged automatically by jenkins after successful build test
Make scheduler_host_subset_size configurable.

Default value 1 is nova default.
Merge pull request #388 from rackerjoe/v4.2.2rc

Merged automatically by jenkins after successful build test
Use recreate action on keystone_endpoints

Ensure that the various keystone endpoints are reconfigured when things like
https is enabled/disabled.

- Change keystone-endpoint action from :create to :recreate

See: rcbops/chef-cookbooks#590
(cherry picked from commit 3b28ea421b6d52c11c876cb2c5c0d1f054ac78c4)
Issue #665: Attributes for sql pool settings

Expose some Nova SQL attributes:

 - connection_debug=0
 - idle_timeout=3600
 - max_pool_size=None
 - max_overflow=None
 - max_retries=10
 - min_pool_size=1
 - retry_interval=10

NB!: These options are different in Grizzly (DO NOT MERGE TO v4.1.X).

(cherry picked from commit 2e27e7528da7c1c9ad22dbec8eccdde92f2b6a9c)
Merge pull request #390 from claco/recreate-action

Merged automatically by jenkins after successful build test
Merge pull request #391 from claco/sql-pool-settings

Merged automatically by jenkins after successful build test
Fix for issue 754

Renamed "nova.comf" to "nova.conf" in configuration file list.

(cherry picked from commit 24b3eb8d7eacc5ae918ec83c28a6674c00450c3e)
Merge pull request #394 from claco/fix-comf-spelling

Merged automatically by jenkins after successful build test
Add favicon to novncproxy

(cherry picked from commit 495acbc48cd0715d110188392ea08ccc411040bc)
Merge pull request #393 from claco/add-proxy-favicon

Merged automatically by jenkins after successful build test
Fix incorrect attribute check

(cherry picked from commit 9bee3e1f5135a97ac683f5e6a7383b8dc2bd0ccc)
Merge pull request #392 from claco/fix-attr-check

Merged automatically by jenkins after successful build test
default libvirt injection part to -2

(cherry picked from commit 7a8b83481339c62ddfa9d387f271181e4a15cc95)