Merge ~zioproto/ubuntu/+source/nova:stable/mitaka into ~ubuntu-server-dev/ubuntu/+source/nova:stable/mitaka

[Saverio Proto]

New upstream point release for OpenStack Mitaka to version 13.1.3

You need also to merge upstream and pristine tar branches

Unmerged commits

36cb999... by Saverio Proto <email address hidden> on 2017-03-01

New upstream point release for OpenStack Mitaka

ad1b293... by Saverio Proto <email address hidden> on 2017-03-01

Merge tag '13.1.3' into stable/mitaka

Upstream version 13.1.3

edef115... by Saverio Proto <email address hidden> on 2017-03-01

Imported Upstream version 13.1.3

diff --git a/AUTHORS b/AUTHORS
index 5589763..99b47d7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -298,6 +298,7 @@ Earle F. Philhower, III <[e-mail]>
 Ed Bak <[e-mail]>
 Ed Leafe <[e-mail]>
 EdLeafe <[e-mail]>
+Edan David <[e-mail]>
 Edgar Magana <[e-mail]>
 Eduardo Costa <[e-mail]>
 Edward Hope-Morley <[e-mail]>
@@ -960,6 +961,7 @@ Tom Cammann <[e-mail]>
 Tom Fifield <[e-mail]>
 Tom Fifield <[e-mail]>
 Tom Hancock <[e-mail]>
+Tom Patzig <[e-mail]>
 Tomi Juvonen <[e-mail]>
 Tomoe Sugihara <[e-mail]>
 Tomofumi Hayashi <[e-mail]>
@@ -1262,6 +1264,7 @@ zhiyanliu <[e-mail]>
 zhiyanliu <[e-mail]>
 zhiyuan_cai <[e-mail]>
 zhoudongshu <[e-mail]>
+zhufl <[e-mail]>
 zte-hanrong <[e-mail]>
 Édouard Thuleau <[e-mail]>
 Édouard Thuleau <[e-mail]>
diff --git a/ChangeLog b/ChangeLog
index 2a027cb..771fc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,25 @@
 CHANGES
 =======
 
+13.1.3
+------
+
+* Ignore deleted services in minimum version calculation
+* Skip test_stamp_pattern in cells v1 job
+* Prepare for using standard python tests
+* Allow None for block_device_mapping_v2.boot_index
+* Fix BDM JSON-Schema validation
+* Use constraints for all tox environments
+* Always use python2.7 for functional tests
+* Imported Translations from Zanata
+* :Add missing %s in print message
+* Do not try to backport when db has older object version
+* Catch DevicePathInUse in attach_volume
+* Fix binary name used in the pci device online migration check
+* Fix error status code on update-volume API
+* Add error handling for delete-volume API
+* refresh instances_path when shared storage used
+
 13.1.2
 ------
 
@@ -10,6 +29,7 @@ CHANGES
 * claims: Do not assume image-meta is a dict
 * Remove network information from IOVisor vif
 * Archive instance-related rows when the parent instance is deleted
+* Add missing slash to dir path
 * Nova shelve creates duplicated images in cells
 * compute: Skip driver detach calls for non local instances
 * Default image.size to 0 when extracting v1 image attributes
@@ -343,7 +363,7 @@ CHANGES
 * Improve 'virt.firewall' conf options documentation
 * config options: Centralise 'virt.firewall' options
 * Improve 'virt.images' conf options documentation
-*  config options: Centralise 'virt.images' options
+* config options: Centralise 'virt.images' options
 * Update wrong comment
 * Fix misuse of assertTrue in console and virt tests
 * Failed migration shoudn't be reported as in progress
@@ -373,7 +393,7 @@ CHANGES
 * RT: Decrese usage for offloaded instances
 * Allow saving empty pci_device_pools in ComputeNode object
 * Add StableObjectJsonFixture and use it in our base test class
-* nova-manage: Add hooks for running  data-migration scripts
+* nova-manage: Add hooks for running data-migration scripts
 * always use pip constraints
 * Update instance host in post live migration even when exception occurs
 * Use imageutils from oslo.utils
@@ -385,7 +405,7 @@ CHANGES
 * Allocate UUID for compute node
 * rpc.init() is being called twice per test
 * Use instance hostname for Neutron DNS unit tests
-* objects: Rename PciDevice _migrate_parent_addr  method
+* objects: Rename PciDevice _migrate_parent_addr method
 * Use assertRaises() to check specific exception
 * libvirt: make live_migration_uri flag dependent on virt_type
 * Remove unused CONF imports
@@ -596,7 +616,7 @@ CHANGES
 * Fix misleading comment of pci_stats
 * cleanup: remove python 2.6 compat assertNotIsInstance
 * Add better help text to scheduler options (3)
-* (lxc) Updated regex to ignore failing tests
+* Updated regex to ignore failing tests
 * Add better help text to scheduler options (2)
 * Add better help text to scheduler options (1)
 * Note in HypervisorSupportMatrix for Libvirt/LXC shutdown kernel bug
@@ -1523,7 +1543,7 @@ CHANGES
 * xenapi: Support extra tgz images that with only a single VHD
 * Hyper-V: Fixes snapshoting inexistent VM issue
 * Hyper-V: Adds RDPConsoleOps unit tests
-*  Rectify spelling mistake in nova
+* Rectify spelling mistake in nova
 * libvirt: Add a finish log
 * Remove old unused baremetal rootwrap filters
 * Relax restrictions on server name
@@ -2581,7 +2601,7 @@ CHANGES
 * libvirt: avoid call of listDefinedDomains when post live migration
 * Remove unused db.aggregate_metadata_get_by_metadata_key() call
 * Removed 'PYTHONHASHSEED=0' from tox.ini
-* Changed logic in _compare_result  api_samples_test_base
+* Changed logic in _compare_result api_samples_test_base
 * Convert bandwidth_usage related timestamp to UTC native datetime
 * Drop use of 'oslo' namespace package
 
@@ -2860,7 +2880,7 @@ CHANGES
 * Neutron: simplify validate_networks
 * Switch to newer cirros image in docs
 * Fix common misspellings
-* Scheduler: update  doctring to use oslo_config
+* Scheduler: update doctring to use oslo_config
 * Skip 'id' attribute to be explicitly deleted in TestCase
 * Remove unused class variables in extended_volumes
 * libvirt: remove volume_drivers config param
@@ -3676,7 +3696,7 @@ CHANGES
 * Fixed incorrect initialization of availability zone tests
 * Revert "initialize objects with context in block device"
 * Fix wrong instructions for rebuilding API samples
-* Performance: leverage  dict comprehension in PEP-0274
+* Performance: leverage dict comprehension in PEP-0274
 * Sync with latest oslo-incubator
 * initialize objects with context in VirtualInterface object tests
 * initialize objects with context in Tag object tests
@@ -3748,7 +3768,7 @@ CHANGES
 * Add WarningsFixture to only emit DeprecationWarning once in a test run
 * Maintain the creation order for vifs
 * Update docstring for wrap_exception decorator
-* Doc:  Adds python-tox to Ubuntu dependencies
+* Doc: Adds python-tox to Ubuntu dependencies
 * Added hacking rule for assertTrue/False(A in B)
 * ironic: use instance object in driver.py
 * Add LibvirtGPFSVolumeDriver class
@@ -4019,7 +4039,7 @@ CHANGES
 * Assert order of DB index members
 * Updated from global requirements
 * object-ify flavors manager side of the RPC
-* Add CPU pinning data to InstanceNUMACell  object
+* Add CPU pinning data to InstanceNUMACell object
 * Enforce unique instance uuid in data model
 * libvirt: Handle empty context on _hard_reboot
 * Move admin_only_action_common out of v3 directory(cleanup)
@@ -4645,7 +4665,7 @@ CHANGES
 * Remove indexes that are prefix subsets of other indexes
 * remove scary error message in tox
 * Cleanup _convert_block_devices
-* Enhance  V2 disk_config extension Unit Test
+* Enhance V2 disk_config extension Unit Test
 * Add developer policy about contractual APIs
 * Reserve 10 migrations for backports
 * libvirt: Make sure volumes are well detected during block migration
@@ -4905,7 +4925,7 @@ CHANGES
 * Ironic: don't canonicalize extra_specs data
 * VMware: add tests for image fetch/cache functions
 * VMware: spawn refactor image fetch/cache
-* Ironic:  Fix direct use of flavor and instance module objects
+* Ironic: Fix direct use of flavor and instance module objects
 * Ironic driver fetches extra_specs when needed
 * Maint: neutronclient exceptions from a more appropriate module
 * Check requirements.txt files for missing (used) requirements
@@ -5657,7 +5677,7 @@ CHANGES
 * VMware: consolidate common constants into one file
 * Require posix_ipc for lockutils
 * hyperv: make method signatures match parent class
-* Format eph disk with  specified format in libvirt
+* Format eph disk with specified format in libvirt
 * Resolve import dependency in consoleauth service
 * Add 'anon' kwarg to FakeDbBlockDeviceDict class
 * Make cells rpc bdm_update_or_create_at_top use BDM objects
@@ -6948,7 +6968,7 @@ CHANGES
 * Make libvirt use Flavor object instead of using VirtAPI
 * Fix instance metadata tracking during resets
 * Make delete_instance_metadata() use objects
-* Break out the meat of the object hydration  process
+* Break out the meat of the object hydration process
 * V2 Pause: treat case when driver does not implement the operation
 * VMware: fix bug for exceptions thrown in _wait_for_task
 * Nova Docker: Metadata service doesn't work
@@ -7330,7 +7350,7 @@ CHANGES
 * Fix interprocess locks when running unit-tests
 * Cleanup object usage in the delete path
 * Change RPC post_live_migration_at_destination from call to cast
-* Pass rbd_user id and conf path  as part of RBD URI for qemu-img
+* Pass rbd_user id and conf path as part of RBD URI for qemu-img
 * Allow some instance polling periodic tasks to hit db slave
 * Sync timeutils from oslo-incubator
 * Catch NotImplementedError for vnc in the api
@@ -8226,7 +8246,7 @@ CHANGES
 * Fixes misuse of assertTrue in virt test scripts
 * Add missing notifications for rescue/unrescue
 * Libvirt: volume driver set correct device type
-* Make v3 API  versions extensions core
+* Make v3 API versions extensions core
 * Make Instance.save() log missing save handlers
 * Don't fail if volume has no image metadata
 * Get image properties instead of the whole image
@@ -9188,7 +9208,7 @@ CHANGES
 * Port multinic extension to v3 API Part 1
 * Port hypervisor API into v3 part2
 * port Instance_usage_audit_log API into v3 part2
-* port Instance_usage_audit_log  API into v3 part1
+* port Instance_usage_audit_log API into v3 part1
 * Fix metadata for create in child cell
 * update xen/vmware virt drivers not to hit db directly
 * Reduce nesting in instance_usage_audit
@@ -9223,7 +9243,7 @@ CHANGES
 * Add tests for `db.console_pool_*()` functions
 * Fix binding of SQL query params in DB utils
 * Make db.fakes stub out API not sqlalchemy
-* Reassign MAC address for vm  when resize_revert
+* Reassign MAC address for vm when resize_revert
 * test_xmlutil.py covers more code in xmlutil.py
 * Handle UnexpectedTaskState and InstanceNotFound exceptions
 * Port quota classes extension to v3 API Part 2
@@ -9366,7 +9386,7 @@ CHANGES
 * Added unit tests for vmware cluster driver
 * Adds expected_errors decorator for API v3
 * Sync oslo-incubator gettextutils
-* port Simple_tenant_usage  API into v3 part1
+* port Simple_tenant_usage API into v3 part1
 * Remove db session hack from conductor's vol_usage_update()
 * Converts scheduler.utils.build_request_spec return to json primitive
 * Revert "Delegate authentication to quantumclient"
@@ -10425,7 +10445,7 @@ CHANGES
 * Fix instance directory path for lxc
 * Add snapshot methods to fakes.py
 * PowerVMDiskAdapter detach/cleanup refactoring
-* Make  ComputeTestCase.test_state_revert faster
+* Make ComputeTestCase.test_state_revert faster
 * Add an extension to show image size
 * libvirt: Use uuid for instance directory name
 * Support running periodic tasks immediately at startup
@@ -10451,7 +10471,7 @@ CHANGES
 * Ensure rpc result is primitive types
 * Change all instances of the non-word "inteface" to "interface"
 * Remove unused nova.db.api:network_get_by_bridge
-* Fix a typo in two comments.  networksa -> networks
+* Fix a typo in two comments. networksa -> networks
 * Live migration with an auto selection of dest
 * Remove unused nova.db.api:network_get_by_instance
 * Fix network list and show with quantum
@@ -11988,7 +12008,7 @@ CHANGES
 * fix unused import
 * Don't include auto_assigned ips in usage
 * Correct IetAdm remove_iscsi_target
-*   Cleanup unused import in manager.py
+* Cleanup unused import in manager.py
 * xapi: fix create hypervisor pool
 * Bump version to 2013.1
 * Add Keypairs extension to API samples test
@@ -12165,7 +12185,7 @@ CHANGES
 * Fix deallocate_fixed_ip invocation
 * fix issues with Nova security groups and Quantum
 * Clear up the .gitignore file
-* Allow for deleting VMs from  down compute nodes
+* Allow for deleting VMs from down compute nodes
 * Update nova-rpc-zmq-receiver to load nova.conf
 * FLAG rename: bandwith_poll_*=>bandwidth_poll_*
 * Spelling: Persistant=>Persistent
@@ -12355,7 +12375,7 @@ CHANGES
 * Implement network association in OS API
 * Fix TypeError conversion in API layer
 * Key requested_networks off of network extension
-*  Key config_drive off of config-drive extension
+* Key config_drive off of config-drive extension
 * Make sure reservations is initialized
 * import module, not type
 * Config drive v2
@@ -12405,7 +12425,7 @@ CHANGES
 * Update devref for general host aggregates
 * Cleanup consoles test cases
 * Return 409 error if get_vnc_console is called before VM is created
-* Move results filtering to  db
+* Move results filtering to db
 * Prohibit file injection writing to host filesystem
 * Added updated locations for iscsiadm
 * Check against unexpected method call
@@ -12668,7 +12688,7 @@ CHANGES
 * Fix error in error handler in instance_usage_audit task
 * Fix SQL deadlock in quota reservations
 * Ensure 413 response for security group over-quota
-* fixes for nova-manage network list  if network has been deleted
+* fixes for nova-manage network list if network has been deleted
 * Allow NoMoreFloatingIps to bubble up to FaultWrapper
 * Fix cloudpipe keypair creation. Add pipelib tests
 * Don't let failure to delete filesystem block deletion of instances in libvirt
@@ -12781,7 +12801,7 @@ CHANGES
 * Fix KeyError 'key_name' when KeyPairExists raised
 * Propagate setup.py change from common
 * Properly name openstack.common.exception
-* Janitorial:  Catch rpc up with a change in common
+* Janitorial: Catch rpc up with a change in common
 * Make reboot work for halted xenapi instances
 * Removed a bunch of cruft files
 * Update common setup code to latest
@@ -12809,6 +12829,10 @@ CHANGES
 * Distinguish over-quota for volume size and number
 * Assign service_catalog in NovaKeystoneContext
 * Fix some hacking violations in the quantum tests
+
+folsom-2
+--------
+
 * Fix missing nova.log change to nova.openstack.common.log
 * Add Cinder Volume API to Nova
 * Modifies ec2/cloud to be able to use Cinder
@@ -12981,7 +13005,7 @@ CHANGES
 * Fixes affinity filters when hints is None
 * implement sql-comment-string stack traces
 * Finalize tox config
-*  Fixes bug lp:999928
+* Fixes bug lp:999928
 * Convert consoles to use instance uuid
 * Use OSError instead of ProcessExecutionError
 * Replace standard json module with openstack.common.jsonutils
@@ -13100,6 +13124,10 @@ CHANGES
 * Remove unused tools/rfc.sh
 * Finish quota refactor
 * Use utils.parse_strtime rather than datetime.strptime
+
+folsom-1
+--------
+
 * Add version to compute rpc API
 * Add version to scheduler rpc API
 * Add version to console rpc API
@@ -13194,7 +13222,7 @@ CHANGES
 * A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process. This configures the xvpvncproxy to configure the RPC drivers properly with FLAGS so that xvpvncproxy can run
 * Fix bug 983206 : _try_convert parsing string
 * pylint cleanup
-* Fix devref  docs
+* Fix devref docs
 * Remove Deprecated AuthMiddleware
 * Allow sitepackages on jenkins
 * Replaces exceptions.Error with NovaException
@@ -13437,7 +13465,7 @@ CHANGES
 * Add validation for OSAPI server name length
 * adjust logging levels for libvirt error conditions
 * Fix exception type in _get_minram_mindisk_params
-* fixed bug lp:968019 ,fix network manager init floating ip  problem
+* fixed bug lp:968019 ,fix network manager init floating ip problem
 * When dnsmasq fails to HUP log an error
 * Update KillFilter to handle 'deleted' exe's
 * Fix disassociate query to remove foreign keys
@@ -13693,7 +13721,7 @@ CHANGES
 * Allows new style config to be used for --flagfile
 * Add support for lxc consoles
 * Fix references to novncproxy_base_url in docs
-* Add  assertRaises check to tools/hacking.py as N202
+* Add assertRaises check to tools/hacking.py as N202
 * fix restructuredtext formatting in docstrings that show up in the developer guide
 * Raise 409 when rescuing instance in RESCUE mode
 * Log a certain rare instance termination exception
@@ -13721,7 +13749,7 @@ CHANGES
 * Use stubout instead of manually stubbing out versions.VERSIONS
 * Remove unused session variable in test setup
 * Cleanup swap in _create_vm undo
-* Do not invoke kill dnsmasq  if no pid file was found
+* Do not invoke kill dnsmasq if no pid file was found
 * Fixes for ec2 images
 * Retry download_vhd with different glance host each time
 * Display error for invalid CIDR
@@ -13734,7 +13762,7 @@ CHANGES
 * Remove unnecessary setting up and down of mox and stubout
 * Remove unnecessary variables from tests
 * Ensure image status filter matches glance format
-* fix for bug 821252.  Smarter default scheduler
+* fix for bug 821252. Smarter default scheduler
 * blueprint sphinx-doc-cleanup bug 944381
 * Adds soft-reboot support to libvirt
 * Minor cleanup based on HACKING
@@ -13810,12 +13838,12 @@ CHANGES
 * Fixes error if Melange returns no networks
 * Print error if nova-manage should be run as root
 * Don't delete security group in use from OS API
-* nova-network can't deallocate ips from deleted  instances
+* nova-network can't deallocate ips from deleted instances
 * Making link prefixes support https
 * Prevent infinite loop in PublishErrorsHandler
 * blueprint host-aggregates: host maintenance - xenapi implementation
 * bug 939480
-* libvirt vif-plugging fixes.  Fixes bug 939252 , bug 939254
+* libvirt vif-plugging fixes. Fixes bug 939252 , bug 939254
 * Speeding up resize down with sparse_copy
 * Remove network_api fallback for info_cache from APIs
 * Improve unit test coverage per bug/934566
@@ -13917,7 +13945,7 @@ CHANGES
 * Fix the description of the --vnc_enabled option
 * Different exit code in new versions of iscsiadm
 * improve injection diagnostics when nbd unavailable. Bug 755854
-*  remove unused nwfilter methods and tests
+* remove unused nwfilter methods and tests
 * LOG.exception only works while in an exception handler
 * _() works best with string literals
 * Remove unnecessary constructors for exceptions
@@ -13949,7 +13977,7 @@ CHANGES
 * bug 931356: nova-manage prints libvirt related warnings if libvirt isn't installed
 * Make melange_port an integer
 * remove a private duplicate function
-* Changes for supporting fast cloning on Xenserver. Implements blueprint fast-cloning-for-xenserver 	1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 	2. image-id is used to tag an image which has already been streamed from glance. 	3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 	4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 	5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 	6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 	7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 	8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host
+* Changes for supporting fast cloning on Xenserver. Implements blueprint fast-cloning-for-xenserver 1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 2. image-id is used to tag an image which has already been streamed from glance. 3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host
 * Completes fix for LP #928910 - libvirt performance
 * Add some more comments to _get_my_ip()
 * remove unused and buggy function from S3ImageService
@@ -14524,7 +14552,7 @@ CHANGES
 * Adds missing image_meta to rescue's spawn() calls
 * Bug #898290: iSCSI volume backend treats FLAGS.host as a hostname
 * split rxtx_factor into network and instance_type
-* Fixing get_info method implementations in virt drivers to accept instance_name instead of instance_id. The abstract class virt.ComputeDriver defines get_info as:     def get_info(self, instance_name). blueprint: internal-uuids
+* Fixing get_info method implementations in virt drivers to accept instance_name instead of instance_id. The abstract class virt.ComputeDriver defines get_info as: def get_info(self, instance_name). blueprint: internal-uuids
 * Fixes bug 767947
 * Remove unused ec2.action_args
 * Fix typo: priviledges -> privileges
@@ -14652,6 +14680,10 @@ CHANGES
 * Converting resize to use instance objects
 * Converting reboot to use instance objects
 * Reducing the number of compute calls to Glance
+
+essex-1
+-------
+
 * Remove duplicate method (2)
 * Move tests for extensions to contrib directory
 * Remove duplicate method
@@ -14911,7 +14943,7 @@ CHANGES
 * merge from trunk
 * convert images that are not 'raw' to 'raw' during caching to node
 * show swap in Mb in nova manage
