summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Catching InstanceNotFound exception during reboot instanceWangpan2013-03-052-12/+33
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the instance is deleted during reboot(most of soft reboot), an InstanceNotFound exception may be raised when update instance info to DB, and the instance may become running deleted, so catching the exception and logging it. This commit is a supplement of bug #1111213, which may result in the instance becomes running deleted, when deleting an instance after soft reboot. Change-Id: I3e8df109d431040c64e87f16ca84ff5b62dde898
* | | | | | | | | | | | | | | | Merge "Fixes live migration with attached volumes issue"Jenkins2013-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixes live migration with attached volumes issueAlessandro Pilotti2013-03-031-1/+1
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug: 1140917 Live migration fails when there are volumes attached to the instance Change-Id: I27b39ac41e97840d2a60006b1c74f6d256bc53b7
* | | | | | | | | | | | | | | Merge "Return proper error messages while disassociating floating IP"Jenkins2013-03-052-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Return proper error messages while disassociating floating IPWangpan2013-02-282-7/+12
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a floating IP is not associated with an instance, and if we try to disassociate it, a response likes "HTTP/1.1 404 Not Found" will be returned, it is not proper, so change it to "HTTP/1.1 422 Unprocessable Entity" with body likes '{"computeFault": {"message": "Floating ip 172.24.4.225 is not associated with instance a33857af-b18b-4b88-a5cc-7d84c7fd41c8.", "code": 422}}'. Fixes bug: #1129719 Change-Id: I18194ccf59edb5eb2bcd52a65f38d5632fef95d3
* | | | | | | | | | | | | | | Merge "Remove completed FIXME."Jenkins2013-03-051-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove completed FIXME.Joe Gordon2013-03-041-6/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block_device_mapping doesn't need elevated context anymore. Change-Id: Iee23320be10604256db479c13ee405f601cbfd42
* | | | | | | | | | | | | | Merge "quantum security_group driver queries db regression"Jenkins2013-03-051-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | quantum security_group driver queries db regressionAaron Rosen2013-03-041-2/+5
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit 1c6cc18 removed the populate_security_groups() method in nova/compute/api.py which causes nova-api to check against the database if a security group exists. Fixes bug 1145426 Change-Id: I35a6003ac4c16df364302cf90f701ed977f54946
* | | | | | | | | | | | | Merge "docs should indicate proper git commit limit"Jenkins2013-03-052-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | docs should indicate proper git commit limitSteven Dake2013-03-042-3/+5
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nova gate should recommend 50 characters or less for a git commit but actually enforce 72 characters. This patch changes the hacking.rst docs to indicate the actual limit is 72 characters rather then 50 characters. Change-Id: I47f1f1f1007f5744bf1fef419df7e033803b4a53 Fixes: Bug #1144840
* | | | | | | | | | | | Merge "fix postgresql drop race"Jenkins2013-03-041-32/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix postgresql drop raceSean Dague2013-03-041-32/+38
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running under testr there is a chance that we enter reset_databases for the postgresql tests at the same time for both general and baremetal tests. In this case the pg admin commands could fail, as pg gets really strict about having 2 users trying to do admin commands at the same time on a single database (in this case the magic template1 db, that we need to use because you can't drop the db you are currently on.) Solve this by breaking out the postgresql reset case into a seperate function and using @lockutils on it. Change-Id: I31555ef5aae27f31daf7cbbae61072a8d7deb255
* | | | | | | | | | | | Merge "Standardize the coverage initializations."Jenkins2013-03-041-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Standardize the coverage initializations.Mitsuhiko Yamazaki2013-02-211-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when we measure coverage repeatedly, the coverage data of nova-api is accumulated but the ones of other nova services are reset each time. This is due to create new "coverage" class each time "_start_coverage_telnet" method is executed. This patch limits creating "coverage" class the first time the method is executed. Fixes bug 1122720 Change-Id: Ia900c96113bee65362ccb7c4c1975535d814d835
* | | | | | | | | | | | | Merge "Push 'Error' result from event to instance action."Jenkins2013-03-042-2/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Push 'Error' result from event to instance action.Andrew Laski2013-02-152-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a failed event stores an 'Error' result but in order to see which actions have failed it would require grabbing each one through the api to see the events. This patch adds 'Error' to the message field of the instance action so that any actions with failures can be seen from the initial listing of actions on an instance. Change-Id: Ieeb798c47211ab00fe5b767dc1f18a665549ba01
* | | | | | | | | | | | | | Merge "Remove unused db calls from nova.db.api"Jenkins2013-03-042-75/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unused db calls from nova.db.apiJoe Gordon2013-03-042-75/+0
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * iscsi_target_count_by_host * iscsi_target_create_safe * reservation_destroy * volume_get_iscsi_target_num Change-Id: I0c357a6398509150e7ac987826341cd1e79f0075
* | | | | | | | | | | | | Merge "Fixes oslo-config update for deprecated_group"Jenkins2013-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixes oslo-config update for deprecated_groupAlessandro Pilotti2013-03-041-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug: 1140310 The oslo-config dependency referenced in pip-requires should be updated to the latest version to include support for "deprecated_group". This is needed to move specific driver options from the DEFAULT group w/o losing backwards compatibility. Change-Id: I5d18a5ee704a1f781c8acd6f903b0e3ca07bc070
* | | | | | | | | | | | Merge "Compute manager should remove dead resources"Jenkins2013-03-0412-16/+124
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Compute manager should remove dead resourcesDevananda van der Veen2013-03-0412-16/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While most hypervisors return a single - and constant - value from driver.get_available_nodes, baremetal does not. When a node is deleted from the baremetal database, it is no longer returned from driver.get_available_nodes. However, Nova's compute_node record is not directly updated. This patch allows Compute Manager to detect missing nodes within update_available_resources. It then invokes resource_tracker to update the dead node and remove it from compute. This in turn allows the ServiceGroup API to properly update the servicegroup when a baremetal node is no longer in service. Fixes bug 1138184 Change-Id: Icfff3f8e3099668806633a6a58a152b32ec8b49b
* | | | | | | | | | | | | Merge "Fallback coverage backdoor telnet connection to lo"Jenkins2013-03-041-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fallback coverage backdoor telnet connection to loMatthew Treinish2013-02-281-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a fallback condition for the telnet connection. If trying to establish a connection to the backdoor fails with ECONNREFUSED the extension will then try to connect to the same port on the lo device. Eventlet backdoors currently open on the lo interface and this is to cover the common (and CI) use case where the hostname doesn't resolve to 127.0.0.1. Using the fallback was done to avoid adding a new config option to specify that the hostname that is in the DB for the service doesn't resolve to the lo device, and that the extension should use just use localhost. Change-Id: I0321db68cbccf0cddf13d91a77dfb744bb456d87
* | | | | | | | | | | | | | Merge "Adds retry on upload_vhd for xapi glance plugin"Jenkins2013-03-043-24/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Adds retry on upload_vhd for xapi glance pluginNicholas Kuechler2013-02-273-24/+69
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a retry for the xapi glance plugin to handle transient issues when uploading the vhd. An example issue we're seeing is a connection timeout: ['XENAPI_PLUGIN_FAILURE', 'upload_vhd', 'error', "(110, 'Connection timed out')"] To work around transient issues such as a connection timeout, we should retry based on glance_num_retries before outright failing. Change-Id: Ice6fdd3dd39ef40e5997d69209aaafa66bff5d6e Fixes: bug #1134493
* | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-041-130/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-041-130/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I380ccf561e13327dc15b8da9bcf938ec5ec46c75
* | | | | | | | | | | | | | Merge "Don't LOG.error on max_depth (by default)."Jenkins2013-03-041-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't LOG.error on max_depth (by default).Dan Prince2013-03-021-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts part of 7b206ad which added an extra LOG.error statement when max_depth is hit. This is causing spurious errors to get logged when making some Nova requests. Fixes LP Bug #1140133 Change-Id: I0fff47d9c53c63345ae273a4d20a2bacb27f12e5
* | | | | | | | | | | | | | Merge "Add ssh port and key based auth to VPD."Jenkins2013-03-033-7/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add ssh port and key based auth to VPD.Chris Krelle2013-03-033-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the ablity to set ssh port, and use key based authentication for VPD. This patch adds config options: virtual_power_ssh_port: port to ssh to on virtual power host virtual_power_host_key: private key file for ssh auth Note: Key file must be able to be read by user nova is running as. This patch switches the default virtual_power_type from 'vbox' to 'virsh' to match the most common usage. Fix Bug 1136010 Change-Id: Id89878d63d26602bb3eacc2a2ce7902d9bd33d61 Authored-by: Chris Krelle <nobodycam@gmail.com>
* | | | | | | | | | | | | | | Merge "Make ComputeManager _running_deleted_instances query by uuid"Jenkins2013-03-032-26/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make ComputeManager _running_deleted_instances query by uuidHans Lindgren2013-03-032-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse existing _get_instances_on_driver method to query driver for running instances. Resolves bug 1129519. Change-Id: I9186b289fadfc4414874b3ba52195e9acfac18b4
* | | | | | | | | | | | | | | Merge "Refactor compute manager _get_instances_by_driver"Jenkins2013-03-032-25/+19
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Refactor compute manager _get_instances_by_driverHans Lindgren2013-03-032-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method more efficient by only querying nova-conductor once. Also limit fallback instance query to host only. This is in preparation for fixing bug 1129519. Change-Id: I7de14f1ffda37c14f760f602fd81250d2163b430
* | | | | | | | | | | | | | | Merge "Fix target host variable from being overwritten"Jenkins2013-03-032-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix target host variable from being overwrittenHans Lindgren2013-03-032-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target host parameter of the compute api evacuate method is mistakenly overwritten before being used. The result is that the instance rebuild operation is tried against the original failed host and will always fail. Rename locally used variable to a different name and modify relevant test to prohibit this from happening again. Resolves bug 1133204. Change-Id: I517b2dc19d9561723391150105b4943b56dba637
* | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-031-543/+585
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-031-543/+585
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41e1e75771f15e65455874b7f48f23f5e162073d
* | | | | | | | | | | | | | | Merge "Set vm_state to ERROR on net deallocate failure."Jenkins2013-03-032-2/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Set vm_state to ERROR on net deallocate failure.Russell Bryant2013-03-012-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If deallocate_network_for_instance from network.api fails while trying to terminate an instance, set the vm_state to ERROR. Previously it still completely failed at this point, but the instance vm_state was still ACTIVE but the task_state was stuck in deleting. Now it will be ERROR/deleting. Fix bug 1110221. Change-Id: I181a11c8de667fa462e1a2cb75b2c8ae41410273
* | | | | | | | | | | | | | | Merge "Implement rules_exist method for quantum security group driver"Jenkins2013-03-024-44/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Implement rules_exist method for quantum security group driverAaron Rosen2013-03-014-44/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally I thought the quantum security group driver should not enforce rules exist on the nova-api side and instead it should just forward the request to quantum which would return the error. That said there is no extra cost to doing this on the nova-api side as nova-api already queries for the group before adding the rule. In addition, rules_exists() is used in revoke_security_group_ingress() for the ec2 compat APIs so this needs to be implemented. This patch moves create_security_group_rule() and rule_exists() from nova/compute/api.py to nova/network/security_group/security_group_base.py as the same code can be leveraged in both places. Fixes bug 1136345 Change-Id: I444ffc2b53b30ed496b6e3250433d14f316e594d
* | | | | | | | | | | | | | | | Merge "Switch to using memorycache from oslo."Jenkins2013-03-026-96/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Switch to using memorycache from oslo.Vishvananda Ishaya2013-03-016-96/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I11ee70b36f06bc4a45b5ff207e53a331891a6bfa
* | | | | | | | | | | | | | | | Merge "Pep8/pyflakes cleanup of deprecated_api"Jenkins2013-03-021-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Pep8/pyflakes cleanup of deprecated_apiJason Kölker2013-02-281-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reformats code better in line with hacking guidelines Change-Id: I27fa5d7321c56155d1f1f3b6a35105e35e95e0f1
* | | | | | | | | | | | | | | | | Merge "Don't use instance['instance_type'] for scheduler filters in migration"Jenkins2013-03-022-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \