summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed session from fixed_ip_*() functions.Victor Sergeyev2013-05-221-34/+35
* Merge "Add ca cert file support to cinder client requests"Jenkins2013-05-163-7/+26
|\
| * Add ca cert file support to cinder client requestsCian O'Driscoll2013-05-163-7/+26
* | Merge "Don't inject settings for dynamic network"Jenkins2013-05-163-15/+187
|\ \
| * | Don't inject settings for dynamic networkBen Nemec2013-05-163-15/+187
* | | Merge "Fix header issue for baremetal_deploy_helper.py"Jenkins2013-05-161-1/+1
|\ \ \
| * | | Fix header issue for baremetal_deploy_helper.pyJay Lau2013-05-111-1/+1
* | | | Merge "Mox should cleanup before stubs"Jenkins2013-05-162-1/+18
|\ \ \ \
| * | | | Mox should cleanup before stubsRick Harris2013-05-162-1/+18
| | |_|/ | |/| |
* | | | Merge "libvirt: Catch VIR_ERR_NO_DOMAIN in list_instances"Jenkins2013-05-162-3/+8
|\ \ \ \
| * | | | libvirt: Catch VIR_ERR_NO_DOMAIN in list_instancesJian Wen2013-05-162-3/+8
| |/ / /
* | | | Merge "Reverse compare arguments in filters tests"Jenkins2013-05-161-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reverse compare arguments in filters testsChris Behrens2013-05-161-3/+3
* | | | Merge "Copy the RHEL6 eventlet workaround from Oslo"Jenkins2013-05-162-1/+3
|\ \ \ \
| * | | | Copy the RHEL6 eventlet workaround from OsloMark McLoughlin2013-05-022-1/+3
* | | | | Merge "Architecture property updated in snapshot libvirt"Jenkins2013-05-162-3/+50
|\ \ \ \ \
| * | | | | Architecture property updated in snapshot libvirtBelmiro Moreira2013-05-092-3/+50
* | | | | | Merge "Fix for missing multipath device name"Jenkins2013-05-162-2/+69
|\ \ \ \ \ \
| * | | | | | Fix for missing multipath device nameWalter A. Boring IV2013-05-152-2/+69
* | | | | | | Merge "Detach volume fails when using multipath iscsi"Jenkins2013-05-162-23/+71
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Detach volume fails when using multipath iscsiXing Yang2013-05-132-23/+71
| | |_|_|_|/ | |/| | | |
* | | | | | Revert "Include list of attached volumes with instance info"Russell Bryant2013-05-1569-329/+52
* | | | | | Merge "Sync rpc from oslo."Jenkins2013-05-165-6/+9
|\ \ \ \ \ \
| * | | | | | Sync rpc from oslo.Russell Bryant2013-05-155-6/+9
| | |/ / / / | |/| | | |
* | | | | | Merge "Remove openstack.common.version."Jenkins2013-05-153-97/+2
|\ \ \ \ \ \
| * | | | | | Remove openstack.common.version.Monty Taylor2013-05-153-97/+2
* | | | | | | Merge "Add missing tests for db.fixed_ip_*(). functions."Jenkins2013-05-154-19/+218
|\ \ \ \ \ \ \
| * | | | | | | Add missing tests for db.fixed_ip_*(). functions.Victor Sergeyev2013-05-154-19/+218
* | | | | | | | Merge "Reverse path SNAT for DNAT floating-ip."Jenkins2013-05-151-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Reverse path SNAT for DNAT floating-ip.Brent Eagles2013-05-141-0/+3
* | | | | | | | | Merge "Fix quantum security group driver to accept none for from/to_port"Jenkins2013-05-152-10/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix quantum security group driver to accept none for from/to_portAaron Rosen2013-05-142-10/+52
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Cells: Don't allow active -> build"Jenkins2013-05-155-0/+131
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Cells: Don't allow active -> buildChris Behrens2013-05-155-0/+131
* | | | | | | | Merge "Refactor nova.volume.cinder.API to reduce roundtrips with Cinder"Jenkins2013-05-1513-180/+182
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor nova.volume.cinder.API to reduce roundtrips with CinderOleg Bondarev2013-05-1413-180/+182
* | | | | | | | | Merge "Extract getting instance's AZ into a helper module."Jenkins2013-05-153-20/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extract getting instance's AZ into a helper module.gtt1162013-05-113-20/+44
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Include list of attached volumes with instance info"Jenkins2013-05-1569-52/+329
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include list of attached volumes with instance infoOleg Bondarev2013-05-0869-52/+329
* | | | | | | | | | Merge "xenapi: ensure vdi is not too big when resizing down"Jenkins2013-05-1510-75/+384
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xenapi: ensure vdi is not too big when resizing downJohn Garbutt2013-05-1510-75/+384
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Handle IPMI transient failures better."Jenkins2013-05-154-19/+98
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Handle IPMI transient failures better.Devananda van der Veen2013-05-144-19/+98
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Pass the proper admin context to update_dhcp"Jenkins2013-05-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass the proper admin context to update_dhcpRafi Khardalian2013-05-141-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Add missing unique constraint to KeyPair model."Jenkins2013-05-151-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing unique constraint to KeyPair model.Victor Sergeyev2013-05-141-0/+1
* | | | | | | | | | Merge "Refactored tests for db.key_pair_*() functions."Jenkins2013-05-151-61/+108
|\| | | | | | | | |
| * | | | | | | | | Refactored tests for db.key_pair_*() functions.Victor Sergeyev2013-05-141-61/+108