Merge "Resize/Migrate functions for PowerVM driver"
Merge "API extension for accessing instance_actions"
Only dhcp the first ip for each mac address.

When using add-fixed-ip there can be more than one ip for each
mac so make dnsmasq just serve the first one. Also, make sure to
disassociate the fixed ips when they are removed since dnsmasq
will never know about them.

Fixes bug 1124692

Change-Id: If41c03e1adb408ce28d8e8a25706ebc76fb3c4e1
Merge "Use a more specific error reporting invalid disk hardware"
Merge "Fix passing conductor to get_instance_nw_info()"
Merge "Fix regression in non-admin simple_usage:show."
Merge "maint: remove unused imports from bin/nova-*"
Merge "Return dest_check_data as expected by the Scheduler"
Merge "Add "is not" test to hacking.py"
Canonizes IPv6 before insert it into the db

This is normalize IPv6 to be inserted always in shortened and no mixed form
into db, this way postgresql, which uses INET type, and other databases like
mysql will have equivalent contents.

Fix bug 1116236
Related to bp migration-testing-with-data

Change-Id: Iae5aa8a28e3ccc0d3a1a96459232b827c3a19d5c
Merge "Allow multiple dns servers when starting dnsmasq"
Merge "Allow aggregate create to have None as the az"
Synchronize code from oslo

Use commit eaab5fae2502198e9fa57d0d90a7204a2bd83b16:
Merge "sort options to make --help output prettier"
(Wed Feb 13 12:52:14 2013 +0000).

Changes:
  9669767 Fix PEP8 error in oslo-rootwrap
  e3e5e0e Fixes "is not", "not in" syntax usage
  d156150 Implements import_group
  0ce65aa sort options to make --help output prettier
  580c259 Make tox run doctests
  d8c4e0c Change Exception MissingArgs's string
  6d102bc Provide i18n to those messages without _()
  cf705c5 Make project pyflakes clean
  9e5912f Fix pep8 E125 errors
  4a1ec21 Support testing args for LocalhostMatchMaker
  9fd6437 Exchanges should return directed topics
  a4b6c31 Allow running test in uninstalled source tree
  1461135 timeutils: considers that now is soon
  a956f7a Import timeutils.is_soon from keystoneclient
  a4b6c31 Allow running test in uninstalled source tree
  076e9e5 Add support for directly stringifying VersionInfo

Change-Id: I427508f0882a528d040c89290ff9ca68a1e91bcd
Fixes: bug #1124213
Don't modify injected_files inside PXE driver

Make a local copy of injected_files so that we don't modify the
original.

Change-Id: I508cfc0baec15a091a1717eb2aebb9dd39278e5b
add config drive to api_samples

Add config drive extension show and details to api_samples

blueprint nova-api-samples
bug 1091737

Change-Id: I6ae1f01a417f153723b85d08c2f181909c154946
Remove a log message in test code.

This log message indicates that this code should only run during
testing.  The downside is that it does run during testing and can cause
a bunch of annoying noise in test logs.  Just remove it.

Change-Id: I2cc18f3b7871dbfa8859e33225fb7c2bb1ccc53b
relocatable roots doesn't handle testr args/opts

Previous fix (4c891b9243985bb95d8beff8affa9db470a1c94a)
changed how the args are parsed but didn't update the logic
for handling testr args/opts. As a result args/opts for testr
where not be properly passed.

This fixes corrects that oversite and now properly parses those
args as well.

Change-Id: I418b0478b2a180e497d041fcab25158c52f44bac
Fixes: #1116942
Add option to allow cross AZ attach configurable

Make check_attach() optionally check if the volume and instance
are in the same availability zone and if cross AZ attach
is configured as not allowed report error.

This does not change the current default behaviour.

DocImpact: Adds a new Nova Config option

Change-Id: Ib0e085888b1c6620869261d87cd964de302accb3
Merge "Canonizes IPv6 before insert it into the db"
Fix script argument parsing.

The vm_vdi_cleaner.py script's argument parsing was broken and unloved.

Change-Id: I1662534d65fd0e8472e092ed9f10d6cc059f1cab