summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix error status code on update-volume APIliberty-eol12.0.6stable/libertyKen'ichi Ohmichi2016-10-173-5/+34
| | | | | | | | | | | | | | | | | | | | | | | As the following part of API-WG guidline[1], If a request contains a reference to a nonexistent resource in the body (not URI), the code should be 400 Bad Request. Do not use 404 NotFound because :rfc:`7231#section-6.5.4` (section 6.5.4) mentions the origin server did not find a current representation for the target resource for 404 and representation for the target resource means a URI Nova should return a BadRequest response(400) in this case, because new_volume_id is specified in a request body. old_volume_id is not necessary to be changed because the value is specified with URI. So it is valid to return NotFound response if that is not existent. [1]: https://github.com/openstack/api-wg/blob/master/guidelines/http.rst#failure-code-clarifications Close-Bug: #1629110 Change-Id: Ib781b116f5af713d64b5880858cc4f81c3da3977 (cherry picked from commit edd86d9dac1ea75bc580a7964e7d699ee9644b19) (cherry picked from commit 4e6958551c324635a8720fc9125e9596860637f7)
* Add error handling for delete-volume APIKen'ichi Ohmichi2016-10-113-1/+13
| | | | | | | | | | | | Due to lack of an error handling, delete-volume API returns HTTP500 error when deleting an attached volume. This patch adds the error handling. The corresponding Tempest test is Idb6267be770bcf2541595babebf269cdc71c2b8d Closes-Bug: #1630783 Change-Id: Ia07556b2dc18678baa4c8fbd65820d8047362ef9 (cherry picked from commit 2afc4e466958b19a4cbb9147abb69f54a06bd507)
* Merge "virt: set address space & CPU time limits when running qemu-img" into ↵12.0.5Jenkins2016-09-224-12/+46
|\ | | | | | | stable/liberty
| * virt: set address space & CPU time limits when running qemu-imgDaniel P. Berrange2016-09-224-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the new 'prlimit' parameter for oslo.concurrency execute method, to set an address space limit of 1GB and CPU time limit of 2 seconds, when running qemu-img. This is a re-implementation of the previously reverted commit commit da217205f53f9a38a573fb151898fbbeae41021d Author: Tristan Cacqueray <tdecacqu@redhat.com> Date: Wed Aug 5 17:17:04 2015 +0000 virt: Use preexec_fn to ulimit qemu-img info call NOTE (kchamart) [stable/liberty]: Add a check for the presence of 'ProcessLimits' attribute (which is only present in oslo.concurrency>=2.6.1; and a conditional check for 'prlimit' parameter in qemu_img_info() method. Upstream discussion[1][2] that led to merging this patch to stable/liberty branch. [1] http://lists.openstack.org/pipermail/openstack-dev/2016-September/104091.html [2] http://lists.openstack.org/pipermail/openstack-dev/2016-September/104303.html Closes-Bug: #1449062 Change-Id: I135b5242af1bfdcb0ea09a6fcda21fc03a6fbe7d (cherry picked from commit 068d851561addfefb2b812d91dc2011077cb6e1d)
* | Merge "Refresh info_cache after deleting floating IP" into stable/libertyJenkins2016-09-192-2/+27
|\ \
| * | Refresh info_cache after deleting floating IPMichael Wurtz2016-09-072-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a floating IP associated with Neutron's info_cache we don't refresh the info_cache after it is deleted. This patch makes it so the info_cache is refreshed when an associated floating IP is deleted. If there is no info_cache associated with the floating IP then info_cache is not refreshed. Change-Id: I8a8ae8cdbe2d9d77e7f1ae94ebdf6e4ad46eaf00 Closes-Bug: #1614538 (cherry picked from commit cdb9b6820dc17971bca24adfc0b56f030f0ae827) (cherry picked from commit a832e6b2a019323fdf00e30302ad5c3c809baa21)
* | | Merge "Updated from global requirements" into stable/libertyJenkins2016-09-131-1/+1
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2016-09-061-1/+1
| |/ / | | | | | | | | | Change-Id: I78e5254d9fae2dfc721316d8f9a40940190cdf57
* | | Fix booting fail when unlimited project quotaRui Chen2016-09-012-9/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | If we launch a instance in the case of unlimited project quota and limited user quota, API would return internal error 500. The code logic wouldn't check the case of unlimited project quota in _calculate_overquota() and OverQuota exception was raised, it cause infinite recursion in _check_num_instances_quota() Change-Id: I7831266b6269ea5d9a3aaa32041158293a1d601e Closes-Bug: #1491222 (cherry picked from commit b630d1471b9f7efc0949fcd8042e86641a997762)
* | Update instance host in post live migration even when exception occursPawel Koniszewski2016-08-223-94/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when, e.g., port binding fails on destination host nova loses track of running VM. Operator needs to change record in DB manually in order to recover VM in nova and then perform operations on destination host to repair such VM. Because VM is on destination host already it should be updated regardless of post live migration at destination result. (cherry picked from commit 89b1fecce116bc44f558e76cbb5dc43497ea67cc) Change-Id: Ibb5158f453abd9717e6d2ab501295351ca9d0dcf Closes-Bug: #1379581 Conflicts: nova/tests/unit/compute/test_compute_mgr.py
* | Updated from global requirementsOpenStack Proposal Bot2016-07-141-2/+2
|/ | | | Change-Id: I3b459165fd8d0f30eacf6d7d7b741322a555ecf1
* Merge "Fix duplicate lines in policy.json" into stable/libertyJenkins2016-06-092-6/+3
|\
| * Fix duplicate lines in policy.jsonRajesh Tailor2016-06-082-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate lines from etc/nova/policy.json file. Commit [1] introduced the delete targets with empty rules and commit [2] changed them in Liberty incompletely to admin_or_owner rules. [1] https://github.com/openstack/nova/commit/9c917816048482e3a42aa06e2aa4933a1a6f7f8c [2] https://github.com/openstack/nova/commit/09a55e2bf4f3d5df3b76454f4839e2ce96f9d42f Change-Id: I9081ccf28ec72a2d791cddac0597efef67e56429 Closes-Bug:1577370
* | Merge "network: Don't repopulate instance info cache from Neutron ports" ↵12.0.4Jenkins2016-06-072-9/+39
|\ \ | | | | | | | | | into stable/liberty
| * | network: Don't repopulate instance info cache from Neutron portsMark Goddard2016-03-172-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocation of network interfaces for an instance can result in corruption of the instance info cache. The result is that the cache may contain duplicate entries for network interfaces. This can cause instance boot failure. This bug appears to be attributable to the combined effects of the fixes for bugs #1467581 and #1407664. This change reverts the fix for bug #1407664, whilst keeping a modified version of the unit test that was added with it. It also adds a second unit test. Conflicts: nova/tests/unit/network/test_neutronv2.py This is because If0a1f3850d92d011aae32ae34e8c8664f2ee4313 isn't in stable/liberty Change-Id: I53d5284907d44ae8b5546993f8fd461b385c39e6 Closes-bug: #1501735 Related-bug: #1467581 Related-bug: #1407664 (cherry picked from commit 8694c1619d774bb8a6c23ed4c0f33df2084849bc)
* | | Merge "Fall back to raw config drive if not found in rbd" into stable/libertyJenkins2016-06-072-0/+39
|\ \ \
| * | | Fall back to raw config drive if not found in rbdmelanie witt2016-06-032-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit adecf780d3ed4315e4ce305cb1821d493650494b added support for storing config drives in rbd. Existing instances however still have config drives in the instance directory. If an existing instance is stopped, an attempt to start it again fails because the guest config is generated assuming a config drive location in rbd. This adds a fall back to the instance directory in the case of config drive and rbd if the image is not found in rbd. Conflicts: nova/tests/unit/virt/libvirt/test_driver.py nova/virt/libvirt/driver.py (Changed image_type from 'flat' to 'raw' and image.exists() to image.check_image_exists(), removed unit tests that don't exist on stable/liberty) Closes-Bug: #1582684 Change-Id: I21107ea0a148b66bee81e57cdce08e3006a60aee (cherry picked from commit f5c9ebd56075f8eb04f9f0e683f85bacdcd68c38)
* | | | Merge "Make compute rpcapi 'live_migration' backward compatible" into ↵Jenkins2016-06-071-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | stable/liberty
| * | | | Make compute rpcapi 'live_migration' backward compatibleWenzhi Yu2016-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit[1] added compute rpcapi version 4.2 which introduced a new argument 'migration' when calling 'live_migration' method, but the code did not ensure the backward compatibility with older version compute node. When calling 'live_migration' method with 'migration' argument on older version(like Kilo) of nova compute node, a "TypeError: live_migration() got an unexpected keyword argument 'migration'" will be threw up. [1]https://github.com/openstack/nova/commit/2f4e64a7cf81de4a22fe2fc4210b1f795b1a3db4 Change-Id: Ie5c498d34e7c4c6573d611abd592c25f1bcb4f44 Closes-Bug: #1576048 (cherry picked from commit 34b8336a41e2896f0639c402f64a05247f475fea)
* | | | | libvirt: Skip CPU compatibility check for emulated guestsKashyap Chamarthy2016-06-032-2/+13
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing host to guest CPU model for emulated guests (<domain type='qemu'>) should not matter -- in this mode the CPU is fully emulated in software and no hardware acceleration, like KVM, is involved. So, skip the CPU compatibility check for the QEMU domain type, and retain it for KVM guests. Closes-Bug: #1588003 Co-Authored-By: Daniel P. Berrange <berrange@redhat.com> Change-Id: I8b782678a6dfa7bcfc203381037e1df4475c3194 (cherry picked from commit afa31e67c3b7f8999da179b78a7051d70ca126bf) (cherry picked from commit 54448676db784bfc233d4e846eacd115d03d9f3f)
* | | | Enable 'null' value for user_data in V2.1 APIHe Jie Xu2016-06-014-1/+32
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The legacy v2 API allow the 'null' value for user_data. Unfortunately the v2.1 API didn't match that in the input validation. This patch enables 'null' value, at sametime, it enables for v2.1 compat mode also. Change-Id: Iae614035efd4b37c214754ad12b17ca224b8fd92 Closes-Bug: #1582911 (cherry picked from commit 22c87390a33300b93f0913d4e787662b119a00b9) (cherry picked from commit 2024387ecc0922abe97863c349cf94df1d4462d0)
* | | Merge "Change "libvirt.xml" back to the original after doing unrescue" into ↵Jenkins2016-05-182-2/+7
|\ \ \ | | | | | | | | | | | | stable/liberty
| * | | Change "libvirt.xml" back to the original after doing unrescueLeehom Li2016-04-132-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After doing rescue and unrescue "libvirt.xml" is not changed back to the original. This patch write back "libvirt.xml" using xml info stored in "unrescue.xml" Conflicts: nova/tests/unit/virt/libvirt/test_driver.py NOTE(lyarwood): conflict due to the use of contextlib.nested prior to Mitaka and 8dde6c7. Change-Id: I524ff57d7f21a1b5ecd20ab9b0e377ad9f7e04b9 Closes-Bug: #1558877 (cherry picked from commit 2e39d6444aa4c231da96b4d6314519578dd3dbf2)
* | | | Merge "Updated from global requirements" into stable/libertyJenkins2016-05-171-1/+1
|\ \ \ \
| * | | | Updated from global requirementsOpenStack Proposal Bot2016-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8a79fddf9fed4e9111ae3e26afaaf357bf216b1
* | | | | Merge "skip lock_unlock_server test for cells" into stable/libertyJenkins2016-05-171-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | skip lock_unlock_server test for cellsSean Dague2016-05-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cells architecture of doing db replay makes this call fundamentally racey for cells. The contract is that if you request an action on a server and it is locked, you get a 409 at the API, and are done. If you get a 2xx, the resource is not locked, and life is good. Except in cells, the API db will be updated, and the API will return all is well. Except the db replay hasn't happened for the cell, so the additional check in the nova compute for locked blows up. The fix probably involves the nova-compute check doing a timed retry under cells because of replication lags. Conflicts: devstack/tempest-dsvm-cells-rc NOTE(mriedem): The conflict is due to an additional test being skipped in liberty that wasn't skipped in mitaka. Change-Id: Ic18407b8372c286d8e258860f3e2bf76eceef2aa Related-Bug: #1466696 (cherry picked from commit 02de17c72ac0f0824df2b3d460739a58cb6b5285)
* | | | | Merge "Fix serial console worker blocking Nova" into stable/libertyJenkins2016-05-131-9/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix serial console worker blocking NovaLucian Petrut2016-05-121-9/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The worker used by Nova to log instance serial console output can log an exception message. The issue is that logging a message from a different thread causes Nova to hang. It seems that the logging file handler causes issues when greenthreads and multiple native threads are used at the same, and the native threads log messages. This patch removes this log message for now. In the future, we should fix the logging handler to avoid this issue. NOTE: This issue has already been solved in Mitaka in os-win, which the Hyper-V driver uses since Mitaka. (cherry picked from commit a25959a204f365a532138d7fe0a73b4cd039e807) Change-Id: Ia5c1aba28347648e90f5ba6111fc047d711236db Closes-Bug: #1557498
* | | | Merge "Properly inject network_data.json in configdrive" into stable/libertyJenkins2016-05-132-1/+25
|\ \ \ \
| * | | | Properly inject network_data.json in configdriveMathieu Gagné2016-04-102-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file "network_data.json" is not currently found in the folder "openstack/2015-10-15/" of config drive, only in "openstack/latest/". The patch makes sure its found in both folders. Closes-bug: #1513267 Change-Id: Ifcd4fadb91fcd360af5cf0988178992f2905190a (cherry picked from commit edea873565d07120141ae0f76199d6a3aee2959d)
* | | | | Merge "Changed an HTTP exception to return proper code" into stable/libertyJenkins2016-05-134-7/+7
|\ \ \ \ \
| * | | | | Changed an HTTP exception to return proper codeBrandon Irizarry2016-04-224-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSTing to /servers with a content-type of text/plain and a text/plain body results in a response code of 400. It should be 415. I found this line in the code that appears to handle this singular case and modified the HTTP exception used to the correct one. Tests were also updated accordingly. Conflicts: nova/api/openstack/wsgi.py nova/tests/unit/api/openstack/compute/legacy_v2/test_servers.py Change-Id: I5fa1fdba56803b2ef63b1efaaeeced6ceb7779d9 Closes-Bug: 1567977 (cherry picked from commit a7019a87ba696509d825c6c6f2220331e4ffb033)
* | | | | | Merge "imagebackend: Check that the RBD image exists before trying to ↵Jenkins2016-05-122-10/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | cleanup" into stable/liberty
| * | | | | | imagebackend: Check that the RBD image exists before trying to cleanupNicolas Simonds2016-05-122-10/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In volume-backed setups, there is no image to clean up, so any attempts to cleanup the resize snapshots will fail by definition. Make sure the image exists first. NOTE(mriedem): The test in the backport is slightly different from mitaka because of some minor things with stubs and config options. Change-Id: I25f65bcc76b83f31a8fce77c2b751d2d167ffc7e Closes-Bug: 1580625 (cherry picked from commit 671bb2651d9d1a07947690468825581d30482dcb) (cherry picked from commit 8b256fb50a0bb9c6ddcbff2099a744045688b652)
* | | | | | | Merge "compute: Retain instance metadata for 'evacuate' on shared storage" ↵Jenkins2016-05-122-7/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into stable/liberty
| * | | | | | compute: Retain instance metadata for 'evacuate' on shared storageKashyap Chamarthy2016-05-122-7/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When performing instance evacuation (which is essentially "rebuild an instance elsewhere"), image metadata is not persistent -- this manifests only when instances are on shared storage. So, supply the original instance metadata to 'image_meta' parameter, instead of an empty dict. Liberty notes (compared to upstream Newton/Mitaka): - We get the image metadata from the instance object's system_metadata. - We're modifying the tests 'test_rebuild_on_host_with_shared_storage()' and 'test_on_shared_storage_not_provided_host_with_shared_storage()' to exercise the code change. Closes-Bug: #1562681 Change-Id: Ibea4954c149b9dcb162c5962ab8e9a4f17e51a1d (cherry picked from commit 82098d06dbaf401966a70c873b8aa97e7eab4b10) (cherry picked from commit 524d59e8c32e0eb1ef7fc86d989897d52180ab83)
* | | | | | Merge "Failed migration shoudn't be reported as in progress" into stable/libertyJenkins2016-05-122-1/+4
|\ \ \ \ \ \
| * | | | | | Failed migration shoudn't be reported as in progressLudovic Beliveau2016-04-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix add 'failed' status to the list of filters for migrations that are reported by migration_get_in_progress_by_host_and_node. Change-Id: I7de143d73a84339d2184d09e5907cbbe941a2e66 Closes-Bug: #1543123 (cherry picked from commit 0f8f854c2646e2e6677efdf8b1bbf82faf57f01f)
* | | | | | | Merge "Don't track migrations in 'accepted' state" into stable/libertyJenkins2016-05-122-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't track migrations in 'accepted' stateNikola Dipanov2016-04-112-2/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This state was added during Liberty for evacuate, and since it's the first state that is assigned to the migration record on it's creation, and before we start using it for resource tracking, there is no reason to consider those records as "in progress". Change-Id: I2a9bbe87bc1518cee9e43e4eeec1fa585305f423 Related-bug: 1417667 (cherry picked from commit 2c1f8e6002850a38c82739839be7245b786c9c0c)
* | | | | | Merge "Updated from global requirements" into stable/libertyJenkins2016-05-121-3/+3
|\ \ \ \ \ \
| * | | | | | Updated from global requirementsOpenStack Proposal Bot2016-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic44193087b698bd7e4d4c6396997e4c8997dbe96
* | | | | | | Merge "Fix wrong CPU metric value in metrics_filter" into stable/libertyJenkins2016-05-122-2/+24
|\ \ \ \ \ \ \
| * | | | | | | Fix wrong CPU metric value in metrics_filterSurojit Pathak2016-03-312-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPU metrics are reported as a normalized value in [0,1]. When scheduler reads the data as MonitorMetric object, as part of update_from_compute_node(), the value of the metric gets lost due to a wrong type conversion, typecasting into an Integer, reduces it to 0. Note: - It may seem unintuitive that to fix the same, we are not changing the type of metric from Integer to Float. Please refer the discussions - * https://review.openstack.org/#/c/243825/ * https://review.openstack.org/#/c/216923/ - To summarize, we are trying to save some 'possible' downstream consumer of metrics updates from compute nodes, i.e. consuming from AMPQ, from software upgrade scenarios. Change-Id: Ib504af33e05dfc4d7e97b52682e27befc67d784a Closes-bug: #1514997 (cherry picked from commit ddb3c4e26f3a908de7836a8fac48360afa6aa1d7)
* | | | | | | | Merge "Fix retry mechanism for generator results" into stable/libertyJenkins2016-05-122-1/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix retry mechanism for generator resultsDiana Clarke2016-04-122-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both v1 and v2 of the glance client return python generators in some cases (rather than fully fleshed out lists) which thwarts our retry mechanism. Convert generator results to a list, so that any potential exceptions get raised earlier rather than later, allowing for retries. Conflicts: /nova/tests/unit/image/test_glance.py Conflict notes: I couldn't add the following assert from master because client.api_servers didn't exist then. It was added in commit 590b2c30073843f736680cdea4d6a6f8c673d725. Instead, I added one that follows the pattern at that time. self.assertEqual(str(client.api_server), "https://host2:9293") Change-Id: Ibc84f1596d4eaabdef0a48f6cf4da2d1323843a8 Closes-Bug: #1557584 (cherry picked from commit ae6d868e2f13f90d9f97c982fdbbccdc6fb8b9c9)
* | | | | | | | Merge "The 'record' option of the WebSocketProxy should be string" into ↵Jenkins2016-05-123-4/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | stable/liberty
| * | | | | | | | The 'record' option of the WebSocketProxy should be stringRadoslav Gerganov2016-04-123-4/+12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If proxy service (VNC, spice, serial) is started with the 'record' option, an exception is thrown. This is because WebSocketProxy expects a file path for the record argument instead of boolean value. This patch fixes this by changing 'record' to be string option. An empty string means no recording. Closes-Bug: #1559026 Change-Id: Id6cf7c65191bdaa579f7cdadea43230897436de6 (cherry picked from commit c5311439d6526006dd1354e09f2bfb86505d550d)
* | | | | | | | Merge "<VMWare> Allocate free bus for new SCSI controller" into stable/libertyJenkins2016-05-114-8/+77
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
View Lorry Controller Status