Merge lp:~zulcss/nova/nova-cloud-g2 into lp:~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

[Chuck Short]

nova-g2

[Adam Gandelman (gandelman-a)]

Please keep the -0ubuntuX verison tag when adding the ~cloud0 tag. Should read: 2013.1~g2-0ubuntu2~cloud0 (not 2013.1~g2~cloud0)

review: Needs Fixing

[lp:~zulcss/nova/nova-cloud-g2]

99. By Chuck Short on 2013-01-25

Fix changelog

=== modified file '.mailmap'
--- .mailmap	2012-11-23 09:04:58 +0000
+++ .mailmap	2013-01-25 16:21:21 +0000
@@ -37,7 +37,8 @@
 <[e-mail]> <[e-mail]>
 <[e-mail]> <[e-mail]>
 <[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
+<[e-mail]> <[e-mail]>
+<[e-mail]> <[e-mail]>
 <[e-mail]> <justinsb@justinsb-desktop>
 <[e-mail]> <[e-mail]>
 <[e-mail]> <[e-mail]>
@@ -89,6 +90,8 @@
 Jake Dahn <[e-mail]> jakedahn <[e-mail]>
 Jason Koelker <[e-mail]> Jason Kölker <[e-mail]>
 Jay Pipes <[e-mail]> [e-mail] <>
+Jian Wen <[e-mail]> <[e-mail]>
+Jian Wen <[e-mail]> <[e-mail]>
 Joel Moore <[e-mail]> Joel Moore [e-mail] <>
 John Griffith <[e-mail]> john-griffith <[e-mail]>
 John Tran <[e-mail]> John Tran <[e-mail]>
@@ -116,4 +119,6 @@
 Vishvananda Ishaya <[e-mail]> <[e-mail]>
 Vishvananda Ishaya <[e-mail]> <root@ubuntu>
 Vivek YS <[e-mail]> Vivek YS [e-mail] <>
+Yaguang Tang <[e-mail]> <[e-mail]>
 Zhongyue Luo <[e-mail]> <[e-mail]>
+Ethan Chu <[e-mail]> <[e-mail]>
 
=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2013-01-25 16:21:21 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ./nova/tests $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
 
=== modified file 'AUTHORS'
--- AUTHORS	2012-11-23 09:04:58 +0000
+++ AUTHORS	2013-01-25 16:21:21 +0000
@@ -17,8 +17,10 @@
 Andrea Rosa <[e-mail]>
 Andrew Bogott <[e-mail]>
 Andrew Clay Shafer <[e-mail]>
+Andrew Glen-Young <[e-mail]>
 Andrew James <[e-mail]>
 Andrew Laski <[e-mail]>
+Andrew Melton <[e-mail]>
 Andrey Brindeyev <[e-mail]>
 Andy McCrae <[e-mail]>
 Andy Smith <[e-mail]>
@@ -33,12 +35,15 @@
 Armando Migliaccio <[e-mail]>
 Arvind Somya <[e-mail]>
 Asbjørn Sannes <[e-mail]>
+Attila Fazekas <[e-mail]>
 Avishay Traeger <[e-mail]>
+Belmiro Moreira <[e-mail]>
 Ben McGraw <[e-mail]>
 Ben Swartzlander <[e-mail]>
 Bhuvan Arumugam <[e-mail]>
 Bilal Akhtar <[e-mail]>
 Boris Filippov <[e-mail]>
+Boris Pavlovic <[e-mail]>
 Brad Hall <[e-mail]>
 Brad McConnell <[e-mail]>
 Brendan Maguire <[e-mail]>
@@ -48,6 +53,7 @@
 Brian Lamar <[e-mail]>
 Brian Schott <[e-mail]>
 Brian Waldon <[e-mail]>
+Carlos Goncalves <[e-mail]>
 Chiradeep Vittal <[e-mail]>
 Chmouel Boudjnah <[e-mail]>
 Chris Behrens <[e-mail]>
@@ -56,6 +62,7 @@
 Christoph Thiel <[e-mail]>
 Christopher MacGown <[e-mail]>
 Chuck Short <[e-mail]>
+Cian O'Driscoll <[e-mail]>
 Clark Boylan <[e-mail]>
 Clay Gerrard <[e-mail]>
 Clemens Perz <[e-mail]>
@@ -102,9 +109,11 @@
 Eric Day <[e-mail]>
 Eric Harney <[e-mail]>
 Eric Windisch <[e-mail]>
+Ethan Chu <[e-mail]>
 Eugene Kirpichov <[e-mail]>
 Evan Callicoat <[e-mail]>
 Ewan Mellor <[e-mail]>
+Flaper Fesp <[e-mail]>
 Flavia Missi <[e-mail]>
 Florian Haas <[e-mail]>
 François Charlier <[e-mail]>
@@ -113,6 +122,7 @@
 Gary Kotton <[e-mail]>
 Gaurav Gupta <[e-mail]>
 Ghe Rivero <[e-mail]>
+Giampaolo Lauria <[e-mail]>
 Greg Althaus <[e-mail]>
 Hendrik Volkmer <[e-mail]>
 Hengqing Hu <[e-mail]>
@@ -128,11 +138,12 @@
 Jake Dahn <[e-mail]>
 James E. Blair <[e-mail]>
 James Page <[e-mail]>
+Janis Gengeris <[e-mail]>
 Jason Cannavale <[e-mail]>
 Jason Koelker <[e-mail]>
 Jay Pipes <[e-mail]>
 Jesse Andrews <[e-mail]>
-Jian Wen <[e-mail]>
+Jian Wen <[e-mail]>
 Jim Fehlig <[e-mail]>
 Jimmy Bergman <[e-mail]>
 Jinwoo 'Joseph' Suh <[e-mail]>
@@ -155,7 +166,7 @@
 Joseph W. Breu <[e-mail]>
 Josh Durgin <[e-mail]>
 Josh Durgin <[e-mail]>
-Josh Kearney <[e-mail]>
+Josh Kearney <[e-mail]>
 Josh Kleinpeter <[e-mail]>
 Joshua Harlow <[e-mail]>
 Joshua McKenty <[e-mail]>
@@ -174,7 +185,10 @@
 Kirill Shileev <[e-mail]>
 Koji Iida <[e-mail]>
 Kost <[e-mail]>
+Kravchenko Pavel <[e-mail]>
+Kurt Taylor <[e-mail]>
 Kylin CG <[e-mail]>
+Lance Bragstad <[e-mail]>
 Launchpad Translations on behalf of nova-core <[e-mail]>
 Leander Bessa Beernaert <[e-mail]>
 Liam Kelleher <[e-mail]>
@@ -187,6 +201,7 @@
 Lvov Maxim <[e-mail]>
 MORITA Kazutaka <[e-mail]>
 Major Hayden <[e-mail]>
+Mana Kaneko <[e-mail]>
 Mandar Vaze <[e-mail]>
 Mandell Degerness <[e-mail]>
 Marco Sinhoreli <[e-mail]>
@@ -218,6 +233,7 @@
 Mohammed Naser <[e-mail]>
 Monsyne Dragon <[e-mail]>
 Monty Taylor <[e-mail]>
+Morgan Fainberg <[e-mail]>
 MotoKen <[e-mail]>
 Muneyuki Noguchi <[e-mail]>
 NTT PF Lab. <[e-mail]>
@@ -233,10 +249,12 @@
 OpenStack Jenkins <[e-mail]>
 Paul McMillan <[e-mail]>
 Paul Voccio <[e-mail]>
+Pedro Navarro Perez <[e-mail]>
 Peng Yong <[e-mail]>
 Phil Day <[e-mail]>
 Philip Knouff <[e-mail]>
 Pádraig Brady <[e-mail]>
+Qiang Guan <[e-mail]>
 Rafi Khardalian <[e-mail]>
 Ralf Haferkamp <[e-mail]>
 Ram Nalluri <[e-mail]>
@@ -250,6 +268,7 @@
 Ripal Nathuji <[e-mail]>
 Rob Esker <[e-mail]>
 Robert Collins <[e-mail]>
+Rohan Rhishikesh Kanade <[e-mail]>
 Roland Hochmuth <[e-mail]>
 Ronen Kat <[e-mail]>
 Rongze Zhu <[e-mail]>
@@ -275,6 +294,7 @@
 Soren Hansen <[e-mail]>
 Soren Hansen <[e-mail]>
 Stanislaw Pitucha <[e-mail]>
+Stef T <[e-mail]>
 Stephanie Reese <[e-mail]>
 Steve Baker <[e-mail]>
 Sulochan Acharya <[e-mail]>
@@ -301,11 +321,15 @@
 Vincent Untz <[e-mail]>
 Vishvananda Ishaya <[e-mail]>
 Vivek YS <[e-mail]>
+Wangpan <[e-mail]>
 William Wolf <[e-mail]>
-Yaguang Tang <[e-mail]>
+Xiangyang Chu <[e-mail]>
+Yaguang Tang <[e-mail]>
+Yolanda Robla <[e-mail]>
 Yong Sheng Gong <[e-mail]>
 Yosef Berman <[e-mail]>
 Yoshiaki Tamura <[e-mail]>
+Yufang Zhang <[e-mail]>
 Yun Mao <[e-mail]>
 Yun Shen <[e-mail]>
 Yunhong, Jiang <[e-mail]>
@@ -318,10 +342,12 @@
 andrewbogott <[e-mail]>
 chris fattarsi <[e-mail]>
 daisy-ycguo <[e-mail]>
+daisy-ycguo <[e-mail]>
 deevi rani <[e-mail]>
 dekehn <[e-mail]>
 eddie-sheffield <[e-mail]>
 garyk <[e-mail]>
+hill <[e-mail]>
 hua zhang <[e-mail]>
 isethi <[e-mail]>
 ivan-zhu <[e-mail]>
@@ -340,7 +366,9 @@
 vijaya-erukala <[e-mail]>
 vladimir.p <[e-mail]>
 xushichao <[e-mail]>
-yaguang tang <[e-mail]>
 yolanda.robla <[e-mail]>
+yugsuo <[e-mail]>
+zhiyanliu <[e-mail]>
+zhoudongshu <[e-mail]>
 Édouard Thuleau <[e-mail]>
 Édouard Thuleau <[e-mail]>
 \ No newline at end of file
 
=== added file 'CONTRIBUTING.rst'
--- CONTRIBUTING.rst	1970-01-01 00:00:00 +0000
+++ CONTRIBUTING.rst	2013-01-25 16:21:21 +0000
@@ -0,0 +1,17 @@
+If you would like to contribute to the development of OpenStack,
+you must follow the steps in the "If you're a developer, start here"
+section of this page:
+
+   http://wiki.openstack.org/HowToContribute
+
+Once those steps have been completed, changes to OpenStack
+should be submitted for review via the Gerrit tool, following
+the workflow documented at:
+
+   http://wiki.openstack.org/GerritWorkflow
+
+Pull requests submitted through GitHub will be ignored.
+
+Bugs should be filed on Launchpad, not GitHub:
+
+   https://bugs.launchpad.net/nova
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-11-23 09:04:58 +0000
+++ ChangeLog	2013-01-25 16:21:21 +0000
@@ -1,4 +1,12713 @@
-commit df534de1452f19bec9b272b88cc76e8393515439
+commit 86db5354bce8b530dde74abce2e96afbf18a17fc
+Author: Rick Harris <[e-mail]>
+Date:   Thu Jan 10 18:22:00 2013 +0000
+
+    Add user/tenant shim to RequestContext
+    
+    This is necessary because we pass the Nova context object to
+    openstack-common/code (logging, for example), which expects the
+    attributes to be named user/tenant not user_id/project_id.
+    
+    Fixes bug 1098278
+    
+    Change-Id: Ic0dc49ef54515fc0ffaa0895cf4d88701afb1e16
+    (cherry picked from commit ce098ccce9d67df8c243fa885640989a4703ac53)
+
+ nova/context.py |   17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit 0d8569e83c3212b7b871a08aa0dc928134bd6338
+Merge: d355a45 6cd0cdf
+Author: Jenkins <[e-mail]>
+Date:   Thu Jan 10 18:17:30 2013 +0000
+
+    Merge "Update instance's cell_name in API cell." into milestone-proposed
+
+commit 6cd0cdfbc03adf0cc633dd964f7cfbaaa5dee567
+Author: Chris Behrens <[e-mail]>
+Date:   Thu Jan 10 08:58:21 2013 +0000
+
+    Update instance's cell_name in API cell.
+    
+    It was accidentally being removed before updating the DB due to code
+    being moved and not updated.  The test for the method was broken, too,
+    allowing this bug to sneak in.
+    
+    Fixes bug 1098093
+    
+    Change-Id: I05c00b8b100568b39afb8ee0ca7ee94d4dd97c0a
+    (cherry picked from commit abc9a0d5df70ee00ba38e655a4d88ae18417f0e3)
+
+ nova/cells/messaging.py                  |   11 +++++------
+ nova/tests/cells/test_cells_messaging.py |    2 ++
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+commit d355a45694ffbdd7955f26e1d806bd5244933e90
+Author: Chris Behrens <[e-mail]>
+Date:   Thu Jan 10 01:18:33 2013 +0000
+
+    Fix init_host checking moved instances
+    
+    Commit 6fc00d3465185 (https://review.openstack.org/#/c/18486/)
+    introduced a couple of problems.
+    
+    1) It introduced a method to try to deduce instance integer id from
+       a name the driver reports and using instance_name_template.  This
+       fails badly when you're using something like 'instance-%(uuid)s' for
+       instance_name_template.  It's only used when the driver does not
+       support the 'list_instance_uuids' method.. but XenAPI happens to
+       not implement this method.
+    
+    2) There's a call to _get_instance_volume_block_device_info() that is
+       passing an instance_uuid when the method wants an instance.
+    
+    Fixes bug 1097987 (#1 above) by doing a brute force match against
+       all instances' names.
+    Fixes bug 1097978 (#2 above)
+    
+    Change-Id: I2da7658dd906fa06f0e867a2b22bf14e7f34cb12
+    (cherry picked from commit d25991b41b5f476c293a6cf62361b115a160c64a)
+
+ nova/compute/manager.py                  |   87 +++++------
+ nova/compute/utils.py                    |   60 --------
+ nova/tests/compute/test_compute.py       |  230 ++++++++++++++++--------------
+ nova/tests/compute/test_compute_utils.py |   94 ------------
+ 4 files changed, 167 insertions(+), 304 deletions(-)
+
+commit 1db4b13d86d748d9619ea9ce37bb4663285468b5
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 08:00:45 2013 +0000
+
+    Move common virt driver options to virt.driver
+    
+    The default_ephemeral_format and use_cow_images options are used by a
+    number of virt drivers and nowhere else.
+    
+    blueprint: scope-config-opts
+    Change-Id: I4ab2891e156589ae7bb44e6ce69cba3680a070c5
+
+ nova/config.py                       |    7 -------
+ nova/virt/driver.py                  |    7 +++++++
+ nova/virt/hyperv/livemigrationops.py |    2 +-
+ nova/virt/hyperv/vmops.py            |    2 +-
+ nova/virt/libvirt/driver.py          |    4 ++--
+ nova/virt/xenapi/vm_utils.py         |    4 ++--
+ 6 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 44cc0cda04cd20adf057eff76af0e6ba5ee0dcad
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:54:01 2013 +0000
+
+    Move default_instance_type into nova.compute
+    
+    Apart from the tests, this option is only used in
+    nova.compute.instance_types so move it there.
+    
+    blueprint: scope-config-opts
+    Change-Id: Iadf4011739e50455b7ad4214a778a02e244fef35
+
+ nova/compute/instance_types.py          |    9 ++++++++-
+ nova/config.py                          |    3 ---
+ nova/tests/api/ec2/test_cinder_cloud.py |    2 +-
+ nova/tests/api/ec2/test_cloud.py        |    2 +-
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+commit 2803fd8d400b7d76138b2e2c152017a3d5e49685
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:50:47 2013 +0000
+
+    Move osapi_compute_unique_server_name_scope to db
+    
+    This strange little option is only used within the DB layer.
+    
+    blueprint: scope-config-opts
+    Change-Id: I10b0fef02a5fffd44094fe351cde683fc5c31442
+
+ nova/config.py            |    5 -----
+ nova/db/sqlalchemy/api.py |    8 ++++++++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 4c43371fd540f81320fb956266393a089e6d56dd
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:38:34 2013 +0000
+
+    Move api_class options to where they are used
+    
+    The compute_api_class, network_api_class and volume_api_class options
+    are only used in their respective modules, so move them there.
+    
+    blueprint: scope-config-opts
+    Change-Id: Ib0497f46b44c4b3af7319550cc64c09d629ea362
+
+ nova/api/openstack/compute/servers.py |    2 +-
+ nova/compute/__init__.py              |    9 +++++++++
+ nova/config.py                        |    9 ---------
+ nova/network/__init__.py              |    9 +++++++++
+ nova/volume/__init__.py               |    9 +++++++++
+ 5 files changed, 28 insertions(+), 10 deletions(-)
+
+commit 39ce4032bb62bf62e84b9a4191e16a28e4a68454
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:20:09 2013 +0000
+
+    Move manager options into nova.service
+    
+    Move the compute_manager, console_manager, cert_manager, network_manager
+    and scheduler_manager options into nova.service.
+    
+    Apart from the tests, these options are mostly just used in nova.service
+    so it makes sense for them to live there. Also, metadata_manager already
+    lives there.
+    
+    blueprint: scope-config-opts
+    Change-Id: I180859817b57c081b83d6a6f075a6ff76bb0ef6d
+
+ bin/nova-dhcpbridge                       |    2 +-
+ bin/nova-manage                           |    2 +-
+ nova/compute/manager.py                   |    2 +-
+ nova/config.py                            |   15 ---------------
+ nova/service.py                           |   16 +++++++++++++++-
+ nova/tests/compute/test_compute.py        |    2 +-
+ nova/tests/compute/test_compute_utils.py  |    2 +-
+ nova/tests/compute/test_multiple_nodes.py |    2 +-
+ nova/tests/console/test_console.py        |    2 +-
+ nova/tests/test_imagecache.py             |    2 +-
+ nova/tests/test_libvirt.py                |    2 +-
+ nova/tests/test_xenapi.py                 |    4 ++--
+ 12 files changed, 26 insertions(+), 27 deletions(-)
+
+commit eac6e73223658595737ea001e1e0b18cfb4398c1
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:01:42 2013 +0000
+
+    Move compute_topic into nova.compute.rpcapi
+    
+    Even though the compute_topic opt is used outside nova.compute.rpcapi,
+    it makes sense for the RPC module to "own" the topic option.
+    
+    blueprint: scope-config-opts
+    Change-Id: I453951825481b9a5ba1865f6bf1223f7b1e25f98
+
+ bin/nova-compute                                   |    2 +-
+ .../compute/contrib/instance_usage_audit_log.py    |    2 +-
+ nova/compute/api.py                                |    2 +-
+ nova/compute/rpcapi.py                             |    8 +++++++-
+ nova/config.py                                     |    3 ---
+ nova/db/sqlalchemy/api.py                          |    2 +-
+ nova/scheduler/chance.py                           |    2 +-
+ nova/scheduler/driver.py                           |    2 +-
+ nova/tests/compute/test_compute.py                 |    1 -
+ nova/tests/compute/test_rpcapi.py                  |    1 -
+ 10 files changed, 13 insertions(+), 12 deletions(-)
+
+commit 32cf601fc16d2de0a9e227bebebcbabc9fef5fb1
+Merge: 579c586 b4af878
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:58:16 2013 +0000
+
+    Merge "Move scheduler_topic into nova.scheduler.rpcapi"
+
+commit 579c5860ab167a80e31ac1b64464b664f9d9cfcb
+Merge: d7b7f10 7a5e72d
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:03:07 2013 +0000
+
+    Merge "Move console_topic into nova.console.rpcapi"
+
+commit d7b7f10855164ee0ea9cdeca21fac446ccb30b3a
+Merge: aa46eb0 580df54
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:02:52 2013 +0000
+
+    Merge "Move network_topic into nova.network.rpcapi"
+
+commit aa46eb0a70cfc138132ceed13ac57874249deeb0
+Merge: f9029d3 9714f31
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:02:38 2013 +0000
+
+    Merge "Move cert_topic into nova.cert.rpcapi"
+
+commit f9029d36e8a70d85ee31eed673c625b5199030c2
+Merge: 5165325 0778420
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:02:24 2013 +0000
+
+    Merge "Move global s3 opts into nova.image.s3"
+
+commit 51653257ee911e6d86da187d84a28d3625879111
+Merge: b9959b1 1b7cea7
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 05:38:21 2013 +0000
+
+    Merge "Verify the disk file exists before running qemu-img on it."
+
+commit b9959b180e8035a0654313be3d6cded2da1d4894
+Merge: ddb2400 e6cae13
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 04:09:45 2013 +0000
+
+    Merge "attach/detach_volume() take instance as a parameter"
+
+commit ddb2400047d0afd8bc8e408ac3e9034b4c625952
+Merge: 2a2892f 1ab2fc6
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 04:09:31 2013 +0000
+
+    Merge "Remove availability_zones from service table"
+
+commit 2a2892f15e0b74eb36b25519756bcb0d19637915
+Merge: dcd4327 fa2ca8e
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 04:09:17 2013 +0000
+
+    Merge "Import latest timeutils from oslo-incubator"
+
+commit dcd4327bd05a637bc49166920ccecf33e7ea4d5a
+Merge: beee8b1 9f4534a
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 04:09:00 2013 +0000
+
+    Merge "Enable Aggregate based availability zones"
+
+commit beee8b112a92475d0e0cf575f5bcebefe3bc6188
+Merge: bdd90e4 8596e8b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 04:02:25 2013 +0000
+
+    Merge "Added sample tests to FlavorRxtx API."
+
+commit bdd90e4ceabccf66163ca77f4cdbd965345b7002
+Merge: 9026553 2bcca39
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 03:27:42 2013 +0000
+
+    Merge "Move global glance opts into nova.image.glance"
+
+commit 9026553e2f6af93fa8a15dbb9dd452f73d09ac1d
+Merge: db3da2d 6fc00d3
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 02:30:25 2013 +0000
+
+    Merge "Adds to manager init_host validation for instances location"
+
+commit db3da2d95626ed25ed8fc925662a5a17dc7d32a2
+Merge: f4091e9 14fcded
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 02:12:18 2013 +0000
+
+    Merge "Clarify the DBApi object in cells fakes"
+
+commit f4091e9eb8813fa005051b9e1524a24b9589e5d4
+Merge: 6ac6622 889116d
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 02:11:58 2013 +0000
+
+    Merge "Add to libvirt driver instance_on_disk method"
+
+commit 6ac66221d17ddb4a342eab4c2a0f5133f0c398db
+Merge: 76cc3b6 2d45a17
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 02:06:41 2013 +0000
+
+    Merge "add to driver option to keep disks when instance destroyed"
+
+commit 76cc3b62653efaacb49aa30fe112c1eb713a4290
+Merge: fa4696f dff51fb
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 01:32:21 2013 +0000
+
+    Merge "Fix serialization in impl_zmq."
+
+commit fa4696ff03260351e0755191e479fcc8026ab828
+Merge: e15b65f 37bfdd3
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 01:01:57 2013 +0000
+
+    Merge "fix N401 errors, stop ignoring all N4* errors"
+
+commit fa2ca8ea7f538669fb32e431eb4c5ea94e6e2e3f
+Author: Flaper Fesp <[e-mail]>
+Date:   Tue Jan 8 16:10:58 2013 +0100
+
+    Import latest timeutils from oslo-incubator
+    
+    Fixes bug #1097464
+    
+    Changes synced are:
+    
+     a08daf1 Use basestring instead of str for type check.
+     615d769 Account for tasks duration in LoopingCall delay
+     ce80aac Convenience wrapper for datetime.timedelta.total_seconds()
+    
+    Change-Id: If4ab7ccd2f4e815e01c41f25fdd541ffcd7693d5
+
+ nova/openstack/common/timeutils.py |   33 ++++++++++++++++++++++++++++-----
+ 1 file changed, 28 insertions(+), 5 deletions(-)
+
+commit e15b65f45673971480a66d17ccb771d7b7a46a30
+Merge: 61e9e01 fd1d901
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 22:13:56 2013 +0000
+
+    Merge "Fix baremetal VIFDriver"
+
+commit 1ab2fc6477c402e29a95fbc93fe4a67950c083df
+Author: Joe Gordon <[e-mail]>
+Date:   Thu Dec 20 03:13:01 2012 +0000
+
+    Remove availability_zones from service table
+    
+    This is the final step in enabling availability_zones using aggregate
+    metadata. Previously all services had an availability_zone, but the
+    availability_zone is only used for nova-compute.  Services such as
+    nova-scheduler, nova-network, nova-conductor have always spanned all
+    availability_zones.
+    
+    After this change only compute nodes (nova-compute), will have an
+    availability_zone. In order to preserve current APIs, when running:
+    * nova host-list (os-hosts)
+    * euca-describe-availability-zones verbose
+    * nova-manage service list
+    Internal services will appear in there own internal availability_zone
+    (CONF.internal_service_availability_zone)
+    Internal zone is hidden in euca-describe-availability_zones
+    (non-verbose)
+    
+    CONF.node_availability_zone has been renamed to
+    CONF.default_availability_zone and is only used by the nova-api and
+    nova-scheduler. CONF.node_availability_zone still works but is
+    deprecated
+    
+    DocImpact
+    
+    Completes blueprint aggregate-based-availability-zones
+    
+    Change-Id: Ib772df5f9ac2865f20df479f8ddce575a9ce3aff
+
+ bin/nova-manage                                    |    3 +
+ doc/api_samples/os-hosts/hosts-list-resp.json      |   10 +--
+ nova/api/ec2/cloud.py                              |   43 +++++-----
+ nova/api/ec2/ec2utils.py                           |    3 +-
+ nova/api/openstack/compute/contrib/hosts.py        |    2 +
+ nova/availability_zones.py                         |   62 +++++++++++++++
+ nova/compute/api.py                                |    5 --
+ nova/config.py                                     |    3 -
+ nova/db/api.py                                     |    6 +-
+ .../migrate_repo/versions/147_no_service_zones.py  |   83 ++++++++++++++++++++
+ nova/db/sqlalchemy/models.py                       |    1 -
+ nova/network/quantumv2/api.py                      |    5 +-
+ nova/scheduler/filters/availability_zone_filter.py |   14 +++-
+ nova/service.py                                    |    5 +-
+ nova/servicegroup/db_driver.py                     |    3 -
+ nova/tests/api/ec2/test_cloud.py                   |   36 +++++----
+ .../api/openstack/compute/contrib/test_hosts.py    |   14 ++--
+ nova/tests/compute/test_compute.py                 |    3 +-
+ .../api_samples/os-hosts/hosts-list-resp.json.tpl  |    8 +-
+ nova/tests/network/test_quantumv2.py               |    1 +
+ nova/tests/test_libvirt.py                         |    3 +-
+ nova/tests/test_migrations.py                      |   58 ++++++++++++++
+ nova/tests/test_service.py                         |    4 +-
+ nova/tests/test_xenapi.py                          |    9 +--
+ 24 files changed, 291 insertions(+), 93 deletions(-)
+
+commit 9f4534ab584faeee1e24d4c1bb38a2b194f24626
+Author: Joe Gordon <[e-mail]>
+Date:   Thu Aug 2 17:44:18 2012 -0700
+
+    Enable Aggregate based availability zones
+    
+    Instead of implementing availability zones in the service table,
+    availability zones are implemented using general aggregate metadata.
+    
+    This patch does not remove availability zones from the service table, a
+    latter patch will do that.
+    
+    * In theory supports a single compute node in multiple availability zones
+    * Drop availability_zone column from Aggregate table (is now a property)
+    * map aggregate metadata 'availability_zone' so API does not change
+    
+    Implements blueprint aggregate-based-availability-zones
+    
+    Change-Id: I2a2ac5bfaa526d639dff5efa392c051347dbd9bb
+
+ .../os-aggregates/aggregate-update-post-resp.json  |    8 +-
+ .../os-aggregates/aggregate-update-post-resp.xml   |    8 +-
+ .../aggregates-add-host-post-resp.json             |    8 +-
+ .../aggregates-add-host-post-resp.xml              |    8 +-
+ .../os-aggregates/aggregates-get-resp.json         |    8 +-
+ .../os-aggregates/aggregates-get-resp.xml          |    8 +-
+ .../os-aggregates/aggregates-list-get-resp.json    |    6 +-
+ .../os-aggregates/aggregates-list-get-resp.xml     |    8 +-
+ .../aggregates-metadata-post-resp.json             |    3 +-
+ .../aggregates-metadata-post-resp.xml              |    3 +-
+ .../aggregates-remove-host-post-resp.json          |    6 +-
+ .../aggregates-remove-host-post-resp.xml           |    6 +-
+ nova/api/ec2/cloud.py                              |   17 ++-
+ nova/compute/api.py                                |   25 ++--
+ nova/db/api.py                                     |    8 ++
+ nova/db/sqlalchemy/api.py                          |   52 ++++++---
+ .../migrate_repo/versions/146_aggregate_zones.py   |   57 +++++++++
+ nova/db/sqlalchemy/models.py                       |    9 +-
+ nova/scheduler/filters/availability_zone_filter.py |   17 ++-
+ nova/tests/api/ec2/test_cloud.py                   |   10 +-
+ .../openstack/compute/contrib/test_aggregates.py   |   16 +--
+ nova/tests/compute/test_compute.py                 |   28 +----
+ nova/tests/conductor/test_conductor.py             |    2 +-
+ .../aggregate-update-post-resp.json.tpl            |    4 +-
+ .../aggregate-update-post-resp.xml.tpl             |    4 +-
+ .../aggregates-add-host-post-resp.json.tpl         |    4 +-
+ .../aggregates-add-host-post-resp.xml.tpl          |    4 +-
+ .../os-aggregates/aggregates-get-resp.json.tpl     |    4 +-
+ .../os-aggregates/aggregates-get-resp.xml.tpl      |    4 +-
+ .../aggregates-list-get-resp.json.tpl              |    4 +-
+ .../os-aggregates/aggregates-list-get-resp.xml.tpl |    4 +-
+ .../aggregates-metadata-post-resp.json.tpl         |    1 +
+ .../aggregates-metadata-post-resp.xml.tpl          |    1 +
+ .../aggregates-remove-host-post-resp.json.tpl      |    4 +-
+ .../aggregates-remove-host-post-resp.xml.tpl       |    4 +-
+ nova/tests/scheduler/test_host_filters.py          |    7 +-
+ nova/tests/test_db_api.py                          |  123 +++++++++-----------
+ nova/tests/test_migrations.py                      |   34 ++++++
+ nova/tests/test_xenapi.py                          |   19 +--
+ 39 files changed, 355 insertions(+), 191 deletions(-)
+
+commit 14fcded53ded17a1c10325453c2e04458955301f
+Author: Chris Behrens <[e-mail]>
+Date:   Tue Jan 8 21:46:01 2013 +0000
+
+    Clarify the DBApi object in cells fakes
+    
+    Adds a docstring and makes instance_get_by_uuid() raise by default.
+    It's only used as a stubbing point, but returning 'None' is not really
+    valid and having it raise might save someone some confusion in the
+    future.
+    
+    Change-Id: Ie3fa333288f9c0263ead69c2d307101b8583dea7
+
+ nova/tests/cells/fakes.py |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit 61e9e0112bf2fd09892a5e1974d4f454ea2a4469
+Merge: 741e0e8 942b3ed
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 21:20:53 2013 +0000
+
+    Merge "Remove unused osapi_path option"
+
+commit 741e0e8e7575b25476f33919304a8f5506b6ab9b
+Merge: 954fabb 285994b
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 21:15:52 2013 +0000
+
+    Merge "Add api extension to get and reset password"
+
+commit 954fabbb3ddc1508f0f432cb89f0957c0e59b991
+Merge: 8a812a7 321a839
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 21:02:10 2013 +0000
+
+    Merge "Refresh instance metadata in-place"
+
+commit 6fc00d34651858308c5b08fdabe8a0b9ce663e26
+Author: Kravchenko Pavel <[e-mail]>
+Date:   Tue Jan 8 22:54:14 2013 +0200
+
+    Adds to manager init_host validation for instances location
+    
+    While the compute was down the instances running on it could be
+    evacuated to another host. The method checks that instance host
+    identical to current host. Otherwise destroying it.
+    
+    part of blueprint rebuild-for-ha
+    
+    DocImpact
+    
+    Change-Id: Ic90df2b2887ee203e6d8261084e3f97773c5d81c
+    Co-authored-by: Oshrit Feder <[e-mail]>
+
+ nova/compute/manager.py                  |   67 ++++++++++++++
+ nova/compute/utils.py                    |   60 +++++++++++++
+ nova/conductor/api.py                    |    6 ++
+ nova/conductor/manager.py                |    7 +-
+ nova/conductor/rpcapi.py                 |    6 ++
+ nova/tests/compute/test_compute.py       |  143 ++++++++++++++++++++++++++++++
+ nova/tests/compute/test_compute_utils.py |   94 ++++++++++++++++++++
+ nova/virt/driver.py                      |    7 ++
+ nova/virt/fake.py                        |    3 +
+ nova/virt/libvirt/driver.py              |    4 +
+ 10 files changed, 396 insertions(+), 1 deletion(-)
+
+commit 889116d49082a75485ffa06b42223ba812b1f1a3
+Author: Kravchenko Pavel <[e-mail]>
+Date:   Sun Jan 6 11:27:05 2013 +0200
+
+    Add to libvirt driver instance_on_disk method
+    
+    Added method to driver layer to validate that instance directory
+    accessible from the host.
+    
+    part of libvirt driver support for blueprint rebuild-for-ha
+    
+    DocImpact
+    
+    Change-Id: I9c6a3aec99f61bd4fb6bc4b4264771e077aae96a
+    Co-authored-by: Oshrit Feder <[e-mail]>
+
+ nova/virt/driver.py         |   14 ++++++++++++++
+ nova/virt/fake.py           |    3 +++
+ nova/virt/libvirt/driver.py |   10 ++++++++++
+ 3 files changed, 27 insertions(+)
+
+commit 2d45a177b0198cc04c769c89231fb01f317937cb
+Author: Kravchenko Pavel <[e-mail]>
+Date:   Tue Jan 8 21:22:35 2013 +0200
+
+    add to driver option to keep disks when instance destroyed
+    
+    Adding delete_disks flag to destroy instance method.
+    In case it's false the driver keeps disks.
+    *required for blueprint rebuild-for-ha
+    
+    DocImpact
+    
+    Change-Id: I38c7833114d8414dff831c9cc0c04c4610dbd33a
+    Co-authored-by: Oshrit Feder <[e-mail]>
+
+ nova/tests/test_libvirt.py    |   68 +++++++++++++++++++++++++++++++++++++++++
+ nova/virt/driver.py           |    4 ++-
+ nova/virt/fake.py             |    3 +-
+ nova/virt/hyperv/driver.py    |    5 +--
+ nova/virt/hyperv/vmops.py     |   26 ++++++++--------
+ nova/virt/libvirt/driver.py   |   37 +++++++++++-----------
+ nova/virt/powervm/driver.py   |    5 +--
+ nova/virt/powervm/operator.py |    8 ++---
+ nova/virt/vmwareapi/driver.py |    5 +--
+ nova/virt/vmwareapi/vmops.py  |   52 ++++++++++++++++---------------
+ nova/virt/xenapi/driver.py    |    6 ++--
+ nova/virt/xenapi/vmops.py     |   17 ++++++-----
+ 12 files changed, 161 insertions(+), 75 deletions(-)
+
+commit 8a812a75ce0e72fd79d6c73d94943bfe30eb3977
+Merge: 885271e 4e02fa1
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 19:44:53 2013 +0000
+
+    Merge "Add exception handler for previous deleted flavor."
+
+commit 885271e06e7860cca05d06d9f49ac0a2646684a8
+Merge: a02f228 dc8aeb4
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 19:44:36 2013 +0000
+
+    Merge "Support cinderclient http retries."
+
+commit a02f22849aed77fd1e7fba3b0a3164e457e1d0f7
+Merge: 7da89a7 0ca44e9
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 19:44:20 2013 +0000
+
+    Merge "Conductor instance_get_all replaces _by_filters"
+
+commit dff51fbf3ebdc5ab1a85b4457414f1f7a9a1dce1
+Author: Russell Bryant <[e-mail]>
+Date:   Tue Jan 8 14:31:46 2013 -0500
+
+    Fix serialization in impl_zmq.
+    
+    Sync rpc from oslo-incubator to include some fixes to impl_zmq:
+    
+        https://review.openstack.org/#/c/18913/
+    
+    Change-Id: I5f5c157e81026c108df04bd385776a9985d4a497
+
+ nova/openstack/common/rpc/impl_zmq.py |   41 +++++++++++++++++++++++++--------
+ 1 file changed, 32 insertions(+), 9 deletions(-)
+
+commit 8596e8b8405c7239b209348ea57263f1017ad7e7
+Author: Giampaolo Lauria <[e-mail]>
+Date:   Tue Jan 8 10:18:59 2013 -0500
+
+    Added sample tests to FlavorRxtx API.
+    
+    Partially implements blueprint nova-api-samples
+    Fixes bug 1091743
+    
+    Change-Id: I400e627cfc499b3e7bb1c88d6ce7d24b4d222b84
+
+ .../os-flavor-rxtx/flavor-rxtx-get-resp.json       |   20 +++++
+ .../os-flavor-rxtx/flavor-rxtx-get-resp.xml        |    5 ++
+ .../os-flavor-rxtx/flavor-rxtx-list-resp.json      |   94 ++++++++++++++++++++
+ .../os-flavor-rxtx/flavor-rxtx-list-resp.xml       |   23 +++++
+ .../os-flavor-rxtx/flavor-rxtx-post-req.json       |   10 +++
+ .../os-flavor-rxtx/flavor-rxtx-post-req.xml        |    9 ++
+ .../os-flavor-rxtx/flavor-rxtx-post-resp.json      |   20 +++++
+ .../os-flavor-rxtx/flavor-rxtx-post-resp.xml       |    5 ++
+ .../os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl   |   20 +++++
+ .../os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl    |    5 ++
+ .../os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl  |   94 ++++++++++++++++++++
+ .../os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl   |   23 +++++
+ .../os-flavor-rxtx/flavor-rxtx-post-req.json.tpl   |   10 +++
+ .../os-flavor-rxtx/flavor-rxtx-post-req.xml.tpl    |    9 ++
+ .../os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl  |   20 +++++
+ .../os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl   |    5 ++
+ nova/tests/integrated/test_api_samples.py          |   50 ++++++++++-
+ 17 files changed, 421 insertions(+), 1 deletion(-)
+
+commit 321a8396ca6e0a6896658e9ceb724f1ba796ee40
+Author: Dan Smith <[e-mail]>
+Date:   Mon Jan 7 14:17:07 2013 -0500
+
+    Refresh instance metadata in-place
+    
+    For some reason that isn't entirely clear to me, the attempt to update
+    instance metadata in _instance_update() results in a stale sqlalchemy
+    object state. This is a similar issue to the one fixed in commit:
+    
+      9fdf7552779d518af9cda4e366bf81fddb0cb6f2
+    
+    For some reason, session.refresh() doesn't work for instance['metadata']
+    in the same way, which also raises suspicion that perhaps it's not the
+    right fix for system_metadata either.
+    
+    This patch adds an _instance_update_metadata_in_place() method that
+    updates the actual instance['metadata'] list _and_ the database,
+    mirroring the high-level behavior of instance_metadata_update(), but
+    without requiring us to refresh or re-fetch the metadata or the
+    whole instance (as a workaround).
+    
+    Fixes bug 1096653
+    
+    Change-Id: Ic5a205631b1b7dce3744960ed4201dcc7b4b2ae6
+
+ nova/db/sqlalchemy/api.py |   30 +++++++++++++++++++++++++++---
+ nova/tests/test_db_api.py |    6 ++++--
+ 2 files changed, 31 insertions(+), 5 deletions(-)
+
+commit 7da89a7947fd2613b3425fa1ded104878b78bda9
+Merge: f628016 eeff3dd
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 17:54:05 2013 +0000
+
+    Merge "CLI for bare-metal database sync."
+
+commit f628016154eaeaffb6ade9153493190079fe5a01
+Merge: 356c08b 3bf5e88
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 17:53:48 2013 +0000
+
+    Merge "powervm: Implement snapshot for local volumes"
+
+commit fd1d9015495713f33f8a2b9ca226f9bc2f4068b3
+Author: Devananda van der Veen <[e-mail]>
+Date:   Tue Jan 8 09:39:37 2013 -0800
+
+    Fix baremetal VIFDriver
+    
+    Commit Id287f7e661 removed the nova/virt/vif.py file and the VIFDriver
+    base class, and erroneously stated in its commit message that baremetal
+    driver did not use it. This patch repeats the work of that earlier patch
+    by removing the import of nova.virt.vif from baremetal/vif_driver.py.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: Ifac9510a72a028dc5d3574148f3c4a6410b1d249
+
+ nova/virt/baremetal/vif_driver.py |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 356c08bfc4b12c8e82f4cbd5d7e96a075106532d
+Merge: f3d26c7 351745d
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 16:12:16 2013 +0000
+
+    Merge "Add two tests for resize action in ServerActionsControllerTest."
+
+commit f3d26c70a2756578111fe078df95384550bcefe2
+Merge: d58061d 2a19cd1
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 15:41:49 2013 +0000
+
+    Merge "Sync rpc and notifier from oslo-incubator."
+
+commit d58061d5ff819f3e8434256264b2d09a02751271
+Merge: 7cd22aa d9b6904
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 14:38:49 2013 +0000
+
+    Merge "Added sample tests to QuotaClasses API."
+
+commit eeff3ddcb69f68bc1ab79356cb30fdbd09b8e8d4
+Author: Mikyung Kang <[e-mail]>
+Date:   Tue Jan 8 22:56:14 2013 +0900
+
+    CLI for bare-metal database sync.
+    
+    Part 3 of 6: blueprint general-bare-metal-provisioning-framework.
+    
+    Change-Id: Ia19ce00edb84aa924c2ab2c9c2217f6b49073d69
+    Co-authored-by: Mikyung Kang <[e-mail]>
+    Co-authored-by: David Kang <[e-mail]>
+    Co-authored-by: Ken Igarashi <[e-mail]>
+    Co-authored-by: Arata Notsu <[e-mail]>
+
+ bin/nova-baremetal-manage                          |  234 ++++++++++++++++++++
+ doc/source/man/nova-baremetal-manage.rst           |   67 ++++++
+ nova/tests/baremetal/test_nova_baremetal_manage.py |   49 ++++
+ setup.py                                           |    1 +
+ 4 files changed, 351 insertions(+)
+
+commit b4af87863485b1dd074ba9f639f5cf5c78fa8fa1
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 06:58:02 2013 +0000
+
+    Move scheduler_topic into nova.scheduler.rpcapi
+    
+    The scheduler_topic opt is only used in nova.scheduler.rpcapi and it
+    makes sense for the RPC module to "own" the topic option.
+    
+    blueprint: scope-config-opts
+    Change-Id: Iafb8705eb716b650b63e060fe1dd36666bcee812
+
+ bin/nova-scheduler                               |    2 +-
+ nova/config.py                                   |    3 ---
+ nova/scheduler/rpcapi.py                         |    8 +++++++-
+ nova/tests/api/openstack/compute/test_servers.py |    2 +-
+ nova/tests/scheduler/test_rpcapi.py              |    1 -
+ nova/tests/test_quota.py                         |    2 +-
+ 6 files changed, 10 insertions(+), 8 deletions(-)
+
+commit 7a5e72d80d78049c8941a7d7ac1fb72bd9ccd2d0
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 06:52:32 2013 +0000
+
+    Move console_topic into nova.console.rpcapi
+    
+    Even though the console_topic opt is used outside nova.console.rpcapi,
+    it makes sense for the RPC module to "own" the topic option.
+    
+    blueprint: scope-config-opts
+    Change-Id: I0f00927ca1c0bba7b21315240165e83e7075ebb7
+
+ bin/nova-console                  |    2 +-
+ nova/compute/manager.py           |    2 +-
+ nova/config.py                    |    3 ---
+ nova/console/api.py               |    2 +-
+ nova/console/rpcapi.py            |    8 +++++++-
+ nova/tests/console/test_rpcapi.py |    1 -
+ 6 files changed, 10 insertions(+), 8 deletions(-)
+
+commit 580df542609eae01358d14f84bbeb278e8f86eac
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 06:48:04 2013 +0000
+
+    Move network_topic into nova.network.rpcapi
+    
+    The network_topic opt is only used in nova.network.rpcapi and it makes
+    sense for the RPC module to "own" the topic option.
+    
+    blueprint: scope-config-opts
+    Change-Id: Icd779f34df47ac6dd048b3e41995e872d8859872
+
+ bin/nova-network                  |    2 +-
+ nova/config.py                    |    3 ---
+ nova/network/rpcapi.py            |    8 +++++++-
+ nova/tests/network/test_rpcapi.py |    1 -
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 9714f31f37e48e9c6f0fca3b3b6e8cd047769b09
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 06:44:36 2013 +0000
+
+    Move cert_topic into nova.cert.rpcapi
+    
+    The cert_topic opt is only used in nova.cert.rpcapi and it makes sense
+    for the RPC module to "own" the topic option.
+    
+    blueprint: scope-config-opts
+    Change-Id: If3584b8e1984e0425d9f33133f9d291739b04d49
+
+ bin/nova-cert                  |    2 +-
+ nova/cert/rpcapi.py            |    8 +++++++-
+ nova/config.py                 |    3 ---
+ nova/tests/cert/test_rpcapi.py |    1 -
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 0778420dcd94b935d7c6dd075e49041e497cf462
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 06:37:20 2013 +0000
+
+    Move global s3 opts into nova.image.s3
+    
+    s3_host and s3_port are only used in nova.image.s3.
+    
+    blueprint: scope-config-opts
+    Change-Id: Ia841406ebe7c03b2a58392e2453118e2646ad7ce
+
+ nova/config.py                 |    7 -------
+ nova/image/s3.py               |   10 ++++++++--
+ nova/tests/test_objectstore.py |    2 +-
+ 3 files changed, 9 insertions(+), 10 deletions(-)
+
+commit 2bcca3959209707e5604948ceb70d039671ae002
+Author: Mark McLoughlin <[e-mail]>
+Date:   Mon Jan 7 22:06:49 2013 +0000
+
+    Move global glance opts into nova.image.glance
+    
+    Move the glance_host, glance_port and glance_protocol options into the
+    nova.image.glance module.
+    
+    Also move the generate_glance_url() and generate_image_url() utility
+    methods there since they're the only uses of the options outside of the
+    module.
+    
+    blueprint: scope-config-opts
+    Change-Id: I3beca1a65cdd902a94ddc1c512d79a4de635ef38
+
+ nova/api/openstack/compute/views/images.py      |    4 ++--
+ nova/compute/manager.py                         |    2 +-
+ nova/config.py                                  |   10 ---------
+ nova/image/glance.py                            |   22 +++++++++++++++++++
+ nova/notifications.py                           |    3 ++-
+ nova/tests/api/openstack/compute/test_images.py |   26 +++++++++++------------
+ nova/tests/compute/test_compute.py              |   13 ++++++------
+ nova/tests/compute/test_compute_utils.py        |   10 ++++-----
+ nova/tests/image/test_glance.py                 |   17 +++++++++++++++
+ nova/tests/test_utils.py                        |   17 ---------------
+ nova/utils.py                                   |   14 ------------
+ 11 files changed, 69 insertions(+), 69 deletions(-)
+
+commit 942b3ed874f045c892ad497ffadfdd80cb63bf9e
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Jan 8 07:48:02 2013 +0000
+
+    Remove unused osapi_path option
+    
+    This has been unused since deprecated auth was removed. It looks like
+    we intended to remove this in commit ea06eff7.
+    
+    Change-Id: I7a5868c42300ba92d5c8f528a447cfe3fbace297
+
+ nova/config.py |    3 ---
+ 1 file changed, 3 deletions(-)
+
+commit e6cae13dd21f03948a28088d45be678f6a0e5c4e
+Author: Arata Notsu <[e-mail]>
+Date:   Thu Dec 20 21:29:13 2012 +0900
+
+    attach/detach_volume() take instance as a parameter
+    
+    Previously the methods take instance['name'] as a parameter.
+    With this change, ComputeDriver can lookup informations about
+    the instance from hypervisor (in bare-metal driver, it is a local DB)
+    by any other attributes of the instance.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: Ibd0567f34ed5053909ce1a408f9cbf87516ba597
+
+ nova/compute/manager.py              |    4 ++--
+ nova/tests/test_hypervapi.py         |    4 ++--
+ nova/tests/test_libvirt.py           |    4 ++--
+ nova/tests/test_virt_drivers.py      |    8 ++++----
+ nova/tests/test_xenapi.py            |    4 ++--
+ nova/virt/baremetal/driver.py        |    8 ++++----
+ nova/virt/baremetal/volume_driver.py |   34 ++++++++++------------------------
+ nova/virt/driver.py                  |    4 ++--
+ nova/virt/fake.py                    |    7 ++++---
+ nova/virt/hyperv/driver.py           |    8 ++++----
+ nova/virt/libvirt/driver.py          |    6 ++++--
+ nova/virt/vmwareapi/driver.py        |    4 ++--
+ nova/virt/xenapi/driver.py           |    8 ++++----
+ 13 files changed, 46 insertions(+), 57 deletions(-)
+
+commit 7cd22aaca7e62db77753cfaa1c5af4a0344fea0d
+Merge: 50cd91f 36df7fa
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 07:49:25 2013 +0000
+
+    Merge "NovaBase.delete() rename to NovaBase.soft_delete()"
+
+commit 50cd91fd1ab09c7b2a234d98221024e132f761fd
+Merge: 0fc1e10 7224fde
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 07:11:55 2013 +0000
+
+    Merge "Invert test stream capture logic for debugging."
+
+commit 0fc1e10d40c5680d0790aadc5b6c8aaf5ef2da88
+Merge: 2f7aa07 abe1db6
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 07:02:17 2013 +0000
+
+    Merge "PXE bare-metal provisioning helper server"
+
+commit 2f7aa071dcd33025e17ba2f59885e2674b388928
+Merge: 2f5a9ae 56eb0df
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:52:11 2013 +0000
+
+    Merge "Cells: Add cells commands to nova-manage"
+
+commit 2f5a9ae471040f59876daf815e3212f7e2c73e79
+Merge: 76f6e91 1428956
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:51:56 2013 +0000
+
+    Merge "Add helper methods to nova.paths"
+
+commit 76f6e9116d261902ed290cded022bd00f7738cb2
+Merge: 9d37f75 2553b4a
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:51:15 2013 +0000
+
+    Merge "Move global path opts in nova.paths"
+
+commit 9d37f75d923fac77e5234a3fe382ccf6e400c3cb
+Merge: 3e2a1e2 904814e
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:32:13 2013 +0000
+
+    Merge "Remove unused aws access key opts"
+
+commit 3e2a1e2c74d85c6faf9e9531f2a4b19fb4c61a63
+Merge: 38a9922 ebfa418
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:30:53 2013 +0000
+
+    Merge "Changed 'OpenStack, LLC' message to 'OpenStack Foundation'"
+
+commit 38a9922ac24f6fcf09eacca48782d98630f781fa
+Merge: eaee1de 60965a5
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:30:38 2013 +0000
+
+    Merge "Get instances from conductor in init_host."
+
+commit eaee1de5e0092bafc7d42a3e78ccb469d5b9a559
+Merge: 4ac882e 64bf619
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 05:30:23 2013 +0000
+
+    Merge "Make WebOb version specification more flexible"
+
+commit 4ac882e7d22f197f3858b3c7b112980334aaa3a0
+Merge: 3a14312 e8746db
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 04:58:12 2013 +0000
+
+    Merge "config_drive is missing in xml deserializer"
+
+commit 3a14312ae2ccccfa4f64d80e42aacb4d16a9567f
+Merge: 2775cd6 91859c5
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 04:57:57 2013 +0000
+
+    Merge "Add NoopQuotaDriver"
+
+commit 2775cd6386edd8e409937549c68cbe311f25aa3f
+Merge: 05e3869 c9207f5
+Author: Jenkins <[e-mail]>
+Date:   Tue Jan 8 04:40:00 2013 +0000
+
+    Merge "Check admin context in bm_interface_get_all()"
+
+commit 37bfdd3b38b2d2c2f088f67e7bcc2f26c6e01c1c
+Author: Sean Dague <[e-mail]>
+Date:   Fri Jan 4 15:46:18 2013 -0500
+
+    fix N401 errors, stop ignoring all N4* errors
+    
+    We had previously been ignoring all our custom N4xx hacking.py
+    errors. This fixes all the N401 errors "doc strings
+    should not start with a space" and reduces the ignore set down
+    to N402 only "single line docstrings should end with period".
+    
+    It also fixes the N401 parser to catch only docstrings, and
+    not tripple quoted string blocks used later on in a function.
+    
+    Clean up a few of the more crazy uses of """ in our code
+    
+    Clean up additional funky comments to make indents a bit more
+    consistent, and pull in lines when possible.
+    
+    Change-Id: I9040a1d2ca7efda83bd5e425b95d1408b5b63577
+
+ nova/api/ec2/cloud.py                              |    2 +-
+ .../openstack/compute/contrib/flavorextraspecs.py  |   10 +++---
+ nova/api/openstack/compute/contrib/keypairs.py     |    4 +--
+ nova/api/openstack/compute/server_metadata.py      |    8 ++---
+ nova/block_device.py                               |    2 +-
+ nova/compute/api.py                                |    7 ++--
+ nova/compute/manager.py                            |    2 +-
+ nova/db/sqlalchemy/session.py                      |    6 ++--
+ nova/network/dns_driver.py                         |    2 +-
+ nova/network/linux_net.py                          |    6 ++--
+ nova/network/minidns.py                            |   18 +++++-----
+ nova/network/noop_dns_driver.py                    |    2 +-
+ nova/servicegroup/api.py                           |    2 +-
+ nova/tests/api/openstack/compute/test_servers.py   |    9 ++---
+ nova/tests/api/openstack/test_common.py            |   38 ++++++++++----------
+ nova/tests/compute/test_compute.py                 |    6 ++--
+ nova/tests/integrated/test_api_samples.py          |    2 +-
+ nova/tests/monkey_patch_example/__init__.py        |    2 +-
+ nova/tests/test_api.py                             |    2 +-
+ nova/tests/test_db_api.py                          |    4 +--
+ nova/tests/test_libvirt.py                         |   10 +++---
+ nova/tests/test_xenapi.py                          |    2 +-
+ nova/tests/xenapi/stubs.py                         |   10 +++---
+ nova/utils.py                                      |    2 +-
+ nova/virt/fake.py                                  |    3 +-
+ nova/virt/firewall.py                              |    2 +-
+ nova/virt/hyperv/hostops.py                        |    4 +--
+ nova/virt/hyperv/vmops.py                          |    6 ++--
+ nova/virt/hyperv/volumeutils.py                    |    4 +--
+ nova/virt/hyperv/volumeutilsV2.py                  |    2 +-
+ nova/virt/libvirt/driver.py                        |    9 ++---
+ nova/virt/libvirt/vif.py                           |    2 +-
+ nova/virt/libvirt/volume_nfs.py                    |    4 +--
+ nova/virt/xenapi/driver.py                         |   26 +++++++-------
+ nova/virt/xenapi/firewall.py                       |    5 ++-
+ nova/virt/xenapi/vmops.py                          |   10 +++---
+ run_tests.sh                                       |    2 +-
+ tools/hacking.py                                   |   17 +++++----
+ tox.ini                                            |    4 +--
+ 39 files changed, 130 insertions(+), 128 deletions(-)
+
+commit 285994be59c88afb80988f8868883403ff53d142
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Fri Nov 30 15:49:17 2012 -0800
+
+    Add api extension to get and reset password
+    
+    Password is stored in system_instance_metadata as four items with the
+    keys 'password_0' through 'password_3'. The extension adds a resource
+    endpoint with two methods:
+    
+    GET v2/servers/<uuid>/os-server-password  # get_password
+    DELETE v2/servers/<uuid>/os-server-password # reset_password
+    
+    get_password retuns:
+    
+    JSON: {"password": "xxx"}
+    XML: <?xml version='1.0' encoding='UTF-8'?><password>xxx</password>
+    
+    Note that this is intended to be an encrypted password set by the
+    guest. Includes api tests for json and xml. Also includes api samples.
+    
+    Part of blueprint get-password
+    
+    Change-Id: I6c03f9c3bc8a2c70403bbb3e57917ab9522d75bd
+
+ .../all_extensions/extensions-get-resp.json        |    8 ++
+ .../all_extensions/extensions-get-resp.xml         |    3 +
+ .../os-server-password/get-password-resp.json      |    3 +
+ .../os-server-password/get-password-resp.xml       |    2 +
+ .../os-server-password/server-post-req.json        |   16 ++++
+ .../os-server-password/server-post-req.xml         |   19 +++++
+ .../os-server-password/server-post-resp.json       |   16 ++++
+ .../os-server-password/server-post-resp.xml        |    6 ++
+ etc/nova/policy.json                               |    1 +
+ .../openstack/compute/contrib/server_password.py   |   87 ++++++++++++++++++++
+ .../compute/contrib/test_server_password.py        |   86 +++++++++++++++++++
+ .../tests/api/openstack/compute/test_extensions.py |    1 +
+ nova/tests/fake_policy.py                          |    1 +
+ .../all_extensions/extensions-get-resp.json.tpl    |    8 ++
+ .../all_extensions/extensions-get-resp.xml.tpl     |    3 +
+ .../os-server-password/get-password-resp.json.tpl  |    3 +
+ .../os-server-password/get-password-resp.xml.tpl   |    2 +
+ .../os-server-password/server-post-req.json.tpl    |   16 ++++
+ .../os-server-password/server-post-req.xml.tpl     |   19 +++++
+ .../os-server-password/server-post-resp.json.tpl   |   16 ++++
+ .../os-server-password/server-post-resp.xml.tpl    |    6 ++
+ nova/tests/integrated/test_api_samples.py          |   34 ++++++++
+ 22 files changed, 356 insertions(+)
+
+commit 3bf5e88931b96381b1768c926b97064985cf9f96
+Author: Lance Bragstad <[e-mail]>
+Date:   Mon Jan 7 21:30:09 2013 +0000
+
+    powervm: Implement snapshot for local volumes
+    
+    Snapshot local volumes by copying the logical volume on VIOS,
+    gzip the file, transfer to compute service node, and
+    finally upload to glance. PEP8 and string concatenation fixes.
+    Added utility to powervm.common for constructing UNIX file paths.
+    Added unit tests for new utility.
+    
+    bp powervm-compute-enhancements
+    
+    Change-Id: Ie6bafbeef75a9464457d78d2997be78346d3ab24
+
+ nova/tests/test_powervm.py     |   29 ++++++++
+ nova/virt/powervm/blockdev.py  |  145 +++++++++++++++++++++++++++++++++++++---
+ nova/virt/powervm/common.py    |   48 ++++++++++++-
+ nova/virt/powervm/driver.py    |   52 ++++++++++++++
+ nova/virt/powervm/exception.py |    6 +-
+ nova/virt/powervm/operator.py  |   30 +++++++++
+ 6 files changed, 296 insertions(+), 14 deletions(-)
+
+commit 4e02fa1964f5de3a6ba345d858623f35b24beafd
+Author: Ken'ichi Ohmichi <[e-mail]>
+Date:   Tue Jan 8 05:08:17 2013 +0900
+
+    Add exception handler for previous deleted flavor.
+    
+    An exception happens if a previous flavor is deleted and
+    'nova resize-revert' run, because 'nova resize-revert' does
+    not handle the deleted flavor.
+    And also we have the same problem in _update_usage_from_migration().
+    This patch fixes the problems.
+    
+    How to reproduce the problem on DevStack:
+      $ nova flavor-create sample 10 512 0 2
+      $ nova boot --image cirros-0.3.0-x86_64-uec --flavor sample test01
+      $ nova resize test01 m1.tiny
+      $ nova flavor-delete 10
+      $ nova resize-revert test01
+    
+    Before applying this patch:
+      $ nova resize-revert test01
+      ERROR: The server could not comply with the request since it is
+      either malformed or otherwise incorrect. (HTTP 400) (Request-ID:
+      req-b0d3e016-9608-4a87-a0cc-44dfe00b25a1)
+      $
+    
+    After applying this patch:
+      $ nova resize-revert test01
+      ERROR: Flavor used by the instance could not be found. (HTTP 400)
+      (Request-ID: req-ed4ce174-33f2-4258-b522-674a1023ea74)
+      $
+    
+    Fixes bug 1091490
+    
+    Change-Id: I39dd23a7565ae66544e8bc2aa7ad3299eb61bfcc
+
+ nova/api/openstack/compute/servers.py |    3 +++
+ nova/compute/resource_tracker.py      |    7 ++++++-
+ nova/tests/compute/test_compute.py    |   34 +++++++++++++++++++++++++++++++++
+ 3 files changed, 43 insertions(+), 1 deletion(-)
+
+commit 91859c5c1a7b17e1f954bae03a7269be3c4348e6
+Author: Chris Behrens <[e-mail]>
+Date:   Mon Jan 7 20:58:09 2013 +0000
+
+    Add NoopQuotaDriver
+    
+    Allows turning quota calls into no-ops, pretending that all quotas are
+    unlimited.  Useful for child compute cells.
+    
+    Use by setting this in nova.conf:
+    
+    quota_driver=nova.quota.NoopQuotaDriver
+    
+    DocImpact
+    
+    Change-Id: Id80a89df5ba73db3f5edc05bd0ef4627e9c211fa
+
+ nova/quota.py            |  188 +++++++++++++++++++++++++++++++++++++++++++++-
+ nova/tests/test_quota.py |   62 +++++++++++++++
+ 2 files changed, 249 insertions(+), 1 deletion(-)
+
+commit 0ca44e958461ee140b97d074fcf7866cc6ac6645
+Author: Dan Prince <[e-mail]>
+Date:   Mon Jan 7 13:19:03 2013 -0500
+
+    Conductor instance_get_all replaces _by_filters
+    
+    Updates the Nova conductor so that it uses instance_get_all()
+    and instance_get_all_by_host() from the Nova DB API to
+    implement its own like named functions.
+    
+    This fixes a regression that occured in d22b0ca where we switched
+    from using the DB API's instance_get_all_by_host and instance_get_all
+    methods over to the DB APIs instance_get_all_by_filters.
+    
+    This caused some subtle regressions due to the fact that
+    instance_get_all_by_filters has different defaults for
+    deleted records.
+    
+    The previously used (prior to d22b0ca) instance_get_all() and
+    instance_get_all_by_host() functions rely on the context.read_deleted
+    and also handle the display of deleted and soft deleted records differently.
+    
+    Fixes LP Bug #1096972.
+    
+    Change-Id: Icb587ef169d1d7dd86cf6ee682e74bd4e84c37e2
+
+ nova/conductor/api.py                  |    8 ++++----
+ nova/conductor/manager.py              |    6 ++++--
+ nova/conductor/rpcapi.py               |   10 ++++++++++
+ nova/tests/conductor/test_conductor.py |    5 ++---
+ nova/tests/test_imagecache.py          |    2 +-
+ 5 files changed, 21 insertions(+), 10 deletions(-)
+
+commit dc8aeb49ce4ad6523e3f093fed082f78a6442814
+Author: Cory Stone <[e-mail]>
+Date:   Fri Nov 16 14:15:06 2012 -0600
+
+    Support cinderclient http retries.
+    
+    HTTP retries were recently added to cinderclient. This adds the
+    config option required to use it. The default (unchanged) behavior
+    is 0 retries.
+    
+    Change-Id: Ia7ad831045e8df9ad9c22f0119ae3485d91ad949
+
+ etc/nova/nova.conf.sample |    5 ++++-
+ nova/tests/test_cinder.py |   17 ++++++++++++++---
+ nova/volume/cinder.py     |    6 +++++-
+ 3 files changed, 23 insertions(+), 5 deletions(-)
+
+commit 2a19cd1e481ea7b2a17bb8e1f7d7455f13bf0afb
+Author: Russell Bryant <[e-mail]>
+Date:   Mon Jan 7 11:08:18 2013 -0500
+
+    Sync rpc and notifier from oslo-incubator.
+    
+    This patch syncs the latest changes to rpc and notifier from
+    oslo-incubator.  The most significant changes are for adding support for
+    a message envelope for all messages, including notifications, sent via
+    rpc.
+    
+    Related oslo-incubator reviews:
+    
+        https://review.openstack.org/#/c/17554/
+        https://review.openstack.org/#/c/18057/
+    
+    Note that a new notifier module was added: rpc_notifier2, which when
+    used, sends notifications out with a message envelope.
+    
+    DocImpact.
+    
+    Implements bp version-rpc-messages.
+    
+    Change-Id: I495c224d0c502086ce3db6c078d48829b8d913a6
+
+ nova/openstack/common/notifier/api.py           |    7 +-
+ nova/openstack/common/notifier/rpc_notifier.py  |    2 +-
+ nova/openstack/common/notifier/rpc_notifier2.py |   51 ++++++++
+ nova/openstack/common/rpc/__init__.py           |    5 +-
+ nova/openstack/common/rpc/amqp.py               |   23 ++--
+ nova/openstack/common/rpc/common.py             |  144 +++++++++++++++++++++--
+ nova/openstack/common/rpc/dispatcher.py         |   18 +--
+ nova/openstack/common/rpc/impl_kombu.py         |   28 +++--
+ nova/openstack/common/rpc/impl_qpid.py          |   25 +++-
+ nova/openstack/common/rpc/impl_zmq.py           |   54 +++------
+ 10 files changed, 270 insertions(+), 87 deletions(-)
+
+commit abe1db6f88a6fb58586d4ed8d272cf7acb57b588
+Author: Mikyung Kang <[e-mail]>
+Date:   Sat Nov 10 08:07:13 2012 +0900
+
+    PXE bare-metal provisioning helper server
+    
+    a part of blueprint general-bare-metal-provisioning-framework.
+    
+    Implement nova-baremetal-deploy-helper.
+    
+    This service listens for HTTP requests from baremetal deploy ramdisk,
+    formats the remote disk and writes an image to it, as part of baremetal
+    PXE provisioning.
+    
+    blueprint improve-baremetal-pxe-deploy shows how we plan to improve this
+    process.
+    
+    Change-Id: I0a1b020cc5f81d49559acd4dcc781397a58e2c01
+    Co-authored-by: Mikyung Kang <[e-mail]>
+    Co-authored-by: David Kang <[e-mail]>
+    Co-authored-by: Ken Igarashi <[e-mail]>
+    Co-authored-by: Arata Notsu <[e-mail]>
+    Co-authored-by: Devananda van der Veen <[e-mail]>
+
+ bin/nova-baremetal-deploy-helper                   |  318 ++++++++++++++++++++
+ doc/source/man/nova-baremetal-deploy-helper.rst    |   52 ++++
+ .../rootwrap.d/baremetal-deploy-helper.filters     |   10 +
+ setup.py                                           |    1 +
+ 4 files changed, 381 insertions(+)
+
+commit d9b69045a72a1a08cc1c3fd2179e998646c81912
+Author: Giampaolo Lauria <[e-mail]>
+Date:   Tue Dec 18 16:29:09 2012 -0500
+
+    Added sample tests to QuotaClasses API.
+    
+    Partially implements blueprint nova-api-samples
+    Fixes bug 1070171
+    
+    Change-Id: I504a9120a0980a727bda21ca2ac76a5d06477e66
+
+ .../quota-classes-show-get-resp.json               |   16 +++++++++++
+ .../quota-classes-show-get-resp.xml                |   14 ++++++++++
+ .../quota-classes-update-post-req.json             |   15 +++++++++++
+ .../quota-classes-update-post-req.xml              |   14 ++++++++++
+ .../quota-classes-update-post-resp.json            |   15 +++++++++++
+ .../quota-classes-update-post-resp.xml             |   14 ++++++++++
+ .../quota-classes-show-get-resp.json.tpl           |   16 +++++++++++
+ .../quota-classes-show-get-resp.xml.tpl            |   14 ++++++++++
+ .../quota-classes-update-post-req.json.tpl         |   15 +++++++++++
+ .../quota-classes-update-post-req.xml.tpl          |   14 ++++++++++
+ .../quota-classes-update-post-resp.json.tpl        |   15 +++++++++++
+ .../quota-classes-update-post-resp.xml.tpl         |   14 ++++++++++
+ nova/tests/integrated/test_api_samples.py          |   28 +++++++++++++++++++-
+ 13 files changed, 203 insertions(+), 1 deletion(-)
+
+commit ebfa418e58d54636392b7c0d82291bf67f417936
+Author: Kurt Taylor <[e-mail]>
+Date:   Mon Jan 7 14:38:28 2013 -0500
+
+    Changed 'OpenStack, LLC' message to 'OpenStack Foundation'
+    
+    Change-Id: Iffad63690d2d7565c651ff3faec4443d0ed471c3
+
+ HACKING.rst |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 05e38697569f97010ae76d5f6ee6e7f99e0d8c69
+Author: Devananda van der Veen <[e-mail]>
+Date:   Thu Jan 3 11:27:22 2013 -0800
+
+    Convert short doc strings to be on one line
+    
+    This patch just cleans up some one-line doc strings which were
+    split across 3 lines needlessly.
+    
+    Change-Id: I3c2011d20fb7c3b8714d7b5a32151e427bf8a311
+
+ nova/tests/baremetal/test_driver.py        |    4 +---
+ nova/tests/baremetal/test_ipmi.py          |    4 +---
+ nova/tests/baremetal/test_pxe.py           |    4 +---
+ nova/tests/baremetal/test_utils.py         |    4 +---
+ nova/tests/baremetal/test_volume_driver.py |    4 +---
+ 5 files changed, 5 insertions(+), 15 deletions(-)
+
+commit 60965a50bcf4b1d1e51d01a8581ae9cb011b8923
+Author: Russell Bryant <[e-mail]>
+Date:   Thu Nov 29 22:03:34 2012 -0500
+
+    Get instances from conductor in init_host.
+    
+    Update compute's init_host() to get the list of instances on this host
+    via the conductor service.  This removes a db read from compute.
+    
+    Most of the test fixes are to ensure conductor is running anywhere that
+    compute is running.  The EC2 availability zones test change (from 13 to
+    15) is because this output includes info on each service that's running,
+    so running nova-conductor in this test suite added more info here.
+    
+    Note that this uses the previously-added ping() call in conductor to
+    determine when the service is available. The compute manager pings the
+    conductor every ten seconds for ten attempts and then falls back to the
+    default configured RPC timeout. This should be a reasonable compromise
+    between requiring strict service startup ordering and extreme delays.
+    
+    Part of blueprint no-db-compute.
+    
+    Change-Id: Ie2953f7ae79819a1b6e24e8997ed4332fd4d2356
+
+ nova/compute/manager.py                     |   32 +++++++++++++++++++++++----
+ nova/tests/api/ec2/test_cinder_cloud.py     |    2 ++
+ nova/tests/api/ec2/test_cloud.py            |    4 +++-
+ nova/tests/api/ec2/test_ec2_validate.py     |    2 ++
+ nova/tests/compute/test_compute.py          |   15 +++++++++++++
+ nova/tests/integrated/integrated_helpers.py |    6 +++--
+ nova/tests/network/test_manager.py          |    4 ++++
+ nova/tests/test_test.py                     |    6 +++++
+ 8 files changed, 64 insertions(+), 7 deletions(-)
+
+commit 7224fde0f0d6206136b411276f8ee8bce8749dd1
+Author: Clark Boylan <[e-mail]>
+Date:   Mon Jan 7 11:03:30 2013 -0800
+
+    Invert test stream capture logic for debugging.
+    
+    Previously the default test behavior was to capture stdout and stderr.
+    Make the new default to not capture stdout and stderr then set
+    .testr.conf to always capture these streams when running tests under
+    testr.
+    
+    The motiviation behind this change is that you will want these streams
+    to be captured when running under testr, but when not running under
+    testr you may not want to capture them. An example of this would be
+    running `python -m testtools.run test_name` with a change to test_name
+    to invoke the python debugger (capturing stdout and stderr interferes
+    with normal debugger functionality).
+    
+    Also, only invoke the test timeout by default when running under testr.
+    This is done for the same reason as above. When running a test under the
+    debugger the timeout interferes with debugging.
+    
+    Change-Id: I42cbbdadb2f221ec439e92a6800d14e8436bb77b
+
+ .testr.conf  |    2 +-
+ nova/test.py |   18 ++++++++++++------
+ run_tests.sh |    2 --
+ tox.ini      |    3 ---
+ 4 files changed, 13 insertions(+), 12 deletions(-)
+
+commit e1c7b18c7f3c8d97ba7b2cccf27b968ad4710735
+Merge: b6947dd aba9fdb
+Author: Jenkins <[e-mail]>
+Date:   Mon Jan 7 18:40:28 2013 +0000
+
+    Merge "Add test for resize server in ComputeAPITestCase."
+
+commit b6947dd93b416d4c22ec2fc5014f4911eb12c09f
+Merge: f4a8a48 1e117ab
+Author: Jenkins <[e-mail]>
+Date:   Mon Jan 7 18:40:14 2013 +0000
+
+    Merge "Remove the global DATA"
+
+commit f4a8a484cc86d11c58ba2d99a58097b70848155c
+Merge: 4d4cddb 6afae49
+Author: Jenkins <[e-mail]>
+Date:   Mon Jan 7 17:57:08 2013 +0000
+
+    Merge "Add compute build/resize errors to instance faults"
+
+commit 4d4cddbb9aeb26fe8d9831f20553f04e8cf29c44
+Merge: a2f260f fad69df
+Author: Jenkins <[e-mail]>
+Date:   Mon Jan 7 15:55:22 2013 +0000
+
+    Merge "Handle compute node records with no timestamp."
+
+commit 64bf6192daf6fa558c92bbde633dd5d16121bf75
+Author: Doug Hellmann <[e-mail]>
+Date:   Mon Jan 7 10:46:01 2013 -0500
+
+    Make WebOb version specification more flexible
+    
+    Change the WebOb version to >=1.0.8 as an temporary
+    measure to allow the actual version update to 1.2.3
+    to roll out across the projects one at a time without
+    breaking the integration tests.
+    
+    Change-Id: Iea626ff758b352cc5cec2b2c9ab1a3dd3da53bf7
+    Signed-off-by: Doug Hellmann <[e-mail]>
+
+ tools/pip-requires |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c9207f528c3bcb9a7a2087452757da0c2d5ddfb2
+Author: Arata Notsu <[e-mail]>
+Date:   Mon Jan 7 17:53:23 2013 +0900
+
+    Check admin context in bm_interface_get_all()
+    
+    This patch puts missing @require_admin_context before
+    the function.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: I07d78f75b7f98a225398ca67b3bda251bc6c0440
+
+ nova/virt/baremetal/db/sqlalchemy/api.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit a2f260fff8810976f31b0d01586e3f691c25abb8
+Author: Devananda van der Veen <[e-mail]>
+Date:   Thu Dec 27 17:23:29 2012 -0800
+
+    Provide a PXE NodeDriver for the Baremetal driver
+    
+    This patch implements a PXE NodeDriver class within the Baremetal
+    provisioning framework, which provides a means for deploying machine
+    images using TFTP and PXE.
+    
+    This patch relies on functionality provided by the nova-baremetal-deploy-helper
+    utility, implemented in review 15830.
+    
+    blueprint general-bare-metal-provisioning-framework.
+    
+    Change-Id: I8d849601186e3dc13f10382857ff2bbc1ff1026d
+
+ etc/nova/rootwrap.d/baremetal-compute-ipmi.filters |    9 +
+ etc/nova/rootwrap.d/baremetal-compute-pxe.filters  |   11 +
+ etc/nova/rootwrap.d/baremetal_compute_ipmi.filters |    9 -
+ nova/tests/baremetal/test_pxe.py                   |  534 ++++++++++++++++++++
+ nova/tests/baremetal/test_utils.py                 |   36 ++
+ nova/virt/baremetal/interfaces.template            |   31 --
+ nova/virt/baremetal/net-dhcp.ubuntu.template       |   21 +
+ nova/virt/baremetal/net-static.ubuntu.template     |   30 ++
+ nova/virt/baremetal/pxe.py                         |  460 +++++++++++++++++
+ nova/virt/baremetal/pxe_config.template            |   11 +
+ nova/virt/baremetal/utils.py                       |    7 +
+ 11 files changed, 1119 insertions(+), 40 deletions(-)
+
+commit 8446973b4a77c665a3c1344b75898004fad7ce32
+Merge: 9279e00 9fb647e
+Author: Jenkins <[e-mail]>
+Date:   Mon Jan 7 06:50:10 2013 +0000
+
+    Merge "Refactor periodic tasks."
+
+commit fad69df25ffcea2a44cbf3ef636a68863a2d64d9
+Author: Robert Collins <[e-mail]>
+Date:   Mon Jan 7 15:12:39 2013 +1300
+
+    Handle compute node records with no timestamp.
+    
+    Commit 94560ab57d9fc23673f42017e6f2a78cb2b66b7a added a fast-path
+    to avoid work when baremetal compute nodes haven't changed, but if
+    the compute message has None for its updated-at timestamp (which
+    can happen during startup) the comparison crashes.
+    
+    Change-Id: Ib8add431d975eee133deefea62eb53479a97396e
+
+ nova/scheduler/host_manager.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit e8746dbcc1ad53a3335d063fea95b516a0f10f9d
+Author: hill <[e-mail]>
+Date:   Sun Jan 6 11:29:41 2013 +0800
+
+    config_drive is missing in xml deserializer
+    
+    bug 1096508
+    
+    Change-Id: Ibaca0b08b866fa6297d8abaf005adbc6f689818c
+
+ nova/api/openstack/compute/servers.py            |    4 ++++
+ nova/tests/api/openstack/compute/test_servers.py |   18 ++++++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+commit 9279e0052f300eb0f64d63c970d34c050d744906
+Merge: 8961cf5 33ede1c
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sun Jan 6 05:51:55 2013 +0000
+
+    Merge "Imported Translations from Transifex"
+
+commit 8961cf562b0a04bcf611c09ac2194603dcd26a49
+Merge: ca91d3c 1ab59c9
+Author: Jenkins <[e-mail]>
+Date:   Sun Jan 6 02:30:29 2013 +0000
+
+    Merge "Add conditions in compute APIRouter"
+
+commit ca91d3c607d82f57e736ef18be815023fd306342
+Merge: 850e5d6 2ee83a4
+Author: Jenkins <[e-mail]>
+Date:   Sun Jan 6 00:42:41 2013 +0000
+
+    Merge "improve libguestfs exception handling"
+
+commit 850e5d6bf989b15ca67396dc246e72f7de7524a8
+Merge: cd0f021 0df60e9
+Author: Jenkins <[e-mail]>
+Date:   Sun Jan 6 00:38:13 2013 +0000
+
+    Merge "Adding two snapshot related task states"
+
+commit 33ede1ca1b8fd52734ec014339e3a17cc3a8a194
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sun Jan 6 00:03:36 2013 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I3037df2c2e65c6de170700d766a75e025cbfa9f3
+
+ nova/locale/nova.pot |  210 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 105 insertions(+), 105 deletions(-)
+
+commit 36df7fa38cbd0c991c8df2f9f6c8220e2b164394
+Author: Boris Pavlovic <[e-mail]>
+Date:   Mon Dec 17 13:50:18 2012 +0400
+
+    NovaBase.delete() rename to NovaBase.soft_delete()
+    
+    Name of this method is misleading. This method actually does not delete entry
+    from DB instead of that it only marks entry as deleted as well as
+    query.soft_delete(). Furthermore we have query.delete() that deletes from DB
+    all matched entries. So it is very important to rename this method to avoid
+    misunderstanding.
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: Ic8b92ce1c087794aca4faafa9c68c72d444e5f9e
+
+ nova/db/sqlalchemy/api.py     |    4 ++--
+ nova/db/sqlalchemy/models.py  |    4 ++--
+ nova/db/sqlalchemy/session.py |   16 ++++++++--------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+commit cd0f02113110bdc25eea4f57db640e906636c814
+Merge: 3efc9c2 c322987
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 21:07:00 2013 +0000
+
+    Merge "Database metadata performance optimizations"
+
+commit 3efc9c21eb533980b22be31f6ca46e49d304f3cf
+Merge: 83ae367 a62f01a
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 21:06:46 2013 +0000
+
+    Merge "Fix regression in RetryFilter"
+
+commit 83ae3670a0e387d746582c5d50d4933fdd1f5b85
+Author: Michael Still <[e-mail]>
+Date:   Sat Jan 5 21:05:41 2013 +1100
+
+    livbirt: have a single source of console log file naming.
+    
+    We were generating the path to the console log for libvirt in multiple
+    places. This was just confusing. Let's have a single source of how
+    these files are named.
+    
+    Change-Id: Iac3654c7f4fd68347b0fcc78f303b76f2bd1586c
+
+ nova/virt/libvirt/driver.py |   13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+commit 1e117ab425c27805f78b976311728f05782fd5bf
+Author: Yunhong, Jiang <[e-mail]>
+Date:   Sat Jan 5 14:50:02 2013 +0800
+
+    Remove the global DATA
+    
+    In test cases for trusted filter, a global variable is used
+    to fake the OAT HTTP request.
+    
+    Remove this global variable, to make code cleaner.
+    
+    Change-Id: Id75077575917e501d51f83d3c4b1c4250fbc84d0
+    Signed-off-by: Yunhong, Jiang <[e-mail]>
+
+ nova/tests/scheduler/test_host_filters.py |   46 +++++++++--------------------
+ 1 file changed, 14 insertions(+), 32 deletions(-)
+
+commit ef0ff2f51ad769b3c9f60a4fc7d3e7eb7b0ae305
+Merge: d150f8a 5ee157c
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:53:37 2013 +0000
+
+    Merge "Add ping to conductor"
+
+commit d150f8a799cce1ced542375987d040f643f86344
+Merge: ac78bc7 7b530ce
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:53:22 2013 +0000
+
+    Merge "Move fake_network opt to nova.network.manager"
+
+commit ac78bc7596a43de9a0c59a3dfc89faa08805d099
+Merge: a4053b6 f80e924
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:43:07 2013 +0000
+
+    Merge "Clean up setting of control_exchange default"
+
+commit a4053b61b4dc825bb38742f12723d32feb01089f
+Merge: d624a22 c7221d0
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:42:53 2013 +0000
+
+    Merge "update version urls to working v2 urls"
+
+commit d624a22a5743487e7c60b32e7d47103867fabf76
+Merge: c9873ff 2a89de1
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:17:30 2013 +0000
+
+    Merge "Cells: Add periodic instance healing"
+
+commit c9873ff654265761ca3eab1df3e65a3f9963ae18
+Merge: f47c997 e83dd12
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 06:13:12 2013 +0000
+
+    Merge "Timeout individual tests after one minute."
+
+commit 5ee157c428b09b102906a7ec6834985557369b20
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 12:47:45 2013 -0800
+
+    Add ping to conductor
+    
+    This adds a ping() method to conductor, which takes a single
+    argument and returns it back to the caller. It also returns
+    the name of the current service, which is always 'conductor' in
+    this case. I did this because I think that a generic ping method
+    should do this in order to facilitate blind or broadcast pings.
+    
+    Related to bp/no-db-compute-manager
+    
+    Change-Id: I83105060945fa6a793d884c9e06ff154bc98e715
+
+ nova/conductor/api.py                  |    6 ++++++
+ nova/conductor/manager.py              |    5 ++++-
+ nova/conductor/rpcapi.py               |    6 ++++++
+ nova/tests/conductor/test_conductor.py |    4 ++++
+ 4 files changed, 20 insertions(+), 1 deletion(-)
+
+commit 351745d3d359fe6ba24cf7dd2283c6fdc670ec57
+Author: Xiangyang Chu <[e-mail]>
+Date:   Thu Dec 20 16:52:00 2012 +0800
+
+    Add two tests for resize action in ServerActionsControllerTest.
+    
+    Add test_resize_not_found for NotFound;
+    and test_resize_with_too_many_instances for TooManyInstances.
+    
+    Fix bug #1089417
+    
+    Change-Id: I18dda1129e1bb3d411bb8a5dab9474d67fcb18fd
+
+ .../api/openstack/compute/test_server_actions.py   |   25 +++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+commit f47c997242f591ca45945f86c00b584217a9b75b
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 10:12:52 2013 -0800
+
+    Move service_get_all operations to conductor
+    
+    This patch adds a single service_get_all_by() method to the
+    conductor, which services the following database calls:
+    
+     - service_get_all()
+     - service_get_all_by_topic()
+     - service_get_all_by_host()
+     - service_get_by_host_and_topic()
+     - service_get_all_compute_by_host()
+    
+    It also makes compute/manager use conductor for this case.
+    The special case for the service_get_all_compute_by_host() call
+    is rather unfortunate, and I wonder if it might be okay to (later)
+    make the generic function automatically joinedload in the compute
+    case.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ib4aa10a3196a4b9aa779f57f4e5d6b136676f3bd
+
+ nova/compute/manager.py                |    4 +-
+ nova/conductor/api.py                  |   31 ++++++++++++
+ nova/conductor/manager.py              |   19 +++++++-
+ nova/conductor/rpcapi.py               |    5 ++
+ nova/tests/conductor/test_conductor.py |   82 ++++++++++++++++++++++++++++++++
+ 5 files changed, 138 insertions(+), 3 deletions(-)
+
+commit 8be47738aedb809b9d64559aeba821e17796a6a8
+Merge: d2edb0a a171033
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sat Jan 5 05:08:26 2013 +0000
+
+    Merge "Imported Translations from Transifex"
+
+commit d2edb0a0077f6acd6a9db359822b63cc1a19dbff
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 09:18:33 2013 -0800
+
+    Move migration_get_unconfirmed_by_dest_compute to conductor
+    
+    This patch moves compute/manager's use of the db query
+    migration_get_unconfirmed_by_dest_compute to the conductor.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ic92f3ae09f831465d12809c14c4a18ffd394f26f
+
+ nova/compute/manager.py                |    3 ++-
+ nova/conductor/api.py                  |   13 +++++++++++++
+ nova/conductor/manager.py              |    9 ++++++++-
+ nova/conductor/rpcapi.py               |    9 +++++++++
+ nova/tests/conductor/test_conductor.py |   11 +++++++++++
+ 5 files changed, 43 insertions(+), 2 deletions(-)
+
+commit ba2a0565a6451ee3227b6e11bbdd8ea75cbf1fc3
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 09:01:29 2013 -0800
+
+    Move vol_usage methods to conductor
+    
+    This patch moves the compute/manager's use of the following methods
+    to conductor:
+    
+     - vol_usage_update()
+     - vol_get_usage_by_time()
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: I51a30d66be51eb532cb19c8b06b87ad07387dd54
+
+ nova/compute/manager.py                |   23 ++++++++++++++---------
+ nova/conductor/api.py                  |   24 ++++++++++++++++++++++++
+ nova/conductor/manager.py              |   13 ++++++++++++-
+ nova/conductor/rpcapi.py               |   17 +++++++++++++++++
+ nova/tests/conductor/test_conductor.py |   20 ++++++++++++++++++++
+ 5 files changed, 87 insertions(+), 10 deletions(-)
+
+commit aba9fdbc1a824b3694d29cc45d9528b5a641ef92
+Author: Xiangyang Chu <[e-mail]>
+Date:   Mon Dec 17 18:10:24 2012 +0800
+
+    Add test for resize server in ComputeAPITestCase.
+    
+    Add test_resize_quota_exceeds_fails for TooManyInstances,
+    and fixes a typo in test_resize_deleted_flavor_fails.
+    
+    Change-Id: Iec21deac3701df4ea1b6eb7e9d3da9c31924e589
+
+ nova/tests/compute/test_compute.py |   21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+commit 6323c80323d01e042558bd78e74c5d6da66a1e17
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 08:48:03 2013 -0800
+
+    Use full instance in virt driver volume usage
+    
+    Right now, the virt driver method get_all_volume_usage() returns
+    a list of items, including the instance uuid. In order to pass
+    the results of this over to conductor (which will demand a full
+    instance), this patch converts the structure to include it.
+    
+    It appears that only libvirt implements this method, and the change
+    is fairly trivial.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ia8001727b57442ef0ecc2c161201f1a617e199d4
+
+ nova/compute/manager.py     |    3 ++-
+ nova/tests/test_libvirt.py  |    4 ++--
+ nova/virt/libvirt/driver.py |    2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+commit c064fcbe84048fb839f7f541d8fdd05428e75617
+Merge: b0fdc22 c740d3f
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 00:32:02 2013 +0000
+
+    Merge "Move instance_type_get() to conductor"
+
+commit b0fdc223a8a3aa85e0fc4f332b1477d9c488b0b7
+Merge: 599843e 334d7b8
+Author: Jenkins <[e-mail]>
+Date:   Sat Jan 5 00:24:16 2013 +0000
+
+    Merge "Fix race in resource tracker"
+
+commit a1710330fff89af3d4b267963a94c5265be19fe6
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sat Jan 5 00:07:25 2013 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I58c8020ccaa88361bfe7062fa094f530461aea96
+
+ nova/locale/nova.pot | 1293 +++++++++++++++++++++++++++++---------------------
+ 1 file changed, 742 insertions(+), 551 deletions(-)
+
+commit 599843e106d453d55f75b96ba7591ba5b615ec92
+Merge: 65f784c d7542c1
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 23:59:06 2013 +0000
+
+    Merge "Move instance_info_cache_delete() to conductor"
+
+commit 65f784ccbf9e51018e77070c48e4e64e6e8b7c27
+Merge: 6d1a1db 9f1b822
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 23:58:04 2013 +0000
+
+    Merge "Move instance_destroy() to conductor"
+
+commit 6d1a1dbb37fe084208dd2c25a2d00c78f04122d3
+Merge: 1be4d7b d22b0ca
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 23:55:50 2013 +0000
+
+    Merge "Move instance_get_*() to conductor"
+
+commit 9fb647ec100133b1ee5903535507c74d408f4790
+Author: Michael Still <[e-mail]>
+Date:   Mon Dec 24 15:00:52 2012 +1100
+
+    Refactor periodic tasks.
+    
+    This review allows periodic tasks to be enabled or disabled in the
+    decorator, as well as by specifying an interval which is negative.
+    
+    The spacing between runs of a periodic task is now specified in
+    seconds, with zero meaning the default spacing which is currently 60
+    seconds.
+    
+    There is also a new argument to the decorator which indicates if a
+    periodic task _needs_ to be run in the nova-compute process. There is
+    also a flag (run_external_periodic_tasks) which can be used to move
+    these periodic tasks out of the nova-compute process.
+    
+    I also remove the periodic_interval flag to services, as the interval
+    between runs is now dynamic based on the number of seconds that a
+    periodic task wants to wait for its next run. For callers who want to
+    twiddle the sleep period (for example unit tests), there is a
+    create() argument periodic_interval_max which lets the period
+    periodic_tasks() specifies be overridden. This is not exposed as a
+    flag because I cannot see a use case for that. It is needed for unit
+    testing however.
+    
+    DocImpact. Resolves bug 939087.
+    
+    Change-Id: I7f245a88b8d229a481c1b65a4c0f1e2769bf3901
+
+ nova/compute/manager.py                 |   21 +++---
+ nova/exception.py                       |    4 ++
+ nova/manager.py                         |   96 +++++++++++++++++++++------
+ nova/network/manager.py                 |    6 +-
+ nova/service.py                         |   38 ++++++-----
+ nova/servicegroup/db_driver.py          |    2 +-
+ nova/tests/api/ec2/test_cinder_cloud.py |   12 ++--
+ nova/tests/api/ec2/test_cloud.py        |   12 ++--
+ nova/tests/integrated/test_servers.py   |    4 +-
+ nova/tests/test_periodic_tasks.py       |  109 +++++++++++++++++++++++++++++++
+ nova/utils.py                           |   59 +++++++++++++++--
+ nova/virt/baremetal/ipmi.py             |    4 +-
+ nova/virt/libvirt/driver.py             |   24 ++++---
+ nova/virt/vmwareapi/driver.py           |    4 +-
+ 14 files changed, 310 insertions(+), 85 deletions(-)
+
+commit 1be4d7b6be3c482d8d8b6e23c610f71e004760df
+Merge: 1b81b50 269aa32
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:42:52 2013 +0000
+
+    Merge "Sync timeutils changes from Oslo"
+
+commit 1b81b509042513a17b2a0f150ec38d35581fa86b
+Merge: 69b8ec2 e034a12
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:42:38 2013 +0000
+
+    Merge "Remove system_metadata db calls from compute manager"
+
+commit 2a89de1e46f9a5ac35e375d760215bc8781ef962
+Author: Chris Behrens <[e-mail]>
+Date:   Wed Nov 21 09:39:04 2012 +0000
+
+    Cells: Add periodic instance healing
+    
+    Adds a periodic task that'll sync instance information to API cells
+    periodically.  Does a handful of instances per periodic task run based
+    on config values.  Instances picked for syncing are randomized so that
+    multiple nova-cells services won't be syncing the same instances at
+    nearly the same time.
+    
+    instance_updated_at_threshold -- Number of seconds after an instance was
+                                     updated or deleted to continue to sync
+                                     (Ie, don't sync instances updated more
+                                     than 'x' seconds ago.)
+    instance_update_num_instances -- Number of instances to update per periodic
+                                     task run
+    
+    Implements blueprint nova-compute-cells
+    
+    DocImpact
+    
+    Change-Id: I3103c3a69ab9cf0ec3e399abe046ed0d216234ab
+
+ nova/cells/manager.py                  |   84 ++++++++++++++++++++++++++++++++
+ nova/cells/utils.py                    |   48 ++++++++++++++++++
+ nova/tests/cells/fakes.py              |    6 +++
+ nova/tests/cells/test_cells_manager.py |   62 +++++++++++++++++++++++
+ nova/tests/cells/test_cells_utils.py   |   82 +++++++++++++++++++++++++++++++
+ 5 files changed, 282 insertions(+)
+
+commit 69b8ec2e9cf48ee836f968ea0817e1d2955b3e63
+Merge: 8fe2796 10daa81
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:39:11 2013 +0000
+
+    Merge "Move block_device_mapping destroy operations to conductor"
+
+commit 8fe279661b0c554b19fbfd145fe266ec58cad4fa
+Merge: 11698a3 1bf8992
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:37:22 2013 +0000
+
+    Merge "Move block_device_mapping get operations to conductor"
+
+commit 11698a3073d743154360ebeac982fb0a5f566bcc
+Merge: 20a338d 03c2a0b
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:37:08 2013 +0000
+
+    Merge "Move block_device_mapping update operations to conductor"
+
+commit 20a338d5cbe6ef6e0661cf8294404a88bac32e41
+Merge: 1308070 d65801c
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:36:55 2013 +0000
+
+    Merge "fix floating-ip in multihost case"
+
+commit 130807036a7574fe81c957ed2635ad9f9db51aba
+Merge: 3e3111f 340c358
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:36:39 2013 +0000
+
+    Merge "Remove unused VMWare VIF driver abstraction"
+
+commit 3e3111f137bc14bb4aa4522bd1fcabaac154ad17
+Merge: 7efe647 f9a868e
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:29:51 2013 +0000
+
+    Merge "Cells: Add the main code."
+
+commit 7efe647e365875dfe1fce03d9260c33349f1a75c
+Merge: 48487f1 66d0cb1
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 22:29:36 2013 +0000
+
+    Merge "Invalid EC2 ids should make the entire request fail."
+
+commit e83dd1259a8dae5e34d2b2334075f9d7a072d780
+Author: Clark Boylan <[e-mail]>
+Date:   Fri Dec 28 16:55:09 2012 -0800
+
+    Timeout individual tests after one minute.
+    
+    Use fixtures.Timeout to timeout each nova test after one minute of
+    running. Because only one fixtures.Timeout can be in use at a time
+    subclasses of nova.test.TestCase should not explicitly use this fixture.
+    
+    Change-Id: I0fced73e81784d0f843ecac2998598a0343a2083
+
+ nova/test.py |    2 ++
+ 1 file changed, 2 insertions(+)
+
+commit a62f01a1abe4fc49b099f0e0dfab827e5f78e80c
+Author: Brian Elliott <[e-mail]>
+Date:   Fri Jan 4 20:46:17 2013 +0000
+
+    Fix regression in RetryFilter
+    
+    Fixes regression in RetryFilter.  The RPC layer would convert the list
+    of tuples that comprised the previously attempted hosts to a list of
+    lists.  The RetryFilter was attempting to compare a tuple to a list,
+    which failed.
+    
+    bug 1096196
+    
+    Change-Id: I30adf42daf5e86ccec0269eca1f84d06ed4beb59
+
+ nova/scheduler/filter_scheduler.py            |    2 +-
+ nova/scheduler/filters/retry_filter.py        |   11 +++++++----
+ nova/tests/scheduler/test_filter_scheduler.py |    6 +++---
+ nova/tests/scheduler/test_host_filters.py     |    6 +++---
+ 4 files changed, 14 insertions(+), 11 deletions(-)
+
+commit f9a868e86ce11f786538547c301b805bd68a1697
+Author: Chris Behrens <[e-mail]>
+Date:   Fri Apr 13 05:54:48 2012 +0000
+
+    Cells: Add the main code.
+    
+    This introduces *EXPERIMENTAL* compute cells functionality as a way to
+    scale nova in a more distributed fashion without having to use complicated
+    technologies like DB and message queue clustering.
+    
+    Cells are configured as a tree and the top level cell should contain
+    nova-api without any nova-computes while child cells contain everything
+    except nova-api.  One can think of a cell as a normal nova deployment in
+    that each cell has its own DB server and message queue broker.
+    
+    The top level cell keeps a subset of data about ALL instances in all
+    cells in its DB.  Child cells send messages to the top level cell when
+    instances change state.  Data in 1 child cell is not shared with another
+    child cell.
+    
+    A new service, nova-cells, is introduced that handles communication
+    between cells and picking of a cell for new instances.  This service is
+    required for every cell.  Communication between cells is pluggable with
+    the only option currently implemented being communnication via RPC.
+    
+    Cells scheduling is separate from host scheduling.  nova-cells first picks
+    a cell (currently randomly -- future patches add filtering/weighing
+    functionality and decisions can be based on broadcasts of
+    capacity/capabilities).  Once a cell has been selected and the new build
+    request has reached its nova-cells service, it'll be sent over to the host
+    scheduler in that cell and the build proceeds as it does without cells.
+    
+    New config options are introduced for enabling and configuring the cells
+    code.  Cells is disabled by default.  All of the config options below go
+    under a '[cells]' section in nova.conf.  These are the options that one
+    may want to tweak:
+    
+    enable -- Turn on cells code (default is False)
+    name -- Name of the current cell.
+    capabilities -- List of arbitrary key=value pairs defining capabilities
+                    of the current cell.  These are sent to parent cells,
+                    but aren't used in scheduling until later filter/weight
+                    support is added.
+    call_timeout -- How long to wait for replies from a calls between cells
+    
+    When using cells, the compute API class must be changed in the API cell,
+    so that requests can be proxied via nova-cells down to the correct cell
+    properly.  Thus, config requirements for API cell:
+    
+    --
+    [DEFAULT]
+    compute_api_class=nova.compute.cells_api.ComputeCellsAPI.
+    [cells]
+    enable=True
+    name=api-cell
+    --
+    
+    Config requirements for child cell:
+    
+    --
+    [cells]
+    enable=True
+    name=child-cell1
+    --
+    
+    Another requirement is populating the 'cells' DB table in each cell.
+    Each cell needs to know about its parent and children and how to
+    communicate with them (message broker location, credentials, etc).
+    
+    Implements blueprint nova-compute-cells
+    
+    DocImpact
+    
+    Change-Id: I1b52788ea9d7753365d175abf39bdbc22ba822fe
+
+ bin/nova-cells                            |   53 ++
+ nova/cells/__init__.py                    |   19 +
+ nova/cells/driver.py                      |   41 ++
+ nova/cells/manager.py                     |  136 ++++
+ nova/cells/messaging.py                   | 1047 +++++++++++++++++++++++++++++
+ nova/cells/opts.py                        |   44 ++
+ nova/cells/rpc_driver.py                  |  165 +++++
+ nova/cells/rpcapi.py                      |  138 ++++
+ nova/cells/scheduler.py                   |  136 ++++
+ nova/cells/state.py                       |  346 ++++++++++
+ nova/compute/api.py                       |    8 +
+ nova/compute/cells_api.py                 |  471 +++++++++++++
+ nova/db/api.py                            |   69 +-
+ nova/exception.py                         |   28 +
+ nova/tests/cells/__init__.py              |   19 +
+ nova/tests/cells/fakes.py                 |  191 ++++++
+ nova/tests/cells/test_cells_manager.py    |  151 +++++
+ nova/tests/cells/test_cells_messaging.py  |  913 +++++++++++++++++++++++++
+ nova/tests/cells/test_cells_rpc_driver.py |  218 ++++++
+ nova/tests/cells/test_cells_rpcapi.py     |  206 ++++++
+ nova/tests/cells/test_cells_scheduler.py  |  206 ++++++
+ nova/tests/compute/test_compute.py        |    4 +
+ nova/tests/compute/test_compute_cells.py  |   99 +++
+ setup.py                                  |    1 +
+ 24 files changed, 4696 insertions(+), 13 deletions(-)
+
+commit 0df60e98790c722aef59d0015c209ea0944e62c0
+Author: Andrew Melton <[e-mail]>
+Date:   Mon Nov 12 13:19:19 2012 -0500
+
+    Adding two snapshot related task states
+    
+    The first, 'image_pending_upload', indicates that the snapshot of a given
+    instance has been taken and it is being prepared for uploading to the
+    image service.
+    
+    The second, 'image_uploading', indicates that the compute manager has
+    initiated upload to the image service.
+    
+    Implements blueprint snapshot-task-states
+    
+    Change-Id: I256c5d21a1d23b87d2060cca99eb9839c5b89161
+
+ nova/compute/manager.py         |   11 ++-
+ nova/compute/task_states.py     |    2 +
+ nova/tests/matchers.py          |   15 +++++
+ nova/tests/test_hypervapi.py    |   34 +++++++++-
+ nova/tests/test_libvirt.py      |  142 ++++++++++++++++++++++++++++++++++++---
+ nova/tests/test_virt_drivers.py |    6 +-
+ nova/tests/test_vmwareapi.py    |   18 ++++-
+ nova/tests/test_xenapi.py       |   20 +++++-
+ nova/virt/driver.py             |    2 +-
+ nova/virt/fake.py               |    4 +-
+ nova/virt/hyperv/driver.py      |    4 +-
+ nova/virt/hyperv/snapshotops.py |    7 +-
+ nova/virt/libvirt/driver.py     |    7 +-
+ nova/virt/vmwareapi/driver.py   |    4 +-
+ nova/virt/vmwareapi/vmops.py    |    6 +-
+ nova/virt/xenapi/driver.py      |    4 +-
+ nova/virt/xenapi/vm_utils.py    |    9 ++-
+ nova/virt/xenapi/vmops.py       |    8 ++-
+ 18 files changed, 268 insertions(+), 35 deletions(-)
+
+commit 48487f1a4b8f8fa538f90716e293ac8d67853311
+Merge: 80325d6 aa2dea3
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 19:14:49 2013 +0000
+
+    Merge "Allow larger encrypted password posts to metadata"
+
+commit c7221d046008f6bc980b6cb97f868e9ef8655070
+Author: Sean Dague <[e-mail]>
+Date:   Fri Jan 4 13:01:06 2013 -0500
+
+    update version urls to working v2 urls
+    
+    the GET /v2/ API call is documented to return urls to both
+    wadl and pdf documents. However our call returned non working
+    urls to 1.1 versions of those documents. Fix this.
+    
+    Also fix the unit tests to actually test the output of versions.
+    Previously we were over stubbing the test_verions.py so it was
+    testing only itself, and not the output you'd actually get from
+    the real versions.py module.
+    
+    Renamed the variables used for the expected variables to reduce
+    confusion about what is an expected variable vs. the variables
+    coming from versions.py to try to ensure we don't have cicular
+    always passing tests in the future.
+    
+    Fixes bug #1076109
+    
+    Change-Id: I1047b8c48ff053eed5ad4afa8eae5833f70d0893
+
+ nova/api/openstack/compute/versions.py            |    4 +-
+ nova/tests/api/openstack/compute/test_versions.py |   48 ++++++++++-----------
+ 2 files changed, 26 insertions(+), 26 deletions(-)
+
+commit 1428956919ffdaf75297fd225452abb9649e6c32
+Author: Mark McLoughlin <[e-mail]>
+Date:   Fri Jan 4 17:36:29 2013 +0000
+
+    Add helper methods to nova.paths
+    
+    We only ever do one of two things with the global path options:
+    
+      1) Reference the option in the default of another option so that the
+         value can be interpolated it
+    
+      2) Use the value of the option to build a path
+    
+    Add helper methods for both these cases - e.g. basedir_def() for the
+    former case and basedir_rel() for the latter case. This makes it much
+    more obvious how and where these options are used.
+    
+    Change-Id: I7fd94a329fe911761d02d94e5381e950c6668d56
+
+ nova/cloudpipe/pipelib.py                    |    4 ++--
+ nova/compute/manager.py                      |    4 ++--
+ nova/console/xvp.py                          |    4 ++--
+ nova/crypto.py                               |    6 +++---
+ nova/db/sqlalchemy/session.py                |    4 ++--
+ nova/network/linux_net.py                    |    8 +++----
+ nova/objectstore/s3server.py                 |    4 ++--
+ nova/paths.py                                |   30 ++++++++++++++++++++++++++
+ nova/test.py                                 |   12 +++++------
+ nova/tests/conf_fixture.py                   |    4 ++--
+ nova/virt/baremetal/db/sqlalchemy/session.py |    5 +++--
+ nova/virt/baremetal/driver.py                |    5 +++--
+ nova/virt/baremetal/ipmi.py                  |    4 ++--
+ nova/virt/disk/api.py                        |    4 ++--
+ nova/virt/libvirt/volume_nfs.py              |    4 ++--
+ 15 files changed, 65 insertions(+), 37 deletions(-)
+
+commit 2553b4a22175d9a00a36fd9d20f3c646fd3fab1f
+Author: Mark McLoughlin <[e-mail]>
+Date:   Fri Jan 4 17:32:36 2013 +0000
+
+    Move global path opts in nova.paths
+    
+    Move the global path config options (i.e. state_path, pybasedir and
+    bindir) into a new nova.paths module. A new module may seem like
+    overkill but some utility methods associated with these options follow
+    in a later commit.
+    
+    Moving them to nova.paths means they are no longer globally defined
+    and it's more obvious which modules require these options.
+    
+    Change-Id: I381d23f1bbe36dc6967a38a65062b0983e1661aa
+
+ nova/cloudpipe/pipelib.py                    |    2 +-
+ nova/compute/manager.py                      |    2 +-
+ nova/config.py                               |   15 ----------
+ nova/console/xvp.py                          |    2 +-
+ nova/crypto.py                               |    2 +-
+ nova/db/sqlalchemy/session.py                |    2 +-
+ nova/network/linux_net.py                    |    4 +--
+ nova/objectstore/s3server.py                 |    2 +-
+ nova/paths.py                                |   38 ++++++++++++++++++++++++++
+ nova/test.py                                 |    2 +-
+ nova/tests/conf_fixture.py                   |    2 +-
+ nova/virt/baremetal/db/sqlalchemy/session.py |    2 +-
+ nova/virt/baremetal/driver.py                |    1 +
+ nova/virt/baremetal/ipmi.py                  |    1 +
+ nova/virt/disk/api.py                        |    2 +-
+ nova/virt/libvirt/volume_nfs.py              |    2 +-
+ 16 files changed, 53 insertions(+), 28 deletions(-)
+
+commit 904814e51f4f24a704d98c3d13a8cce2a5bddc7e
+Author: Mark McLoughlin <[e-mail]>
+Date:   Fri Jan 4 17:32:08 2013 +0000
+
+    Remove unused aws access key opts
+    
+    These options are unused since the compute monitor was removed by
+    commit 07646e8.
+    
+    blueprint: scope-config-opts
+    Change-Id: I85af41fb385040710f830864d8ce70b743376e04
+
+ nova/config.py |    6 ------
+ 1 file changed, 6 deletions(-)
+
+commit 7b530ce65bc543a2d042570d45eec3fe9441261f
+Author: Mark McLoughlin <[e-mail]>
+Date:   Fri Jan 4 17:28:58 2013 +0000
+
+    Move fake_network opt to nova.network.manager
+    
+    This is only used in the network.manager and linux_net.
+    
+    blueprint: scope-config-opts
+    Change-Id: Id39a6a8427b293d1d9f9f22be12357b206910d72
+
+ nova/config.py            |    7 -------
+ nova/network/linux_net.py |    2 +-
+ nova/network/manager.py   |    4 +++-
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+commit aa2dea35c6e1cfc913e85834b9b98eda4155bd06
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Wed Jan 2 13:10:01 2013 -0800
+
+    Allow larger encrypted password posts to metadata
+    
+    System Metadata only supports values up to 255 characters, but
+    passwords encrypted with an rsa key are generally much longer than
+    that, so we support longer passwords by chunking into four fields.
+    
+    Change-Id: Iceae6cbc7609ec3bdf1b3814aec5b73f19613349
+
+ nova/api/metadata/base.py     |    7 +------
+ nova/api/metadata/password.py |   34 +++++++++++++++++++++++++++++-----
+ nova/tests/test_metadata.py   |    3 ++-
+ 3 files changed, 32 insertions(+), 12 deletions(-)
+
+commit c740d3f270e221f712bbf8c1cc3ac4dcb8156c23
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 07:22:07 2013 -0800
+
+    Move instance_type_get() to conductor
+    
+    This patch moves compute/manager's use of instance_type_get()
+    to the conductor.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ib70dabc54ffeb199dd2fd4f597b9afc22d2511bf
+
+ nova/compute/manager.py                |    2 +-
+ nova/conductor/api.py                  |    7 +++++++
+ nova/conductor/manager.py              |    6 +++++-
+ nova/conductor/rpcapi.py               |    6 ++++++
+ nova/tests/conductor/test_conductor.py |    7 +++++++
+ 5 files changed, 26 insertions(+), 2 deletions(-)
+
+commit d7542c116f45b3e314ecc7bacfd885ee43a36808
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jan 4 06:56:39 2013 -0800
+
+    Move instance_info_cache_delete() to conductor
+    
+    This patch moves compute/manager's use of
+    instance_info_cache_delete() to conductor.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: I4e7f2d95ddc26c0dbea1a644ca23026339ce720e
+
+ nova/compute/manager.py                |    2 +-
+ nova/conductor/api.py                  |    7 +++++++
+ nova/conductor/manager.py              |    5 ++++-
+ nova/conductor/rpcapi.py               |    6 ++++++
+ nova/tests/conductor/test_conductor.py |    7 +++++++
+ 5 files changed, 25 insertions(+), 2 deletions(-)
+
+commit 9f1b8228c93571552de4df73d1827dcd21498256
+Author: Dan Smith <[e-mail]>
+Date:   Thu Jan 3 14:34:48 2013 -0800
+
+    Move instance_destroy() to conductor
+    
+    This patch moves compute/manager's use of db.instance_destroy()
+    to the conductor.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: I72ee249ee2842a453fdf225414a03527448d2a26
+
+ nova/compute/manager.py                |    2 +-
+ nova/conductor/api.py                  |    6 ++++++
+ nova/conductor/manager.py              |    5 ++++-
+ nova/conductor/rpcapi.py               |    6 ++++++
+ nova/tests/conductor/test_conductor.py |    6 ++++++
+ 5 files changed, 23 insertions(+), 2 deletions(-)
+
+commit d22b0ca2402d9625cea7460050e3fc77e7e2ea85
+Author: Dan Smith <[e-mail]>
+Date:   Thu Jan 3 09:17:17 2013 -0800
+
+    Move instance_get_*() to conductor
+    
+    This patch adds conductor support for instance_get_all_by_filters(),
+    and supports the following APIs through that method:
+    
+     - instance_get_all()
+     - instance_get_all_by_host()
+     - instance_get_all_by_filters()
+    
+    Further, it adds support for the following APIs:
+    
+     - instance_get_all_hung_in_rebooting()
+     - instance_get_active_by_window()
+    
+    It also makes compute/manager use conductor for these operations, with
+    one exception. Currently, ComputeManager.init_host () lists all
+    instances associated with the host, which may happen before a conductor
+    service is available. This will be handled separately due to the
+    sequencing concerns.
+    
+    Related to bp/no-db-compute-manager
+    
+    Change-Id: I0dd346fd632aa15cd301386bc392502b95709529
+
+ nova/compute/manager.py                |   35 ++++++++++++--------
+ nova/conductor/api.py                  |   44 +++++++++++++++++++++++--
+ nova/conductor/manager.py              |   21 +++++++++++-
+ nova/conductor/rpcapi.py               |   27 +++++++++++++---
+ nova/tests/compute/test_compute.py     |   17 +++++-----
+ nova/tests/conductor/test_conductor.py |   55 ++++++++++++++++++++++++++++----
+ nova/tests/test_imagecache.py          |    7 ++--
+ 7 files changed, 168 insertions(+), 38 deletions(-)
+
+commit 269aa32a09af6200b4cafecf1cafb8ca34322b04
+Author: Dan Smith <[e-mail]>
+Date:   Thu Jan 3 09:36:54 2013 -0800
+
+    Sync timeutils changes from Oslo
+    
+    Change-Id: I5eddfbad43a2f57e6b2af6299e480c32b11a5d19
+
+ nova/openstack/common/timeutils.py |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e034a126dade15f05014f6a9eb85562f59714f63
+Author: Dan Smith <[e-mail]>
+Date:   Wed Jan 2 13:07:04 2013 -0800
+
+    Remove system_metadata db calls from compute manager
+    
+    The compute/manager makes several unnecessary db calls to fetch
+    the instance system_metadata, which is available in the instance
+    object itself now. This patch replaces those uses, avoiding the
+    need to farm them out to conductor.
+    
+    Related to bp/no-db-compute
+    Related to bp/no-db-compute-manager
+    
+    Change-Id: I26ff77be17eb538a4fcd238ffe52f8bde4fbe3e0
+
+ nova/compute/manager.py                  |    8 ++++----
+ nova/compute/utils.py                    |   13 ++++++++-----
+ nova/tests/compute/test_compute_utils.py |   12 ++++++++++++
+ 3 files changed, 24 insertions(+), 9 deletions(-)
+
+commit 10daa81057b2cfc0a3e21624b50b0b5d610b4db2
+Author: Dan Smith <[e-mail]>
+Date:   Wed Jan 2 10:59:42 2013 -0800
+
+    Move block_device_mapping destroy operations to conductor
+    
+    This patch moves the compute/manager's use of block_device_mapping_destroy
+    operations to the conductor. Specifically:
+    
+     - block_device_mapping_destroy()
+     - block_device_mapping_destroy_by_instance_and_device()
+     - block_device_mapping_destroy_by_instance_and_volume()
+    
+    Once again, this just adds a single destroy operation to the conductor's
+    RPC API and replicates the older interfaces in the public API. Further,
+    the first now takes a list of bdms to be destroyed (unlike the db
+    operation it mirrors) so that multiple RPC calls can be avoided for
+    bulk delete operations.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ib93184ee6d32fcda90f75a26b579787e4625e9ae
+
+ nova/compute/manager.py                |   12 ++---
+ nova/conductor/api.py                  |   31 +++++++++++++
+ nova/conductor/manager.py              |   19 +++++++-
+ nova/conductor/rpcapi.py               |   12 +++++
+ nova/tests/conductor/test_conductor.py |   75 ++++++++++++++++++++++++++++++++
+ 5 files changed, 142 insertions(+), 7 deletions(-)
+
+commit 80325d6897e9aadd0287e5e4e3fc3ada03448dac
+Merge: 8e71b1e fa650b4
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 14:45:19 2013 +0000
+
+    Merge "Ensure that Quantum uses configured fixed IP"
+
+commit 8e71b1e1808523675e1779d2b7651ac1b9df902e
+Merge: 90f4b3b b1298cc
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 13:43:50 2013 +0000
+
+    Merge "Delete pointless nova.virt.VIFDriver class"
+
+commit f80e924737c0db8025aa71cad2f83f74f8ea742b
+Author: Mark McLoughlin <[e-mail]>
+Date:   Tue Dec 11 07:18:35 2012 +0000
+
+    Clean up setting of control_exchange default
+    
+    The RPC code from Oslo now registers the control_exchange option but
+    provides us with an API for changing the default.
+    
+    blueprint: scope-config-opts
+    Change-Id: Ie7950daaddb53f38eb72d2a113e1f26252dd6903
+
+ nova/config.py                        |    5 ++---
+ nova/openstack/common/rpc/__init__.py |   16 ++++++++--------
+ nova/openstack/common/rpc/amqp.py     |    5 +----
+ 3 files changed, 11 insertions(+), 15 deletions(-)
+
+commit 90f4b3ba15578e7a99189e128209bfc286e91d42
+Merge: be22c7f 5425824
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 13:06:18 2013 +0000
+
+    Merge "db.security_group_rule_destroy() method performance optimization"
+
+commit be22c7fb23448980a2ed1e8dee28abb376e89faf
+Merge: b4d7261 881a934
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:56:35 2013 +0000
+
+    Merge "Eliminate race conditions in floating association"
+
+commit b4d72616c19d7b079f3225a3f57fe49e5df642f4
+Merge: 668e8e9 ce9867b
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:33:35 2013 +0000
+
+    Merge "Add html reports to report action in coverage extension."
+
+commit 668e8e943d112f7f67e228c43b6b24b544df3ced
+Merge: 89c2e6b 2a94a25
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:31:23 2013 +0000
+
+    Merge "Fix error in test_get_all_by_multiple_options_at_once()"
+
+commit 89c2e6b71482db9ccd1d39bf0299b46c15477690
+Merge: b34c7f3 5492826
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:30:15 2013 +0000
+
+    Merge "Fix race condition of resize confirmation"
+
+commit b34c7f32b303e4b6d6cea45094c487a0230005b3
+Merge: b6af299 1c6bb73
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:29:48 2013 +0000
+
+    Merge "Add unit test to update server metadata"
+
+commit b6af2992b589d2662e35de24c98a8df319f633c7
+Merge: a2fb27e d4f1512
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:29:21 2013 +0000
+
+    Merge "Add unit test to revert resize server action"
+
+commit a2fb27e9ba3e15aefe25b2aaacf7d45d379c7779
+Merge: f7703be 9402ca6
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:28:55 2013 +0000
+
+    Merge "Fix spelling mistakes in nova.virt"
+
+commit f7703beb932d589173ca174c1e6f0dcc1ed47c3c
+Merge: 8d10a6b 484a7a9
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 12:28:30 2013 +0000
+
+    Merge "Remove inconsistent usage of variable from hyperv."
+
+commit 8d10a6bc55e24a67581fdefd1f473a305f0a2e26
+Merge: e4b5abc 58d5b2b
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 11:58:30 2013 +0000
+
+    Merge "Added sample tests to FlavorDisabled API."
+
+commit e4b5abcdb34bed91a8033b24cf47dad60c670604
+Merge: b6843ad 54ee787
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 10:05:34 2013 +0000
+
+    Merge "fix resize of unpartitioned images with libguestfs"
+
+commit d65801ca0718a5ca417d5b134ae9b7d87730f83f
+Author: Mate Lakat <[e-mail]>
+Date:   Tue Dec 18 14:22:40 2012 +0000
+
+    fix floating-ip in multihost case
+    
+    Fixes bug 1091698.
+    
+    _disassociate_floating_ip and _associate_floating_ip got an extra
+    parameter since this change:
+    https://github.com/openstack/nova/commit/b93e851c0d90c17868a0e68a3b54e136bb5cd54d
+    However, the multi-host codepath was not amended, thus multihost case
+    is broken since that. This fix adds the extra parameters for those rpc
+    calls.
+    
+    Change-Id: I93a5f96ef87c0f8a14c912d7812c001d0c682afa
+
+ nova/network/manager.py            |    7 ++-
+ nova/network/rpcapi.py             |   17 ++++--
+ nova/tests/network/test_manager.py |  111 ++++++++++++++++++++++++++++++++++++
+ nova/tests/network/test_rpcapi.py  |    5 +-
+ 4 files changed, 129 insertions(+), 11 deletions(-)
+
+commit b6843ad968ca03797d968625e8bec814caa42aa0
+Merge: 3ff2b56 c759a87
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 06:50:06 2013 +0000
+
+    Merge "Enable nova exception format checking in tests."
+
+commit 3ff2b563c0f5aa39dbb424c5be27072314646558
+Merge: e4d3ca6 21ea2e6
+Author: Jenkins <[e-mail]>
+Date:   Fri Jan 4 01:07:15 2013 +0000
+
+    Merge "xenapi: Avoid hotplugging volumes on resize."
+
+commit e4d3ca6c5a8630bd3d848d0af2b375355847a4f1
+Merge: 76835e5 f9883ce
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Thu Jan 3 22:03:53 2013 +0000
+
+    Merge "Imported Translations from Transifex"
+
+commit 76835e5a1b4e90628b71c23160e400d54b905448
+Merge: dcb79ba 17642b2
+Author: Jenkins <[e-mail]>
+Date:   Thu Jan 3 22:03:40 2013 +0000
+
+    Merge "Removes unused imports"
+
+commit 66d0cb1ce5c9d716ad93685ab6e6e86ddbd0b293
+Author: Michael Still <[e-mail]>
+Date:   Thu Dec 27 16:15:12 2012 +1100
+
+    Invalid EC2 ids should make the entire request fail.
+    
+    Resolves bug 836978. I suspect there are many other cases where we
+    should add this check.
+    
+    Change-Id: I027e44db2e27eb1ef913ddad8560cca08388906b
+
+ nova/api/ec2/cloud.py            |   44 +++++++++++++++++++++++++++++---------
+ nova/tests/api/ec2/test_cloud.py |   19 ++++++++++++++++
+ 2 files changed, 53 insertions(+), 10 deletions(-)
+
+commit dcb79ba1e6e20a8fb07205a4558cb93f3c5d5052
+Merge: ec648c0 977f4e0
+Author: Jenkins <[e-mail]>
+Date:   Thu Jan 3 19:32:49 2013 +0000
+
+    Merge "Clarify & fix docs for nova-novncproxy"
+
+commit ec648c01606ea68522e69dfe926860a584325cc7
+Merge: 1b1b955 2dfc08c
+Author: Jenkins <[e-mail]>
+Date:   Thu Jan 3 19:29:35 2013 +0000
+
+    Merge "Add remaining get_backdoor_port() rpc calls to coverage."
+
+commit 2ee83a493a91b6dd0ce79a8f6e74ac21638cff0a
+Author: Pádraig Brady <[e-mail]>
+Date:   Thu Jan 3 14:25:06 2013 +0000
+
+    improve libguestfs exception handling
+    
+    * nova/virt/disk/vfs/guestfs.py (teardown): Handle specific
+    exceptions when tearing down so that (future) nova bugs
+    aren't masked.  Also handle AttributeError so that the
+    relatively new handle() and close() don't cause erroneous
+    debug logs on older versions of libguestfs.
+    (has_file): remove the last use of generic exception
+    catching and use the more specific RuntimeError.
+    
+    Change-Id: Ia7345675d75c1c6727e9254791d44475c0ed9295
+
+ nova/tests/fakeguestfs.py     |   10 +++++-----
+ nova/virt/disk/vfs/guestfs.py |   39 ++++++++++++++++++++++++++-------------
+ 2 files changed, 31 insertions(+), 18 deletions(-)
+
+commit 54ee787d7ae1d7635bd5dac8efd985e3a93ad1c2
+Author: Pádraig Brady <[e-mail]>
+Date:   Thu Jan 3 03:09:00 2013 +0000
+
+    fix resize of unpartitioned images with libguestfs
+    
+    Following on from I9c974e138ff90e8b7a5a40f5b31dcdb25a59622d
+    Ensure that the libguestfs path also throws a NovaException,
+    handled by can_resize_fs().
+    
+    * nova/virt/disk/vfs/guestfs.py (setup): Move the debug message
+    and guestfs handle outside the exception handler as we
+    don't want to map failure of those to a NovaException
+    that indicates an issue with the image as opposed to the
+    nova code or libguestfs installation.  Change to a more explicit
+    exception thrown by guestfs, so as to avoid masking other issues.
+    (teardown): Remove redundant calls to str().
+    * nova/virt/disk/api.py (can_resize_fs): Cleanup the debug messages,
+    and use the newer vfs API directly, rather than the slightly
+    hacky call to inject_data() with no data to inject.
+    
+    Fixes bug: 1094373
+    Change-Id: I3e1305cf6bb64278a8caf37e4c5005cb9683f632
+
+ nova/virt/disk/api.py         |   12 +++++++-----
+ nova/virt/disk/vfs/guestfs.py |   21 +++++++++++++--------
+ 2 files changed, 20 insertions(+), 13 deletions(-)
+
+commit 1b1b955e86086054496f96e0d9a2631ee5dd678f
+Merge: 7240f7d 0edb7d4
+Author: Jenkins <[e-mail]>
+Date:   Thu Jan 3 15:55:36 2013 +0000
+
+    Merge "Provide a configdrive helper which uses contextlib."
+
+commit 21ea2e6109831156592dd1e4f4f4caefdcedd04f
+Author: Cory Stone <[e-mail]>
+Date:   Fri Dec 28 15:39:54 2012 -0600
+
+    xenapi: Avoid hotplugging volumes on resize.
+    
+    In finish_migration, instead of starting up the vm and then
+    hotplugging in the volumes to it, just attach the volumes before
+    starting the vm.
+    
+    This avoids the issue where the guest OS hasn't loaded the PV
+    drivers for the volume yet.
+    
+    Fixes bug 1094351
+    
+    Change-Id: I51d754f8f82f1d22bc123b39777449b58b03e389
+
+ nova/tests/test_xenapi.py                |    2 +-
+ nova/tests/virt/xenapi/test_volumeops.py |   75 +++++++++++++++++++++++++++++-
+ nova/virt/xenapi/driver.py               |   16 ++-----
+ nova/virt/xenapi/fake.py                 |    7 +++
+ nova/virt/xenapi/vmops.py                |   23 ++++++++-
+ nova/virt/xenapi/volumeops.py            |   24 +++++-----
+ 6 files changed, 119 insertions(+), 28 deletions(-)
+
+commit 340c35865ef32cc75612980b0c51524e0c19cfe1
+Author: Daniel P. Berrange <[e-mail]>
+Date:   Mon Dec 17 20:52:55 2012 +0000
+
+    Remove unused VMWare VIF driver abstraction
+    
+    There is only a single VMWare VIF driver impl and that is
+    entirely a no-op in the plug & unplug methods. The VMWare
+    driver does call a 'ensure_vlan_bridge' method, which is
+    essentially a static helper for creating a bridge device.
+    
+    Remove the VMWareVlanBridgeDriver class entirely and simply
+    have a single static method instead
+    
+    Change-Id: I7d0873798e0e7261e17e8894237fd4339be7c3cd
+    Signed-off-by: Daniel P. Berrange <[e-mail]>
+
+ nova/virt/vmwareapi/driver.py |    3 --
+ nova/virt/vmwareapi/vif.py    |   96 +++++++++++++++++++----------------------
+ nova/virt/vmwareapi/vmops.py  |   17 +++-----
+ 3 files changed, 49 insertions(+), 67 deletions(-)
+
+commit b1298cc990e80ec7b51f353e143fd15888be53b4
+Author: Daniel P. Berrange <[e-mail]>
+Date:   Mon Dec 17 20:45:03 2012 +0000
+
+    Delete pointless nova.virt.VIFDriver class
+    
+    There is a nova.virt.VIFDriver class which the hypervisor
+    VIF drivers inherit from. None of the hypervisor subclasses
+    pay any attention to the API contract defined to the parent
+    class. Some of the hypervisors don't bother trying to use
+    the VIFDriver class at all (hyperv, baremetal).
+    
+    It is not worth trying to make the hypervisor subclasses
+    follow the same API contract, since the base parent class
+    offers no re-usable functionality of its own. The hypervisor
+    base classs nova.virt.ComputeDriver also has no need for the
+    VIFDriver API to exist, since its integration point is the
+    'plug_vifs' method.
+    
+    As such the nova.virt.VIFDriver class serves no purpose
+    other than to mislead reviewers into thinking there is a
+    common API where none actually exists. It should thus be
+    deleted
+    
+    Change-Id: Id287f7e66143a248a5f106e010510a3f09d2b1e7
+    Signed-off-by: Daniel P. Berrange <[e-mail]>
+
+ nova/virt/libvirt/vif.py   |    3 +--
+ nova/virt/vif.py           |   34 ----------------------------------
+ nova/virt/vmwareapi/vif.py |    3 +--
+ nova/virt/xenapi/vif.py    |    3 +--
+ 4 files changed, 3 insertions(+), 40 deletions(-)
+
+commit 977f4e0f5ab766fc4eadd9af9aae1ac53e711c47
+Author: Daniel P. Berrange <[e-mail]>
+Date:   Thu Jan 3 10:43:20 2013 +0000
+
+    Clarify & fix docs for nova-novncproxy
+    
+    Clarify docs for nova-novncproxy to indicate that it only serves
+    noVNC web content. Also remove duplicated link from manpage
+    
+    Change-Id: Ia1f4aff21591132a5c41810a371d248ea0001e1f
+
+ bin/nova-novncproxy                |    4 ++--
+ doc/source/man/nova-novncproxy.rst |   10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 17642b2e1ae6ba6284ee01b9b99edd7ad447fb90
+Author: Zhongyue Luo <[e-mail]>
+Date:   Thu Jan 3 18:21:36 2013 +0800
+
+    Removes unused imports
+    
+    Change-Id: I76d243329f810cdcd6f8a5459eb66fddd5871e33
+
+ nova/tests/baremetal/test_driver.py         |    9 ++-------
+ nova/tests/baremetal/test_ipmi.py           |    4 ----
+ nova/tests/consoleauth/test_rpcapi.py       |    1 -
+ nova/tests/virt/disk/test_api.py            |    3 ---
+ nova/virt/baremetal/db/sqlalchemy/models.py |    2 +-
+ nova/virt/baremetal/fake.py                 |    1 -
+ nova/virt/baremetal/ipmi.py                 |    1 -
+ 7 files changed, 3 insertions(+), 18 deletions(-)
+
+commit f9883cef275a4d75f8054c7ae70960a8ecdbd738
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Thu Jan 3 00:03:24 2013 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: Ifb57826e0cfe1c94511c86641b6392f042c4b866
+
+ nova/locale/nova.pot |  772 ++++++++++++++++++++++++++++----------------------
+ 1 file changed, 435 insertions(+), 337 deletions(-)
+
+commit 7240f7d480a14e1dfde83400af2bb385b4e3b9e9
+Merge: ee01860 0673aef
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 22:36:51 2013 +0000
+
+    Merge "Improve baremetal driver error handling"
+
+commit 9402ca64a80e471f69d24430692cc11600b3be7b
+Author: Joe Gordon <[e-mail]>
+Date:   Wed Jan 2 14:21:57 2013 -0800
+
+    Fix spelling mistakes in nova.virt
+    
+    Change-Id: Ic5ff80af956726b768610290e4fae7dd46549711
+
+ nova/virt/disk/api.py       |    2 +-
+ nova/virt/disk/mount/api.py |    2 +-
+ nova/virt/disk/vfs/api.py   |    2 +-
+ nova/virt/firewall.py       |    2 +-
+ nova/virt/netutils.py       |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+commit ee01860ef51a4e809cf8d6b37c2a9250d8acf742
+Merge: 8470da6 9e9ffb0
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 22:17:20 2013 +0000
+
+    Merge "Remove unused imports"
+
+commit 8470da6c73f7b28a6ee6bd17c1dc802e9c105dcb
+Merge: 8f918e7 a1c90a3
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 22:13:34 2013 +0000
+
+    Merge "Check for image_meta in libvirt.driver.spawn"
+
+commit 56eb0df00c4fa995b767a9e2391ac5cb5f757c4d
+Author: Chris Behrens <[e-mail]>
+Date:   Thu Nov 1 19:52:36 2012 +0000
+
+    Cells: Add cells commands to nova-manage
+    
+    Add commands to nova-manage for configuring cells in the DB.
+    
+    Implements blueprint nova-compute-cells
+    
+    DocImpact
+    
+    Change-Id: Ic1a950181d5ce191780647838c5d06e5410676f7
+
+ bin/nova-manage |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 64 insertions(+)
+
+commit 8f918e7570f0997e9ffa954e0cc70d6537d26c60
+Merge: 02c29e9 4d16f2d
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 20:10:18 2013 +0000
+
+    Merge "Remove session.flush() and session.query() monkey patching"
+
+commit 2dfc08c145ce371d5697fa6e5128182c899517b4
+Author: Matthew Treinish <[e-mail]>
+Date:   Wed Dec 19 15:21:19 2012 -0500
+
+    Add remaining get_backdoor_port() rpc calls to coverage.
+    
+    This adds the get_backdoor_port() rpc calls for cert, conductor,
+    console, consoleauth, and scheduler so that the coverage
+    extension can now telnet into all of those services.
+    
+    Change-Id: I5de654a11ac224b1192a3b1601855c302b771efd
+
+ nova/api/openstack/compute/contrib/coverage_ext.py |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit 02c29e9dea6f6b7d2df5a2ba1e611510675b451a
+Merge: ab17a55 fa16f2b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:52:25 2013 +0000
+
+    Merge "Remove improper NotFound except block in list servers"
+
+commit ab17a55a18c5936ef17b21057b682e0b1cd816cb
+Merge: 688bbcf 86008a6
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:51:27 2013 +0000
+
+    Merge "Raise BadRequest when updating 'personality'"
+
+commit 688bbcf1df7e2816f3e9f2ac97c38fa429b6dd8f
+Merge: fdcf843 dc54013
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:51:03 2013 +0000
+
+    Merge "Add unit test for too long metadata for server rebuild action"
+
+commit fdcf843a4885b69fdaffe60437b462a1ea44ae5b
+Merge: c66755f 2b619e2
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:50:18 2013 +0000
+
+    Merge "Adds os-volume_attachments 'volume_id' validation"
+
+commit 334d7b8d25b0aa9b41b578df8309497e34b0a05f
+Author: Brian Elliott <[e-mail]>
+Date:   Wed Jan 2 19:24:00 2013 +0000
+
+    Fix race in resource tracker
+    
+    Fix a race in resource tracker where usage can get under reported if the
+    audit process runs after an instance gets set to vm_state=DELETED, but
+    before the DB record itself is deleted.
+    
+    bug 1095403
+    
+    Change-Id: I47943d12155a6484c6cb3adb31dfa4db0191cf26
+
+ nova/compute/resource_tracker.py            |    5 ++++-
+ nova/tests/compute/test_resource_tracker.py |    9 +++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+commit c66755f0edfe803653e5e278dc078a7a7e82b6e4
+Merge: 46b047f 2397c6b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:17:39 2013 +0000
+
+    Merge "Report failures to mount in localfs correctly."
+
+commit 46b047fbcc9a4d2c54c74c46163d89f557e5898c
+Merge: 7f53b62 06d791b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:17:22 2013 +0000
+
+    Merge "Add get_backdoor_port to scheduler."
+
+commit 7f53b621230b247cae6c74d2ccc8dccad215a51e
+Merge: 8a73316 a4332ee
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:16:52 2013 +0000
+
+    Merge "Add get_backdoor_port to console."
+
+commit 8a7331697698addd67bf4c778760f1b4ecb3824e
+Merge: 9497653 576a561
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:16:27 2013 +0000
+
+    Merge "Add get_backdoor_port to cert."
+
+commit 94976530d9b9a64949ed982df2777a52a3bf8b19
+Merge: 4690b50 fb32f1e
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 19:03:56 2013 +0000
+
+    Merge "Extract image metadata from Cinder"
+
+commit 1bf89924ba6eafc394612f9d62c1b52251825b2b
+Author: Dan Smith <[e-mail]>
+Date:   Wed Jan 2 10:32:38 2013 -0800
+
+    Move block_device_mapping get operations to conductor
+    
+    This patch moves the block_device_mapping_get_by_instance()
+    uses from compute/manager to the conductor. This also includes
+    some nasty refactoring in some of compute's helper methods to
+    pass around instances instead of just uuids so that we can
+    properly pass the former to the conductor.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ib5223274d21096a9e47b3420c3de801b978b253d
+
+ nova/compute/manager.py                |   76 ++++++++++++++++----------------
+ nova/conductor/api.py                  |    8 ++++
+ nova/conductor/manager.py              |    7 ++-
+ nova/conductor/rpcapi.py               |    7 +++
+ nova/tests/conductor/test_conductor.py |   11 +++++
+ 5 files changed, 69 insertions(+), 40 deletions(-)
+
+commit 03c2a0ba5228448baf90fd9248bc51c8071a7d47
+Author: Dan Smith <[e-mail]>
+Date:   Wed Jan 2 09:30:10 2013 -0800
+
+    Move block_device_mapping update operations to conductor
+    
+    This patch moves the uses of the following methods in compute/manager
+    to the conductor:
+    
+     - block_device_mapping_create()
+     - block_device_mapping_update()
+     - block_device_mapping_update_or_create()
+    
+    As in the past with adding multiple similar operations to conductor,
+    only one method is actually added to the manager and RPC API, which
+    is similar to the update_or_create variant above. The public API for
+    conductor maintains all three variants and their original calling
+    conventions.
+    
+    Related to blueprint no-db-compute-manager
+    
+    Change-Id: Ibcb721ebd0ba8639ccb2ba2f7bed1dcf499e4edb
+
+ nova/compute/manager.py                |    9 +++---
+ nova/conductor/api.py                  |   29 ++++++++++++++++++
+ nova/conductor/manager.py              |   11 ++++++-
+ nova/conductor/rpcapi.py               |    7 +++++
+ nova/tests/conductor/test_conductor.py |   51 ++++++++++++++++++++++++++++++++
+ 5 files changed, 102 insertions(+), 5 deletions(-)
+
+commit 0673aef9ff336b29a744cea02103ff992b50cbc6
+Author: Devananda van der Veen <[e-mail]>
+Date:   Thu Dec 27 17:19:21 2012 -0800
+
+    Improve baremetal driver error handling
+    
+    Several improvements to baremetal driver are implemented in this patch.
+    There is now significantly more error handling during spawn().
+    
+    It also includes an addition to nova/tests/utils.py to provide
+    additional sample information from get_test_network_info().
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: I65d93051d7fcfd79f4d24d4ddb62fb1a55bee646
+
+ nova/tests/baremetal/test_driver.py      |    2 +-
+ nova/tests/utils.py                      |    7 +-
+ nova/virt/baremetal/base.py              |   27 ++++---
+ nova/virt/baremetal/db/api.py            |    4 +
+ nova/virt/baremetal/db/sqlalchemy/api.py |   31 ++++++++
+ nova/virt/baremetal/driver.py            |  128 ++++++++++++++++--------------
+ nova/virt/baremetal/fake.py              |   39 ++-------
+ nova/virt/baremetal/utils.py             |   29 ++++++-
+ 8 files changed, 160 insertions(+), 107 deletions(-)
+
+commit 1c6bb73b3df355b0100212e8732c8be16ee63624
+Author: Mauro S. M. Rodrigues <[e-mail]>
+Date:   Wed Jan 2 08:43:39 2013 -0500
+
+    Add unit test to update server metadata
+    
+    Fixes bug: 1088878
+    Partially implements blueprint nova-v2-api-audit
+    
+    The bug description points to 4 situations to be tested, although those
+    situations are already tested on create metadata tests which use the same
+    method as update_all to operate over metadata (_update_instance_metadata) so no
+    more tests are needed.
+    
+    Change-Id: Ifae3c69c0e00c361ae36f5a8dede835c96568d11
+
+ .../api/openstack/compute/test_server_metadata.py  |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+commit d4f151214ee7db8bd1e40258206a79ce3aee75cb
+Author: Mauro S. M. Rodrigues <[e-mail]>
+Date:   Tue Jan 1 21:52:33 2013 -0500
+
+    Add unit test to revert resize server action
+    
+    Add a unit test to check the revert resize to an invaid server
+    
+    Fix bug: 1088874
+    Partially implements blueprint nova-v2-api-audit
+    
+    Change-Id: I19128ac1a99e85721e7911176fa6d6c78bd5c256
+
+ .../api/openstack/compute/test_server_actions.py   |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit 4690b501b58bc499029bc4586ff4b7c0917d2395
+Merge: 723fee5 6bf64e8
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 17:46:11 2013 +0000
+
+    Merge "baremetal power driver takes **kwargs"
+
+commit 723fee501cff99d7f6b3ad734a0810bd6c72d269
+Merge: 865565e f1bb1a2
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 17:45:48 2013 +0000
+
+    Merge "Implement IPMI sub-driver for baremetal compute"
+
+commit 865565e166609e6073686bd881594099f9502b82
+Merge: 1c6f047 0279d84
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 17:45:17 2013 +0000
+
+    Merge "Fix tests/baremetal/test_driver.py"
+
+commit 1c6f047094a9008a0c15231053906837c8e6cc41
+Merge: fff67a6 79d919b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 17:45:04 2013 +0000
+
+    Merge "Add get_backdoor_port to consoleauth."
+
+commit 6afae496d2314ca6900f6f9709d093aa6bb7f29d
+Author: Brian Elliott <[e-mail]>
+Date:   Wed Jan 2 16:35:23 2013 +0000
+
+    Add compute build/resize errors to instance faults
+    
+    Save exception during build and resize operations in instance faults.
+    This will making it easier to see the individual compute errors that
+    occurred when an operation got re-scheduled.
+    
+    Change-Id: I4224b9638aa9b7572fc0ee1ef6fa3e6654b84805
+
+ nova/compute/manager.py            |   22 +++++++++++------
+ nova/tests/compute/test_compute.py |   47 +++++++++++++++++++++++-------------
+ 2 files changed, 44 insertions(+), 25 deletions(-)
+
+commit fff67a693a947c2d99c710682c999493558ea6f5
+Merge: 40a19b7 18a4c7a
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:44:13 2013 +0000
+
+    Merge "Spelling: Compatability=>Compatibility"
+
+commit 40a19b7c082c781fb013aab24b92a15dc5d719db
+Merge: edf4df3 1f21448
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:43:49 2013 +0000
+
+    Merge "Fix cloudpipe instances query."
+
+commit edf4df3f6fa64f24d3352d69bfdd0e47bbea9f31
+Merge: 04e4212 9f01b10
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:42:48 2013 +0000
+
+    Merge "Log last compute error when rescheduling."
+
+commit 04e4212849d614e0c49eeda33bbbe43d215f9301
+Merge: 4092a85 0fd155b
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:13:08 2013 +0000
+
+    Merge "db.network_delete_safe() method performance optimization"
+
+commit 4092a850c949ea12eaa5376471ec6e039bded6d5
+Merge: 1ee38bb 9ac65bd
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:12:54 2013 +0000
+
+    Merge "Move baremetal options to [BAREMETAL] OptGroup"
+
+commit 1ee38bbb4859bfdc47daafa9ab79ed59e2aa3dd9
+Merge: f18923f 41b17b6
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:12:12 2013 +0000
+
+    Merge "spelling in test_migrations"
+
+commit f18923f316a4b6c464e1c68066a6196aed450894
+Merge: 2ab0bf7 352eac1
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 16:11:50 2013 +0000
+
+    Merge "Update nova-cert man page"
+
+commit 2ab0bf7431e155183c7f9d81553eb97a5f459365
+Merge: cc6800e cb5c61f
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 15:04:39 2013 +0000
+
+    Merge "Allow new XML API sample file generation"
+
+commit cc6800e6abb48dff943e40e60741b58cfaf7c38c
+Merge: 551fad9 f21a3ab
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:58:04 2013 +0000
+
+    Merge "Adds test for HTTPUnprocessableEntity when rebooting"
+
+commit dc54013c130bdc8afc6bb931198d3d0bccb23ad2
+Author: Mauro S. M. Rodrigues <[e-mail]>
+Date:   Tue Jan 1 20:49:46 2013 -0500
+
+    Add unit test for too long metadata for server rebuild action
+    
+    This fixes bug: 1088686
+    Partially implements blueprint nova-v2-api-audit
+    
+    Change-Id: Ibf2b468cb95e0b1be9f47c0ff01ae55ce56d421d
+
+ .../api/openstack/compute/test_server_actions.py   |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit 551fad9a313278f8ce0e89c6e8922689fce3f910
+Merge: f35cd43 e12a6f6
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:31:18 2013 +0000
+
+    Merge "Ensure datetimes can be properly serialized."
+
+commit f35cd43612f7d69bddde5929d6355a12c11410d0
+Merge: 4c5e2ef ae3bb03
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:30:56 2013 +0000
+
+    Merge "Periodic update of DNS entries."
+
+commit 4c5e2ef5e87d07945893f7e38d00a0325870549b
+Merge: 5f9641c e313c7d
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:29:49 2013 +0000
+
+    Merge "Fix bug and remove update lock in db.instance_test_and_set()"
+
+commit 5f9641c979d8f9fe21440cbc7fa087b279bebd79
+Merge: 3a64246 abba557
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:29:25 2013 +0000
+
+    Merge "Add API sample tests to FixedIPs extension"
+
+commit 3a642467c8604e185d38ebaa8adc990cf415ff7f
+Merge: fc3a938 3b9f080
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 14:29:03 2013 +0000
+
+    Merge "Ignore double messages to associate the same ip"
+
+commit 2b619e271624eb84947a9a9596745d06efe81b08
+Author: Janis Gengeris <[e-mail]>
+Date:   Tue Jan 1 22:28:41 2013 +0200
+
+    Adds os-volume_attachments 'volume_id' validation
+    
+    If you POST to os-volume_attachments but give the name of the volume
+    instead of a UUID, it returns a 404 error; this is invalid HTTP.
+    404 means that the Request-URI has not been found. In fact, the
+    Request-URI has been found, but a child attribute has been incorrectly
+    specified. Some other error could be used.
+    
+    This fixes the problem by returning 'BadRequest' in place of 'NotFound'.
+    The 'volumeId' is checked to be a valid UUID string before moving
+    further.
+    
+    Fixes bug #1062494
+    
+    Change-Id: Icc5dbc7ac94051514709997457cafb16e870bea9
+
+ nova/api/openstack/compute/contrib/volumes.py      |    9 +++++++++
+ .../api/openstack/compute/contrib/test_volumes.py  |   21 ++++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+commit fc3a938804866b269ca864e177e80381f1ce7062
+Merge: 97d49f9 aee1253
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 2 05:04:11 2013 +0000
+
+    Merge "CRUD on flavor extra spec extension should be admin-only"
+
+commit 86008a67aade0d8830bf353395729fa55e54b8d8
+Author: Janis Gengeris <[e-mail]>
+Date:   Tue Jan 1 17:14:18 2013 +0200
+
+    Raise BadRequest when updating 'personality'
+    
+    Updating booted server instance through server PUT API call with
+    'personality' property set is not returning 'Bad Request', although the
+    property is not allowed to be updated once the instance is booted.
+    
+    This fixes the described problem.
+    
+    Fixes bug #1032546
+    
+    Change-Id: Ia086f5ea5176640a9916a3ba42c79d4d5944ce76
+
+ nova/api/openstack/compute/servers.py            |    4 ++++
+ nova/tests/api/openstack/compute/test_servers.py |   14 ++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+commit 97d49f951cd27fba8fd562c3b03d7504fe05b4a8
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Tue Jan 1 00:02:11 2013 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I1195c7e9345095da6f49e9cabf014a45cee31c65
+
+ nova/locale/nova.pot |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit fa650b4d8756cd5411c5861b396d16a9ebd310df
+Author: Gary Kotton <[e-mail]>
+Date:   Mon Dec 31 14:46:51 2012 +0000
+
+    Ensure that Quantum uses configured fixed IP
+    
+    Fixes bug 1094897
+    
+    The fix ensures that the fixed IP address specified by the user
+    is correctly passed to Quantum. That is, when the Quantum port
+    is created it is created with the specified IP address.
+    
+    Change-Id: I8191ac2497037e2592b0679962e4606cd24d7844
+
+ nova/network/quantumv2/api.py        |    3 ++-
+ nova/tests/network/test_quantumv2.py |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 1ab59c999e918e86c4bd0224db9ef98b585138a4
+Author: yugsuo <[e-mail]>
+Date:   Mon Dec 31 16:03:54 2012 +0800
+
+    Add conditions in compute APIRouter
+    
+    The Route of versions should add HTTP GET methods conditions, because
+    it only has a 'show' action, thus other methods will not match.
+    
+    Fixes bug 1088530
+    
+    Change-Id: Ib21381324cf7067015d0a6e36a0f0292eb902fe9
+
+ nova/api/openstack/compute/__init__.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit b8b8f2032483e5f3d6c09b7b6fddd07301805230
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Mon Dec 31 00:02:02 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I20319c16446e8ea1553202cbe54967e2505d2f41
+
+ nova/locale/nova.pot |  140 ++++++++++++++++++++++++--------------------------
+ 1 file changed, 66 insertions(+), 74 deletions(-)
+
+commit aee1253ce21fdb8bffac8c68e933910f1bf39dc7
+Author: Jay Pipes <[e-mail]>
+Date:   Fri Dec 28 06:25:19 2012 -0500
+
+    CRUD on flavor extra spec extension should be admin-only
+    
+    Changes the default policy.json file to make the flavor extra
+    spec create/update/delete operations admin-only, since the
+    flavormanage extension is admin-only.
+    
+    fixes: lp bug #1094142
+    
+    Change-Id: Ic464b17130e76565a7c475e59064e3e3e8861327
+
+ etc/nova/policy.json |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 2397c6b902174ef39bff5f9194a06f82c6746267
+Author: Michael Still <[e-mail]>
+Date:   Sat Dec 29 19:22:54 2012 +1100
+
+    Report failures to mount in localfs correctly.
+    
+    The wrong exception type was being thrown, which meant that the virt
+    disk api though the disk could be resized when it couldn't. I've
+    added two unit tests to cover regressions as well, but this code needs
+    more unit testing in general. Resolves bug 1094373.
+    
+    Change-Id: I9c974e138ff90e8b7a5a40f5b31dcdb25a59622d
+
+ nova/tests/virt/disk/test_api.py |   63 ++++++++++++++++++++++++++++++++++++++
+ nova/tests/virt/disk/test_nbd.py |   24 +++++++++++++--
+ nova/virt/disk/api.py            |   19 +++++++++---
+ nova/virt/disk/vfs/localfs.py    |    3 +-
+ 4 files changed, 101 insertions(+), 8 deletions(-)
+
+commit abba5574ca219ea3180edfa018ef36d98015394a
+Author: ivan-zhu <[e-mail]>
+Date:   Sat Dec 29 16:34:27 2012 +0800
+
+    Add API sample tests to FixedIPs extension
+    
+    Partially implements blueprint nova-api-samples
+    Bug 1091739
+    
+    Change-Id: Ie10fd85199ec10de29e99338c748f34cc04aeeb6
+
+ doc/api_samples/os-fixed-ips/fixedip-post-req.json |    3 +
+ doc/api_samples/os-fixed-ips/fixedip-post-req.xml  |    2 +
+ .../os-fixed-ips/fixedips-get-resp.json            |    8 ++
+ doc/api_samples/os-fixed-ips/fixedips-get-resp.xml |    7 ++
+ .../os-fixed-ips/fixedip-post-req.json.tpl         |    3 +
+ .../os-fixed-ips/fixedip-post-req.xml.tpl          |    2 +
+ .../os-fixed-ips/fixedips-get-resp.json.tpl        |    8 ++
+ .../os-fixed-ips/fixedips-get-resp.xml.tpl         |    7 ++
+ nova/tests/integrated/test_api_samples.py          |   86 +++++++++++++++++++-
+ 9 files changed, 125 insertions(+), 1 deletion(-)
+
+commit 4f4ef9f556a29dffcea40a2aa4b7e2e0146b898e
+Merge: ad11657 e865f12
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 29 00:39:53 2012 +0000
+
+    Merge "Fix stack trace on incorrect nova-manage args."
+
+commit ad1165788a79fce37d977e0e663989e19403a884
+Merge: 32eb83b e9e0379
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 28 23:28:36 2012 +0000
+
+    Merge "Make sure the loadables path is the absolute path"
+
+commit 6bf64e829267d46324a240fa421e5d55a8156bee
+Author: Devananda van der Veen <[e-mail]>
+Date:   Thu Dec 27 15:13:58 2012 -0800
+
+    baremetal power driver takes **kwargs
+    
+    Some baremetal power drivers may require different information passed to
+    them. This patch prepares the way by having the base class take only
+    **kwargs, and having the driver pass both 'instance' and 'node', instead
+    of just passing 'node'.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: Iff91024b1d019b0d07f2cbfe991748e618bfcb18
+
+ nova/virt/baremetal/base.py   |    2 +-
+ nova/virt/baremetal/driver.py |   16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit f1bb1a213b63df050e98dbdeb1e7fb5ea8f3e05c
+Author: Devananda van der Veen <[e-mail]>
+Date:   Fri Dec 21 20:15:38 2012 -0800
+
+    Implement IPMI sub-driver for baremetal compute
+    
+    This patch implements only the IPMI power manager for baremetal nova
+    compute. Documentation will come in a separate patch.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: I60ccfbf963d7bbf6f840e627396601b7bba80e7f
+
+ etc/nova/rootwrap.d/baremetal_compute_ipmi.filters |    9 +
+ nova/tests/baremetal/test_ipmi.py                  |  228 +++++++++++++++++
+ nova/virt/baremetal/ipmi.py                        |  257 ++++++++++++++++++++
+ 3 files changed, 494 insertions(+)
+
+commit 0279d846abd20904fa5a1d357fac6727005a2943
+Author: Devananda van der Veen <[e-mail]>
+Date:   Sat Dec 22 16:35:58 2012 -0800
+
+    Fix tests/baremetal/test_driver.py
+    
+    Unit tests for baremetal/driver.py were not functioning and were
+    falsely reporting success due to inheriting from the wrong class.
+    This lead to drift between the tests and the code over time.
+    I decided it was easier to re-implement tests/baremetal/test_driver.py
+    instead of trying to fix the drift. This gave me the chance to make
+    the test class easier to extend. Additional tests will be added
+    in the future, when I refactor driver.py:spawn().
+    
+    This patch also has some minor variable name changes for baremetal/driver.py.
+    
+    blueprint general-bare-metal-provisioning-framework.
+    
+    Change-Id: I36ba5ed340b722b9a6e8d02d6d57d3c8d53b1eef
+
+ nova/tests/baremetal/test_driver.py |  271 +++++++++++++++++------------------
+ nova/virt/baremetal/driver.py       |   88 ++++++------
+ nova/virt/baremetal/fake.py         |   37 ++++-
+ 3 files changed, 207 insertions(+), 189 deletions(-)
+
+commit 9ac65bde3a3d39389e356dbb79be1404c81cbd2e
+Author: Devananda van der Veen <[e-mail]>
+Date:   Fri Dec 21 11:09:48 2012 -0800
+
+    Move baremetal options to [BAREMETAL] OptGroup
+    
+    Move all the baremetal options into a new [BAREMETAL] OptGroup,
+    except for 'baremetal_db_backend', which breaks LazyPluggable if moved.
+    
+    blueprint general-bare-metal-provisioning-framework
+    
+    Change-Id: I06f53dcf10b9bbd3fd7cc0725cc6076af3d74d19
+
+ nova/tests/baremetal/db/base.py              |    9 ++++----
+ nova/tests/baremetal/test_driver.py          |   19 ++++++++++------
+ nova/tests/baremetal/test_volume_driver.py   |    2 +-
+ nova/virt/baremetal/db/api.py                |    7 ++++--
+ nova/virt/baremetal/db/sqlalchemy/session.py |   11 +++++++---
+ nova/virt/baremetal/driver.py                |   30 +++++++++++++++-----------
+ nova/virt/baremetal/volume_driver.py         |   16 ++++++++------
+ 7 files changed, 58 insertions(+), 36 deletions(-)
+
+commit f21a3abd61c85531f68d0f9847640e8912434f8a
+Author: Tiago Mello <[e-mail]>
+Date:   Fri Dec 28 16:45:08 2012 -0200
+
+    Adds test for HTTPUnprocessableEntity when rebooting
+    
+    Implements a test for 'HTTPUnprocessableEntity' error when rebooting
+    an instance.
+    
+    Fixes Bug 1088672.
+    
+    Change-Id: I7a658f4f09c871a43d20fd6fa60d4ad69784ce7d
+
+ .../api/openstack/compute/test_server_actions.py   |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit e9e037920d5140ce60348a54b070bba48da9cef7
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Fri Dec 28 11:42:17 2012 -0800
+
+    Make sure the loadables path is the absolute path
+    
+    the __path__ of a module can be a relative path in some install
+    scenarios (i.e. setup.py develop on osx), so normalize it to an
+    absolute path since we expect an absolute path in the tests.
+    
+    Change-Id: Id40889229f5735a292899dfee2c8595fdbf0dfff
+
+ nova/loadables.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e313c7dda326d8e6cb5b0e2ac77f53becc037a16
+Author: Boris Pavlovic <[e-mail]>
+Date:   Sun Dec 23 07:03:55 2012 +0400
+
+    Fix bug and remove update lock in db.instance_test_and_set()
+    
+    Remove session from arguments.
+    
+    Instance update works through one query, so we don't need to use update lock.
+    
+    Add tests for instance_test_and_set().
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: I143877f427f5eba4a7c7aa985bb70c79a9513822
+
+ nova/db/sqlalchemy/api.py |   42 ++++++++++++++++++++++--------------------
+ nova/tests/test_db_api.py |   21 +++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 20 deletions(-)
+
+commit ae3bb03699a4e27b8aafe31837180ca168efab49
+Author: Édouard Thuleau <[e-mail]>
+Date:   Tue Dec 4 17:06:23 2012 +0100
+
+    Periodic update of DNS entries.
+    
+    The new DNS mechanism to resolve instance names on private network with
+    multi hosted mode doesn't scale.
+    This patch add the possibility to update the DNS entries periodically on
+    each network host in addition to fanout cast each time the DNS entries
+    need to be updated.
+    
+    DocImpact: new config options
+    Fixes LP bug #1086026
+    
+    Change-Id: I59094a29c9f5010f5e55a6f11160263337b058b2
+
+ etc/nova/nova.conf.sample |    9 +++++++++
+ nova/network/manager.py   |   13 +++++++++++++
+ 2 files changed, 22 insertions(+)
+
+commit 2a94a257f95acf190091337600c1af5ae3c92142
+Author: Boris Pavlovic <[e-mail]>
+Date:   Wed Dec 26 20:33:22 2012 +0400
+
+    Fix error in test_get_all_by_multiple_options_at_once()
+    
+    We should not use 0 as id. It will conflict with db-unique-keys.
+    
+    Since soft_delete() stores `id` value in `deleted` column, and
+    checking whether entry is deleted softly is made through comparison of
+    `id` and `deleted` column values, created entry will look like already
+    deleted softly.
+    
+    blueprint db-unique-keys
+    
+    Change-Id: Icb7a4880886301a3cc72c6ea0e455b867952812e
+
+ nova/tests/compute/test_compute.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 32eb83be79ff19e06b5057dce32052b98368ce40
+Merge: ab13543 b883109
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 28 11:25:11 2012 +0000
+
+    Merge "Remove lxc attaching/detaching of volumes"
+
+commit 4d16f2d037acebc986d32a8f2437824dab071fc3
+Author: Boris Pavlovic <[e-mail]>
+Date:   Fri Dec 28 15:21:08 2012 +0400
+
+    Remove session.flush() and session.query() monkey patching
+    
+    Use custom Session class to avoid monkey patching of SqlAlchemy
+    Session instance.
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: I7d40c20e585782403556f3587141805c197bfa64
+
+ nova/db/sqlalchemy/session.py                |   20 ++++++++++++--------
+ nova/virt/baremetal/db/sqlalchemy/session.py |    1 -
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+commit ab135433464865f6612f4b543157d62c05d2fb13
+Merge: bde5420 b4f15f1
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 28 04:30:54 2012 +0000
+
+    Merge "Adds test for 'itemNotFound' errors in 'Delete server'"
+
+commit 352eac12e3126089eef80fbe16a2b0874662c12f
+Author: Joe Gordon <[e-mail]>
+Date:   Thu Dec 27 17:57:12 2012 -0800
+
+    Update nova-cert man page
+    
+    nova-cert is:
+    * Used to generate certificates for euca-bundle-image.
+    * Only needed for EC2 API.
+    
+    Change-Id: If941e964d152a9af5980a2589bc0f0f8ee4842b7
+
+ doc/source/man/nova-cert.rst |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cb5c61f66be54f5437ca78d62c51ed64aacc383e
+Author: Chris Behrens <[e-mail]>
+Date:   Thu Dec 27 22:20:19 2012 +0000
+
+    Allow new XML API sample file generation
+    
+    When GENERATE_SAMPLES is used, it's supposed to generate the docs for
+    you.  However, if there's no pre-existing XML doc sample, it fails due
+    to bad handling of this case.
+    
+    Fixes bug 1094141
+    
+    Change-Id: I186d6ce78886e37a3fdd3268154872c99072fdca
+
+ nova/tests/integrated/test_api_samples.py |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit bde5420564e9abfc656b48af1798eabd65b30234
+Merge: b3a2582 2655ac9
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 27 21:47:52 2012 +0000
+
+    Merge "Add API samples tests for the coverage extension."
+
+commit 9e9ffb03cfea0e33b39639c74d1a75fc1cea8ee7
+Author: Joe Gordon <[e-mail]>
+Date:   Wed Dec 26 23:42:14 2012 +0000
+
+    Remove unused imports
+    
+    And one unused variable
+    
+    Change-Id: I81edaf7ddedd7723c2601b30951ca82bd2cd5256
+
+ nova/api/ec2/__init__.py                    |    2 +-
+ nova/db/sqlalchemy/api.py                   |    1 -
+ nova/network/quantumv2/__init__.py          |    1 -
+ nova/tests/baremetal/test_volume_driver.py  |    3 ---
+ nova/tests/test_imagecache.py               |    1 -
+ nova/tests/test_virt_drivers.py             |    1 -
+ nova/virt/baremetal/db/sqlalchemy/models.py |    2 +-
+ nova/virt/baremetal/volume_driver.py        |    1 -
+ 8 files changed, 2 insertions(+), 10 deletions(-)
+
+commit b3a258297a9fe631d29ae1b4660cbd5b85bdc008
+Merge: 758cba0 f393a51
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 27 06:00:06 2012 +0000
+
+    Merge "Ensure we add a new line when appending to rc.local"
+
+commit 41b17b61e27e2f69420d2fd526f9236b21cf4a0a
+Author: Joe Gordon <[e-mail]>
+Date:   Wed Dec 26 16:04:34 2012 -0800
+
+    spelling in test_migrations
+    
+    Change-Id: If6da7af1b6da9093610b7ce982acb048ed2e0ac0
+
+ nova/tests/test_migrations.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 758cba09330fd51d91d69e2d7970085d5cb997ea
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Thu Dec 27 00:02:03 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: Ida94b82fbab1655191e493069a3c6ee9664100c7
+
+ nova/locale/nova.pot |  108 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 54 insertions(+), 54 deletions(-)
+
+commit a1c90a3b3dca567c0075b24901b85a2d41265305
+Author: Kravchenko Pavel <[e-mail]>
+Date:   Tue Dec 25 17:50:37 2012 +0200
+
+    Check for image_meta in libvirt.driver.spawn
+    
+    This adds check that image_meta exists in libvirt driver
+    spawn method. In case it doesn't the image shouldn't be
+    created.
+    
+    part of libvirt driver support for blueprint rebuild-for-ha
+    
+    DocImpact
+    
+    Change-Id: I097c7cbfde96bcb21b4f06af4e5bac00440849c2
+    Co-authored-by: Oshrit Feder <[e-mail]>
+
+ nova/tests/test_libvirt.py  |   32 ++++++++++++++++++++++++++++++++
+ nova/virt/libvirt/driver.py |    4 +++-
+ 2 files changed, 35 insertions(+), 1 deletion(-)
+
+commit b4f15f15a10f93278e869f6ab7e776e7450000bb
+Author: Tiago Mello <[e-mail]>
+Date:   Wed Dec 26 21:03:47 2012 -0200
+
+    Adds test for 'itemNotFound' errors in 'Delete server'
+    
+    Implements a test for 'itemNotFound' errors when deleting
+    a server.
+    
+    Fixes Bug 1089368
+    
+    Change-Id: I201486bb5775f856048ac1f5e4f3c852fb38e091
+
+ nova/tests/api/openstack/compute/test_servers.py |   13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+commit fa16f2b68603be04cb5f4e915625181ac6c119eb
+Author: Jay Pipes <[e-mail]>
+Date:   Wed Dec 26 14:53:53 2012 -0500
+
+    Remove improper NotFound except block in list servers
+    
+    Added a couple tests to verify that NotFound was actually
+    never raised when no results are returned from list servers
+    or list servers details, and then removed the except blocks
+    from the controller.
+    
+    Change-Id: I36856066b9e4c4e3f7b85ddf8facb35204034838
+    fixes: lp bug #1089385
+
+ nova/api/openstack/compute/servers.py            |    6 ------
+ nova/tests/api/openstack/compute/test_servers.py |   24 ++++++++++++++++++++++
+ 2 files changed, 24 insertions(+), 6 deletions(-)
+
+commit 18a4c7ab9d80921f0b2fba701f2f4d0e42c0b702
+Author: Joe Gordon <[e-mail]>
+Date:   Wed Dec 26 11:20:26 2012 -0800
+
+    Spelling: Compatability=>Compatibility
+    
+    Change-Id: Idc6f99d8021bb942b3a82f530c6a4ff2c4d72f8f
+
+ nova/db/sqlalchemy/models.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 094d6b294bec70501f9bbdce3df63c8a328e06bf
+Merge: 5f697f6 5f08221
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Tue Dec 25 22:10:44 2012 +0000
+
+    Merge "Imported Translations from Transifex"
+
+commit 5f08221f4d0edc921f1dbe563fbd09c8a7b4763b
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Tue Dec 25 00:02:07 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I8beb8ef0800c7ba4e24a96ce3b6b9f749dc00a8b
+
+ nova/locale/nova.pot |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f393a513d7894ddb800e4dfc87da896600fb7421
+Author: Davanum Srinivas <[e-mail]>
+Date:   Wed Dec 12 21:11:06 2012 -0500
+
+    Ensure we add a new line when appending to rc.local
+    
+    When we add content to rc.local, if the file already
+    exists then we need to make sure we add the content
+    after a new line explicitly
+    
+    Fixes LP #1089668
+    
+    Change-Id: I35be1496703b302f732363fa76ce832505eed599
+
+ nova/tests/test_virt_disk.py |   22 ++++++++++++++++++++++
+ nova/virt/disk/api.py        |    5 ++++-
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+commit 1b7cea76abde83e9f937e33b56d54fa885f2a0b9
+Author: Michael Still <[e-mail]>
+Date:   Mon Dec 24 09:51:19 2012 +1100
+
+    Verify the disk file exists before running qemu-img on it.
+    
+    Should resolve bug 955788, although it is a little hard to tell
+    because the bug is so old.
+    
+    Change-Id: Ic0c47f4b6181f56a98cf58d4ebe2cc926d06d524
+
+ nova/tests/test_image_utils.py   |   20 ++++++++++++++++++++
+ nova/tests/test_libvirt.py       |   11 +++++++++++
+ nova/tests/test_libvirt_utils.py |    4 ++++
+ nova/virt/images.py              |    3 +++
+ 4 files changed, 38 insertions(+)
+
+commit b8831091a8d097bb55a0e65c3af254a8bfa88811
+Author: Chuck Short <[e-mail]>
+Date:   Tue Dec 11 10:02:28 2012 -0600
+
+    Remove lxc attaching/detaching of volumes
+    
+    Remove lxc attach and detach of volumes since this
+    will be handled by libvirt in upcoming versions of
+    libvirt.
+    
+    This is expected to be in libvirt 1.0.1 or 1.0.2.
+    This resolves (LP: #1067638) and (LP: #1009701)
+    
+    This removes a non-functional feature of the
+    lxc driver with functionalilty that is coming
+    with newer versions of libvirt.
+    
+    Change-Id: Iaf4bc2769632ba2e7dcfc67892dded7b4dfbb3ae
+    Signed-off-by: Chuck Short <[e-mail]>
+
+ nova/tests/test_libvirt.py  |   16 ------
+ nova/virt/libvirt/driver.py |  114 ++++++++-----------------------------------
+ 2 files changed, 21 insertions(+), 109 deletions(-)
+
+commit 5f697f64e5c445ba1b62c82d9167fd6b9c7256d2
+Author: unicell <[e-mail]>
+Date:   Mon Dec 24 18:08:56 2012 +0800
+
+    Teardown container rootfs in host namespace for lxc
+    
+    Unlike other hypervisor to directly using image for VM, rootfs need to
+    be mounted in setup_container() for lxc before launching the domain.
+    
+    However, this leads to several problems:
+    
+    * previously spawned container polluted later spawned container, which
+      in turn causing lvm device refused to be removed, as bug descirbes
+    * container rootfs not mounted after nova stop/start sequence
+    
+    This commit addresses above two issues.
+    
+    Fixes bug 1091639
+    
+    Change-Id: I718baa6e46cf07a5458a5b80d42139dd353ae51c
+
+ nova/tests/test_libvirt.py  |    4 ++--
+ nova/tests/test_virt.py     |   10 +++++-----
+ nova/virt/disk/api.py       |    6 +++---
+ nova/virt/libvirt/driver.py |   46 ++++++++++++++++++++++++-------------------
+ 4 files changed, 36 insertions(+), 30 deletions(-)
+
+commit 1f2144893df2fb79238ea22d84b9b5ee47f15ac0
+Author: MotoKen <[e-mail]>
+Date:   Sat Dec 22 13:58:53 2012 +0800
+
+    Fix cloudpipe instances query.
+    
+    Filter out deleted instances in _get_all_cloudpipes.
+    
+    Fix bug 1092786.
+    
+    Change-Id: Ia714a1989f78728f8b3597d6f837b622427ac5b1
+
+ nova/api/openstack/compute/contrib/cloudpipe.py    |    4 +++-
+ .../openstack/compute/contrib/test_cloudpipe.py    |    4 ++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit e12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc
+Author: zhiyanliu <[e-mail]>
+Date:   Mon Dec 24 11:22:45 2012 +0800
+
+    Ensure datetimes can be properly serialized.
+    
+    The nova-network manager was returning db models from methods invoked
+    via rpc.call(). These db models include non-primitive types that can
+    not be properly serialized (namely datetime objects). Use
+    to_primitive() to ensure that the data gets serialized properly.
+    
+    Fix bug: #1089430
+    
+    Change-Id: I0519e88444b8fcc3af5e43170ea07dd966ccef05
+    Signed-off-by: zhiyanliu <[e-mail]>
+
+ nova/network/manager.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a52af4aee14447bed1b9acf8dbd8b25f4e5c7100
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Mon Dec 24 00:02:43 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I17d73e4475788329a4c49a4c0d0f5ba713dc194b
+
+ nova/locale/nova.pot |  572 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 290 insertions(+), 282 deletions(-)
+
+commit c3229871853ad98cb99eba5036aef0c6a5d51275
+Author: Boris Pavlovic <[e-mail]>
+Date:   Mon Dec 17 13:48:28 2012 +0400
+
+    Database metadata performance optimizations
+    
+    In instance_metadata_update():
+    Fix bug: there was no transaction in method.
+    Performance optimization:
+    let N is number of metadata items.
+    Was:
+    *) 1 request to get all (M) existing in DB entries
+    *) (M-L) requests to get all entries that don't exist in metadata
+    *) (M-L) requests to soft delete all entries
+    *) N request to try to get get metadata by key from DB
+    *) N request to save
+    Now:
+    *) 1 requst to soft delete entries that exist in DB and don't exist in metadata
+    *) 1 requst to get all(L) entries that exist in metadata and DB
+    *) L request to update all L entries that exist in DB and metadata
+    *) N-L request to create new entries.
+    result 1 + 2*(M - L + N) -> 2 + N
+    
+    In instance_system_metadata_update():
+    Fix bug: there was no transaction in method.
+    Same performance situation.
+    
+    In aggregate_metadata_get:
+    Fix bug: there was no transaction at all in method.
+    Performance optimization:
+    Let N is number of metadata items.
+    All request have check that Aggregate exist so each time there are 2 request.
+    Was:
+    *) 1 + 1 request to get all (M) entries that exist in DB
+    *) (1 + 1)*(M-L) request to get each entry that exist in DB and doesn't exist in metadata
+    *) (1 + 1)*(M-L) to soft delete entries
+    *) N * (1 + 1) try to get each item that exist in metadata
+    *) N * (1 + 1) update or save
+    Now:
+    *) 1 request to get query object if exist Aggregate
+    *) 1 request to soft delete or entries that exist in DB and doesn't exit in metadata
+    *) 1 request to get elements that exist in DB and in metadata
+    *) L request to update existing metadata
+    *) N - L request to create new metadata
+    2 + 4*(M - L) + 4*N -> 3 + N
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: Ie14f89c567c971dece34cc3659ad3a48cf82acf6
+
+ nova/db/sqlalchemy/api.py |  156 +++++++++++++++++++++++----------------------
+ 1 file changed, 80 insertions(+), 76 deletions(-)
+
+commit 0fd155ba84e3ba451e5361fa732fc12aebf98ff5
+Author: Boris Pavlovic <[e-mail]>
+Date:   Mon Dec 17 13:49:18 2012 +0400
+
+    db.network_delete_safe() method performance optimization
+    
+    Using query.count() instead of query.all() to count FixedIp.
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: Ibe88765b52518112f9f16727082fd6db97ba9411
+
+ nova/db/sqlalchemy/api.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5425824271b36c3b9822c76af47c27fc3f338df5
+Author: Boris Pavlovic <[e-mail]>
+Date:   Mon Dec 17 13:45:41 2012 +0400
+
+    db.security_group_rule_destroy() method performance optimization
+    
+    1 db requst instead of 2
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: I094632c422aa9d10278c1b85ec9f4d51a54541b1
+
+ nova/db/sqlalchemy/api.py |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 1836ede3c57ecb255fe9dcf0f2ea3c880af3d201
+Merge: 72d69a6 edcd55d
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 22:41:06 2012 +0000
+
+    Merge "Import missing exception"
+
+commit 72d69a6c690f82655d735f7e3cb76aaaac61077c
+Merge: 59c6743 4acafc7
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 22:40:44 2012 +0000
+
+    Merge "Removed unused imports."
+
+commit 59c674363b41cfbf4d2e850e51a822ef00b41e22
+Merge: a0b8d97 0323a74
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 20:52:06 2012 +0000
+
+    Merge "allow for the ability to run partial coverage"
+
+commit a0b8d9757472cc900746c891c20cd7290b55eccb
+Merge: 9846619 0cecdf4
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 20:51:42 2012 +0000
+
+    Merge "Reliably include OS type in ephemeral filenames."
+
+commit 984661993c11b210c879d16134b58bc6fe516b19
+Merge: acb651e c82be9f
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 20:36:31 2012 +0000
+
+    Merge "libvirt: Skip intermediate base files with qcow2."
+
+commit acb651edb360e0a6add3d16376a2071602c2b38c
+Merge: 8a1843a bcfb4d4
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 20:36:08 2012 +0000
+
+    Merge "Refactor xvp console"
+
+commit edcd55da491cb258414541562453b7702d7e1fd1
+Author: Chuck Short <[e-mail]>
+Date:   Sat Dec 22 08:31:59 2012 -0600
+
+    Import missing exception
+    
+    Import InvalidUnicodeParameter from nova.exceptions,
+    it wasnt imported according to pyflakes.
+    
+    Change-Id: If61b691281c59e840be3c54f9394499fafa699f0
+    Signed-off-by: Chuck Short <[e-mail]>
+
+ nova/db/sqlalchemy/session.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 8a1843a91a98cf5b945ed97adb82c2f820438949
+Merge: 54c9537 c7becb1
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sat Dec 22 04:16:16 2012 +0000
+
+    Merge "Imported Translations from Transifex"
+
+commit 54c9537c6021c2bacabb3bb857597cc9d949fa43
+Merge: e963f04 d84ab04
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 04:15:53 2012 +0000
+
+    Merge "fixing the typo of the error message from nbd"
+
+commit e963f04d5baaf9c8408afb4f804e44d414e3dff9
+Merge: 4cf4287 2c1653a
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 01:17:31 2012 +0000
+
+    Merge "Database reservations methods performance optimization"
+
+commit 4cf4287ecb61c4cec6a89621c7bb0cecb34a1e18
+Merge: 22cbf66 6d38a61
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 01:06:45 2012 +0000
+
+    Merge "Using query.soft_delete() method insead of soft deleting by hand"
+
+commit 22cbf66f31acd2f26b46045b81c3cc13aca5e7d1
+Merge: da9399c eda8516
+Author: Jenkins <[e-mail]>
+Date:   Sat Dec 22 01:06:18 2012 +0000
+
+    Merge "Create and use subclass of sqlalchemy Query with soft_delete() method"
+
+commit 3b9f08072abe9f92d292e9fa5998c62a766b01f3
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Fri Dec 21 16:04:16 2012 -0800
+
+    Ignore double messages to associate the same ip
+    
+    Associating an ip removes the old association and adds a new one.
+    If we are already associated to the target ip, then we can avoid
+    sending extra messages and making db calls. The current possibility
+    of a double send contributes to bug 1092762.
+    
+    Change-Id: I5a40177fcd05b150f39e3144c1d521bd979b358b
+
+ nova/network/manager.py            |    3 +++
+ nova/tests/network/test_manager.py |    8 ++++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit c7becb1e1b97bfca1f7296ddf8d1ce2b06b6d7ab
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Sat Dec 22 00:02:38 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: I7e5ee39a83d33e5df6ba252b02ace4b23b794df8
+
+ nova/locale/nova.pot |  142 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 75 insertions(+), 67 deletions(-)
+
+commit 2c1653a16302a92f385940c1c3bf0562c3976d70
+Author: Boris Pavlovic <[e-mail]>
+Date:   Mon Dec 17 13:44:02 2012 +0400
+
+    Database reservations methods performance optimization
+    
+    In reservation_commit():
+    Was:
+    *) 1 request to get all (N) reservations,
+    *) 1 requrest to get all (M) usages,
+    *) N query to update all reservations
+    *) M query to update all usages
+    Now there is only 1 db request to soft delete N reservations.
+    result: 1 + 1 + N + M -> 1 + 1 + 1 + M
+    remove usages save loop, because it will be automaticly make sqlalchemy
+    session in transaction.__exit__() hook.
+    
+    In reservation_rollback():
+    Same as in reservation_commit()
+    
+    In quota_destroy_all_by_project():
+    Was:
+    *) 1 request to get all (N) Quotas
+    *) N request to soft delete all Quotas
+    *) 1 request to get all (M) QuotaUsage
+    *) M request to soft delete all QuotaUsages
+    *) 1 request to get all (K) Reservations
+    *) K request to soft delete Reservations
+    Now there are only 3 requests.
+    result: 3 + N + K -> 3
+    
+    In reservation_expire():
+    Was:
+    *) 1 request to get all (N) reservations
+    *) N request to get each usage for reservation
+    *) N request to update each usage
+    *) N request to soft delete each reservations
+    Now:
+    *) 1 request to get all (N) reservations with usages
+    *) N request to save each reservation
+    *) 1 request to soft delete N reservations
+    result: 1 + N + N + N -> 2 + N
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: If6ddbe552b8f562cf6e8649eab96a375c4875487
+
+ nova/db/sqlalchemy/api.py |   78 +++++++++++++++++----------------------------
+ 1 file changed, 30 insertions(+), 48 deletions(-)
+
+commit 6d38a6145e4ded084d72714549d7f9b613c6936c
+Author: Boris Pavlovic <[e-mail]>
+Date:   Wed Dec 19 15:06:17 2012 +0400
+
+    Using query.soft_delete() method insead of soft deleting by hand
+    
+    Change all occurences of:
+    	query.update({
+    		deleted:True,
+    		'deleted_at': timeutils.utcnow(),
+                    'updated_at': literal_column('updated_at')})
+    to:
+    	query.soft_delete()
+    
+    Make instance_type_access_remove() with 2 db requests instead of 3
+    
+    Make agent_build_destroy() with 1 db request instead of 2
+    
+    Fix bug in aggregate_delete() added missing transaction
+    make it with 2 db requests instead of 3
+    
+    Make aggregate_metadata_delete() with 1 db request instead of 2
+    
+    Make aggregate_host_delete() with 1 db request instead of 2
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: I23a85c48474126743c5d02f642baf6047358aae8
+
+ nova/db/sqlalchemy/api.py |  157 +++++++++++++++------------------------------
+ 1 file changed, 51 insertions(+), 106 deletions(-)
+
+commit eda851676d14956c03616e5b2cb856acdc8edbef
+Author: Boris Pavlovic <[e-mail]>
+Date:   Wed Dec 19 14:21:01 2012 +0400
+
+    Create and use subclass of sqlalchemy Query with soft_delete() method
+    
+    Create subclass of sqlalchemy.orm.query.Query that has soft_delete() method
+    
+    Change get_maker() method to create Session with our Query class
+    
+    The main idea of soft_delete() method is to get good performance with clean
+    syntax: Let we have already `query` instance.
+    
+    Clean syntax example:
+    If we want to make soft delete for each entry that correspond to query:
+    we should write:
+            query.soft_delete()
+    instead of:
+            query.update({
+                    deleted:True,
+                    'deleted_at': timeutils.utcnow(),
+                    'updated_at': literal_column('updated_at')})
+    
+    Performance examples:
+    If we make:
+            query.soft_delete()
+    we will make only one request to soft delete corresponding entries.
+    But if we make:
+            for model_ref in query.all():
+                    model_ref.delete(session=session)
+    it will produce >= N + 1 queries.
+    
+    In almost all situation it is better to use query.soft_delete() than
+    model.delete() method, because in second approach we should make
+    2 request (get model_ref and then soft delete it).
+    
+    In future patch model.delete() will be at least renamed to model.soft_delete().
+    Probably it should be removed at all, to avoid situation in code with N+1
+    requests for soft deletion.
+    
+    blueprint db-session-cleanup
+    
+    Change-Id: I6059982b83648133b6d8becf94ad8980b056c6ff
+
+ nova/db/sqlalchemy/session.py |   75 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 74 insertions(+), 1 deletion(-)
+
+commit da9399cf26d15b73d35465ccd8b8f3badb1eb1e3
+Merge: 99a4f53 40f3724
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 19:01:30 2012 +0000
+
+    Merge "Make libvirt driver default to virtio for KVM/QEMU NICs"
+
+commit 99a4f531371f4a7c76a4f9575913926d87ed841a
+Merge: a752448 f57c727
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 18:29:15 2012 +0000
+
+    Merge "Fix "image_meta" data passed in libvirt test case"
+
+commit a75244800683fe624ed9ada17354ed00cb3c3a11
+Merge: 3f1a70b e84dc26
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 18:26:43 2012 +0000
+
+    Merge "Refactor libvirt VIF classes to reduce duplicate code"
+
+commit 484a7a9124c3877b045e40788e9cf59c5069458a
+Author: Sean M. Collins <[e-mail]>
+Date:   Wed Dec 19 13:59:04 2012 -0500
+
+    Remove inconsistent usage of variable from hyperv.
+    
+    Portions of the code use instance_name, while others use
+    instance['name']. In some cases, within the same function. See
+    lines 123, 153, and 156.
+    
+    Change-Id: I69763e62a1db79b4c5a4468104fd26ad9b3aad5a
+
+ nova/virt/hyperv/vmops.py |   49 ++++++++++++++++++++-------------------------
+ 1 file changed, 22 insertions(+), 27 deletions(-)
+
+commit 9f01b105fa3f240d9cae88a5b305b4cc312e95f4
+Author: Brian Elliott <[e-mail]>
+Date:   Wed Dec 19 22:57:26 2012 +0000
+
+    Log last compute error when rescheduling.
+    
+    When a scheduling attempt is re-tried, log the last exception from
+    the compute side.  The goal is to provide simpler access to debugging
+    information about why a build/resize is having issues.
+    
+    Change-Id: Ic31852dcbbf1cea9034a4b8eb1c7d20178c3229d
+
+ nova/compute/manager.py            |   11 ++++++++---
+ nova/scheduler/filter_scheduler.py |   21 ++++++++++++++++++++-
+ nova/tests/compute/test_compute.py |   25 ++++++++++++++++++-------
+ 3 files changed, 46 insertions(+), 11 deletions(-)
+
+commit 4acafc7ff3e1306f3400853ec79762f45ef0ae5c
+Author: Chuck Short <[e-mail]>
+Date:   Fri Dec 21 08:39:32 2012 -0600
+
+    Removed unused imports.
+    
+    Removed a bunch of unused imports based on pyflakes.
+    
+    Change-Id: I00952371200cb4531ddf163447433da756582a21
+    Signed-off-by: Chuck Short <[e-mail]>
+
+ .../openstack/compute/contrib/cloudpipe_update.py  |    2 --
+ nova/api/openstack/compute/contrib/coverage_ext.py |    4 ----
+ .../openstack/compute/contrib/floating_ips_bulk.py |    3 ---
+ nova/api/openstack/compute/contrib/fping.py        |    1 -
+ nova/api/openstack/compute/contrib/networks.py     |    1 -
+ .../compute/contrib/networks_associate.py          |    2 --
+ nova/compute/manager.py                            |    1 -
+ nova/compute/resource_tracker.py                   |    1 -
+ nova/db/sqlalchemy/models.py                       |    1 -
+ nova/network/api.py                                |    1 -
+ nova/scheduler/driver.py                           |    2 --
+ nova/scheduler/filters/compute_filter.py           |    1 -
+ nova/test.py                                       |    2 --
+ .../compute/contrib/test_cloudpipe_update.py       |    1 -
+ .../openstack/compute/contrib/test_coverage_ext.py |    2 --
+ .../openstack/compute/contrib/test_fixed_ips.py    |    1 -
+ .../compute/contrib/test_floating_ip_bulk.py       |    2 --
+ .../api/openstack/compute/contrib/test_networks.py |    3 ---
+ .../api/openstack/compute/contrib/test_volumes.py  |    1 -
+ nova/tests/baremetal/db/base.py                    |    2 --
+ nova/tests/baremetal/test_driver.py                |    3 ---
+ nova/tests/compute/test_multiple_nodes.py          |    2 --
+ nova/tests/compute/test_resource_tracker.py        |    3 ---
+ nova/tests/compute/test_stats.py                   |    2 --
+ nova/tests/conductor/test_conductor.py             |    1 -
+ nova/tests/consoleauth/test_consoleauth.py         |    2 --
+ nova/tests/fake_network.py                         |    1 -
+ nova/tests/hyperv/mockproxy.py                     |    1 -
+ nova/tests/network/test_linux_net.py               |    1 -
+ nova/tests/scheduler/test_host_filters.py          |    1 -
+ nova/tests/scheduler/test_host_manager.py          |    2 --
+ nova/tests/scheduler/test_scheduler.py             |    1 -
+ nova/tests/servicegroup/test_db_servicegroup.py    |    1 -
+ nova/tests/test_imagebackend.py                    |    1 -
+ nova/tests/test_libvirt.py                         |    1 -
+ nova/tests/test_libvirt_config.py                  |    1 -
+ nova/tests/test_misc.py                            |    5 -----
+ nova/tests/test_utils.py                           |    2 --
+ nova/tests/test_versions.py                        |    1 -
+ nova/tests/test_virt.py                            |    4 ----
+ nova/tests/test_virt_disk.py                       |    1 -
+ nova/tests/test_virt_disk_vfs_localfs.py           |    2 --
+ nova/tests/test_virt_drivers.py                    |    3 ---
+ nova/tests/virt/disk/test_loop.py                  |    5 -----
+ nova/tests/virt/disk/test_nbd.py                   |    3 ---
+ nova/utils.py                                      |    3 ---
+ nova/virt/baremetal/db/sqlalchemy/api.py           |    7 -------
+ .../sqlalchemy/migrate_repo/versions/001_init.py   |    5 ++---
+ nova/virt/baremetal/db/sqlalchemy/models.py        |    7 ++-----
+ nova/virt/libvirt/utils.py                         |    1 -
+ nova/virt/powervm/blockdev.py                      |    1 -
+ nova/virt/powervm/driver.py                        |    5 -----
+ nova/virt/xenapi/driver.py                         |    1 -
+ nova/virt/xenapi/host.py                           |    1 -
+ nova/virt/xenapi/pool.py                           |    1 -
+ 55 files changed, 4 insertions(+), 112 deletions(-)
+
+commit 3f1a70bdb1b2a7df7147f09e2b0b09dd1b49f3be
+Merge: a359b64 a8a6e2e
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 10:43:35 2012 +0000
+
+    Merge "Makes sure to call crypto scripts with abspath"
+
+commit 40f3724bec5cc9883af7597af6c33c480b7d3c97
+Author: Daniel P. Berrange <[e-mail]>
+Date:   Mon Dec 17 15:04:18 2012 +0000
+
+    Make libvirt driver default to virtio for KVM/QEMU NICs
+    
+    Currently users of KVM/QEMU must set libvirt_use_virtio_for_bridges
+    to true to get a virtio based NIC, instead of the awful rtl8139
+    that QEMU defaults to.
+    
+    Switch libvirt_use_virtio_for_bridges to default to enabled, but
+    ensure it only takes effect if libvirt_type is 'kvm' or 'qemu'.
+    
+    Although it is possible that some guest OS do not support virtio
+    drivers, currently Nova hardcodes use of 'virtio' for disks, so
+    this change doesn't make the current guest OS support situation
+    worse.
+    
+    Obviously in the future, both NIC & disk models will have to be
+    made fully configurable
+    
+    Change-Id: I7c0d306921f554ac2d06b5bdb1f9017ab7f9c643
+    Signed-off-by: Daniel P. Berrange <[e-mail]>
+
+ nova/tests/test_libvirt_vif.py |   76 ++++++++++++++++++++++++++++++++++++++++
+ nova/virt/libvirt/vif.py       |   11 ++++--
+ 2 files changed, 84 insertions(+), 3 deletions(-)
+
+commit e84dc2603532f4577bd42846191a530f3abd2e48
+Author: Daniel P. Berrange <[e-mail]>
+Date:   Tue Dec 18 23:09:59 2012 +0000
+
+    Refactor libvirt VIF classes to reduce duplicate code
+    
+    Irrespective of the VIF driver used, some config parameters are
+    always identical (mac addr, NIC model). Move creation of the
+    vconfig.LibvirtConfigGuestInterface instance into a base class,
+    so VIF driver impls only need to provide their custom data.
+    
+    Change-Id: I7c9d5357c8ceff6d5eb2c982a7420bc93a7266bf
+    Signed-off-by: Daniel P. Berrange <[e-mail]>
+
+ nova/virt/libvirt/vif.py |   56 +++++++++++++++++++++++++++++-----------------
+ 1 file changed, 35 insertions(+), 21 deletions(-)
+
+commit a8a6e2e82e4f108badaad599570848c5e10ae241
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Thu Dec 20 21:20:58 2012 -0800
+
+    Makes sure to call crypto scripts with abspath
+    
+    In some cases __file__ can return a local path instead of an
+    absolute path. For example when you are running with run_tests.sh
+    from a checkout that has been setup.py developed on os x. Make
+    sure that we convert it to an absolute path in case it is relative.
+    
+    Change-Id: Ie18be6039db56601de18ce4ad48791b4abf118fe
+
+ nova/crypto.py |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+commit a359b644c1f28b9a2e24aecc9f6f8d6581354f0f
+Merge: c1bdc39 51546e7
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 05:14:29 2012 +0000
+
+    Merge "libvirt: Make vif_driver.plug() returns None"
+
+commit c1bdc39fd9ae728d824c65fd65bc857e51d2a233
+Merge: 2a57e53 e6acd86
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 05:13:43 2012 +0000
+
+    Merge "Execute pygrub using nova-rootwrap in xenapi"
+
+commit 2a57e53855fcbccb8f5fe399f557f98494540e61
+Merge: 3662704 3b8e122
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 05:13:16 2012 +0000
+
+    Merge "fix instance rescue without cmdline params in xml.rescue."
+
+commit c759a87a95e1abf08278b738b949c770cdc372d6
+Author: Dan Prince <[e-mail]>
+Date:   Tue Dec 18 10:08:37 2012 -0500
+
+    Enable nova exception format checking in tests.
+    
+    Updates the Nova test runner so that it enables
+    'fatal_exception_format_errors' for testing.
+    
+    Fixes a slew of issues in the tests including:
+     -adds a whole bunch of missing kwarg's to exception constructors
+     -removing an extra print statement in ec2/test_cloud
+      (this was causing failures...)
+     -removing a duplicate (and misnamed) flavor test case:
+        test_remove_tenant_access_with_bad_access
+     -removing an odd test case which tested throwing an exception with
+      and without kwargs explicitly (the part testing without kwargs was
+      removed)
+     -explicitly update test/test_misc.py's test_exceptions_raise to disable
+      formatting checks for now. This allows it to continue to pass.
+    
+    Change-Id: Ibb5083c93f1a5de6edadb1b613292ff9eb26ddf0
+
+ nova/test.py                                       |    1 +
+ nova/tests/api/ec2/test_cloud.py                   |    1 -
+ .../compute/contrib/test_admin_actions.py          |    8 ++++---
+ .../openstack/compute/contrib/test_aggregates.py   |   22 ++++++++++--------
+ .../compute/contrib/test_deferred_delete.py        |   13 ++++++++---
+ .../contrib/test_extended_server_attributes.py     |    2 +-
+ .../compute/contrib/test_extended_status.py        |    2 +-
+ .../compute/contrib/test_flavor_access.py          |   21 ++++-------------
+ .../compute/contrib/test_flavor_manage.py          |    2 +-
+ .../openstack/compute/contrib/test_floating_ips.py |    8 ++++---
+ .../compute/contrib/test_hide_server_addresses.py  |    2 +-
+ .../openstack/compute/contrib/test_hypervisors.py  |    2 +-
+ .../api/openstack/compute/contrib/test_networks.py |    8 +++----
+ .../compute/contrib/test_security_groups.py        |    2 +-
+ nova/tests/api/openstack/compute/test_flavors.py   |    2 +-
+ .../api/openstack/compute/test_server_actions.py   |   24 +++++++++++++++-----
+ .../api/openstack/compute/test_server_metadata.py  |    2 +-
+ nova/tests/api/openstack/compute/test_servers.py   |    6 ++---
+ nova/tests/api/openstack/fakes.py                  |    2 +-
+ nova/tests/api/openstack/test_common.py            |   15 ++----------
+ nova/tests/compute/test_compute.py                 |   12 ++++++----
+ nova/tests/fake_network.py                         |    4 ++--
+ nova/tests/network/test_api.py                     |    2 +-
+ nova/tests/network/test_manager.py                 |   18 +++++++++------
+ nova/tests/test_exception.py                       |    4 ++--
+ nova/tests/test_libvirt.py                         |   10 ++++----
+ nova/tests/test_misc.py                            |    2 ++
+ nova/tests/test_quota.py                           |    2 +-
+ 28 files changed, 106 insertions(+), 93 deletions(-)
+
+commit 366270451892ad6b94872e7d13e9da998d0b2606
+Merge: ee710e7 f8d2f86
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 04:48:38 2012 +0000
+
+    Merge "Raise old exception instance instead of new one."
+
+commit ee710e7fc574f166a4f2f7a5b58d9670f6a7c7dc
+Merge: 1dc9d73 65d9f80
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 04:43:00 2012 +0000
+
+    Merge "Update exceptions to pass correct kwargs."
+
+commit 881a93473c32a7c7e23a8e6dcede8394053408c6
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Thu Dec 20 20:13:37 2012 -0800
+
+    Eliminate race conditions in floating association
+    
+    This makes associating and disassociating floating ips atomic and
+    idempotent. This means multiple concurrent messages will not leave
+    behind iptables rules and concurrent request will not cause odd
+    failures.
+    
+    Fixes bug 1092762 and bug 1092761.
+    
+    Change-Id: Idbcad6c1d2a3d4881cf7180b848ed3844fac4054
+
+ nova/db/api.py                     |   10 +++-
+ nova/db/sqlalchemy/api.py          |    3 ++
+ nova/network/manager.py            |   91 ++++++++++++++++++++++--------------
+ nova/tests/network/test_manager.py |    2 +-
+ nova/tests/test_db_api.py          |   15 ++++++
+ 5 files changed, 83 insertions(+), 38 deletions(-)
+
+commit 1dc9d73cf0d79dc86064228ca4da23f00947b7e0
+Author: OpenStack Jenkins <[e-mail]>
+Date:   Fri Dec 21 00:02:24 2012 +0000
+
+    Imported Translations from Transifex
+    
+    Change-Id: Ifdf358f8ec68b9010195c914409f0d926934052c
+
+ nova/locale/nova.pot | 1150 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 623 insertions(+), 527 deletions(-)
+
+commit af16e5f24d77f0a11a0ec33af428b45a7c6fecdf
+Merge: 62c31c7 4bfce36
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:44:00 2012 +0000
+
+    Merge "Trap exception when trying to write csr"
+
+commit 62c31c7a9b0b86e787971daf18e1496a8ce1d883
+Merge: 90b6b82 9eadd4f
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:43:39 2012 +0000
+
+    Merge "Fix revert resize failure with disk.local not found"
+
+commit 90b6b82dc3c8f32df00a66fcff9deb52aa17c117
+Merge: ff04ded 6902021
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:43:13 2012 +0000
+
+    Merge "add 'random_seed' entry to instance metadata"
+
+commit ff04ded017802af199fa672ad4b673f46d98ca27
+Merge: 1552837 617c92b
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:42:24 2012 +0000
+
+    Merge "Baremetal VIF and Volume sub-drivers."
+
+commit 15528379fcd138cbb68f2522bb177d2aede73b10
+Merge: b827dc2 67d188c
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:42:01 2012 +0000
+
+    Merge "Fix _find_ports() for when backdoor_port is None."
+
+commit b827dc2983b2604bb00d79f372c8a696370d83c8
+Merge: d7673f7 b3bbd09
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:41:39 2012 +0000
+
+    Merge "Add extension to allow hiding of addresses"
+
+commit d7673f7655c631cafbaf5e95439c1c07bd267714
+Merge: 550ec0a 44d543b
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:28:45 2012 +0000
+
+    Merge "Volume backed live migration w/o shared storage"
+
+commit 550ec0a23b844d079666d79a9c20b6832288484c
+Merge: 6085602 bffa842
+Author: Jenkins <[e-mail]>
+Date:   Thu Dec 20 23:10:43 2012 +0000
+
+    Merge "Parameterize database connection in test.py"
+
+commit 0edb7d4db9d20afc88be8b562d3301a5bd667138
+Author: Michael Still <[e-mail]>
+Date:   Thu Dec 20 13:56:00 2012 +1100
+
+    Provide a configdrive helper which uses contextlib.
+    
+    As suggested on review of Ib23d117ad4cd5dc92298a0812eb468f7d557417c.
+    
+    Resolves bug 1092248.
+    
+    Change-Id: I2829ac60732b86b9853983b03ef6f30f5c5a3283