-* Address Soren's comments:  * clean up temp files if an ImageUnacceptable is going to be raised    Note, a qemu-img execution error will not clean up the image, but I    think thats reasonable.  We leave the image on disk so the user can    easily investigate.  * Change final 2 arguments to fetch_to_raw to not start with an _  * use 'env' utility to change environment variables LC_ALL and LANG so    that qemu-img output parsing is not locale dependent.    Note, I considered the following, but found using 'env' more readable      out, err = utils.execute('sh', '-c', 'export LC_ALL=C LANG=C && exec "$@"',          'qemu-img', 'info', path)
+* Address Soren's comments: * clean up temp files if an ImageUnacceptable is going to be raised Note, a qemu-img execution error will not clean up the image, but I think thats reasonable. We leave the image on disk so the user can easily investigate. * Change final 2 arguments to fetch_to_raw to not start with an _ * use 'env' utility to change environment variables LC_ALL and LANG so that qemu-img output parsing is not locale dependent. Note, I considered the following, but found using 'env' more readable out, err = utils.execute('sh', '-c', 'export LC_ALL=C LANG=C && exec "$@"', 'qemu-img', 'info', path)
 * Add iptables filter rules for dnsmasq (lp:844935)
 * create disk.local the same way ephemerals are created (LP: #851145)
 * merge with trunk r1601
@@ -14925,7 +14957,7 @@ CHANGES
 * Update migration 047 to dynamically lookup the name of the instance_id fkey before dropping it. We can't hard code the name of the fkey since we didn't name it explicitly on create
 * oops, add project_id and 'servers' to next links
 * Fixes migration for Mysql to drop the FK on the right table
-* Reverted some changes to instance_get_all_by_filters() that was added in rev 1594.  An additional argument for filtering on instance uuids is not needed, as you can add 'uuid: uuid_list' into the filters dictionary.  Just needed to add 'uuid' as an exact_match_filter.  This restores the filtering to do a single DB query
+* Reverted some changes to instance_get_all_by_filters() that was added in rev 1594. An additional argument for filtering on instance uuids is not needed, as you can add 'uuid: uuid_list' into the filters dictionary. Just needed to add 'uuid' as an exact_match_filter. This restores the filtering to do a single DB query
 * fix syntax error in exception, remove "Dangerous!" comment
 * merged trunk and resolved conflict
 * run the alter on the right table
@@ -14940,7 +14972,7 @@ CHANGES
 * convert images that are not 'raw' to 'raw' during caching to node
 * now raising instead of setting bridge to br100 and warning as was noted
 * * Remove the foreign key and backrefs tying vif<->instance * Update instance filtering to pass ip related filters to the network manager * move/update tests
-* Adds an optional flag to force dhcp releases on instance termination.  This allows ips to be reused without having to wait for the lease to timeout
+* Adds an optional flag to force dhcp releases on instance termination. This allows ips to be reused without having to wait for the lease to timeout
 * remove urllib import
 * Fixing case where OSAPI server create would return 500 on malformed body
 * Fix the issue with the new dnsmasq where it tries and fails to bind to ipv6 addresses
@@ -14956,7 +14988,7 @@ CHANGES
 * merge the sknurt
 * remove the polymorph
 * Fix typo in comment
-* Fixes the handling of snapshotting in libvirt driver to actually use the proper image type instead of using raw for everything. Also cleans up an unneeded flag.  Based on doude's initial work
+* Fixes the handling of snapshotting in libvirt driver to actually use the proper image type instead of using raw for everything. Also cleans up an unneeded flag. Based on doude's initial work
 * merge with trunk
 * removing extra newline
 * catching AttributeError and adding tests
@@ -14990,7 +15022,7 @@ CHANGES
 * Only log migration info if they exist
 * remove getting fixed_ips directly from the db
 * removed unused import
-* Fixes libvirt rescue to use the same strategy as xen.  Use a new copy of the base image as the rescue image.  It leaves the original rescue image flags in, so a hand picked rescue image can still be used if desired
+* Fixes libvirt rescue to use the same strategy as xen. Use a new copy of the base image as the rescue image. It leaves the original rescue image flags in, so a hand picked rescue image can still be used if desired
 * Fixing tests, PEP8 failures
 * fix permissions
 * Add a FakeVirDomainSnapshot and return it from snapshotCreateXML. Fixes libvirt snapshot tests
@@ -15067,7 +15099,7 @@ CHANGES
 * merge trunk
 * write out xml for rescue
 * fix up the filtering so it does not return duplicates if both the network and the db filters match
-* fix rescue to use the base image, reset firewall rules,  and accept network_info
+* fix rescue to use the base image, reset firewall rules, and accept network_info
 * make sure to pass in the context
 * move the FakeNetworkManager into fake_network
 * Fix issue where floating ips don't get recreated when a network host reboots
@@ -15133,7 +15165,7 @@ CHANGES
 * Fix instance rebooting (lp847604) by correcting a malformed cast in compute.api and an incorrect method signature in the libvirt driver
 * Fix mismerge
 * make tests pass
-* This patch teaches virt/libvirt how to format filesystem on ephemeral device depending on os_type so that the behaviour matches with EC2's. Such behaviour isn't explicitly described in the documentation, but it is confirmed by checking realy EC2 instances.  This patch introduces options virt_mkfs as multistring. Its format is --virt_mkfs=<os_type>=<mkfs command> When creating ephemeral device, format it according to the option depending on os_type.  This addresses the bugs, https://bugs.launchpad.net/nova/+bug/827598 https://bugs.launchpad.net/nova/+bug/828357
+* This patch teaches virt/libvirt how to format filesystem on ephemeral device depending on os_type so that the behaviour matches with EC2's. Such behaviour isn't explicitly described in the documentation, but it is confirmed by checking realy EC2 instances. This patch introduces options virt_mkfs as multistring. Its format is --virt_mkfs=<os_type>=<mkfs command> When creating ephemeral device, format it according to the option depending on os_type. This addresses the bugs, https://bugs.launchpad.net/nova/+bug/827598 https://bugs.launchpad.net/nova/+bug/828357
 * Test new vendor content types as well
 * Only allow up to 15 chars for a Windows hostname
 * Split accept tests to better match the name of the test
@@ -15198,7 +15230,7 @@ CHANGES
 * api/ec2: make get_metadata() return correct mappings
 * virt/libvirt: format ephemeral device and add fs label when formating ext3 fs
 * Fix spelling mistake
-* Stock zones follows a fill-first methodology—the current zone is filled with instances before other zones are considered.  This adds a flag to nova to select a spread-first methodology.  The implementation is simply adding a random.shuffle() prior to sorting the list of potential compute hosts by weights
+* Stock zones follows a fill-first methodology—the current zone is filled with instances before other zones are considered. This adds a flag to nova to select a spread-first methodology. The implementation is simply adding a random.shuffle() prior to sorting the list of potential compute hosts by weights
 * Pass reboot_type (either HARD or SOFT) to the virt layers from the API
 * merging trunk
 * fixing image status mapping
@@ -15237,7 +15269,7 @@ CHANGES
 * First pass at adding reboot_type to reboot codepath
 * child zone queries working with keystone now
 * Added docstring to explain usage of reserved keyword argument
-* One more bug fix to make zones work in trunk.  Basic problem is that in novaclient using the 1.0 OSAPI, servers.create() takes an ipgroups argument, but when using the 1.1 OSAPI, it doesn't, which means booting instances in child zones won't work with OSAPI v1.0.  This fix works around that by using keyword arguments for all the arguments after the flavor, and dropping the unused ipgroups argument
+* One more bug fix to make zones work in trunk. Basic problem is that in novaclient using the 1.0 OSAPI, servers.create() takes an ipgroups argument, but when using the 1.1 OSAPI, it doesn't, which means booting instances in child zones won't work with OSAPI v1.0. This fix works around that by using keyword arguments for all the arguments after the flavor, and dropping the unused ipgroups argument
 * Fixes the reroute_compute decorator in the scheduler API so that it properly:
 * make check for fixed_ip association more defensive
 * Fix lp:844155
@@ -15267,7 +15299,7 @@ CHANGES
 * typo trying to raise InstanceNotFound when all zones returned nothing
 * create a new exception ZoneRequestError to use for returning errors when zone requests couldn't complete
 * pep8 fix for tests/api/openstack/test_servers.py which is an issue in trunk
-* catch exceptions from novaclient when talking to child zones.  store them and re-raise if no other child zones return any results.  If no exceptions are raised but no results are returned, raise a NotFound exception
+* catch exceptions from novaclient when talking to child zones. store them and re-raise if no other child zones return any results. If no exceptions are raised but no results are returned, raise a NotFound exception
 * added test to cover case where no local hosts are available but child hosts are
 * remove the short circuit in abstract scheduler when no local hosts are available
 * fix for lp844364: improve check for fixed_ip association
@@ -15304,7 +15336,7 @@ CHANGES
 * Added use_single_default_gateway to switch from multiple default gateways to single default gateway
 * Fixed unit test
 * reverting change to GlanceImageService._is_image_available
-* At present, the os servers.detail api does not return server.user_id or server.tenant_id.  This is problematic, since the servers.detail api defaults to returning all servers for all users of a tenant, which makes it impossible to tell which user is associated with which server
+* At present, the os servers.detail api does not return server.user_id or server.tenant_id. This is problematic, since the servers.detail api defaults to returning all servers for all users of a tenant, which makes it impossible to tell which user is associated with which server
 * reverting xenapi change
 * Micro-fix; "exception" was misspelled as "exceptions"
 * Fix a misspelling of "exception"
@@ -15349,7 +15381,7 @@ CHANGES
 * removed unneeded import
 * rick nits
 * alex meade issues
-* Added list of security groups to the newly added extension (Createserverext)  for the Create Server and Get Server detail responses
+* Added list of security groups to the newly added extension (Createserverext) for the Create Server and Get Server detail responses
 * default description to name
 * use 'qemu-image resize' rather than 'truncate' to grow image files
 * remove extra description stuff
@@ -15362,7 +15394,7 @@ CHANGES
 * move networks declarations within upgrade/downgrade methods
 * more review cleanup
 * remove import of 'fake' from nova manager, now that we've moved that to test_quantum.py
-* Fixes a small bug which causes filters to not work at all.  Also reworks a bit of exception handling to allow the exception related to the bug to propagate up
+* Fixes a small bug which causes filters to not work at all. Also reworks a bit of exception handling to allow the exception related to the bug to propagate up
 * Email error again. Tired
 * Email error
 * Fixed review comments
@@ -15410,7 +15442,7 @@ CHANGES
 * typo
 * more review cleanup
 * another commit from brad
-* add specific exceptions for quantum client.  Fix doc-strings in client.py
+* add specific exceptions for quantum client. Fix doc-strings in client.py
 * merge brad's changes that address most review feedback
 * fix for lp838583 - fixes bug in os-floating-ips view code that prevents instance_id from being returned for associated addresses
 * Accept keypair when you launch a new server. These properties would be stored along with the other server properties in the database (like they are currently for ec2 api)
@@ -15425,7 +15457,7 @@ CHANGES
 * Add comment for an uncommon failure case that we need to fix
 * Fix for LP Bug #838466
 * Correctly yield images from glance client through image service
-* Simple usage extension for nova.  Uses db to calculate tenant_usage for specified time periods
+* Simple usage extension for nova. Uses db to calculate tenant_usage for specified time periods
 * Fix for LP Bug #838251
 * merge trunk, fix conflict
 * Validates that user-data is b64 encoded
@@ -15436,8 +15468,8 @@ CHANGES
 * Updating test for <choices> xml to use lxml
 * expect key_name attribute in 1.1
 * change to use _get_key_name to retrieve the key
-* Implements lp:798876 which is 'switch carrot to kombu'.  Leaves carrot as the default for now... decision will be made later to switch the default to kombu after further testing.  There's a lot of code duplication between carrot and kombu, but I left it that way in preparation for ripping carrot out later and to keep minimal changes to carrot
-* Disassociated previously associated floating ips when calling network_api.associate_floating_ip.  Also guard against double-association in the network.manager
+* Implements lp:798876 which is 'switch carrot to kombu'. Leaves carrot as the default for now... decision will be made later to switch the default to kombu after further testing. There's a lot of code duplication between carrot and kombu, but I left it that way in preparation for ripping carrot out later and to keep minimal changes to carrot
+* Disassociated previously associated floating ips when calling network_api.associate_floating_ip. Also guard against double-association in the network.manager
 * adding support for limiting in image service; updating tests with fixture ids and marker support
 * trunk merge
 * merging trunk
@@ -15466,7 +15498,7 @@ CHANGES
 * Removed debug messages
 * Fix for LP Bug #837534
 * add kombu to pip-requires and contrib/nova.sh
-* restore old way FLAGS.rpc_backend worked..  no short name support for consistency
+* restore old way FLAGS.rpc_backend worked.. no short name support for consistency
 * fix remaining tests
 * Update RequestContext so that it correctly sets self.is_admin from the roles array. Additionally add a bit of code to ignore case as well
 * pep8, fix fakes
@@ -15506,15 +15538,15 @@ CHANGES
 * Removed test_parallel_builds
 * Merged trunk
 * Increased migration number
-* Fixes lp:813864 by removing the broken assert.  The assert was a check for isinstance of 'int' that should have been 'long'.  But it doesn't appear this assert really belongs, anyway
+* Fixes lp:813864 by removing the broken assert. The assert was a check for isinstance of 'int' that should have been 'long'. But it doesn't appear this assert really belongs, anyway
 * Merged trunk
 * Adds assertIn and assertNotIn support to TestCase for compatibility with python 2.6 This is a very minimal addition which doesn't require unittest2
 * support the extra optional arguments for msg to assertIn and assertNotIn
 * removed broken assert for abstract_scheduler
 * pep8 fixes
-* fix for assertIn and assertNotIn use which was added in python 2.7.  this makes things work on 2.6 still
+* fix for assertIn and assertNotIn use which was added in python 2.7. this makes things work on 2.6 still
 * merge trunk
-* restore fixed_ip_associate_pool in nova/db/sqlalchemy.py to its original form before this branch.  Figured out how to make unit tests pass without requiring that this function changes
+* restore fixed_ip_associate_pool in nova/db/sqlalchemy.py to its original form before this branch. Figured out how to make unit tests pass without requiring that this function changes
 * remove unused rpc connections in test_cloud and test_adminapi
 * carrot consumer thread fix
 * add carrot/kombu tests... small thread fix for kombu
@@ -15527,10 +15559,10 @@ CHANGES
 * always set network_id in virtual_interfaces table, otherwise API commands that show IP addresses get confused
 * start to rework some consumer stuff
 * update melange ipam lib to use network uuid, not bridge
-* fix issue with setting 'Active' caused by Quantum API changes.  Other misc fixes
+* fix issue with setting 'Active' caused by Quantum API changes. Other misc fixes
 * Bug #835952: pep8 failures do not cause the tests to fail
 * Start domid's at 1, not 0, to avoid any confusion with dom0
-* use 'uuid' field in networks table rather than 'bridge'.  Specify project_id when creating instance in unit test
+* use 'uuid' field in networks table rather than 'bridge'. Specify project_id when creating instance in unit test
 * Bug #835964: pep8 violations in IPv6 code
 * In the XenAPI simulator, set VM.domid, when creating the instance initially, and when starting the VM
 * Bug #835952: pep8 failures do not cause the tests to fail
@@ -15591,7 +15623,7 @@ CHANGES
 * Just a couple of small changes I needed to get the migrations working with SQLAlchemy 0.7.x on Fedora 16
 * Minor fixes
 * check log file's mode prior to calling chmod
-* The fix for run_iscsiadm in rev 1489 changed the call to use a tuple because values were being passed as tuples.  Unfortunately a few calls to the method were still passing strings
+* The fix for run_iscsiadm in rev 1489 changed the call to use a tuple because values were being passed as tuples. Unfortunately a few calls to the method were still passing strings
 * Add a set of generic tests for the virt drivers. Update a bit of documentation to match reality
 * updated LimitsXMLSerializer to use etree and supply the xml declaration
 * merge underlying fix for testing
@@ -15725,7 +15757,7 @@ CHANGES
 * Merged from upstream
 * Fixed some pep8 and pylint issues
 * Forgot to set the flag for the test
-* I added notifications  decorator for each API call using monkey_patching. By this merge, users can get API call notification from any modules
+* I added notifications decorator for each API call using monkey_patching. By this merge, users can get API call notification from any modules
 * Fixes bug that causes 400 status code when an instance wasn't attached to a network
 * fix for rc generation using noauth
 * Fixed doc string
@@ -15777,7 +15809,7 @@ CHANGES
 * Added Test Code, doc string, and fixed pip-requiresw
 * Merged trunk
 * Ensure that reserve and unreserve exit when an address is not found
-* Simple usage extension for nova.  Uses db to calculate tenant_usage for specified time periods
+* Simple usage extension for nova. Uses db to calculate tenant_usage for specified time periods
 * Stubbed out the database in order to improve tests
 * logging as exception rather than error
 * Merged from upstream
@@ -15826,7 +15858,7 @@ CHANGES
 * pep8
 * improve test coverage for instance types / flavors
 * Launchpad automatic translations update
-* Assorted fixes to os-floating-ips to make it play nicely with an in-progress novaclient implementation, as well as some changes to make it more consistent with other os rest apis.  Changes include:
+* Assorted fixes to os-floating-ips to make it play nicely with an in-progress novaclient implementation, as well as some changes to make it more consistent with other os rest apis. Changes include:
 * finished fake network info, removed testing shims
 * updated a maths
 * updated a maths
@@ -15855,7 +15887,7 @@ CHANGES
 * tweak to comment
 * Merged with trunkw
 * a few tweaks - remove unused member functions, add comment
-* incorporate feedback from brian waldon and brian lamar.  Move associate/disassociate to server actions
+* incorporate feedback from brian waldon and brian lamar. Move associate/disassociate to server actions
 * merge from trunk
 * pep8
 * Finished changing ServerXMLSerializationTest to use XML validation and lxml
@@ -15866,7 +15898,7 @@ CHANGES
 * merge from trunk
 * Removes the incorrect hard-coded filter path
 * Revert irrelevant changes that accidentally crept into this patch :(
-* add tenant_id to api.  without tenant_id, admins can't tell which servers belong to which tenants when retrieving lists
+* add tenant_id to api. without tenant_id, admins can't tell which servers belong to which tenants when retrieving lists
 * Merged from trunk
 * Fixes primitive with builtins, modules, etc
 * fix test_virtual interfaces for tenant_id stuff
@@ -15881,17 +15913,17 @@ CHANGES
 * Bump migration number
 * pep8
 * Start improving documentation
-* Added uuid column in virtual_interfaces table, and an OpenStack extension API for virtual interfaces to expose these IDs.  Also set this UUID as one of the external IDs in the OVS vif driver
+* Added uuid column in virtual_interfaces table, and an OpenStack extension API for virtual interfaces to expose these IDs. Also set this UUID as one of the external IDs in the OVS vif driver
 * Move documentation from nova.virt.fake to nova.virt.driver
 * add key_name/data support to server stub
-* add user_id and description.  without user_id, there is no way for a tenant to tell which user created the server.  description should be added for ec2 parity
+* add user_id and description. without user_id, there is no way for a tenant to tell which user created the server. description should be added for ec2 parity
 * merge
-* Bugfix for lp 828429.  Its still not clear to me exactly how this code path is actually invoked when nova is used, so I'm looking for input on whether we should be adding a test case for this, removing the code as unused, etc.  Thanks
+* Bugfix for lp 828429. Its still not clear to me exactly how this code path is actually invoked when nova is used, so I'm looking for input on whether we should be adding a test case for this, removing the code as unused, etc. Thanks
 * remove security groups, improve exception handling, add tests
 * Merged trunk
 * merged trunk
 * Currently, rescue/unrescue is only available over the admin API. Non-admin tenants also need to be able to access this functionality. This patch adds rescue functionality over an API extension
-* Makes all of the binary services launch using the same strategy.  * Removes helper methods from utils for loading flags and logging  * Changes service.serve to use Launcher  * Changes service.wait to actually wait for all the services to exit  * Changes nova-api to explicitly load flags and logging and use service.serve  * Fixes the annoying IOError when /etc/nova/nova.conf doesn't exist
+* Makes all of the binary services launch using the same strategy. * Removes helper methods from utils for loading flags and logging * Changes service.serve to use Launcher * Changes service.wait to actually wait for all the services to exit * Changes nova-api to explicitly load flags and logging and use service.serve * Fixes the annoying IOError when /etc/nova/nova.conf doesn't exist
 * tests pass
 * Fixes issue where ServersXMLSerializer was missing a method for update actions
 * follow same pattern as userdata (not metadata apporach)
@@ -15905,7 +15937,7 @@ CHANGES
 * Fixes lp828207
 * Added unit test
 * allow specification of key pair/security group info via metadata
-* Fixed bug in which DescribeInstances was returning deleted instances.  Added tests for pertinent api methods
+* Fixed bug in which DescribeInstances was returning deleted instances. Added tests for pertinent api methods
 * Accept binary user_data in radix-64 format when you launch a new server using OSAPI. This user_data would be stored along with the other server properties in the database. Once the VM instance boots you can query for the user-data to do any custom installation of applications/servers or do some specific job like setting up networking route table
 * added unittests for volume_extra_data
 * Removed extra parameter from the call to _provision_resource_locally()
@@ -16007,7 +16039,7 @@ CHANGES
 * Resolved conflicts and merged with trunk
 * Added uuid for networks and made changes to the Create server API format to accept network as uuid instead of id
 * I'm taking Thierry at his word that I should merge early and merge often :)
-* Fixes issue with exceptions getting eaten in image/s3.py if there is a failure during register.  The variables referenced with locals() were actually out of scope
+* Fixes issue with exceptions getting eaten in image/s3.py if there is a failure during register. The variables referenced with locals() were actually out of scope
 * Allow local_gb size to be 0. libvirt uses local_gb as a secondary drive, but XenServer uses it as the root partition's size. Now we support both
 * Merged trunk
 * merge from trunk
@@ -16073,7 +16105,7 @@ CHANGES
 * fix typo where I forgot a comma
 * merge trunk, remove _validate_cidrs and replace functionality with a double for loop
 * fix bug which DescribeInstances in EC2 api was returning deleted instances
-* We don't have source for open-wrt in the source tree, so we shouldn't use the images.  Since the images are only there for uploading smoketests, They are now replaced with random images
+* We don't have source for open-wrt in the source tree, so we shouldn't use the images. Since the images are only there for uploading smoketests, They are now replaced with random images
 * Make response structure for list floating ips conform with rest of openstack api
 * put tenant_id back in places where it was
 * This branch allows the standard inclusion of a body param which most http clients will send along with a POST request
@@ -16095,16 +16127,16 @@ CHANGES
 * Dryed up contructors
 * make list response for floating ip match other apis
 * fix missing 'run_as_root' from bad merge
-* Added ability too boot VM from install ISO.  System detects an image of type iso.  Images is streamed to a VDI and mounted to the VM.  Blank disk allocated to VM based on instance type
+* Added ability too boot VM from install ISO. System detects an image of type iso. Images is streamed to a VDI and mounted to the VM. Blank disk allocated to VM based on instance type
 * Add source-group filtering
-* added logic to make the creation of networks (IPv4 only) validation a bit smarter:   - detects if the cidr is already in use   - detects if any existing smaller networks are within the range of requested cidr(s)   - detects if splitting a supernet into # of num_networks && network_size will fit   - detects if requested cidr(s) are within range of already existing supernet (larger cidr)
-*   fix InvalidPortRange exception shows up in euca2ools  instead of UnknownError when euca-authorize is specified w/ invalid port #
+* added logic to make the creation of networks (IPv4 only) validation a bit smarter: - detects if the cidr is already in use - detects if any existing smaller networks are within the range of requested cidr(s) - detects if splitting a supernet into # of num_networks && network_size will fit - detects if requested cidr(s) are within range of already existing supernet (larger cidr)
+* fix InvalidPortRange exception shows up in euca2ools instead of UnknownError when euca-authorize is specified w/ invalid port #
 * Changes requests with an invalid server action to return an HTTP 400 instead of a 501
 * Currently OS API doesn't accept availability zone parameter so there is no way to instruct scheduler (SimpleScheduler) to launch VM instance on specific host of specified zone
 * typo fix
 * Fix v1.1 /servers/<id> PUT request to match API documentation by returning 200 code and the server data in the body
 * Allow different schedulers for compute and volume
-* have NetworkManager generate MAC address and pass it to the driver for plugging.  Sets the stage for being able to do duplicate checks on those MACs as well
+* have NetworkManager generate MAC address and pass it to the driver for plugging. Sets the stage for being able to do duplicate checks on those MACs as well
 * make sure security groups come back on restart of nova-compute
 * fix all of the tests
 * rename project_net to same_net
@@ -16157,9 +16189,9 @@ CHANGES
 * Merged trunk
 * start of day
 * Fixes to the OSAPI floating API extension DELETE. Updated to use correct args for self.disassociate (don't sweep exceptions which should cause test cases to fail under the rug). Additionally updated to pass network_api.release_floating_ip the address instead of a dict
-* API needs virtual_interfaces.instance joined when pulling instances from the DB.  Updated instance_get_all() to match instance_get_all_by_filters() even though the former is only used by nova-manage now.  (The latter is used by the API)
+* API needs virtual_interfaces.instance joined when pulling instances from the DB. Updated instance_get_all() to match instance_get_all_by_filters() even though the former is only used by nova-manage now. (The latter is used by the API)
 * remove extra log statements
-* join virtual_interfaces.instance for DB queries for instances.  updates instance_get_all to match instance_get_all_by_filters
+* join virtual_interfaces.instance for DB queries for instances. updates instance_get_all to match instance_get_all_by_filters
 * remove accidentally duplicated flag
 * merged trunk
 * add keystone middlewares for ec2 api
@@ -16226,7 +16258,7 @@ CHANGES
 * added project_id for flavors requests links
 * added project_id for images requests
 * merge trunk
-* fix so that the exception shows up in euca2ools  instead of UnknownError
+* fix so that the exception shows up in euca2ools instead of UnknownError
 * Dropped vsa_id from instances
 * import formatting - thx
 * List security groups project wise for admin users same as other users
@@ -16327,10 +16359,10 @@ CHANGES
 * Added possibility to mark fixed ip like reserved and unreserved
 * Update the OSAPI v1.1 server 'createImage' and 'createBackup' actions to limit the number of image metadata items based on the configured quota.allowed_metadata_items that is set
 * Pep8 fix
-* zone_aware_scheduler classes couldn't build instances due to a change to compute api's create_db_entry_for_new_instance call.  now passing image argument down to the scheduler and through to the call.  updated a existing test to cover this
+* zone_aware_scheduler classes couldn't build instances due to a change to compute api's create_db_entry_for_new_instance call. now passing image argument down to the scheduler and through to the call. updated a existing test to cover this
 * Adding check to stub method
 * moving try/except block, and changing syntax of except statement
-* Fixes broken image_convert.  The context being passed to glance image service was not a real context
+* Fixes broken image_convert. The context being passed to glance image service was not a real context
 * Using decorator for snapshots enabled check
 * Disable flag for V1 Openstack API
 * adding logging to exception in delete method
@@ -16374,10 +16406,10 @@ CHANGES
 * Add run_as_root parameter to utils.execute, uses new sudo_helper FLAG to prefix command
 * Remove spurious direct use of subprocess
 * Added virtual interfaces REST API extension controller
-* Trunk contained PEP8 errors.  Fixed
+* Trunk contained PEP8 errors. Fixed
 * Trunk merge
 * fix mismerge
-* Added migration to add uuid to virtual interfaces.  Added uuid column to models
+* Added migration to add uuid to virtual interfaces. Added uuid column to models
 * merged trunk
 * merged with nova trunk
 * Launchpad automatic translations update
@@ -16387,22 +16419,22 @@ CHANGES
 * tests and merge with trunk
 * removed redundant logic
 * merged trunk
-* For nova-manage network create cmd, added warning when size of subnet(s) being created are larger than FLAG.network_size,  in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why
+* For nova-manage network create cmd, added warning when size of subnet(s) being created are larger than FLAG.network_size, in attempt to alleviate confusion. For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why
 * Remove instances of the "diaper pattern"
 * Read response to reset the connection state-machine for the next request/response cycle
 * Added explanations to exceptions and cleaned up reboot types
 * fix pep8 issues
-* fixed bug , when logic searched for next avail cidr it would return cidrs that were out of range of original requested cidr block.  added test for it
+* fixed bug , when logic searched for next avail cidr it would return cidrs that were out of range of original requested cidr block. added test for it
 * Adding missing module xmlutil
 * fixed bug, wasn't detecting smaller subnet conflict properly added test for it
 * Properly format mapping['dns'] before handing off to template for injection (Fixes LP Bug #821203)
 * Read response to reset HTTPConnection state machine
 * removed unnecessary context from test I had left there from prior
 * move ensure_vlan_bridge,ensure_bridge,ensure_vlan to the bridge/vlan specific vif-plugging driver
-* re-integrated my changes after merging trunk.  fixed some pep8 issues.  sorting the list of cidrs to create, so that it will create x.x.0.0 with a lower 'id' than x.x.1.0 (as an example).  <- was causing libvirtd test to fail
+* re-integrated my changes after merging trunk. fixed some pep8 issues. sorting the list of cidrs to create, so that it will create x.x.0.0 with a lower 'id' than x.x.1.0 (as an example). <- was causing libvirtd test to fail
 * Revert migration now finishes
 * The OSAPI v1.0 image create POST request should store the instance_id as a Glance property
-* There was a recent change to how we should flip FLAGS in tests, but not all tests were fixed.  This covers the rest of them.  I also added a method to test.UnitTest so that FLAGS.verbose can be set.  This removes the need for flags to be imported from a lot of tests
+* There was a recent change to how we should flip FLAGS in tests, but not all tests were fixed. This covers the rest of them. I also added a method to test.UnitTest so that FLAGS.verbose can be set. This removes the need for flags to be imported from a lot of tests
 * Bad method call
 * Forgot the instance_id parameter in the finish call
 * Merged in the power action changes
@@ -16507,7 +16539,7 @@ CHANGES
 * Use flavorid only at the API level and use instance_type_id internally
 * Yet another conflict resolved
 * forgot to remove comment
-* updated to work w/ changes after merged trunk fixing var renaming.  the logic which forces default to FLAGS.network_size if requested cidr was larger, was also applying to requested cidrs smaller than FLAGS.network_size.   Requested cidrs smaller than FLAGS.network_size should be ignored and not overriden
+* updated to work w/ changes after merged trunk fixing var renaming. the logic which forces default to FLAGS.network_size if requested cidr was larger, was also applying to requested cidrs smaller than FLAGS.network_size. Requested cidrs smaller than FLAGS.network_size should be ignored and not overriden
 * merged from trunk
 * merged from trunk
 * merge trunk
@@ -16526,7 +16558,7 @@ CHANGES
 * Merged trunk
 * Add support for 300 Multiple Choice responses when no version identifier is used in the URI (or no version header is present)
 * Merged trunk
-* Glance has been updated for integration with keystone.  That means that nova needs to forward the user's credentials (the auth token) when it uses the glance API.  This patch, combined with a forth-coming patch for nova_auth_token.py in keystone, establishes that for nova itself and for xenapi; other hypervisors will need to set up the appropriate hooks for their use of glance
+* Glance has been updated for integration with keystone. That means that nova needs to forward the user's credentials (the auth token) when it uses the glance API. This patch, combined with a forth-coming patch for nova_auth_token.py in keystone, establishes that for nova itself and for xenapi; other hypervisors will need to set up the appropriate hooks for their use of glance
 * Added changes from mini server
 * raise correct error
 * Minor test fixes
@@ -16566,10 +16598,10 @@ CHANGES
 * fixing method naming problem
 * removing compute monitor
 * merge from trunk
-* code was checking for key in sqlalchemy instance and will ignore if value is None, but wasn't working if floating_ip was a non-sqlalchemy dict obj.  Therefore, updated the error checking to work in both caes
+* code was checking for key in sqlalchemy instance and will ignore if value is None, but wasn't working if floating_ip was a non-sqlalchemy dict obj. Therefore, updated the error checking to work in both caes
 * While we currently trap JSON encoding exceptions and bail out, for error notification it's more important that *some* form of the message gets out. So, we take complex notification payloads and convert them to something we know can be expressed in JSON
 * Better error handling for resizing
-* Adds the auth token to nova's RequestContext.  This will allow for delegation, i.e., use of a nova user's credentials when accessing other services such as glance, or perhaps for zones
+* Adds the auth token to nova's RequestContext. This will allow for delegation, i.e., use of a nova user's credentials when accessing other services such as glance, or perhaps for zones
 * merged trunk rev1348
 * Launchpad automatic translations update
 * added some tests for network create & moved the ipv6 logic back into the function
@@ -16621,14 +16653,14 @@ CHANGES
 * merge trunk
 * stwart the switch to just fixed_range
 * typo
-* Round 1 of changes for keystone integration.  * Modified request context to allow it to hold all of the relevant data from the auth component.  * Pulled out access to AuthManager from as many places as possible  * Massive cleanup of unit tests  * Made the openstack api fakes use fake Authentication by default
+* Round 1 of changes for keystone integration. * Modified request context to allow it to hold all of the relevant data from the auth component. * Pulled out access to AuthManager from as many places as possible * Massive cleanup of unit tests * Made the openstack api fakes use fake Authentication by default
 * require either v4 or v6
 * pull-up from trunk
 * Fix various errors discovered by pylint and pyflakes
 * fixing underline
 * removing extra verbage
 * merged trunk
-* This change creates a minimalist API abstraction for the nova/rpc.py code so that it's possible to use other queue mechanisms besides Rabbit and/or AMQP, and even use other drivers for AMQP rather than Rabbit.  The change is intended to give the least amount of interference with the rest of the code, fixes several bugs in the tests, and works with the current branch.  I also have a small demo driver+server for using 0MQ which I'll submit after this patch is merged
+* This change creates a minimalist API abstraction for the nova/rpc.py code so that it's possible to use other queue mechanisms besides Rabbit and/or AMQP, and even use other drivers for AMQP rather than Rabbit. The change is intended to give the least amount of interference with the rest of the code, fixes several bugs in the tests, and works with the current branch. I also have a small demo driver+server for using 0MQ which I'll submit after this patch is merged
 * removing dict() comment
 * adding more on return_type in docstrings
 * Fixes issue with OSAPI passing compute API a flavorid instead of an instance identifier. Added tests
@@ -16757,12 +16789,12 @@ CHANGES
 * remove unexpected parameter
 * fixed xmlns issue
 * updated the bridge arg requirements based on manager
-* this change will require that local urls be input with a properly constructed local url:  http://localhost/v1.1/images/[id].  Such urls are translated to ids at the api layer.  Previously, any url ending with and int was ok
+* this change will require that local urls be input with a properly constructed local url: http://localhost/v1.1/images/[id]. Such urls are translated to ids at the api layer. Previously, any url ending with and int was ok
 * make atom+xml accept header be ignored on 300 responses in the VersionsRequestDeserializer
 * Removed superfluous parameter
 * Use auth_token to set x-auth-token header in glance requests
 * Fixed the virt driver base
-* Some work on testing.  Two cases related to lp816713 have some coverage already: using an id as an imageRef (test_create_instance_v1_1_local_href), and using a nova href as a url (test_create_instance_v1_1)
+* Some work on testing. Two cases related to lp816713 have some coverage already: using an id as an imageRef (test_create_instance_v1_1_local_href), and using a nova href as a url (test_create_instance_v1_1)
 * Remove xenapi_inject_image flag
 * Add a flag to set the default file mode of logs
 * fixed issue with factory for Versions Resource
@@ -16818,7 +16850,7 @@ CHANGES
 * cleanup
 * pep8
 * pep8
-* First pass at converting this stuff--pass context down into vmops.  Still need to fix unit tests and actually use auth_token from the context..
+* First pass at converting this stuff--pass context down into vmops. Still need to fix unit tests and actually use auth_token from the context..
 * pep8 and simplify rule refresh logic
 * pep8
 * merging parent branch lp:~rackspace-titan/nova/osapi-create-server
@@ -16843,7 +16875,7 @@ CHANGES
 * merging trunk; resolving conflicts
 * Add OpenStack API support for block_device_mapping
 * queries in the models.Instance context need to reference the table by name (fixed_ips) however queries in the models.FloatingIp context alias the tables out properly and return the data as fixed_ip (which is why you need to reference it by fixed_ip in that context)
-* added warning when size of subnet(s) being created are larger than FLAG.network_size in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why
+* added warning when size of subnet(s) being created are larger than FLAG.network_size in attempt to alleviate confusion. For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why
 * xml deserialization works now
 * merged from trunk
 * merged trunk
@@ -16865,7 +16897,7 @@ CHANGES
 * fix issue with failing test
 * merged trunk
 * I'm sorry, for my fail with rebasing. Any way previous branch grew to many other futures, so I supersede it. 1. Used optparse for parsing arg string 2. Added decorator for describe method params 3. Added option for assigning network to certain project. 4. Added field to "network list" for showing which project owns network
-* Moved the VIF network connectivity logic('ensure_bridge' and 'ensure_vlan_bridge') from the network managers to the virt layer.  In addition, VIF driver class is added to allow customized VIF configurations for various types of VIFs and underlying network technologies
+* Moved the VIF network connectivity logic('ensure_bridge' and 'ensure_vlan_bridge') from the network managers to the virt layer. In addition, VIF driver class is added to allow customized VIF configurations for various types of VIFs and underlying network technologies
 * merge with trunk, resolve conflicts
 * fix pep8
 * Launchpad automatic translations update
@@ -16888,7 +16920,7 @@ CHANGES
 * Estetic fix
 * Fix boot from volume failure for network block devices
 * Bug #796813: vmwareapi does not support distributed vswitch
-*  modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
+* modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
 * Fixes faults to use xml serializers based on api version. This fixed bug 814228
 * Fixes a typo in rescue instance in ec2 api. This is mnaser's fix, I just added a test to verify the change
 * Fixes bug 797250 where a create server request with the body '{"name":"server1"}' results in a HTTP 500 instead of HTTP 422
@@ -16907,7 +16939,7 @@ CHANGES
 * added 1.0 detail test, added VersionRequestDeserializer to support Versions actions properly, started 300/multiple choice work
 * fix for reviews
 * Fixed bad test Fixed using wrong variable
-* Moved the exception handling of unplugging VIF from virt driver to VIF driver.  Added better comments.  Added OpenStack copyrights to libivrt vifs.py
+* Moved the exception handling of unplugging VIF from virt driver to VIF driver. Added better comments. Added OpenStack copyrights to libivrt vifs.py
 * pep8 + spelling fixes
 * Floating IP DB tests
 * Updated Faults controller to choose an xml serializer based on api version found in the request url
@@ -17031,7 +17063,7 @@ CHANGES
 * Moving lp:~rackspace-titan/nova/extensions-xml-serialization to new branch based off of trunk. To remove dep on another branch
 * Perform fault wrapping in the openstack WSGI controller. This allows us to just raise webob Exceptions in OS API controllers with the appropriate explanations set. This resolves some inconsistencies with exception raising and returning that would cause HTML output to occur when faults weren't being handled correctly
 * pep8 and stuff
-* Some code was recently added to glance to allow the is_public filter to be overridden.  This allows us to get all images and filter properly on the nova side until keystone support is in glance. This fixes the issue with private images and snapshots disappearing from the image list
+* Some code was recently added to glance to allow the is_public filter to be overridden. This allows us to get all images and filter properly on the nova side until keystone support is in glance. This fixes the issue with private images and snapshots disappearing from the image list
 * pep8
 * Merged with trunk which includes ha-net changes
 * Updated the compute API so that has_finished_migration uses instance_uuid. Fixes some regressions with 1295-1296
@@ -17059,8 +17091,8 @@ CHANGES
 * Fixed Xenapi unit test error of test_rescue
 * Slight indentation change
 * Merged Dan Wendlandt's branch and fixed pep8 errors
-* Added  call to second coverage invocation
-* Fixed an issue where  was invoked before it was defined in the case of a venv
+* Added call to second coverage invocation
+* Fixed an issue where was invoked before it was defined in the case of a venv
 * - Add 'fixed_ipv6' property to VirtualInterface model - Expose ipv6 addresses in each network in OSAPI v1.1
 * forgot to add xenapi/vif.py
 * Perform fault wrapping in the openstack WSGI controller. This allows us to just raise webob Exceptions in OS API controllers with the appropriate explanations set. This resolves some inconsistencies with exception raising and returning that could cause HTML output to occur when an exception was raised
@@ -17081,8 +17113,8 @@ CHANGES
 * Fix plus passing tests
 * remove debug prints
 * merge ryu's branch
-* update for ryu's naming changes, fix some bugs.  tested with OVSDriver only so far
-* Fixes bug #807764.  Please disregard previous proposal with incorrect bug #
+* update for ryu's naming changes, fix some bugs. tested with OVSDriver only so far
+* Fixes bug #807764. Please disregard previous proposal with incorrect bug #
 * Whoops
 * Added LP bug num to TODO
 * Split tests into 2
@@ -17136,7 +17168,7 @@ CHANGES
 * move import network to the top
 * Merged lp:~danwent/nova/network-refactoring-l2
 * merged from trunk
-* network api release_floating_ip method checks if an instance associated to the floating prior to releasing.  added test
+* network api release_floating_ip method checks if an instance associated to the floating prior to releasing. added test
 * Added detroy_vif_network
 * Functionality fixed and new test passing
 * Updates to the compute API and manager so that rebuild, reboot, snapshots, and password resets work with the most recent versions of novaclient
@@ -17204,7 +17236,7 @@ CHANGES
 * merged with 1280
 * VSA: first cut. merged with 1279
 * Added some unit and integration tests for updating the server name via the openstack api
-* renamed priv method arg_to_dict since it's not just used for revoke.  modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
+* renamed priv method arg_to_dict since it's not just used for revoke. modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
 * got rid of return_server_with_interfaces and added return_server_with_attributes
 * Added ServerXMLSerializationTest
 * take out print statements
@@ -17220,7 +17252,7 @@ CHANGES
 * use id in links instead of uuid
 * pep8 fixes
 * fix ServersViewBuilderV11Tests
-* Adds greater configuration flexibility to rate limiting via api-paste.ini.  In particular:
+* Adds greater configuration flexibility to rate limiting via api-paste.ini. In particular:
 * return id and uuid for now
 * merge with trunk
 * Adds distributed scheduler and multinic docs to the Developer Reference page
@@ -17345,7 +17377,7 @@ CHANGES
 * pre trunk merge
 * Missing Author updated
 * Allows for ports in serverRef in image create through the openstack api
-* Adds security groups to metadata server.  Also adds some basic tests for metadata code
+* Adds security groups to metadata server. Also adds some basic tests for metadata code
 * fix comments
 * fix conflict
 * Added vif OS API extension to get started on it
@@ -17363,7 +17395,7 @@ CHANGES
 * Add a flag to disable ec2 or osapi
 * refactor
 * easing up content-type restrictions
-* peer review fix - per vish: 'This method automatically converts unknown formats to ami, which is the same logic used to display unknown images in the ec2 api.  This will allow you to properly deregister raw images, etc.'
+* peer review fix - per vish: 'This method automatically converts unknown formats to ami, which is the same logic used to display unknown images in the ec2 api. This will allow you to properly deregister raw images, etc.'
 * Updated resize docstring
 * removing Content-Length requirement
 * Add docstrings for multinic extension
@@ -17377,7 +17409,7 @@ CHANGES
 * Updated mailmap due to wrong address in commit message
 * tests/test_cloud: make an unit test, test_create_image, happy
 * nova/compute/api.py: fixed mismerge
-* ec2 api _get_image method logic flaw that strips the hex16 digit off of the image name, and does a search against the db for it and ignores that it may not be the correct image, such as if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister that.  That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr
+* ec2 api _get_image method logic flaw that strips the hex16 digit off of the image name, and does a search against the db for it and ignores that it may not be the correct image, such as if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister that. That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr
 * sqlalchemy/migrate: resolved version conflict
 * merge with trunk
 * pull-up from trunk
@@ -17438,7 +17470,7 @@ CHANGES
 * merged trunk
 * merge code i'd split from instance_get_fixed_addresses_v6 that's no longer needed to be split
 * fix metadata test since fixed_ip searching now goes thru filters db api call instead of the get_by_fixed_ip call
-* clean up compute_api.get_all filter name remappings.  ditch fixed_ip one-off code.  fixed ec2 api call to this to compensate
+* clean up compute_api.get_all filter name remappings. ditch fixed_ip one-off code. fixed ec2 api call to this to compensate
 * clean up OS API servers getting
 * rename _check_servers_options, add some comments and small cleanup in the db get_by_filters call
 * pep8 fix
@@ -17479,14 +17511,14 @@ CHANGES
 * add image and flavor searching to v1.0 api fixed missing updates from cut n paste in some doc strings
 * added searching by 'image', 'flavor', and 'status' reverted ip/ip6 searching to be admin only
 * compute's get_all should accept 'name' not 'display_name' for searching Instance.display_name. Removed 'server_name' searching.. Fixed DB calls for searching to filter results based on context
-* Refactored OS API code to allow checking of invalid query string paremeters and admin api/context to the index/detail calls.  v1.0 still ignores unknown parameters, but v1.1 will return 400/BadRequest on unknown options.  admin_api only commands are treated as unknown parameters if FLAGS.enable_admin_api is False.   If enable_admin_api is True, non-admin context requests return 403/Forbidden
+* Refactored OS API code to allow checking of invalid query string paremeters and admin api/context to the index/detail calls. v1.0 still ignores unknown parameters, but v1.1 will return 400/BadRequest on unknown options. admin_api only commands are treated as unknown parameters if FLAGS.enable_admin_api is False. If enable_admin_api is True, non-admin context requests return 403/Forbidden
 * clean up checking for exclusive search options fix a cut n paste error with instance_get_all_by_name_regexp
 * merged trunk
 * python-novaclient 2.5.8 is required
 * fix bugs with fixed_ip returning a 404 instance searching needs to joinload more stuff
 * added searching by instance name added unit tests
 * pep8 fixes
-* Replace 'like' support with 'regexp' matching done in python.  Since 'like' would result in a full table scan anyway, this is a bit more flexible. Make search options and matching a little more generic Return 404 when --fixed_ip doesn't match any instance, instead of a 500 only when the IP isn't in the FixedIps table
+* Replace 'like' support with 'regexp' matching done in python. Since 'like' would result in a full table scan anyway, this is a bit more flexible. Make search options and matching a little more generic Return 404 when --fixed_ip doesn't match any instance, instead of a 500 only when the IP isn't in the FixedIps table
 * start of re-work of compute/api's 'get_all' to handle more search options
 * Silence warning in case tests.sqlite doesn't exist
 * fix libvirt test
@@ -17540,7 +17572,7 @@ CHANGES
 * Include migrate_repo/versions/*.sql in tarball
 * Ensure auto-delete is false on Topic Queues
 * refactored the security_group tests a bit and broke up a few of them into smaller tests
-* Reverses the self.auto_delete = True that was added to TopicPublisher in the bugfix for lp804063.  That bugfix should have only added auto_delete = True to FanoutPublisher to match the previous change to FanoutConsumer
+* Reverses the self.auto_delete = True that was added to TopicPublisher in the bugfix for lp804063. That bugfix should have only added auto_delete = True to FanoutPublisher to match the previous change to FanoutConsumer
 * Added 'self.auto_delete = True' to the two Publisher subclasses that lacked that setting
 * Added the '--fixes' tag to link to bug
 * Added self.auto_delete = True to the Publisher subclasses that did not have that set
@@ -17590,8 +17622,12 @@ CHANGES
 * Merged trunk
 * Fixes Bug #803563 by changing how nova passes options in to glance. Before, if limit or marker were not set, we would pass limit=0 and marker=0 in to glance. However, marker is supposed to be an image id. With this change, if limit or marker are not set, they are simply not passed into glance. Glance is free then to choose the default behavior
 * Fixed indentation issues Fixed min/max_count checking issues Fixed a wrongly log message when zone aware scheduler finds no suitable hosts
+
+diablo-2
+--------
+
 * Fixes Bug #803563 by changing how nova passes options in to glance. Before, if limit or marker were not set, we would pass limit=0 and marker=0 in to glance. However, marker is supposed to be an image id. With this change, if limit or marker are not set, they are simply not passed into glance. Glance is free then to choose the default behavior
-* Sets 'exclusive=True' on Fanout amqp queues.  We create the queues with uuids, so the consumer should have exclusive access and they should get removed when done (service stop).  exclusive implies auto_delete.  Fixes lp:803165
+* Sets 'exclusive=True' on Fanout amqp queues. We create the queues with uuids, so the consumer should have exclusive access and they should get removed when done (service stop). exclusive implies auto_delete. Fixes lp:803165
 * don't pass zero in to glance image service if no limit or marker are present
 * more incorrect list type casting in create_network
 * removed the list type cast in create_network on the NETADDR projects
@@ -17602,7 +17638,7 @@ CHANGES
 * "nova-manage vm list" was still referencing the old "image_id" column, which was renamed to "image_ref" at revision 1144
 * Implement backup with rotation and expose this functionality in the OS API
 * Allow a port name in the server ref for image create
-* Fanout queues use unique queue names, so the consumer should have exclusive access.  This means that they also get auto deleted when we're done with them, so they're not left around on a service restart.  Fixes lp:803165
+* Fanout queues use unique queue names, so the consumer should have exclusive access. This means that they also get auto deleted when we're done with them, so they're not left around on a service restart. Fixes lp:803165
 * pep8 fix
 * removed extra stubout, switched to isinstance and catching explicit exception
 * get latest branch
@@ -17669,10 +17705,10 @@ CHANGES
 * Re-merging code for generating system-usages to get around bzr merge braindeadness
 * getting started
 * Added floating IP support in OS API
-* This speeds up multiple runs of tests to start up much faster because it only runs db migrations if the test db doesn't exist.  It also adds the -r/--recreate-db option to run_tests.sh to delete the tests db so it will be recreated
+* This speeds up multiple runs of tests to start up much faster because it only runs db migrations if the test db doesn't exist. It also adds the -r/--recreate-db option to run_tests.sh to delete the tests db so it will be recreated
 * small formatting change
 * breaking up into individual tests for security_groups
-* Proposing this because it is a critical fix before milestone.  Suggestions on testing it are welcome
+* Proposing this because it is a critical fix before milestone. Suggestions on testing it are welcome
 * logging fixes
 * removed unneded mac parameter to lease and release fixed ip functions
 * Made _issue_novaclient_command() behave better. Fixed a bunch of tests
@@ -17722,7 +17758,7 @@ CHANGES
 * Merged from trunk
 * Add api methods to delete provider firewall rules
 * This small change restores single quotes and double quotes as they were before in the filter expression for retrieving the PIF (physical interface) xenapi should use for creating VLAN interfaces
-* Remove the unnecessary insertion of whitespace.  This happens to be enough to make this patch apply on recent versions of XenServer / Xen Cloud Platform
+* Remove the unnecessary insertion of whitespace. This happens to be enough to make this patch apply on recent versions of XenServer / Xen Cloud Platform
 * Removes the usage of the IPy module in favor of the netaddr module
 * - update glance image fixtures with expected checksum attribute - ensure checksum attribute is handled properly in image service
 * mailmap
@@ -17768,7 +17804,7 @@ CHANGES
 * image/s3: typo
 * same typo i made before!
 * on 2nd run through filter_hosts, we've already accounted for the topic memory needs converted to Bytes from MB
-* LeastCostScheduler wasn't checking for topic cost functions correctly. Added support so that --least_cost_scheduler_cost_functions only needs to have method names specified, instead of the full blown version with module and class name.  Still works the old way, too
+* LeastCostScheduler wasn't checking for topic cost functions correctly. Added support so that --least_cost_scheduler_cost_functions only needs to have method names specified, instead of the full blown version with module and class name. Still works the old way, too
 * requested_mem typo
 * more typos
 * typo in least cost scheduler
@@ -17808,7 +17844,7 @@ CHANGES
 * libvirt test for deleting provider firewall rules
 * Make firewall rules tests idempotent, move IPy=>netaddr, add deltete test
 * merge from trunk
-* altho security_group authorize & revoke tests already exist in test_api, adding some direct ec2 api method tests.   added group_id param support to the pertinent security group methods
+* altho security_group authorize & revoke tests already exist in test_api, adding some direct ec2 api method tests. added group_id param support to the pertinent security group methods
 * Make sure there are actually rules to test against
 * Add test for listing provider firewall rules
 * pep8: remove newline at end of file
@@ -17850,7 +17886,7 @@ CHANGES
 * Bug fixing
 * Added flavor extra specs controller
 * Initial unit test (failing)
-* This catches the InstanceNotFound exception on create, and ignores it.  This prevents errors in the compute log, and causes the server to not be built (it should only get InstanceNotFound if the server was deleted right after being created).  This is a temporary fix that should be fixed correctly once no-db-messaging stuff is complete
+* This catches the InstanceNotFound exception on create, and ignores it. This prevents errors in the compute log, and causes the server to not be built (it should only get InstanceNotFound if the server was deleted right after being created). This is a temporary fix that should be fixed correctly once no-db-messaging stuff is complete
 * allocate and release implementation
 * fixed pep8 issues
 * merge from trunk
@@ -17927,7 +17963,7 @@ CHANGES
 * Removed debugging and switched eventlet to monkey patch everything
 * Removed unneeded import
 * Tests for WSGI/Launcher
-* Remove the unnecessary insertion of whitespace.  This happens to be enough to match this patch apply on recent versions of XenServer / Xen Cloud Platform
+* Remove the unnecessary insertion of whitespace. This happens to be enough to match this patch apply on recent versions of XenServer / Xen Cloud Platform
 * trunk merge
 * fix lp 798361
 * Removed logging logic from __init__, added concept of Launcher...no tests for it yet
@@ -17966,7 +18002,7 @@ CHANGES
 * General cleanup and refactor of a lot of the API/WSGI service code
 * Adding tests for is_uuid_like
 * Using proper UUID format for uuids
-* Implements a portion of ec2 ebs boot. What's implemented - block_device_mapping option for run instance with volume   (ephemeral device and no device isn't supported yet) - stop/start instance
+* Implements a portion of ec2 ebs boot. What's implemented - block_device_mapping option for run instance with volume (ephemeral device and no device isn't supported yet) - stop/start instance
 * updated fixed ip and floating ip exceptions
 * pep8: white space/blank lines
 * Merging trunk
@@ -17974,7 +18010,7 @@ CHANGES
 * moving instance existance logic down to api layer
 * Ensure os_type and architecture get set correctly
 * Make EC2 update_instance() only update updatable_fields, rather than all fields. Patch courtesy of Vladimir Popovski
-* Fixes two minor bugs (lp795123 and lp795126) in the extension mechanism.  The first bug is that each extension has _check_extension() called twice on it; this is a minor cosmetic problem, but the second is that extensions which flunk _check_extension() are still added.  The proposed fix is to make _check_extensions() return True or False, then make _add_extension() call it from the top and return immediately if _check_extensions() returns False
+* Fixes two minor bugs (lp795123 and lp795126) in the extension mechanism. The first bug is that each extension has _check_extension() called twice on it; this is a minor cosmetic problem, but the second is that extensions which flunk _check_extension() are still added. The proposed fix is to make _check_extensions() return True or False, then make _add_extension() call it from the top and return immediately if _check_extensions() returns False
 * Fixes a bug where a misleading error message is outputted when there's a sqlalchemy-migrate version conflict
 * Result is already in JSON format from _wait_for_agent
 * Fix PEP8
@@ -18012,7 +18048,7 @@ CHANGES
 * We don't check result in caller, so don't set variable to return value
 * Remove debugging statement
 * Fix lp795123 and lp795126 by making _check_extension() return True or False and checking the result only from the top of _add_extension()
-* Glance host defaults to  rather than localhost
+* Glance host defaults to rather than localhost
 * Upstream merge
 * add in dhcp drawing
 * Rename: intance_type_metadata -> instance_type_extra_specs
@@ -18178,7 +18214,7 @@ CHANGES
 * Improved tests
 * removing unnecessary lines
 * wsgi can now handle dispatching action None more elegantly
-* This fixes the server_metadata create and update functions that were returning req.body (as a string) instead of body (deserialized body dictionary object).  It also adds checks where appropriate to make sure that body is not empty (and return 400 if it is).  Tests updated/added where appropriate
+* This fixes the server_metadata create and update functions that were returning req.body (as a string) instead of body (deserialized body dictionary object). It also adds checks where appropriate to make sure that body is not empty (and return 400 if it is). Tests updated/added where appropriate
 * removed yucky None return types
 * merging trunk
 * trunk merge
@@ -18196,7 +18232,7 @@ CHANGES
 * block migration feature added
 * Reorder firewall rules so the common path is shorter
 * ec2 api method allocate_address ; raises exception.NoFloatingIpsDefined instead of UnknownError when there aren't any floating ips available
-* in XML Serialization of output, the toprettyxml() call would sometimes return a str() and sometimes unicode(), I've forced encoding to utf-8 to ensure that we always get str().  This fixes the related bug
+* in XML Serialization of output, the toprettyxml() call would sometimes return a str() and sometimes unicode(), I've forced encoding to utf-8 to ensure that we always get str(). This fixes the related bug
 * A recent commit added a couple of directories that don't belong in version control. Remove them again
 * adding support for cusom serialization methods
 * forgot a comma
@@ -18312,7 +18348,7 @@ CHANGES
 * Remove ipy from network code and replace with netaddr
 * Remove ipy from nova/api/ec2/cloud.py and use netaddr
 * Remove ipy from nova-manage and use netaddr
-* This branch allows marker and limit parameters to be used on image listing (index and detail) requests.  It parses the parameters from the request, and passes it along to the glance_client, which can now handle these parameters.  Essentially all of the logic for the pagination is handled in glance, we just pass along the correct parameters and do some error checking
+* This branch allows marker and limit parameters to be used on image listing (index and detail) requests. It parses the parameters from the request, and passes it along to the glance_client, which can now handle these parameters. Essentially all of the logic for the pagination is handled in glance, we just pass along the correct parameters and do some error checking
 * merge from trunk, resolved conflicts
 * Update the OSAPI images controller to use 'serverRef' for image create requests
 * Changed the error raise to not be AdminRequired when admin is not, in fact, required
@@ -18328,7 +18364,7 @@ CHANGES
 * Small pylint fixes
 * merge with trunk
 * Fixed incorrect exception
-* This branch removes nwfilter rules when instances are terminated to prevent resource leakage and serious eventual performance degradation.  Without this patch, launching instances and restarting nova-compute eventually become very slow
+* This branch removes nwfilter rules when instances are terminated to prevent resource leakage and serious eventual performance degradation. Without this patch, launching instances and restarting nova-compute eventually become very slow
 * merge with trunk
 * resolve conflicts with trunk
 * Update migrate script version to 22
@@ -18346,8 +18382,8 @@ CHANGES
 * Fixed pip-requires double requirement
 * Added a test case for XML serialization
 * Removed unused and erroneous (yes, it was both) function
-* paramiko is not installed into the venv, but is required by smoketests/base.py.  Added paramiko to tools/pip-requires
-* Changes all uses of utcnow to use the version in utils.  This is a simple wrapper for datetime.datetime.utcnow that allows us to use fake values for tests
+* paramiko is not installed into the venv, but is required by smoketests/base.py. Added paramiko to tools/pip-requires
+* Changes all uses of utcnow to use the version in utils. This is a simple wrapper for datetime.datetime.utcnow that allows us to use fake values for tests
 * Set pylint to ignore correct lines that it could not determine were correct, due to the means by which eventlet.green imported subprocess Minimized the number of these lines to ignore
 * LDAP optimization and fix for one small bug caused huge performance leak. Dashboard's benchmarks showed overall x22 boost in page request completion time
 * Adds LeastCostScheduler which uses a series of cost functions and associated weights to determine which host to provision to
@@ -18360,7 +18396,7 @@ CHANGES
 * Flush AuthManager's cache before each test
 * Fixed FakeLdapDriver, made it call LdapDriver.__init__
 * Merged with trunk
-* This change set adds the ability to create new servers with an href that points to a server image on any glance server (not only the default one configured).  This means you can create a server with imageRef = http://glance1:9292/images/3  and then also create one with imageRef = http://glance2:9292/images/1.  Using the old way of passing in an image_id still works as well, and will use the default configured glance server (imageRef = 3 for instance)
+* This change set adds the ability to create new servers with an href that points to a server image on any glance server (not only the default one configured). This means you can create a server with imageRef = http://glance1:9292/images/3 and then also create one with imageRef = http://glance2:9292/images/1. Using the old way of passing in an image_id still works as well, and will use the default configured glance server (imageRef = 3 for instance)
 * added nova_adminclient to tools/pip-requires
 * merged trunk
 * Added paramiko to tools/pip-requires
@@ -18403,7 +18439,7 @@ CHANGES
 * list --reservation now works across zones
 * fix novarc to work on mac and zsh
 * merged, with trunk, fixed the test failure, and split the test into 3 as per peer review
-* Fixes nova-manage bug.  When a nova-network host has allocated floating ips *AND* some associated, the nova-manage floating list <host> would throw exception because was expecting hash with 'ec2_id' key , however, the obj returned is a sqlalchemy obj and the attr we need is 'hostname'
+* Fixes nova-manage bug. When a nova-network host has allocated floating ips *AND* some associated, the nova-manage floating list <host> would throw exception because was expecting hash with 'ec2_id' key , however, the obj returned is a sqlalchemy obj and the attr we need is 'hostname'
 * start the flat network
 * more testing fun
 * fixed as per peer review to make more consistent
@@ -18423,7 +18459,7 @@ CHANGES
 * touch ups
 * Updates to the 018_rename_server_management_url to avoid adding and dropping a column. Just simply rename the column
 * basic reservation id support to GET /servers
-* - move osapi-specific wsgi code from nova/wsgi.py to nova/api/openstack/wsgi.py - refactor wsgi modules to use more object-oriented approach to wsgi request handling:     - Resource object steps up to original Controller position     - Resource coordinates deserialization, dispatch to controller, serialization     - serialization and deserialization broken down to be more testable/flexible
+* - move osapi-specific wsgi code from nova/wsgi.py to nova/api/openstack/wsgi.py - refactor wsgi modules to use more object-oriented approach to wsgi request handling: - Resource object steps up to original Controller position - Resource coordinates deserialization, dispatch to controller, serialization - serialization and deserialization broken down to be more testable/flexible
 * merge from trunk
 * make the stubs
 * use the host
@@ -18442,6 +18478,10 @@ CHANGES
 * Renamed migration to 020
 * osapi: added support for header X-Auth-Project-Id
 * added /zones/boot reservation id tests
+
+diablo-1
+--------
+
 * Adds hooks for applying ovs flows when vifs are created and destroyed for XenServer instances
 * Logs the exception if metadata fails and returns a 500 with an error message to the client
 * Fixing a bunch of conflicts
@@ -18454,7 +18494,7 @@ CHANGES
 * Incremented version of migration script to reflect changes in trunk
 * switch to using webob exception
 * Added new snapshots table to InnoDB migrations
-* Adds a few more status messages to error states on image register for the ec2 api.  This will hopefully provide users of the ec2 api with a little more info if their registration fails
+* Adds a few more status messages to error states on image register for the ec2 api. This will hopefully provide users of the ec2 api with a little more info if their registration fails
 * Cleaned up bug introduced after fixing pep8 errors
 * Fixing Scheduler Tests
 * Cleaned up bug introduced after fixing ^Cp8 errors
@@ -18530,7 +18570,7 @@ CHANGES
 * Fixing xen and vmware tests by correctly mocking glance client
 * Fixing integration tests by correctly stubbing image service
 * More image_id to image_ref stuff. Also fixed tests in test_servers
-* When encrypting passwords in xenapi's SimpleDH(), we shouldn't send a final newline to openssl, as it'll use that as encryption data.  However, we do need to make sure there's a newline on the end when we write the base64 string for decoding..  Made these changes and updated the test
+* When encrypting passwords in xenapi's SimpleDH(), we shouldn't send a final newline to openssl, as it'll use that as encryption data. However, we do need to make sure there's a newline on the end when we write the base64 string for decoding.. Made these changes and updated the test
 * Fixes the bug introduced by rpc-multicall that caused some test_service.py tests to fail by pip-requiring a later version of mox
 * added \n is not needed with -A
 * now pip-requires mox version 0.5.3
@@ -18562,7 +18602,7 @@ CHANGES
 * Commit the migration script
 * fixed docstrings and general tidying
 * remove _take_action_to_instance
-* fix calls to openssl properly now.  Only append \n to stdin when decoding.  Updated the test slightly, also
+* fix calls to openssl properly now. Only append \n to stdin when decoding. Updated the test slightly, also
 * fixed read_only check
 * Fix pep8 errors
 * Fix pep8 violations
@@ -18651,7 +18691,7 @@ CHANGES
 * Always create Service consumers no matter if report_interval is 0 Fix tests to handle how Service loads Consumers now
 * catch greenlet.GreenletExit when shutting service down
 * fix consumers to actually be deleted and clean up cloud test
-* fakerabbit's declare_consumer should support more than 1 consumer.  also: make fakerabbit Backend.consume be an iterator like it should be.
+* fakerabbit's declare_consumer should support more than 1 consumer. also: make fakerabbit Backend.consume be an iterator like it should be.
 * convert fanout_cast to ConnectionPool
 * pep8 and comment fixes
 * Add a connection pool for rpc cast/call Use the same rabbit connection for all topic listening and wait to be notified vs doing a 0.1 second poll for each
@@ -18668,14 +18708,14 @@ CHANGES
 * make the test work
 * Merged with trunk
 * Several changes designed to bring the openstack api 1.1 closer to spec - add ram limits to the nova compute quotas - enable injected file limits and injected file size limits to be overridden in the quota database table - expose quota limits as absolute limits in the openstack api 1.1 limits resource - add support for controlling 'unlimited' quotas to nova-manage
-* During the API create call, the API would kick off a build and then loop in a greenthread waiting for the scheduler to pick a host for the instance.  After API would see a host was picked, it would cast to the compute node's set_admin_password method
+* During the API create call, the API would kick off a build and then loop in a greenthread waiting for the scheduler to pick a host for the instance. After API would see a host was picked, it would cast to the compute node's set_admin_password method
 * starting breakdown of nova.compute.api.create()
-* fix test.  instance is not updated in DB with admin password in the API anymore
+* fix test. instance is not updated in DB with admin password in the API anymore
 * Merged upstream
 * pep8 fixes
 * Initial tests
 * fix forever looping on a password reset API call
-* updating admin_pass moved down to compute where the password is actually reset.  only update if it succeeds
+* updating admin_pass moved down to compute where the password is actually reset. only update if it succeeds
 * merged trunk
 * change install_ref.admin_password to instance_ref.admin_pass to match the DB
 * Merged trunk
@@ -18705,17 +18745,17 @@ CHANGES
 * Add unittests for cloning volumes
 * merged recent trunk
 * merged recent trunk
-* Make snapshot_id=None a default value in VolumeManager:create_volume().  It is not a regular case to create a volume from a snapshot
+* Make snapshot_id=None a default value in VolumeManager:create_volume(). It is not a regular case to create a volume from a snapshot
 * Don't need to import json
 * Fix wrong call of the volume api create()
 * pep8 fix in nova/compute/api.py
-* instead of the API spawning a greenthread to wait for a host to be picked, the instance to boot, etc for setting the admin password...  let's push the admin password down to the scheduler so that compute can just take care of setting the password as a part of the build process
+* instead of the API spawning a greenthread to wait for a host to be picked, the instance to boot, etc for setting the admin password... let's push the admin password down to the scheduler so that compute can just take care of setting the password as a part of the build process
 * tests working again
 * eventlet.spawn_n() expects the function and arguments, but it expects the arguments unpacked since it uses *args
 * Don't pass a tuple since spawn_n will get the arguments with *args anyway
 * move devices back
 * Using the root-password subcommand of the nova client results in the password being changed for the instance specified, but to a different unknown password. The patch changes nova to use the password specified in the API call
-* Pretty simple.  We call openssl to encrypt the admin password, but the recent changes around this code forgot to strip the newline off the read from stdout
+* Pretty simple. We call openssl to encrypt the admin password, but the recent changes around this code forgot to strip the newline off the read from stdout
 * DHSimple's decrypt needs to append \n when writing to stdin
 * need to strip newline from openssl stdout data
 * merge with trey
@@ -18822,7 +18862,7 @@ CHANGES
 * fixed silly issue with variable needing to be named 'id' for the url mapper, also caught new exception type where needed
 * This is the groundwork for the upcoming distributed scheduler changes. Nothing is actually wired up here, so it shouldn't break any existing code (and all tests pass)
 * Merging trunk
-* Get rid of old virt/images.py functions that are no longer needed.  Checked for any loose calls to these functions and found none.  All tests pass for me
+* Get rid of old virt/images.py functions that are no longer needed. Checked for any loose calls to these functions and found none. All tests pass for me
 * Update OSAPI v1.1 extensions so that it supports RequestExtensions. ResponseExtensions were removed since the new RequestExtension covers both use cases. This branch also removes some of the odd serialization code in the RequestExtensionController that converted dictionary objects into webob objects. RequestExtension handlers should now always return proper webob objects
 * Addressing bug #785763. Usual default for maximum number of DHCP leases in dnsmasq is 150. This prevents instances to obtain IP addresses from DHCP in case we have more than 150 in our network. Adding myself to Authors
 * foo
@@ -18832,7 +18872,7 @@ CHANGES
 * Fixed some tests
 * merge with trunk
 * Added an EC2 API endpoint that'll allow import of public key. Prior, api only allowed generation of new keys
-* This fix ensures that kpartx -d is called in the event that tune2fs fails during key injection, as it does when trying to inject a key into a windows instance.  Bug #760921 is a symptom of this issue, as if kpartx -d is not called then partitions remain mapped that prevent the underlying nbd from being reused
+* This fix ensures that kpartx -d is called in the event that tune2fs fails during key injection, as it does when trying to inject a key into a windows instance. Bug #760921 is a symptom of this issue, as if kpartx -d is not called then partitions remain mapped that prevent the underlying nbd from being reused
 * Add new flag 'max_kernel_ramdisk_size' to specify a maximum size of kernel or ramdisk so we don't copy large files to dom0 and fill up /boot/guest
 * The XenAPI driver uses openssl as part of the nova-agent implementation to set the password for root. It uses a temporary file insecurely and unnecessarily. Change the code to write the password directly to stdin of the openssl process instead
 * The tools/* directory is now included in pep8 runs. Added an opt-out system for excluding files/dirs from pep8 (using GLOBIGNORE)
@@ -18842,7 +18882,7 @@ CHANGES
 * fixed pep8 issue
 * merge from trunk
 * Fail early if requested imageRef does not exist when creating a server
-* Separate out tests for when unfilter is called from iptables vs. nwfilter driver.  Re: lp783705
+* Separate out tests for when unfilter is called from iptables vs. nwfilter driver. Re: lp783705
 * Moved back templates and fixed pep8 issue. Template move was due to breaking packaging with template moves. That will need to happen in a later merge
 * further refactoring of wsgi module; adding documentation and tests
 * don't give instance quota errors with negative values
@@ -18927,7 +18967,7 @@ CHANGES
 * Changed builder to match specs and added test
 * add migration for proper name
 * Update test case to ensure password gets set correctly
-* make token use typo that is in database.  Also fix now -> utcnow and stop using . syntax for dealing with tokens
+* make token use typo that is in database. Also fix now -> utcnow and stop using . syntax for dealing with tokens
 * Added missing metadata join to instance_get calls
 * Avoid using spawn_n to fix LP784132
 * add ram limits to instance quotas
@@ -18996,9 +19036,9 @@ CHANGES
 * started on integrating HostFilter
 * Add support for rbd snapshots
 * Merging in trunk
-* I'm assuming that openstack doesnt work with python < 2.6 here (which I read somewhere on the wiki).  This patch will check to make sure python >= 2.6 is installed, and also allow it to work with python 2.7 (and greater in the future)
+* I'm assuming that openstack doesnt work with python < 2.6 here (which I read somewhere on the wiki). This patch will check to make sure python >= 2.6 is installed, and also allow it to work with python 2.7 (and greater in the future)
 * merge lp:nova
-* XenAPI was not implemented to allow for multiple simultaneous XenAPI requests.  A single XenAPIConnection (and thus XenAPISession) is used for all queries.  XenAPISession's wait_for_task method would set a self.loop = for looping calls to _poll_task until task completion.  Subsequent (parallel) calls to wait_for_task for another query would overwrite this.  XenAPISession._poll_task was pulled into the XenAPISession.wait_for_task method to avoid having to store self.loop
+* XenAPI was not implemented to allow for multiple simultaneous XenAPI requests. A single XenAPIConnection (and thus XenAPISession) is used for all queries. XenAPISession's wait_for_task method would set a self.loop = for looping calls to _poll_task until task completion. Subsequent (parallel) calls to wait_for_task for another query would overwrite this. XenAPISession._poll_task was pulled into the XenAPISession.wait_for_task method to avoid having to store self.loop
 * pep8 fixes
 * Merged trunk
 * volume/driver: make unit test, test_volume, pass
@@ -19028,9 +19068,9 @@ CHANGES
 * updated previous calls referring to the flags to use the column from the networks table instead
 * merged from trunk
 * handle instance_type_ids that are NULL during upgrade to integers
-* fix for lp760921.  Previously, if tune2fs failed, as it does on windows hosts, kpartx -d also failed to be called which leaves mapped partitions that retain holds on the nbd device.  These holds cause the observed errors
+* fix for lp760921. Previously, if tune2fs failed, as it does on windows hosts, kpartx -d also failed to be called which leaves mapped partitions that retain holds on the nbd device. These holds cause the observed errors
 * if a LoopingCall has canceled the loop, break out early instead of sleeping any more than needed
-* Add a test for parallel builds.  verified this test fails before this fix and succeeds after this fix
+* Add a test for parallel builds. verified this test fails before this fix and succeeds after this fix
 * incorporated ImageNotFound instead of NotFound
 * merged from trunk
 * misc related network manager refactor and cleanup
@@ -19059,7 +19099,7 @@ CHANGES
 * Merged trunk
 * Updated MANIFEST for template move
 * NoValidHost exception test
-* Fixes an issue with conversion of images that was introduced by exception refactoring.  This makes the exceptions when trying to locate an ec2 id clearer and also adds some tests for the conversion methods
+* Fixes an issue with conversion of images that was introduced by exception refactoring. This makes the exceptions when trying to locate an ec2 id clearer and also adds some tests for the conversion methods
 * oops fixed a docstring
 * Pep8 stuff
 * Bluprint URL: https://blueprints.launchpad.net/nova/+spec/improve-pylint-scores/
@@ -19085,7 +19125,7 @@ CHANGES
 * extracted xenserver capability reporting from dabo's dist-scheduler branch and added tests
 * migrate back updated_at correctly
 * added in log_notifier for easier debugging
-* Add priority based queues to notifications. Remove duplicate json encoding in notifier (rpc.cast does encoding... ) make no_op_notifier  match rabbit one for signature on notify()
+* Add priority based queues to notifications. Remove duplicate json encoding in notifier (rpc.cast does encoding... ) make no_op_notifier match rabbit one for signature on notify()
 * Bugfix #780784. KeyError when creating custom image
 * removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
 * removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
@@ -19097,7 +19137,7 @@ CHANGES
 * fix migration bug
 * Pep8
 * Test
-* remove stubbing of XenAPISession.wait_for_task for xenapi tests as it doesn't need to be faked.  Also removed duplicate code that stubbed xenapi_conn._parse_xmlrpc_value
+* remove stubbing of XenAPISession.wait_for_task for xenapi tests as it doesn't need to be faked. Also removed duplicate code that stubbed xenapi_conn._parse_xmlrpc_value
 * migration bug fixes
 * Change xenapi's wait_for_task to handle multiple simultaenous queries to fix lp:766404
 * Added GitPython to [install_dir]/tools/pip-requires
@@ -19123,7 +19163,7 @@ CHANGES
 * merge from trunk
 * Set publish_errors default to False
 * convert quota table to key-value
-* Simple fix for this issue.  Tries to raise an exception passing in a variable that doesn't exist, which causes an error
+* Simple fix for this issue. Tries to raise an exception passing in a variable that doesn't exist, which causes an error
 * Fixed duplicate function
 * Review feedback
 * Review feedback
@@ -19140,7 +19180,7 @@ CHANGES
 * Sanitize get_console_output results. See bug #758054
 * revised file docs
 * New author in town
-* Changes to allow a VM to boot from  iso image.  A blank HD is also attached with a size corresponding to the instance type
+* Changes to allow a VM to boot from iso image. A blank HD is also attached with a size corresponding to the instance type
 * Added stub function for a referenced, previously non-existant function
 * Merged trunk
 * grabbed from dist-sched branch
@@ -19197,7 +19237,7 @@ CHANGES
 * ensure create image conforms to OS API 1.1 spec
 * merge updates from trunk
 * Added support in the nova openstack api for requests with local hrefs, e.g., "imageRef":"2" Previously, it only supported "imageRef":"http://foo.com/images/2". The 1.1 api spec defines both approaches
-* Add a flag to allow the user to specify a dnsmasq configuration file for nova-network to use when starting dnsmasq. Currently the command line option is set to "--config-fil=" with nothing specified.  This branch will leave it as it is if the user does not specify a config file, but will utilize the specific file if they do
+* Add a flag to allow the user to specify a dnsmasq configuration file for nova-network to use when starting dnsmasq. Currently the command line option is set to "--config-fil=" with nothing specified. This branch will leave it as it is if the user does not specify a config file, but will utilize the specific file if they do
 * merged from trunk
 * implemented review suggestion EAFP style, and fixed test stub fake_show needs to have image_state = available or other tests will fail
 * got rid of extra whitespace
@@ -19333,7 +19373,7 @@ CHANGES
 * revert changes that doesn't affect the bug
 * in doesn't work properly on instance_ref
 * Another small round of pylint clean-up
-* Added an option to run_tests.sh so you can run just pep8. So now you can:     ./run_tests.sh --just-pep8 or     ./run_tests.sh -p
+* Added an option to run_tests.sh so you can run just pep8. So now you can: ./run_tests.sh --just-pep8 or ./run_tests.sh -p
 * merge trunk
 * fix display of vpn instance id and add output rule so it can be tested from network host
 * Exit early if tests fail, before pep8 is run
@@ -19478,7 +19518,7 @@ CHANGES
 2011.2rc1
 ---------
 
-* Rework GlanceImageService._translate_base() to not call BaseImageService._translate_base() otherwise the wrong class attributes are used in properties construction..
+* Rework GlanceImageService._translate_base(
 * Updated following to RIck's comments
 * Rebased to trunk rev 987
 * Rework GlanceImageService._translate_base() to not call BaseImageService._translate_base() otherwise the wrong class attributes are used in properties construction..
@@ -19502,7 +19542,7 @@ CHANGES
 * Minor fixes
 * Fix RBDDriver in volume manager. discover_volume was raising exception. Modified local_path as well
 * Fixes VMware Connection to inherit from ComputeDriver
-* Fixes s3.py to allow looking up images by name.  Smoketests run unmodified again with this change!
+* Fixes s3.py to allow looking up images by name. Smoketests run unmodified again with this change!
 * move from try_execute to _execute
 * Make VMWare Connection inherit from ComputeDriver
 * add up and down .sh
@@ -19593,6 +19633,10 @@ CHANGES
 * Ignore errors when deleting the default route in the ensure_bridge function
 * bzr ignore the CA dir
 * merge prop tweaks
+
+2011.2gamma1
+------------
+
 * Import translations from Launchpad
 * added Zones doc
 * Update the describe_image_attribute and modify_image_attribute functions in the EC2 API so they use the top level 'is_public' attribute of image objects. This brings these functions in line with the base image service
@@ -19608,17 +19652,17 @@ CHANGES
 * Fixes issues with describe instances due to improperly set metadata
 * Keep guest instances when libvirt host restarts
 * fix tests from moving access check into update and delete
-* Added support for listing addresses of a server in the openstack api. Now you can GET  * /servers/1/ips  * /servers/1/ips/public  * /servers/1/ips/private Supports v1.0 json and xml. Added corresponding tests
+* Added support for listing addresses of a server in the openstack api. Now you can GET * /servers/1/ips * /servers/1/ips/public * /servers/1/ips/private Supports v1.0 json and xml. Added corresponding tests
 * Log libvirt errcode on exception
 * This fixes how the metadata and addresses collections are serialized in xml responses
 * Fix to correct libvirt error code when the domain is not found
 * merged trunk
 * Removed commented-out old 'delete instance on SHUTOFF' code
-* Automatically add the metadata address to the network host.  This allows guests to ARP for the address properly
+* Automatically add the metadata address to the network host. This allows guests to ARP for the address properly
 * merged trunk and resolved conflict
 * slight typo
 * clarified nova-manage instance_type create error output on duplicate flavorid
-* This branch is a patch for fixing below issue. > Bug #746821: live_migration failing due to network filter not found  Link a bug report
+* This branch is a patch for fixing below issue. > Bug #746821: live_migration failing due to network filter not found Link a bug report
 * fix pep8 violation
 * Update instances table to use instance_type_id instead of the old instance_type column which represented the name (ex: m1.small) of an instance type
 * Drop extra 'None' arg from dict.get call
@@ -19647,18 +19691,18 @@ CHANGES
 * Make description of volume_id more generic
 * add the tests
 * pep8 cleanup
-* ApiError code should default to None, and will only display a code if one exists.  Prior was output an 'ApiError: ApiError: error message' string, which is confusing
-* ec2 api run_instances checks for image status must be 'available'.  Overhauled test_run_instances for working set of test assertions
+* ApiError code should default to None, and will only display a code if one exists. Prior was output an 'ApiError: ApiError: error message' string, which is confusing
+* ec2 api run_instances checks for image status must be 'available'. Overhauled test_run_instances for working set of test assertions
 * if we delete the old route when we move it we don't need to check for exists
 * merged trunk
 * removed comment on API compliance
-* Added an option to run_tests.sh so you can run just pep8. So now you can:     ./run_tests.sh --just-pep8 or     ./run_tests.sh -p
-* Add automatic metadata ip to network host on start.  Also fix race where gw is readded twice
+* Added an option to run_tests.sh so you can run just pep8. So now you can: ./run_tests.sh --just-pep8 or ./run_tests.sh -p
+* Add automatic metadata ip to network host on start. Also fix race where gw is readded twice
 * Controllers now inherit from nova.api.openstack.common.OpenstackController
 * Merged trunk
 * Support providing an XML namespace on the XML output from the OpenStack API
 * Merged with trunk, fixed up test that wasn't checking namespace
-* Added support for listing addresses of a server in the openstack api. Now you can GET  * /servers/1/ips  * /servers/1/ips/public  * /servers/1/ips/private Supports v1.0 json and xml. Added corresponding tests
+* Added support for listing addresses of a server in the openstack api. Now you can GET * /servers/1/ips * /servers/1/ips/public * /servers/1/ips/private Supports v1.0 json and xml. Added corresponding tests
 * check visibility on delete and update
 * YADU (Yet Another Docstring Update)
 * Make sure ca_folder is created before chdir()ing into it
@@ -19741,7 +19785,7 @@ CHANGES
 * Removed adminclient.py and added reference to the new nova-adminclient project in tools/pip-requires
 * Don't prefix adminPass with the first 4 chars of the instance name
 * Declares the flag for vncproxy_topic in compute.api
-* Fixes bug 741246.  Ed Leafe's inject_file method for the agent plugin was mistakenly never committed after having to fix commits under wrong email address.  vmops makes calls to this (previously) missing method
+* Fixes bug 741246. Ed Leafe's inject_file method for the agent plugin was mistakenly never committed after having to fix commits under wrong email address. vmops makes calls to this (previously) missing method
 * Attempt to circumvent errors in the API from improper/malformed responses from image service
 * fixes incorrect case of OpenStack API status response
 * Fixed network_info creating
@@ -19851,12 +19895,12 @@ CHANGES
 * Moving server update adminPass support to be v1.0-specific OS API servers update tests actually assert and pass now Enforcing server name being a string of length > 0
 * Adding Content-Type code to openstack.api.versions.Versions wsgi.Application
 * Fixes metadata for ec2_api to specify owner_id so that it filters properly
-* Makes the image decryption code use the per-project private key to decrpyt uploaded images if use_project_ca is set.  This allows the decryption code to work properly when we are using a different ca per project
+* Makes the image decryption code use the per-project private key to decrpyt uploaded images if use_project_ca is set. This allows the decryption code to work properly when we are using a different ca per project
 * exception -> Fault
 * Merged trunk
 * Do not push 'None' to authorized_keys when no key is specified
 * Add missing method that prevent HyperV compute nodes from starting up
-* TopicAdapterConsumer uses a different callback model than TopicConsumer.  This patch updates the console proxy to use this pattern
+* TopicAdapterConsumer uses a different callback model than TopicConsumer. This patch updates the console proxy to use this pattern
 * merge trunk
 * Uses the proc filesystem to check the volume size in volume smoketests so that it works with a very limited busybox image
 * merged trunk
@@ -19868,7 +19912,7 @@ CHANGES
 * Deepcopy the images, because the string formatting transforms them in-place
 * name, created_at, updated_at are required
 * Merged with trunk
-* "Incubator" is no more.  Long live "contrib"
+* "Incubator" is no more. Long live "contrib"
 * Rename MockImageService -> FakeImageService
 * Removed unused super_verbose argument left over from previous code
 * Renamed incubator => contrib
@@ -19891,7 +19935,7 @@ CHANGES
 * add line
 * incorporate feedback from termie
 * Make dnsmasq_interface configurable
-* Stop nova-manage from reporting an error every time.  Apparently except: catches sys.exit(0)
+* Stop nova-manage from reporting an error every time. Apparently except: catches sys.exit(0)
 * add comment
 * switch cast to a call
 * move functions around
@@ -19934,7 +19978,7 @@ CHANGES
 * Pass along the nbd flags although we dont support it just yet
 * cleaned up var name
 * made changes per code review: 1) removed import of image from objectstore 2) changed to comments instaed of triple quotes
-* Displays an error message to the user if an exception is raised.  This is vital because if logfile is set, the exception shows up in the log and the user has no idea something went wrong
+* Displays an error message to the user if an exception is raised. This is vital because if logfile is set, the exception shows up in the log and the user has no idea something went wrong
 * Yet more docstring fixes
 * More style changes
 * Merged with trunk
@@ -20001,7 +20045,7 @@ CHANGES
 * merge lp:nova
 * Mixins for tests confuse pylint no end, and aren't necessary... you can stop the base-class from being run as a test by prefixing the class name with an underscore
 * Merged the two periodic_tasks functions, that snuck in due to parallel merges in compute.manager
-* Start up nova-api service on an unused port if 0 is specified.  Fixes bug 744150
+* Start up nova-api service on an unused port if 0 is specified. Fixes bug 744150
 * Removed 'is not None' to do more general truth-checking. Added rather verbose testing
 * Merged with trunk
 * merge trunk
@@ -20029,8 +20073,8 @@ CHANGES
 * Fix utils checking
 * use_ipv6 now passing to interfaces.template as first level variable in libvirt_conn
 * Replaced import of an object with module import as per suggestion
-* Updates to the newest version of nova.sh, which includes:  * Installing new python dependencies  * Allows for use of interfaces other than eth0  * Adds a run_detached mode for automated testing
-* Now that it's an extension, it has to be v1.1.  Also fixed up all the things that changed in v1.1
+* Updates to the newest version of nova.sh, which includes: * Installing new python dependencies * Allows for use of interfaces other than eth0 * Adds a run_detached mode for automated testing
+* Now that it's an extension, it has to be v1.1. Also fixed up all the things that changed in v1.1
 * merge trunk addressing Trey's comments
 * Initial extensification of volumes
 * Merged with trunk, resolved conflicts & code-flicts
@@ -20070,7 +20114,7 @@ CHANGES
 * merging trunk and resolving conflicts
 * Fix up destroy container
 * Fix up templating
-* Implement metadata resource for Openstack API v1.1. Includes:       -GET /servers/id/meta       -POST /servers/id/meta       -GET /servers/id/meta/key       -PUT /servers/id/meta/key       -DELETE /servers/id/meta/key
+* Implement metadata resource for Openstack API v1.1. Includes: -GET /servers/id/meta -POST /servers/id/meta -GET /servers/id/meta/key -PUT /servers/id/meta/key -DELETE /servers/id/meta/key
 * Dont always assume qemu
 * Removed partition from setup_container
 * pep8 fix
@@ -20102,7 +20146,7 @@ CHANGES
 * merge trunk
 * Added detail keywork and i18n as per suggestions
 * incorporate feedback from termie
-* Implementation of blueprint hypervisor-vmware-vsphere-support.  (Link to blueprint: https://blueprints.launchpad.net/nova/+spec/hypervisor-vmware-vsphere-support)
+* Implementation of blueprint hypervisor-vmware-vsphere-support. (Link to blueprint: https://blueprints.launchpad.net/nova/+spec/hypervisor-vmware-vsphere-support)
 * fix typo
 * Addressing Trey's comments. Removed disk_get_injectables, using _get_network_info's return value
 * Adds serverId to OpenStack API image detail per related_image blueprint
@@ -20119,7 +20163,7 @@ CHANGES
 * Added test_get_servers_with_bad_limit, test_get_servers_with_bad_offset and test_get_servers_with_bad_marker
 * pep8 cleanups
 * Added test_get_servers_with_limit_and_marker to test pagination with marker and limit request params
-* style and spacing  fixed
+* style and spacing fixed
 * better error handling and serialization
 * add some more docs and make it more obvious which parts are examples
 * add an example of a versioned api
@@ -20212,7 +20256,7 @@ CHANGES
 * boto_v6 module is imported if the flag "use_ipv6" is set to True
 * pep8 fixes, backported some important fixes that didn't make it over from my testing system :-(
 * Move all types of locking into utils.synchronize decorator
-* Doh!  Missed two places which were importing the old driver location
+* Doh! Missed two places which were importing the old driver location
 * Review feedback
 * make missing noVNC error condition a bit more fool-proof
 * clean some pep8 issues
@@ -20267,7 +20311,7 @@ CHANGES
 * more progress
 * use the nova Server object
 * separating out components of vnc console
-* Earlier versions of the python libvirt binding had getVersion in the libvirt namespace, not on the connection object.  Check both
+* Earlier versions of the python libvirt binding had getVersion in the libvirt namespace, not on the connection object. Check both
 * Report the exception (happens when can't import libvirt)
 * Use subset_dict
 * Removing dead code
@@ -20291,9 +20335,9 @@ CHANGES
 * Filled out the base-driver contract, so it's not a false-promise
 * Enable flat manager support for ipv6
 * Adding a talk bubble to the nova.openstack.org site that points readers to the 2011.1 site and the docs.openstack.org site - similar to the swift.openstack.org site. I believe it helps people see more sites are available, plus they can get to the Bexar site if they want to. Going forward it'll be nice to use this talk bubble to point people to the trunk site from released sites
-* Correctly imports greenthread in libvirt_conn.py.  It is used by live_migrate()
+* Correctly imports greenthread in libvirt_conn.py. It is used by live_migrate()
 * Forgot this in the rename of check_instance -> check_isinstance
-* Test the login behavior of the OpenStack API.  Uncovered bug732866
+* Test the login behavior of the OpenStack API. Uncovered bug732866
 * trunk merge
 * Renamed check_instance -> check_isinstance to make intent clearer
 * Fix some crypto strangeness (\n in file_name field of certificates, wrong IMPL method for certificate_update)
@@ -20313,7 +20357,7 @@ CHANGES
 * Merging trunk
 * make executable
 * Adding BASE_IMAGE_ATTRS to ImageService
-* intermediate progress on vnc-nova integration.  checking in to show vish
+* intermediate progress on vnc-nova integration. checking in to show vish
 * add in eventlet version of vnc proxy
 * Updating doc strings in accordance with PEP 257. Fixing order of imports in common.py
 * one more copyright fix
@@ -20460,10 +20504,10 @@ CHANGES
 * Ensuring kernel/ramdisk files are always removed in case of failures
 * merge trunk
 * merge trunk
-* Implement metadata resource for Openstack API v1.1. Includes:     -GET /servers/id/meta     -POST /servers/id/meta     -GET /servers/id/meta/key     -PUT /servers/id/meta/key     -DELETE /servers/id/meta/key
+* Implement metadata resource for Openstack API v1.1. Includes: -GET /servers/id/meta -POST /servers/id/meta -GET /servers/id/meta/key -PUT /servers/id/meta/key -DELETE /servers/id/meta/key
 * Make "ApiError" the default error code for ApiError instances, rather than "Unknown."
 * When changing the project manager, if the new manager is not yet a project member, be sure to make them be a project member
-* Make the rpc cast/call debug calls show what topic they are sending to.  This aides in debuugging
+* Make the rpc cast/call debug calls show what topic they are sending to. This aides in debuugging
 * Final touches and bug/pep8 fixes
 * Support for markers for pagination as defined in the 1.1 spec
 * Merged trunk
@@ -20486,7 +20530,7 @@ CHANGES
 * Fix a couple of things that assume that libvirt == kvm/qemu
 * Made fixed_range a required parameter for nova-manage network create. Changed default num_networks to 1; 1000 seems large
 * Fix a number of place in the volume driver where the argv hadn't been fully split
-* fix for lp712982, and likely a variety of other dashboard error handling issues.  This fix simply causes the default error code for ApiError to be 'ApiError' rather than 'Unknown', which makes dashboard handle the error gracefully, and makes euca error output slightly prettier
+* fix for lp712982, and likely a variety of other dashboard error handling issues. This fix simply causes the default error code for ApiError to be 'ApiError' rather than 'Unknown', which makes dashboard handle the error gracefully, and makes euca error output slightly prettier
 * Fix mis-merge
 * pep8 is hard
 * syntax error
@@ -20623,7 +20667,7 @@ CHANGES
 * fixes bug 735298: start of nova-compute not possible because of wrong xml paths to the //host/cpu section in "virsh capabilities", used in nova/virt/libvirt_conn.py
 * update image service documentation
 * merge lp:nova and resolve conflicts
-* User ids are strings, and are not necessarily == name.  Also fix so that non-existent user gives a 404, not a 500
+* User ids are strings, and are not necessarily == name. Also fix so that non-existent user gives a 404, not a 500
 * Fudge
 * Keypairs are not required in the OpenStack API; don't require them!
 * Merging trunk
@@ -20657,7 +20701,7 @@ CHANGES
 * Stuff
 * Removing io_util.py. We now use eventlets library instead
 * Some typos
-* * Updated document vmware_readme.rst to mention VLAN networking * Corrected docstrings as per pep0257 recommentations. * Stream-lined the comments. * Updated code with locals() where ever applicable. * VIM : It stands for VMware Virtual Infrastructure Methodology. We have used the terminology from VMware.  we have added a question in FAQ inside vmware_readme.rst in doc/source * New fake db: vmwareapi fake module uses a different set of fields and hence the structures required are different. Ex: bridge : 'xenbr0' does not hold good for VMware environment and bridge : 'vmnic0' is used instead. Also return values varies, hence went for implementing separate fake db. * Now using eventlet library instead and removed io_utils.py from branch. * Now using glance.client.Client instead of homegrown code to talk to Glance server to handle images. * Corrected all mis-spelled function names and corresponding calls. Yeah, an auto-complete side-effect!
+* * Updated document vmware_readme.rst to mention VLAN networking * Corrected docstrings as per pep0257 recommentations. * Stream-lined the comments. * Updated code with locals() where ever applicable. * VIM : It stands for VMware Virtual Infrastructure Methodology. We have used the terminology from VMware. we have added a question in FAQ inside vmware_readme.rst in doc/source * New fake db: vmwareapi fake module uses a different set of fields and hence the structures required are different. Ex: bridge : 'xenbr0' does not hold good for VMware environment and bridge : 'vmnic0' is used instead. Also return values varies, hence went for implementing separate fake db. * Now using eventlet library instead and removed io_utils.py from branch. * Now using glance.client.Client instead of homegrown code to talk to Glance server to handle images. * Corrected all mis-spelled function names and corresponding calls. Yeah, an auto-complete side-effect!
 * Implement top level extensions
 * Added i18n to error message
 * Checks locally before routing
@@ -20690,7 +20734,7 @@ CHANGES
 * adding imageRef and flavorRef attributes to servers serialization metadata
 * Merged with trunk (and brian's previous fixes to fake auth)
 * Plugin
-* As suggested by Eric Day:  * changed request.environ version key to more descriptive 'api.version'  * removed python3 string formatting  * added licenses to headers on new files
+* As suggested by Eric Day: * changed request.environ version key to more descriptive 'api.version' * removed python3 string formatting * added licenses to headers on new files
 * Tweak
 * A few fixes
 * pep8
@@ -20733,8 +20777,8 @@ CHANGES
 * Merging trunk
 * Reapplied rename to another file
 * serverId returned as int per spec
-* Reapplied rename of Openstack -> OpenStack.  Easier to do it by hand than to ask Bazaar to do it
-* Merged with trunk.  Had to hold bazaar's hand as it got lost again
+* Reapplied rename of Openstack -> OpenStack. Easier to do it by hand than to ask Bazaar to do it
+* Merged with trunk. Had to hold bazaar's hand as it got lost again
 * Derive unit test from standard nova.test.TestCase
 * pep8 fixes
 * adding flavors and images barebones view code; adding flavorRef and imageRef to v1.1 servers
@@ -20752,8 +20796,8 @@ CHANGES
 * Fix capitalization of ApiError (it was mistakenly called APIError)
 * added migration to repo
 * Clarified message when a VM is not running but still in DB
-* Implemented Hyper-V list_instances_detail function.  Needs a cleanup by someone that knows the Hyper-V code
-* So the first of those tests doesn't pass.  Removing as it looks like it was meant to be deleted
+* Implemented Hyper-V list_instances_detail function. Needs a cleanup by someone that knows the Hyper-V code
+* So the first of those tests doesn't pass. Removing as it looks like it was meant to be deleted
 * Added test and fixed up code so that it works
 * Fix for LP Bug #704300
 * fixed keyword arg error
@@ -20864,11 +20908,11 @@ CHANGES
 * fix minor typo
 * Fix a fer nits jaypipes found in review
 * Pep8 / Style
-* Re-removed the code that was deleted upstream but somehow didn't get merged in.  Bizarre!
+* Re-removed the code that was deleted upstream but somehow didn't get merged in. Bizarre!
 * More resize
 * Merged with upstream
 * pep8 fun
-* Test login.  Uncovered bug732866
+* Test login. Uncovered bug732866
 * Merged with upstream
 * Better logging, be more careful about when we throw login errors re bug732866
 * Don't wrap keys and volumes till they're in the API
@@ -20907,9 +20951,9 @@ CHANGES
 * merged to trunk rev781
 * fix pep8 check
 * merge lp:nova
-* Modifies S3ImageService to wrap LocalImageService or GlanceImageService.  It now pulls the parts out of s3, decrypts them locally, and sends them to the underlying service.  It includes various fixes for image/glance.py, image/local.py and the tests
+* Modifies S3ImageService to wrap LocalImageService or GlanceImageService. It now pulls the parts out of s3, decrypts them locally, and sends them to the underlying service. It includes various fixes for image/glance.py, image/local.py and the tests
 * add tests to verify the serialization of adminPass in server creation response
-* Fixes nova.sh to run properly the first time.  We have to get the zip file after nova-api is running
+* Fixes nova.sh to run properly the first time. We have to get the zip file after nova-api is running
 * minor fixes from review
 * merged trunk
 * fixed based on reviewer's comment
@@ -20917,7 +20961,7 @@ CHANGES
 * Moved umount container to disk.py and try to remove loopback when destroying the container
 * Merged trunk
 * Replace session.execute() calls performing raw UPDATE statements with SQLAlchemy code, with the exception of fixed_ip_disassociate_all_by_timeout()
-* Fixes a race condition where multiple greenthreads were attempting to resize a file at the same time.  Adds tests to verify that the image caching call will run concurrently for different files, but will block other greenthreads trying to cache the same file
+* Fixes a race condition where multiple greenthreads were attempting to resize a file at the same time. Adds tests to verify that the image caching call will run concurrently for different files, but will block other greenthreads trying to cache the same file
 * maybe a int instead ?
 * merge lp:nova
 * merge, resolve conflicts, and update to reflect new standard deserialization function signature
@@ -20953,7 +20997,7 @@ CHANGES
 * replaced ConnectionFailed with Exception in tools/euca-get-ajax-console was not working for me with euca2tools 1.2 (version 2007-10-10, release 31337)
 * Fixed pep8 issues
 * remerge trunk
-* removed uneeded  **kw args leftover from removed account-in-url changes
+* removed uneeded **kw args leftover from removed account-in-url changes
 * fixed lp715427
 * fixed lp715427
 * Fix spacing
@@ -20999,7 +21043,7 @@ CHANGES
 * Remove addition of account to service url
 * refactored up nova/virt/xenapi/vmops _get_vm_opaque_ref() no longer inspects the param to check to see if it is an opaque ref works better for unittests
 * This fix is an updated version of Todd's lp720157. Adds SignatureVersion checking for Amazon EC2 API requests, and resolves bug #720157
-*  * pep8 cleanups in migrations  * a few bugfixes
+* * pep8 cleanups in migrations * a few bugfixes
 * Removed stale references to XenAPI
 * Moved guest_tool.py from etc/esx directory to tools/esx directory
 * Removed excess comment lines
@@ -21011,10 +21055,10 @@ CHANGES
 * add a delay before grabbing zipfile
 * Some more refactoring and a tighter unit test
 * Moved FLAGS.paste_config to its re-usable location
-* Merged with trunk and fixed conflict.  Sigh
+* Merged with trunk and fixed conflict. Sigh
 * Converted tabs to spaces in bin/nova-api
 * A few more changes
-* Inhibit inclusion of stack traces in the logs UNLESS --verbose has been specified.  This should help keep the logs compact, helping admins find the messages they're interested in (e.g., "Can't connect to MySQL server on '127.0.0.1' (111)") without having to sort through the stack traces, while still allowing developers to see those traces at will
+* Inhibit inclusion of stack traces in the logs UNLESS --verbose has been specified. This should help keep the logs compact, helping admins find the messages they're interested in (e.g., "Can't connect to MySQL server on '127.0.0.1' (111)") without having to sort through the stack traces, while still allowing developers to see those traces at will
 * Addresses bugs 704985 and 705453 by:
 * And unit tests
 * A few formatting niceties
@@ -21049,7 +21093,7 @@ CHANGES
 * Merged to trunk rev 760, and fixed comment line indent according to Jay's comment
 * Fix renaming of instance fields using update_instance api method
 * apirequest -> apireq
-*  * os_type is no longer `not null`
+* * os_type is no longer `not null`
 * respond well if personality attribute is incomplete
 * Added initial support to delete networks nova-manage
 * move the id wrapping into cloud layer instead of image_service
@@ -21158,7 +21202,7 @@ CHANGES
 * Moved the guest tools script that does IP injection inside VM on ESX server to etc/esx directory from etc/ directory
 * support adding a single personality in the osapi
 * corrected copyrights for new files
-* Updated with flags for nova-compute, nova-network and nova-console. Added the flags,  --vlan_interface=<Physical ethernet adapter name in VMware ESX host for vlan networking E.g vmnic0>  --network_driver=nova.network.vmwareapi_net [Optional, only for VLAN Networking]  --flat_network_bridge=<ESX Virtual Machine Port Group> [Optional, only for Flat Networking]  --console_manager=nova.console.vmrc_manager.ConsoleVMRCManager  --console_driver=nova.console.vmrc.VMRCSessionConsole [Optional for OTP (One time Passwords) as against host credentials]  --vmwareapi_wsdl_loc=<http://<WEB SERVER>/vimService.wsdl>
+* Updated with flags for nova-compute, nova-network and nova-console. Added the flags, --vlan_interface=<Physical ethernet adapter name in VMware ESX host for vlan networking E.g vmnic0> --network_driver=nova.network.vmwareapi_net [Optional, only for VLAN Networking] --flat_network_bridge=<ESX Virtual Machine Port Group> [Optional, only for Flat Networking] --console_manager=nova.console.vmrc_manager.ConsoleVMRCManager --console_driver=nova.console.vmrc.VMRCSessionConsole [Optional for OTP (One time Passwords) as against host credentials] --vmwareapi_wsdl_loc=<http://<WEB SERVER>/vimService.wsdl>
 * Fixed trunk merge issues
 * Merged trunk
 * At previous commit, I forget to erase conflict - fixed it
@@ -21192,7 +21236,7 @@ CHANGES
 * Fixed obvious errors with flags. Note: tests still fail
 * Merging trunk
 * Fixed default value for xenapi_agent_path flag
-* 1) merge trunk 2) removed preconfigure_xenstore 3) added jkey for broadcast address in inject_network_info 4) added 2 flags: 	4.1) xenapi_inject_image (default True) 	This flag allows for turning off data injection by mounting the image in the VDI 	(agreed with Trey Morris) 	4.2) xenapi_agent_path (default /usr/bin/xe-update-networking) 	This flag specifies the path where the agent should be located. It makes sense only 	if the above flag is True. If the agent is found, data injection is not performed
+* 1) merge trunk 2) removed preconfigure_xenstore 3) added jkey for broadcast address in inject_network_info 4) added 2 flags: 4.1) xenapi_inject_image (default True) This flag allows for turning off data injection by mounting the image in the VDI (agreed with Trey Morris) 4.2) xenapi_agent_path (default /usr/bin/xe-update-networking) This flag specifies the path where the agent should be located. It makes sense only if the above flag is True. If the agent is found, data injection is not performed
 * Wrap IptablesManager.apply() calls in utils.synchronized to avoid having different workers step on each other's toes
 * merge trunk
 * Add utils.synchronized decorator to allow for synchronising method entrance across multiple workers on the same host
@@ -21275,7 +21319,7 @@ CHANGES
 * Merged trunk
 * nothing
 * Removes processName from debug output since we aren't using multiprocessing and it doesn't exist in python 2.6.1
-* Add some methods to the ec2 admin api to work with VPNs.  Also implements and properly documents the get_hosts method
+* Add some methods to the ec2 admin api to work with VPNs. Also implements and properly documents the get_hosts method
 * Fix copypasta pep8 violation
 * moved migrate script to 007 (again..sigh)
 * Don't require metadata (hotfix for bug 724143)
@@ -21284,7 +21328,7 @@ CHANGES
 * Updated email in Authors
 * Easy and effective fix for getting the DNS value from flag file, when working in FlatNetworking mode
 * Some first steps towards resolving some of the issues brought up on the mailing list related to documenting flags
-* Support HP/LeftHand SANs.  We control the SAN by SSHing and issuing CLIQ commands.  Also improved the way iSCSI volumes are mounted: try to store the iSCSI connection info in the volume entity, in preference to doing discovery.  Also CHAP authentication support
+* Support HP/LeftHand SANs. We control the SAN by SSHing and issuing CLIQ commands. Also improved the way iSCSI volumes are mounted: try to store the iSCSI connection info in the volume entity, in preference to doing discovery. Also CHAP authentication support
 * This fix checks whether the boot/guest directory exists on the hypervisor. If that is not the case, it creates it
 * Globally exclude *.pyc files from generated tarballs
 * stubbing out _is_vdi_pv for test purposes
@@ -21338,7 +21382,7 @@ CHANGES
 * Revert commit 709. This fixes issues with the Openstack API causing 'No user for access key admin' errors
 * put the redirection back in to run_tests.sh and fix terminal colors by using original stdout
 * Deleted trailing whitespace
-* Fixes and optimizes filtering for describe_security_groups.  Also adds a unit test
+* Fixes and optimizes filtering for describe_security_groups. Also adds a unit test
 * merged trunk
 * fix for failing describe_instances test
 * merged trunk
@@ -21347,10 +21391,10 @@ CHANGES
 * Fixes lp715424, code now checks network range can fit num_networks * network_size
 * The proposed branch prevents FlatManager from executing network initialisation tasks contained in linux_net.init_host(), which are unnecessary when flat networking is used
 * Adds some features to run_tests.sh: - if it crashes right away with a short erorr log, print that directly - allow specifying tests without the nova.tests part
-* The kernel_id and the ramdisk_id are optional, yet the OpenStack API was requiring them.  In addition, with the ObjectStore these properties are not under 'properties' (as they are with Glance)
+* The kernel_id and the ramdisk_id are optional, yet the OpenStack API was requiring them. In addition, with the ObjectStore these properties are not under 'properties' (as they are with Glance)
 * merged trunk
 * merge trunk
-* Initial support for per-instance metadata, though the OpenStack API.  Key/value pairs can be specified at instance creation time and are returned in the details view.  Support limits based on quota system
+* Initial support for per-instance metadata, though the OpenStack API. Key/value pairs can be specified at instance creation time and are returned in the details view. Support limits based on quota system
 * Merged trunk
 * Removed pass
 * Changed unit test to refer to compute API, per Todd's suggestion. Avoids needing to extend our implementation of the EC2 API
@@ -21402,7 +21446,7 @@ CHANGES
 * Merged trunk
 * no, really fix lp721297 this time
 * Updated import statements according to HACKING guidelines. Added docstrings to each document. Verified pep8 over all files. Replaced some constants by enums accordingly. Still little bit more left in vm_util.py and vim_util.py files
-* Add flags for listen_port to nova-api.  This allows us to listen on one port, but return another port (for a proxy or load balancer) in calls like describe_regions, etc
+* Add flags for listen_port to nova-api. This allows us to listen on one port, but return another port (for a proxy or load balancer) in calls like describe_regions, etc
 * Fix tiny mitakes! (remove unnecessary comment, etc)
 * Fixed based on reviewer's comment. 1. Change docstrings format 2. Fix comment grammer mistake, etc
 * PEP8 again
@@ -21420,7 +21464,7 @@ CHANGES
 * added disabled services to the list of displayed services in bin/nova-manage
 * merged to trunk rev709. NEEDS to be fixed based on 3rd reviewer's comment
 * just add 005_add_live_migration.py
-* Fixed based on reviewer's comment. 1. DB schema change    vcpu/memory/hdd info were stored into Service table.    but reviewer pointed out to me creating new table is better    since Service table has too much columns
+* Fixed based on reviewer's comment. 1. DB schema change vcpu/memory/hdd info were stored into Service table. but reviewer pointed out to me creating new table is better since Service table has too much columns
 * update based on prereq branch
 * update based on prereq branch
 * fixed newline and moved import fake_flags into run_tests where it makes more sense
@@ -21436,7 +21480,7 @@ CHANGES
 * add a start_service method to our test baseclass
 * add a test for rpc consumer isolation
 * Merged with trunk
-* The OpenStack API was using the 'secret' as the 'access key'.  There is an 'access key' and there is a 'secret key'.  Access key ~= username.  Secret key ~= password.  This fix is necessary for the OpenStack Python API bindings to log in
+* The OpenStack API was using the 'secret' as the 'access key'. There is an 'access key' and there is a 'secret key'. Access key ~= username. Secret key ~= password. This fix is necessary for the OpenStack Python API bindings to log in
 * Add a bunch of docs for the new iptables hotness
 * fix pep8 and remove extra reference to reset
 * switch to explicit call to logging.setup()
@@ -21456,9 +21500,9 @@ CHANGES
 * PEP8 errors and remove check in authors file for nova-core, since nova-core owns the translation export branch
 * Merged trunk
 * Stub out VM create
-* * Removed VimService_services.py & VimService_services_types.py to reduce the diffs to normal.   These 2 files are auto-generated files containing stubs for VI SDK API end points.   The stub files are generated using ZSI SOAP stub generator module ZSI.commands.wsdl2py over   Vimservice.wsdl distributed as part of VMware Virtual Infrastructure SDK package.   To not include them in the repository we have few options to choose from,   1) Generate the stub files in build time and make them available as packages for distribution.   2) Generate the stub files in installation/configuration time if ESX/ESXi server is detected as compute provider.   Further to this, we can try to reduce the size of stub files by attempting to create stubs only for the API end points required by the module vmwareapi
+* * Removed VimService_services.py & VimService_services_types.py to reduce the diffs to normal. These 2 files are auto-generated files containing stubs for VI SDK API end points. The stub files are generated using ZSI SOAP stub generator module ZSI.commands.wsdl2py over Vimservice.wsdl distributed as part of VMware Virtual Infrastructure SDK package. To not include them in the repository we have few options to choose from, 1) Generate the stub files in build time and make them available as packages for distribution. 2) Generate the stub files in installation/configuration time if ESX/ESXi server is detected as compute provider. Further to this, we can try to reduce the size of stub files by attempting to create stubs only for the API end points required by the module vmwareapi
 * introducing a new flag timeout_nbd for manually setting the time in seconds for waiting for an upcoming NBD device
-* * Removed nova/virt/guest-tools/guest_tool.bat &   nova/virt/guest-tools/guest_tool.sh as guest_tool.py   can be invoked directly during guest startup
+* * Removed nova/virt/guest-tools/guest_tool.bat & nova/virt/guest-tools/guest_tool.sh as guest_tool.py can be invoked directly during guest startup
 * More PEP-8
 * Wrap ipv6 rules, too
 * PEP-8 fixes
@@ -21624,7 +21668,7 @@ CHANGES
 * polling tests
 * Use glance image type to determine disk type
 * Minor change. Adding a helper function stub_instance() inside the test test_get_all_server_details_with_host for readability
-* Fixes ldapdriver so that it works properly with admin client.  It now sanitizes all unicode data to strings before passing it into ldap driver.  This may need to be rethought to work properly for internationalization
+* Fixes ldapdriver so that it works properly with admin client. It now sanitizes all unicode data to strings before passing it into ldap driver. This may need to be rethought to work properly for internationalization
 * Moved definition of return_servers_with_host stub to inside the test_get_all_server_details_with_host test
 * fixed
 * Pep8 fixes
@@ -21634,7 +21678,7 @@ CHANGES
 * Update to our HACKING doc to add examples of our docstring style
 * add periodic disassociate from VlanManager to FlatDHCPManager
 * Flipped mailmap entries
-* -from migrate.versioning import exceptions as versioning_exceptions + +try: +    from migrate.versioning import exceptions as versioning_exceptions +except ImportError: +    try: +        # python-migration changed location of exceptions after 1.6.3 +        # See LP Bug #717467 +        from migrate import exceptions as versioning_exceptions +    except ImportError: +        sys.exit(_("python-migrate is not installed. Exiting."))
+* -from migrate.versioning import exceptions as versioning_exceptions + +try: + from migrate.versioning import exceptions as versioning_exceptions +except ImportError: + try: + # python-migration changed location of exceptions after 1.6.3 + # See LP Bug #717467 + from migrate import exceptions as versioning_exceptions + except ImportError: + sys.exit(_("python-migrate is not installed. Exiting."))
 * Accidently removed myself from Authors
 * Added alternate email to mailmap
 * zone manager tests
@@ -21707,7 +21751,7 @@ CHANGES
 * Merged lp:nova
 * Fixes tarball contents by adding missing scripts and files to setup.py / MANIFEST.in
 * Moving SR path code outside of glance plugin
-* When re-throwing an exception, use "raise", not "raise e".  This way we don't lose the stack trace
+* When re-throwing an exception, use "raise", not "raise e". This way we don't lose the stack trace
 * Adding more documentation, code-cleanup
 * Replace placeholders in nova.pot with some actual values
 * The proposed fix puts a VM which fails to spawn in a (new) 'FAILED' power state. It does not perform a clean-up. This because the user needs to know what has happened to the VM he/she was trying to run. Normally, API users do not have access to log files. In this case, the only way for the user to know what happened to the instance is to query its state (e.g.: doing euca-describe-instances). If we perform a complete clean-up, no information about the instance which failed to spawn will be left
@@ -21800,7 +21844,7 @@ CHANGES
 * More typos
 * fixed exceptions import from python migrate
 * Cast to host
-* This fixes a lazy-load issue in describe-instances, which causes a crash.  The solution is to specifically load the network table when retrieving an instance
+* This fixes a lazy-load issue in describe-instances, which causes a crash. The solution is to specifically load the network table when retrieving an instance
 * added instance_type_purge() to actually remove records from db
 * updated tests and added more error checking
 * Merged trunk
@@ -21849,7 +21893,7 @@ CHANGES
 * Wrap line to under 79 characters
 * Launchpad automatic translations update
 * adding myself to Authors file
-* 1. Merged to rev654(?) 2. Fixed bug continuous request.    if user continuouslly send live-migration request to same host,    concurrent request to iptables occurs, and iptables complains.    This version add retry for this issue
+* 1. Merged to rev654(?) 2. Fixed bug continuous request. if user continuouslly send live-migration request to same host, concurrent request to iptables occurs, and iptables complains. This version add retry for this issue
 * forgot to register new instance_types table
 * Plugin tidying and more migration implementation
 * fixed overlooked mandatory changes in Xen
@@ -21858,7 +21902,7 @@ CHANGES
 * - population of public and private addresses containers in openstack api - replacement of sqlalchemy model in instance stub with dict
 * Fixes the ordering of init_host commands so that iptables chains are created before they are used
 * Pass timestamps to the db layer in fixed_ip_disassociate_all_by_timeout rather than converting to strings ahead of time, otherwise comparison between timestamps would often fail
-* Added support for 'SAN' style volumes.  A SAN's big difference is that the iSCSI target won't normally run on the same host as the volume service
+* Added support for 'SAN' style volumes. A SAN's big difference is that the iSCSI target won't normally run on the same host as the volume service
 * added support to pull list of ALL instance types even those that are marked deleted
 * Indent args to ssh_connect correctly
 * Fix PEP8 violations
@@ -21868,7 +21912,7 @@ CHANGES
 * Fixed pep8 error in vm_utils.py
 * Add my name to AUTHORS, remove parentheses from the substitution made in the previous commit
 * Don't convert datetime objects to a string using .isoformat(). Leave it to sqlalchmeny (or pysqlite or whatever it is that does the magic) to work it out
-* Added test case for 'not enough memory' Successfully ran  unit tests Fixed pep8 errors
+* Added test case for 'not enough memory' Successfully ran unit tests Fixed pep8 errors
 * Give a better error message if the instance type specified is invalid
 * Launchpad automatic translations update
 * added testing for instance_types.py and refactored nova-manage to use instance_types.py instead of going directly to db
@@ -21997,7 +22041,7 @@ CHANGES
 * Working on api / manager / db support for zones
 * Launchpad automatic translations update
 * Adds security group output to describe_instances
-* Use firewall_driver flag as expected with NWFilterFirewall.  This way, either you use NWFilterFirewall directly, or you use IptablesFirewall, which creates its own instance of NWFilterFirewall for the setup_basic_filtering command.  This removes the requirement that LibvirtConnection would always need to know about NWFirewallFilter, and cleans up the area where the flag is used for loading the firewall class
+* Use firewall_driver flag as expected with NWFilterFirewall. This way, either you use NWFilterFirewall directly, or you use IptablesFirewall, which creates its own instance of NWFilterFirewall for the setup_basic_filtering command. This removes the requirement that LibvirtConnection would always need to know about NWFirewallFilter, and cleans up the area where the flag is used for loading the firewall class
 * simplify get and remove extra reference to import logging
 * Added a test that checks for localized strings in the source code that contain position-based string formatting placeholders. If found, an exception message is generated that summarizes the problem, as well as the location of the problematic code. This will prevent future trunk commits from adding localized strings that cannot be properly translated
 * Made changes based on code review
@@ -22021,7 +22065,7 @@ CHANGES
 * Properly pulling the name attribute from security_group
 * adding testcode
 * Fix Bug #703037. ra_server is None
-* Fix regression in s3 image service.  This should be a feature freeze exception
+* Fix regression in s3 image service. This should be a feature freeze exception
 * I have a feeling if we try to migrate from imageId to id we'll be tracking it down a while
 * more instanceId => id fixes
 * Fix regression in imageId => id field rename in s3 image service
@@ -22046,20 +22090,20 @@ CHANGES
 * Merged with http://bazaar.launchpad.net/~vishvananda/nova/lp703037
 * Merged with vish branch
 * Prefixed ending multi-line docstring with a newline
-* Fixing documentation strings.  Second attempt at pep8
-* Removal of image tempdir in test tearDown.  Also, reformatted a couple method comments to match the file's style
-* Add DescribeInstanceTypes to admin api.  This lets the dashboard know what sizes can be launched (using the -t flag in euca-run-instances, for example) and what resources they provide
+* Fixing documentation strings. Second attempt at pep8
+* Removal of image tempdir in test tearDown. Also, reformatted a couple method comments to match the file's style
+* Add DescribeInstanceTypes to admin api. This lets the dashboard know what sizes can be launched (using the -t flag in euca-run-instances, for example) and what resources they provide
 * Rename Mock, since it wasn't a Mock
 * Add DescribeInstanceTypes to admin api (dashboard uses it)
 * Fix for LP Bug #699654
 * Change how libvirt firewall drivers work to have meaningful flags
 * Fixed pep8 errors
-* This branch updates docs to reflect the db sync addition.  It additionally adds some useful errors to nova-manage to help people that are using old guides.  It wraps sqlalchemy errors in generic DBError. Finally, it updates nova.sh to use current settings
+* This branch updates docs to reflect the db sync addition. It additionally adds some useful errors to nova-manage to help people that are using old guides. It wraps sqlalchemy errors in generic DBError. Finally, it updates nova.sh to use current settings
 * Added myself to the authors list
 * fix pep8 issue (and my commit hook that didn't catch it)
 * Add a host argument to virt drivers's init_host method. It will be set to the name of host it's running on
 * merged trunk
-* Wraps the NotFound exception at the api layer to print the proper instance id.  Does the same for volume.  Note that euca-describe-volumes doesn't pass in volume ids properly, so you will get no error messages on euca-describe-volumes with improper ids.  We may also need to wrap a few other calls as well
+* Wraps the NotFound exception at the api layer to print the proper instance id. Does the same for volume. Note that euca-describe-volumes doesn't pass in volume ids properly, so you will get no error messages on euca-describe-volumes with improper ids. We may also need to wrap a few other calls as well
 * Fixes issue with SNATTING chain not getting created or added to POSTROUTING when nova-network starts
 * Fix for bug #702237
 * Moving init_host before metadata_forward, as metadata_forward modifies prerouting rules
@@ -22077,7 +22121,7 @@ CHANGES
 * Adds driver.init_host() call to flatdhcp driver
 * Fixed pep8 errors
 * Fixed pep8 errors
-* No longer hard coding to "/tmp/nova/images/".   Using tempdir so tests run by different people on the same development machine pass
+* No longer hard coding to "/tmp/nova/images/". Using tempdir so tests run by different people on the same development machine pass
 * Perform same filtering for OUTPUT as FORWARD in iptables. This removes a way around the filtering
 * Fix pep-8 problem from prereq branch
 * Add a host argument to virt driver's init_host method. It will be set to the name of host it's running on
@@ -22094,7 +22138,7 @@ CHANGES
 * Fixed spacing issue for pep8
 * Fixed merge conflict
 * Added myself to ./Authors file
-* Switches from project_get_network to network_get_by_instance, which actually works with all networking modes.  Also removes a couple duplicate lines from a bad merge
+* Switches from project_get_network to network_get_by_instance, which actually works with all networking modes. Also removes a couple duplicate lines from a bad merge
 * Set the default number of IP's to to reserver for VPN to 0
 * Localized strings that employ formatting should not use positional arguments, as they prevent the translator from re-ordering the translated text; instead, they should use mappings (i.e., dicts). This change replaces all localized formatted strings that use more than one formatting placeholder with a mapping version
 * add ip and network to nwfilter test
@@ -22110,7 +22154,7 @@ CHANGES
 * merged branch to name net_manager.create_networks args
 * the net_managers expect different args to create_networks, so nova-manage's call to net_manager.create_networks was changed to use named args to prevent argument mismatching
 * OS-55: Post-merge fixes
-* Fix describe_regions by changing renamed flags.  Also added a test to catch future errors
+* Fix describe_regions by changing renamed flags. Also added a test to catch future errors
 * changed nova-manage to use named arguments to net_manager.create_networks
 * Merged trunk
 * Removed tabs form source. Merged trunk changes
@@ -22128,7 +22172,7 @@ CHANGES
 * i18n!
 * merged trunk fixed whitespace in rst
 * wrap sqlalchemy exceptions in a generic error
-* Wrap instance at api layer to print the proper error.  Use same logic for volumes
+* Wrap instance at api layer to print the proper error. Use same logic for volumes
 * This patch adds two flags:
 * Using new style logging
 * Adding ability to remap VBD device
@@ -22138,7 +22182,7 @@ CHANGES
 * Add provider_fw_rules awareness to iptables firewall driver
 * No longer chmod 0777 instance directories, since nova works just fine without them
 * Updated docs for db sync requirements; merged with Vish's similar doc updates
-* Change default log formats so that:  * they include a timestamp (necessary to correlate logs)  * no longer display version on every line (shorter lines)  * use [-] instead of [N/A] (shorter lines, less scary-looking)  * show level before logger name (better human-readability)
+* Change default log formats so that: * they include a timestamp (necessary to correlate logs) * no longer display version on every line (shorter lines) * use [-] instead of [N/A] (shorter lines, less scary-looking) * show level before logger name (better human-readability)
 * OS55: pylint fixes
 * OS-55: Added unit test for network injection via xenstore
 * fixed typo
@@ -22156,7 +22200,7 @@ CHANGES
 * syntax
 * syntax error
 * added plugin call for resetnetworking
-* Fix metadata using versions other than /later.  Patch via ~ttx
+* Fix metadata using versions other than /later. Patch via ~ttx
 * should be writing some kindof network info to the xenstore now, hopefully
 * Use ttx's patch to be explict about paths, as urlmap doesn't work as I expected
 * Doc changes for db sync
@@ -22238,22 +22282,22 @@ CHANGES
 * Enable the use_ipv6 flag in unit tests by default
 * Fixed unit tests
 * merge from upstream and fix small issues
-* merged  to trunk rev572
+* merged to trunk rev572
 * fixed based on reviewer's comment
 * Basic stubbing throughout the stack
 * Enable the use_ipv6 flag in unit tests by default
 * Add an apply_instance_filter method to NWFilter driver
 * update status to 'error_deleting' on volumes where deletion fails
 * Merged trunk
-* This disables ipv6 by default.  Most use cases will not need it on and it makes dependencies more complex
+* This disables ipv6 by default. Most use cases will not need it on and it makes dependencies more complex
 * The live_migration branch ( https://code.launchpad.net/~nttdata/nova/live-migration/+merge/44940 ) was not ready to be merged
 * merge from upstream to fix conflict
 * Trunk merge
-* s/cleanup/volume.  volume commands will need their own ns in the long run
+* s/cleanup/volume. volume commands will need their own ns in the long run
 * disable ipv6 by default
 * Merged trunk
 * Plug VBD to existing instance and minor cleanup
-* fixes related to #701749.  Also, added nova-manage commands to recover from certain states:
+* fixes related to #701749. Also, added nova-manage commands to recover from certain states:
 * Implement support for streaming images from Glance when using the XenAPI virtualization backend, as per the bexar-xenapi-support-for-glance blueprint
 * Works around the app-armor problem of requiring disks with backing files to be named appropriately by changing the name of our extra disks
 * fix test to respect xml changes
@@ -22262,9 +22306,9 @@ CHANGES
 * added paste pastedeploy to nova.sh
 * authors needed for test
 * revert live_migration branch
-* This removes the need for the custom udev rule for iscsi devices.  It instead attaches the device based on /dev/disk/by-path/ which should make the setup of nova-volume a little easier
+* This removes the need for the custom udev rule for iscsi devices. It instead attaches the device based on /dev/disk/by-path/ which should make the setup of nova-volume a little easier
 * Merged trunk
-* Risk of Regression: This patch don’t modify existing functionlities, but I have added some.     1. nova.db.service.sqlalchemy.model.Serivce (adding a column to database)     2. nova.service ( nova-compute needes to insert information defined by 1 above)
+* Risk of Regression: This patch don’t modify existing functionlities, but I have added some. 1. nova.db.service.sqlalchemy.model.Serivce (adding a column to database) 2. nova.service ( nova-compute needes to insert information defined by 1 above)
 * Docstrings aren't guaranteed to exist, so split() can't automatically be called on a method without first checking for the method docstring's existence. Fixes Bug #704447
 * Removes circular import issues from bin/stack and replaces utils.loads with json.loads. Fixes Bug#704424
 * ComputeAPI -> compute.API in bin/nova-direct-api. Fixes LP#704422
@@ -22278,8 +22322,8 @@ CHANGES
 * Merged trunk
 * Merged with trunk revno 572
 * Better shutdown handling
-* Change where paste.deploy factories live and how they are called.  They are now in the nova.wsgi.Application/Middleware classes, and call the __init__ method of their class with kwargs of the local configuration of the paste file
-* Further decouple api routing decisions and move into paste.deploy configuration.  This makes paste back the nova-api binary
+* Change where paste.deploy factories live and how they are called. They are now in the nova.wsgi.Application/Middleware classes, and call the __init__ method of their class with kwargs of the local configuration of the paste file
+* Further decouple api routing decisions and move into paste.deploy configuration. This makes paste back the nova-api binary
 * Clean up openstack api test fake
 * Merged trunk
 * Add Start/Shutdown support to XenAPI
@@ -22297,8 +22341,8 @@ CHANGES
 * merge from upstream
 * pep8
 * remove print statement
-* This branch fixes two outstanding bugs in compute.  It also fixes a bad method signature in network and removes an unused method in cloud
-* Re-removes TrialTestCase.  It was accidentally added in by some merges and causing issues with running tests individually
+* This branch fixes two outstanding bugs in compute. It also fixes a bad method signature in network and removes an unused method in cloud
+* Re-removes TrialTestCase. It was accidentally added in by some merges and causing issues with running tests individually
 * removed rpc in cloud
 * merged trial fix again
 * fix bad function signature in create_networks
@@ -22306,7 +22350,7 @@ CHANGES
 * Merged trunk
 * merged lp:~vishvananda/nova/lp703012
 * remove TrialTestCase again and fix merge issues
-* import re, remove extra call in cloud.py.  Move get_console_output to compute_api
+* import re, remove extra call in cloud.py. Move get_console_output to compute_api
 * Create and use a generic handler for RPC calls to compute
 * Create and use a generic handler for RPC calls to compute
 * Create and use a generic handler for RPC calls
@@ -22325,8 +22369,8 @@ CHANGES
 * update migration script to add new tables since merge
 * sort Authors
 * Merged with r562
-* This modifies libvirt to use CoW images instead of raw images.  This is much more efficient and allows us to use the snapshotting capabilities available for qcow2 images.  It also changes local storage to be a separate drive instead of a separate partition
-* pep8.  Someday I'll remember 2 blank lines between module methods
+* This modifies libvirt to use CoW images instead of raw images. This is much more efficient and allows us to use the snapshotting capabilities available for qcow2 images. It also changes local storage to be a separate drive instead of a separate partition
+* pep8. Someday I'll remember 2 blank lines between module methods
 * remove ">>>MERGE" iin nova/db/sqlalchemy/api.py
 * checking based on pep8
 * merged trunk
@@ -22359,7 +22403,7 @@ CHANGES
 * Replaced home-grown Diffie-Hellman implementation with the M2Crypto version supplied by Soren
 * Instead of a set() to keep track of instances and security groups, use a dict(). __eq__ for stuff coming out of sqlalchemy does not do what I expected (probably due to our use of sessions)
 * Fixes broken call to __generate_rc in auth manager
-* Fixes bug #701055.  Moves code for instance termination inline so that the manager doesn't prematurely mark an instance as deleted.  Prematurely doing so causes find calls to fail, prevents instance data from being deleted, and also causes some other issues
+* Fixes bug #701055. Moves code for instance termination inline so that the manager doesn't prematurely mark an instance as deleted. Prematurely doing so causes find calls to fail, prevents instance data from being deleted, and also causes some other issues
 * Revert r510 and r512 because Josh had already done the same work
 * merged trunk
 * Fixed Authors
@@ -22368,7 +22412,7 @@ CHANGES
 * merge from upstream and fix leaks in console tests
 * make sure get_all returns
 * Fixes a typo in the name of a variable
-* Fixes #701055.  Move instance termination code inline to prevent manager from prematurely marking it as destroyed
+* Fixes #701055. Move instance termination code inline to prevent manager from prematurely marking it as destroyed
 * fix invalid variable reference in cloud api
 * fix indentation
 * add support for database migration
@@ -22417,10 +22461,10 @@ CHANGES
 * Added support of availability zones for compute. models.Service got additional field availability_zone and was created ZoneScheduler that make decisions based on this field. Also replaced fake 'nova' zone in EC2 cloud api
 * Eagerly load fixed_ip property of instances
 * Had to abandon the other branch (~annegentle/nova/newscript) because the diffs weren't working right for me. This is a fresh branch that should be merged correctly with trunk. Thanks for your patience. :)
-* Added unit tests for the xenapi-glance integration.  This adds a glance simulator that can stub in place of glance.client.Client, and enhances the xapi simulator to add the additional calls that the Glance-specific path requires
+* Added unit tests for the xenapi-glance integration. This adds a glance simulator that can stub in place of glance.client.Client, and enhances the xapi simulator to add the additional calls that the Glance-specific path requires
 * Merged with 549
 * Change command to get link local address Remove superfluous code
-* This branch adds web based serial console access.  Here is an overview of how it works (for libvirt):
+* This branch adds web based serial console access. Here is an overview of how it works (for libvirt):
 * Merged with r548
 * Fixed bug
 * Add DescribeInstanceV6 for backward compatibility
@@ -22432,7 +22476,7 @@ CHANGES
 * merge trunk, fix conflict
 * more useful prefix and fix typo in string
 * use by-path instead of custom udev script
-* Quick bugfix.  Also make the error message more specific and unique in the equivalent code in the revoke method
+* Quick bugfix. Also make the error message more specific and unique in the equivalent code in the revoke method
 * remove extra whitspaces
 * Raise meaningful exception when there aren't enough params for a sec group rule
 * bah - pep8 errors
@@ -22441,7 +22485,7 @@ CHANGES
 * Read Full Spec for implementation details and notes on how to boot an instance using OS API. http://etherpad.openstack.org/B2RK0q1CYj
 * Added my name to Authors list
 * Changes per Edays comments
-* Fixed a number of issues with the iptables firewall backend:  * Port specifications for firewalls come back from the data store as integers, but were compared as strings.  * --icmp-type was misspelled as --icmp_type (underscore vs dash)  * There weren't any unit tests for these issues
+* Fixed a number of issues with the iptables firewall backend: * Port specifications for firewalls come back from the data store as integers, but were compared as strings. * --icmp-type was misspelled as --icmp_type (underscore vs dash) * There weren't any unit tests for these issues
 * merged trunk changes
 * Removed unneeded SimpleDH code from agent plugin. Improved handling of plugin call failures
 * Now tries to install virtualenv via easy_install if not present
@@ -22449,11 +22493,11 @@ CHANGES
 * fixed issue in pluginlib_nova.py
 * Trunk merge and conflcts resolved
 * Implementation of xs-console blueprint (adds support for console proxies like xvp)
-* Fixed a number of issues with the iptables firewall backend:  * Port specifications for firewalls come back from the data store as integers, but were compared as strings.  * --icmp-type was misspelled as --icmp_type (underscore vs dash)  * There weren't any unit tests for these issues
+* Fixed a number of issues with the iptables firewall backend: * Port specifications for firewalls come back from the data store as integers, but were compared as strings. * --icmp-type was misspelled as --icmp_type (underscore vs dash) * There weren't any unit tests for these issues
 * Add support for EBS volumes to the live migration feature. Currently, only AoE is supported
 * Changed shared_ip_group detail routing
 * Changed shared_ip_group detail routing
-* A few more changes to the smoeketests.  Allows smoketests to find the nova package from the checkout.  Adds smoketests for security groups.  Also fixes a couple of typos
+* A few more changes to the smoeketests. Allows smoketests to find the nova package from the checkout. Adds smoketests for security groups. Also fixes a couple of typos
 * Fixes the metadata forwarding to work by default
 * Adds support to nova-manage to modify projects
 * Add glance to pip-requires, as we're now using the Glance client code from Nova
@@ -22476,7 +22520,7 @@ CHANGES
 * Adding modify option for projects
 * Fixes describe_instances to filter by a list of instance_ids
 * Late import module for register_models() so it doesn't create the db before flags are loaded
-* Checks for existence of volume group using vgs instead of checking to see if /dev/nova-volumes exists.  The dev is created by udev and isn't always there even if the volume group does exist
+* Checks for existence of volume group using vgs instead of checking to see if /dev/nova-volumes exists. The dev is created by udev and isn't always there even if the volume group does exist
 * Add a new firewall backend for libvirt, based on iptables
 * Create LibvirtConnection directly, rather than going through libvirt_conn.get_connection. This should remove the dependency on libvirt for tests
 * Fixed xenapi_conn wait_for_task to properly terminate LoopingCall on exception
@@ -22489,14 +22533,14 @@ CHANGES
 * alphbetized Authors
 * added myself to authors and fixed typo to follow standard
 * typo correction
-* fixed small glitch in _fetch_image_glance  virtual_size = imeta['size']
+* fixed small glitch in _fetch_image_glance virtual_size = imeta['size']
 * fixed doc make process for new nova version (rev530) machanism
 * late import module for register_models() so it doesn't create the db before flags are loaded
 * use safer vgs call
 * Return proper region info in describe_regions
 * change API classname to match the way other API's are done
 * small cleanups
-* First cut at implementing partition-adding in combination with the Glance streaming.  Untested
+* First cut at implementing partition-adding in combination with the Glance streaming. Untested
 * some small cleanups
 * merged from upstream and made applicable changes
 * Adds a mechanism to programmatically determine the version of Nova. The designated version is defined in nova/version.py. When running python setup.py from a bzr checkout, information about the bzr branch is put into nova/vcsversion.py which is conditionally imported in nova/version.py
@@ -22568,12 +22612,12 @@ CHANGES
 * pep8 fix
 * merged trunk changes
 * commit before merging trunk
-* Fixes format_instances error by passing reservation_id as a kwarg instead of an arg.  Also removes extraneous yields in test_cloud that were causing tests to pass with broken code
-* Remove module-level factory methods in favor of having a factory class-method on wsgi components themselves.  Local options from config are passed to the __init__ method of the component as kwargs
+* Fixes format_instances error by passing reservation_id as a kwarg instead of an arg. Also removes extraneous yields in test_cloud that were causing tests to pass with broken code
+* Remove module-level factory methods in favor of having a factory class-method on wsgi components themselves. Local options from config are passed to the __init__ method of the component as kwargs
 * fix the broken tests that allowed the breakage in format to happen
 * Fix format_run_instances to pass in reservation id as a kwarg
 * Add factories into the wsgi classes
-* Add blank __init__ file for fixing importability.  The stale .pyc masked this error locally
+* Add blank __init__ file for fixing importability. The stale .pyc masked this error locally
 * merged trunk changes
 * Introduces basic support for spawning, rebooting and destroying vms when using Microsoft Hyper-V as the hypervisor. Images need to be in VHD format. Note that although Hyper-V doesn't accept kernel and ramdisk separate from the image, the nova objectstore api still expects an image to have an associated aki and ari. You can use dummy aki and ari images -- the hyper-v driver won't use them or try to download them. Requires Python's WMI module
 * merged trunk changes
@@ -22681,10 +22725,10 @@ CHANGES
 * Make sure we point to the right PPA's everywhere
 * Editing note about the database schema available on the wiki
 * Modifying based on reviewer comments
-* Uses paste.deploy to make application running configurable.  This includes the ability to swap out middlewares, define new endpoints, and generally move away from having code to build wsgi routers and middleware chains into a configurable, extensible method for running wsgi servers
+* Uses paste.deploy to make application running configurable. This includes the ability to swap out middlewares, define new endpoints, and generally move away from having code to build wsgi routers and middleware chains into a configurable, extensible method for running wsgi servers
 * Modifications to the nova-CC-installer.sh based on review
-* Adds the pool_recycle option to the sql engine startup call.  This enables connection auto-timeout so that connection pooling will work properly.  The recommended setting (per sqlalchemy FAQ page) has been provided as a default for a new configuration flag.  What this means is that if a db connection sits idle for the configured # of seconds, the engine will automatically close the connection and return it to the available thread pool.  See Bug #690314 for info
-* Add burnin support.  Services are now by default disabled, but can have instances and volumes run on them using availability_zone = nova:HOSTNAME.  This lets the hardware be put through its paces without being put in the generally available pool of hardware.  There is a 'service' subcommand for nova-manage where you can enable, disable, and list statuses of services
+* Adds the pool_recycle option to the sql engine startup call. This enables connection auto-timeout so that connection pooling will work properly. The recommended setting (per sqlalchemy FAQ page) has been provided as a default for a new configuration flag. What this means is that if a db connection sits idle for the configured # of seconds, the engine will automatically close the connection and return it to the available thread pool. See Bug #690314 for info
+* Add burnin support. Services are now by default disabled, but can have instances and volumes run on them using availability_zone = nova:HOSTNAME. This lets the hardware be put through its paces without being put in the generally available pool of hardware. There is a 'service' subcommand for nova-manage where you can enable, disable, and list statuses of services
 * pep8 fixes
 * Merged compute-api-cleanup branch
 * Removed compute dependency in quota.py
@@ -22751,7 +22795,7 @@ CHANGES
 * Merged trunk
 * Calling compute api directly from OpenStack image create
 * Several documentation corrections
-* merge recent revision(version of 2010/12/28) Change:    1. Use greenthread instead of defer at nova.virt.libvirt_conn.live_migration.    2. Move nova.scheduler.manager.live_migration to nova.scheduler.driver    3. Move nova.scheduler.manager.has_enough_resource to nova.scheduler.driver    4. Any check routine in nova-manage.instance.live_migration is moved to       nova.scheduler.driver.schedule_live_migration
+* merge recent revision(version of 2010/12/28) Change: 1. Use greenthread instead of defer at nova.virt.libvirt_conn.live_migration. 2. Move nova.scheduler.manager.live_migration to nova.scheduler.driver 3. Move nova.scheduler.manager.has_enough_resource to nova.scheduler.driver 4. Any check routine in nova-manage.instance.live_migration is moved to nova.scheduler.driver.schedule_live_migration
 * Merging trunk
 * Note that contributors are required to be listed in Authors file before work can be merged into trunk
 * Mention Authors and .mailmap files in Developer Guide
@@ -22779,7 +22823,7 @@ CHANGES
 * removed lock check from show and changed returning 404 to 405
 * fix lp:695182, scheduler tests needed to DECLARE flag to run standalone
 * removed () from if (can't believe i did that) and renamed checks_lock decorator
-* Add the pool_recycle setting to enable connection pooling features for the sql engine.  The setting is hard-coded to 3600 seconds (one hour) per the recommendation provided on sqlalchemy's site
+* Add the pool_recycle setting to enable connection pooling features for the sql engine. The setting is hard-coded to 3600 seconds (one hour) per the recommendation provided on sqlalchemy's site
 * i18n
 * Pep-8 cleanup
 * Fix scheduler testcase so it knows all flags and can run in isolation
@@ -22789,11 +22833,11 @@ CHANGES
 * fixed up test for lock
 * added tests for EC2 describe_instances
 * PEP8 cleanup
-* This branch fixes an issue where VM creation fails because of a missing flag definition for 'injected_network_template'.  See Bug #695467 for more info
+* This branch fixes an issue where VM creation fails because of a missing flag definition for 'injected_network_template'. See Bug #695467 for more info
 * Added tests
 * added test for lock to os api
 * refactor
-* Re-added flag definition for injected_network_template.  Tested & verified fix in the same env as the original bug
+* Re-added flag definition for injected_network_template. Tested & verified fix in the same env as the original bug
 * forgot import
 * syntax error
 * Merged trunk
@@ -22873,7 +22917,7 @@ CHANGES
 * テスト項目表がなぜか消えたので追加
 * nova.compute.managerがこれまでの修正でデグレしていたので修正 CPUID, その他のチェックルーチンをnova.scheduler.manager.live_migrationに追加
 * nova.compute.managerがこれまでの修正でデグレしていたので修正 CPUID, その他のチェックルーチンをnova.scheduler.manager.live_migrationに追加
-*     Make nova work even when user has LANG or LC_ALL configured
+* Make nova work even when user has LANG or LC_ALL configured
 * merged trunk, resolved trivial conflict
 * merged trunk, resolved conflict
 * Faked out handling for shared ip groups so they return something
@@ -22915,7 +22959,7 @@ CHANGES
 * better bin name, and pep8
 * pep8 fixes
 * some pep8 fixes
-* removing xen/uml specific switches.  If they need special treatment, we can add it
+* removing xen/uml specific switches. If they need special treatment, we can add it
 * add license
 * delete xtra dir
 * move euca-get-ajax-console up one directory
@@ -22928,7 +22972,7 @@ CHANGES
 * added power state logging to nova.virt.xenapi.vm_utils
 * added suspend as a power state
 * last merge trunk before push
-*  merge trunk, fixed unittests, added i18n strings, cleanups etc etc
+* merge trunk, fixed unittests, added i18n strings, cleanups etc etc
 * And the common module
 * minor notes, commit before rewriting proxy with eventlet
 * There were a few unclaimed addresses in mailmap
@@ -22943,7 +22987,7 @@ CHANGES
 * Fixes reboot (and rescue) to work even if libvirt doesn't know about the instance and the network doesn't exist
 * merged trunk
 * Fixes reboot (and rescue) to work even if libvirt doesn't know about the instance and the network doesn't exist
-* Adds a flag to use the X-Forwarded-For header to find the ip of the remote server.  This is needed when you have multiple api servers with a load balancing proxy in front.  It is a flag that defaults to False because if you don't have a sanitizing proxy in front, users could masquerade as other ips by passing in the header manually
+* Adds a flag to use the X-Forwarded-For header to find the ip of the remote server. This is needed when you have multiple api servers with a load balancing proxy in front. It is a flag that defaults to False because if you don't have a sanitizing proxy in front, users could masquerade as other ips by passing in the header manually
 * Got basic xenstore operations working
 * Merged trunk
 * Modified InstanceDiagnostics and truncate action
@@ -22969,7 +23013,7 @@ CHANGES
 * working connection security
 * WSGI middleware for lockout after failed authentications of ec2 access key
 * Modifies nova-network to recreate important data on start
-* Puts the creation of nova iptables chains into the source code and cleans up rule creation.  This makes nova play more nicely with other iptables rules that may be created on the host
+* Puts the creation of nova iptables chains into the source code and cleans up rule creation. This makes nova play more nicely with other iptables rules that may be created on the host
 * Forgot the copyright info
 * i18n support for xs-snaps
 * Finished moving the middleware layers and fixed the API tests again
@@ -23008,7 +23052,7 @@ CHANGES
 * Burnin support by specifying a specific host via availability_zone for running instances and volumes on
 * Merged trunk
 * This stops the nova-network dhcp ip from being added to all of the compute hosts
-* prototype works with kvm.  now moving call from api to compute
+* prototype works with kvm. now moving call from api to compute
 * Style correction
 * fix reboot command to work even if a host is rebooted
 * Filter templates and dom0 from list_instances()
@@ -23039,7 +23083,7 @@ CHANGES
 * Typo fix, stubbing out to use admin project for now
 * Close devnull filehandle
 * added suspend and resume
-* Rewrite of vif_rules.py to meet coding standards and be more pythonic in general.  Use absolute paths for iptables/ebtables/arptables in host-rules
+* Rewrite of vif_rules.py to meet coding standards and be more pythonic in general. Use absolute paths for iptables/ebtables/arptables in host-rules
 * Add raw disk image support
 * Add my @linux2go.dk address to .mailmap
 * fixed some pep8 business
@@ -23057,8 +23101,8 @@ CHANGES
 * pep8 (again again)
 * pep8 (again)
 * small clean up
-* テストコードをレポジトリに追加 nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更  - 正常終了の戻り値をTrueに変更  - fixed_ipが見つからないときにはRemoteErrorをraiseする  - それに合わせてnova.compute.manager.live_migrationも変更
-* テストコードをレポジトリに追加 nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更  - 正常終了の戻り値をTrueに変更  - fixed_ipが見つからないときにはRemoteErrorをraiseする  - それに合わせてnova.compute.manager.live_migrationも変更
+* テストコードをレポジトリに追加 nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更 - 正常終了の戻り値をTrueに変更 - fixed_ipが見つからないときにはRemoteErrorをraiseする - それに合わせてnova.compute.manager.live_migrationも変更
+* テストコードをレポジトリに追加 nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更 - 正常終了の戻り値をTrueに変更 - fixed_ipが見つからないときにはRemoteErrorをraiseする - それに合わせてnova.compute.manager.live_migrationも変更
 * Support proxying api by using X-Forwarded-For
 * eventlet merge updates
 * Cleaned up TODOs, using flags now
@@ -23112,7 +23156,7 @@ CHANGES
 * Removed FakeInstance and introduced stubout for DB. Code clean-up
 * removed extra stuff used for debugging
 * Restore code which was changed for testing reasons to the original state. Kudos to Armando for spotting this
-*   Make nova work even when user has LANG or LC_ALL configured
+* Make nova work even when user has LANG or LC_ALL configured
 * Merged changes from trunk into the branch
 * Hostテーブルのカラム名を修正 FlatManager, FlatDHCPManagerに対応
 * merged with trunk. fixed compute.pause test
@@ -23138,13 +23182,13 @@ CHANGES
 * added volume tests and extended fake to support them
 * Make sure the new, consolidated template gets included
 * Make sure we unlock the bzr tree again in the authors unit test
-* The ppa was moved.  This updates nova.sh to reflect that
+* The ppa was moved. This updates nova.sh to reflect that
 * merged upstream
 * remove some logging
 * Merged from trunk and fixed merge issues. Also fixed pep8 issues
 * Lockout middleware for ec2 api
 * updates per review
-* Initial work on i18n.  This adds the installation of the nova domain in gettext to all the "endpoints", which are all the bin/* files and run_tests.py
+* Initial work on i18n. This adds the installation of the nova domain in gettext to all the "endpoints", which are all the bin/* files and run_tests.py
 * For some reason, I forgot to commit the other endpoints..
 * Remove default_{kernel,ramdisk} flags. They are not used anymore
 * Don't attempt to fiddle with partitions for whole-disk-images
@@ -23210,7 +23254,7 @@ CHANGES
 * Changed OpenStack API auth layer to inject a RequestContext rather than building one everywhere we need it
 * changed resume to unpause
 * Import module instead of function
-* filter describe volumes by supplied ids.  Includes unittest
+* filter describe volumes by supplied ids. Includes unittest
 * merging sandy's branch
 * Make get_diagnostics async
 * raw instances can now be launched in xenapi (only as hvm at the moment)
@@ -23285,7 +23329,7 @@ CHANGES
 * Remove dead test code
 * Add iptables based security groups implementation
 * Merged gundlach's fixes
-* Don't wrap HTTPAccepted in a fault.  Correctly pass kwargs to update_instance
+* Don't wrap HTTPAccepted in a fault. Correctly pass kwargs to update_instance
 * fixed import module in __init__.py
 * minor changes to docstrings
 * added interim solution for target discovery. Now info can either be passed via flags or discovered via iscsiadm. Long term solution is to add a few more fields to the db in the iscsi_target table with the necessary info and modify the iscsi driver to set them
@@ -23293,7 +23337,7 @@ CHANGES
 * merge trunk
 * moved XenAPI namespace definition into xenapi/__init__.py
 * pylint and pep8 fixes
-* Decreased the maximum value for instance-id generation from uint32 to int32 to avoid truncation when being entered into the instance table.  Reverted fix to make internal_id column a uint
+* Decreased the maximum value for instance-id generation from uint32 to int32 to avoid truncation when being entered into the instance table. Reverted fix to make internal_id column a uint
 * Finished cleaning up the openstack servers API, it no longer touches the database directly. Also cleaned up similar things in ec2 API and refactored a couple methods in nova.compute.api to accomodate this work
 * Merged reboot-rescue into network-manager
 * Merged trunk
@@ -23307,7 +23351,7 @@ CHANGES
 * Use newfangled compute_api
 * Update tests to use proper id
 * Fixing single node install doc
-* Oops, update 'display_name', not 'name'.  And un-extract-method
+* Oops, update 'display_name', not 'name'. And un-extract-method
 * Correctly translate instance ids to internal_ids in some spots we neglected
 * Added test files to be ignored
 * Consolidated the start instance logic in the two API classes into a single method. This also cleans up a number of small discrepencies between the two
@@ -23326,15 +23370,15 @@ CHANGES
 * Add a simple abstraction for firewalls
 * fix nova.sh to reflect new location of ppa
 * Changed null_kernel flag from aki-00000000 to nokernel
-* Guarantee that the OpenStack API's Server-related responses will always contain a "name" value.  And get rid of a redundant field in models.py
+* Guarantee that the OpenStack API's Server-related responses will always contain a "name" value. And get rid of a redundant field in models.py
 * Going for a record commits per line changes ratio
-* Oops, internal_id isn't available until after a save.  This code saves twice; if I moved it into the DB layer we could do it in one save.  However, we're moving to one sqlite db per compute worker, so I'd rather have two saves in order to keep the logic in the right layer
-* Todd points out that the API doesn't require a display_name, so let's make a default.  That way the OpenStack API can rest assured that its server responses will always have a name key
+* Oops, internal_id isn't available until after a save. This code saves twice; if I moved it into the DB layer we could do it in one save. However, we're moving to one sqlite db per compute worker, so I'd rather have two saves in order to keep the logic in the right layer
+* Todd points out that the API doesn't require a display_name, so let's make a default. That way the OpenStack API can rest assured that its server responses will always have a name key
 * Adds in more documentation contributions from Citrix
 * Remove duplicate field and make OpenStack API return server.name for EC2-API-created instances
 * Move cc_host and cc_port flags into nova/network/linux_net.py. They weren't used anywhere else
 * Add include_package_data=True to setup.py
-* With utils.default_flagfile() in its old location, the flagfile isn't being read -- twistd.serve() loads flags earlier than that point.  Move the utils.default_flagfile() call earlier so the flagfile is included
+* With utils.default_flagfile() in its old location, the flagfile isn't being read -- twistd.serve() loads flags earlier than that point. Move the utils.default_flagfile() call earlier so the flagfile is included
 * Removed a blank line
 * Broke parts of compute manager out into compute.api to separate what gets run on the API side vs the worker side
 * Move default_flagfile() call to where it will be parsed in time to load the flagfile
@@ -23344,7 +23388,7 @@ CHANGES
 * Fixed termie's tiny bits from the prior merge request
 * Delete unused flag in nova.sh
 * Moving the openldap schema out of nova.sh into it's own files, and adding sun (opends/opendj/sun directory server/fedora ds) schema files
-* OpenStack API returns the wrong x-server-management-url.  Fix that
+* OpenStack API returns the wrong x-server-management-url. Fix that
 * Cleaned up pep8 errors
 * brought latest changes from trunk
 * iscsi volumes attach/detach complete. There is only one minor issue on how to discover targets from device_path
@@ -23355,7 +23399,7 @@ CHANGES
 * Rename imageSet variable to images
 * remove FAKE_subdomain reference
 * Return the correct server_management_url
-* Default flagfile moved in trunk recently.  This updates nova.sh to run properly with the new flagfile location
+* Default flagfile moved in trunk recently. This updates nova.sh to run properly with the new flagfile location
 * Correctly handle imageId list passed to DescribeImages API call
 * update of nova.sh because default flagfile moved
 * merged trunk
@@ -23373,13 +23417,13 @@ CHANGES
 * other round of refactoring
 * further refactoring
 * typos and pep8 fixes
-* first cut of the refactoring of the XenAPIConnection class. Currently the class merged both the code for managing the XenAPI connection and the business logic for implementing Nova operations. If left like this, it would  eventually become difficult to read, maintain and extend. The file was getting kind of big and cluttered, so a quick refactoring now will save a lot of headaches later
+* first cut of the refactoring of the XenAPIConnection class. Currently the class merged both the code for managing the XenAPI connection and the business logic for implementing Nova operations. If left like this, it would eventually become difficult to read, maintain and extend. The file was getting kind of big and cluttered, so a quick refactoring now will save a lot of headaches later
 * PEP fixes
 * Adding support for modification only of user accounts
 * This modification should have occured in a different branch. Reverting
 * added attach_volume implementation
 * work on attach_volume, with a few things to iron out
-* A few more changes:  * Fixed up some flags  * Put in an updated nova.sh  * Broke out metadata forwarding so it will work in flatdhcp mode  * Added descriptive docstrings explaining the networking modes in more detail
+* A few more changes: * Fixed up some flags * Put in an updated nova.sh * Broke out metadata forwarding so it will work in flatdhcp mode * Added descriptive docstrings explaining the networking modes in more detail
 * small conflict resolution
 * first cut of changes for the attach_volume call
 * The image server should throw not found errors, don't need to check in compute manager
@@ -23416,13 +23460,12 @@ CHANGES
 * updated nova.sh
 * added flat_interface for flat_dhcp binding
 * changed bridge_dev to vlan_interface
-* 
 * Add a --logdir flag that will be prepended to the logfile setting. This makes it easier to share a flagfile between multiple workers while still having separate log files
 * added svg files (state.svg is missing because its source is a screen snapshot)
 * Unify the location of the default flagfile. Not all workers called utils.default_flagfile, and nova-manage explicitly said to use the one in /etc/nova/nova-manage.conf
 * Set and use AMQP retry interval and max retry FLAGS
 * Incorporating security groups info
-* Rename cloudServersFault (rackspace branding) to computeFault.  Fixes bug lp680285
+* Rename cloudServersFault (rackspace branding) to computeFault. Fixes bug lp680285
 * Use FLAGS instead of constants
 * Incorporating more networking info
 * Make time.sleep() non-blocking
@@ -23444,7 +23487,7 @@ CHANGES
 * Adds images (only links one in), start for a nova-manage man file, and also documents all nova-manage commands. Can we merge it in even though the man page build isn't working?
 * Added some comments
 * Check for running AMQP instances
-* first cut of fixes for bug  #676128
+* first cut of fixes for bug #676128
 * Removed .DS_Store files everywhere, begone!
 * Moves the EC2 API S3 image service into nova.service. There is still work to be done to make the APIs align, but this is the first step
 * PEP8 fixes, 2 lines were too long
@@ -23469,12 +23512,12 @@ CHANGES
 * small edit
 * Further editing and added images
 * Update version to 2011.1 as that is the version we expect to release next
-* ec2_api commands for describe_addresses and associate_address are broken in trunk.  This happened during the switch to ec2_id and internal_id.  We clearly didn't have any unit tests for this, so I've added a couple in addition to the three line change to actually fix the bugs
+* ec2_api commands for describe_addresses and associate_address are broken in trunk. This happened during the switch to ec2_id and internal_id. We clearly didn't have any unit tests for this, so I've added a couple in addition to the three line change to actually fix the bugs
 * delete floating ips after tests
 * remove extra line and ref. to LOG that doesn't exist
 * fix leaking floating ip from network unittests and use of fakeldap driver
 * Adds nova-debug to tools directory, for debugging of instances that lose networking
-* fixes errors in describe address and associate address.  Adds test cases
+* fixes errors in describe address and associate address. Adds test cases
 * Ryan_Lane's code to handle /etc/network not existing when we try to inject /etc/network/interfaces into an image
 * pep8
 * First dump of content related to Nova RPC and RabbitMQ
@@ -23485,7 +23528,7 @@ CHANGES
 * Changed from fine-grained operation control to binary admin on/off setting
 * Changed from fine-grained operation control to binary admin on/off setting
 * Lots of documentation and docstring updates
-* The docs are just going to be wrong for now.  I'll file a bug upstream
+* The docs are just going to be wrong for now. I'll file a bug upstream
 * Change how wsgified doc wrapping happens to fix test
 * merge to trunk
 * pep8
@@ -23509,14 +23552,14 @@ CHANGES
 * Add sample puppet scripts
 * fix install guide
 * getting started
-* create SPHINX_DEBUG env var.  Setting this will disable aggressive autodoc generation.  Also provide some sample for P syntax
+* create SPHINX_DEBUG env var. Setting this will disable aggressive autodoc generation. Also provide some sample for P syntax
 * fix conf file from earlier merge
 * notes, and add code to enable sorted "..todo:: P[1-5] xyz" syntax
 * merge in more networking docs - still a work in progress
 * anne's changes to the networking documentation
 * Updated Networking doc
 * anne gentle's changes to community page
-* merge in heckj's corrections  to multi-node install
+* merge in heckj's corrections to multi-node install
 * Added a .mailmap that maps addresses in bzr to people's real, preferred e-mail addresses. (I made a few guesses along the way, feel free to adjust according to what is actually the preferred e-mail)
 * Updated community.rst to fix a link to the IRC logs
 * merging in changes from ~anso/nova/trunkdoc
@@ -23548,7 +23591,7 @@ CHANGES
 * quieter doc building (less warnings)
 * File moves from "merge" of termie's branch
 * back out stacked merge
-* Doc updates:   * quieter build (fewer warnings)   * move api reference out of root directory   * auto glob api reference into a TOC   * remove old dev entries for new-fangled auto-generated docs
+* Doc updates: * quieter build (fewer warnings) * move api reference out of root directory * auto glob api reference into a TOC * remove old dev entries for new-fangled auto-generated docs
 * Normalization of Dev reference docs
 * Switch to module-per-file for the module index
 * Allow case-by-case overriding of autodocs
@@ -23577,12 +23620,12 @@ CHANGES
 * Getting Started Guide
 * Nova quickstart: move vish's novascript into contrib, and convert reademe.md to a quickstart.rst
 * merge trunk
-* Add a templating mechanism in the flag parsing.  Add a state_path flag that will be used as the top-level dir for all other state (such as images, instances, buckets, networks, etc). This way you only need to change one flag to put all your state in e.g. /var/lib/nova
+* Add a templating mechanism in the flag parsing. Add a state_path flag that will be used as the top-level dir for all other state (such as images, instances, buckets, networks, etc). This way you only need to change one flag to put all your state in e.g. /var/lib/nova
 * add missing file
 * Cleanup nova-manage section
 * have "contents" look the same as other headings
 * Enables the exclusive flag for DirectConsumer queues
-* Ensures that keys for context from the queue are passed to the context constructor as strings.  This prevents hangs on older versions of python that can't handle unicode kwargs
+* Ensures that keys for context from the queue are passed to the context constructor as strings. This prevents hangs on older versions of python that can't handle unicode kwargs
 * Fix for bug #640400, enables the exclusive flag on the temporary queues
 * pep8 whitespace and line length fixes
 * make sure context keys are not unicode so they can be passed as kwargs
@@ -23676,7 +23719,7 @@ CHANGES
 * Added Google Analytics code
 * renamed target_id to iscsi_target
 * merged gundlach's excision
-* Oops, didn't mean to check this one in.  Ninja-patch
+* Oops, didn't mean to check this one in. Ninja-patch
 * Delete BaseTestCase and with it the last reference to tornado
 * fix completely broken ServiceTestCase
 * Removes some cruft from sqlalchemy/models.py like unused imports and the unused str_id method
@@ -23741,7 +23784,7 @@ CHANGES
 * Also update version in docs
 * Update version to 2010.1 in preparation for Austin release
 * * Fills out the Parallax/Glance API calls for update/create/delete and adds unit tests for them. * Modifies the ImageController and GlanceImageService/LocalImageService calls to use index and detail routes to comply perfectly with the RS/OpenStack API
-* Makes disk.partition resize root drive to 10G, unless it is m1.tiny which just leaves it as is.  Larger images are just used as is
+* Makes disk.partition resize root drive to 10G, unless it is m1.tiny which just leaves it as is. Larger images are just used as is
 * reverted python-boto version in pip-requires to 1.9b1
 * Construct exception instead of raising a class
 * Authorize Image before download
@@ -23754,14 +23797,14 @@ CHANGES
 * Makes nova-dhcpbridge notify nova-network on old network lease updates
 * add reasonable gb to instance types
 * it is flags.DEFINE_integer, not FLAGS.define_int
-* Makes disk.partition resize root drive to 10G, unless it is m1.tiny which just leaves it as is.  Larger images are just used as is
+* Makes disk.partition resize root drive to 10G, unless it is m1.tiny which just leaves it as is. Larger images are just used as is
 * update leases on old leases as well
 * Adds a simple nova-manage command called scrub to deallocate the network and remove security groups for a projeect
 * Refresh MANIFEST.in to make the tarball include all the stuff that belongs in the tarball
 * Added test case to reproduce bug #660668 and provided a fix by using the user_id from the auth layer instead of the username header
 * Add the last few things to MANIFEST.in
 * Also add Xen template to manifest
-* Fix two problems with get_console_log:  * libvirt has this annoying "feature" where it chown()s your console to the uid running libvirt. That gets in the way of reading it. Add a call to "sudo chown ...." right before we read it to make sure it works out well.  * We were looking in the wrong directory for console.log. *blush*
+* Fix two problems with get_console_log: * libvirt has this annoying "feature" where it chown()s your console to the uid running libvirt. That gets in the way of reading it. Add a call to "sudo chown ...." right before we read it to make sure it works out well. * We were looking in the wrong directory for console.log. *blush*
 * This branch converts incoming data to the api into the proper type
 * Fixes deprecated use of context in nova-manage network create
 * Add a bunch of stuff to MANIFEST.in that has been added to the tree over the last couple of months
@@ -23769,7 +23812,7 @@ CHANGES
 * Fix two problems with get_console_log: libvirt has this annoying "feature" where it chown()s your console to the uid running libvirt. That gets in the way of reading it. We were looking in the wrong directory for console.log. *blush*
 * Fix for bug 660818 by adding the resource ID argument
 * Reorg the image services code to push glance stuff into its own directory
-* Fix some unit tests:  * One is a race due to the polling nature of rpc in eventlet based unit tests.  * The other is a more real problem. It was caused by datastore.py being removed. It wasn't caught earlier because the .pyc file was still around on the tarmac box
+* Fix some unit tests: * One is a race due to the polling nature of rpc in eventlet based unit tests. * The other is a more real problem. It was caused by datastore.py being removed. It wasn't caught earlier because the .pyc file was still around on the tarmac box
 * Add a greenthread.sleep(0.3) in get_console_output unit test. This is needed because, for eventlet based unit tests, rpc polls, and there's a bit of a race. We need to fix this properly later on
 * Perform a redisectomy on bin/nova-dhcpbridge
 * Removed 'and True' oddity
@@ -23785,7 +23828,7 @@ CHANGES
 * Added test case to reproduce bug #660668 and provided a fix by using the user_id from the auth layer instead of the username header
 * get flags for nova-manage and fix a couple more deprecations
 * Fix for bug#660818, allows tests to pass since delete expects a resource ID
-* This branch modifies the fixes all of the deprecation warnings about empty context.  It does this by adding the following fixes/features   * promotes api/context.py to context.py because it is used by the whole system   * adds more information to the context object   * passes the context through rpc   * adds a helper method for promoting to admin context (elevate())   * modifies most checks to use context.project_id instead of context.project.id to avoid     trips to the database
+* This branch modifies the fixes all of the deprecation warnings about empty context. It does this by adding the following fixes/features * promotes api/context.py to context.py because it is used by the whole system * adds more information to the context object * passes the context through rpc * adds a helper method for promoting to admin context (elevate()) * modifies most checks to use context.project_id instead of context.project.id to avoid trips to the database
 * timestamps are passed as unicode
 * Removed stray spaces that were causing an unnecessary diff line
 * merged trunk
@@ -23822,7 +23865,7 @@ CHANGES
 * Fixes LP Bug#660095
 * Xen support
 * Adds flat networking + dhcpserver mode
-* This patch removes the ugly network_index that is used by VlanManager and turns network itself into a pool.  It adds support for creating the networks through an api command:     nova-manage network create # creates all of the networks defined by flags or     nova-manage network create 5 # create the first five networks
+* This patch removes the ugly network_index that is used by VlanManager and turns network itself into a pool. It adds support for creating the networks through an api command: nova-manage network create # creates all of the networks defined by flags or nova-manage network create 5 # create the first five networks
 * Newlines again, reorder imports
 * Remove extraneous newlines
 * Fix typo, fix import
@@ -23835,13 +23878,13 @@ CHANGES
 * merged trunk
 * merged trunk
 * Revert the conversion to 64-bit ints stored in a PickleType column, because PickleType is incompatible with having a unique constraint
-* Revert 64 bit storage and use 32 bit again.  I didn't notice that we verify that randomly created uids don't already exist in the DB, so the chance of collision isn't really an issue until we get to tens of thousands of machines.  Even then we should only expect a few retries before finding a free ID
+* Revert 64 bit storage and use 32 bit again. I didn't notice that we verify that randomly created uids don't already exist in the DB, so the chance of collision isn't really an issue until we get to tens of thousands of machines. Even then we should only expect a few retries before finding a free ID
 * Add design doc, docstrings, document hyper-v wmi, python wmi usage. Adhere to pep-8 more closely
-* This patch adds support for EC2 security groups using libvirt's nwfilter mechanism, which in turn uses iptables and ebtables on the individual compute nodes. This has a number of benefits:  * Inter-VM network traffic can take the fastest route through the network without our having to worry about getting it through a central firewall.  * Not relying on a central firewall also removes a potential SPOF.  * The filtering load is distributed, offering great scalability
+* This patch adds support for EC2 security groups using libvirt's nwfilter mechanism, which in turn uses iptables and ebtables on the individual compute nodes. This has a number of benefits: * Inter-VM network traffic can take the fastest route through the network without our having to worry about getting it through a central firewall. * Not relying on a central firewall also removes a potential SPOF. * The filtering load is distributed, offering great scalability
 * Change internal_id from a 32 bit int to a 64 bit int
-* 32 bit internal_ids become 64 bit.  Since there is no 64 bit native type in SqlAlchemy, we use PickleType which uses the Binary SqlAlchemy type under the hood
+* 32 bit internal_ids become 64 bit. Since there is no 64 bit native type in SqlAlchemy, we use PickleType which uses the Binary SqlAlchemy type under the hood
 * Make Instance.name a string again instead of an integer
-* Now that the ec2 id is not the same as the name of the instance, don't compare internal_id [nee ec2_id] to instance names provided by the virtualization driver.  Compare names directly instead
+* Now that the ec2 id is not the same as the name of the instance, don't compare internal_id [nee ec2_id] to instance names provided by the virtualization driver. Compare names directly instead
 * Fix bug 659330
 * Catch exception.NotFound when getting project VPN data
 * Improve the virt unit tests
@@ -23895,19 +23938,19 @@ CHANGES
 * Update Parallax default port number to match Glance
 * One last bad line
 * merge from gundlach ec2 conversion
-* Adds ParallaxClient and TellerClient plumbing for GlanceImageService.  Adds stubs FakeParallaxClient and unit tests for LocalImageService and GlanceImageService
+* Adds ParallaxClient and TellerClient plumbing for GlanceImageService. Adds stubs FakeParallaxClient and unit tests for LocalImageService and GlanceImageService
 * Fix broken unit tests
 * Matches changes in the database / model layer with corresponding fixes to nova.virt.xenapi
 * Replace the embarrasingly crude string based tests for to_xml with some more sensible ElementTree based stuff
 * A shiny, new Auth driver backed by SQLAlchemy. Read it and weep. I did
-* Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new  nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted
+* Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted
 * Add pylint thingamajig for startService (name defined by Twisted)
 * Revert r312
 * Add a context of None to the call to db.instance_get_all
 * Honour the --verbose flag by setting the logging level to DEBUG
 * Accidentally renamed volume related stuff
 * More clean up and conflict resolution
-* Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new  nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted
+* Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted
 * Bug #653560: AttributeError in VlanManager.periodic_tasks
 * Bug #653534: NameError on session_get in sqlalchemy.api.service_update
 * Fixes to address the following issues:
@@ -23924,7 +23967,7 @@ CHANGES
 * Adjust db api usage according to recent refactoring
 * Make _dhcp_file ensure the existence of the directory containing the files it returns
 * Keep handles to loggers open after daemonizing
-* Adds BaseImageService and flag to control image service loading.  Adds unit test for local image service
+* Adds BaseImageService and flag to control image service loading. Adds unit test for local image service
 * Cleans up the unit tests that are meant to be run with nosetests
 * Refactor sqlalchemy api to perform contextual authorization
 * automatically convert strings passed into the api into their respective original values
@@ -23951,7 +23994,7 @@ CHANGES
 * Get rid of mention of mongo, since we are using openstack/swift
 * Mongo bad, swift good
 * Add a DB backend for auth manager
-*   Bug #652103: NameError in exception handler in sqlalchemy API layer
+* Bug #652103: NameError in exception handler in sqlalchemy API layer
 * Bug #652103: NameError in exception handler in sqlalchemy API layer
 * Bug #651887: xenapi list_instances completely broken
 * Grabbed the wrong copyright info
@@ -24081,7 +24124,7 @@ CHANGES
 * fix a few missed calls to _confirm_rule and 80 char issues
 * allow mgmt ip access to api
 * flush the nova chains
-* Test the AuthManager interface explicitly, in case the user/project wrappers fail or change at some point.  Those interfaces should be tested on their own
+* Test the AuthManager interface explicitly, in case the user/project wrappers fail or change at some point. Those interfaces should be tested on their own
 * Update auth manager to have a update_user method and better tests
 * add a reset command
 * Merged Termie's branch and fixed rpc test cases for tesited. Nothing is testing the Eventlet version of rpc.call though yet
@@ -24102,11 +24145,11 @@ CHANGES
 * put setup_iptables in the right dir
 * Fixed rpc consumer to use unique return connection to prevent overlap. This could be reworked to share a connection, but it should be a wait operation and not a fast poll like it was before. We could also keep a cache of opened connections to be used between requests
 * fixed a couple of typos
-*  Re-added the ramdisk line I accidentally removed
+* Re-added the ramdisk line I accidentally removed
 * Added a primary_key to AuthToken, fixed some unbound variables, and now all unit tests pass
 * Missed the model include, and fixed a broken test after the merge
 * Some more refactoring and another unit test
-*  Refactored the auth branch based on review feedback
+* Refactored the auth branch based on review feedback
 * Replaced the existing Rackspace Auth Mechanism with one that mirrors the implementation in the design document
 * Merged gundlach's branch
 * renamed ipchains to iptables
@@ -24153,15 +24196,15 @@ CHANGES
 * Moves keypairs out of ldap and into the common datastore
 * Fixes server error on get metadata when instances are started without keypairs
 * allows api servers to have a list of regions, allowing multi-cluster support if you have a shared image store and user database
-* Don't use something the shell will escape as a separator.  | is now =
+* Don't use something the shell will escape as a separator. | is now =
 * Added modify project command to auth manager to allow changing of project manager and description
 * merged trunk
 * merged trunk
 * Refactored the auth branch based on review feedback
 * Whitespace fixes
-* Support querying version list, per the RS API spec.  Fixes bug 613117
+* Support querying version list, per the RS API spec. Fixes bug 613117
 * Undo run_tests.py modification in the hopes of making this merge
-* Add a RateLimitingMiddleware to the Rackspace API, implementing the rate limits as defined by the current Cloud Servers spec.  The Middleware can do rate counting in memory, or (for deployments that have more than one API Server) can offload to a rate limiting service
+* Add a RateLimitingMiddleware to the Rackspace API, implementing the rate limits as defined by the current Cloud Servers spec. The Middleware can do rate counting in memory, or (for deployments that have more than one API Server) can offload to a rate limiting service
 * Use assertRaises
 * A small fix to the install_venv program to allow us to run it on the tarmac box as part of the tarmac build
 * Removes second copy of ProcessExecutionError that creeped in during a bad merge
@@ -24174,7 +24217,7 @@ CHANGES
 * Adds timing fields to instances and volumes to track launch times and schedule times
 * updated docstring
 * add in a few comments
-* s/\t/    /g, and add some comments
+* s/\t/ /g, and add some comments
 * add in support for ajaxterm console access
 * add security and session timeout to ajaxterm
 * initial commit of ajaxterm
@@ -24185,7 +24228,7 @@ CHANGES
 * Better error message on the failure of a spawned process, and it's a ProcessExecutionException irrespective of how the process is run (twisted or not)
 * Added iptables host initial configuration
 * Added iptables host initial configuration
-* Proposing merge to get feedback on orm refactoring.  I am very interested in feedback to all of these changes
+* Proposing merge to get feedback on orm refactoring. I am very interested in feedback to all of these changes
 * Support querying version list
 * Add support for middleware proxying to a ratelimiting.WSGIApp, for deployments that use more than one API Server and thus can't store ratelimiting counters in memory
 * Test the WSGIApp
@@ -24196,7 +24239,7 @@ CHANGES
 * More ORM object cleanup
 * Clean up use of objects coming out of the ORM
 * RateLimitingMiddleware
-* Add ratelimiting package into Nova.  After Austin it'll be pulled out into PyPI
+* Add ratelimiting package into Nova. After Austin it'll be pulled out into PyPI
 * When destroying a VM using the XenAPI backend, if the VM is still running (the usual case) the destroy fails. It needs to be powered-off first
 * Leave out the network setting from the interfaces template. It does not get passed anymore
 * Network model has network_str attribute
@@ -24213,7 +24256,7 @@ CHANGES
 * Pull S3ImageService out of this mergeprop
 * Correctly pass ip_address to templates
 * Fix call to listNWFilters
-* (Untested) Make changes to security group rules propagate to the relevant compute nodes
+* Make changes to security group rules propagate to the relevant compute nodes
 * Filters all get defined when running an instance
 * added missing yield in detach_volume
 * multiple network controllers will not create duplicate indexes
@@ -24227,7 +24270,7 @@ CHANGES
 * set leased = 0 as well on disassociate update
 * speed up the query and make sure allocated is false
 * workaround for mysql select in update
-* Periodic callback for services and managers.  Added code to automatically disassociate stale ip addresses
+* Periodic callback for services and managers. Added code to automatically disassociate stale ip addresses
 * fixed typo
 * flag for retries on volume commands
 * auto all and start all exceptions should be ignored
@@ -24405,7 +24448,7 @@ CHANGES
 * Bug #630640: Duplicated power state constants
 * Bug #630636: XenAPI VM destroy fails when the VM is still running
 * removed extra equals
-* Just a couple of UML-only fixes:  * Due to an issue with libvirt, we need to chown the disk image to root.  * Just point UML's console directly at a file, and don't bother with the pty. It was only used for debugging
+* Just a couple of UML-only fixes: * Due to an issue with libvirt, we need to chown the disk image to root. * Just point UML's console directly at a file, and don't bother with the pty. It was only used for debugging
 * removed extra file and updated sql note
 * merged fixed format instances from orm
 * fixed up format_instances
@@ -24431,7 +24474,7 @@ CHANGES
 * Move nova.endpoint.images to api.ec2 and delete nova.endpoint
 * Cloud tests pass
 * OMG got api_unittests to pass
-* send requests to the main API instead of to the EC2 subset -- so that it can parse out the '/services/' prefix.  Also, oops, match on path_info instead of path like we're supposed to
+* send requests to the main API instead of to the EC2 subset -- so that it can parse out the '/services/' prefix. Also, oops, match on path_info instead of path like we're supposed to
 * Remove unused APIRequestContext.handler
 * Use port that boto expects
 * merged orm branch
@@ -24516,7 +24559,7 @@ CHANGES
 * fixed service mox test cases
 * Renamed test.py and moved a test as per merge proposal feedback
 * fixed volume unit tests
-* work endpoint/images.py into an S3ImageService.  The translation isn't perfect, but it's a start
+* work endpoint/images.py into an S3ImageService. The translation isn't perfect, but it's a start
 * get to look like trunk
 * Set UML guests to use a file as their console. This halfway fixes get-console-output for them
 * network tests pass again
@@ -24529,7 +24572,7 @@ CHANGES
 * Use compute.instance_types for flavor data instead of a FlavorService
 * more data layer breakouts, lots of fixes to cloud.py
 * merged jesse
-* Initial support for Rackspace API /image requests.  They will eventually be backed by Glance
+* Initial support for Rackspace API /image requests. They will eventually be backed by Glance
 * Fix a pep8 violation
 * improve the volume export - sleep & check export
 * missing context and move volume_update to before the export
@@ -24566,7 +24609,7 @@ CHANGES
 * moving network code and fixing run_instances
 * jesse's run_instances changes
 * fix daemons and move network code
-* Rework virt.xenapi's concurrency model.  There were many places where we were inadvertently blocking the reactor thread.  The reworking puts all calls to XenAPI on background threads, so that they won't block the reactor thread
+* Rework virt.xenapi's concurrency model. There were many places where we were inadvertently blocking the reactor thread. The reworking puts all calls to XenAPI on background threads, so that they won't block the reactor thread
 * merged trunk and fixed merge errors
 * Refactored network model access into data abstraction layer
 * Get the output formatting correct
@@ -24635,7 +24678,7 @@ CHANGES
 * In an effort to keep new and old API code separate, I've created a nova.api to put all new API code under. This means nova.endpoint only contains the old Tornado implementation. I also cleaned up a few pep8 and other style nits in the new API code
 * No longer installs a virtualenv automatically and adds new options to bypass the interactive prompt
 * Stylistic improvements
-* Add documentation to spawn, reboot, and destroy stating that those functions should return Deferreds.  Update the fake implementations to do so (the libvirt ones already do, and making the xenapi ones do so is the subject of a current merge request)
+* Add documentation to spawn, reboot, and destroy stating that those functions should return Deferreds. Update the fake implementations to do so (the libvirt ones already do, and making the xenapi ones do so is the subject of a current merge request)
 * start with model code
 * clean up linux_net
 * merged refresh from sleepsonthefloor
@@ -24661,8 +24704,8 @@ CHANGES
 * typos
 * don't try to create and destroy lvs in fake mode
 * refactoring volume and some cleanup in model and compute
-* Add documentation to spawn, reboot, and destroy stating that those functions should return Deferreds.  Update the fake implementations to do so (the libvirt ones already do, and making the xenapi ones do so is the subject of a current merge request)
-* Rework virt.xenapi's concurrency model.  There were many places where we were inadvertently blocking the reactor thread.  The reworking puts all calls to XenAPI on background threads, so that they won't block the reactor thread
+* Add documentation to spawn, reboot, and destroy stating that those functions should return Deferreds. Update the fake implementations to do so (the libvirt ones already do, and making the xenapi ones do so is the subject of a current merge request)
+* Rework virt.xenapi's concurrency model. There were many places where we were inadvertently blocking the reactor thread. The reworking puts all calls to XenAPI on background threads, so that they won't block the reactor thread
 * add refresh on model
 * merge in latedt from vish
 * Catches and logs exceptions for rpc calls and raises a RemoteError exception on the caller side
@@ -24696,7 +24739,7 @@ CHANGES
 * Support JSON and XML in Serializer
 * Added note regarding dependency upon XenAPI.py
 * Added documentation to the nova.virt interface
-* make rpc.call propogate exception info.  Includes tests
+* make rpc.call propogate exception info. Includes tests
 * Undo the changes to cloud.py that somehow diverged from trunk
 * Mergeprop cleanup
 * Mergeprop cleanup
@@ -24721,7 +24764,7 @@ CHANGES
 * Prototype implementation of Servers controller
 * Working router that can target WSGI middleware or a standard controller+action
 * Added a xapi plugin that can pull images from nova-objectstore, and use that to get a disk, kernel, and ramdisk for the VM
-* Serializing in middleware after all... by tying to the router.  maybe a good idea?
+* Serializing in middleware after all... by tying to the router. maybe a good idea?
 * Merged with trunk
 * Actually pass in hostname and create a proper model for data in network code
 * Improved roles functionality (listing & improved test coverage)
@@ -24749,9 +24792,9 @@ CHANGES
 * pylint fixes for nova/objectstore/handler.py
 * rename create_zip to zipfile so lazy match works
 * Quick fix on location of printouts when trying to install virtualenv
-* Changes the run_tests.sh and /tools/install_venv.py scripts to be more user-friendly and not depend on PIP while not in the virtual environment.  Running run_tests.sh should not just work out of the box on all systems supporting easy_install..
-* 2 changes in doing PEP8 & Pylint cleaning:  * adding pep8 and pylint to the PIP requirements files for Tools  * light cleaning work (mostly formatting) on nova/endpoints/cloud.py
-* More changes to volume to fix concurrency issues.  Also testing updates
+* Changes the run_tests.sh and /tools/install_venv.py scripts to be more user-friendly and not depend on PIP while not in the virtual environment. Running run_tests.sh should not just work out of the box on all systems supporting easy_install..
+* 2 changes in doing PEP8 & Pylint cleaning: * adding pep8 and pylint to the PIP requirements files for Tools * light cleaning work (mostly formatting) on nova/endpoints/cloud.py
+* More changes to volume to fix concurrency issues. Also testing updates
 * Merge
 * Merged nova-tests-apitest into pylint
 * Merged nova-virt-connection into nova-tests-apitest
@@ -24769,7 +24812,7 @@ CHANGES
 * Run correctly even if called while in tools/ directory, as 'python install_venv.py'
 * This branch builds off of Todd and Michael's API branches to rework the Rackspace API endpoint and WSGI layers
 * separated scheduler types into own modules
-* Fix up variable names instead of disabling pylint naming rule.  Makes variables able to be a single letter in pylintrc
+* Fix up variable names instead of disabling pylint naming rule. Makes variables able to be a single letter in pylintrc
 * Disables warning about TODO in code comments in pylintrc
 * More pylint/pep8 cleanup, this time in bin/* files
 * pylint fixes for nova/server.py
@@ -24799,8 +24842,8 @@ CHANGES
 * pep8 and pylint cleanups
 * Some pylink and pep8 cleanups. Added a pylintrc file
 * fix copyrights for new files, etc
-* a few more commands were putting output on stderr.  In general, exceptions on stderr output seems like a bad idea
-* Moved Scheduler classes into scheduler.py.  Created a way to specify scheduler class that the SchedulerService uses..
+* a few more commands were putting output on stderr. In general, exceptions on stderr output seems like a bad idea
+* Moved Scheduler classes into scheduler.py. Created a way to specify scheduler class that the SchedulerService uses..
 * Make network its own worker! This separates the network logic from the api server, allowing us to have multiple network controllers. There a lot of stuff in networking that is ugly and should be modified with the datamodel changes. I've attempted not to mess with those things too much to keep the changeset small(ha!)
 * Fixed instance model associations to host (node) and added association to ip
 * Fixed write authorization for public images
@@ -24810,12 +24853,12 @@ CHANGES
 * Start breaking out scheduler classes..
 * WsgiStack class, eventletserver.serve. Trying to work toward a simple API that anyone can use to start an eventlet-based server composed of several WSGI apps
 * Use webob to simplify wsgi middleware
-* Made group membership check only search group instead of subtree.  Roles in a group are removed when a user is removed from that group.  Added test
+* Made group membership check only search group instead of subtree. Roles in a group are removed when a user is removed from that group. Added test
 * Fixes bug#614090 -- nova.virt.images._fetch_local_image being called with 4 args but only has 3
 * Fixed image modification authorization, API cleanup
 * fixed doc string
 * compute topic for a node is compute.node not compute:node!
-* almost there on random scheduler.  not pushing to correct compute node topic, yet, apparently..
+* almost there on random scheduler. not pushing to correct compute node topic, yet, apparently..
 * First pass at making a file pass pep8 and pylint tests as an example
 * merged trunk
 * rename networkdata to vpn
@@ -24824,7 +24867,7 @@ CHANGES
 * merged from trunk
 * added bin/nova-listinstances, which is mostly just a duplication of euca-describe-instances but doesn't go through the API
 * Fixes various concurrency issues in volume worker
-* Changed volumes to use a pool instead of globbing filesystem for concurrency reasons.  Fixed broken tests
+* Changed volumes to use a pool instead of globbing filesystem for concurrency reasons. Fixed broken tests
 * clean up nova-manage. If vpn data isn't set for user it skips it
 * method is called set_network_host
 * fixed circular reference and tests
@@ -24837,7 +24880,7 @@ CHANGES
 * use iteritems
 * reference to self.project instead of context.project + self.network_model instead of network_model
 * fixes in get public address and extra references to self.network
-* method should return network topic instead of  network host
+* method should return network topic instead of network host
 * use deferreds in network
 * don't __ module methods
 * inline commands use returnValue
@@ -24860,15 +24903,15 @@ CHANGES
 * Implement VIF creation
 * Define __contains__ on BasicModel, so that we can use "x in datamodel"
 * Fixed instance model associations to host (node) and added association to ip
-* Added a xapi plugin that can pull images from nova-objectstore, and use that to get a disk, kernel, and ramdisk for the VM.  The VM actually boots!
+* Added a xapi plugin that can pull images from nova-objectstore, and use that to get a disk, kernel, and ramdisk for the VM. The VM actually boots!
 * Added project as parameter to admin client x509 zip file download
-* Turn the private _image_url(path) into a public image_url(image).  This will be used by virt.xenapi to instruct xapi as to which images to download
+* Turn the private _image_url(path) into a public image_url(image). This will be used by virt.xenapi to instruct xapi as to which images to download
 * Merged in configurable libvirt_uri, and fixes to raw disk images from the virtualbox branch
 * Fixed up some of the raw disk stuff that broke in the abstraction out of libvirt
 * Merged with raw disk image
 * Recognize 'magic' kernel value that means "don't use a kernel" - currently aki-00000000
 * Fix Tests
-* Fixes nova volumes.  The async commands yield properly.  Simplified the call to create volume in cloud.  Added some notes
+* Fixes nova volumes. The async commands yield properly. Simplified the call to create volume in cloud. Added some notes
 * another try on fix boto
 * use user.access instead of user.id
 * Fixes access key passing in curl statement
@@ -24877,7 +24920,7 @@ CHANGES
 * Removed duplicate toXml method
 * Merged with trunk
 * Merged with trunk, added note about suspicious behaviour
-* Added exit code checking to process.py (twisted process utils).  A bit of class refactoring to make it work & cleaner. Also added some more instructive messages to install_venv.py, because otherwise people that don't know what they're doing will install the wrong pip... i.e. I did :-)
+* Added exit code checking to process.py (twisted process utils). A bit of class refactoring to make it work & cleaner. Also added some more instructive messages to install_venv.py, because otherwise people that don't know what they're doing will install the wrong pip... i.e. I did :-)
 * Make nodaemon twistd processes log to stdout
 * Make nodaemon twistd processes log to stdout
 * use the right tag
@@ -24903,7 +24946,7 @@ CHANGES
 * Move the reading of API parameters above the call to _get_image, so that they have a chance to take effect
 * Move the reading of API parameters above the call to _get_image, so that they have a chance to take effect
 * Adds initial support for XenAPI (not yet finished)
-* More merges from trunk.  Not everything came over the first time
+* More merges from trunk. Not everything came over the first time
 * Allow driver specification in AuthManager creation
 * pep8
 * Fixed pep8 issues in setup.py - thanks redbo
@@ -24928,7 +24971,7 @@ CHANGES
 * Makes ldap flags work again
 * bzr merge lp:nova/trunk
 * Tagged 0.9.0 and bumped the version to 0.9.1
-* Silence logs when associated models aren't found.  Also document methods used ofr associating things.  And get rid of some duplicated code
+* Silence logs when associated models aren't found. Also document methods used ofr associating things. And get rid of some duplicated code
 * Fix dnsmasq commands to pass in environment properly
 
 0.9.0
@@ -24951,7 +24994,7 @@ CHANGES
 * Merged trunk
 * Wired up user:project auth calls
 * Bump version to 0.9.0
-* Makes the compute and volume daemon workers use a common base class called Service. Adds a NetworkService in preparation for splitting out networking code.  General cleanup and standardizarion of naming
+* Makes the compute and volume daemon workers use a common base class called Service. Adds a NetworkService in preparation for splitting out networking code. General cleanup and standardizarion of naming
 * fixed path to keys directory
 * Fixes Bug lp:610611: deleted project vlans are deleted from the datastore before they are reused
 * Add a 'sdist' make target. It first generates a MANIFEST.in based on what's in bzr, then calls python setup.py sdist
@@ -24972,7 +25015,7 @@ CHANGES
 * A few minor fixes to the virtualenv installer that were breaking on ubuntu
 * Give SessionToken an is_expired method
 * Refactor of auth code
-* Fixes bug#610140.  Thanks to Vish and Muharem for the patch
+* Fixes bug#610140. Thanks to Vish and Muharem for the patch
 * Share my updates to the Rackspace API
 * Fixes to the virtualenv installer
 * Ensure consistent use of filename for dhcp bridge flag file
@@ -25001,7 +25044,7 @@ CHANGES
 * Added missing import
 * Replace hardcoded example URL, username, and password with flags called xenapi_connection_url, xenapi_connection_username, xenapi_connection_password
 * Fix instance cleanup
-* Fix references to image_object.  This caused an internal error when using euca-deregister
+* Fix references to image_object. This caused an internal error when using euca-deregister
 * removed unused assignment
 * More Cleanup of code
 * Fix references to get_argument, fixing internal error when calling euca-deregister
@@ -25011,11 +25054,11 @@ CHANGES
 * Merged lp:~ewanmellor/nova/lp609792
 * Merged lp:~ewanmellor/nova/lp609791
 * Replace hardcoded "nova" with FLAGS.control_exchange
-* Set durable=False on TopicPublisher, so that it matches the flag on TopicConsumer.  This ensures that either redeclaration of the control_exchange will use the same flag, and avoid AMQPChannelException
+* Set durable=False on TopicPublisher, so that it matches the flag on TopicConsumer. This ensures that either redeclaration of the control_exchange will use the same flag, and avoid AMQPChannelException
 * Add an import so that nova-compute sees the images_path flag, so that it can be used on the command line
 * Return a 404 when attempting to access a bucket that does not exist
-* Removed creation of process pools.  We don't use these any more now that we're using process.simple_execute
-* Fix assertion "Someone released me too many times: too many tokens!" when more than one process was running at the same time.  This was caused by the override of SharedPool.__new__ not stopping ProcessPool.__init__ from being run whenever process.simple_execute is called
+* Removed creation of process pools. We don't use these any more now that we're using process.simple_execute
+* Fix assertion "Someone released me too many times: too many tokens!" when more than one process was running at the same time. This was caused by the override of SharedPool.__new__ not stopping ProcessPool.__init__ from being run whenever process.simple_execute is called
 * Always make sure to set a Date headers, since it's needed to calculate the S3 Auth header
 * Updated the README file
 * Updated sphinx layout to a two-dir layout like swift. Updated a doc string to get rid of a Sphinx warning
@@ -25033,7 +25076,7 @@ CHANGES
 * Fix syslogging of exceptions by stripping newlines from the exception info
 * Merged fix for bug 608505 so unit tests pass
 * Check exit codes when spawning processes by default
-* Nobody wants to take on this twisted cleanup.  It works for now, but could be much nicer if twisted has a nice hook-point for exception mapping
+* Nobody wants to take on this twisted cleanup. It works for now, but could be much nicer if twisted has a nice hook-point for exception mapping
 * syslog changes
 * typo fixes and extra print statements removed
 * added todo for ABC
@@ -25044,7 +25087,7 @@ CHANGES
 * refactor daemons to use common base class in preparation for network refactor
 * reorder import statement and remove commented-out test case that is the same as api_unittest in objectstore_unittest
 * Fixes up Bucket to throw proper NotFound and NotEmpty exceptions in constructor and delete() method, and fixes up objectstore_unittest to properly use assertRaises() to check for proper exceptions and remove the assert_ calls
-* Fix bug 607501.  Raise 403, not exception if Authorization header not passed. Also added missing call to request.finish() & Python exception-handling style tweak
+* Fix bug 607501. Raise 403, not exception if Authorization header not passed. Also added missing call to request.finish() & Python exception-handling style tweak
 * merge with twisted-volume
 * remove all of the unused saved return values from attach_to_twisted
 * fix for describe addresses showing everyone's public ips
@@ -25060,15 +25103,15 @@ CHANGES
 * Cleanup per suggestions
 * network unittest clean up
 * Test cleanup, make driver return dictionaries and construct objects in manager
-* Able to boot without kernel or ramdisk.  libvirt.xml.template is now a Cheetah template
+* Able to boot without kernel or ramdisk. libvirt.xml.template is now a Cheetah template
 * Merged https://code.launchpad.net/~justin-fathomdb/nova/copy-error-handling
 * Merged bug fixes
-* Map exceptions to 404 / 403 codes, as was done before the move to twisted. However, I don't think this is the right way to do this in Twisted.  For example, exceptions thrown after the render method returns will not be mapped
+* Map exceptions to 404 / 403 codes, as was done before the move to twisted. However, I don't think this is the right way to do this in Twisted. For example, exceptions thrown after the render method returns will not be mapped
 * Merged lp:~justin-fathomdb/nova/bug607501
 * Merged trunk. Fixed new references to UserManager
 * I put the call to request.finish() in the wrong place. :-(
 * More docstrings, don't autocreate projects
-* Raise 401, not exception if Authorization header not passed.  Also minor fixes & Python exception-handling style tweak
+* Raise 401, not exception if Authorization header not passed. Also minor fixes & Python exception-handling style tweak
 * LdapDriver cleanup: docstrings and parameter ordering
 * Ask curl to set exit code if resource was not found
 * Fixes to dhcp lease code to use a flagfile
@@ -25081,7 +25124,7 @@ CHANGES
 * Replace tornado objectstore with twisted web
 * merged in trunk and fixed import merge errors
 * First commit of XenAPI-specific code (i.e. connections to the open-source community project Xen Cloud Platform, or the open-source commercial product Citrix XenServer)
-* Remove the tight coupling between nova.compute.monitor and libvirt.  The libvirt-specific code was placed in nova.virt.libvirt_conn by the last changeset.  This greatly simplifies the monitor code, and puts the libvirt-specific XML record parsing in a libvirt-specific place
+* Remove the tight coupling between nova.compute.monitor and libvirt. The libvirt-specific code was placed in nova.virt.libvirt_conn by the last changeset. This greatly simplifies the monitor code, and puts the libvirt-specific XML record parsing in a libvirt-specific place
 * In preparation for XenAPI support, refactor the interface between nova.compute and the hypervisor (i.e. libvirt)
 * Fixed references to nova.utils that were broken by a change of import statement in the remove-vendor merge
 * Remove s3_internal_port setting. Objectstore should be able to handle the beatings now. As such, nginx is no longer needed, so it's removed from the dependencies and the configuration files are removed
@@ -25106,7 +25149,7 @@ CHANGES
 * _redis_name wasn't picking up override_type correctly, and _redis_key wasn't using it
 * Quick fix to variable names for consistency in documentation..
 * Adds a fix to the idempotency of the test_too_many_addresses test case by adding a simple property to the BaseNetwork class and calculating the number of available IPs by asking the network class to tell the test how many static and preallocated IP addresses are in use before entering the loop to "blow up" the address allocation..
-* Adds a flag to redirect STDERR when running run_tests.py.  Defaults to a truncate-on-write logfile named run_tests.err.log.  Adds ignore rule for generated errlog file
+* Adds a flag to redirect STDERR when running run_tests.py. Defaults to a truncate-on-write logfile named run_tests.err.log. Adds ignore rule for generated errlog file
 * no more print in storage unittest
 * reorder imports spacing
 * Fixes to dhcp lease code to use a flagfile
@@ -25358,7 +25401,7 @@ CHANGES
 * make a "Running" topic instead of having it flow under "Configuration"
 * Make nginx config be in a code block
 * More doc updates: nginx & pycurl
-* Add a README, because GitHub loves them.  Update the getting started docs
+* Add a README, because GitHub loves them. Update the getting started docs
 * update spacing
 * Commit what I have almost working before diverging
 * first go at moving from tornado to twisted
@@ -25377,7 +25420,7 @@ CHANGES
 * make a "Running" topic instead of having it flow under "Configuration"
 * Make nginx config be in a code block
 * More doc updates: nginx & pycurl
-* Add a README, because GitHub loves them.  Update the getting started docs
+* Add a README, because GitHub loves them. Update the getting started docs
 * whitespace fixes for nova/utils.py
 * Add project methods to nova-manage
 * Fix novarc to use project when creating access key
diff --git a/PKG-INFO b/PKG-INFO
index a03bf00..a0c739c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 13.1.2
+Version: 13.1.3
 Summary: Cloud computing fabric controller
 Home-page: http://docs.openstack.org/developer/nova/
 Author: OpenStack
diff --git a/debian/changelog b/debian/changelog
index 80618b2..f7bf234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nova (2:13.1.3-0ubuntu1) xenial; urgency=medium
+
+  * New upstream point release for OpenStack Mitaka
+
+ -- Saverio Proto <[e-mail]>  Wed, 01 Mar 2017 09:52:51 +0000
+
 nova (2:13.1.2-0ubuntu2) xenial; urgency=medium
 
   [ dann frazier ]
diff --git a/devstack/tempest-dsvm-cells-rc b/devstack/tempest-dsvm-cells-rc
index 2eef823..e51cc45 100644
--- a/devstack/tempest-dsvm-cells-rc
+++ b/devstack/tempest-dsvm-cells-rc
@@ -86,6 +86,9 @@ r="$r|(?:tempest\.thirdparty\.boto\.test_ec2_instance_run\.InstanceRunTest\.test
 r="$r|(?:tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTestJSON\.test_lock_unlock_server)"
 # scheduler hints apparently don't work in devstack cells
 r="$r|(?:tempest\.scenario\.test_server_multinode\.TestServerMultinode\.test_schedule_to_all_nodes)"
+# test_stamp_pattern uses security groups which aren't supported in cells v1
+# tempest.scenario.test_stamp_pattern.TestStampPattern.test_stamp_pattern
+r="$r|(?:.*id\-10fd234a\-515c\-41e5\-b092\-8323060598c5.*)"
 r="$r).*$"
 
 export DEVSTACK_GATE_TEMPEST_REGEX="$r"
diff --git a/doc/source/development.environment.rst b/doc/source/development.environment.rst
index ce5d044..b618b1a 100644
--- a/doc/source/development.environment.rst
+++ b/doc/source/development.environment.rst
@@ -147,6 +147,10 @@ See `Running Python Unit Tests`_.
 
 .. _`Running Python Unit Tests`: http://docs.openstack.org/infra/manual/python.html#running-python-unit-tests
 
+Note that some unit and functional tests use a database. See the file
+``tools/test-setup.sh`` on how the databases are set up in the
+OpenStack CI environment and replicate it in your test environment.
+
 Using a remote debugger
 =======================
 
diff --git a/nova.egg-info/PKG-INFO b/nova.egg-info/PKG-INFO
index a03bf00..a0c739c 100644
--- a/nova.egg-info/PKG-INFO
+++ b/nova.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 13.1.2
+Version: 13.1.3
 Summary: Cloud computing fabric controller
 Home-page: http://docs.openstack.org/developer/nova/
 Author: OpenStack
diff --git a/nova.egg-info/SOURCES.txt b/nova.egg-info/SOURCES.txt
index b892f6b..50acc25 100644
--- a/nova.egg-info/SOURCES.txt
+++ b/nova.egg-info/SOURCES.txt
@@ -2590,6 +2590,7 @@ releasenotes/notes/bp-rbd-instance-snapshots-130e860b726ddc16.yaml
 releasenotes/notes/bp-split-network-plane-for-live-migration-40bc127734173759.yaml
 releasenotes/notes/bp-virt-driver-cpu-thread-pinning-1aaeeb6648f8e009.yaml
 releasenotes/notes/bug-1559026-47c3fa3468d66b07.yaml
+releasenotes/notes/bug-1662699-06203e7262e02aa6.yaml
 releasenotes/notes/cinder-backend-report-discard-1def1c28140def9b.yaml
 releasenotes/notes/compute_upgrade_levels_auto-97acebc7b45b76df.yaml
 releasenotes/notes/conductor_rpcapi_v2_drop-9893c27bb32d9786.yaml
@@ -2677,6 +2678,7 @@ tools/nova-manage.bash_completion
 tools/pretty_tox.sh
 tools/regression_tester.py
 tools/reserve-migrations.py
+tools/test-setup.sh
 tools/with_venv.sh
 tools/db/schema_diff.py
 tools/xenserver/cleanup_sm_locks.py
diff --git a/nova.egg-info/pbr.json b/nova.egg-info/pbr.json
index 7f38f04..6d6b01a 100644
--- a/nova.egg-info/pbr.json
+++ b/nova.egg-info/pbr.json
@@ -1 +1 @@
-{"git_version": "63f3d99", "is_release": true}
\ No newline at end of file
+{"git_version": "2e05c82", "is_release": true}
\ No newline at end of file
diff --git a/nova.egg-info/requires.txt b/nova.egg-info/requires.txt
index 07fa5ff..4bea35a 100644
--- a/nova.egg-info/requires.txt
+++ b/nova.egg-info/requires.txt
@@ -6,7 +6,6 @@ eventlet!=0.18.3,>=0.18.2
 Jinja2>=2.8
 keystonemiddleware!=4.1.0,>=4.0.0
 lxml>=2.3
-Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3
 cryptography!=1.3.0,>=1.0
 pycrypto>=2.6
 WebOb>=1.2.3
@@ -55,3 +54,6 @@ castellan>=0.3.1
 
 [:(python_version!='2.7')]
 Routes!=2.0,!=2.3.0,>=1.12.3
+
+[:(python_version=='2.7')]
+Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3
diff --git a/nova/api/openstack/compute/legacy_v2/contrib/volumes.py b/nova/api/openstack/compute/legacy_v2/contrib/volumes.py
index 6b0e996..eee9804 100644
--- a/nova/api/openstack/compute/legacy_v2/contrib/volumes.py
+++ b/nova/api/openstack/compute/legacy_v2/contrib/volumes.py
@@ -124,6 +124,8 @@ class VolumeController(wsgi.Controller):
 
         try:
             self.volume_api.delete(context, id)
+        except exception.InvalidInput as e:
+            raise exc.HTTPBadRequest(explanation=e.format_message())
         except exception.NotFound as e:
             raise exc.HTTPNotFound(explanation=e.format_message())
         return webob.Response(status_int=202)
@@ -323,6 +325,8 @@ class VolumeAttachmentController(wsgi.Controller):
             raise exc.HTTPNotFound(explanation=e.format_message())
         except exception.InstanceIsLocked as e:
             raise exc.HTTPConflict(explanation=e.format_message())
+        except exception.DevicePathInUse as e:
+            raise exc.HTTPConflict(explanation=e.format_message())
         except exception.InstanceInvalidState as state_error:
             common.raise_http_conflict_for_instance_invalid_state(state_error,
                     'attach_volume', server_id)
@@ -365,8 +369,19 @@ class VolumeAttachmentController(wsgi.Controller):
         except KeyError:
             msg = _("volumeId must be specified.")
             raise exc.HTTPBadRequest(explanation=msg)
+
         self._validate_volume_id(new_volume_id)
-        new_volume = self.volume_api.get(context, new_volume_id)
+        try:
+            new_volume = self.volume_api.get(context, new_volume_id)
+        except exception.VolumeNotFound as e:
+            # NOTE: This BadRequest is different from the above NotFound even
+            # though the same VolumeNotFound exception. This is intentional
+            # because new_volume_id is specified in a request body and if a
+            # nonexistent resource in the body (not URI) the code should be
+            # 400 Bad Request as API-WG guideline. On the other hand,
+            # old_volume_id is specified with URI. So it is valid to return
+            # NotFound response if that is not existent.
+            raise exc.HTTPBadRequest(explanation=e.format_message())
 
         instance = common.get_instance(self.compute_api, context, server_id)
 
diff --git a/nova/api/openstack/compute/schemas/block_device_mapping.py b/nova/api/openstack/compute/schemas/block_device_mapping.py
index 6c32199..1fe13aa 100644
--- a/nova/api/openstack/compute/schemas/block_device_mapping.py
+++ b/nova/api/openstack/compute/schemas/block_device_mapping.py
@@ -55,8 +55,10 @@ block_device_mapping_new_item = {
         'type': 'string', 'maxLength': 255,
     },
     # Defined as integer in nova/block_device.py:from_api()
+    # NOTE(mriedem): boot_index=None is also accepted for backward
+    # compatibility with the legacy v2 API.
     'boot_index': {
-        'type': ['integer', 'string'],
+        'type': ['integer', 'string', 'null'],
         'pattern': '^-?[0-9]+$',
     },
 }
@@ -68,6 +70,6 @@ block_device_mapping['properties'].update(block_device_mapping_new_item)
 server_create = {
     'block_device_mapping_v2': {
         'type': 'array',
-        'items': [block_device_mapping]
+        'items': block_device_mapping
     }
 }
diff --git a/nova/api/openstack/compute/schemas/block_device_mapping_v1.py b/nova/api/openstack/compute/schemas/block_device_mapping_v1.py
index 5528e3d..91ca3a2 100644
--- a/nova/api/openstack/compute/schemas/block_device_mapping_v1.py
+++ b/nova/api/openstack/compute/schemas/block_device_mapping_v1.py
@@ -44,6 +44,6 @@ legacy_block_device_mapping = {
 server_create = {
     'block_device_mapping': {
         'type': 'array',
-        'items': [legacy_block_device_mapping]
+        'items': legacy_block_device_mapping
     }
 }
diff --git a/nova/api/openstack/compute/volumes.py b/nova/api/openstack/compute/volumes.py
index 7dc2caa..27f0bcd 100644
--- a/nova/api/openstack/compute/volumes.py
+++ b/nova/api/openstack/compute/volumes.py
@@ -114,7 +114,7 @@ class VolumeController(wsgi.Controller):
         return {'volume': _translate_volume_detail_view(context, vol)}
 
     @wsgi.response(202)
-    @extensions.expected_errors(404)
+    @extensions.expected_errors((400, 404))
     def delete(self, req, id):
         """Delete a volume."""
         context = req.environ['nova.context']
@@ -122,6 +122,8 @@ class VolumeController(wsgi.Controller):
 
         try:
             self.volume_api.delete(context, id)
+        except exception.InvalidInput as e:
+            raise exc.HTTPBadRequest(explanation=e.format_message())
         except exception.VolumeNotFound as e:
             raise exc.HTTPNotFound(explanation=e.format_message())
 
@@ -320,6 +322,8 @@ class VolumeAttachmentController(wsgi.Controller):
             raise exc.HTTPNotFound(explanation=e.format_message())
         except exception.InstanceIsLocked as e:
             raise exc.HTTPConflict(explanation=e.format_message())
+        except exception.DevicePathInUse as e:
+            raise exc.HTTPConflict(explanation=e.format_message())
         except exception.InstanceInvalidState as state_error:
             common.raise_http_conflict_for_instance_invalid_state(state_error,
                     'attach_volume', server_id)
@@ -356,11 +360,21 @@ class VolumeAttachmentController(wsgi.Controller):
         old_volume_id = id
         try:
             old_volume = self.volume_api.get(context, old_volume_id)
+        except exception.VolumeNotFound as e:
+            raise exc.HTTPNotFound(explanation=e.format_message())
 
-            new_volume_id = body['volumeAttachment']['volumeId']
+        new_volume_id = body['volumeAttachment']['volumeId']
+        try:
             new_volume = self.volume_api.get(context, new_volume_id)
         except exception.VolumeNotFound as e:
-            raise exc.HTTPNotFound(explanation=e.format_message())
+            # NOTE: This BadRequest is different from the above NotFound even
+            # though the same VolumeNotFound exception. This is intentional
+            # because new_volume_id is specified in a request body and if a
+            # nonexistent resource in the body (not URI) the code should be
+            # 400 Bad Request as API-WG guideline. On the other hand,
+            # old_volume_id is specified with URI. So it is valid to return
+            # NotFound response if that is not existent.
+            raise exc.HTTPBadRequest(explanation=e.format_message())
 
         instance = common.get_instance(self.compute_api, context, server_id)
 
diff --git a/nova/block_device.py b/nova/block_device.py
index b40aa5c..8e6d034 100644
--- a/nova/block_device.py
+++ b/nova/block_device.py
@@ -197,7 +197,13 @@ class BlockDeviceDict(dict):
                 api_dict[source_type + '_id'] = device_uuid
             if source_type == 'image' and destination_type == 'local':
                 try:
-                    boot_index = int(api_dict.get('boot_index', -1))
+                    # NOTE(mriedem): boot_index can be None so we need to
+                    # account for that to avoid a TypeError.
+                    boot_index = api_dict.get('boot_index', -1)
+                    if boot_index is None:
+                        # boot_index=None is equivalent to -1.
+                        boot_index = -1
+                    boot_index = int(boot_index)
                 except ValueError:
                     raise exception.InvalidBDMFormat(
                         details=_("Boot index is invalid."))
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py
index 8dbfb48..7461b9d 100644
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -20,6 +20,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import excutils
+from oslo_utils import versionutils
 import six
 
 from nova.compute import rpcapi as compute_rpcapi
@@ -95,10 +96,21 @@ class ConductorManager(manager.Manager):
         # NOTE(danms): The RPC layer will convert to primitives for us,
         # but in this case, we need to honor the version the client is
         # asking for, so we do it before returning here.
-        return (result.obj_to_primitive(
-            target_version=object_versions[objname],
-            version_manifest=object_versions)
-                if isinstance(result, nova_object.NovaObject) else result)
+        # NOTE(hanlind): Do not convert older than requested objects,
+        # see bug #1596119.
+        if isinstance(result, nova_object.NovaObject):
+            target_version = object_versions[objname]
+            requested_version = versionutils.convert_version_to_tuple(
+                target_version)
+            actual_version = versionutils.convert_version_to_tuple(
+                result.VERSION)
+            do_backport = requested_version < actual_version
+            other_major_version = requested_version[0] != actual_version[0]
+            if do_backport or other_major_version:
+                result = result.obj_to_primitive(
+                    target_version=target_version,
+                    version_manifest=object_versions)
+        return result
 
     def object_action(self, context, objinst, objmethod, args, kwargs):
         """Perform an action on an object."""
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 30bbb09..7f983d2 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -512,6 +512,7 @@ def service_get_minimum_version(context, binary):
     min_version = context.session.query(
         func.min(models.Service.version)).\
                          filter(models.Service.binary == binary).\
+                         filter(models.Service.deleted == 0).\
                          filter(models.Service.forced_down == false()).\
                          scalar()
     return min_version
diff --git a/nova/locale/cs/LC_MESSAGES/nova-log-error.po b/nova/locale/cs/LC_MESSAGES/nova-log-error.po
index 6e47bc6..74c31ff 100644
--- a/nova/locale/cs/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/cs/LC_MESSAGES/nova-log-error.po
@@ -8,9 +8,9 @@
 # Zbyněk Schwarz <[e-mail]>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -933,9 +933,6 @@ msgstr "Nastavení štítku názvu zásoby selhalo: %s"
 msgid "Pre live migration failed at %s"
 msgstr "Příprava přesunu za provozu selhala v %s"
 
-msgid "Read/Write data failed"
-msgstr "Zápis/Čtení dat selhalo"
-
 #, python-format
 msgid "Requested VM Generation %s is not supported on this OS."
 msgstr "Požadované vytvoření VM %s není v tomto OS podporováno."
@@ -997,9 +994,6 @@ msgstr "Volání %(method)s vrátilo chybu: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Volání %(method)s vrátilo chybu: %(e)s. argumenty=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "Přenos dat selhal"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Nelze získat přístup k plovoucím IP %s"
@@ -1047,10 +1041,6 @@ msgid "Unable to find SR from VDI"
 msgstr "Nelze najít SR z VDI"
 
 #, python-format
-msgid "Unable to find a service record to update for %(binary)s on %(host)s"
-msgstr "Nelze najít záznam služby k aktualizaci pro %(binary)s na %(host)s"
-
-#, python-format
 msgid "Unable to find address %r"
 msgstr "Nelze najít adresu %r"
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index b3ba044..4cb6309 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -12,9 +12,9 @@
 # Zbyněk Schwarz <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1612,14 +1612,6 @@ msgstr ""
 "Volných %(type)s %(free).02f %(unit)s < požadovaných %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Obraz Glance %(image_id)s je v nezámém stavu - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Obraz Glance %s je ve stavu ukončení"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Skupina není platná. Důvod: %(reason)s"
 
diff --git a/nova/locale/de/LC_MESSAGES/nova-log-error.po b/nova/locale/de/LC_MESSAGES/nova-log-error.po
index a2bf4da..6a9962d 100644
--- a/nova/locale/de/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/de/LC_MESSAGES/nova-log-error.po
@@ -10,9 +10,9 @@
 # Reik Keutterling <[e-mail]>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -890,9 +890,6 @@ msgstr "Pool-set_name_label Fehler: %s"
 msgid "Pre live migration failed at %s"
 msgstr "Vor-Live-Migration fehlgeschlagen an %s"
 
-msgid "Read/Write data failed"
-msgstr "Lesen/Schreiben von Daten fehlgeschlagen"
-
 #, python-format
 msgid "Requested VM Generation %s, but provided VHD instead of VHDX."
 msgstr "Angefragte VM Generation %s, aber zur Verfügung steht VHD statt VHDX."
@@ -950,9 +947,6 @@ msgstr "Der Aufruf zu %(method)s gab einen Fehler zurück: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Der Aufruf zu %(method)s gab einen Fehler zurück: %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "Datenübertragung fehlgeschlagen"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Zugriff nicht möglich auf Floating-IP %s"
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index b69da48..81d94ed 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -15,9 +15,9 @@
 # Monika Wolf <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1793,14 +1793,6 @@ msgstr ""
 "Frei %(type)s %(free).02f %(unit)s < angefordert %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance-Abbild '%(image_id)s' ist in unbekanntem Status - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance-Abbild '%s' ist im Status 'killed'"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Gruppe nicht gültig. Grund: %(reason)s"
 
diff --git a/nova/locale/es/LC_MESSAGES/nova-log-error.po b/nova/locale/es/LC_MESSAGES/nova-log-error.po
index 5b7f637..e435a46 100644
--- a/nova/locale/es/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/es/LC_MESSAGES/nova-log-error.po
@@ -14,9 +14,9 @@
 # Eugènia Torrella <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev83\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-06-11 00:11+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -867,9 +867,6 @@ msgstr "Fallo al establecer set_name_label en conjunto: %s"
 msgid "Pre live migration failed at %s"
 msgstr "Previo a migración en vivo falló en %s"
 
-msgid "Read/Write data failed"
-msgstr "Fallo en la Lectura/Escritura de datos"
-
 #, python-format
 msgid "Requested VM Generation %s, but provided VHD instead of VHDX."
 msgstr ""
@@ -929,9 +926,6 @@ msgstr "La llamada a %(method)s ha devuelto un error: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "La llamada a %(method)s ha devuelto un error: %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "Ha fallado la transferencia de datos"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Incapaz de acceder a la Ip flotante %s"
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 9d3ad6b..90e0c3d 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -16,9 +16,9 @@
 # Eugènia Torrella <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1805,14 +1805,6 @@ msgstr ""
 "%(type)s libres %(free).02f %(unit)s < solicitados %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "La imagen Glance %(image_id)s está en estado desconocido - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "La imagen Glance %s está en estado terminado"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Grupo no válido. Motivo: %(reason)s"
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova-log-error.po b/nova/locale/fr/LC_MESSAGES/nova-log-error.po
index 568db4a..96168c0 100644
--- a/nova/locale/fr/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/fr/LC_MESSAGES/nova-log-error.po
@@ -14,9 +14,9 @@
 # Sylvie Chesneau <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -910,9 +910,6 @@ msgstr "Pool-set_name_label a échoué : %s"
 msgid "Pre live migration failed at %s"
 msgstr "Pré migration en directe a échoué a %s"
 
-msgid "Read/Write data failed"
-msgstr "Echec de Lecture/Ecriture des données"
-
 #, python-format
 msgid "Requested VM Generation %s is not supported on this OS."
 msgstr ""
@@ -975,9 +972,6 @@ msgstr "L'appel à %(method)s a renvoyé une erreur : %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "L'appel à %(method)s a renvoyé une erreur : %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "Le transfert de donnée a échoué"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Incapable d'accéder à l'IP flottante %s"
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 2836581..d509f79 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -25,9 +25,9 @@
 # Sylvie Chesneau <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1805,14 +1805,6 @@ msgstr ""
 "%(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Image Glance %(image_id)s dans un état inconnu - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Image Glance %s à l'état supprimé"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Groupe non valide. Cause : %(reason)s"
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index faea907..3f14c7c 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -11,9 +11,9 @@
 # Remo Mattei <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1782,14 +1782,6 @@ msgstr ""
 "Libero %(type)s %(free).02f %(unit)s < richiesto %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Lo stato dell'immagine glance %(image_id)s è unknown - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Lo stato dell'immagine glance %s è killed"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Gruppo non valido. Motivo: %(reason)s"
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index c3c4e79..8fa312e 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -18,9 +18,9 @@
 # 笹原 昌美 <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1764,14 +1764,6 @@ msgstr ""
 "ないです"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance イメージ %(image_id)s は不明な状態 %(state)s です。"
-
-#, fuzzy, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance イメージ %s は強制終了状態です"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "グループが無効です。理由: %(reason)s"
 
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova-log-error.po b/nova/locale/ko_KR/LC_MESSAGES/nova-log-error.po
index 9b43e4d..cc00ba0 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova-log-error.po
@@ -4,18 +4,18 @@
 #
 # Translators:
 # jaekwon.park <[e-mail]>, 2014
-# OpenStack Infra <[e-mail]>, 2015. #zanata
-# SeYeon Lee <[e-mail]>, 2016. #zanata
+# Jongwon Lee <[e-mail]>, 2016. #zanata
+# Sungjin Kang <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-22 09:56+0000\n"
-"Last-Translator: SeYeon Lee <[e-mail]>\n"
+"PO-Revision-Date: 2016-10-22 06:07+0000\n"
+"Last-Translator: Jongwon Lee <[e-mail]>\n"
 "Language: ko-KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.0\n"
@@ -927,6 +927,10 @@ msgstr "%(uuid)s 인스턴스의 %(event)s 이벤트에서 Neutron이 실패를 
 msgid "Neutron error creating port on network %s"
 msgstr "%s 네트워크에서 포트를 생성하는 중 Neutron 오류 발생"
 
+msgid "No APIs were started. Check the enabled_apis config option."
+msgstr ""
+"어떤 API도 시작 되지 않았습니다. nabled_apis  구성 옵션을 확인해 보세요."
+
 #, python-format
 msgid "No compute node record for host %s"
 msgstr "%s 호스트의 컴퓨트 노드 레코드가 없음"
@@ -981,9 +985,6 @@ msgstr "Pool-set_name_label 실패: %s"
 msgid "Pre live migration failed at %s"
 msgstr "사전 라이브 마이그레이션이 %s에서 실패함"
 
-msgid "Read/Write data failed"
-msgstr "데이터 읽기/쓰기 실패"
-
 #, python-format
 msgid "Requested VM Generation %s is not supported on this OS."
 msgstr "요청된 VM 생성 %s은(는) 이 OS에서 지원되지 않습니다."
@@ -1046,9 +1047,6 @@ msgstr "%(method)s에 대한 호출이 오류를 리턴함: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "%(method)s 호출이 오류를 리턴했음: %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "데이터 전송 실패"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Floating IP %s에 액세스할 수 없음"
@@ -1065,6 +1063,14 @@ msgid "Unable to attach volume to instance %s"
 msgstr "%s 인스턴스에 볼륨을 첨부할 수 없음"
 
 #, python-format
+msgid ""
+"Unable to call for a driver detach of volume %(vol_id)s due to the instance "
+"being registered to the remote host %(inst_host)s."
+msgstr ""
+"원격 호스트 %(inst_host)s에 등록되는 인스턴스 때문에 볼륨 %(vol_id)s에 대한 "
+"장치 분리가 호출 될 수 없습니다."
+
+#, python-format
 msgid "Unable to clear device ID for port '%s'"
 msgstr "'%s' 포트의 디바이스 ID를 지울 수 없음"
 
@@ -1095,10 +1101,6 @@ msgid "Unable to find SR from VDI"
 msgstr "VDI에서 SR을 찾을 수 없음"
 
 #, python-format
-msgid "Unable to find a service record to update for %(binary)s on %(host)s"
-msgstr "%(host)s에서 %(binary)s의 업데이트를 위한 서비스 레코드를 찾을 수 없음"
-
-#, python-format
 msgid "Unable to find address %r"
 msgstr "%r 주소를 찾을 수 없음"
 
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova-log-warning.po b/nova/locale/ko_KR/LC_MESSAGES/nova-log-warning.po
index e840ba5..64d6a60 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova-log-warning.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova-log-warning.po
@@ -3,17 +3,19 @@
 # This file is distributed under the same license as the nova project.
 #
 # Translators:
+# Ian Y. Choi <[e-mail]>, 2016. #zanata
+# Jongwon Lee <[e-mail]>, 2016. #zanata
 # Sungjin Kang <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:49+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-04-08 05:42+0000\n"
-"Last-Translator: SeYeon Lee <[e-mail]>\n"
+"PO-Revision-Date: 2016-10-25 11:38+0000\n"
+"Last-Translator: Ian Y. Choi <[e-mail]>\n"
 "Language: ko-KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.0\n"
@@ -75,6 +77,12 @@ msgstr "%s이(가) 이미 마운트되었음"
 msgid "%s swap image was used by instance but no back files existing!"
 msgstr "인스턴스에서 %s 스왑 이미지가 사용되었지만 지원 파일이 없습니다!"
 
+#, python-format
+msgid "%s. ``enabled_apis`` includes bad values. Fix to remove this warning."
+msgstr ""
+"%s. ``enabled_apis``가 옳지 않은  값을 포함하고 있습니다.  이 경고가 발생하"
+"지 않도록 수정하세요."
+
 msgid ""
 "Adding the VIR_MIGRATE_NON_SHARED_INC flag to the block_migration_flag "
 "config option, otherwise all block-migrations will be live-migrations "
@@ -454,6 +462,10 @@ msgid "Failed to abort migration %s"
 msgstr "%s 마이그레이션을 중단하는 데 실패"
 
 #, python-format
+msgid "Failed to archive %(table)s: %(error)s"
+msgstr "저장하는데 실패함 %(table)s: %(error)s"
+
+#, python-format
 msgid "Failed to close augeas %s"
 msgstr "Augeas %s을(를) 닫지 못했음"
 
@@ -523,6 +535,14 @@ msgstr "%(ext_name)s:%(exc)s 확장을 로드하는 데 실패"
 msgid "Failed to power off instance"
 msgstr "인스턴스 전원 끄기 실패"
 
+#, python-format
+msgid ""
+"Failed to remove deploy parameters from node %(node)s when unprovisioning "
+"the instance %(instance)s: %(reason)s"
+msgstr ""
+"인스턴스 %(instance)s 해제 시 노드 %(node)s 로부터의 디플로이 매개변수 삭제"
+"에 실패함: %(reason)s"
+
 msgid "Failed to resume instance"
 msgstr "인스턴스를 재개하지 못했음"
 
@@ -620,6 +640,14 @@ msgstr ""
 "호스트 %(hostname)s에 예상 데이터베이스보다 디스크 공간이 많음(%(physical)s "
 "GB > %(database)s GB)"
 
+#, python-format
+msgid ""
+"Host '%(host)s' has a metadata key '%(key)s' that is not present in the "
+"image metadata."
+msgstr ""
+" 호스트 '%(host)s'가   이미지 메타데이터에 존재하지 않은 메타데이터 키 "
+"'%(key)s'를 갖고 있습니다."
+
 msgid ""
 "Host field should not be set on the instance until resources have been "
 "claimed."
@@ -671,6 +699,10 @@ msgstr ""
 "%(err)s"
 
 #, python-format
+msgid "Ignoring EndpointNotFound for volume %(volume_id)s: %(exc)s"
+msgstr "볼륨 %(volume_id)s에 대한 EndpointNotFound 오류를 무시함: %(exc)s"
+
+#, python-format
 msgid "Ignoring Volume Error on vol %(vol_id)s during delete %(exc)s"
 msgstr "%(exc)s 삭제 중에 %(vol_id)s 볼륨에서 발생한 볼륨 오류 무시"
 
@@ -720,6 +752,14 @@ msgid "Ignoring the invalid elements of the option %(name)s: %(options)s"
 msgstr "%(name)s: %(options)s 옵션의 올바르지 않은 요소 무시"
 
 #, python-format
+msgid "Ignoring unknown cinder exception for volume %(volume_id)s: %(exc)s"
+msgstr "볼륨 %(volume_id)s에 대한 알려지지 않은 cinder 예외를 무시함: %(exc)s"
+
+#, python-format
+msgid "Ignoring unknown exception for volume %(volume_id)s: %(exc)s"
+msgstr "볼륨 %(volume_id)s에 대한 알려지지 않은 예외를 무시함:   %(exc)s"
+
+#, python-format
 msgid "Ignoring unknown libvirt live migration flag '%(flag)s'"
 msgstr "알 수 없는 libvirt 라이브 마이그레이션 플래그 '%(flag)s' 무시"
 
@@ -1764,6 +1804,14 @@ msgstr "도메인 id: %(uuid)s에서 vcpu 수를 가져올 수 없습니다. 예
 msgid "cpu_arch not defined for node '%s'"
 msgstr "'%s' 노드의 cpu_arch가 정의되지 않음"
 
+#, python-format
+msgid ""
+"cryptsetup status %(dev_name) exited abnormally (status %(exit_code)s): "
+"%(err)s"
+msgstr ""
+"cryptsetup 상태가 비정상적으로 종료 되었습니다 %(dev_name) exited abnormally "
+"((status %(exit_code)s)): %(err)s"
+
 msgid "datastore_regex is ignored when PBM is enabled"
 msgstr "PBM을 사용하면  datastore_regex가 무시됨"
 
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index db9f2fc..5177540 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova.po
@@ -8,17 +8,18 @@
 # Sungjin Kang <[e-mail]>, 2013
 # Sungjin Kang <[e-mail]>, 2013
 # Sungjin Kang <[e-mail]>, 2015. #zanata
+# Jongwon Lee <[e-mail]>, 2016. #zanata
 # Sungjin Kang <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-04-26 12:10+0000\n"
-"Last-Translator: Sungjin Kang <[e-mail]>\n"
+"PO-Revision-Date: 2016-10-22 06:02+0000\n"
+"Last-Translator: Jongwon Lee <[e-mail]>\n"
 "Language: ko-KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.0\n"
@@ -651,6 +652,14 @@ msgstr ""
 "요합니다."
 
 #, python-format
+msgid ""
+"Cannot block migrate instance %(uuid)s with mapped volumes. Selective block "
+"device migration is not supported with tunnelled block migrations."
+msgstr ""
+"볼륨에 매핑 되는 인스턴스 %(uuid)s 마이그레이션을 차단할 수 없습니다. 선택적 "
+"블록 장치 마이그레이션은 터널링 된 블록 마이그레이션과 지원 되지 않습니다."
+
+#, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr "Orphaned %(objtype)s 오브젝트에서 %(method)s 메소드를 호출할 수 없음"
 
@@ -1687,14 +1696,6 @@ msgid "Free %(type)s %(free).02f %(unit)s < requested %(requested)d %(unit)s"
 msgstr "여유 %(type)s %(free).02f %(unit)s < 요청된 %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance 이미지 %(image_id)s이(가) 알 수 없는 상태에 있음 - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance 이미지 %s이(가) 강제 종료 상태에 있음"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "그룹이 올바르지 않습니다. 이유: %(reason)s"
 
@@ -2249,6 +2250,10 @@ msgstr "올바르지 않은 이미지 href %(image_href)s."
 msgid "Invalid image metadata"
 msgstr "올바르지 않은 이미지 메타데이터"
 
+#, python-format
+msgid "Invalid image metadata. Error: %s"
+msgstr "유효하지 않은 이미지 메타데이터. 오류:  %s"
+
 msgid "Invalid imageRef provided."
 msgstr "올바르지 않은 imageRef가 제공되었습니다. "
 
@@ -2355,6 +2360,9 @@ msgstr "올바르지 않은 요청 본문"
 msgid "Invalid request body: %s"
 msgstr "올바르지 않은 요청 본문: %s"
 
+msgid "Invalid rescue_image_ref provided."
+msgstr "유효하지 않은 escue_image_ref 가 제공 됨."
+
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "올바르지 않은 예약 만기 %(expire)s."
@@ -3200,6 +3208,10 @@ msgstr ""
 "모든 %(unit_string)s의 %(uri)s에는 %(value)s %(verb)s 요청만 작성할 수 있습니"
 "다."
 
+#, python-format
+msgid "Only %d SCSI controllers are allowed to be created on this instance."
+msgstr "%d SCSI 컨트롤러만 이 인스턴스에서의 생성이 허용 됩니다."
+
 msgid "Only 'updated_since', 'project_id' and 'deleted' are understood."
 msgstr "'updated_since', 'project_id', 'deleted'만 이해됩니다."
 
@@ -4063,6 +4075,9 @@ msgstr ""
 "네트워크 범위가 %(num_networks)s에 맞추기에는 충분히 크지 않습니다. 네트워크 "
 "크기는 %(network_size)s입니다."
 
+msgid "The networks quota is disabled"
+msgstr "네트워크 할당이 비활성화 되어 있습니다."
+
 #, python-format
 msgid "The number of defined ports: %(ports)d is over the limit: %(quota)d"
 msgstr "정의된 포트 수 %(ports)d이(가) 한계를 초과함: %(quota)d"
@@ -4605,6 +4620,10 @@ msgid "Unknown argument: port"
 msgstr "알 수 없는 인수: 포트"
 
 #, python-format
+msgid "Unknown auth type: %s"
+msgstr "알려지지 않은 인증 유형: %s"
+
+#, python-format
 msgid "Unknown chain: %r"
 msgstr "알 수 없는 체인: %r"
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova-log-error.po b/nova/locale/pt_BR/LC_MESSAGES/nova-log-error.po
index 22792de..7db7b73 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova-log-error.po
@@ -7,9 +7,9 @@
 # Carlos Marques <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1004,9 +1004,6 @@ msgstr "Pool-set_name_label falhou: %s"
 msgid "Pre live migration failed at %s"
 msgstr "A pré-migração em tempo real falhou em %s"
 
-msgid "Read/Write data failed"
-msgstr "A Leitura/Gravação de dados falhou"
-
 #, python-format
 msgid "Requested VM Generation %s is not supported on this OS."
 msgstr "O VM Generation solicitado %s não é suportado neste S.O."
@@ -1072,9 +1069,6 @@ msgstr "A chamada para %(method)s retornou um erro: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "A chamada para %(method)s retornou um erro: %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "A transferência de dados falhou"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "Não é possível acessar o IP flutuante %s"
@@ -1123,12 +1117,6 @@ msgid "Unable to find SR from VDI"
 msgstr "Não é possível localizar SR a partir do VDI"
 
 #, python-format
-msgid "Unable to find a service record to update for %(binary)s on %(host)s"
-msgstr ""
-"Não é possível localizar um registro de serviço para atualizar %(binary)s no "
-"%(host)s"
-
-#, python-format
 msgid "Unable to find address %r"
 msgstr "Não foi possível localizar o endereço %r"
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 4a41084..cc9da68 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -18,9 +18,9 @@
 # Carlos Marques <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1770,15 +1770,6 @@ msgstr ""
 "%(type)s %(free).02f %(unit)s livres < %(requested)d %(unit)s solicitadas"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr ""
-"A imagem de visão geral %(image_id)s está em estado desconhecido - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "A imagem de visão geral %s está em estado eliminado"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "O grupo não é válido. Motivo: %(reason)s"
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 26c5979..3784e80 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -17,9 +17,9 @@
 # Lucas Palm <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1768,15 +1768,6 @@ msgstr ""
 "%(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr ""
-"Образ Glance %(image_id)s находится в неизвестном состоянии - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Образ Glance %s находится в удаленном состоянии"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Неверная группа. Причина: %(reason)s"
 
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova-log-error.po b/nova/locale/tr_TR/LC_MESSAGES/nova-log-error.po
index 28cdb8d..660a73b 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova-log-error.po
@@ -5,11 +5,12 @@
 # Translators:
 # OpenStack Infra <[e-mail]>, 2015. #zanata
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
+# Mücahit Büyükyılmaz <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev12\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:50+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -823,9 +824,6 @@ msgstr "Havuz-set_name_label başarısız: %s"
 msgid "Pre live migration failed at %s"
 msgstr "Canlı öncesi göç %s de başarısız"
 
-msgid "Read/Write data failed"
-msgstr "Veri okuma/yazma başarısız"
-
 #, python-format
 msgid "Requested VM Generation %s, but provided VHD instead of VHDX."
 msgstr "VM Oluşturma %s istendi, ama VHDX yerine VHD sağlandı."
@@ -880,9 +878,6 @@ msgstr "%(method)s çağrısı hata döndürdü: %(e)s."
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "%(method)s çağrısı bir hata döndürdü: %(e)s. args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "Veri aktarımı başarısız"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "%s değişken IP'sine erişilemiyor"
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index f0abdcd..9400e5d 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -10,9 +10,9 @@
 # Mücahit Büyükyılmaz <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.0.1.dev83\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-06-11 00:10+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1375,14 +1375,6 @@ msgid "Free %(type)s %(free).02f %(unit)s < requested %(requested)d %(unit)s"
 msgstr "Boş %(type)s %(free).02f %(unit)s < istenen %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance imajı %(image_id)s bilinmeyen durumda - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance imajı %s öldürülmüş durumda"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Grup geçerli değil. Sebep: %(reason)s"
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova-log-error.po b/nova/locale/zh_CN/LC_MESSAGES/nova-log-error.po
index 186e953..f758d20 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova-log-error.po
@@ -12,9 +12,9 @@
 # maoshuai <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.1.dev3\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-07-19 22:58+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -858,9 +858,6 @@ msgstr "Pool-set_name_label 失败：%s"
 msgid "Pre live migration failed at %s"
 msgstr "预热迁移失败 %s"
 
-msgid "Read/Write data failed"
-msgstr "读/写数据失败"
-
 #, python-format
 msgid "Requested VM Generation %s is not supported on this OS."
 msgstr "这个系统不支持请求VM Generation %s。"
@@ -920,9 +917,6 @@ msgstr "对 %(method)s 的调用返回错误：%(e)s。"
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "对 %(method)s 的调用返回了错误：%(e)s。args=%(args)r"
 
-msgid "Transfer data failed"
-msgstr "传输数据失败"
-
 #, python-format
 msgid "Unable to access floating IP %s"
 msgstr "无法访问浮动IP %s"
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 1a460aa..4518292 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -34,9 +34,9 @@
 # maoshuai <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1628,14 +1628,6 @@ msgid "Free %(type)s %(free).02f %(unit)s < requested %(requested)d %(unit)s"
 msgstr "剩余的 %(type)s %(free).02f %(unit)s 小于请求的 %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance 映像 %(image_id)s 处于未知状态 - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance 映像 %s 为已终止状态"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "组无效。原因：%(reason)s"
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 1009b09..5b3a7b8 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -10,9 +10,9 @@
 # Jennifer <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 13.1.2.dev11\n"
+"Project-Id-Version: nova 13.1.3.dev12\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-09-07 20:56+0000\n"
+"POT-Creation-Date: 2016-10-18 10:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1609,14 +1609,6 @@ msgid "Free %(type)s %(free).02f %(unit)s < requested %(requested)d %(unit)s"
 msgstr "可用 %(type)s %(free).02f %(unit)s 小於所要求的 %(requested)d %(unit)s"
 
 #, python-format
-msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr "Glance 映像檔 %(image_id)s 處於不明狀態 - %(state)s"
-
-#, python-format
-msgid "Glance image %s is in killed state"
-msgstr "Glance 映像檔 %s 處於已結束狀態"
-
-#, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "群組無效。原因：%(reason)s"
 
diff --git a/nova/objects/pci_device.py b/nova/objects/pci_device.py
index a0b05e7..28e61af 100644
--- a/nova/objects/pci_device.py
+++ b/nova/objects/pci_device.py
@@ -118,7 +118,7 @@ class PciDevice(base.NovaPersistentObject, base.NovaObject):
     def should_migrate_data():
         # NOTE(ndipanov): Only migrate parent_addr if all services are up to at
         # least version 4 - this should only ever be called from save()
-        services = ('conductor', 'api')
+        services = ('conductor', 'osapi_compute')
         min_parent_addr_version = 4
 
         min_deployed = min(objects.Service.get_minimum_version(
diff --git a/nova/pci/utils.py b/nova/pci/utils.py
index e10a303..b28568f 100644
--- a/nova/pci/utils.py
+++ b/nova/pci/utils.py
@@ -82,7 +82,7 @@ def get_function_by_ifname(ifname):
     if os.path.isdir(dev_path):
         try:
             # sriov_totalvfs contains the maximum possible VFs for this PF
-            with open(dev_path + _SRIOV_TOTALVFS) as fd:
+            with open(os.path.join(dev_path, _SRIOV_TOTALVFS)) as fd:
                 sriov_totalvfs = int(fd.read())
                 return (os.readlink(dev_path).strip("./"),
                         sriov_totalvfs > 0)
diff --git a/nova/tests/unit/api/openstack/compute/test_block_device_mapping.py b/nova/tests/unit/api/openstack/compute/test_block_device_mapping.py
index c342236..40ac9a9 100644
--- a/nova/tests/unit/api/openstack/compute/test_block_device_mapping.py
+++ b/nova/tests/unit/api/openstack/compute/test_block_device_mapping.py
@@ -150,6 +150,66 @@ class BlockDeviceMappingTestV21(test.TestCase):
         params = {block_device_mapping.ATTRIBUTE_NAME: self.bdm}
         self._test_create(params, no_image=True)
 
+    def test_create_instance_with_invalid_bdm_in_2nd_dict(self):
+        bdm_1st = {"source_type": "image", "delete_on_termination": True,
+                   "boot_index": 0,
+                   "uuid": "2ff3a1d3-ed70-4c3f-94ac-941461153bc0",
+                   "destination_type": "local"}
+        bdm_2nd = {"source_type": "volume",
+                   "uuid": "99d92140-3d0c-4ea5-a49c-f94c38c607f0",
+                   "destination_type": "invalid"}
+        bdm = [bdm_1st, bdm_2nd]
+
+        params = {block_device_mapping.ATTRIBUTE_NAME: bdm,
+                  'imageRef': '2ff3a1d3-ed70-4c3f-94ac-941461153bc0'}
+        self.assertRaises(exception.ValidationError,
+                          self._test_create, params)
+
+    def test_create_instance_with_boot_index_none_ok(self):
+        """Tests creating a server with two block devices. One is the boot
+        device and the other is a non-bootable device.
+        """
+        # From the docs:
+        # To disable a device from booting, set the boot index to a negative
+        # value or use the default boot index value, which is None. The
+        # simplest usage is, set the boot index of the boot device to 0 and use
+        # the default boot index value, None, for any other devices.
+        bdms = [
+            # This is the bootable device that would create a 20GB cinder
+            # volume from the given image.
+            {
+                'source_type': 'image',
+                'destination_type': 'volume',
+                'boot_index': 0,
+                'uuid': '155d900f-4e14-4e4c-a73d-069cbf4541e6',
+                'volume_size': 20
+            },
+            # This is the non-bootable 10GB ext4 ephemeral block device.
+            {
+                'source_type': 'blank',
+                'destination_type': 'local',
+                'boot_index': None,
+                # If 'guest_format' is 'swap' then a swap device is created.
+                'guest_format': 'ext4'
+            }
+        ]
+        params = {block_device_mapping.ATTRIBUTE_NAME: bdms}
+        self._test_create(params, no_image=True)
+
+    def test_create_instance_with_boot_index_none_image_local_fails(self):
+        """Tests creating a server with a local image-based block device which
+        has a boot_index of None which is invalid.
+        """
+        bdms = [{
+            'source_type': 'image',
+            'destination_type': 'local',
+            'boot_index': None,
+            'uuid': '155d900f-4e14-4e4c-a73d-069cbf4541e6'
+        }]
+        params = {block_device_mapping.ATTRIBUTE_NAME: bdms}
+        self.assertRaises(exc.HTTPBadRequest, self._test_create,
+                          params, no_image=True)
+
     def test_create_instance_with_device_name_not_string(self):
         self.bdm[0]['device_name'] = 123
         old_create = compute_api.API.create
@@ -385,3 +445,8 @@ class BlockDeviceMappingTestV2(BlockDeviceMappingTestV21):
         # Add a check whether the destination type is invalid
         # in V2.1 API only. So this test is skipped in V2.0 API
         pass
+
+    def test_create_instance_with_invalid_bdm_in_2nd_dict(self):
+        # Add a check whether the destination type is invalid
+        # in V2.1 API only. So this test is skipped in V2.0 API
+        pass
diff --git a/nova/tests/unit/api/openstack/compute/test_block_device_mapping_v1.py b/nova/tests/unit/api/openstack/compute/test_block_device_mapping_v1.py
index d851e8b..d771d92 100644
--- a/nova/tests/unit/api/openstack/compute/test_block_device_mapping_v1.py
+++ b/nova/tests/unit/api/openstack/compute/test_block_device_mapping_v1.py
@@ -277,7 +277,7 @@ class BlockDeviceMappingTestV21(test.TestCase):
                {'device_name': 'foo2', 'volume_id': fakes.FAKE_UUID,
                 'delete_on_termination': True},
                {'device_name': 'foo3', 'volume_id': fakes.FAKE_UUID,
-                'delete_on_termination': 'invalid'},
+                'delete_on_termination': 'False'},
                {'device_name': 'foo4', 'volume_id': fakes.FAKE_UUID,
                 'delete_on_termination': False},
                {'device_name': 'foo5', 'volume_id': fakes.FAKE_UUID,
@@ -307,6 +307,16 @@ class BlockDeviceMappingTestV21(test.TestCase):
         self.stubs.Set(compute_api.API, '_validate_bdm', _validate_bdm)
         self._test_create(params)
 
+    def test_create_instance_with_bdm_delete_on_termination_invalid_2nd(self):
+        bdm = [{'device_name': 'foo1', 'volume_id': fakes.FAKE_UUID,
+                'delete_on_termination': 'True'},
+               {'device_name': 'foo2', 'volume_id': fakes.FAKE_UUID,
+                'delete_on_termination': 'invalid'}]
+
+        params = {'block_device_mapping': bdm}
+        self.assertRaises(self.validation_error,
+                          self._test_create, params)
+
     def test_create_instance_decide_format_legacy(self):
         ext_info = extension_info.LoadedExtensionInfo()
         CONF.set_override('extensions_blacklist',
diff --git a/nova/tests/unit/api/openstack/compute/test_volumes.py b/nova/tests/unit/api/openstack/compute/test_volumes.py
index 42745aa..ba47c8f 100644
--- a/nova/tests/unit/api/openstack/compute/test_volumes.py
+++ b/nova/tests/unit/api/openstack/compute/test_volumes.py
@@ -650,6 +650,26 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
         self.assertRaises(self.validation_error, self.attachments.create,
                           req, FAKE_UUID, body=body)
 
+    @mock.patch.object(compute_api.API, 'attach_volume',
+                       side_effect=exception.DevicePathInUse(path='/dev/sda'))
+    def test_attach_volume_device_in_use(self, mock_attach):
+
+        body = {
+            'volumeAttachment': {
+                'device': '/dev/sda',
+                'volumeId': FAKE_UUID_A,
+            }
+        }
+
+        req = fakes.HTTPRequest.blank('/v2/servers/id/os-volume_attachments')
+        req.method = 'POST'
+        req.body = jsonutils.dump_as_bytes({})
+        req.headers['content-type'] = 'application/json'
+        req.environ['nova.context'] = self.context
+
+        self.assertRaises(webob.exc.HTTPConflict, self.attachments.create,
+                          req, FAKE_UUID, body=body)
+
     def test_attach_volume_without_volumeId(self):
         self.stubs.Set(compute_api.API,
                        'attach_volume',
@@ -721,9 +741,17 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
             status_int = result.status_int
         self.assertEqual(202, status_int)
 
-    def test_swap_volume_no_attachment(self):
+    def test_swap_volume_with_nonexistent_uri(self):
         self.assertRaises(exc.HTTPNotFound, self._test_swap,
-                          self.attachments, FAKE_UUID_C)
+                          self.attachments, uuid=FAKE_UUID_C)
+
+    @mock.patch.object(cinder.API, 'get')
+    def test_swap_volume_with_nonexistent_dest_in_body(self, mock_update):
+        mock_update.side_effect = [
+            None, exception.VolumeNotFound(volume_id=FAKE_UUID_C)]
+        body = {'volumeAttachment': {'volumeId': FAKE_UUID_C}}
+        self.assertRaises(exc.HTTPBadRequest, self._test_swap,
+                          self.attachments, body=body)
 
     def test_swap_volume_without_volumeId(self):
         body = {'volumeAttachment': {'device': '/dev/fake'}}
@@ -828,6 +856,14 @@ class BadRequestVolumeTestCaseV21(CommonBadRequestTestCase,
     controller_cls = volumes_v21.VolumeController
     bad_request = exception.ValidationError
 
+    @mock.patch.object(cinder.API, 'delete',
+        side_effect=exception.InvalidInput(reason='vol attach'))
+    def test_delete_invalid_status_volume(self, mock_delete):
+        req = fakes.HTTPRequest.blank('/v2.1/os-volumes')
+        req.method = 'DELETE'
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                          self.controller.delete, req, FAKE_UUID)
+
 
 class BadRequestVolumeTestCaseV2(BadRequestVolumeTestCaseV21):
     controller_cls = volumes.VolumeController
diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py
index b89e82f..ed14e1d 100644
--- a/nova/tests/unit/conductor/test_conductor.py
+++ b/nova/tests/unit/conductor/test_conductor.py
@@ -22,6 +22,7 @@ import mock
 from mox3 import mox
 import oslo_messaging as messaging
 from oslo_utils import timeutils
+from oslo_versionedobjects import exception as ovo_exc
 import six
 
 from nova.compute import flavors
@@ -182,6 +183,55 @@ class ConductorTestCase(_BaseTestCase, test.TestCase):
             m.return_value.obj_to_primitive.assert_called_once_with(
                 target_version='1.2', version_manifest=versions)
 
+    def test_object_class_action_versions_old_object(self):
+        # Make sure we return older than requested objects unmodified,
+        # see bug #1596119.
+        @obj_base.NovaObjectRegistry.register
+        class TestObject(obj_base.NovaObject):
+            VERSION = '1.10'
+
+            @classmethod
+            def foo(cls, context):
+                return cls()
+
+        versions = {
+            'TestObject': '1.10',
+            'OtherObj': '1.0',
+        }
+        with mock.patch.object(self.conductor_manager,
+                               '_object_dispatch') as m:
+            m.return_value = TestObject()
+            m.return_value.VERSION = '1.9'
+            m.return_value.obj_to_primitive = mock.MagicMock()
+            obj = self.conductor.object_class_action_versions(
+                self.context, TestObject.obj_name(), 'foo', versions,
+                tuple(), {})
+            self.assertFalse(m.return_value.obj_to_primitive.called)
+            self.assertEqual('1.9', obj.VERSION)
+
+    def test_object_class_action_versions_major_version_diff(self):
+        @obj_base.NovaObjectRegistry.register
+        class TestObject(obj_base.NovaObject):
+            VERSION = '2.10'
+
+            @classmethod
+            def foo(cls, context):
+                return cls()
+
+        versions = {
+            'TestObject': '2.10',
+            'OtherObj': '1.0',
+        }
+        with mock.patch.object(self.conductor_manager,
+                               '_object_dispatch') as m:
+            m.return_value = TestObject()
+            m.return_value.VERSION = '1.9'
+            self.assertRaises(
+                ovo_exc.InvalidTargetVersion,
+                self.conductor.object_class_action_versions,
+                self.context, TestObject.obj_name(), 'foo', versions,
+                tuple(), {})
+
     def test_reset(self):
         with mock.patch.object(objects.Service, 'clear_min_version_cache'
                                ) as mock_clear_cache:
diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py
index cb50fc9..9e0eda9 100644
--- a/nova/tests/unit/db/test_db_api.py
+++ b/nova/tests/unit/db/test_db_api.py
@@ -3427,6 +3427,10 @@ class ServiceTestCase(test.TestCase, ModelsObjectComparatorMixin):
         self._create_service({'version': 3,
                               'host': 'host2',
                               'binary': 'compute'})
+        self._create_service({'version': 0,
+                              'host': 'host0',
+                              'binary': 'compute',
+                              'deleted': 1})
         self.assertEqual(2, db.service_get_minimum_version(self.ctxt,
                                                            'compute'))
 
diff --git a/nova/tests/unit/objects/test_pci_device.py b/nova/tests/unit/objects/test_pci_device.py
index 4fbe343..8fa906f 100644
--- a/nova/tests/unit/objects/test_pci_device.py
+++ b/nova/tests/unit/objects/test_pci_device.py
@@ -307,6 +307,16 @@ class _TestPciDeviceObject(object):
             self.assertIn("other",
                           update_mock.call_args[0][3]['extra_info'])
 
+    @mock.patch('nova.objects.Service.get_minimum_version')
+    @mock.patch('nova.context.get_admin_context')
+    def test_should_migrate_checks_correct_services(self, mock_gc, mock_gmv):
+        mock_gmv.return_value = 100
+        self.assertTrue(objects.PciDevice.should_migrate_data())
+        mock_gmv.assert_has_calls([
+            mock.call(mock_gc.return_value, 'nova-conductor'),
+            mock.call(mock_gc.return_value, 'nova-osapi_compute'),
+        ])
+
     def test_update_numa_node(self):
         self.pci_device = pci_device.PciDevice.create(None, dev_dict)
         self.assertEqual(0, self.pci_device.numa_node)
diff --git a/nova/tests/unit/pci/test_utils.py b/nova/tests/unit/pci/test_utils.py
index 109f47e..bd1acba 100644
--- a/nova/tests/unit/pci/test_utils.py
+++ b/nova/tests/unit/pci/test_utils.py
@@ -82,12 +82,16 @@ class GetFunctionByIfnameTestCase(test.NoDBTestCase):
     @mock.patch('os.path.isdir', return_value=True)
     @mock.patch.object(os, 'readlink')
     def test_physical_function(self, mock_readlink, *args):
+        ifname = 'eth0'
+        totalvf_path = "/sys/class/net/%s/device/%s" % (ifname,
+                                                        utils._SRIOV_TOTALVFS)
         mock_readlink.return_value = '../../../0000:00:00.1'
         with mock.patch.object(
-            builtins, 'open', mock.mock_open(read_data='4')):
+            builtins, 'open', mock.mock_open(read_data='4')) as mock_open:
             address, physical_function = utils.get_function_by_ifname('eth0')
             self.assertEqual(address, '0000:00:00.1')
             self.assertTrue(physical_function)
+            mock_open.assert_called_once_with(totalvf_path)
 
     @mock.patch('os.path.isdir', return_value=False)
     def test_exception(self, *args):
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index 0599997..6276f11 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -6428,6 +6428,26 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         drvr.check_can_live_migrate_destination_cleanup(self.context,
                                                         dest_check_data)
 
+    @mock.patch('os.path.exists', return_value=True)
+    @mock.patch('os.utime')
+    def test_check_shared_storage_test_file_exists(self, mock_utime,
+                                                   mock_path_exists):
+        tmpfile_path = os.path.join(CONF.instances_path, 'tmp123')
+        drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
+        self.assertTrue(drvr._check_shared_storage_test_file('tmp123'))
+        mock_utime.assert_called_once_with(CONF.instances_path, None)
+        mock_path_exists.assert_called_once_with(tmpfile_path)
+
+    @mock.patch('os.path.exists', return_value=False)
+    @mock.patch('os.utime')
+    def test_check_shared_storage_test_file_does_not_exist(self, mock_utime,
+                                                   mock_path_exists):
+        tmpfile_path = os.path.join(CONF.instances_path, 'tmp123')
+        drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
+        self.assertFalse(drvr._check_shared_storage_test_file('tmp123'))
+        mock_utime.assert_called_once_with(CONF.instances_path, None)
+        mock_path_exists.assert_called_once_with(tmpfile_path)
+
     def _mock_can_live_migrate_source(self, block_migration=False,
                                       is_shared_block_storage=False,
                                       is_shared_instance_path=False,
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 8c1e27a..78f9c7c 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -5749,6 +5749,14 @@ class LibvirtDriver(driver.ComputeDriver):
 
         Cannot confirm tmpfile return False.
         """
+        # NOTE(tpatzig): if instances_path is a shared volume that is
+        # under heavy IO (many instances on many compute nodes),
+        # then checking the existence of the testfile fails,
+        # just because it takes longer until the client refreshes and new
+        # content gets visible.
+        # os.utime (like touch) on the directory forces the client to refresh.
+        os.utime(CONF.instances_path, None)
+
         tmp_file = os.path.join(CONF.instances_path, filename)
         if not os.path.exists(tmp_file):
             return False
diff --git a/nova/volume/encryptors/cryptsetup.py b/nova/volume/encryptors/cryptsetup.py
index 603bc26..bff35a1 100644
--- a/nova/volume/encryptors/cryptsetup.py
+++ b/nova/volume/encryptors/cryptsetup.py
@@ -82,7 +82,7 @@ class CryptsetupEncryptor(base.VolumeEncryptor):
             # normal disk or multipath device), exit_code will be 1. In the
             # case, we will omit the warning message.
             if e.exit_code != 1:
-                LOG.warning(_LW('cryptsetup status %(dev_name) exited '
+                LOG.warning(_LW('cryptsetup status %(dev_name)s exited '
                                 'abnormally (status %(exit_code)s): %(err)s'),
                             {"dev_name": dev_name, "exit_code": e.exit_code,
                              "err": e.stderr})
diff --git a/releasenotes/notes/bug-1662699-06203e7262e02aa6.yaml b/releasenotes/notes/bug-1662699-06203e7262e02aa6.yaml
new file mode 100644
index 0000000..94a5ab8
--- /dev/null
+++ b/releasenotes/notes/bug-1662699-06203e7262e02aa6.yaml
@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    Fixes `bug 1662699`_ which was a regression in the v2.1 API from the
+    ``block_device_mapping_v2.boot_index`` validation that was performed in the
+    legacy v2 API. With this fix, requests to create a server with
+    ``boot_index=None`` will be treated as if ``boot_index`` was not specified,
+    which defaults to meaning a non-bootable block device.
+
+    .. _bug 1662699: https://bugs.launchpad.net/nova/+bug/1662699
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
new file mode 100755
index 0000000..00c765e
--- /dev/null
+++ b/tools/test-setup.sh
@@ -0,0 +1,54 @@
+#!/bin/bash -xe
+
+# This script will be run by OpenStack CI before unit tests are run,
+# it sets up the test system as needed.
+# Developers should setup their test systems in a similar way.
+
+# This setup needs to be run as a user that can run sudo.
+
+# The root password for the MySQL database; pass it in via
+# MYSQL_ROOT_PW.
+DB_ROOT_PW=${MYSQL_ROOT_PW:-insecure_slave}
+
+# This user and its password are used by the tests, if you change it,
+# your tests might fail.
+DB_USER=openstack_citest
+DB_PW=openstack_citest
+
+sudo -H mysqladmin -u root password $DB_ROOT_PW
+
+# It's best practice to remove anonymous users from the database.  If
+# an anonymous user exists, then it matches first for connections and
+# other connections from that host will not work.
+sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
+    DELETE FROM mysql.user WHERE User='';
+    FLUSH PRIVILEGES;
+    GRANT ALL PRIVILEGES ON *.*
+        TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
+
+# Now create our database.
+mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "
+    SET default_storage_engine=MYISAM;
+    DROP DATABASE IF EXISTS openstack_citest;
+    CREATE DATABASE openstack_citest CHARACTER SET utf8;"
+
+# Same for PostgreSQL
+
+# Setup user
+root_roles=$(sudo -H -u postgres psql -t -c "
+   SELECT 'HERE' from pg_roles where rolname='$DB_USER'")
+if [[ ${root_roles} == *HERE ]];then
+    sudo -H -u postgres psql -c "ALTER ROLE $DB_USER WITH SUPERUSER LOGIN PASSWORD '$DB_PW'"
+else
+    sudo -H -u postgres psql -c "CREATE ROLE $DB_USER WITH SUPERUSER LOGIN PASSWORD '$DB_PW'"
+fi
+
+# Store password for tests
+cat << EOF > $HOME/.pgpass
+*:*:*:$DB_USER:$DB_PW
+EOF
+chmod 0600 $HOME/.pgpass
+
+# Now create our database
+psql -h 127.0.0.1 -U $DB_USER -d template1 -c "DROP DATABASE IF EXISTS openstack_citest"
+createdb -h 127.0.0.1 -U $DB_USER -l C -T template0 -E utf8 openstack_citest
diff --git a/tox.ini b/tox.ini
index 41417ff..e890311 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,6 +41,9 @@ commands =
   ostestr --blacklist_file tests-py3.txt
 
 [testenv:functional]
+# TODO(melwitt): This can be removed when functional tests can be run
+# with python 3.x
+basepython = python2.7
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
        OS_TEST_PATH=./nova/tests/functional
@@ -74,10 +77,6 @@ commands =
   coverage html --include='nova/*' --omit='nova/openstack/common/*' -d covhtml -i
 
 [testenv:venv]
-# NOTE(jaegerandi): This target does not use constraints because
-# upstream infra does not yet support it. Once that's fixed, we can
-# drop the install_command.
-install_command = pip install -U --force-reinstall {opts} {packages}
 commands = {posargs}
 
 [testenv:docs]