commit ca1f1d39b8ee85f55d5b656f7db946f855be5cb2
Merge: 060c58e cf99107
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 26 00:12:36 2012 +0000

    Merge "Another killfilter test fix for Fedora 17."

commit 060c58ea65cfc5224e6e93059dda682e5e7ce806
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jun 25 23:42:10 2012 +0000

    Fix hacking.py failures...
    
    test_xenapi hacking fix and volume_utils unneeded import
    
    Change-Id: I503cf0780850aba90d7ba8665d83bff08fb2504a

 nova/tests/test_xenapi.py        |    2 +-
 nova/virt/xenapi/volume_utils.py |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit aaadd381bbee3ec61f7f64ae5de3e635f0afe627
Merge: 169d0ca 01c654e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 22:01:05 2012 +0000

    Merge "Make tgtadm the default iscsi user-land helper."

commit 169d0ca4df833766c878ef3ca62868ce38610db1
Merge: ad6b11c 1825abc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 20:55:54 2012 +0000

    Merge "Set libvirt_nonblocking to true by default for Folsom."

commit ad6b11c17c8afd6522d9e9dce269e3f51b5b0851
Merge: aa802e0 96c8633
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 19:07:18 2012 +0000

    Merge "Call libvirt_volume_driver with right mountpoint"

commit aa802e0204f4f3d96b94866ec42478353796c759
Merge: bf36836 129b87e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 18:24:30 2012 +0000

    Merge "vm state and task state management"

commit bf368360cb089a1db0b7a2bf6a7ba87c6f46a882
Merge: 2c7aa90 5685d20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 18:03:16 2012 +0000

    Merge "Fix import order of openstack.common"

commit 2c7aa901b9174a4a4f04c5f8a52ef6c9d2d5d27c
Merge: 259cf1c 1b40708
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 18:00:19 2012 +0000

    Merge "Fixes ram_allocation_ratio based over subscription"

commit 259cf1cd39a46b36f47014d1b9770b52a563e9df
Merge: 75546da 35749ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 16:38:51 2012 +0000

    Merge "XenAPI: Fixes Bug 1012878"

commit cf99107321c891565ab97f49193b81419abf3d66
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 25 12:29:36 2012 -0400

    Another killfilter test fix for Fedora 17.
    
    Updates killfilter test to use /usr/bin/sleep in addition to /bin/sleep.
    
    Fixes LP Bug #1017585.
    
    Change-Id: Ied0a8837fb0e7ca7fa3629859fbd67f71e5d80dc

 nova/tests/test_nova_rootwrap.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 75546dade88d39469bb3479e80ebd6b4afad36e9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 25 15:37:50 2012 +0000

    Remove unknown shutdown kwarg in call to vmops._destroy
    
    Fixes bug 1017562
    
    Also, _destroy will now intelligently shutdown the VM first, so need
    to do that in vm_vdi_cleaner.py anymore
    
    Change-Id: I8c1e3aa8ecb98ed3c19ab4b8fa072b7fa8e5618f

 tools/xenserver/vm_vdi_cleaner.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit fcd2dad6de73e153b756a16d97597df61a4ddbe8
Merge: 8fe25a3 0622868
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 15:24:47 2012 +0000

    Merge "Refactor vm_vdi_cleaner.py connection use"

commit 8fe25a36171f13d2c9413b3693e982169bdb32ff
Merge: ef65f34 93d3c77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 25 14:11:50 2012 +0000

    Merge "Move rootwrap filters definition to config files"

commit 0622868cc54569a30e6cf427a564b79d9b3669b5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Jun 24 23:08:19 2012 +0000

    Refactor vm_vdi_cleaner.py connection use
    
    cleanup_instance() would fail because of using old get_connection().
    This refactors everything to use XenAPIDriver().
    
    Fixes bug 1017282
    
    Change-Id: I8822f322bb8f60e5992afbe1feb45c0f4fffc893

 tools/xenserver/vm_vdi_cleaner.py |   84 +++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

commit ef65f3413d029ca01780457b1872037e22716a0b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jun 23 12:32:50 2012 -0700

    Remove direct access to glance client
    
    All internal clients of Glance should be using GlanceImageService. This
    refactors the code in the xen and vmware virt drivers that were
    directly instantiating a glance.client object
    
    Related to bp integrate-python-glanceclient
    
    Change-Id: I354254060e400d9c1dfd6d041b071e3960a9ece6

 nova/image/__init__.py               |    4 +-
 nova/image/glance.py                 |    5 +-
 nova/tests/glance/stubs.py           |   70 ---------------------
 nova/tests/image/test_glance.py      |    4 +-
 nova/tests/test_vmwareapi.py         |    6 +-
 nova/tests/test_xenapi.py            |  111 +++++++++++++++++++++++++---------
 nova/tests/xenapi/stubs.py           |   11 +++-
 nova/virt/vmwareapi/io_util.py       |   18 +++---
 nova/virt/vmwareapi/vmware_images.py |   27 +++++----
 nova/virt/xenapi/vm_utils.py         |   14 ++---
 10 files changed, 137 insertions(+), 133 deletions(-)

commit 5685d20341502ddbb0265ebbaa6336f69aebc6fe
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Jun 22 17:58:30 2012 -0700

    Fix import order of openstack.common
    
    Change-Id: Id80026ad9eb78c6d9a6bcae33e26ac8a4fdd6680

 bin/nova-novncproxy                |    2 +-
 nova/tests/compute/test_compute.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 01c654e2ef6db17e677d5e9a0d8e781d374bdbbe
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jun 21 13:50:22 2012 -0400

    Make tgtadm the default iscsi user-land helper.
    
    Most modern Linux distrobutions have tgtadm as their
    default iscsi user-land helper. This includes Ubuntu,
    Fedora, RHEL, SuSe, and others.
    
    Make it default for nova as well. No change is
    required for devstack since its the default as well.
    
    Change-Id: I3f5204f08bfd9ef41eda2df7aa6bb35559516213
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/tests/test_libvirt.py |    6 +++---
 nova/volume/iscsi.py       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 93d3c77caff67e2c406a9b17c31de88e90700e13
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 6 14:23:24 2012 +0200

    Move rootwrap filters definition to config files
    
    Move rootwrap filters definition from being defined within Nova
    code to being defined in configuration files to facilitate pluging-in
    new rootwrap commands.
    
    Transition notes:
    * nova-rootwrap now requires an additional (first) parameter pointing
      to the root-owned rootwrap.conf file, sudoers needs to be updated
      to specify that ("nova-rootwrap /etc/nova/rootwrap.conf *")
    * Packagers should ship {compute,network,volume}.filters inside a
      directory listed in rootwrap.conf rather than shipping
      nova/rootwrap/{compute,network,volume}.py
    * Filter definitions now only support strings. The KillFilter (which was
      using arrays as parameters) was modified and the tests updated.
    
    Implements bp nova-rootwrap-pluggable-filters
    
    Corresponding devstack change needs to land first, so that tests pass:
    https://review.openstack.org/8842
    
    Change-Id: I2350154cd8057bd57926ed542de035626f7de37d

 bin/nova-rootwrap                   |   35 ++++--
 etc/nova/rootwrap.conf              |    7 ++
 etc/nova/rootwrap.d/compute.filters |  187 +++++++++++++++++++++++++++++++
 etc/nova/rootwrap.d/network.filters |   83 ++++++++++++++
 etc/nova/rootwrap.d/volume.filters  |   27 +++++
 nova/rootwrap/compute.py            |  207 -----------------------------------
 nova/rootwrap/filters.py            |   19 ++--
 nova/rootwrap/network.py            |   98 -----------------
 nova/rootwrap/volume.py             |   45 --------
 nova/rootwrap/wrapper.py            |   54 +++++----
 nova/tests/test_nova_rootwrap.py    |   36 +++---
 11 files changed, 387 insertions(+), 411 deletions(-)

commit 1b40708287808243be27b83791b7d23f8b51b194
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Jun 21 16:41:17 2012 -0700

    Fixes ram_allocation_ratio based over subscription
    
    Fix for bug 1016273
    
    Change-Id: I7f7b227e71e93b4bcded150791fb0b9e9df98e4c

 doc/source/devref/filter_scheduler.rst    |    4 +++-
 nova/scheduler/filters/ram_filter.py      |    5 ++++-
 nova/scheduler/host_manager.py            |    2 ++
 nova/tests/scheduler/test_host_filters.py |   16 ++++++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

commit 96c86336c69b9d456e43234e3fe315bd3b101045
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 21 13:25:57 2012 -0700

    Call libvirt_volume_driver with right mountpoint
    
     * fixes bug 1013782
     * includes failing test
     * fixes tests for live migration
    
    Change-Id: I8f95c6baa7aad878af19d5d8b8b34531a4a43885

 nova/tests/test_libvirt.py      |   20 +++++++++++++++++++-
 nova/virt/libvirt/connection.py |   12 ++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

commit 3252371afca71f57c171569676d5de70439d5384
Merge: 4e3c99b 8849c85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 21:42:48 2012 +0000

    Merge "update refresh_cache on compute calls to get_instance_nw_info"

commit 35749ba5b8dee86b57f90da11c9566b3a6a24174
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed Jun 13 14:56:07 2012 -0700

    XenAPI: Fixes Bug 1012878
    
    Launching an instance when the image is not cached fails since
    https://review.openstack.org/#/c/7971/, because the change tries
    to set the nova_disk_type key in _create_cached_image, but that
    is already set in create_vdi
    
    Change-Id: I5eeb1558acf894cc7cd2eea5fd0fb1cdd673b83c

 nova/virt/xenapi/vm_utils.py |    3 ---
 1 file changed, 3 deletions(-)

commit 8849c85a4fe001c512ce1ba5f12ea9837aabbac4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 21 15:27:23 2012 -0500

    update refresh_cache on compute calls to get_instance_nw_info
    
    addendum to commit 82599c77346bbefd550ea4ee6c0b13a3df4950af
    allows calls to get_instance_nw_info to update the cache
    without worry of infinite recursion
    
    refresh_cache decorator ungracefully fails if instance
    isn't somehow in the function args. This is so tests will fail
    to prevent it from being incorrectly used.
    
    Change-Id: If8c7c53db1c7d0d1f7c1d042b5a79bad5b7f45b6

 nova/network/api.py |   30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

commit 4e3c99bc975859ab3f01aec97cf26dc522e8422d
Merge: efdaeb2 964adeb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 20:52:18 2012 +0000

    Merge "Admin action to reset states."

commit efdaeb2f16cdd96c0742afb0f776878e39fabf5b
Merge: 6a16ebd 699ef28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 19:57:38 2012 +0000

    Merge "Minor HACKING.rst exception fix"

commit 6a16ebd2ac1259c7dbde3be8db5679f24070ed5c
Merge: 1ecf831 13871ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 19:36:25 2012 +0000

    Merge "Propose nova-novncproxy back into nove core."

commit 129b87e17d3333aeaa9e855a70dea51e6581ea63
Author: Yun Mao <yunmao@gmail.com>
Date:   Tue Jun 5 14:55:34 2012 -0400

    vm state and task state management
    
    partially implements bp task-management
    fixes bug 997867
    
    also see http://wiki.openstack.org/VMState
    
    Refactored the following API/state:
    * rebuild
    * migrate
    * resize
    * start
    * stop
    * delete
    * soft delete
    * rework sync_power_state in compute/manager.
    
    fix broken tests, add transition diagram in dot
    
    Change-Id: I3c5a97508a6dad7175fba12828bd3fa6ef1e50ee

 doc/source/devref/vmstates.rst                     |  137 +++++++++++++++
 nova/api/ec2/cloud.py                              |   25 ++-
 nova/api/ec2/inst_state.py                         |    2 -
 nova/api/openstack/common.py                       |   27 +--
 nova/api/openstack/compute/contrib/floating_ips.py |    2 +-
 nova/compute/api.py                                |   60 +++----
 nova/compute/manager.py                            |  182 ++++++++++++--------
 nova/compute/task_states.py                        |   44 ++++-
 nova/compute/vm_states.py                          |   35 ++--
 nova/db/sqlalchemy/api.py                          |    7 +-
 nova/scheduler/driver.py                           |    4 +-
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 .../compute/contrib/test_admin_actions.py          |    3 +-
 .../api/openstack/compute/test_server_actions.py   |    5 +-
 nova/tests/api/openstack/compute/test_servers.py   |   24 +--
 nova/tests/compute/test_compute.py                 |   40 +++--
 nova/tests/scheduler/test_scheduler.py             |    5 +-
 nova/tests/test_imagecache.py                      |   12 +-
 nova/virt/libvirt/imagecache.py                    |    9 +-
 nova/virt/xenapi/host.py                           |    3 +-
 20 files changed, 423 insertions(+), 205 deletions(-)

commit 1ecf8311f817cf1c5b3b6f0efe7c022da1950187
Merge: 5ae50d1 23ec8c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 19:04:18 2012 +0000

    Merge "Make libvirt LoopingCalls actually wait()"

commit 5ae50d14fed254dd8e207e459d43812c07f1709a
Merge: cdc68cd 080671c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 19:04:16 2012 +0000

    Merge "Update pylint/pep8 issues jenkins job link"

commit cdc68cd3c93c749f959ffbbfe8934c264a2c7c12
Merge: 1e742df 947f92e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 18:15:22 2012 +0000

    Merge "Spelling fixes"

commit 1e742df03848f727fc8248de3438f6ac39d7f2ff
Merge: e205037 52fd153
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 18:07:05 2012 +0000

    Merge "Add instance_id in Usage API response."

commit e205037a43478438470257fe5baab05df353612d
Merge: f816aa4 6041ad7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 17:49:13 2012 +0000

    Merge "Fix bug 1010581"

commit f816aa4c83b7b141ff94bdf3ba6a922616348621
Merge: a519752 65bff9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 17:37:24 2012 +0000

    Merge "Tidy up exception handling in contrib api consoles"

commit 080671c9b5edab87e3c4e6157d9c77e5ba5d1bf6
Author: Sascha Peilicke <saschpe@suse.de>
Date:   Tue Jun 19 12:39:18 2012 +0200

    Update pylint/pep8 issues jenkins job link
    
    Change-Id: Ibf5ac4b29d668d0d0f15e980361b0bd71d0bc050

 Authors    |    1 +
 README.rst |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit a519752eef157aaa03c9f6169eba1ff1b5a9f1bd
Author: Ralf Haferkamp <rhafer@suse.de>
Date:   Wed Jun 20 11:28:22 2012 +0200

    Addtional CommandFilters to fix rootwrap on SLES
    
    Fixes bug 1013147 (for SLES)
    
    Change-Id: Ib362c913b809f7601a9a4faedede89b22794dfb7

 Authors                  |    1 +
 nova/rootwrap/compute.py |    7 +++++++
 nova/rootwrap/network.py |    5 +++++
 3 files changed, 13 insertions(+)

commit 65bff9b98471bfd09cee2c24aba7f2e5d0f0cacd
Author: Martin Packman <martin.packman@canonical.com>
Date:   Thu Jun 21 01:29:20 2012 +0100

    Tidy up exception handling in contrib api consoles
    
    Removes redundant exception handling from VNC consoles extension api module.
    Both NotAuthorized and Invalid subclasses are already handled at the wsgi
    application layer. Also gives a better message, including the id, when an
    instance is not found. Includes tweaks suggested by Vish in review.
    
    Change-Id: Iefa4deeb46e4a12d012e7abe3c73d7d9c18afeff

 nova/api/openstack/compute/contrib/consoles.py     |   16 +++-------------
 .../api/openstack/compute/contrib/test_consoles.py |   15 +++++++++++----
 nova/tests/compute/test_compute.py                 |   14 +++++++++++++-
 3 files changed, 27 insertions(+), 18 deletions(-)

commit 6041ad70d25aa4e015003e9df03d3f9759e09e6e
Author: Yun Mao <yunmao@gmail.com>
Date:   Fri Jun 8 11:27:20 2012 -0400

    Fix bug 1010581
    
    Set shutdown_terminate to False by default.
    Fix related tests.
    
    Change-Id: I194ea7f01e375a93ff73ee1560589f0eadc1b965

 nova/db/sqlalchemy/models.py     |    4 +++-
 nova/tests/api/ec2/test_cloud.py |    6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit c9b88b8c50ca9dd13bef6206cfc004c9b23d24b6
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed Jun 20 16:47:19 2012 -0700

    xenapi tests: changes size='0' to size=0
    
    This could potentially cause a memory leak.
    
    Change-Id: I46f0bc34598a9927767820b3616ced3b527a259f

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 470ccb85f2ecaff38973854e209f0fabdb117dc0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 20 18:02:47 2012 -0500

    fixes a bug in xenapi tests where a string should be int
    
    Change-Id: I202fa5b20c78c02d1072bdae774d9f19e4044fe6

 nova/tests/test_xensm.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 699ef28045cd2da319859d24faba4d91e094be24
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Jun 19 12:10:26 2012 -0700

    Minor HACKING.rst exception fix
    
    Change-Id: If7f7d57dd6c3d426ed6b29dc658a3ab964329644

 nova/api/ec2/cloud.py                              |    3 ++-
 nova/api/openstack/compute/contrib/floating_ips.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 23ec8c915c900fcafd1683da000817ef4497bf93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 20 00:44:25 2012 +0000

    Make libvirt LoopingCalls actually wait()
    
     * Adds wait() to all the LoopingCall timers
     * Fixes loopingCalls in baremetal/proxy.py as well
     * Includes failing test to verify result from destroy
     * Fixes tests depending on improper behavior
     * Fixes bug 1015355
    
    Change-Id: I9e1914c446170e49f0aab76c7745b55d12132425

 nova/tests/test_libvirt.py      |   68 +++++++++++++++++++++++++++++++++++----
 nova/virt/baremetal/proxy.py    |    6 ++--
 nova/virt/libvirt/connection.py |   16 ++++-----
 3 files changed, 73 insertions(+), 17 deletions(-)

commit 52fd1536a897a24ba07b5f4459edb15e581b7adc
Author: Lin Hua Cheng <lin-hua.cheng@hp.com>
Date:   Wed Jun 20 19:37:19 2012 +0000

    Add instance_id in Usage API response.
    
    Fixes bug 1003093.
    
    Required to fix horizon bug 1003299.
    
    Add the instance_id in the server usage
    response. The value of the id is the UUID
    of the instance.
    
    Change-Id: I77e0f64db456b4c80a03fa922dd18146b94d1187

 Authors                                            |    1 +
 .../compute/contrib/simple_tenant_usage.py         |    7 ++++---
 .../compute/contrib/test_simple_tenant_usage.py    |   15 +++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

commit 1825abc8da4db5e5a85e30386c7598a61c59aa9d
Author: Yun Mao <yunmao@gmail.com>
Date:   Mon Jun 18 13:12:31 2012 -0400

    Set libvirt_nonblocking to true by default for Folsom.
    
    Make the fake libvirt module look more like the real module.
    
    Change-Id: Ie03f24c6e5c3027d83d8f3d87d049f7f9df29e5b

 etc/nova/nova.conf.sample       |    2 +-
 nova/tests/fakelibvirt.py       |    6 ++++++
 nova/virt/libvirt/connection.py |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

commit 964adebb3c4ca297dd61487dffffca48283be3b5
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jun 20 11:43:03 2012 -0500

    Admin action to reset states.
    
    Adds an Admin API action to reset the state of an instance.  This will
    at least allow easy clean-up from bugs which corrupt the state of an
    instance and inhibit the owner of the instance from deleting it.
    
    Change-Id: Ia059cbd643e24e04dede06da330f444d03b07674

 etc/nova/policy.json                               |    1 +
 .../api/openstack/compute/contrib/admin_actions.py |   32 +++++++++++
 .../compute/contrib/test_admin_actions.py          |   60 ++++++++++++++++++++
 nova/tests/policy.json                             |    1 +
 4 files changed, 94 insertions(+)

commit cf1854946838bf14607d05acd6f347702372b744
Merge: 5226d40 38c98c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 20 19:52:46 2012 +0000

    Merge "add nova-manage bash completion script"

commit 5226d4054cb2b25bca9a00636663cd56d4f1ddb5
Merge: ba3754e 2c0adf1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 20 19:37:42 2012 +0000

    Merge "Fix bug 1014925: fix os-hosts"

commit ba3754e3ff672a877d90c78486c7f4d5fd4bf7b0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Jun 13 10:48:54 2012 -0400

    Use rpc from openstack-common.
    
    Final patch for blueprint common-rpc.
    
    This patch removes nova.rpc in favor of the copy in openstack-common.
    
    Change-Id: I9c2f6bdbe8cd0c44417f75284131dbf3c126d1dd

 bin/nova-clear-rabbit-queues                       |    2 +-
 bin/nova-dhcpbridge                                |    2 +-
 bin/nova-instance-usage-audit                      |    2 +-
 bin/nova-manage                                    |    2 +-
 bin/nova-rpc-zmq-receiver                          |    4 +-
 bin/nova-volume-usage-audit                        |    2 +-
 bin/nova-xvpvncproxy                               |    2 +-
 nova/api/openstack/compute/servers.py              |    2 +-
 nova/cert/rpcapi.py                                |    4 +-
 nova/compute/manager.py                            |    2 +-
 nova/compute/rpcapi.py                             |    8 +-
 nova/console/api.py                                |    2 +-
 nova/console/rpcapi.py                             |    4 +-
 nova/consoleauth/rpcapi.py                         |    4 +-
 nova/manager.py                                    |    2 +-
 nova/network/api.py                                |    2 +-
 nova/network/manager.py                            |    2 +-
 nova/network/quantum/manager.py                    |    2 +-
 nova/notifier/rabbit_notifier.py                   |    2 +-
 nova/openstack/common/rpc/__init__.py              |  262 +++++++
 nova/openstack/common/rpc/amqp.py                  |  416 +++++++++++
 nova/openstack/common/rpc/common.py                |  316 ++++++++
 nova/openstack/common/rpc/dispatcher.py            |  105 +++
 nova/openstack/common/rpc/impl_fake.py             |  184 +++++
 nova/openstack/common/rpc/impl_kombu.py            |  758 +++++++++++++++++++
 nova/openstack/common/rpc/impl_qpid.py             |  585 +++++++++++++++
 nova/openstack/common/rpc/impl_zmq.py              |  714 ++++++++++++++++++
 nova/openstack/common/rpc/matchmaker.py            |  257 +++++++
 nova/openstack/common/rpc/proxy.py                 |  161 +++++
 nova/rpc/__init__.py                               |  252 -------
 nova/rpc/amqp.py                                   |  416 -----------
 nova/rpc/common.py                                 |  314 --------
 nova/rpc/dispatcher.py                             |  105 ---
 nova/rpc/impl_fake.py                              |  184 -----
 nova/rpc/impl_kombu.py                             |  759 --------------------
 nova/rpc/impl_qpid.py                              |  584 ---------------
 nova/rpc/impl_zmq.py                               |  713 ------------------
 nova/rpc/matchmaker.py                             |  257 -------
 nova/rpc/proxy.py                                  |  161 -----
 nova/scheduler/driver.py                           |    2 +-
 nova/scheduler/rpcapi.py                           |    4 +-
 nova/service.py                                    |    2 +-
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 nova/tests/api/ec2/test_ec2_validate.py            |    2 +-
 .../openstack/compute/contrib/test_certificates.py |    2 +-
 .../openstack/compute/contrib/test_disk_config.py  |    2 +-
 .../openstack/compute/contrib/test_floating_ips.py |    2 +-
 .../compute/contrib/test_scheduler_hints.py        |    2 +-
 nova/tests/api/openstack/compute/test_servers.py   |    9 +-
 nova/tests/cert/test_rpcapi.py                     |    2 +-
 nova/tests/compute/test_compute.py                 |    4 +-
 nova/tests/compute/test_rpcapi.py                  |    2 +-
 nova/tests/console/test_rpcapi.py                  |    2 +-
 nova/tests/consoleauth/test_rpcapi.py              |    2 +-
 nova/tests/fake_flags.py                           |    2 +-
 nova/tests/network/test_manager.py                 |    2 +-
 nova/tests/rpc/__init__.py                         |   19 -
 nova/tests/rpc/common.py                           |  321 ---------
 nova/tests/rpc/test_common.py                      |  144 ----
 nova/tests/rpc/test_dispatcher.py                  |  109 ---
 nova/tests/rpc/test_fake.py                        |   33 -
 nova/tests/rpc/test_kombu.py                       |  395 ----------
 nova/tests/rpc/test_kombu_ssl.py                   |   66 --
 nova/tests/rpc/test_matchmaker.py                  |   58 --
 nova/tests/rpc/test_proxy.py                       |  124 ----
 nova/tests/rpc/test_qpid.py                        |  370 ----------
 nova/tests/rpc/test_zmq.py                         |  128 ----
 nova/tests/scheduler/test_rpcapi.py                |    2 +-
 nova/tests/scheduler/test_scheduler.py             |    4 +-
 nova/tests/test_notifier.py                        |    6 +-
 nova/tests/test_quota.py                           |    2 +-
 nova/tests/test_test.py                            |    2 +-
 nova/tests/test_volume.py                          |    2 +-
 nova/virt/xenapi/pool.py                           |    2 +-
 nova/volume/api.py                                 |    2 +-
 openstack-common.conf                              |    2 +-
 76 files changed, 3819 insertions(+), 5572 deletions(-)

commit 83e6cf7b92ae6a845939adf1771f0422a5e5f2ca
Merge: 8637f71 e71a8c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 20 16:35:29 2012 +0000

    Merge "Add instance details to notifications"

commit 38c98c4df5b3d4b1c229db870e094d342cf56b52
Author: Dominik Heidler <dheidler@suse.de>
Date:   Mon May 14 15:47:42 2012 +0200

    add nova-manage bash completion script
    
    Change-Id: I856349fb0b31f32ec4570c74ebceb3563fa22547

 Authors                           |    1 +
 bin/nova-manage                   |   12 ++++++++++++
 tools/nova-manage.bash_completion |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)

commit 8637f71e2747909a31294cd64b5e7ea891dd9c12
Merge: eae762a e88780a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 20 07:59:24 2012 +0000

    Merge "Adjust the libvirt config classes' API contract for parsing"

commit 947f92e80e896f5ffe83a5bde5c55d8043ff3b62
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Jun 19 11:45:25 2012 -0700

    Spelling fixes
    
    Change-Id: Id8e49b75821a1272a05ddb6c2cb8ee47ec15afdc

 nova/db/sqlalchemy/models.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 2c0adf1304e73eb1c940a6fbfd50bf34f870e282
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Jun 19 02:27:53 2012 +0000

    Fix bug 1014925: fix os-hosts
    
    List all hosts API.
    
    Change-Id: I95231ac98223c7b8cc07e867283da8c8d90fed38

 nova/api/openstack/compute/contrib/hosts.py        |    8 +++++---
 .../api/openstack/compute/contrib/test_hosts.py    |   15 +++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

commit eae762ad2ea6bde52231d5fffc58ed2ad932758d
Merge: 635f8e1 3a4126e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 19 17:42:23 2012 +0000

    Merge "Remove two obsolete libvirt cheetah templates from MANIFEST.in"

commit 635f8e137b4e311fbf5d2b248148a72c4359c44c
Merge: 225f6f2 468e64d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 19 16:56:09 2012 +0000

    Merge "Fix missing import in compute/utils.py"

commit e88780a5ddbba230b500052391c1ba64b67e6a22
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Tue Jun 19 14:22:44 2012 +0100

    Adjust the libvirt config classes' API contract for parsing
    
    Don't not automatically invoke the 'parse_dom' method from
    the LibvirtConfigObject constructor, because this is too
    early in construction - no child class constructors have
    initialized yet.
    
    Instead require the 'parse_dom' method to be invoked after
    the bare object has been constructed. Also make the default
    impl of 'parse_dom' take an etree.Element instance and
    validate its root element name. Add a convenient 'parse_str'
    method for turning a XML string into an etree.Element
    instance & parsing it.
    
    Change-Id: I7eda2b59869f3b4ef9dce1602cbb05f7662f4528
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_config.py |    5 +++++
 nova/virt/libvirt/config.py       |   14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

commit 225f6f21b1f4158e635f06b4d040b41fa21be09d
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Tue Jun 19 11:24:06 2012 +0100

    Move libvirt version comparison code into separate function helper
    
    To help various areas of libvirt driver code to perform version
    comparisons, move the libvirt version comparison code out of the
    "init_host" method and into a seperate "has_min_version" helper
    method
    
    Change-Id: Idc54dceff7bda60e1459ebe7c9c60c869d15aedb
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt/connection.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 3a4126e4e1e4f426f97a93f912f52372e2616685
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Tue Jun 19 14:14:37 2012 +0100

    Remove two obsolete libvirt cheetah templates from MANIFEST.in
    
    The nova/virt/libvirt*.xml.template and nova/virt/cpuinfo.xml.template
    files were deleted in earlier commits, so should no longer be listed
    in the MANIFEST.in file
    
    Change-Id: I3a840e6801d02293d0d6b4983d404c1652256cd2
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 MANIFEST.in |    2 --
 1 file changed, 2 deletions(-)

commit 6e6ffc2e4eff90e07f03049452979773e67a6a1c
Merge: 169112c 984435b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 19 05:50:55 2012 +0000

    Merge "Handle missing server when getting security groups"

commit 169112c15394425bf633d004f1feb6aaf43cb08d
Merge: 7db939c 82599c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 19 02:27:39 2012 +0000

    Merge "moved update cache functionality to the network api"

commit 13871ad4f39361531dff1abd7f9257369862cccc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu May 17 23:05:27 2012 -0700

    Propose nova-novncproxy back into nove core.
    
      * Use https://github.com/kanaka/websockify instead of wsproxy
        (which ships with noVNC)
      * Fixes bug 1001098
      * Looks for noVNC html files in /usr/share/novnc by default
      * Fix comments, and call utils.default_cfgfile()
      * use "except Exception"
    
    Change-Id: I73dfe26fde699bb79aa1145bb1ab33f3a148bf21

 bin/nova-novncproxy |  157 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

commit 7db939c3de2d5f6c01993d7f727a390b123ef890
Merge: 73aec65 bc2de59
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 23:26:52 2012 +0000

    Merge changes Ifebbdbf7,I00f431ed
    
    * changes:
      Xen Storage Manager: tests for xensm volume driver
      SM volume driver: DB changes and tests

commit 73aec655017afca73e7efeffeac95861ed5e5d33
Merge: ba52373 9ce6577
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 22:07:34 2012 +0000

    Merge "bug #996880 change HostNotFound in hosts to HTTPNotFound"

commit 468e64d019f51d364afb30b0eed2ad09483e0b98
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 18 16:07:37 2012 -0400

    Fix missing import in compute/utils.py
    
    Fixes bug 1014829
    
    Change-Id: Id4c9225b4b2cec81519155ab660370be4448e366

 nova/compute/utils.py            |    1 +
 nova/tests/test_compute_utils.py |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

commit e71a8c390916079a682b197a291c8fbea5cd844f
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Mon Jun 18 10:52:18 2012 -0400

    Add instance details to notifications
    
    bug 1006120
    
    Ceilometer needs to collect more data for determining the billing rate
    for an instance. The most efficient way to get that data is to have it
    included in the notifications sent by nova, rather than looking it up
    after the notification is received.  This change adds details about the
    location, size, and "type" of the instance to the existing notification
    data. It also organizes the set of values into groups and adds comments
    to clarify those groupings.
    
    Change-Id: I01b7b550b0c4a5da1cc0dc764c9a6cb0161bf7e5

 nova/notifications.py |   33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

commit bc2de59a3225988e8c4af11eec077a7662162672
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Thu Jun 14 16:58:27 2012 -0700

    Xen Storage Manager: tests for xensm volume driver
    
    Change-Id: Ifebbdbf70152c5d6587dc26a8789150a7674a768

 nova/tests/test_xensm.py |  147 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/fake.py |   15 ++---
 nova/volume/xensm.py     |    4 +-
 3 files changed, 158 insertions(+), 8 deletions(-)

commit 02a9a18088b62d1c4c5aaafc44523d3dda6db527
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue May 29 16:36:54 2012 -0700

    SM volume driver: DB changes and tests
    
    Fixes the storage manager db api code in minor ways
    like checking for duplicates during creation.
    Adds tests for the storage manager db api.
    
    Change-Id: I00f431ed9137b140f46b4e30cb953792d7307d22

 bin/nova-manage           |    2 +-
 nova/db/api.py            |   11 ++-
 nova/db/sqlalchemy/api.py |   86 ++++++++++++++++-----
 nova/test.py              |    9 +++
 nova/tests/test_db_api.py |  186 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 270 insertions(+), 24 deletions(-)

commit ba52373f3827117f07b1b871eed3970c83131973
Merge: 56e7cb1 152cf6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 18:48:55 2012 +0000

    Merge "xensm: Fix xensm volume driver after uuid changes"

commit 82599c77346bbefd550ea4ee6c0b13a3df4950af
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 15 16:35:31 2012 -0500

    moved update cache functionality to the network api
    
    previously the network manager get_instance_nw_info
    was responsible for updating the cache. This is to
    prevent calling that function in a confusing way.
    
    part 2 of this patch was fixing bug997763
    floating_ip_associate was removed from the compute
    api. network api associate is now called directly.
    network api floating_ip functions now require
    instance as an argument in order to update cache.
    
    Change-Id: Ie8daa017b99e48769afbac4862696ef0a8eb1067

 Authors                                            |    2 +-
 nova/api/ec2/cloud.py                              |   45 ++++++++++--
 nova/api/ec2/ec2utils.py                           |   20 ++----
 nova/api/openstack/compute/contrib/floating_ips.py |   75 ++++++++++++++++----
 nova/compute/api.py                                |   38 ----------
 nova/network/api.py                                |   67 +++++++++++++----
 nova/network/manager.py                            |   18 +++--
 nova/tests/api/ec2/test_cloud.py                   |    9 ++-
 .../openstack/compute/contrib/test_floating_ips.py |   16 +++--
 nova/tests/compute/test_compute.py                 |   43 -----------
 nova/tests/network/test_manager.py                 |    4 +-
 11 files changed, 198 insertions(+), 139 deletions(-)

commit 56e7cb1c43c64669fb2ffb2decdb35ef37535995
Merge: c547b71 a717e47
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 18:28:04 2012 +0000

    Merge "Enforce an instance uuid for instance_test_and_set."

commit 984435b1edc9ab0ec3d33e809babd04884e96ff1
Author: Martin Packman <martin.packman@canonical.com>
Date:   Fri Jun 8 15:08:48 2012 +0100

    Handle missing server when getting security groups
    
    Fix bug 1010486.
    
    Treat InstanceNotFound as a 404 when querying the security groups of server
    that does not exist. Also removes old exception translation, ApiError no
    longer exists and NotAuthorized shouldn't need handling at this level.
    Includes tweak suggested by Mark McLoughlin in review.
    
    Change-Id: Iaeada84dbadc232968f792c6f4855bf61cc5a5ae

 Authors                                            |    1 +
 .../openstack/compute/contrib/security_groups.py   |   10 ++++------
 .../compute/contrib/test_security_groups.py        |   14 ++++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

commit c547b7161afe42b8e3872926633fc550cc1db4b3
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Sat Jun 16 00:58:36 2012 +0800

    Imports cleanup
    
    Fixes bug #1013770
    
    1. Reorder imports by full module path
    2. Insert two blank lines after the last import
    
    Change-Id: I294ac3ab528f17a72811392d1732158e9487f3bf

 .../sqlalchemy/migrate_repo/versions/082_essex.py  |    3 ++-
 ..._instance_id_to_uuid_in_block_device_mapping.py |    4 ++--
 .../versions/089_add_volume_id_mappings.py         |    1 +
 .../versions/090_modify_volume_id_datatype.py      |    3 ++-
 .../versions/091_convert_volume_ids_to_uuid.py     |    2 ++
 .../versions/092_add_instance_system_metadata.py   |    2 ++
 .../versions/095_change_fk_instance_id_to_uuid.py  |    4 ++--
 .../versions/096_recreate_dns_domains.py           |    2 +-
 .../versions/100_instance_metadata_uses_uuid.py    |    4 ++--
 ...ecurity_group_instance_association_uses_uuid.py |    4 ++--
 .../versions/102_consoles_uses_uuid.py             |    4 ++--
 nova/db/sqlalchemy/models.py                       |    5 ++---
 nova/db/sqlalchemy/session.py                      |    2 +-
 nova/rootwrap/compute.py                           |    2 +-
 nova/rootwrap/filters.py                           |    1 -
 nova/rootwrap/network.py                           |    2 +-
 nova/rootwrap/volume.py                            |    2 +-
 nova/rootwrap/wrapper.py                           |    1 -
 nova/tests/__init__.py                             |    1 +
 nova/tests/baremetal/test_proxy_bare_metal.py      |    1 +
 nova/tests/fake_libvirt_utils.py                   |    1 +
 nova/tests/test_migrations.py                      |    1 +
 nova/tests/test_netapp.py                          |    1 +
 nova/tests/test_policy.py                          |    1 +
 24 files changed, 32 insertions(+), 22 deletions(-)

commit 6279e16ae1693cd3cae4f0b30e9412052ca356ab
Merge: 5bfa8a7 adc6664
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 17:02:28 2012 +0000

    Merge "added deprecated.warn helper method"

commit 5bfa8a70e8b11f68deb101c872eace27d7a3b1b4
Merge: 60ea96b 9ff3121
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 17:02:19 2012 +0000

    Merge "Replaces functions in utils.py with openstack/common/timeutils.py"

commit 60ea96b288d9d8f29d772dce3763fda466c73040
Merge: fb9abcc 31336b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 16:45:03 2012 +0000

    Merge "Add CPU arch filter scheduler support"

commit adc66644c4d1a4c6e5cd6a26394cf8b48620d99e
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Wed Jun 13 10:56:39 2012 -0400

    added deprecated.warn helper method
    
    provide a convenience method for indicating in code that a config
    option the operateor will have to deal with exists in their environment.
    
    Change-Id: I17b0c120d54b1db75c6bb29d107e4a15a5202e76

 nova/common/deprecated.py     |   42 +++++++++++++++++++++++++++++++++++++++++
 nova/exception.py             |    4 ++++
 nova/tests/test_deprecated.py |   40 +++++++++++++++++++++++++++++++++++++++
 nova/virt/connection.py       |    4 +++-
 4 files changed, 89 insertions(+), 1 deletion(-)

commit a717e4704af172f4d9711fc59f1d1785582e0d44
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Jun 16 11:42:08 2012 +1000

    Enforce an instance uuid for instance_test_and_set.
    
    This method only has one caller (compute/api.py) and it turns out
    was already always getting a uuid, so this is a relatively minor
    change.
    
    Change-Id: I5beae5a707be053903f40cc98ed43b66eaf945a9

 nova/db/api.py            |    6 +++---
 nova/db/sqlalchemy/api.py |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 9ff3121bd90133fb3b37c0e10407b5f7ade26b90
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed Jun 6 10:32:49 2012 +0800

    Replaces functions in utils.py with openstack/common/timeutils.py
    
    Fixes bug #1008628
    
    1. Edit openstack-common.conf and import nova/openstack/common/timeutils.py
    2. Move time related functions from utils.py to timeutils.py
    3. Replace following functions in utils.py with timeutils.py
    - isotime
    - parse_isotime
    - strtime
    - parse_strtime
    - normalize_time
    - is_older_than
    - utcnow_ts
    - utcnow
    - set_time_override
    - advance_time_delta
    - advance_time_seconds
    - clear_time_override
    4. Remove datetime related functions and datetime related unittests
    
    Change-Id: I9a92be286fb071b6237dd39495d88dae106e2ce0

 bin/nova-manage                                    |    5 +-
 nova/api/ec2/__init__.py                           |    5 +-
 nova/api/ec2/cloud.py                              |    3 +-
 nova/api/openstack/compute/contrib/cloudpipe.py    |    3 +-
 .../compute/contrib/simple_tenant_usage.py         |   20 ++--
 nova/api/openstack/compute/servers.py              |    3 +-
 nova/api/openstack/compute/versions.py             |    6 +-
 nova/api/openstack/compute/views/limits.py         |    4 +-
 nova/api/openstack/compute/views/servers.py        |    8 +-
 nova/common/memorycache.py                         |    6 +-
 nova/compute/api.py                                |    3 +-
 nova/compute/manager.py                            |   33 +++---
 nova/context.py                                    |    7 +-
 nova/crypto.py                                     |    5 +-
 nova/db/sqlalchemy/api.py                          |   83 +++++++-------
 nova/db/sqlalchemy/models.py                       |    8 +-
 nova/image/glance.py                               |    3 +-
 nova/network/manager.py                            |    5 +-
 nova/notifications.py                              |    3 +-
 nova/notifier/api.py                               |    6 +-
 nova/openstack/common/timeutils.py                 |  109 ++++++++++++++++++
 nova/quota.py                                      |    4 +-
 nova/scheduler/driver.py                           |    5 +-
 nova/scheduler/host_manager.py                     |    6 +-
 nova/scheduler/scheduler_options.py                |    4 +-
 nova/test.py                                       |    4 +-
 nova/tests/api/ec2/test_middleware.py              |   12 +-
 .../openstack/compute/contrib/test_cloudpipe.py    |   11 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    8 +-
 .../openstack/compute/contrib/test_snapshots.py    |    8 +-
 .../api/openstack/compute/contrib/test_volumes.py  |    8 +-
 nova/tests/api/openstack/compute/test_consoles.py  |    7 +-
 nova/tests/api/openstack/fakes.py                  |    9 +-
 nova/tests/api/openstack/volume/test_snapshots.py  |    8 +-
 nova/tests/api/openstack/volume/test_volumes.py    |    8 +-
 nova/tests/compute/test_compute.py                 |   49 ++++----
 nova/tests/scheduler/test_host_manager.py          |   18 +--
 nova/tests/scheduler/test_scheduler.py             |    9 +-
 nova/tests/test_api.py                             |   10 +-
 nova/tests/test_db_api.py                          |    9 +-
 nova/tests/test_quota.py                           |   33 +++---
 nova/tests/test_utils.py                           |  118 ++------------------
 nova/tests/test_xenapi.py                          |    5 +-
 nova/utils.py                                      |   85 +-------------
 nova/virt/xenapi/fake.py                           |    4 +-
 nova/virt/xenapi/vmops.py                          |   13 ++-
 nova/volume/api.py                                 |    4 +-
 nova/volume/manager.py                             |    3 +-
 nova/volume/utils.py                               |    3 +-
 openstack-common.conf                              |    2 +-
 tools/xenserver/vm_vdi_cleaner.py                  |    4 +-
 51 files changed, 380 insertions(+), 419 deletions(-)

commit fb9abcc83935b01746aeba0db4c431fe72b921fc
Merge: f100841 2020fba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 23:03:14 2012 +0000

    Merge "Present correct ec2id format for volumes and snaps"

commit f1008417bf01e42ec30bccb436d0c14964aa7548
Merge: e1a9d42 b5ddcb2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 21:58:15 2012 +0000

    Merge "Adds property to selectively enable image caching."

commit e1a9d42fcb2f2728f5732265a6b3a81f101f4219
Merge: 4d95452 d1ee82a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 21:36:22 2012 +0000

    Merge "Cleanup instance_update so it only takes a UUID."

commit 4d9545260509d238e7ba809d39b3a4e602f5777b
Merge: 5aea01e f28731c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 21:26:56 2012 +0000

    Merge "Add libvirt min version check."

commit 31336b35b4604f70150d0073d77dbf63b9bf7598
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jun 6 22:45:25 2012 -0400

    Add CPU arch filter scheduler support
    
    In a mixed environment of running different CPU architecutres,
    one would not want to run an ARM instance on a X86_64 host and
    vice versa.
    
    This scheduler filter option will prevent instances running
    on a host that it is not intended for.
    
    The libvirt driver queries the guest capabilities of the
    host and stores the guest arches in the permitted_instances_types
    list in the cpu_info dict of the host.
    
    The Xen equivalent will be done later in another commit.
    
    The arch filter will compare the instance arch against
    the permitted_instances_types of a host
    and filter out invalid hosts.
    
    Also adds ARM as a valid arch to the filter.
    
    The ArchFilter is not turned on by default.
    
    Change-Id: I17bd103f00c25d6006a421252c9c8dcfd2d2c49b
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/compute/api.py                       |    1 -
 nova/scheduler/filters/arch_filter.py     |   44 +++++++++++++++++++++++
 nova/tests/scheduler/test_host_filters.py |   54 +++++++++++++++++++++++++++++
 nova/utils.py                             |    9 +++++
 nova/virt/libvirt/connection.py           |    4 +++
 5 files changed, 111 insertions(+), 1 deletion(-)

commit 5aea01e0f9ed5f79f9eda92bf4ac4340ceb33d95
Merge: 0876416 55128d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 18:42:42 2012 +0000

    Merge "separate Metadata logic away from the web service"

commit 0876416ecee44bd60352b41b2372ce048366f59d
Merge: e4b4d34 9e337da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 18:38:09 2012 +0000

    Merge "Revert "Fix nova-manage backend_add with sr_uuid""

commit 2020fba6731634319a0d541168fbf45138825357
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri Jun 15 11:12:45 2012 -0600

    Present correct ec2id format for volumes and snaps
    
    Fixes bug 1013765
    * Add template argument to ec2utils.id_to_ec2_id() calls
    
    Change-Id: I5e574f8e60d091ef8862ad814e2c8ab993daa366

 nova/api/ec2/ec2utils.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 152cf6f592a40b54cfb8b0132aee944e5533d54d
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue May 29 11:54:35 2012 -0700

    xensm: Fix xensm volume driver after uuid changes
    
    Fixes Bug 1013436
    Minor fixes after uuid in volumes were changed from
    integers.
    The parameters passed to create_vdi have changed, so
    modify the call from SM code accordingly
    
    Change-Id: I3d61f0221b23bba9a9e218209d5293be8960e2e2

 nova/virt/xenapi/vm_utils.py  |   15 +++++++++++----
 nova/virt/xenapi/volumeops.py |    6 ++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

commit e4b4d3472341a30fc394e5c7e05d2307991711da
Merge: 7663605 cbd334d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 15 13:37:19 2012 +0000

    Merge "Unwrap httplib.HTTPConnection after WsgiLimiterProxyTest."

commit 76636056d29b87f8bac95ca302621d9158d615e4
Merge: 7097e01 d15f303
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 14 22:02:05 2012 +0000

    Merge "Add missing ack to impl_qpid."

commit d1ee82af65fae2467544b4c3a5062dae544badd7
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Jun 14 21:31:20 2012 +1000

    Cleanup instance_update so it only takes a UUID.
    
    You know when you try to do something simple like tweak
    instance_update and instance_update_and_get_original and
    it turns out to have all these knock on effects? Yeah,
    that.
    
    I still think this is a good idea though. I'd like to live
    in a future where we don't have instance ids at all at the
    DB API level. We need to do this to get there.
    
    Change-Id: Ia51d06beaec068a8544642a6a4bf489247ff61a0

 nova/api/ec2/ec2utils.py                           |    7 +
 nova/compute/api.py                                |    2 +-
 nova/compute/manager.py                            |   64 ++++---
 nova/db/api.py                                     |    9 +-
 nova/db/sqlalchemy/api.py                          |   21 +--
 nova/tests/api/ec2/test_cloud.py                   |    6 +-
 .../api/openstack/compute/test_server_actions.py   |   11 +-
 nova/tests/api/openstack/compute/test_servers.py   |   20 +-
 nova/tests/compute/test_compute.py                 |  198 +++++++++-----------
 nova/tests/test_db_api.py                          |   10 +-
 nova/tests/test_libvirt.py                         |    2 +-
 nova/tests/test_notifications.py                   |    4 +-
 nova/tests/test_xenapi.py                          |    4 +-
 nova/virt/libvirt/connection.py                    |    6 +-
 nova/virt/xenapi/vmops.py                          |    9 +-
 15 files changed, 185 insertions(+), 188 deletions(-)

commit 7097e01a15ecd5c28b6b771e5043f18da243607e
Author: deevi rani <deevi_rani@persistent.co.in>
Date:   Thu May 3 06:42:47 2012 -0400

    Updates the cache
    
    fixes bug 939122
    
    Following are the changes done:
    1. in compute/api.py to display the
       floating ip in nova list command upon
       its association with an instance.
    2. in network/api.py to solve the similar
       issue upon the floating ip disassocaition
    Updated version of: https://review.openstack.org/#/c/7059
    
    Change-Id: Ief1a3f544c3d14bd61cc0814612df3ee521ddec2

 Authors             |    1 +
 nova/compute/api.py |    2 ++
 nova/network/api.py |    8 ++++++++
 3 files changed, 11 insertions(+)

commit f28731c1941e57b776b519783b0337e52e1484ab
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 13 10:11:04 2012 -0400

    Add libvirt min version check.
    
    Fixes LP Bug #1012689.
    
    Change-Id: I91c0b7c41804b2b25026cbe672b9210c305dc29b

 nova/tests/fakelibvirt.py       |    3 +++
 nova/virt/libvirt/connection.py |   16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

commit aa1e71d1b313f80f5581b1422e3f3e5719569e50
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Jun 14 12:34:08 2012 -0400

    Ensure dnsmasq accept rules are preset at startup.
    
    Fix bug 1000853.
    
    This bug reported that after restarting nova-network, the dnsmasq ACCEPT
    iptables rules were no longer present, causing instances to lose their
    IP addresses.  This patch updates the restart_dhcp() function in the
    linux_net driver to ensure these rules are present even if dnsmasq was
    already running.  Before this was only done when first starting dnsmasq.
    
    Change-Id: Icfbe6177d4c913c3d7755ca40a71752bcdaa4448

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit 2adeb5a76d8376d3506f4c63ec73211bfa1e5cc0
Merge: 81fef25 123b28c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 14 15:43:34 2012 +0000

    Merge "Dedupe native and EC2 security group APIs."

commit 81fef25e96b20f69f58044fa341b108edea67d93
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 14 07:47:07 2012 -0400

    Re-add private _compute_node_get call to sql api.
    
    Re-adds a private _compute_node_get call to the sql api.
    This call is in used by the compute manager.
    
    Fixes LP Bug #1013061.
    
    Change-Id: I28c578509ac70ac7bccede41c3210a46ae56e717

 nova/db/sqlalchemy/api.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 9ce657702cbc4312669f364e68b0c1faefd0f0af
Author: daisy-ycguo <daisy.ycguo@gmail.com>
Date:   Thu Jun 14 10:32:21 2012 +0800

    bug #996880 change HostNotFound in hosts to HTTPNotFound
    
    Change-Id: Ib8b7f1f26c2370e2a82b491d8774797985c0ae98

 nova/api/openstack/compute/contrib/hosts.py        |    3 ++-
 .../api/openstack/compute/contrib/test_hosts.py    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit cbd334d0a8b12bb78ff40a4bdc696a80fa6a393a
Author: Eric Harney <eharney@gmail.com>
Date:   Tue Jun 12 21:23:47 2012 -0400

    Unwrap httplib.HTTPConnection after WsgiLimiterProxyTest.
    
    Fixes bug 1007307.
    
    Change-Id: I0b84d29a86a727b611f60f6be15a6d0d21c17a4b

 Authors                                         |    1 +
 nova/tests/api/openstack/compute/test_limits.py |   12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

commit cd085d0ce74fc478c04f1f61c0e5c22d7aa6d208
Merge: 47a8683 46b88ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 23:08:13 2012 +0000

    Merge "Add two missing indexes for instance_uuid columns."

commit 47a8683dac310c7542e1ad805f678a5dd3d6ed7b
Merge: 57b1f1d 1a2efba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 23:02:55 2012 +0000

    Merge "Remove unused DB calls"

commit 57b1f1d9c22663fb6bb165d7f56e9b05d40297a3
Merge: 004b97f 3114a97
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 22:03:18 2012 +0000

    Merge "Update default policies for KVM guest PIT & RTC timers"

commit 004b97fbf16e9e2b1d7efb6cf64ce64553f7cbff
Merge: 85db093 573ada5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 21:56:12 2012 +0000

    Merge "Add support for configuring libvirt VM clock and timers"

commit 85db093bea5972ecea25474ee9081623788b8e49
Merge: dfcaa32 a5b9237
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 20:57:20 2012 +0000

    Merge "Log warnings instead of full exceptions for AMQP reconnects."

commit dfcaa325f7a6925f59123a33bd509ebc6c04bd03
Merge: e80b339 e0540df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 20:50:10 2012 +0000

    Merge "blueprint lvm-disk-images"

commit e80b33948292634666d0dad0d18bb83a9997acd7
Merge: cb8a51b f03b728
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 20:49:29 2012 +0000

    Merge "Log connection_type deprecation message as WARNING"

commit cb8a51bbe63f2b4b1aa0e108f74bb6092c3898eb
Merge: 9e0c684 294dd45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 20:40:48 2012 +0000

    Merge "Remove utils.deprecated functions."

commit a5b923722c75dbfbb0a44c0f6ef6542db3c3aee2
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 13 12:25:54 2012 -0500

    Log warnings instead of full exceptions for AMQP reconnects.
    
    Fixes bug 1010147.
    
    Change-Id: I1af7614330307dfdf5c723710334a168bc30b50f

 nova/rpc/impl_kombu.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d15f3034dfab05ef0ec02b4e353b3dfa1512db35
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jun 12 17:07:18 2012 -0400

    Add missing ack to impl_qpid.
    
    Fix bug 1012374.
    
    Johannes Erdfelt pointed out that impl_qpid wasn't acking messages that
    it received.  This turned out to be a nasty oversight, resulting in
    unbounded message queue growth inside of the python-qpid library.  This
    fixes it.
    
    Change-Id: I0370293807f0282e1dbdd59246f70be031e888a9

 nova/rpc/impl_qpid.py       |    7 ++++++-
 nova/tests/rpc/test_qpid.py |    4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 9e0c6845562dcd8e294841ac06aad559247de0cf
Merge: 6555c5a ad0031c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 12 21:29:05 2012 +0000

    Merge "implement sql-comment-string stack traces"

commit e0540dfed1c1276106105aea8d5765356961ef3d
Author: Boris Filippov <bfilippov@griddynamics.com>
Date:   Wed May 16 15:17:53 2012 +0400

    blueprint lvm-disk-images
    
    Add ability to use LVM volumes for VM disks.
    
    Implements LVM disks support for libvirt driver.
    
    VM disks will be stored on LVM volumes in volume group
     specified by `libvirt_images_volume_group` option.
     Another option `libvirt_local_images_type` specify which storage
     type will be used. Supported values are `raw`, `lvm`, `qcow2`,
     `default`. If `libvirt_local_images_type` = `default`, usual
     logic with `use_cow_images` flag is used.
    Boolean option `libvirt_sparse_logical_volumes` controls which type
     of logical volumes will be created (sparsed with virtualsize or
     usual logical volumes with full space allocation). Default value
     for this option is `False`.
    Commit introduce three classes: `Raw`, `Qcow2` and `Lvm`. They contain
     image creation logic, that was stored in
     `LibvirtConnection._cache_image` and `libvirt_info` methods,
     that produce right `LibvirtGuestConfigDisk` configurations for
     libvirt. `Backend` class choose which image type to use.
    
    Change-Id: I0d01cb7d2fd67de2565b8d45d34f7846ad4112c2

 Authors                           |    1 +
 nova/rootwrap/compute.py          |    9 +
 nova/tests/fake_imagebackend.py   |   48 +++++
 nova/tests/fake_libvirt_utils.py  |   16 ++
 nova/tests/test_imagebackend.py   |  392 +++++++++++++++++++++++++++++++++++++
 nova/tests/test_libvirt.py        |   27 +--
 nova/tests/test_virt_drivers.py   |    2 +
 nova/virt/disk/api.py             |    8 +-
 nova/virt/libvirt/connection.py   |  269 ++++++++++---------------
 nova/virt/libvirt/imagebackend.py |  255 ++++++++++++++++++++++++
 nova/virt/libvirt/utils.py        |   55 ++++++
 11 files changed, 900 insertions(+), 182 deletions(-)

commit 1a2efbaaf89303cc5977b832b784c23ad219b0d7
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Jun 11 15:10:40 2012 -0700

    Remove unused DB calls
    
    Fixes bug 1012301: Remove unused Cells code
    
    Change-Id: I7e78e7c4ae3b099c775be2acc54b37f1e1b9883e

 nova/db/api.py               |   43 --------------------------
 nova/db/sqlalchemy/api.py    |   70 ------------------------------------------
 nova/db/sqlalchemy/models.py |   19 ------------
 nova/exception.py            |    4 ---
 4 files changed, 136 deletions(-)

commit 3114a97ba188895daff4a3d337b2c73855d4632d
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Mon Jun 11 17:16:10 2012 +0100

    Update default policies for KVM guest PIT & RTC timers
    
    The default policies for the KVM guest PIT and RTC timers
    are not very good at maintaining reliable time in guest
    operating systems. In particular Windows 7 guests will
    often crash with the default KVM timer policies, and old
    Linux guests will have very bad time drift
    
    Set the PIT such that missed ticks are injected at the
    normal rate, ie they are delayed
    
    Set the RTC such that missed ticks are injected at a
    higher rate to "catch up"
    
    This corresponds to the following libvirt XML
    
      <clock offset='utc'>
        <timer name='pit' tickpolicy='delay'/>
        <timer name='rtc' tickpolicy='catchup'/>
      </clock>
    
    And the following KVM options
    
      -no-kvm-pit-reinjection
      -rtc base=utc,driftfix=slew
    
    This should provide a default configuration that works
    acceptably for most OS types. In the future this will
    likely need to be made configurable per-guest OS type.
    
    Fixes LP bug #1011848
    
    Change-Id: Iafb0e2192b5f3c05b6395ffdfa14f86a98ce3d1f
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py      |   15 +++++++++++++++
 nova/virt/libvirt/connection.py |   18 ++++++++++++++++++
 2 files changed, 33 insertions(+)

commit 573ada525b8a7384398a8d7d5f094f343555df56
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Tue May 1 17:09:32 2012 +0100

    Add support for configuring libvirt VM clock and timers
    
    There are a number of time sources made available to guests,
    each of which have a number of configurable policies. This
    introduces config APIs for the libvirt domain XML to configure
    the clock time sources
    
    Change-Id: Ic5047b02b4753f20bb9a63e85130d84258df7a28
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_config.py |   92 +++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/config.py       |   65 ++++++++++++++++++++++++++
 2 files changed, 157 insertions(+)

commit 123b28cd1a4ffa1e972e29963cb0e6be46b0d7c2
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Tue May 22 13:35:06 2012 +0100

    Dedupe native and EC2 security group APIs.
    
    Reduce the code duplication in the native openstack and EC2 APIs
    related to security groups, by factoring commonality into a new
    internal SecurityGroupAPI.
    
    Also fixes bug lp 1005931
    
    Change-Id: Ifb92bf5d0f07d5713818a3eee6175ef03e8c0b7c

 nova/api/ec2/cloud.py                              |  376 +++---------
 .../openstack/compute/contrib/security_groups.py   |  428 ++++---------
 nova/compute/api.py                                |  648 +++++++++++++++-----
 nova/compute/rpcapi.py                             |  171 +++---
 nova/network/manager.py                            |   11 +-
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 nova/tests/compute/test_compute.py                 |   16 +-
 nova/tests/compute/test_rpcapi.py                  |    9 +-
 nova/tests/policy.json                             |    4 +-
 9 files changed, 835 insertions(+), 830 deletions(-)

commit 6555c5a8728c5eed9fc104894fdb988a5c9d3e0b
Merge: b1b0936 b1dc846
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 12 03:26:44 2012 +0000

    Merge "add unit tests for new virt driver loader"

commit 46b88ca9c0bf90d5511f365f0b08b8b6fc0ca82c
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Jun 12 10:11:57 2012 +1000

    Add two missing indexes for instance_uuid columns.
    
    sqlite has these indexes because they were in the sql scripts, but
    they're missing from the other database engines.
    
    Change-Id: I2a1935f6eb577d2c3d2eb177c083ad647f76f58f

 .../versions/104_instance_indexes_2.py             |   43 ++++++++++++++++++++
 .../migrate_repo/versions/104_sqlite_downgrade.sql |    1 +
 .../migrate_repo/versions/104_sqlite_upgrade.sql   |    1 +
 3 files changed, 45 insertions(+)

commit 9e337dac2960bbe8eaa4fbe3a8e5ca3e5e228936
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue May 29 11:45:57 2012 -0700

    Revert "Fix nova-manage backend_add with sr_uuid"
    
    Fixes bug 988596
    
    Change 77495cfe breaks storage manager, as it makes a
    wrong assumption about nova-manage. The sr-uuid must be
    generated and provided by the xenapi storage manager.
    
    When the volume service is started, SM volume driver will
    create a new SR for everything that does not have an
    existing sr_uuid and will populate the db with the result.
    It will only introduce the SRs that do have one. The introduce
    will work only if the uuid provided is something SM understands.
    
    This partially reverts commit 77495cfed17f12f225e11fbc10e0f8db516dadf2.
    Changes in db are left intact.
    
    Change-Id: I8405ac905a15f829f704951b94297f3b6f6c0a29

 bin/nova-manage |   43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

commit b5ddcb2a91caac505b0ad35f65f058cdd80f9ec9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 11 19:47:18 2012 +0000

    Adds property to selectively enable image caching.
    
    The image-property `cache_in_nova` can be used to choose which images
    should be cached in Nova. One use-case would be to cache base images but
    not any customer snapshots.
    
    Change-Id: I1b8ac914a6effd4cd4653aae7e4eac9d14d0e7bd

 nova/flags.py                |    9 ++++++---
 nova/virt/xenapi/vm_utils.py |   28 +++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

commit 294dd459827c3d79ae684f9f206bcc213c69dd12
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 11 15:48:12 2012 -0400

    Remove utils.deprecated functions.
    
    We don't seem to use utils.deprecated at all... so lets
    remove it and save ourselves 200 lines of code.
    
    Also moves a couple misc. test cases in utils.py out of the
    DeprecationTest suite and into the GenericUtilsTestCase
    suite.
    
    Change-Id: I03f71f2ee06a526a8902a3079257afd6fd65dc59

 nova/tests/test_utils.py |  200 +++++++++++-----------------------------------
 nova/utils.py            |  168 --------------------------------------
 2 files changed, 45 insertions(+), 323 deletions(-)

commit b1b09368f07b178416949b045f459bd00ec491a3
Merge: 9072639 0efa0da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 11 19:13:27 2012 +0000

    Merge "Add indexes to new instance_uuid columns."

commit f03b728989673d06f49e349a23b9ad2ffc66753e
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 11 15:08:32 2012 -0400

    Log connection_type deprecation message as WARNING
    
    Updates the connection_type log messages to log as
    a warning instead of an error.
    
    Fixes LP Bug #1011788.
    
    Change-Id: I4cc2d9d5fdea2c8871f760b73a905fe61edcbe8f

 nova/virt/connection.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b1dc846170e67ce63ef78d9ef86fe287cb97c9a1
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Fri Jun 1 17:19:54 2012 -0400

    add unit tests for new virt driver loader
    
    Continues work on bp:virt-driver-cleanup
    
    Add unit tests to test the loading of the new and old style loaders
    
    Fix libvirt driver to make read_only optional on the constructor
    
    Fix fake driver to correctly have the kwarg be read_only
    
    Add VirtDriverNotFound exception to make get_connection failures more
    explicit
    
    Factor out fake backend replacement (currently just libvirt) to a
    seperate super class
    
    Remove touching FLAGS and use self.flags instead
    
    Change-Id: I089d0dd9c97f87478b922f4c3e26c45891eaf6cc

 nova/compute/manager.py         |    1 +
 nova/exception.py               |    4 +
 nova/tests/test_virt_drivers.py |  168 ++++++++++++++++++++++++++++-----------
 nova/virt/connection.py         |    4 +-
 nova/virt/fake.py               |    2 +-
 nova/virt/libvirt/connection.py |    2 +-
 6 files changed, 131 insertions(+), 50 deletions(-)

commit 9072639e9440cd1b0a0c75904a13cb6a5111a0f4
Merge: 7bdf35e 1c5df79
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 11 15:06:16 2012 +0000

    Merge "instance_destroy now only takes a uuid."

commit 7bdf35eb11e41624aa1888dfe9eb4ebae330ff33
Merge: bbdf82c 294de0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 11 13:18:34 2012 +0000

    Merge "Do not attempt to kill already-dead dnsmasq"

commit 294de0ec6c6b2f5d39dcdc3687a42095fca01288
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jun 11 11:37:07 2012 +0200

    Do not attempt to kill already-dead dnsmasq
    
    Check that the dnsmasq process is running (and actually looks like a
    dnsmasq process) before attempting to kill it. Fixes bug 1010275.
    
    Change-Id: Ib49209e1624dfb30470adbe13d7fc045ec1fdf83

 nova/network/linux_net.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit bbdf82c5ec3e31a5dc43948291c4f37ce1098714
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jun 11 09:23:33 2012 +0200

    Only invoke .lower() on non-None protocols
    
    When using source group based security group rules (rather than CIDR
    based ones), it's permissible to not set a protocol and port. However,
    Nova would always try to convert the protocol to lower case, which would
    fail if the protocol wasn't set.
    
    Fixes bug 1010514
    
    Change-Id: I9b1519a52ececd16a497acebfe022508cbe96126

 .mailmap                   |    1 +
 nova/tests/test_libvirt.py |    7 +++++++
 nova/virt/firewall.py      |    6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

commit 3ea7dcc6432d6247cb1dc536c31684b595841633
Merge: c3a12e6 5157401
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:56:47 2012 +0000

    Merge "Do not always query deleted instance_types."

commit c3a12e6eafc4563ef44101629f1f4363c9cefdab
Merge: c952a8c a1f430d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:49:51 2012 +0000

    Merge " Fixes bug lp:999928"

commit c952a8cb1bb775aef5eb6fd10aad81cdd445d01b
Merge: 168a8a1 6e83d78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:48:16 2012 +0000

    Merge changes Ic1378da2,I0f279ce6
    
    * changes:
      Rename image to image_id.
      Avoid partially finished cache files.

commit 168a8a15bea6ee755219f9471ac790e40942e77d
Merge: 7e3f593 2d1d124
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:44:11 2012 +0000

    Merge "Fix power_state mis-use bug 1010586"

commit 7e3f593e11f7cf8f47d3fafba94b451caa58df3d
Merge: bfb1c0a 34a00da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:29:03 2012 +0000

    Merge "fixes bug 1010200"

commit bfb1c0af2ecb7704f414c84324921b875674fa2c
Merge: 1fea9a2 3006297
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:15:01 2012 +0000

    Merge "Resolve unittest error in rpc/impl_zmq"

commit 1fea9a2f03aad246d7daf6f1e1390e771138fe2d
Merge: d6c0f5d 197a424
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 20:11:47 2012 +0000

    Merge "Add user_name project_name and color option to log"

commit d6c0f5dc4cbaab72c1accbcc3e04c44bc9623a39
Merge: e391180 32f84e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 10 19:59:08 2012 +0000

    Merge "Fix whitespace in sqlite steps."

commit 0efa0da2313ae4fffca1a17e820262185d60a402
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Jun 9 14:04:15 2012 +1000

    Add indexes to new instance_uuid columns.
    
    Resolves bug 1009738 as well as several other bugs that haven't been
    reported yet.
    
    Change-Id: I09b456df70aaaba1bc4ac00514e63bda804d7f92

 .../migrate_repo/versions/103_instance_indexes.py  |   43 ++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 1c5df791b5024b1934f728df4797f2a722a51d6e
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Jun 7 10:55:13 2012 +1000

    instance_destroy now only takes a uuid.
    
    As requested in https://review.openstack.org/#/c/8218/. You'll get an
    exception if you pass a non-uuid in.
    
    Change-Id: I0e54eeba7ea65fa8f6640b47c47abf8c7b4f6b79

 nova/compute/api.py                                |    7 +-
 nova/db/api.py                                     |    4 +-
 nova/db/sqlalchemy/api.py                          |   14 +-
 nova/tests/api/ec2/test_cloud.py                   |   24 +--
 .../api/openstack/compute/contrib/test_hosts.py    |    4 +-
 nova/tests/compute/test_compute.py                 |  156 ++++++++++----------
 nova/tests/console/test_console.py                 |   24 +--
 nova/tests/test_db_api.py                          |    2 +-
 nova/tests/test_libvirt.py                         |   18 +--
 nova/tests/test_quota.py                           |   19 +--
 nova/tests/test_volume.py                          |    4 +-
 nova/tests/test_xenapi.py                          |    2 +-
 12 files changed, 138 insertions(+), 140 deletions(-)

commit 5157401f20158b2b99d01796f73a8ba5368c80a2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jun 8 15:18:13 2012 -0400

    Do not always query deleted instance_types.
    
    When converting from flavorid to instance_type_id in the OSAPI,
    it isn't always desired to return deleted instance_types. In the case
    of OSAPI create(), we explicitly do not want to query deleted flavors.
    
    Fixes bug 1010638
    
    Change-Id: I9c26c7130f8c3d6680143e36b4aaa1f662c682a7

 nova/api/openstack/compute/servers.py |    2 +-
 nova/compute/instance_types.py        |    4 ++--
 nova/tests/test_instance_types.py     |   17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

commit e3911801f6814ebc8aeed1e6b4284fbfb2e74192
Merge: 01ad153 ad04586
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 8 18:17:43 2012 +0000

    Merge "Use OSError instead of ProcessExecutionError."

commit 6e83d7869b2492c56ac540a5702314a504b75064
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 8 17:42:56 2012 +0000

    Rename image to image_id.
    
    The variable name `image` was a bit misleading since we're dealing with
    an ID and not an Image object. This renames the variables to clarify
    that fact.
    
    Includes some other small cleanups like using new-style classes and replacing
    `if X is True` with `if X`.
    
    Change-Id: Ic1378da203cfb3e199b9d2f1a14911bc7e24a1f5

 nova/exception.py            |    2 +-
 nova/virt/xenapi/vm_utils.py |   60 +++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

commit 93ca3da26bad785b1f30c3be5947de4f9f6d14af
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 8 00:15:41 2012 +0000

    Avoid partially finished cache files.
    
    `VDI.copy` stores half-completed files directly in the SR where we may
    inadvertenly make use of them. To avoid these 'half-baked' records, we
    compare its current size to its expected size.
    
    Fixes bug 1009750
    
    Change-Id: I0f279ce69bfa0842a6bc74f19fd61462c6013b28

 nova/virt/xenapi/vm_utils.py |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 2d1d124982d3f67f587767012aaf260d9ddc217b
Author: Yun Mao <yunmao@gmail.com>
Date:   Fri Jun 8 11:16:26 2012 -0400

    Fix power_state mis-use bug 1010586
    
    SHUTDOWN and SHUTOFF are merged to SHUTDOWN in power state.
    
    Change-Id: If6a64076a3c23837ee18a34dcbd0a08fd46ab57f

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01ad153b338c9df264e86b8211e82a811ae6332c
Merge: 4803074 dfa9e52
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 8 15:59:28 2012 +0000

    Merge "Make eventlet backdoor play nicer with gettext"

commit 30062970e70adae61b12eb64f59c62b80e533f9f
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Jun 8 16:57:33 2012 +0800

    Resolve unittest error in rpc/impl_zmq
    
    Fixes bug #1010376
    
    Remove ensure_ascii=True from dumps function.
    
    Change-Id: Ifb2f12371d3262a5765e4434178621d401e8c610

 nova/rpc/impl_zmq.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32f84e93638a071707f66e39f2d99e8f3007d998
Author: Michael Still <mikal@stillhq.com>
Date:   Fri Jun 8 09:49:07 2012 +1000

    Fix whitespace in sqlite steps.
    
    Change-Id: I06b7d4296512e4659961f40e3ca7b3395c0704cf

 .../migrate_repo/versions/102_sqlite_downgrade.sql |   26 ++++++++++----------
 .../migrate_repo/versions/102_sqlite_upgrade.sql   |   24 +++++++++---------
 2 files changed, 25 insertions(+), 25 deletions(-)

commit dfa9e5210cc3569dc2d5d8fc3ea45e610c766ffc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 7 22:59:41 2012 +0000

    Make eventlet backdoor play nicer with gettext
    
    Fixes bug 1010236
    
    Implement a new sys.displayhook that doesn't overwrite __builtin__._
    that was set by gettext
    
    Change-Id: Id3c0a331eb6f98240fe1e4d0b083c72e28f99c53

 nova/common/eventlet_backdoor.py |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 197a424bb43c57c6362d3df4c0d1c9528e823b5d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 1 23:12:56 2012 +0000

    Add user_name project_name and color option to log
    
     * adds project_name and user_name to context for logging
     * adds color argument to logging which allows for colored
       log output based on the log level
    
    Change-Id: If37d646fdba77d4214f72b19e5df02da5f7dbac6

 nova/api/auth.py         |    4 ++++
 nova/api/ec2/__init__.py |    4 ++++
 nova/context.py          |    9 +++++++--
 nova/log.py              |   17 ++++++++++++++++-
 4 files changed, 31 insertions(+), 3 deletions(-)

commit 34a00da7206857c975227a8301ed892270a1632d
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu Jun 7 16:20:02 2012 -0400

    fixes bug 1010200
    
    volume['id'] is no longer integer
    
    Change-Id: I5a9f59618569a9702297154d29b703562fe36ee9

 nova/volume/driver.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4803074f2c02c87310c486f66fb66be98533805f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 1 12:29:24 2012 -0700

    Fixes affinity filters when hints is None
    
     * Fixes bug 1007573
     * Includes failing tests
    
    Change-Id: I827588f0694c5dd7b5e8ff3173d4794a55946d81

 nova/scheduler/filters/affinity_filter.py |    6 ++---
 nova/tests/scheduler/test_host_filters.py |   37 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

commit 089300fd4bcecaacd2ea3fa345a1b6b2c5b2ab61
Merge: 7bf79a1 fe5706c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 18:55:34 2012 +0000

    Merge "Convert consoles to use instance uuid."

commit 7bf79a132b1826bc29b1c15ebfc7356c14f42515
Merge: f088bdf 3dce38f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 18:55:26 2012 +0000

    Merge "Replace standard json module with openstack.common.jsonutils"

commit f088bdfd1cabcb5d03f473d20d7e76e3287acd9c
Merge: cf34a60 8db54f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 18:45:46 2012 +0000

    Merge "Don't query nova-network on startup."

commit ad0031c7fbfd0461b4b804b3a75a48212d5c9e9f
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri Jun 1 12:54:22 2012 -0700

    implement sql-comment-string stack traces
    
    Implements solution for bug 1007648.
    
    Add python stack traces to all sql comment strings so that someone
    looking at database query logs can immediately see what code
    generated each query. This is especially powerful when combined
    with pt-query-digest to get per-file or per-method aggregates.
    
    Change-Id: Ieda5cf4d70cc2643d27fb00efb48de14ca2abe52

 Authors                       |    1 +
 nova/db/sqlalchemy/session.py |   47 +++++++++++++++++++++++++++++++++++++++++
 nova/flags.py                 |   11 ++++++----
 3 files changed, 55 insertions(+), 4 deletions(-)

commit cf34a6015762a82780f86004a76439e1e21340f8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sun Jun 3 13:03:21 2012 -0400

    Finalize tox config.
    
    Shrink tox.ini to the new short version.
    Fix the test cases to be able to be run in nosetets plus the
    openstack.nose_plugin, which finally removes the need for
    nova/testing/runner.py
    Also, now we'll just output directly to stdout, which will
    make nose collect the trace logging directly and either output
    it at the end of the run, or inject it into the xunit output
    appropriately.
    
    Change-Id: I1456e18a11a840145492038108bdfe812c8230d1

 .coveragerc                         |    6 +
 .gitignore                          |    7 +-
 contrib/boto_v6/ec2/connection.py   |    2 +-
 nova/log.py                         |    4 +-
 nova/network/linux_net.py           |    6 +-
 nova/testing/runner.py              |  368 -----------------------------------
 nova/tests/__init__.py              |    8 +
 nova/tests/test_iptables_network.py |   22 ++-
 run_tests.sh                        |   11 +-
 setup.cfg                           |    9 +-
 tools/test-requires                 |    3 +-
 tox.ini                             |   28 +--
 12 files changed, 65 insertions(+), 409 deletions(-)

commit a1f430d30149637e07a288c70b40edd57600f8b8
Author: yaguang tang <heut2008@gmail.com>
Date:   Thu Jun 7 21:06:40 2012 +0800

     Fixes bug lp:999928
    
        The CIDR affinity filter currently matches the scheduler's IP address against
         the network specified by the 'build_near_host_ip' and 'cidr' scheduler hints.
         It should be matching each compute host's IP address against the network
         in the scheduler hints.
         Ensure that the compute host's IP address is reported as part of host_state
         and use this value in the filter.
         this issue has been talked at https://review.openstack.org/#/c/7470/
    
    Change-Id: I14eac8797dfe8aaf870bb31ef7bf87edcf691f93

 nova/compute/manager.py                   |    1 +
 nova/scheduler/filters/affinity_filter.py |    7 ++++---
 nova/tests/scheduler/test_host_filters.py |   10 ++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

commit 281979a7b602b3555617394a468871e8d237acf2
Merge: 7b7febb 7c847bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 15:36:40 2012 +0000

    Merge "Cleans up power_off and power_on semantics"

commit fe5706cb973e1cddecdeed9580fc9d9bbdc848fd
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Jun 7 11:16:23 2012 +1000

    Convert consoles to use instance uuid.
    
    Continued work on blueprint finish-uuid-conversion.
    
    Change-Id: I4032419d66e9bbb17b770d8974a92a136bf9c5d2

 nova/console/api.py                                |   40 +++++-----
 nova/console/manager.py                            |    7 +-
 nova/console/vmrc_manager.py                       |    2 +-
 nova/db/api.py                                     |   12 +--
 nova/db/sqlalchemy/api.py                          |   20 ++---
 .../versions/102_consoles_uses_uuid.py             |   80 ++++++++++++++++++++
 .../migrate_repo/versions/102_sqlite_downgrade.sql |   72 ++++++++++++++++++
 .../migrate_repo/versions/102_sqlite_upgrade.sql   |   72 ++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/exception.py                                  |    4 +-
 nova/tests/console/test_console.py                 |    4 +-
 11 files changed, 270 insertions(+), 45 deletions(-)

commit ad045864508855361c1ada70c2ef6b8aab0ef2b4
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Jun 6 21:26:02 2012 -0400

    Use OSError instead of ProcessExecutionError.
    
    This patch updates the ZeroMQ test module to use OSError in one place
    instead of ProcessExecutionError from nova.exception.  In a previous rev
    of this code, it was using nova.utils.execute(), but no longer does.
    
    Change-Id: I3dac2981b5c1a7cd5fc0e4e8dbf0a2d378a1d136

 nova/tests/rpc/test_zmq.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3dce38f32559659978dd2ae69e9ffcb39c608582
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Sun Jun 3 16:36:06 2012 +0800

    Replace standard json module with openstack.common.jsonutils
    
    Implements blueprint use-common-jsonutils
    
    1. Edit openstack-common.conf and import nova/openstack/common/jsonutils.py
    2. Remove json package imports and replace with jsonutils
    
    Places where using json.load hasn't changed.
    
    Change-Id: Ie6feab605fb0474fd505c56ef57b7a9ecfa5269d

 bin/nova-manage                                    |    4 +-
 nova/api/openstack/compute/limits.py               |    6 +-
 nova/auth/fakeldap.py                              |    7 +-
 nova/console/vmrc.py                               |   14 +--
 nova/image/glance.py                               |    6 +-
 nova/log.py                                        |    4 +-
 nova/network/model.py                              |    6 +-
 nova/network/quantum/melange_connection.py         |   29 +++---
 nova/notifier/log_notifier.py                      |    5 +-
 nova/openstack/common/policy.py                    |    9 +-
 nova/rpc/impl_fake.py                              |    4 +-
 nova/rpc/impl_qpid.py                              |    6 +-
 nova/rpc/impl_zmq.py                               |    6 +-
 nova/scheduler/filters/json_filter.py              |    4 +-
 nova/scheduler/filters/trusted_filter.py           |    6 +-
 nova/tests/api/openstack/common.py                 |    6 +-
 .../api/openstack/compute/contrib/test_accounts.py |   18 ++--
 .../compute/contrib/test_admin_actions.py          |   28 ++++--
 .../compute/contrib/test_console_output.py         |   17 ++--
 .../api/openstack/compute/contrib/test_consoles.py |   15 ++-
 .../compute/contrib/test_createserverext.py        |    6 +-
 .../contrib/test_extended_server_attributes.py     |    7 +-
 .../compute/contrib/test_extended_status.py        |    7 +-
 .../compute/contrib/test_flavor_manage.py          |    8 +-
 .../compute/contrib/test_flavorextradata.py        |    6 +-
 .../api/openstack/compute/contrib/test_keypairs.py |   31 +++---
 .../openstack/compute/contrib/test_multinic_xs.py  |   11 +-
 .../api/openstack/compute/contrib/test_rescue.py   |   17 ++--
 .../compute/contrib/test_server_diagnostics.py     |    4 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    8 +-
 .../openstack/compute/contrib/test_snapshots.py    |   15 ++-
 .../compute/contrib/test_virtual_interfaces.py     |    5 +-
 .../api/openstack/compute/contrib/test_volumes.py  |   20 ++--
 nova/tests/api/openstack/compute/test_api.py       |    5 +-
 .../tests/api/openstack/compute/test_extensions.py |   27 +++--
 .../api/openstack/compute/test_image_metadata.py   |   22 ++--
 nova/tests/api/openstack/compute/test_limits.py    |   14 +--
 .../api/openstack/compute/test_server_metadata.py  |   52 +++++-----
 nova/tests/api/openstack/compute/test_servers.py   |  106 ++++++++++----------
 nova/tests/api/openstack/compute/test_urlmap.py    |   18 ++--
 nova/tests/api/openstack/compute/test_versions.py  |   13 ++-
 nova/tests/api/openstack/test_faults.py            |    6 +-
 nova/tests/api/openstack/volume/test_extensions.py |    9 +-
 nova/tests/integrated/api/client.py                |    8 +-
 nova/tests/rpc/test_common.py                      |   14 +--
 nova/tests/scheduler/test_host_filters.py          |   74 +++++++++++---
 nova/tests/scheduler/test_scheduler.py             |   39 ++++---
 nova/tests/scheduler/test_scheduler_options.py     |   12 +--
 nova/tests/test_log.py                             |    6 +-
 nova/tests/xenapi/stubs.py                         |    4 +-
 nova/virt/disk/api.py                              |    4 +-
 nova/virt/libvirt/utils.py                         |    6 +-
 nova/virt/xenapi/fake.py                           |   16 +--
 nova/virt/xenapi/firewall.py                       |    8 +-
 nova/virt/xenapi/host.py                           |    8 +-
 nova/virt/xenapi/pool.py                           |    4 +-
 nova/virt/xenapi/vm_utils.py                       |    4 +-
 nova/virt/xenapi/vmops.py                          |   12 ++-
 nova/volume/nexenta/jsonrpc.py                     |   10 +-
 nova/volume/san.py                                 |    9 +-
 60 files changed, 454 insertions(+), 401 deletions(-)

commit 8db54f3bd590e71c6c6e383c928aa82fc28b3379
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 16:04:16 2012 -0400

    Don't query nova-network on startup.
    
    Fix bug 999698.
    
    nova-compute requested network info for each instance on startup via rpc.
    If all services get (re)started at the same time, nova-network may not
    be available to take this request, resulting in a lost request.  To
    combat this issue, get the network info from the cache in the database
    on startup.  If by some chance this information is not correct, it will
    get fixed up by a periodic task.
    
    Change-Id: I0bbd475e078ac2a67c99c2be4711e86d617c609a

 nova/api/openstack/common.py                       |   10 ++--------
 nova/api/openstack/compute/contrib/cloudpipe.py    |    4 ++--
 nova/compute/manager.py                            |    2 +-
 nova/compute/utils.py                              |    7 +++++++
 .../openstack/compute/contrib/test_cloudpipe.py    |   14 +++++++-------
 5 files changed, 19 insertions(+), 18 deletions(-)

commit 7b7febb02b37420c759eab59b07c7e3e2de9bab1
Merge: 25b665d 29baa0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 23:21:25 2012 +0000

    Merge "Fix bug 1006664: describe non existent ec2 keypair"

commit 25b665d6ec966f3b27af56e2085dda0923728bd5
Merge: 21cd915 ae878fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 23:01:20 2012 +0000

    Merge "Refactor libvirt create calls"

commit 21cd91513591729e6bb8bec27e2f50804d7b0f89
Merge: f120abe bf1ebe7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 23:01:12 2012 +0000

    Merge "Fix whitespace in sqlite steps"

commit f120abe759f368227fd96acd2c68688101322058
Merge: eeffd58 783264b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 23:01:02 2012 +0000

    Merge "Fix libvirt rescue to work with whole disk images"

commit eeffd582f77db0160a075d84c34b82e5403f9ab2
Merge: f1243fb 53cb7ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 22:29:03 2012 +0000

    Merge "Make live_migration a first-class compute API."

commit 7c847bc659e7c493cf009adc417be2e884c3c616
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 1 02:52:57 2012 +0000

    Cleans up power_off and power_on semantics
    
    compute.api changes:
      * improves state handling for delete/restrore
      * removes hack to deal with SHUTOFF on start
      * fixes api tests (volume shouldn't detach on stop)
    
    compute.manager changes:
      * uses power_off/power_on for stop/start
    
    virt.libvirt changes:
      * implements power_off/power_on for libvirt
      * synchronizes usage of domain.create()
      * cleans up usage of instance.name
      * added tests for power_on and power_off
      * fixes bug 1006950
    
    Change-Id: I91845a643e3f97955e7c81ca57c6ee5aa0a3d295

 nova/compute/api.py                |   33 +++++++----------------
 nova/compute/manager.py            |   51 ++++++++++++++++--------------------
 nova/tests/api/ec2/test_cloud.py   |   10 +++----
 nova/tests/compute/test_compute.py |   40 ++++++++++++++--------------
 nova/tests/test_virt_drivers.py    |   16 +++++++++++
 nova/virt/fake.py                  |    6 +++++
 nova/virt/libvirt/connection.py    |   31 +++++++++++++++-------
 7 files changed, 101 insertions(+), 86 deletions(-)

commit ae878fc8b9761d099a4145617e4a48cbeb390623
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 1 01:44:02 2012 +0000

    Refactor libvirt create calls
    
     * minimizes duplicated code for create
     * makes wait_for_destroy happen on shutdown instead of undefine
     * allows for destruction of an instance while leaving the domain
     * uses reset for hard reboot instead of create/destroy
     * makes resume_host_state use new methods instead of hard_reboot
     * makes rescue/unrescue not use hard reboot to recreate domain
    
    Change-Id: I2072f93ad6c889d534b04009671147af653048e7

 nova/tests/fakelibvirt.py       |    5 ++
 nova/tests/test_libvirt.py      |   26 ++++---
 nova/virt/libvirt/connection.py |  144 ++++++++++++++++-----------------------
 3 files changed, 82 insertions(+), 93 deletions(-)

commit f1243fb1e2e2d088b10d3776839c627665977e3e
Merge: 66a7b18 f617896
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 22:15:33 2012 +0000

    Merge "Update libvirt imagecache to support resizes."

commit bf1ebe78cf191fc3f348a0e35bf6f3d15cdbdee4
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Jun 7 07:23:56 2012 +1000

    Fix whitespace in sqlite steps
    
    Change-Id: Ieab9c492aa526903c55f17b87b70fe7c25372f5e

 .../migrate_repo/versions/101_sqlite_downgrade.sql |    6 +++---
 .../migrate_repo/versions/101_sqlite_upgrade.sql   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 66a7b1895dcf0b7b4ad133edeec3d04205e75c41
Merge: 534e6cf 6548c50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 21:49:38 2012 +0000

    Merge "Implements resume_state_on_host_boot for libvirt."

commit f617896efe466a4080a0061fb1c939b76641043b
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 6 17:35:18 2012 -0400

    Update libvirt imagecache to support resizes.
    
    Updates the libvirt image cache manage so that it accounts
    for instances which are resizing.
    
    Also fixes an issue where an exception was thrown when
    the image cache manager ran while instances were resizing.
    This is because instances which are resizing may have files in the
    Nova instances directory which are missing backing files.
    
    Fixes LP Bug #1006616.
    
    Change-Id: I724c6855b68eca24a00893fd96b26b1443f9da5c

 nova/tests/test_imagecache.py   |   42 +++++++++++++++++++++++++++++++-------
 nova/virt/libvirt/imagecache.py |   43 +++++++++++++++++++++++++--------------
 2 files changed, 63 insertions(+), 22 deletions(-)

commit 534e6cf87338d7d47349d6186e622ba73ecb9e40
Merge: 7626472 6228acd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 21:18:37 2012 +0000

    Merge "Unused imports cleanup (folsom-2)"

commit 55128d1c5d2ffda769f7b939dfc7dc6af3bf2e97
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Jun 1 17:24:12 2012 -0400

    separate Metadata logic away from the web service
    
    The changes here are coming as a result of starting on blueprint
    config-drive-v2 [1].  I wanted to separate out the "Metadata" from the
    "Metadata Server".  Thus, the creation of nova/api/metadata/base.py.
    
    The InstanceMetadata in base.py contains most of the logic for
    presenting metadata.  As a result, the Metadata webservice in handler.py
    greatly simplified.  This should make it easier to render duplicate
    data to a config drive.
    
    Additional changes here:
     * a few more tests
     * removal of the separate 'Versions' handler.  Its now replaced
       by the single handler.
    
    Change-Id: I35fcfd8d7f247763954afc0a9f752f629b243e9b

 etc/nova/api-paste.ini       |   18 +--
 nova/api/metadata/base.py    |  255 +++++++++++++++++++++++++++++++++++++++++
 nova/api/metadata/handler.py |  188 ++-----------------------------
 nova/tests/test_metadata.py  |  256 ++++++++++++++++++++++++++----------------
 4 files changed, 425 insertions(+), 292 deletions(-)

commit 29baa0ec661c2578ad0aabd138a6b84e5c7a0b40
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed May 30 18:33:24 2012 -0700

    Fix bug 1006664: describe non existent ec2 keypair
    
    Change-Id: I92bfd6b51aa31abb06e21893174101da31baffd8

 nova/api/ec2/cloud.py            |    5 +++++
 nova/tests/api/ec2/test_cloud.py |    5 +++++
 2 files changed, 10 insertions(+)

commit 7626472ed8eac46f393d7d9ff4d5e8250a4a22b7
Merge: d15d74d cf2b873
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:48:08 2012 +0000

    Merge "Add shared_storage_test methods to compute rpcapi."

commit d15d74dbbd2312f14d12f12fa10cdd6cac00b59a
Merge: 9c59e51 b7744f8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:47:59 2012 +0000

    Merge "Add get_instance_disk_info to the compute rpcapi."

commit 9c59e515a2f12c64bd9c384659c0d4b5bc3c0601
Merge: 9121fc6 dc0751f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:46:02 2012 +0000

    Merge "Add remove_volume_connection to the compute rpcapi."

commit 53cb7ea71409dc7ecfe36f92df63e11231022455
Author: Yun Mao <yunmao@gmail.com>
Date:   Wed Jun 6 15:08:15 2012 -0400

    Make live_migration a first-class compute API.
    
    * Move the trivial implementation from admin_actions to compute.api
    * Remove the dependency to scheduler from admin_actions
    * Add check_instance_state like all other compute APIs to prevent
    undesirable behavior
    
    Change-Id: Ib5176718eae624de982f641bf3ec201fc7b4efcc

 .../api/openstack/compute/contrib/admin_actions.py |   10 ++--------
 nova/compute/api.py                                |   14 ++++++++++++++
 .../compute/contrib/test_admin_actions.py          |    3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

commit 9121fc6b9d6b1a7a9d945cfdad944fa59b648106
Merge: 355aac9 7f56f71
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:00:37 2012 +0000

    Merge "Migrate security_group_instance_association to use a uuid to refer to instances."

commit 355aac94a9d951f828bf8805803f90a6908b3676
Merge: a1feaba 6582517
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 19:42:10 2012 +0000

    Merge "Prefix all nova binaries with 'nova-'."

commit a1feabadef1c067ff7fa00b1019482d1c963aa72
Merge: ff06c7c 244fd4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 19:41:51 2012 +0000

    Merge "Add zeromq driver. Implements blueprint zeromq-rpc-driver"

commit 244fd4d946c59ce9e779d59f19d70a83f21e28fb
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Mon Apr 23 13:48:13 2012 -0400

    Add zeromq driver. Implements blueprint zeromq-rpc-driver
    
    Change-Id: I7d941a97bf250428e70e8a4ee65ab6cb70fdfcfb

 bin/nova-rpc-zmq-receiver  |   77 +++++
 nova/flags.py              |    5 +-
 nova/rpc/__init__.py       |    4 +
 nova/rpc/impl_zmq.py       |  713 ++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/fake_flags.py   |    3 +
 nova/tests/rpc/test_zmq.py |  128 ++++++++
 setup.py                   |    1 +
 7 files changed, 930 insertions(+), 1 deletion(-)

commit ff06c7c885dc94ed7c828e8cdbb8b5d850a7e654
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 6 13:25:04 2012 -0400

    Fix up protocol case handling for security groups.
    
    Fix bug 985184.
    
    When creating security group rules, any case for the protocol was
    accepted as input, such as TCP, Tcp, tcp, etc., and was stored in the
    database as specified.  However, unless specified as all lowercase, the
    code to apply the rules would break and result in some rules not being
    applied.
    
    Change-Id: I6c723d371579eb37a94bd484d39beeb773668ed4

 nova/api/ec2/cloud.py                              |    2 +-
 .../openstack/compute/contrib/security_groups.py   |    2 +-
 nova/virt/firewall.py                              |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 6582517c4a48e134d2ed982d23c49d89560fb05a
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 4 13:35:21 2012 -0400

    Prefix all nova binaries with 'nova-'.
    
    Fixes LP Bug #1008625.
    
    Change-Id: I2b0dc97133b3039818a52e0b8456dc31cdbd714e

 bin/clear_rabbit_queues       |   76 -------------------------------------
 bin/instance-usage-audit      |   83 -----------------------------------------
 bin/nova-clear-rabbit-queues  |   76 +++++++++++++++++++++++++++++++++++++
 bin/nova-instance-usage-audit |   83 +++++++++++++++++++++++++++++++++++++++++
 bin/nova-volume-usage-audit   |   82 ++++++++++++++++++++++++++++++++++++++++
 bin/volume-usage-audit        |   82 ----------------------------------------
 setup.py                      |    8 ++--
 7 files changed, 245 insertions(+), 245 deletions(-)

commit 7f56f71152dc87012d3a303491f531247c030a11
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Jun 6 15:18:51 2012 +1000

    Migrate security_group_instance_association to use a uuid to refer to instances.
    
    Continued work on blueprint finish-uuid-conversion.
    
    Change-Id: Id5c33c2aa3560462aded102c670a82997eeda949

 nova/db/sqlalchemy/api.py                          |    6 +-
 ...ecurity_group_instance_association_uses_uuid.py |   80 ++++++++++++++++++++
 .../migrate_repo/versions/101_sqlite_downgrade.sql |   61 +++++++++++++++
 .../migrate_repo/versions/101_sqlite_upgrade.sql   |   61 +++++++++++++++
 nova/db/sqlalchemy/models.py                       |    4 +-
 5 files changed, 207 insertions(+), 5 deletions(-)

commit 1a007651c40b8f959fab9e3d5c431f65b4728950
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Jun 5 11:17:21 2012 +1000

    Migrate instance_metadata to use a uuid to refer to instances.
    
    Continued work on blueprint finish-uuid-conversion.
    
    Change-Id: I64302d0abb2e734422e6b0fee8f12e90f4ce711a

 nova/compute/api.py                                |    6 +-
 nova/db/api.py                                     |   12 +--
 nova/db/sqlalchemy/api.py                          |   40 +++++-----
 .../versions/100_instance_metadata_uses_uuid.py    |   80 ++++++++++++++++++++
 .../migrate_repo/versions/100_sqlite_downgrade.sql |   64 ++++++++++++++++
 .../migrate_repo/versions/100_sqlite_upgrade.sql   |   64 ++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    8 +-
 nova/exception.py                                  |    2 +-
 .../api/openstack/compute/test_server_metadata.py  |   21 +++--
 nova/tests/test_db_api.py                          |    4 +-
 10 files changed, 259 insertions(+), 42 deletions(-)

commit d7714963527cfa6161145f88c814c2f47e3b629e
Merge: 42998d0 f371198
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 03:50:07 2012 +0000

    Merge "Adds `disabled` field for instance-types."

commit f371198b843ba17ad6a6e4bc77a58afb006ab677
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 29 22:28:17 2012 +0000

    Adds `disabled` field for instance-types.
    
    The `disabled` field is intended to be used when phasing out
    instance-types. In this case, a delete wouldn't work because the
    instance-type needs to still be available for live instances using that
    type, but we don't want to allow *new* instances created from that type.
    
    In addition, we don't want to list hidden instance-types for regular
    users, but we *do* want to list them for admin-users to ensure they have
    a complete view of what's going on in the system.
    
    Once all references to the phased-out instance-type have been dropped,
    it would be safe to mark the instance-type as `deleted=True`.
    
    Change-Id: I2af1c027f4d8114aee31353007dfdd3d0bb679ed

 .../openstack/compute/contrib/flavorextradata.py   |    3 +-
 nova/api/openstack/compute/flavors.py              |    5 +
 nova/api/openstack/compute/servers.py              |    2 +
 nova/api/openstack/compute/views/flavors.py        |   10 +-
 nova/compute/api.py                                |   14 +++
 nova/compute/instance_types.py                     |    7 +-
 nova/db/sqlalchemy/api.py                          |   11 ++
 .../versions/099_add_disabled_instance_types.py    |   40 ++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/test.py                                       |   27 +++++
 nova/tests/api/openstack/compute/test_flavors.py   |  110 ++++++++++++++++-
 nova/tests/compute/test_compute.py                 |  127 ++++++++++++++++++++
 12 files changed, 349 insertions(+), 8 deletions(-)

commit 42998d0a6fe1bed7876aadf604cf74f6c4eaff78
Author: Florian Haas <florian@hastexo.com>
Date:   Tue Jun 5 20:56:00 2012 +0200

    More meaningful help messages for libvirt migration options
    
    Change-Id: I08f4724a7ef664cfebba57c5c9495494853289a8
    Reference: http://libvirt.org/html/libvirt-libvirt.html#virDomainMigrate

 Authors                         |    1 +
 nova/virt/libvirt/connection.py |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 9a020a6ecf5d0ec1a49e8f52ce1c8908ae51e2b5
Merge: 5a24235 5b85997
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 18:45:25 2012 +0000

    Merge "cleanup power state (partially implements bp task-management)"

commit 5a24235c22d259469e32febd58adb72c57880b2d
Merge: 84969af 05130da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 18:45:18 2012 +0000

    Merge "fix bug lp:1009041,add option "-F" to make mkfs non-interactive."

commit 84969afb3bfd467a2f48cf030a325c1a2fcd13ca
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Tue Jun 5 14:33:43 2012 +0100

    fix the instance quota overlimit message
    
    This addresses two closely related bugs.
    
    Bug: 998199
    Fix the "used" and "total" counts
    in the returned diagnostic.
    
    Bug: 902218
    Itemize instance quota items exceeded,
    in the returned diagnostic.
    
    Change-Id: Iff7781a7fb53545d44c2b4ec0ca6d65114723c8d

 nova/compute/api.py                              |   17 +++++++++++++----
 nova/exception.py                                |    4 ++--
 nova/tests/api/openstack/compute/test_servers.py |    3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

commit 05130daeaa490070c52499c9fac26dd16c38074d
Author: yaguang tang <heut2008@gmail.com>
Date:   Wed Jun 6 00:26:17 2012 +0800

    fix bug lp:1009041,add option "-F" to make mkfs non-interactive.
    
    Change-Id: Ic8be1657dbad0cd91fdb5176f17f7b1ba034c2e0

 nova/tests/test_libvirt.py |    2 +-
 nova/virt/libvirt/utils.py |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 1334ce8755c775c963aa98a6d43e521fb641a569
Merge: 68d5835 18ed0b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 15:47:18 2012 +0000

    Merge "Use openstack-common's policy module"

commit 68d5835cb99bcb9b004b7b401ff5e47b17d70036
Merge: 16fd17e fb0eb9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 14:50:04 2012 +0000

    Merge "Finish removing xenapi.HelperBase class"

commit 16fd17e40a99f5507c8bae4f6b7a2add9497c135
Merge: 4cf3b5e 3ae2c6a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 14:33:43 2012 +0000

    Merge "Remove network_util.NetworkHelper class"

commit 4cf3b5ea8560910657b0caa33c698ea624953b6c
Merge: b58b837 791ea7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 14:20:46 2012 +0000

    Merge changes I26d1adfd,If8a20501,I13d6d495
    
    * changes:
      Remove volume_util.VolumeHelper class
      Remove vm_utils.VMHelper class
      Start removing unnecessary classes from XenAPI driver

commit b58b8373b6f90f41631f844269af93f79c53a5d9
Merge: be9bcd8 d1d99b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 14:07:59 2012 +0000

    Merge "XenAPI: Don't hardcode userdevice for VBDs"

commit be9bcd8ea49e60c7637a44a1dfecbe421ff1c15c
Merge: 2b9ff78 d28f5bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 13:58:53 2012 +0000

    Merge "Finally ack consumed message"

commit 2b9ff78f2c006cc7ba1cfe7b3561beb17d08013e
Merge: 626f64a fd49b0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 12:26:33 2012 +0000

    Merge "Use openstack.common.cfg.CONF."

commit d28f5bdaab5e620c6e4ece839526495bc632a2b4
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Tue Jun 5 14:54:28 2012 +0800

    Finally ack consumed message
    
    To avoid bad messages fill up the queue.
    
    Change-Id: Id57ff33cfcacf698f89fa7f1020c0c887ebe14ed

 nova/rpc/impl_kombu.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 626f64a716651af3654b0f7dedab0a70988e53c5
Author: James E. Blair <jeblair@hp.com>
Date:   Tue Jun 5 01:07:41 2012 +0000

    Revert "blueprint <multi-process-api-service>"
    
    This reverts commit e599636d09755f635604f64f17e9f56cac14575e
    
    The nova test runner is leaking processes after this change.
    
    Change-Id: Id74463d53f3b7cd749cba293619abef01499b90d

 bin/nova-api                                   |    2 +-
 bin/nova-api-ec2                               |    2 +-
 bin/nova-api-metadata                          |    2 +-
 bin/nova-api-os-compute                        |    2 +-
 bin/nova-api-os-volume                         |    2 +-
 etc/nova/nova.conf.sample                      |   12 --
 nova/service.py                                |   26 ++--
 nova/testing/runner.py                         |    2 +-
 nova/tests/integrated/test_multiprocess_api.py |  186 ------------------------
 nova/utils.py                                  |    8 -
 nova/wsgi.py                                   |  166 ++-------------------
 11 files changed, 28 insertions(+), 382 deletions(-)

commit b33d445b905f6de8c8b395e50b521d3fe6c26af6
Merge: bf9fd42 91d0074
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 03:07:38 2012 +0000

    Merge "Eliminate a race condition on instance deletes."

commit 18ed0b0940da01eb25d5b6c56e0ac92d09a0b566
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jun 4 18:49:19 2012 -0500

    Use openstack-common's policy module
    
    Reworks nova to use the new policy module in openstack-common.
    
    Change-Id: Iea8651bad85f26804285616330107d9d5f23e6cb

 nova/common/policy.py                              |  222 ------------------
 nova/openstack/common/policy.py                    |  238 ++++++++++++++++++++
 nova/policy.py                                     |    8 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    2 +-
 nova/tests/compute/test_compute.py                 |    4 +-
 nova/tests/test_policy.py                          |    7 +-
 openstack-common.conf                              |    2 +-
 7 files changed, 248 insertions(+), 235 deletions(-)

commit fd49b0ec8933188a489ca9f38beeb601a1108730
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Jun 1 14:42:32 2012 -0400

    Use openstack.common.cfg.CONF.
    
    Part of blueprint common-rpc.
    
    This patch makes the rpc code use the global config object from
    openstack-common.  Based on some recent discussions on the mailing list,
    this may not be the final way configuration handling is done here, but
    it is certainly better than the register_opts() hack that is removed by
    this patch.
    
    Change-Id: Id128126e0bc064a2a1c710c6bd32fb3d137dc7f6

 bin/clear_rabbit_queues          |    1 -
 bin/instance-usage-audit         |    1 -
 bin/nova-dhcpbridge              |    2 --
 bin/nova-manage                  |    1 -
 bin/nova-xvpvncproxy             |    1 -
 bin/volume-usage-audit           |    1 -
 nova/rpc/__init__.py             |   27 ++++++++++-----------------
 nova/rpc/impl_fake.py            |    4 ----
 nova/rpc/impl_kombu.py           |    6 ++----
 nova/rpc/impl_qpid.py            |    6 ++----
 nova/service.py                  |    3 ---
 nova/tests/__init__.py           |    4 ----
 nova/tests/rpc/test_kombu.py     |    1 -
 nova/tests/rpc/test_kombu_ssl.py |    1 -
 nova/tests/rpc/test_qpid.py      |    1 -
 15 files changed, 14 insertions(+), 46 deletions(-)

commit bf9fd420ae2044335f13b96af09e0d7539356055
Merge: 3bed846 78fd35a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 20:24:37 2012 +0000

    Merge "convert virt drivers to fully dynamic loading"

commit 3bed84608444f8a111d19e2de39aa1b3255a2887
Merge: b1cfea8 adf7afa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 19:57:45 2012 +0000

    Merge "Add missing import to quantum manager."

commit b1cfea8b974875b83fdacdbb7bd1ff32c6d28cc6
Merge: c4987ef 664723b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 19:08:19 2012 +0000

    Merge "bug #1006094 correct typo in addmethod.openstackapi.rst"

commit c4987ef9a20cb79993f6651e507c6fb80af00f7e
Merge: ebf63c9 42a4fd9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 18:54:09 2012 +0000

    Merge "Correct use of uuid in _get_instance_volume_bdm."

commit ebf63c9d181ebe9f1e056f3848c1be8b2e8bd958
Merge: d964f5d e599636
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 18:42:12 2012 +0000

    Merge "blueprint <multi-process-api-service>"

commit d964f5da7311e137f8c3e011a509c724452e1451
Merge: 36522d0 62bea64
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 18:10:20 2012 +0000

    Merge "Add a comment to rpc.queue_get_for()."

commit 36522d059e05e7634f1e8e9efa59f264e0e0a5ef
Merge: e6e0bf3 7d57cc1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 17:56:12 2012 +0000

    Merge "defensive coding against None inside bdm resolves bug 1007615"

commit 664723bde931c7c7e5ff2cd4ed3bb7411faf4136
Author: daisy-ycguo <daisy.ycguo@gmail.com>
Date:   Thu May 31 11:59:57 2012 +0800

    bug #1006094 correct typo in addmethod.openstackapi.rst
    
    Change-Id: Ic03996357aacb6f135b95fc1e5810066b776b980

 Authors                                      |    1 +
 doc/source/devref/addmethod.openstackapi.rst |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 42a4fd986ab884ba09eb1372b00475fd3bb8f4ca
Author: MotoKen <motokentsai@gmail.com>
Date:   Fri Jun 1 15:11:56 2012 +0800

    Correct use of uuid in _get_instance_volume_bdm.
    
    Fixes bug 1007267.
    
    Change-Id: Icc3cfbef7beabebdaba88a6f81579ae784771bd2

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6228acd7ff3b20460d8c6fae9ab7c773ab38529a
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Sun Jun 3 13:23:11 2012 +0800

    Unused imports cleanup (folsom-2)
    
    Fixes bug #1008023
    
    Change-Id: Ifb8ecbb7430fdabd7b5d81ab23df66942abd9cb7

 nova/api/openstack/compute/contrib/certificates.py |    1 -
 nova/api/sizelimit.py                              |    1 -
 nova/compute/api.py                                |    2 --
 nova/compute/utils.py                              |    4 ----
 .../sqlalchemy/migrate_repo/versions/082_essex.py  |    2 --
 .../migrate_repo/versions/084_quotas_unlimited.py  |    1 -
 .../versions/096_recreate_dns_domains.py           |    2 +-
 nova/image/s3.py                                   |    1 -
 nova/network/api.py                                |    2 --
 nova/network/l3.py                                 |    2 --
 nova/network/quantum/client.py                     |    1 -
 nova/network/quantum/fake_client.py                |    2 --
 nova/notifier/api.py                               |    1 -
 nova/rpc/common.py                                 |    2 --
 nova/scheduler/driver.py                           |    1 -
 nova/scheduler/filters/trusted_filter.py           |    1 -
 nova/test.py                                       |    2 --
 nova/testing/runner.py                             |    2 --
 nova/tests/api/ec2/test_ec2_validate.py            |    6 ------
 .../openstack/compute/contrib/test_disk_config.py  |    2 --
 .../openstack/compute/contrib/test_floating_ips.py |    1 -
 .../compute/contrib/test_scheduler_hints.py        |    2 --
 .../tests/api/openstack/compute/test_extensions.py |    2 +-
 nova/tests/api/openstack/compute/test_flavors.py   |    1 -
 nova/tests/api/openstack/test_wsgi.py              |    3 ---
 nova/tests/consoleauth/test_consoleauth.py         |    3 ---
 nova/tests/fake_network.py                         |    1 -
 nova/tests/glance/stubs.py                         |    1 -
 nova/tests/integrated/test_extensions.py           |    1 -
 nova/tests/network/test_manager.py                 |    1 -
 nova/tests/rpc/test_common.py                      |    3 ---
 nova/tests/scheduler/test_filter_scheduler.py      |    1 -
 nova/tests/scheduler/test_scheduler.py             |    1 -
 nova/tests/test_flags.py                           |    3 ---
 nova/tests/test_imagecache.py                      |    1 -
 nova/tests/test_libvirt.py                         |    1 -
 nova/tests/test_libvirt_vif.py                     |    2 --
 nova/tests/test_log.py                             |    1 -
 nova/tests/test_melange_ipam_lib.py                |    1 -
 nova/tests/test_nova_manage.py                     |    1 -
 nova/tests/test_utils.py                           |    1 -
 nova/tests/test_xenapi.py                          |    4 ----
 nova/virt/baremetal/tilera.py                      |    1 -
 nova/virt/images.py                                |    1 -
 nova/virt/libvirt/connection.py                    |    1 -
 nova/virt/libvirt/firewall.py                      |    5 -----
 nova/virt/libvirt/imagecache.py                    |    2 --
 nova/virt/vmwareapi_conn.py                        |    2 --
 nova/virt/xenapi/vmops.py                          |    2 --
 nova/virt/xenapi/volume_utils.py                   |    5 +----
 nova/vnc/xvp_proxy.py                              |    1 -
 nova/volume/manager.py                             |    2 --
 nova/wsgi.py                                       |    1 -
 53 files changed, 3 insertions(+), 94 deletions(-)

commit e6e0bf343f73fb664167f173ef2ae80d39a06540
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jun 1 17:07:13 2012 -0700

    Quantum Manager disassociate floating-ips on instance delete.
    
    bug #997763
    
    Change-Id: I4a1e6c63d2a27c361433b9150dd5ad5218578c02

 nova/network/quantum/nova_ipam_lib.py |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 7d57cc16a6ab3b286e4fd3a479e5b40160980304
Author: Joe Heck <heckj@mac.com>
Date:   Fri Jun 1 21:51:48 2012 +0000

    defensive coding against None inside bdm
    resolves bug 1007615
    
    Change-Id: If7afa4fb030b3c53a0b80737ff792e42cc4d3101

 nova/compute/manager.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit adf7afa00e6a9d66201c8fdda4c183f556ed6c18
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Jun 1 15:03:42 2012 -0400

    Add missing import to quantum manager.
    
    This patch adds a missing import of rpc to the quantum manager.  rpc
    usage was added in d901b44fea897a038ce9a8afa32751ab79ffa210, but the
    import was never there.
    
    Change-Id: Id98a7034d190338c48d7e8c787b3d152cafe6353

 nova/network/quantum/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 62bea64940cf629829e2945255cc34903f310115
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Jun 1 14:49:42 2012 -0400

    Add a comment to rpc.queue_get_for().
    
    Part of blueprint common-rpc.
    
    Add a comment to the rpc.queue_get_for() function that notes that this
    is simply a naming convention and is dependent on how queues are set up
    on the consumer side.
    
    Change-Id: Ifa7d648e9b33ad2416236dc6966527c257baaf88

 nova/rpc/__init__.py |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit cf2b87347cd801112f89552a78efabb92a63bac6
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 30 14:57:03 2012 -0400

    Add shared_storage_test methods to compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds 3 methods used to check if shared storage works between
    two compute hosts to the compute rpcapi.  These methods are used by the
    scheduler.
    
    This also cuts down on some duplicated code in test_scheduler.
    
    Change-Id: If0bf7f7fdd2beb0e5280ae52daf049372f8bc9e2

 nova/compute/rpcapi.py                 |   15 ++++
 nova/scheduler/driver.py               |   16 ++---
 nova/tests/compute/test_rpcapi.py      |   12 ++++
 nova/tests/scheduler/test_scheduler.py |  119 +++++++++-----------------------
 4 files changed, 67 insertions(+), 95 deletions(-)

commit b7744f8f7e345928df016a04b6d8a5935470b254
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 30 14:04:48 2012 -0400

    Add get_instance_disk_info to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds get_instance_disk_info to the compute rpcapi, which is
    used by the scheduler.
    
    Change-Id: Ibb4a86d92ef402a3cc993212dfb8ce073c1c542d

 nova/compute/rpcapi.py                 |    5 +++++
 nova/scheduler/driver.py               |    6 +-----
 nova/tests/compute/test_rpcapi.py      |    7 ++++++-
 nova/tests/scheduler/test_scheduler.py |    8 ++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

commit dc0751ff4649d4b1ae642222704c244d5995138a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 30 11:28:09 2012 -0400

    Add remove_volume_connection to the compute rpcapi.
    
    Part of bug 1006467.
    
    Add the remove_volume_connection method to the compute rpcapi.  This is
    used by the compute manager.
    
    Change-Id: I307d85782baa371a16c80bd9ecabf449a60a0876

 nova/compute/manager.py            |    7 ++-----
 nova/compute/rpcapi.py             |    5 +++++
 nova/tests/compute/test_compute.py |    8 +++++---
 nova/tests/compute/test_rpcapi.py  |    6 +++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

commit 18734e9bc7eaf99caea5957618aa77e70c69db81
Merge: 44ac6e6 abea7d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 17:16:53 2012 +0000

    Merge "Fix instance update notification publisher id"

commit 44ac6e69a0a98f92584c8d3a1fec997ec653812d
Merge: aae9f61 a8d9bf7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 17:02:50 2012 +0000

    Merge "[PATCH] Allow [:print:] chars for security group names"

commit aae9f614090c8eca9f596efcc5238d5b8200061b
Merge: 3110802 5a1236e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 16:47:19 2012 +0000

    Merge "Add compare_cpu to the compute rpcapi."

commit e599636d09755f635604f64f17e9f56cac14575e
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Sun Mar 25 02:06:01 2012 +0800

    blueprint <multi-process-api-service>
    
    Add multiprocess support for API serivces (EC2/OSAPI_Compute/OSAPI_Volume/Metadata).
    
    2012-06-1 v7:
        * Add unittest to cover worker recovery, service termination functionality
        in wsgi.py, fix python 2.6 compatibility issue.
        * Modify generate_uid() to introduce per-process seeds in utils.py to avoid
        collisions.
        * Add worker session to nova.conf.sample.
    2012-05-21 v6:
        * Fix 'test_wsgi' unittest error.
    2012-04-28 v5:
        * Add SIGINT handler and fix child-parent race condition when Ctrl+C is
        pressed.
    2012-03-31 v4:
        * Fixed typo, removed debug code.
    2012-03-30 v3:
        * Fixed localization/pep8 error in unittest, add metadata test.
        * nova/wsgi.py:Server: use the greenthread pool created for each process.
        * nova/service.py: remove debug code
    2012-03-27 v2:
        * Fixed unittest error.
        * nova/wsgi.py:Server: Use self._logger to do logging in multiprocess mode.
        * nova/wsgi.py:Server: Move self._pool creation into proper place.
        * code style fix.
    2012-03-25 v1:
        * Modification to nova/service.py and nova/wsgi.py in order to support
        multiprocess (a.k.a. workers) for various API services.  If multiprocess
        mode is enabled, (i.e. flags 'APINAME_workers' set to positive numbers),
        corresponding API service will run in target number of process(es). There
        is also a master_worker process spawned for managing all workers (handling
        signal/termination).
        * Add unittest for multiprocess API service, also alter testing/runner.py
        to adopt new unittest.
    
    Change-Id: Ia045e595543ddfd192894b2a05801cc4b7ca90cb

 Authors                                        |    1 +
 bin/nova-api                                   |    2 +-
 bin/nova-api-ec2                               |    2 +-
 bin/nova-api-metadata                          |    2 +-
 bin/nova-api-os-compute                        |    2 +-
 bin/nova-api-os-volume                         |    2 +-
 etc/nova/nova.conf.sample                      |   12 ++
 nova/service.py                                |   26 ++--
 nova/testing/runner.py                         |    2 +-
 nova/tests/integrated/test_multiprocess_api.py |  186 ++++++++++++++++++++++++
 nova/utils.py                                  |    8 +
 nova/wsgi.py                                   |  166 +++++++++++++++++++--
 12 files changed, 383 insertions(+), 28 deletions(-)

commit 31108020fc237624e244f08658646e2f119506db
Merge: 8184a33 60b6c5d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 16:31:24 2012 +0000

    Merge "Add get_console_topic() to the compute rpcapi."

commit 8184a3368158e23531cdad2ab8c8966d769e6757
Merge: 05164ce ebedbfd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 16:18:32 2012 +0000

    Merge "Add refresh_provider_fw_rules() to compute rpcapi."

commit 05164ce0ecca745ed98c13d823daaa1a666f1e35
Merge: dffc2ec 23cfb85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 16:08:50 2012 +0000

    Merge "Use compute rpcapi in nova-manage."

commit dffc2ec401030f827aeeff51c570bce791f2da45
Merge: 2684de5 f9986b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 15:53:01 2012 +0000

    Merge "Add post_live_migration_at_destination() to compute rpcapi."

commit 2684de57f905c974270233828cf887e64ad9e0ad
Merge: 3779981 093bdd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 15:36:46 2012 +0000

    Merge "Add pre_live_migration() to the compute rpcapi."

commit 3779981380d87b49586d20f32fe4f1a314a435e3
Merge: 9dcc4da 3a829e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 15:18:05 2012 +0000

    Merge "Add rollback_live_migration_at_destination() to compute rpcapi."

commit 9dcc4da5255030193aa42258bd9b4649dde616d5
Merge: f799d75 18108a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 14:58:47 2012 +0000

    Merge "Add finish_resize() to the compute rpcapi."

commit 6548c509f1780a7168f26de6f2045ec7d5768520
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 1 10:34:11 2012 -0400

    Implements resume_state_on_host_boot for libvirt.
    
    Adds a new virt driver function to help resume guest states
    on host boot. This fixes a couple issue with using a reboot
    (like we did previously):
    
     * Using reboot would clear some task states (VERIFY_RESIZE for example)
     * Provides a mechanism for hypervisor specific guest restarts.
       Reboot would not have worked for XenServer for example...
     * Updates libvirt to use a hard reboot (instead of soft)
    
    Fixes LP Bug #985162.
    
    Change-Id: Iaf5aad75ec9b91f44710a18ddaf3a93378573a62

 nova/compute/manager.py         |   10 ++++++++--
 nova/tests/test_virt_drivers.py |    6 ++++++
 nova/virt/driver.py             |    4 ++++
 nova/virt/fake.py               |    3 +++
 nova/virt/libvirt/connection.py |    7 +++++++
 5 files changed, 28 insertions(+), 2 deletions(-)

commit f799d758b04b830588823199da6fe037e492c9ee
Merge: a91693b 7255028
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 14:36:26 2012 +0000

    Merge "Add resize_instance() to the compute rpcapi."

commit a91693bae9383e1947cb8fdbcaf0bcbc549eea15
Merge: 2f48ee1 836ffbd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 14:12:17 2012 +0000

    Merge "Add finish_revert_resize() to the compute rpcapi."

commit 2f48ee1621a2fa52fe8cf5dc6c6d6938a197690f
Merge: 0dd15a7 0db055b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 1 13:52:34 2012 +0000

    Merge "Add get_console_pool_info() to the compute rpcapi."

commit 783264be546088a5f37a9e9afdb00c07af6a1e20
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 1 06:24:49 2012 +0000

    Fix libvirt rescue to work with whole disk images
    
     * fixes bug 1007266
     * passes rescue image data to get_config so it only adds
       the kernel and ramdisk if necessary
     * adds tests to make sure that the kernel and ramdisk
       only appear if they are needed
    
    Change-Id: I32e0369a066ce2b6189b4a015b30ffd8b6d3ec66

 nova/tests/test_libvirt.py      |   59 ++++++++++++++++++++++++---------------
 nova/virt/libvirt/connection.py |   29 ++++++++++++-------
 2 files changed, 55 insertions(+), 33 deletions(-)

commit fb0eb9ecf4819cda7667990c7e91488d63f599e3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 21:45:26 2012 +0000

    Finish removing xenapi.HelperBase class
    
    The XenAPI driver has the concept of helper classes. All methods
    have been classmethods and the classes themselves are never
    instantiated. As a result, they only add an extra namespace
    lookup and provide no value.
    
    This is the last patch in this series
    
    Change-Id: I314dfa6555d38be9b0988270b3367c4ae86b19bb

 nova/virt/xenapi/__init__.py |    6 ------
 1 file changed, 6 deletions(-)

commit 3ae2c6abcde71564e7ee9f73ea86a6c5acc78029
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 21:41:30 2012 +0000

    Remove network_util.NetworkHelper class
    
    The XenAPI driver has the concept of helper classes. All methods
    have been classmethods and the classes themselves are never
    instantiated. As a result, they only add an extra namespace
    lookup and provide no value.
    
    Change-Id: Ief7d51013d8f313ca8c78cb157599858b156ac3f

 nova/virt/xenapi/network_utils.py |   53 +++++++++++++++----------------------
 nova/virt/xenapi/vif.py           |   10 +++----
 nova/virt/xenapi/vmops.py         |    1 -
 3 files changed, 27 insertions(+), 37 deletions(-)

commit 791ea7e3b7b4155257b588a2827cdd2c86735c1b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 21:36:15 2012 +0000

    Remove volume_util.VolumeHelper class
    
    The XenAPI driver has the concept of helper classes. All methods
    have been classmethods and the classes themselves are never
    instantiated. As a result, they only add an extra namespace
    lookup and provide no value.
    
    Change-Id: I26d1adfd378adc0728388185ba81fc4c71a41bdc

 nova/tests/test_xenapi.py        |    5 +-
 nova/virt/xenapi/vmops.py        |    1 -
 nova/virt/xenapi/volume_utils.py |  549 +++++++++++++++++++-------------------
 nova/virt/xenapi/volumeops.py    |   36 ++-
 4 files changed, 288 insertions(+), 303 deletions(-)

commit a3f33ca52c516e55dfbed13a1a6f4a9aef7aee96
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 18:13:03 2012 +0000

    Remove vm_utils.VMHelper class
    
    The XenAPI driver has the concept of helper classes. All methods
    have been classmethods and the classes themselves are never
    instantiated. As a result, they only add an extra namespace
    lookup and provide no value.
    
    Change-Id: If8a20501c9a9353359234441580552e41471722b

 nova/tests/test_xenapi.py     |   42 +-
 nova/tests/xenapi/stubs.py    |   52 +-
 nova/virt/xenapi/host.py      |    4 +-
 nova/virt/xenapi/vif.py       |    4 +-
 nova/virt/xenapi/vm_utils.py  | 1879 ++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py     |  111 ++-
 nova/virt/xenapi/volumeops.py |   23 +-
 7 files changed, 1034 insertions(+), 1081 deletions(-)

commit 442a3a74a8af0b8585a1340d49103bf5304e4504
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 20:18:34 2012 +0000

    Start removing unnecessary classes from XenAPI driver
    
    The XenAPI driver has the concept of helper classes. All methods
    have been classmethods and the classes themselves are never
    instantiated. As a result, they only add an extra namespace
    lookup and provide no value.
    
    The first step is to move some functions from HelperBase to the
    session class where it is better suited.
    
    Change-Id: I13d6d49509052d35339a0ef132647bd61179cdd8

 nova/virt/xenapi/__init__.py     |   24 ------------------------
 nova/virt/xenapi/connection.py   |   23 +++++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py     |   10 +++++-----
 nova/virt/xenapi/volume_utils.py |    2 +-
 4 files changed, 29 insertions(+), 30 deletions(-)

commit d1d99b3de22853d87548ba2a8fa680012945f960
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 30 23:23:14 2012 +0000

    XenAPI: Don't hardcode userdevice for VBDs
    
    Cleanup and refactor the way VBDs are allocated so it's clearer what
    userdevice each VDI is allocated to. Also, use a dict of VDIs instead
    of a list since it's nonsensical to have multiple VDIs of any type
    and simplifies the code somewhat.
    
    Change-Id: I46d6215dbd90822970a874af66f22c9a34529a40

 nova/tests/test_xenapi.py    |   33 +++++----
 nova/tests/xenapi/stubs.py   |   15 ++--
 nova/virt/xenapi/fake.py     |   13 ++--
 nova/virt/xenapi/vm_utils.py |  111 +++++++++++++++---------------
 nova/virt/xenapi/vmops.py    |  155 ++++++++++++++++++------------------------
 5 files changed, 158 insertions(+), 169 deletions(-)

commit 0dd15a784482f92ad5aca631c1dc26012b62e3eb
Merge: 79cb3bf d5f888f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 22:31:47 2012 +0000

    Merge "Removing double quotes from sample config file"

commit 79cb3bf9d9559cba5c59ea47f30147bfe89faecb
Merge: f86ef06 61c5597
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 22:19:07 2012 +0000

    Merge "Backslash continuation removal (Nova folsom-2)"

commit f86ef06e6d5a9b3e0039e05c42b45ec136a17862
Merge: a85d568 1e63eec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 21:15:28 2012 +0000

    Merge "Implement blueprint host-topic-matchmaking"

commit a85d5687d15e26fc53ef7539a6f11cdfbf914bfe
Merge: 164d233 be4afe4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 21:07:17 2012 +0000

    Merge "Remove resize function from virt driver."

commit 78fd35ac5520f5228d4fd5319ac47c72fa20a350
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Tue May 22 15:13:20 2012 -0400

    convert virt drivers to fully dynamic loading
    
    Progress on bp:virt-driver-cleanup
    
    This series of patches converts the virt drivers to loading via
    importutils making it possible to add a virt driver without changing
    core code. It deprecates the use of connection_type in favor of a
    full driver name in compute_driver.
    
    Based on email thread with Vish and Jay Pipes on approaches to do
    this.
    
    Change-Id: I48366ec7efc7b095859988e5e6ac5a853b98b8a7

 nova/test.py                                  |    4 -
 nova/tests/api/ec2/test_cloud.py              |    2 +-
 nova/tests/api/ec2/test_ec2_validate.py       |    2 +-
 nova/tests/baremetal/test_proxy_bare_metal.py |    2 +-
 nova/tests/compute/test_compute.py            |   18 +--
 nova/tests/fake_flags.py                      |    1 +
 nova/tests/integrated/test_servers.py         |    2 +-
 nova/tests/test_auth.py                       |    2 +-
 nova/tests/test_compute_utils.py              |    2 +-
 nova/tests/test_libvirt.py                    |  167 +++++++++++++------------
 nova/tests/test_notifications.py              |    2 +-
 nova/tests/test_quota.py                      |    2 +-
 nova/tests/test_virt_drivers.py               |   21 ++--
 nova/tests/test_vmwareapi.py                  |    2 +-
 nova/tests/test_volume.py                     |    2 +-
 nova/tests/test_volume_utils.py               |    2 +-
 nova/tests/test_xenapi.py                     |   40 +++---
 nova/virt/baremetal/proxy.py                  |   10 +-
 nova/virt/connection.py                       |   43 +++----
 nova/virt/fake.py                             |   15 +--
 nova/virt/libvirt/connection.py               |   26 ++--
 nova/virt/vmwareapi_conn.py                   |   33 +++--
 nova/virt/xenapi/connection.py                |   32 +++--
 23 files changed, 196 insertions(+), 236 deletions(-)

commit 5a1236e469faf0f415989249d8aaa1c510fa8b3d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 22:00:10 2012 -0400

    Add compare_cpu to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds compare_cpu to the compute rpcapi.  This is used by the
    scheduler.
    
    Change-Id: Ibce3ab3797c1305829c0722be1813e462193f08b

 nova/compute/rpcapi.py                 |    4 ++++
 nova/scheduler/driver.py               |    8 ++++----
 nova/tests/compute/test_rpcapi.py      |    4 ++++
 nova/tests/scheduler/test_scheduler.py |   10 +++++++---
 4 files changed, 19 insertions(+), 7 deletions(-)

commit 60b6c5d53508d9c2b113dd78c5a0bc43a7fad9f8
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 21:39:11 2012 -0400

    Add get_console_topic() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds get_console_topic to the compute rpcapi.  This method is
    used by the console API.
    
    Change-Id: I738be88a52fede0739a73283b6e2640072f0f72b

 nova/compute/rpcapi.py            |    4 ++++
 nova/console/api.py               |    8 +++-----
 nova/tests/compute/test_rpcapi.py |    3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

commit ebedbfd243ed99e33501c039f09ac62aaf041cd7
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 21:30:59 2012 -0400

    Add refresh_provider_fw_rules() to compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds another method to the compute rpcapi -
    refresh_provider_fw_rules().  It is used from compute.api.
    
    Change-Id: I653efc00a2324047f34a383da9e36454a45c4038

 nova/compute/api.py               |    4 +---
 nova/compute/rpcapi.py            |    4 ++++
 nova/tests/compute/test_rpcapi.py |    4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

commit 23cfb85e385478df01b0623afb07a8995fa801cc
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 21:15:58 2012 -0400

    Use compute rpcapi in nova-manage.
    
    Part of bug 1006467.
    
    This patch fixes nova-manage to use the compute rpcapi instead of
    calling rpc.cast() directly.  This cast was actually broken, as it sent
    an instance ID instead of UUID, so this change should make this code
    functional again.
    
    Change-Id: I90a1bf4a03cc6d9e21f24f19165141f894b6ec75

 bin/nova-manage |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit f9986b8be0d577e9e44cae1c8a9afe308af868f9
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 21:11:21 2012 -0400

    Add post_live_migration_at_destination() to compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds the "post_live_migration_at_destination method to the
    compute rpcapi.  It is used by the compute manager.
    
    Change-Id: I964d3b149e10c927657d0b239835335eb240b6e4

 nova/compute/manager.py            |    7 ++-----
 nova/compute/rpcapi.py             |    7 +++++++
 nova/tests/compute/test_compute.py |    3 ++-
 nova/tests/compute/test_rpcapi.py  |    8 +++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

commit 093bdd6edff7ec391145018a0d3ce8e9dc1f84ff
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 18:39:07 2012 -0400

    Add pre_live_migration() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds pre_live_migration() to the compute rpcapi.  It is used
    by the compute manager.
    
    Change-Id: I70fb66ad194837faa1139e644888c4a7c7a5a0a6

 nova/compute/manager.py            |    8 ++------
 nova/compute/rpcapi.py             |    6 ++++++
 nova/tests/compute/test_compute.py |   15 +++++++++------
 nova/tests/compute/test_rpcapi.py  |    8 +++++++-
 4 files changed, 24 insertions(+), 13 deletions(-)

commit 3a829e3543b8a346fce95f71cd51f68e7c4aae41
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 18:28:09 2012 -0400

    Add rollback_live_migration_at_destination() to compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds rollback_live_migration_at_destination() to the compute
    rpcapi.  This method is used by the compute manager.
    
    Change-Id: Iadbb50fc5cb0f7b5ad483d48666bc81e033ac5f4

 nova/compute/manager.py           |    6 ++----
 nova/compute/rpcapi.py            |    5 +++++
 nova/tests/compute/test_rpcapi.py |   19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

commit 18108a0143df0847fe1a4b105b787ca9ca76f422
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 18:12:49 2012 -0400

    Add finish_resize() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds the finish_resize() method to the compute rpcapi.  It is
    used by the compute manager.
    
    Change-Id: I989bc70c1af44001a095e64b8abde05a0f99964d

 nova/compute/manager.py           |   13 ++-----------
 nova/compute/rpcapi.py            |    7 +++++++
 nova/tests/compute/test_rpcapi.py |    5 +++++
 3 files changed, 14 insertions(+), 11 deletions(-)

commit 72550284ee6cdbda9c1a6762deb140b670634d2f
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 17:22:33 2012 -0400

    Add resize_instance() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This method is used by the compute manager.  Add it to the compute
    rpcapi and use it from there.
    
    Change-Id: I873fc0740595f7387ea476b11fd2c70d29d4765a

 nova/compute/manager.py           |    9 ++-------
 nova/compute/rpcapi.py            |    5 +++++
 nova/tests/compute/test_rpcapi.py |    4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

commit 836ffbd489f28a1d370cb1003bd8d62de4783351
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 17:10:09 2012 -0400

    Add finish_revert_resize() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This method is used by the compute manager itself.  Add it to the
    rpcapi and use it from there.
    
    Change-Id: I7fcab5b0b498318377a1a108e2eeb4db1ae1e4ea

 nova/compute/manager.py           |   11 ++++-------
 nova/compute/rpcapi.py            |    5 +++++
 nova/tests/compute/test_rpcapi.py |    4 ++++
 3 files changed, 13 insertions(+), 7 deletions(-)

commit 0db055b9b3e5e74d229b38df06408166b53069b7
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 16:51:59 2012 -0400

    Add get_console_pool_info() to the compute rpcapi.
    
    Part of bug 1006467.
    
    This patch adds the get_console_pool_info() method to the compute
    rpcapi.  This is used by the console manager.
    
    Change-Id: I429123ed48cb2a5fcfb70248eac743cf4e7a76f2

 nova/compute/rpcapi.py            |    5 +++++
 nova/console/manager.py           |   11 ++++-------
 nova/console/vmrc_manager.py      |   11 ++++-------
 nova/tests/compute/test_rpcapi.py |    4 ++++
 4 files changed, 17 insertions(+), 14 deletions(-)

commit 164d233371fa1acbe695136df30366c4547604d0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu May 31 15:07:53 2012 -0400

    Fix destination host for remove_volume_connection.
    
    This patch fixes a regression in
    957c4ff741b4029cf4bad5087000fba91f0ce938.  The destination host was
    accidentally changed to 'host' when it should have been 'dest'.
    
    Change-Id: I2b262c4aedc2caa0c98c7660853358fc59935b63

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9024065f52333e6c62b8c9dac8b3942d70bcd10c
Merge: 957c4ff 5fcdaf8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 19:04:51 2012 +0000

    Merge "Don't deepcopy RpcContext"

commit 5fcdaf8232d404da0d281173b8f1e885aa0832b1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 31 18:09:23 2012 +0000

    Don't deepcopy RpcContext
    
    Instead of deepcopying the RpcContext, which seems to not work
    sometimes, we'll explicitly create a new instance of the class and
    deepcopy the required values.
    
    Fixes bug 1007043
    
    Change-Id: I6578c4c82046acf149724a1c5985fa6b46857a7c

 nova/rpc/amqp.py      |    6 ++++++
 nova/rpc/common.py    |    5 ++++-
 nova/rpc/impl_fake.py |    7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

commit be4afe4b86ab1cdfd9839dd175d67ff74226f547
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 31 12:54:47 2012 -0400

    Remove resize function from virt driver.
    
    Fixes LP Bug #1007009.
    
    Change-Id: If7d1492abd4ea0f66ae49117e87093fa58257a40

 nova/tests/test_virt_drivers.py |    5 -----
 nova/virt/driver.py             |    9 ---------
 nova/virt/fake.py               |    3 ---
 3 files changed, 17 deletions(-)

commit 957c4ff741b4029cf4bad5087000fba91f0ce938
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu May 31 10:38:20 2012 -0700

    Cleans up extraneous volume_api calls
    
     * Partially implements blueprint volume-decoupling
     * Deletes update() which should not be public
     * Removes extra call to update() in rollback live migration that
       was missed in an earlier patch
     * Deletes remove_from_compute() in preference to compute doing
       the call to the destination host directly
     * Removes wait_creation and moves the polling to the one place
       it is used
    
    Change-Id: I63160e0fd048f82937a322bd068c3a9ff4f60336

 nova/compute/manager.py |   17 +++++++++++------
 nova/volume/api.py      |   29 ++++-------------------------
 2 files changed, 15 insertions(+), 31 deletions(-)

commit 9e8007320666797778f4a4e339fb30a681b75a22
Merge: e0a29a1 88888d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 17:31:56 2012 +0000

    Merge "Remove list_disks/list_interfaces from virt driver"

commit e0a29a1edf067a338281c423d33f59951714f73c
Merge: 336fe29 81ad28b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 17:16:12 2012 +0000

    Merge "Remove duplicate words in comments"

commit 88888d1ac81969608b4d6166b2043dd3c0bc43bc
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 31 12:41:30 2012 -0400

    Remove list_disks/list_interfaces from virt driver
    
    Removes the list_disks and list_interfaces functions from the
    Nova virt driver. These functions are not used.
    
    Fixes LP Bug #1007005.
    
    Change-Id: I69296866f2cae712fbf7f0b8cb50c282714f04b8

 nova/tests/test_virt_drivers.py |   10 ----------
 nova/virt/driver.py             |   27 ---------------------------
 nova/virt/fake.py               |    6 ------
 3 files changed, 43 deletions(-)

commit 336fe29dc848a800befa9f217e7b6a660d098d83
Merge: 639d342 1da15a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 16:42:42 2012 +0000

    Merge "Remove unnecessary setting of XenAPI module attribute"

commit 81ad28b8f192aad3e301cad385420a32d3a735f1
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu May 31 09:41:53 2012 -0700

    Remove duplicate words in comments
    
    Change-Id: I645692d66c6c007d5fbf40d4db16d7f36cbfd6fe

 nova/compute/api.py |    2 +-
 nova/db/api.py      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1e63eec6cbd89d5ee016b1852d82db29977dc032
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed May 30 13:36:35 2012 -0400

    Implement blueprint host-topic-matchmaking
    
    Change-Id: I382b731bbc64e92db9d06f4e9ee497b1cc0f7d26

 nova/rpc/matchmaker.py            |  257 +++++++++++++++++++++++++++++++++++++
 nova/tests/rpc/test_matchmaker.py |   58 +++++++++
 2 files changed, 315 insertions(+)

commit 639d3426679bd99123e9408b7515d22c8ffb1444
Merge: 9ff902b cc87be9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 16:26:39 2012 +0000

    Merge "Prevent task_state changes during VERIFY_RESIZE."

commit 9ff902bddbf18d924e0ccc9ba0dc3bbd4c057faf
Merge: 5410526 a390798
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 16:12:58 2012 +0000

    Merge "Make sure an exception is logged when config file isn't found"

commit 1da15a50515255675c2d280edff9774a4059b628
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 16:07:41 2012 +0000

    Remove unnecessary setting of XenAPI module attribute
    
    This was moved to be class/instance attributes in a previous change
    and the module attribute no longer needs to be set.
    
    Change-Id: I413ba69444fdd2d246b060ef6280a547a3b46f76

 nova/tests/test_xenapi.py |   20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

commit cc87be923ff83fed349c0da4b285a180d0644db8
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 31 11:40:27 2012 -0400

    Prevent task_state changes during VERIFY_RESIZE.
    
    Don't allow operations that cause task_state to change
    when an instance is in VERIFY_RESIZE.
    
    Fixes LP Bug #965630.
    
    Change-Id: I7e222985c199d619c5cb248c04e1670c92d5587b

 nova/compute/api.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 541052688f3dda64bc2cceb52ffddb50968322d9
Merge: 0f2142b c41fad5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 15:28:23 2012 +0000

    Merge "Add a note on why quota classes are unused in Nova"

commit 91d007426f109dfef2142e28741edd51dcf1fdbc
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 11 09:47:10 2012 -0400

    Eliminate a race condition on instance deletes.
    
    - Add constraint and equality conditions to nova.db[.sqlalchemy].api
    - Use host constraints to ensure the compute api doesn't simply delete
      an instance from the database that a compute manager has already
      started to run.
    
    This race condition is associated with bug #998117
    
    Change-Id: Id74192d3e66bea073327342f57ce0f26987efd2d

 nova/compute/api.py                              |   12 +++--
 nova/db/api.py                                   |   30 ++++++++++-
 nova/db/sqlalchemy/api.py                        |   62 +++++++++++++++++++---
 nova/exception.py                                |    5 ++
 nova/tests/api/openstack/compute/test_servers.py |    4 +-
 nova/tests/compute/test_compute.py               |   23 +++++---
 nova/tests/test_db_api.py                        |   37 +++++++++++++
 7 files changed, 154 insertions(+), 19 deletions(-)

commit a390798d4e5956e94060a9c45a1f7be2bdb9ccbd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 31 13:13:46 2012 +0000

    Make sure an exception is logged when config file isn't found
    
    Fixes bug 1006457
    
    Since exception.ConfigNotFound was derived from exception.NotFound, it
    would result in a silent 404 error being returned to the client instead
    of logging a useful error message that a necessary config file was
    missing and returning a 500 error.
    
    Change-Id: I3abefae8d41be4013501ba1731fa49e3c93bde1a

 nova/exception.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit d5f888fc7ad8b83b8af25c96c0211b0d70405c89
Author: Derek Higgins <derekh@redhat.com>
Date:   Thu May 31 11:22:25 2012 +0100

    Removing double quotes from sample config file
    
    Fixes bug #1005869
    
    Changing create_conf.py to no longer include quotes for
    StrOpt, ListOpt and MultiStrOpt types, Also regenerating
    and new version of etc/nova/nova.conf.sample
    
    Change-Id: I31c0a6cdcfd3e7cacaae6afbf75648ef0a34d668

 etc/nova/nova.conf.sample  |  538 +++++++++++++++++++++++---------------------
 tools/conf/extract_opts.py |    6 +-
 2 files changed, 281 insertions(+), 263 deletions(-)

commit 61c5597a09945982f093412cd134850346b82e3b
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed May 16 17:08:27 2012 +0800

    Backslash continuation removal (Nova folsom-2)
    
    Fixes bug #938588
    
    Backslash continuations removal for scripts in bin/, plugin/, and etc.
    
    Change-Id: Idd17048b6e8db6e939946968e011e68da8585b8d

 HACKING.rst                                        |    2 +
 bin/clear_rabbit_queues                            |    7 +-
 bin/nova-dhcpbridge                                |    8 +-
 bin/nova-manage                                    |  100 +++++++++--------
 .../compute/contrib/extended_server_attributes.py  |   16 +--
 .../openstack/compute/contrib/flavorextradata.py   |   13 +--
 nova/network/model.py                              |   19 ++--
 nova/network/quantum/manager.py                    |    4 +-
 nova/notifications.py                              |    4 +-
 nova/tests/compute/test_compute.py                 |   15 +--
 nova/tests/test_volume.py                          |    8 +-
 nova/virt/disk/api.py                              |    5 +-
 nova/virt/libvirt/config.py                        |    6 +-
 nova/virt/libvirt/connection.py                    |    4 +-
 nova/virt/xenapi/host.py                           |  113 ++++++++++----------
 nova/virt/xenapi/vif.py                            |    4 +-
 nova/virt/xenapi/vmops.py                          |    4 +-
 .../xensource/scripts/ovs_configure_base_flows.py  |   11 +-
 .../xensource/scripts/ovs_configure_vif_flows.py   |    8 +-
 .../networking/etc/xensource/scripts/vif_rules.py  |    4 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 +-
 smoketests/run_tests.py                            |   10 +-
 tools/db/schema_diff.py                            |    4 +-
 tools/esx/guest_tool.py                            |   54 +++++-----
 tools/hacking.py                                   |   10 +-
 tools/install_venv.py                              |    4 +-
 26 files changed, 219 insertions(+), 222 deletions(-)

commit 0f2142b14adc442840c79a48add0dab78acf7c93
Merge: 7f910cd 5db41cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 02:46:00 2012 +0000

    Merge "Update .gitignore"

commit 7f910cddc3765f30e5d0130b8eaa9fa79bc84805
Merge: f3edf7f 6e48070
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 01:50:46 2012 +0000

    Merge "Cleanup tools/hacking using flake8"

commit f3edf7ff7edefede242de50aca59abc4c6adc7f9
Merge: 069f8f3 26353bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 01:29:40 2012 +0000

    Merge "Move queue_get_for() from db to rpc."

commit 069f8f3ea4ac20271cddca0c3e209ef0af8cd0d6
Merge: 3c27193 14c01e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 01:17:54 2012 +0000

    Merge "Add scheduler filter for trustedness of a host"

commit 3c2719350c14f0f453eb0ef95482c2cc19d710e8
Merge: 709681e 991614a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 01:09:01 2012 +0000

    Merge "Sample config file tool updates"

commit 709681e7a406a8f06b07c21a1cdceecd60dcadd8
Merge: fd06062 31bf321
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 31 00:13:15 2012 +0000

    Merge "Record instance architecture types."

commit fd06062905c2ab51b847632e5658d6439e896834
Merge: 1c4a1f5 e79356b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 23:45:26 2012 +0000

    Merge "Run coverage tests via xcover for jenkins."

commit 1c4a1f50eb47bf7c909276f1f1211d8523c9c949
Merge: ed0b56c 00786bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 22:53:35 2012 +0000

    Merge "Use cfg's new global CONF object"

commit ed0b56c50dba876a6cdca02482dbf1a117a91311
Merge: 57aa586 0ce533e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 22:44:43 2012 +0000

    Merge "fixing issue with db.volume_update not returning the volume_ref"

commit 5db41cb35843c9a8038e52d8a24ef9dc201c6a4f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed May 30 15:37:42 2012 -0700

    Update .gitignore
    
    Add:
    * ChangeLog
    * nova/tests/coverage.xml
    
    Change-Id: I1d0c395cf679e07e304dd878d97734307b685f4c

 .gitignore |    2 ++
 1 file changed, 2 insertions(+)

commit 57aa58630d2362a6753eb861c8afd9abb682db3b
Merge: 2f5e543 16d26af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 22:26:31 2012 +0000

    Merge "Revert "API users should not see deleted flavors.""

commit c41fad5015bff7341d6952ed645f639917ada529
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 24 12:02:50 2012 +0100

    Add a note on why quota classes are unused in Nova
    
    Quota classes can only be used if you write a custom middleware which
    sets the quota_class context attribute. Nothing in OpenStack core does
    this.
    
    The only known middleware which does this is the rs_limits turnstile
    preprocessor: https://github.com/klmitch/rs_limits
    
    Add a note to the code to give others some chance of figuring this out
    for themselves.
    
    Change-Id: I52973f2f4d7f07f5121492e062dd31cadf02aa43

 nova/context.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 2f5e5431000751a9afeda3f961a04c96c944963a
Merge: cb7c437 777014c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 22:08:31 2012 +0000

    Merge "Fix the conf argument to get_connection_pool()."

commit 26353bb372081f674cf5fd3dbbffd990918f3803
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 16:35:35 2012 -0400

    Move queue_get_for() from db to rpc.
    
    Part of blueprint common-rpc.
    
    The function queue_get_for() is a utility function used by various
    consumers of the rpc API.  This function lived in the db API, but never
    ended up using anything from the database.  This patch moves it into the
    rpc API so that it can be used by other users of rpc once it moves into
    openstack-common.
    
    Change-Id: If92675beecff5471b416a929c161b810e3c71939

 bin/nova-manage                                  |    4 +-
 nova/compute/api.py                              |    3 +-
 nova/compute/manager.py                          |   22 +++---
 nova/compute/rpcapi.py                           |    6 +-
 nova/console/api.py                              |   10 +--
 nova/console/manager.py                          |    2 +-
 nova/console/vmrc_manager.py                     |    6 +-
 nova/db/api.py                                   |    8 ---
 nova/db/sqlalchemy/api.py                        |    8 ---
 nova/network/manager.py                          |   13 ++--
 nova/network/quantum/manager.py                  |    6 +-
 nova/rpc/__init__.py                             |    5 ++
 nova/scheduler/driver.py                         |   24 +++----
 nova/tests/api/openstack/compute/test_servers.py |    2 +-
 nova/tests/compute/test_compute.py               |    6 +-
 nova/tests/db/fakes.py                           |    6 +-
 nova/tests/scheduler/test_scheduler.py           |   78 +++++++++++-----------
 nova/virt/xenapi/pool.py                         |    2 +-
 nova/volume/api.py                               |   16 ++---
 19 files changed, 104 insertions(+), 123 deletions(-)

commit 991614add8a0dabe1cfa15ef19d5df2396410cf3
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed May 16 13:27:50 2012 +0800

    Sample config file tool updates
    
    Fixes bug #1000133
    
    Current method of extracting config options will not work
    once the global config object gets removed.
    
    1. Update tool to read a cfg.Opt subclass instance or list of cfg.Opt subclass
       instances rather than the FLAG object.
    2. Word wrap help messages
    3. Insert line between consecutive options
    4. Print warnings for missing option help string
    
    Change-Id: Idd17048b6e8db6e939946968e011e68da8585b8c

 etc/nova/nova.conf.sample     | 2539 ++++++++++++++++++++++++++---------------
 tools/conf/create_conf.py     |  159 ---
 tools/conf/extract_opts.py    |  161 +++
 tools/conf/generate_sample.sh |    2 +-
 4 files changed, 1762 insertions(+), 1099 deletions(-)

commit cb7c4377b373857cc57e95b84d4e93b0f785673c
Merge: 3ff85a2 7b0c403
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 21:38:40 2012 +0000

    Merge "Make xenapi fake match real xenapi a bit closer"

commit 3ff85a2963cb8124a294108591373f94ece9180c
Merge: 04d511b f03f2a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 21:28:01 2012 +0000

    Merge "Align ApiEc2TestCase to closer match api-paste.ini"

commit 04d511b2973f61cd1181f329f168fc502fb19357
Merge: b04cd35 0414446
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 21:19:02 2012 +0000

    Merge "Add attach_time for EC2 Volumes"

commit abea7d8f797675135b4419ff07491df4ecaed829
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Wed May 30 21:14:31 2012 +0000

    Fix instance update notification publisher id
    
    Fixes instance update notifications to follow the nova convention for
    publisher ids.  The notification publisher id will now be of the format
    service.host (e.g. compute.somehostname).
    
    Change-Id: Ib5c4c962b9ac3e0bac90703b20465f99dfd047c0

 nova/compute/api.py              |    8 +++++---
 nova/notifications.py            |   21 +++++++++++++--------
 nova/scheduler/driver.py         |    3 ++-
 nova/scheduler/manager.py        |    3 ++-
 nova/tests/test_notifications.py |   33 ++++++++++++++++++++++++++++++++-
 5 files changed, 54 insertions(+), 14 deletions(-)

commit b04cd354f9c28403536593169b3fcfd828dba389
Merge: 2a726d0 0f6df0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 20:52:59 2012 +0000

    Merge "New RPC tests, docstring fixes."

commit 00786bc554a2dfacb3c6f02fbb7e9c98f35d4262
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue May 29 08:57:58 2012 +0100

    Use cfg's new global CONF object
    
    Implements blueprint cfg-global-object
    
    Replace nova.flags.FLAGS with openstack.common.cfg.CONF.
    
    In future, we can do a s/FLAGS/CONF/ across the codebase.
    
    Change-Id: Ib293873089a5399febd7a3b0410f66e9bef115f1

 bin/clear_rabbit_queues           |    4 +-
 bin/instance-usage-audit          |    3 +-
 bin/nova-all                      |    3 +-
 bin/nova-api                      |    3 +-
 bin/nova-api-ec2                  |    3 +-
 bin/nova-api-metadata             |    3 +-
 bin/nova-api-os-compute           |    3 +-
 bin/nova-api-os-volume            |    3 +-
 bin/nova-cert                     |    3 +-
 bin/nova-compute                  |    3 +-
 bin/nova-console                  |    4 +-
 bin/nova-consoleauth              |    4 +-
 bin/nova-dhcpbridge               |    3 +-
 bin/nova-manage                   |   31 +++--
 bin/nova-network                  |    3 +-
 bin/nova-objectstore              |    3 +-
 bin/nova-scheduler                |    3 +-
 bin/nova-volume                   |    3 +-
 bin/nova-xvpvncproxy              |    4 +-
 nova/flags.py                     |   17 +--
 nova/openstack/common/cfg.py      |  246 ++++++++++++++++++++++++-------------
 nova/test.py                      |    1 +
 nova/tests/test_flags.py          |   66 ++++------
 nova/utils.py                     |   21 ----
 tools/xenserver/vm_vdi_cleaner.py |    3 +-
 25 files changed, 224 insertions(+), 219 deletions(-)

commit 2a726d06e2ec41758e4460a2138e1af51509cc14
Merge: bb93b4b a427d04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 20:11:41 2012 +0000

    Merge changes I17ca4b69,I9e6ec0d2
    
    * changes:
      Remove nova.log usage from nova.rpc.
      Remove nova.context dependency from nova.rpc

commit bb93b4b209491602f6c5f7fecff9b1192a3ec968
Merge: 5635850 965d855
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 19:43:00 2012 +0000

    Merge "Localize rpc options to rpc code."

commit 56358508a8ca71a8615c542164d99e53ee5a7e0d
Merge: cb64394 d5cc5fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 19:16:27 2012 +0000

    Merge "Grammar fixes."

commit 7b0c40309a716620f6e641037204927d0688de15
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 30 18:46:31 2012 +0000

    Make xenapi fake match real xenapi a bit closer
    
    xenstore_data is a dictionary in the real xenapi and keys get deleted
    from xenstore_data and other_config when removing them instead of being
    set to None.
    
    Change-Id: I462b04b6e1dc5ad4abf05cc50538121811c2334e

 nova/tests/test_xenapi.py |    2 +-
 nova/virt/xenapi/fake.py  |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

commit cb6439462877a5cc4e9063c5f960e427c3c737d2
Merge: c71f0e3 d26ed3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 18:35:36 2012 +0000

    Merge "Fix reservation_commit so it works w/ PostgreSQL."

commit f03f2a2e6e8745681c4336d91b070a9a338cdc62
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed May 30 11:10:01 2012 -0700

    Align ApiEc2TestCase to closer match api-paste.ini
    
    Change-Id: I02f5d6bc66fd372132d4d01e2027c1d3d8467b91

 nova/tests/test_api.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit c71f0e3165c42d0b9e9d31b28a8db0dedf6f63f8
Merge: 382bac5 5e48767
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 18:08:13 2012 +0000

    Merge "fixes bug 1004153"

commit 0414446063101bf2931f1c9cf568bf3c46488363
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sat May 19 21:02:20 2012 -0400

    Add attach_time for EC2 Volumes
    
    According to the EC2 API spec, attach_time has a
    timestamp that is returned when running euca-describe-volumes.
    Openstack EC2 API currently does not do this.
    
    This fixes bug 1001828
    
    Change-Id: I571b937481f22e8d0f4eb38d4cabcafc5fbb920b
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/db/sqlalchemy/api.py                          |    1 +
 .../versions/098_update_volume_attach_time.py      |   72 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 3 files changed, 74 insertions(+), 1 deletion(-)

commit 382bac5c17ef98d7d326caf05f5b8063d80b33c5
Merge: f06624e 261c80e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 17:50:55 2012 +0000

    Merge "Remove Deprecated auth from EC2"

commit 0ce533e0e194741b6ade7eed12c107628d0e6d3d
Author: Craig Vyvial <cp16net@gmail.com>
Date:   Thu May 24 13:16:08 2012 -0500

    fixing issue with db.volume_update not returning the volume_ref
    
    fixes bug #1003664
    
    - changed the sqlalchemy db api code to return the volume_ref from the
    volume_update method. This was causing the volume  notifications to
    have the incorrect information in the payload.
    - Fixed up the unit tests because they started failing badly.
    - fixed the volume-usage-audit reading the default config values
    - fix hacking issue with volume-usage-audit
    
    Change-Id: Iba5634b0c351a6cc0c48b697217a6f85533de93e

 bin/volume-usage-audit           |    7 +++----
 nova/db/sqlalchemy/api.py        |    6 +++++-
 nova/tests/api/ec2/test_cloud.py |    8 +++-----
 nova/tests/test_volume.py        |    4 +++-
 nova/volume/manager.py           |    4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

commit 0f6df0b51fbabf30259b61289cb2157f82bed3a8
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri May 25 09:59:47 2012 -0400

    New RPC tests, docstring fixes.
    
    Also fixes versioning problem in impl_fake
    Makes topics configurable by RPC test suites.
    
    Change-Id: I2c7b2413b8e642e7ac1e82d54c052b97d6149659

 nova/rpc/impl_fake.py    |    3 +-
 nova/tests/rpc/common.py |  101 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 78 insertions(+), 26 deletions(-)

commit d26ed3aee130646be0e042f29f3af64f1d73608e
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 25 12:25:23 2012 -0400

    Fix reservation_commit so it works w/ PostgreSQL.
    
    Update the Reservation model so that the 'usage' relationship is
    explicitly forced to use an inner join. This fixes an issue on
    PostgreSQL which doesn't support 'SELECT FOR UPDATE' on outer
    joined queries.
    
    Fixes LP Bug #1003756.
    
    Change-Id: I3c40bd8481855a18391e12d7411762e91b1ef8b0

 nova/db/sqlalchemy/models.py |    2 ++
 1 file changed, 2 insertions(+)

commit f06624ef9415dfb3343a357c156f035c29fa01ef
Author: Yun Mao <yunmao@gmail.com>
Date:   Wed May 30 10:49:44 2012 -0400

    remove dead file nova/tests/db/nova.austin.sqlite
    
    This file no longer appears to be used.
    
    Change-Id: I6cee63f3e35ed1de68249aa12e828e23cbe65a40

 MANIFEST.in                      |    1 -
 nova/tests/db/nova.austin.sqlite |  Bin 44032 -> 0 bytes
 2 files changed, 1 deletion(-)

commit 777014c9667210c3b63180380a4562e0522b8885
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Tue May 29 07:46:27 2012 -0400

    Fix the conf argument to get_connection_pool().
    
    The first argument to amqp.get_connection_pool() should be a global
    config object, not the Connection.
    
    Change-Id: Ic0b8f32ea42bdebdd883175a1351b3a52f26942d

 nova/rpc/impl_kombu.py |    4 ++--
 nova/rpc/impl_qpid.py  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 261c80e724d802ff146a9eca3d967c46c8ab9639
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue May 29 21:55:30 2012 -0700

    Remove Deprecated auth from EC2
    
    Partially implements bp remove-deprecated-auth
    
    Change-Id: Ic500f8b2eb68d6b56fa8c6a7313c550e7b293d5d

 etc/nova/api-paste.ini   |    7 ---
 nova/api/ec2/__init__.py |  122 ----------------------------------------------
 2 files changed, 129 deletions(-)

commit 16d26af6ef57a7de86c7acaa8ab2aa4f37be7097
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 29 16:42:26 2012 -0500

    Revert "API users should not see deleted flavors."
    
    This reverts commit f6e62c6120453fa90e2e690753fe6eaf157f2dde. We
    need to be able to query deleted flavors for instances that may
    be running on deleted flavors.
    
    Change-Id: I9ae80c525c9bc1e3172bd4e7ffe50fe74f2d3a51

 nova/compute/instance_types.py    |    2 +-
 nova/tests/test_instance_types.py |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

commit d5cc5fd2f023e5d7095476282159027dce957cb3
Author: Matt Joyce <matt.joyce@cloudscaling.com>
Date:   Tue May 29 12:04:03 2012 -0700

    Grammar fixes.
    
    Change-Id: Iff3f5765193e0bc98dfc377ee5a9b6f47ae11859

 bin/nova-manage                          |    2 +-
 doc/source/devref/xensmvolume.rst        |    2 +-
 etc/nova/nova.conf.sample                |    2 +-
 nova/db/api.py                           |    6 +++---
 nova/db/sqlalchemy/models.py             |    4 ++--
 nova/flags.py                            |    2 +-
 nova/network/quantum/melange_ipam_lib.py |    2 +-
 nova/openstack/common/cfg.py             |    4 ++--
 nova/rpc/amqp.py                         |   15 ++++++++-------
 nova/utils.py                            |    2 +-
 nova/virt/connection.py                  |    2 +-
 nova/virt/libvirt/firewall.py            |    2 +-
 nova/volume/san.py                       |    2 +-
 tools/hacking.py                         |    2 +-
 14 files changed, 25 insertions(+), 24 deletions(-)

commit 31bf321cf11783ebd1b7233bd752d23f3883101b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed May 23 14:31:47 2012 -0400

    Record instance architecture types.
    
    In order to support image architectures other than x86,
    we need to record the instance architecture when it is running.
    
    Glance has the information that we need so we take the
    information that glance provides us.
    
    This is the first step for support other arches like armhf.
    
    Change-Id: Ia9ca1353a7cf56955d00d17f7bc1bfb3712a89ab
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/compute/api.py                |    6 ++++++
 nova/tests/compute/test_compute.py |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

commit 1bbf44fa67412040246b93b15cab18e715a0be07
Author: Matt Joyce <matt.joyce@cloudscaling.com>
Date:   Fri May 25 14:53:33 2012 -0700

    Grammar / spelling corrections
    
    Change-Id: Id5b6665a2a40a9bd0830c1a3500b4ad98eec435b

 Authors                                |    1 +
 bin/nova-manage                        |    2 +-
 nova/auth/nova_openldap.schema         |    2 +-
 nova/db/api.py                         |   22 +++++++++++-----------
 nova/image/fake.py                     |    2 +-
 nova/openstack/common/cfg.py           |    2 +-
 nova/tests/api/ec2/test_cloud.py       |    2 +-
 nova/tests/scheduler/test_scheduler.py |    2 +-
 nova/virt/libvirt/connection.py        |    2 +-
 nova/volume/api.py                     |    2 +-
 smoketests/test_sysadmin.py            |    2 +-
 11 files changed, 21 insertions(+), 20 deletions(-)

commit dab262af0d642c48c7d2b92bf8b0520ffc65daaf
Merge: 09b13b8 4e65a33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 29 16:30:49 2012 +0000

    Merge "Allow adding fixed IPs by network UUID"

commit 09b13b84493144ebc9c71e504709bd596e546a0f
Merge: d7e613d 345439f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 29 15:27:50 2012 +0000

    Merge "update xen to use network_model"

commit 5b85997e33aa749ece94edebaaefefe71b899561
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu May 24 21:51:57 2012 -0400

    cleanup power state (partially implements bp task-management)
    
    Removed duplicate and invalid state in power_state:
    FAILED, SHUTOFF, BLOCKED
    This is the first step in cleaning up nova state machine
    and do better task management (bp/task-management)
    
    http://wiki.openstack.org/VMState
    
    Change-Id: I586b9058fada5efd468870fb187590fc0e37aa8f

 nova/compute/manager.py                       |    3 +-
 nova/compute/power_state.py                   |   25 +++++++++------
 nova/scheduler/driver.py                      |    4 +--
 nova/tests/baremetal/test_proxy_bare_metal.py |   14 +++------
 nova/tests/test_libvirt.py                    |    2 +-
 nova/virt/libvirt/connection.py               |   42 ++++++++++++++++++++++---
 6 files changed, 61 insertions(+), 29 deletions(-)

commit a8d9bf7705d01fc40a652e7e35624a1488d3a44f
Author: Alessio Ababilov <aababilov@griddynamics.com>
Date:   Fri May 25 19:27:39 2012 +0300

    [PATCH] Allow [:print:] chars for security group names
    
    Fixes bug #1000673
    
    Change-Id: Id1b23d6a0f8d328f65b66f947e8937fa1914a5db

 nova/api/ec2/__init__.py |    4 ++++
 nova/api/ec2/cloud.py    |   42 ++++++++++++++++++++++++++++------------
 nova/tests/test_api.py   |   48 +++++++++++++++++++++++++++++++++-------------
 3 files changed, 69 insertions(+), 25 deletions(-)

commit 14c01e09b68b367d708c6ddd6f3d4e440687727c
Author: Don Dugger <donald.d.dugger@intel.com>
Date:   Tue May 8 18:30:57 2012 -0600

    Add scheduler filter for trustedness of a host
    
    Implements blueprint trusted-computing-pools
    
    Add a scheduling filter that filters based upon the trustedness of
    a node.  A request is sent to the attestation service to disover the
    trustedness of the target node and, only if it matches the `trust_host'
    key/value pair in the `extra_specs' for the instance type, then the
    instance can be started on that node.  More details can be found in the
    docspec for the filter in:
    
    	nova/scheduler/filters/trusted_filter.py
    
    To setup an attestation server go to the Open Attestation Project at:
    
            https://github.com/OpenAttestation/OpenAttestation
    
    Also add 5 tests for the new filter that verifies:
    
    1)  Schedule works with no trust in the extra specs
    2)  Schedule works with trusted instance and trusted host
    3)  Schedule works with untrusted instance and untrusted host
    4)  Schedule fails with trusted instance and untrusted host
    5)  Scheduel fails with untrusted instance and trusted host
    
    Signed-off-by: Don Dugger <donald.d.dugger@intel.com>
    Signed-off-by: Fred Yang <fred.yang@intel.com>
    
    Change-Id: Iafa6aed8061f6cd4630367553aee14bd4b0263e2

 Authors                                   |    1 +
 nova/scheduler/filters/trusted_filter.py  |  207 +++++++++++++++++++++++++++++
 nova/tests/scheduler/test_host_filters.py |   81 +++++++++++
 3 files changed, 289 insertions(+)

commit d7e613dabc2dbc28d9405a5b450dc2b4dfa9d47b
Merge: 0add75a 7b89917
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 28 09:59:58 2012 +0000

    Merge "_s3_create update only pertinent metadata"

commit 0add75a7ff674cd650a962bfbc1f24121313bfde
Merge: 3ac0e1f fb4e034
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 27 03:52:32 2012 +0000

    Merge "clean-up of the bare-metal framework."

commit a427d04901b57789b4127c8b8c79b6b7141d8e3a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Sat May 26 20:42:09 2012 -0400

    Remove nova.log usage from nova.rpc.
    
    Part of blueprint common-rpc.
    
    This patch removes the usage of nova.log from nova.rpc.  This is
    necessary before nova.rpc can be moved to openstack-common.  The rpc
    logging was not using any of the extra features provided in nova.log as
    far as I can tell, so the changes are very simple.
    
    This is the final dependency.  After this change, the rpc code
    can be moved to openstack-common without any changes.
    
    Change-Id: I17ca4b691bb8d4f18e618632a2381dd12d31852a

 nova/rpc/amqp.py      |    2 +-
 nova/rpc/common.py    |    2 +-
 nova/rpc/impl_qpid.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 4a3104c6aeeb4368b298b81b4e5e6270801ea775
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 25 16:24:03 2012 -0400

    Remove nova.context dependency from nova.rpc
    
    Part of blueprint common-rpc.
    
    This patch removes the usage of nova.context from nova.rpc.  Everything
    needed to implement RpcContext now exists within nova.rpc.
    
    Change-Id: I9e6ec0d22e55d3d4f38e12e0fdd2df745da496f5

 nova/rpc/amqp.py      |    7 +++----
 nova/rpc/common.py    |   44 ++++++++++++++++++++++++++++++++++++++++++++
 nova/rpc/impl_fake.py |    7 +++----
 3 files changed, 50 insertions(+), 8 deletions(-)

commit 7b89917ece552b6b3dfe92ecc878531d9bfd9125
Author: John Tran <jhtran@att.com>
Date:   Wed May 23 13:06:19 2012 -0700

    _s3_create update only pertinent metadata
    
    Fixes bug 827458.  nova/image/s3.py _s3_create iterates through each
    image_state during image creation isn't mindful of metadata updates
    such as 'is_public'.  Now will only update the specific pertinent
    metadata instead of purging all.
    
    Change-Id: I3e678d028464ac252383aa363baf488249dca198

 nova/image/fake.py          |   18 +++++++++++--
 nova/image/glance.py        |    5 ++--
 nova/image/s3.py            |   47 +++++++++++++++++++---------------
 nova/tests/glance/stubs.py  |    2 +-
 nova/tests/image/test_s3.py |   59 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 105 insertions(+), 26 deletions(-)

commit 4e65a33276895432121e2d4e8efd323956d73529
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Fri May 25 03:50:25 2012 +0000

    Allow adding fixed IPs by network UUID
    
    Fixes LP Bug #1004280
    
    Change-Id: I832b21091803d8da511ded96d14000602016e984

 nova/network/manager.py            |    7 +++++--
 nova/tests/network/test_manager.py |   35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

commit 3ac0e1fc3bd4e3b3fb7931f174e362e4ff1e8740
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 25 17:18:21 2012 -0400

    Fix a minor spelling error.
    
    Change-Id: I6fe9f254814be6c28bc9377b864c8c4c454390ff

 nova/tests/rpc/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e79356b86adb5679c58ac6afd2cc6af7606bf50d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri May 25 15:27:03 2012 -0400

    Run coverage tests via xcover for jenkins.
    
    In the jenkins jobs, we need to run coverage with xunit output so that
    jenkins can parse it.
    
    Change-Id: Ie4cfec6f89d6b37554b5345cde92f982397915e2

 tox.ini |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a75486d6240cd9291face18108326eafd6273acd
Merge: d9de51a f88f3ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 19:32:11 2012 +0000

    Merge "Bugfix in simple_tenant_usage API detail view"

commit 965d855202da9e4aba06ab421239016080f0b3e6
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 25 14:13:34 2012 -0400

    Localize rpc options to rpc code.
    
    Part of blueprint common-rpc.
    
    Move rpc options from nova.flags into nova.rpc code.  This is necessary
    before the rpc code can be moved to openstack-common.
    
    Change-Id: I474c3660e1cbd3ab663571b1e088c84deb905e0b

 nova/flags.py          |   38 --------------------------------------
 nova/rpc/__init__.py   |    6 ++++++
 nova/rpc/impl_kombu.py |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 38 deletions(-)

commit d9de51ac52307ac017b1e7cee5320c9d4915b16e
Merge: 9385758 b116d73
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 18:43:02 2012 +0000

    Merge "Fix XenServer diagnostics to provide correct details"

commit 93857585d6405cf034d1af0a79413166e05a879f
Merge: 2458449 5aca2e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 17:06:25 2012 +0000

    Merge "Use utils.utcnow rather than datetime.utcnow"

commit 2458449399cb765b336ff46f18517d4f026a3323
Merge: 342a978 cb74f67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 16:54:54 2012 +0000

    Merge "Expose a limited networks API for users"

commit 342a978c496e0de9c4cc8f5e10762f08f66b74a8
Merge: 709d49e b858108
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 16:43:27 2012 +0000

    Merge "Use cfg's new behavior of reset() clearing overrides"

commit fb4e03457e46af75bd1922ba35c2ec80e11bd503
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri May 25 02:16:51 2012 +0100

    clean-up of the bare-metal framework.
    
    address minor problems and errors found in the driver, such as old
    docstrings, unused imports, and variables, references of non-existent
    classes, and methods; plus remove the requirement that every sub-driver
    needs to be implemented as singleton, as the tilera one.
    
    Change-Id: I5943bcdd785c1b4b83e95f88bd7d69c1edc5f62f

 nova/virt/baremetal/dom.py   |    2 --
 nova/virt/baremetal/proxy.py |   64 ++++++++++++++++++------------------------
 nova/virt/connection.py      |    9 ++++--
 3 files changed, 33 insertions(+), 42 deletions(-)

commit 5aca2e2df66c124696589ed3d45aae218fe2c91e
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed May 23 22:17:35 2012 +0800

    Use utils.utcnow rather than datetime.utcnow
    
    Fixes bug #1003587
    
    Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow
    
    Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224

 .../compute/contrib/simple_tenant_usage.py         |    2 +-
 nova/db/sqlalchemy/api.py                          |    7 +++----
 nova/scheduler/scheduler_options.py                |    5 ++++-
 .../openstack/compute/contrib/test_cloudpipe.py    |    4 +---
 .../compute/contrib/test_simple_tenant_usage.py    |    7 ++++---
 .../openstack/compute/contrib/test_snapshots.py    |    8 ++++----
 .../api/openstack/compute/contrib/test_volumes.py  |    7 ++++---
 nova/tests/api/openstack/volume/test_snapshots.py  |    9 ++++-----
 nova/tests/api/openstack/volume/test_volumes.py    |    7 ++++---
 nova/tests/test_db_api.py                          |    4 ++--
 nova/tests/test_xenapi.py                          |    5 ++---
 nova/utils.py                                      |    4 ++--
 12 files changed, 35 insertions(+), 34 deletions(-)

commit 709d49e9791751911635a923971d8f17757a97cf
Merge: 89fccd5 6b4012d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 25 00:15:45 2012 +0000

    Merge "removed a dead db function register_models()"

commit 345439f86a9ac8bd95cc7f382a3890d86f794b62
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Mar 30 10:14:08 2012 -0500

    update xen to use network_model
    
    blueprint xenapi-network-info-model
    
    updated xenapi to use the new network info models
    
    also:
    updated virt firewall to handle both old version and new hotness
    made a few minor changes to the network info model
    moved the legacy converstion shim from compute/utils to the model itself
    wharrgarbl'd a few of the tests
    
    NOTE: no unittests were skipped during the creation of this patch
    
    Change-Id: Ib77dd2bf4f0a525b73800441f19013e842c77f98

 nova/compute/manager.py            |    2 +-
 nova/compute/utils.py              |  118 ---------------------------
 nova/network/manager.py            |    2 +-
 nova/network/model.py              |  128 ++++++++++++++++++++++++++++--
 nova/network/quantum/manager.py    |    2 +-
 nova/tests/fake_network.py         |    7 +-
 nova/tests/network/test_manager.py |    4 +-
 nova/tests/test_libvirt.py         |    3 +-
 nova/tests/test_libvirt_vif.py     |   10 +--
 nova/tests/test_xenapi.py          |  154 +++++++++---------------------------
 nova/virt/firewall.py              |   29 +++++++
 nova/virt/libvirt/connection.py    |    6 +-
 nova/virt/libvirt/vif.py           |   22 ++++--
 nova/virt/vif.py                   |    4 +-
 nova/virt/vmwareapi/vif.py         |    4 +-
 nova/virt/vmwareapi/vmops.py       |    4 +-
 nova/virt/xenapi/connection.py     |    7 ++
 nova/virt/xenapi/vif.py            |   43 +++++-----
 nova/virt/xenapi/vm_utils.py       |   94 ++++++++++++++++------
 nova/virt/xenapi/vmops.py          |   86 +++++++++++++++++---
 20 files changed, 401 insertions(+), 328 deletions(-)

commit 5e487678424ce099261ea53d55d3d8976273f01f
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu May 24 15:37:57 2012 -0400

    fixes bug 1004153
    
    fixes save_and_reraise_exception call to the right module and removes unused import.
    
    Change-Id: I3e6472fe5ade0cc0c155b73b97c8aabbf9b21398

 nova/compute/manager.py |    2 +-
 nova/virt/driver.py     |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

commit f88f3ed42c83730b28d4da2b3a51ce7fb7d19221
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon May 21 14:00:01 2012 +0800

    Bugfix in simple_tenant_usage API detail view
    
    Fixes bug #1002154
    
    Change-Id: I56b38c32e55c825297626eb0d6813d70fbefad4c

 .../compute/contrib/simple_tenant_usage.py         |    3 ++-
 .../compute/contrib/test_simple_tenant_usage.py    |   22 ++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

commit 6b4012de9fef7b1f6695bca26f67c31a5f69617d
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu May 24 15:42:46 2012 -0400

    removed a dead db function register_models()
    
    The actual models are created by the migration modules.
    register_models() are no longer used and raises some confusions.
    
    Change-Id: Id418917f3bbcf9a951b89bec01499a53cc92f57b

 nova/db/sqlalchemy/models.py |   48 ------------------------------------------
 1 file changed, 48 deletions(-)

commit 89fccd50d740a0cd68e7993e94536e68641d3337
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Fri May 18 15:13:20 2012 -0400

    add queue name argument to TopicConsumer
    
    ceilometer is going to want to subscribe several worker processes
    to the notifications.info topic queue. The pool of workers needs
    to be assured of receiving all messages, without interference from
    other clients listening for notifications. The TopicConsumer
    class always assumes the topic and queue name should be the same,
    but in the ceilometer case we want to use a separate named queue
    with a different name. The only parameter that cannot be
    controlled by the user of TopicConsumer is the queue name,
    so this change adds the ability to set the queue name.
    
    Change-Id: I41a525de2fd855ca30c24fafcfbfefd6ab615dd7

 nova/rpc/amqp.py             |    3 +++
 nova/rpc/common.py           |   19 +++++++++++++++++++
 nova/rpc/impl_kombu.py       |   32 +++++++++++++++++++++++---------
 nova/rpc/impl_qpid.py        |   32 +++++++++++++++++++++++++-------
 nova/tests/rpc/test_kombu.py |   25 +++++++++++++++++++++++++
 nova/tests/rpc/test_qpid.py  |   29 +++++++++++++++++++++++++++++
 6 files changed, 124 insertions(+), 16 deletions(-)

commit d7eef34fdea8f94068dd2d745cba1ae493af61a9
Merge: b91cf18 d37e49f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 19:30:42 2012 +0000

    Merge "Remove deprecated quota code."

commit 6e480708eed4b32a0748cbca46c3d8b439d151db
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu May 24 12:03:37 2012 -0700

    Cleanup tools/hacking using flake8
    
    Change-Id: Ia151f265bf62e6704de6cc2f2c01963be9e2dd69

 tools/hacking.py |    2 --
 1 file changed, 2 deletions(-)

commit b91cf18420fc09b0151271e0c5f878d5df944e1c
Merge: 43e9e7c 4048158
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 18:24:30 2012 +0000

    Merge "Use memcache to store consoleauth tokens"

commit 43e9e7c0703ad1d49b1ce63a751a2ff5e176c394
Merge: 84d547c bc0f223
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 18:22:07 2012 +0000

    Merge "Added a instance state update notification"

commit cb74f678f67bafc060499766ad3e2422422f0ded
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Sun May 20 00:06:32 2012 -0400

    Expose a limited networks API for users
    
    Currently, users do not have any way of knowing what networks
    are available for use, and in some scenarios such as when a
    user wants to add a fixed IP, they do not have access to the
    network ID.
    
    This exposes a limited amount of information through the
    existing networks extension for users and fixes LP Bug #1003979
    
    Change-Id: I14cc3a377ee0f031b4edaf7eeec3a6550a402b1a

 etc/nova/policy.json                               |    1 +
 nova/api/openstack/compute/contrib/networks.py     |   30 ++++++-----
 nova/db/sqlalchemy/api.py                          |    2 +-
 .../api/openstack/compute/contrib/test_networks.py |   52 +++++++++++++++++---
 nova/tests/policy.json                             |    1 +
 5 files changed, 65 insertions(+), 21 deletions(-)

commit 84d547c7d9176894b23463bbc2a26cac06f4fe10
Merge: 9c9c4d7 db0f283
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 17:04:50 2012 +0000

    Merge "Add help string to option 'osapi_max_request_body_size'"

commit bc0f2235d9b27e604b9264b5c19adce3cf306bc2
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Sun May 13 21:06:29 2012 +0000

    Added a instance state update notification
    
    Added a instance update notification (compute.instance.update) that
    will report on changes to vm_state and task_state. The goal here is
    to provide useful insight into instance state transitions.  (e.g.
    BUILDING->ACTIVE)
    
    The new notification has minimial dependencies and is intended for
    wide use across the different layers/packages within nova.  Calls
    in compute api/manager, scheduler, and the virt layer that modify
    the instance state have been instrumented with this notification.
    
    Change-Id: I223eb7eccc8aa079b782f6bb17727cd0b71d18ed

 nova/compute/api.py                                |   23 +-
 nova/compute/manager.py                            |    8 +-
 nova/compute/utils.py                              |   94 +-------
 nova/db/api.py                                     |   16 ++
 nova/db/sqlalchemy/api.py                          |   32 ++-
 nova/notifications.py                              |  242 ++++++++++++++++++++
 nova/scheduler/driver.py                           |    7 +-
 nova/scheduler/manager.py                          |    7 +-
 .../openstack/compute/contrib/test_disk_config.py  |    8 +-
 .../api/openstack/compute/test_server_actions.py   |    6 +-
 nova/tests/api/openstack/compute/test_servers.py   |   15 +-
 nova/tests/scheduler/test_scheduler.py             |   46 ++--
 nova/tests/test_db_api.py                          |   12 +
 nova/tests/test_notifications.py                   |  169 ++++++++++++++
 nova/virt/baremetal/proxy.py                       |   22 +-
 nova/virt/xenapi/host.py                           |   30 ++-
 16 files changed, 602 insertions(+), 135 deletions(-)

commit d37e49fda032dc0892f5242d77d65f7ff32cc83a
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri May 11 17:19:48 2012 -0500

    Remove deprecated quota code.
    
    This completes blueprint quota-refactor by removing the now-unused
    classic quotas code.
    
    This change is fairly substantial.  To make it easier to review, it has been
    broken up into 3 parts.  This is the third part.
    
    Change-Id: I8856f84655ef2e6d61b3d1f52190b83a96c87fdb

 nova/quota.py            |  183 ------------------
 nova/tests/test_quota.py |  458 +---------------------------------------------
 2 files changed, 2 insertions(+), 639 deletions(-)

commit 9c9c4d78530a3a1e50dd5b7496ef54e51c4b48f5
Merge: 317378f f6e62c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 15:54:52 2012 +0000

    Merge "API users should not see deleted flavors."

commit 317378f742aafd59d0aaa6c5698bbda57cbfa15a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 24 06:56:15 2012 -0700

    Update pep8 dependency to v1.1
    
    The latest release of pep8 adds stricter rules for extraneous
    whitespace within lines. This patch also addresses these new
    violations acoss the codebase.
    
    Change-Id: Ib7e50281870473df1704ed50868c5c2e26bdb02e

 nova/api/openstack/compute/contrib/hosts.py        |    2 +-
 nova/api/openstack/compute/contrib/networks.py     |    2 +-
 .../compute/contrib/test_admin_actions.py          |    2 +-
 .../openstack/compute/contrib/test_disk_config.py  |    2 +-
 .../compute/contrib/test_scheduler_hints.py        |    2 +-
 .../compute/contrib/test_security_groups.py        |    4 ++--
 .../compute/contrib/test_simple_tenant_usage.py    |   18 +++++++++---------
 nova/virt/baremetal/nodes.py                       |    2 +-
 nova/virt/baremetal/proxy.py                       |    6 +++---
 nova/virt/fake.py                                  |    6 +++---
 nova/virt/libvirt/connection.py                    |    8 ++++----
 nova/virt/vmwareapi/vmops.py                       |    2 +-
 nova/virt/xenapi/connection.py                     |    6 +++---
 nova/virt/xenapi/volume_utils.py                   |    2 +-
 nova/vnc/xvp_proxy.py                              |   10 +++++-----
 tools/hacking.py                                   |    8 ++++----
 tools/test-requires                                |    2 +-
 tools/xenserver/vdi_chain_cleanup.py               |    2 +-
 tox.ini                                            |    2 +-
 19 files changed, 44 insertions(+), 44 deletions(-)

commit e3d7d3a805355340f27b9626f83eda329f358fda
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 24 09:31:16 2012 -0400

    Nail pep8 dependencies to 1.0.1.
    
    Nails the pep8 deps for tox and test-requires to 1.0.1.
    Fixes an issues causing pep8 failures due to a new pep8 release.
    
    Change-Id: I30be4909f052c29834afbfddba6007045afa519b

 tools/test-requires |    2 +-
 tox.ini             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f6e62c6120453fa90e2e690753fe6eaf157f2dde
Author: Dan Prince <dprince@redhat.com>
Date:   Wed May 23 23:06:22 2012 -0400

    API users should not see deleted flavors.
    
    Reverts a change earlier today to instance_types.get_instance_type_by_flavor_id
    which allows deleted flavors (instance types) to be displayed via the flavors
    API.
    
    Fixes LP Bug #1003741.
    
    Change-Id: I8236a2ca2a7b461a66c1118e599d5e49f2b650d8

 nova/compute/instance_types.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit bae7d8a1e8af0c0303862420ad552c05b955ccff
Merge: 10c5d74 66073a4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 24 02:39:15 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 10c5d74dcd7cddc4dcefe27180eae5eb8587b1b6
Merge: eed5ccc 7ab5198
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 01:00:23 2012 +0000

    Merge "Add scheduler filter: TypeAffinityFilter"

commit eed5ccc27d7f12266d6bc5da2dcc3932bb1fddb5
Merge: b5a376e 1d7b4f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 24 00:37:24 2012 +0000

    Merge "More accurate rescue mode testing for XenAPI"

commit 7ab519806dfc6b44ada9fdd9eec3a342c5f9263f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu May 17 19:08:14 2012 -0700

    Add scheduler filter: TypeAffinityFilter
    
    Dynamically limits hosts to one instance type
    
    Change-Id: I987e8062e2094c5d5578392653c5335b3d64afb7

 nova/db/api.py                            |    9 +++++--
 nova/db/sqlalchemy/api.py                 |    6 +++++
 nova/scheduler/filters/type_filter.py     |   39 +++++++++++++++++++++++++++++
 nova/tests/scheduler/test_host_filters.py |   29 ++++++++++++++++++++-
 4 files changed, 80 insertions(+), 3 deletions(-)

commit b5a376e2ce9d52178e737cb23a37a6aa387087e8
Merge: d346cbd c1bf456
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 22:13:45 2012 +0000

    Merge "Sync with latest version of openstack.common.cfg"

commit d346cbd48b96b87fea7cc9aab9e243e4b8e00f92
Merge: a9989ff f06ebd4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 21:34:09 2012 +0000

    Merge "Remove unused tools/rfc.sh"

commit a9989ffbb91b09a772851d859db751243a5a1917
Merge: c737803 ae95868
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 21:05:50 2012 +0000

    Merge "fixes bug 999206"

commit db0f2836df84f6c2d3098b7a87896e7a276bd862
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Thu May 24 04:02:23 2012 +0800

    Add help string to option 'osapi_max_request_body_size'
    
    Fixes bug #1003626
    
    Change-Id: I3b08b813ff2e15a612474113aed43e570335ac9e

 nova/api/sizelimit.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c7378032c8bbdc77efb98f427b73df096dd82085
Merge: 1a2d94f 31506c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 20:40:46 2012 +0000

    Merge "Permit deleted instance types to be queried for active instances."

commit 1a2d94f39e4119263b31d3ede2beb90c658dc19a
Merge: d9ee3bd 17f9473
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 20:30:25 2012 +0000

    Merge "Make validate_compacted_migration into general diff tool."

commit d9ee3bd9bc8509b15889083aa29359022c5569b1
Merge: 19ec093 b7f0946
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 19:22:16 2012 +0000

    Merge "Finish quota refactor."

commit 31506c0a252f06e283eecc54741f6a3062fbe913
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 23 13:36:37 2012 -0500

    Permit deleted instance types to be queried for active instances.
    
    Fixes bug 994935.
    
    This removes the deleted=0 restriction for joining instance_types
    to instances. Active instances may be using old/deleted instance_types,
    so we still need to be able to look up that information for show/detail
    requests.
    
    Change-Id: Ica72801f19c7e5b04966e53ed3ea4c330df44ed1

 nova/compute/instance_types.py    |    4 +++-
 nova/db/sqlalchemy/models.py      |    3 +--
 nova/tests/test_instance_types.py |   20 +++++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

commit 17f9473be7ec32b468d26c7304596ae51901a8e6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 23 18:03:08 2012 +0000

    Make validate_compacted_migration into general diff tool.
    
    This patch removes some assumptions from the tool and turns it in to a
    generalized schema diffing tool where any two versions of the DB schema,
    represented by branch-version pairs, can be diffed.
    
    To reflect the more genernal nature, the name was changed to
    schema_diff.py.
    
    Change-Id: I4dc233fa2d4b084779922893f76baa753fe2c126

 tools/db/schema_diff.py                  |  270 ++++++++++++++++++++++++++++++
 tools/db/validate_compacted_migration.py |  241 --------------------------
 2 files changed, 270 insertions(+), 241 deletions(-)

commit f06ebd4e3282c8b05fd3bef0dc580cfed71d03b3
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed May 23 11:35:24 2012 -0700

    Remove unused tools/rfc.sh
    
    nova now uses git-review from pip
    
    Change-Id: Ic4bfa1aee3a4b6a7588be3678ac033a1b13e2b18

 tools/rfc.sh |  150 ----------------------------------------------------------
 1 file changed, 150 deletions(-)

commit 19ec093e81f94c9b00bddf2af25ac6dcc406590b
Merge: a833a2e 8c34089
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 17:31:38 2012 +0000

    Merge "Use utils.parse_strtime rather than datetime.strptime"

commit a833a2e0279fc12a2c8343b6ce54a1480b7ec766
Merge: 7e15d4e 42c4f68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 16:15:36 2012 +0000

    Merge "Add migration compaction validation tool."

commit b7f0946bbd071bc76809eca440ab7d21a03eb1a3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri May 11 15:30:14 2012 -0500

    Finish quota refactor.
    
    Finishes quota refactoring by making use of the new quota infrastructure.
    Partially implements blueprint quota-refactor (the final piece is to
    remove the old quota architecture).
    
    This change is fairly substantial.  To make it easier to review, it has been
    broken up into 3 parts.  This is the second part.
    
    Change-Id: I1c8b43198f0d44e9e13a45575361aa043fd0639e

 bin/nova-manage                                    |   10 +-
 nova/api/ec2/cloud.py                              |   49 ++++++--
 nova/api/openstack/common.py                       |    8 +-
 .../api/openstack/compute/contrib/quota_classes.py |   15 ++-
 nova/api/openstack/compute/contrib/quotas.py       |   27 +++--
 .../openstack/compute/contrib/security_groups.py   |   60 ++++++---
 nova/api/openstack/compute/limits.py               |    7 +-
 nova/compute/api.py                                |  128 ++++++++++++++++----
 nova/db/sqlalchemy/api.py                          |    9 +-
 nova/exception.py                                  |    4 +
 nova/network/manager.py                            |   54 +++++++--
 nova/scheduler/chance.py                           |    6 +-
 nova/scheduler/driver.py                           |    4 +-
 nova/scheduler/filter_scheduler.py                 |   11 +-
 nova/scheduler/manager.py                          |    8 +-
 nova/scheduler/rpcapi.py                           |    5 +-
 nova/scheduler/simple.py                           |    5 +-
 .../api/openstack/compute/contrib/test_keypairs.py |   34 +++++-
 .../compute/contrib/test_quota_classes.py          |    6 +-
 .../api/openstack/compute/contrib/test_quotas.py   |    7 +-
 .../compute/contrib/test_security_groups.py        |    2 +-
 nova/tests/api/openstack/compute/test_limits.py    |    7 +-
 nova/tests/api/openstack/compute/test_servers.py   |    4 +-
 nova/tests/api/openstack/fakes.py                  |   23 +++-
 nova/tests/compute/test_compute.py                 |   16 +--
 nova/tests/network/test_manager.py                 |   20 +--
 nova/tests/scheduler/test_chance_scheduler.py      |   23 ++--
 nova/tests/scheduler/test_filter_scheduler.py      |   12 +-
 nova/tests/scheduler/test_rpcapi.py                |    6 +-
 nova/tests/scheduler/test_scheduler.py             |    6 +-
 nova/tests/test_quota.py                           |   79 ++++++++++--
 nova/tests/test_volume.py                          |   16 +++
 nova/volume/api.py                                 |    9 +-
 nova/volume/manager.py                             |   25 +++-
 34 files changed, 528 insertions(+), 177 deletions(-)

commit 8c34089997d6dd6491a779964792ce4a85f523fa
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon May 21 13:17:58 2012 +0800

    Use utils.parse_strtime rather than datetime.strptime
    
    Fixes bug #1002130
    
    Fix direct use of datetime.strptime to utilize utils.parse_strtime
    
    Change-Id: Ibb25a1fdae0836f046aa3cdee3190a24db8d7aa5

 .../compute/contrib/simple_tenant_usage.py         |   27 ++++++++++----------
 nova/api/openstack/compute/versions.py             |    7 +++--
 nova/image/glance.py                               |    3 +--
 nova/tests/test_api.py                             |   20 +++++----------
 4 files changed, 24 insertions(+), 33 deletions(-)

commit 7e15d4e28f98e13f0ea7399787c50839139d8492
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu May 10 19:28:04 2012 -0400

    Add version to compute rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    Change-Id: I5943d1fae2c96cfe519817b59098402481a1026b

 nova/compute/api.py                |  240 +--
 nova/compute/manager.py            |    2 +
 nova/compute/rpcapi.py             |  276 +++
 nova/tests/compute/__init__.py     |   19 +
 nova/tests/compute/test_compute.py | 4167 ++++++++++++++++++++++++++++++++++++
 nova/tests/compute/test_rpcapi.py  |  236 ++
 nova/tests/test_compute.py         | 4161 -----------------------------------
 7 files changed, 4783 insertions(+), 4318 deletions(-)

commit 21e9d2e2b793241d8264833cfd9a9c94d023df8e
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 16 16:40:05 2012 -0400

    Add version to scheduler rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    One side effect of this change was that nova.scheduler.api was removed
    in favor of nova.scheduler.rpcapi.  In this case, the api was just a
    direct wrapper around rpc usage.  For other APIs, I've been following
    the pattern that the rpcapi module provides the rpc client wrapper, and
    if any other client-side logic is needed, that's where an api module is
    used.
    
    Change-Id: Ibd0292936f9afc77aeb5d040660bfa857861eed1

 bin/nova-manage                                    |    8 +-
 .../api/openstack/compute/contrib/admin_actions.py |    5 +-
 nova/api/openstack/compute/contrib/hosts.py        |    5 +-
 nova/compute/api.py                                |   35 +++----
 nova/manager.py                                    |    7 +-
 nova/scheduler/api.py                              |   72 --------------
 nova/scheduler/manager.py                          |    5 +
 nova/scheduler/rpcapi.py                           |   79 +++++++++++++++
 .../compute/contrib/test_admin_actions.py          |    6 +-
 .../api/openstack/compute/contrib/test_hosts.py    |    7 +-
 nova/tests/api/openstack/compute/test_servers.py   |    2 +-
 nova/tests/scheduler/test_rpcapi.py                |  103 ++++++++++++++++++++
 nova/tests/test_compute.py                         |   18 ++--
 nova/tests/test_quota.py                           |    2 +-
 14 files changed, 230 insertions(+), 124 deletions(-)

commit f50ce35c9cf2e05d205485586da1cb6d5433ba56
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 16 16:31:39 2012 -0400

    Add version to console rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    Change-Id: I17d6e3094c56d8628688dabdc8d40b2f4f815af4

 nova/console/api.py                |   23 +++----
 nova/console/manager.py            |    2 +
 nova/console/rpcapi.py             |   47 ++++++++++++++
 nova/tests/console/__init__.py     |   19 ++++++
 nova/tests/console/test_console.py |  118 ++++++++++++++++++++++++++++++++++++
 nova/tests/console/test_rpcapi.py  |   66 ++++++++++++++++++++
 nova/tests/test_console.py         |  118 ------------------------------------
 7 files changed, 261 insertions(+), 132 deletions(-)

commit 82f38e44ae5504bc56e05446266912cb700a329e
Merge: 9437220 f8437e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 23 02:55:35 2012 +0000

    Merge "Enable checking for imports in alphabetical order"

commit 94372203cf7fc41245b5b0cb4eb935a80e2d8c20
Merge: 6254523 d7ed2c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 22 23:08:43 2012 +0000

    Merge "Remove wsgiref from requirements."

commit d7ed2c136bf4d17b7784bc741fb1bd8aa84ec133
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue May 22 14:50:44 2012 -0700

    Remove wsgiref from requirements.
    
    Not referenced in code
    
    Change-Id: I13c63abbbe7fb7e206a78bffc2ade06aebad44b8

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit 1d7b4f1e5eb3d6e00eeaa927c67c765f726b9d77
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu May 10 16:54:12 2012 -0400

    More accurate rescue mode testing for XenAPI
    
    Update test_rescue to make sure the swap partition wasn't rescued. Since
    this test fails with the current code, I also updated the code so the test
    passed.
    
    Fixes bug 997835
    
    Change-Id: I9f09b3bbbee0ddfcbfdb243a7dff0b9bae99925d

 nova/tests/test_xenapi.py |   17 +++++++++++++++--
 nova/virt/xenapi/fake.py  |    4 ++--
 nova/virt/xenapi/vmops.py |   15 +++++----------
 3 files changed, 22 insertions(+), 14 deletions(-)

commit 6254523439ad692adb39f9e3231454a047e5cb10
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Tue May 1 11:24:59 2012 -0400

    Add tenant id in self link in /servers call for images
    
    Fixes bug #990019
    
    Change-Id: I0bf3c3c827090124a69205eaa1d5a6aa6568f21c

 nova/api/openstack/common.py                    |   36 ++++++++++++++---------
 nova/api/openstack/compute/views/flavors.py     |    9 ++++--
 nova/api/openstack/compute/views/images.py      |   29 +++++++++++-------
 nova/api/openstack/compute/views/servers.py     |   23 +++++++++++----
 nova/tests/api/openstack/compute/test_images.py |   20 ++++++-------
 5 files changed, 74 insertions(+), 43 deletions(-)

commit 42c4f68c252c8da8b287d31caeff9c73262dfc63
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat May 19 00:22:14 2012 +0000

    Add migration compaction validation tool.
    
    This tool can be used to diff the schemas pre and post migration to
    validate that nothing fundamental has changed during the compaction
    process.
    
    Change-Id: I178c849aa93467898a7c9bf1d2128d28af1b1ad4

 tools/db/validate_compacted_migration.py |  241 ++++++++++++++++++++++++++++++
 1 file changed, 241 insertions(+)

commit f8437e37d4961c6f0cf7be091d919f49268ded1d
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue May 22 10:44:00 2012 -0700

    Enable checking for imports in alphabetical order
    
    And fix existing alphabetical ordering problems
    
    Change-Id: I3ab887e118adc8022c84ff7230e7cc2d261804f6

 nova/compute/api.py               |    4 ++--
 nova/openstack/common/cfg.py      |    2 +-
 nova/tests/rpc/test_dispatcher.py |    2 +-
 nova/tests/test_volume_utils.py   |    8 ++++----
 nova/volume/manager.py            |    2 +-
 nova/volume/utils.py              |    2 +-
 run_tests.sh                      |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

commit fea0ae767dd7d04f33b09c238d8063899bca6c70
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue May 22 11:47:01 2012 +0200

    Include volume-usage-audit in tarballs
    
    Fix setup.py to include a reference to bin/volume-usage-audit
    and make it included in generated tarballs. Fixes bug #1001218.
    
    Change-Id: I9a02e3723a29f3fb960ffa4b10d5499e98bd3a4c

 setup.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b116d73ca3806016440e182c095d8b519a71970c
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Mon May 21 20:48:38 2012 +0000

    Fix XenServer diagnostics to provide correct details
    
    XenServer driver was providing the values which were
    not the actual latest information, this makes sure the
    information is the latest and fixes LP Bug #1002497
    
    Change-Id: I4241be4a040fbadd630ba3c2cfaacbcf1c18f72e

 nova/tests/test_xenapi.py    |   16 ++++++++++------
 nova/virt/xenapi/vm_utils.py |   21 +++++++++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

commit b8581083318d887cd23e2d3cb6c1023d77f332d2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 14 06:49:17 2012 -0400

    Use cfg's new behavior of reset() clearing overrides
    
    Change-Id: Ia363ab3c3c16d4988c2e7f3a73302134698a9b79

 nova/test.py             |   18 +++++-------------
 nova/tests/__init__.py   |    1 +
 nova/tests/fake_flags.py |   43 +++++++++++++++++++++++--------------------
 nova/tests/test_flags.py |    2 +-
 4 files changed, 30 insertions(+), 34 deletions(-)

commit c1bf456cca88652efef8468e673b12acceea5665
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 21 20:52:26 2012 +0100

    Sync with latest version of openstack.common.cfg
    
    Changes since last sync:
    
     - Alphabetize imports in openstack/common/cfg.py
     - make reset() clear defaults and overrides
     - automatically create option groups
     - allow options to be marked as required
     - use a list comprehension instead of map()
    
    Change-Id: I74fac3f66b37ee07bab53bd655c0297f25849979

 nova/openstack/common/cfg.py |  103 +++++++++++++++++++++++++++++++++++-------
 nova/tests/test_flags.py     |    5 +-
 2 files changed, 90 insertions(+), 18 deletions(-)

commit e6b42d7bdf92c8dade030798436cb3e5ec652ee9
Author: Josh Kearney <josh@jk0.org>
Date:   Mon May 21 12:55:49 2012 -0500

    Only permit alpha-numerics and ._- for instance type names.
    
    Fixes bug 977187.
    
    Change-Id: I883204a508f39441c172f3c42c8be3d6598c35d8

 nova/compute/instance_types.py    |   10 ++++++++++
 nova/tests/test_instance_types.py |    7 +++++++
 2 files changed, 17 insertions(+)

commit 53583faac261f2272f81da2ee2efaff0e10bc400
Merge: 0d4c0e7 f51f387
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 21 15:53:24 2012 +0000

    Merge "Cleanup LOG.getLoggers to use __name__"

commit 40481581696a8ba3c056c59d97213791eca84a6c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Apr 30 16:14:27 2012 -0700

    Use memcache to store consoleauth tokens
    
     * Rather than store tokens in a dict, use memorycache
       so that deployers can optionally use memcached if they
       would like to run multile nova-consoleauth processes
     * Fixes bug 989337
    
    Change-Id: I96ec4d796e53b69a494d856269e3c4e8f9b3d222

 nova/consoleauth/manager.py |   40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

commit 0d4c0e7fbc8bdd0d9c9503b09cf4590b696daf60
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon May 21 17:01:15 2012 +0800

    cert/manager.py not using crypto.fetch_crl
    
    Fixes bug #1002212
    
    Change-Id: Ie4021e9ce150a9806826d0934d30ecd0d994f7e0

 nova/cert/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f51f387b8cb8058a8f5a0c486c256a7a4d79b37d
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon May 21 15:55:52 2012 +0800

    Cleanup LOG.getLoggers to use __name__
    
    Fixes bug #1002191
    
    Change-Id: I166c6bf535ac097e3e6f64158bde0c7f5448a7b3

 .../compute/contrib/extended_server_attributes.py  |    3 +--
 nova/network/quantum/sg.py                         |    2 +-
 nova/tests/api/ec2/test_ec2_validate.py            |    2 +-
 nova/tests/test_migrations.py                      |    2 +-
 nova/tests/test_netapp.py                          |    2 +-
 nova/virt/xenapi/pool.py                           |    2 +-
 nova/volume/netapp.py                              |    2 +-
 nova/volume/nexenta/jsonrpc.py                     |    2 +-
 nova/volume/nexenta/volume.py                      |    2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

commit 66073a454eb6d44bf1afd33d972b0b582e46b971
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 20 23:04:49 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Ica48cac46d586121deaa43d5ae439f2a37fce7a3

 nova/locale/bs/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/cs/LC_MESSAGES/nova.po    | 2007 +++++++++++++++++----------------
 nova/locale/da/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/de/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 1508 +++++++++++++------------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 1504 ++++++++++++------------
 nova/locale/es/LC_MESSAGES/nova.po    | 1541 +++++++++++++------------
 nova/locale/fr/LC_MESSAGES/nova.po    | 1515 +++++++++++++------------
 nova/locale/it/LC_MESSAGES/nova.po    | 1504 ++++++++++++------------
 nova/locale/ja/LC_MESSAGES/nova.po    | 1508 +++++++++++++------------
 nova/locale/ko/LC_MESSAGES/nova.po    | 1503 ++++++++++++------------
 nova/locale/nova.pot                  | 1496 ++++++++++++------------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 1508 +++++++++++++------------
 nova/locale/ru/LC_MESSAGES/nova.po    | 1523 +++++++++++++------------
 nova/locale/tl/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/tr/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/uk/LC_MESSAGES/nova.po    | 1499 ++++++++++++------------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 1522 +++++++++++++------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 1500 ++++++++++++------------
 19 files changed, 15396 insertions(+), 13737 deletions(-)

commit ebf523174f047d5ee727e92e761bc63346bcd1ba
Merge: 09235f4 b1ece76
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat May 19 18:42:26 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 09235f490cc63d250a36a3e4992feb5491d9130f
Merge: 75cd464 300ba2d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat May 19 01:17:58 2012 +0000

    Merge "Alphabetize imports in nova/tests/"

commit 75cd4642db7859085336dcfd47862cdedc858b88
Merge: 129795c 3ae69eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 22:32:22 2012 +0000

    Merge "Fix Multi_Scheduler to process host capabilities"

commit 129795c890963c9767ec59e41e3ed3334a2d29c7
Merge: a76f08b c1e54e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 22:06:15 2012 +0000

    Merge "fixed_ip_get_by_address read_deleted from context"

commit 300ba2df117f457986d9ce77b8e709b5ad02c8b4
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon May 14 14:42:29 2012 -0700

    Alphabetize imports in nova/tests/
    
    Change-Id: Ib8e747f91f5277aecc3be01a5e8cee5bc911e823

 .../api/openstack/compute/contrib/test_accounts.py |    2 +-
 .../compute/contrib/test_admin_actions.py          |    4 ++--
 .../openstack/compute/contrib/test_cloudpipe.py    |    2 +-
 .../compute/contrib/test_deferred_delete.py        |    2 +-
 .../contrib/test_extended_server_attributes.py     |    2 +-
 .../compute/contrib/test_extended_status.py        |    2 +-
 .../compute/contrib/test_flavor_manage.py          |    4 ++--
 .../compute/contrib/test_flavorextradata.py        |    2 +-
 .../compute/contrib/test_flavors_extra_specs.py    |    2 +-
 .../openstack/compute/contrib/test_floating_ips.py |    4 ++--
 .../api/openstack/compute/contrib/test_hosts.py    |    8 ++++----
 .../api/openstack/compute/contrib/test_keypairs.py |    4 ++--
 .../compute/contrib/test_quota_classes.py          |    4 ++--
 .../api/openstack/compute/contrib/test_quotas.py   |    4 ++--
 .../compute/contrib/test_simple_tenant_usage.py    |    2 +-
 .../openstack/compute/contrib/test_snapshots.py    |    2 +-
 .../openstack/compute/contrib/test_volume_types.py |    4 ++--
 nova/tests/api/openstack/compute/test_api.py       |    6 +++---
 nova/tests/api/openstack/compute/test_consoles.py  |    2 +-
 .../tests/api/openstack/compute/test_extensions.py |    6 +++---
 nova/tests/api/openstack/compute/test_flavors.py   |    2 +-
 nova/tests/api/openstack/compute/test_images.py    |    6 +++---
 nova/tests/api/openstack/compute/test_servers.py   |    2 +-
 nova/tests/api/openstack/fakes.py                  |    4 ++--
 nova/tests/api/openstack/test_common.py            |    4 ++--
 nova/tests/api/openstack/test_faults.py            |    2 +-
 nova/tests/api/openstack/test_wsgi.py              |    6 +++---
 nova/tests/api/openstack/test_xmlutil.py           |    2 +-
 .../openstack/volume/contrib/test_types_manage.py  |    2 +-
 nova/tests/api/openstack/volume/test_extensions.py |    4 ++--
 nova/tests/api/openstack/volume/test_router.py     |    2 +-
 nova/tests/api/openstack/volume/test_snapshots.py  |    2 +-
 nova/tests/api/openstack/volume/test_types.py      |    2 +-
 nova/tests/api/test_validator.py                   |    2 +-
 nova/tests/baremetal/test_proxy_bare_metal.py      |    8 ++++----
 nova/tests/fake_network.py                         |    4 ++--
 nova/tests/image/test_glance.py                    |    2 +-
 nova/tests/image/test_s3.py                        |    2 +-
 nova/tests/integrated/api/client.py                |    2 +-
 nova/tests/integrated/test_servers.py              |    4 ++--
 nova/tests/integrated/test_volumes.py              |    6 +++---
 nova/tests/integrated/test_xml.py                  |    4 ++--
 nova/tests/network/test_linux_net.py               |    2 +-
 nova/tests/network/test_quantum.py                 |    2 +-
 nova/tests/notifier/test_list_notifier.py          |    2 +-
 nova/tests/rpc/test_common.py                      |    2 +-
 nova/tests/rpc/test_kombu.py                       |    2 +-
 nova/tests/rpc/test_qpid.py                        |    2 +-
 nova/tests/test_SolidFireSanISCSIDriver.py         |    2 +-
 nova/tests/test_access.py                          |    4 ++--
 nova/tests/test_api.py                             |    8 ++++----
 nova/tests/test_auth.py                            |    4 ++--
 nova/tests/test_compat_flagfile.py                 |    2 +-
 nova/tests/test_compute.py                         |    2 +-
 nova/tests/test_compute_utils.py                   |   12 ++++++------
 nova/tests/test_db_api.py                          |    2 +-
 nova/tests/test_exception.py                       |    4 ++--
 nova/tests/test_image.py                           |    2 +-
 nova/tests/test_imagecache.py                      |    2 +-
 nova/tests/test_instance_types.py                  |    6 +++---
 nova/tests/test_iptables_network.py                |    2 +-
 nova/tests/test_libvirt.py                         |    6 +++---
 nova/tests/test_melange_ipam_lib.py                |    2 +-
 nova/tests/test_metadata.py                        |    2 +-
 nova/tests/test_migrations.py                      |    4 ++--
 nova/tests/test_nexenta.py                         |    2 +-
 nova/tests/test_notifier.py                        |    2 +-
 nova/tests/test_objectstore.py                     |    4 ++--
 nova/tests/test_policy.py                          |    2 +-
 nova/tests/test_service.py                         |    4 ++--
 nova/tests/test_signer.py                          |    2 +-
 nova/tests/test_utils.py                           |    2 +-
 nova/tests/test_virt_drivers.py                    |    2 +-
 nova/tests/test_vmwareapi.py                       |    4 ++--
 nova/tests/test_volume.py                          |    2 +-
 nova/tests/test_volume_types.py                    |    4 ++--
 nova/tests/test_xenapi.py                          |    8 ++++----
 nova/tests/vmwareapi/db_fakes.py                   |    4 ++--
 nova/tests/vmwareapi/stubs.py                      |    6 +++---
 nova/tests/volume/test_HpSanISCSIDriver.py         |    2 +-
 80 files changed, 135 insertions(+), 135 deletions(-)

commit a76f08b971e58f1f58280374600ca2c62f674e4d
Merge: dae5b2c 7e845f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 18:30:23 2012 +0000

    Merge "Fix for Quantum LinuxBridge Intf driver plug call"

commit dae5b2c6f745a0403713fd426a17dd3e7f517b5b
Merge: df89399 9ec9fdc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 18:22:15 2012 +0000

    Merge "Add version to consoleauth rpc API."

commit df89399c783d0d97840e48765b29187e6e9311f5
Merge: e025f0e cdcb64f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 18:12:24 2012 +0000

    Merge "Implement get_hypervisor_hostname for libvirt."

commit e025f0ea80ee771b0428c62df83addae854681a1
Merge: b4a64da 1b6aa2d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 18:04:37 2012 +0000

    Merge "Add version to the cert rpc API."

commit 3ae69ebcc5febd79c6cfdb8e37ce34a2fe660655
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu May 17 01:54:53 2012 +0100

    Fix Multi_Scheduler to process host capabilities
    
    To fix bug #1000403, make sure that each driver held by the
    Multi Scheduler gets called during update_service_capabilities.
    
    Change-Id: Iee8141f1a6dcfa24101640626d209d2d65776339

 .mailmap                                     |    1 +
 nova/scheduler/multi.py                      |    6 ++++++
 nova/tests/scheduler/test_multi_scheduler.py |   22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)

commit b4a64da192b10f770646668252ae0a72694f2dd9
Merge: 51e745f a78902c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 18 15:03:00 2012 +0000

    Merge "Remove unused _get_target code from xenapi"

commit c1e54e1968faa23dfa26796fdb8f3f8d9ba79367
Author: John Tran <jhtran@att.com>
Date:   Tue May 15 10:00:36 2012 -0700

    fixed_ip_get_by_address read_deleted from context
    
    Fixes bug 996482. by default fixed_ip_get_by_address
    always sets read_deleted='yes'.  Changed it to accept
    read_deleted value from context.
    updated .mailmap to rewrite my old email to new email
    
    Change-Id: If94251972df7bbcfdeebc226613edac0a3f41186

 .mailmap                  |    1 +
 Authors                   |    2 +-
 nova/db/sqlalchemy/api.py |    2 +-
 nova/tests/test_db_api.py |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

commit 51e745fc1d9e44e04b55ecf2317df0b386d4eb05
Merge: 5cee511 8fbde49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 23:32:29 2012 +0000

    Merge "Add unit test coverage for bug 1000261."

commit 5cee511dbb4b8db77fb34e265103f722fcfa106c
Merge: 70f40b8 2fd869e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 23:22:53 2012 +0000

    Merge "make get_all_bw_usage() signature match for fake virt driver."

commit 7e845f4af6f89253d9c47645875aa67ef24ebee3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu May 17 16:14:52 2012 -0700

    Fix for Quantum LinuxBridge Intf driver plug call
    
    The current implementation of the plug operation tries to assign an IP
    address to a bridge even if it already has one. The fix is to do this
    only when a new device is created. The check for a new device was
    already being performed however the IP address was being set outside
    that check. That's being corrected here, minor fix.
    
    bug 1000580
    
    Change-Id: I45215a3ca87a32ef4c2a2f76bab9b743eabb525e

 nova/network/linux_net.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 70f40b8816e43898c0b0b0de463a7a1f542463aa
Merge: 0472976 975a206
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 22:54:41 2012 +0000

    Merge "use a RequestContext object instead of context module"

commit 0472976c97992c8017baf050d35ddd9ea7ad20fe
Merge: b140b34 8ed3059
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 22:13:35 2012 +0000

    Merge "Add base support for rpc API versioning."

commit b140b34d0f51c87b82f9157aef97dd99a75918c9
Merge: adb11a0 f0dd8b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 22:02:02 2012 +0000

    Merge "get instance details results in volumes key error"

commit adb11a00cc2c53b1fb07249d6ae0fc40c63c39bc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 17 16:33:11 2012 -0500

    Add additional logging to compute filter
    
    Change-Id: I3cca70ea81be12cc5a47d492f49a30774f902c91

 nova/scheduler/filters/compute_filter.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 911775ed114ee75042ac7bdc5de71efb3642b1a1
Merge: 289a108 ed3bf46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 21:01:44 2012 +0000

    Merge "Add configurable timeout to Quantum HTTP connections."

commit 289a1088f3f3b24f4f5bf069b9845daa10c77b7e
Merge: 5a9e678 f799f77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 20:51:50 2012 +0000

    Merge "Add eventlet backdoor to facilitate troubleshooting."

commit 975a2064a1faf62f2a908bbf615098c023962e15
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu May 17 16:38:37 2012 -0400

    use a RequestContext object instead of context module
    
    Change-Id: Ib3ef1602838daee8e9453a2ded2fbb4b17d36935

 nova/tests/test_compute.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5a9e678cc08bc17d072ae1a4d23ab8bd7841ed4a
Merge: 16873e1 ad5cf3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 20:36:37 2012 +0000

    Merge "Modify vm_vdi_cleaner to handle `-orig`."

commit 2fd869e9ec51b0c76ee63a3382dac8287594f6c8
Author: Yun Mao <yunmao@gmail.com>
Date:   Thu May 17 16:33:34 2012 -0400

    make get_all_bw_usage() signature match for fake virt driver.
    
    Change-Id: Ia96349275321f25da55845d73b212bb7c820f3d4

 nova/virt/fake.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 16873e10d02d825d1586c51dcd1363c08b8f1238
Merge: 12ea7e4d 3897641
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 20:26:54 2012 +0000

    Merge "Add aliases to .mailmap for comstud and belliott."

commit 8fbde4936df0c3521704dfc8629bb94579277f79
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu May 17 16:15:29 2012 -0400

    Add unit test coverage for bug 1000261.
    
    The fix for bug 1000261 updated some parsing code to handle updated
    output from qemu-img.  This test case exercises this parsing code.
    
    Change-Id: I5c9592478823464317cc6d521b3240913e4ded92

 nova/tests/test_libvirt.py |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 12ea7e4ded9f71624721aae638abb822e1f538f8
Merge: a5d06c2 3e4925b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 19:08:03 2012 +0000

    Merge "Moving network tests into the network folder."

commit 3e4925b36f11abc8cc746682118c3c58fb2bb88d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 17 12:05:41 2012 -0500

    Moving network tests into the network folder.
    
    Change-Id: Ic8f20967fb999cc67f74bd5ef751c7bb23129604

 nova/tests/network/test_linux_net.py    |  501 ++++++++++++++++++++++++
 nova/tests/network/test_network_info.py |  326 ++++++++++++++++
 nova/tests/network/test_quantum.py      |  647 +++++++++++++++++++++++++++++++
 nova/tests/test_linux_net.py            |  501 ------------------------
 nova/tests/test_network_info.py         |  326 ----------------
 nova/tests/test_quantum.py              |  647 -------------------------------
 6 files changed, 1474 insertions(+), 1474 deletions(-)

commit 9ec9fdce626d5e2937c6e0664621ad590f958e13
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 4 22:56:11 2012 -0400

    Add version to consoleauth rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    Change-Id: I9682bdbd06d744141b94385992b37cd2e55b8f5e

 nova/compute/api.py                        |   13 ++---
 nova/consoleauth/manager.py                |    2 +
 nova/consoleauth/rpcapi.py                 |   53 ++++++++++++++++++++
 nova/tests/consoleauth/__init__.py         |   19 +++++++
 nova/tests/consoleauth/test_consoleauth.py |   55 +++++++++++++++++++++
 nova/tests/consoleauth/test_rpcapi.py      |   74 ++++++++++++++++++++++++++++
 nova/tests/test_compute.py                 |   17 +++----
 nova/tests/test_consoleauth.py             |   55 ---------------------
 nova/vnc/xvp_proxy.py                      |    8 ++-
 9 files changed, 218 insertions(+), 78 deletions(-)

commit 1b6aa2d1af3d65f381aa9c57cc80531704c0ca8a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon May 7 14:13:44 2012 -0400

    Add version to the cert rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    Change-Id: Iea00a2e82eef7ca7b3ffef438e81e5b4fcca7751

 nova/api/openstack/compute/contrib/certificates.py |   13 ++-
 nova/cert/manager.py                               |    2 +
 nova/cert/rpcapi.py                                |   71 +++++++++++++++
 nova/image/s3.py                                   |   19 ++--
 nova/tests/cert/__init__.py                        |   19 ++++
 nova/tests/cert/test_rpcapi.py                     |   93 ++++++++++++++++++++
 6 files changed, 200 insertions(+), 17 deletions(-)

commit 8ed3059cb4cb6ff777b59716db32c3133900b393
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon May 7 14:10:29 2012 -0400

    Add base support for rpc API versioning.
    
    Part of blueprint versioned-rpc-apis.
    
    This commit includes the base support for versioned RPC APIs.  It
    introduces the RpcProxy and RpcDispatcher classes that have common code
    for handling versioning on the client and server sides, respectively.
    
    RPC APIs will be converted one at a time using this infrastructure.
    
    Change-Id: I07bd82e9ff60c356123950e466caaffdfce79eba

 nova/manager.py                   |   12 +++
 nova/rpc/__init__.py              |    8 ++
 nova/rpc/amqp.py                  |   19 +++--
 nova/rpc/common.py                |    5 ++
 nova/rpc/dispatcher.py            |  105 ++++++++++++++++++++++++
 nova/rpc/impl_fake.py             |    9 +--
 nova/rpc/proxy.py                 |  161 +++++++++++++++++++++++++++++++++++++
 nova/service.py                   |    8 +-
 nova/tests/rpc/common.py          |   10 ++-
 nova/tests/rpc/test_dispatcher.py |  109 +++++++++++++++++++++++++
 nova/tests/rpc/test_proxy.py      |  124 ++++++++++++++++++++++++++++
 11 files changed, 550 insertions(+), 20 deletions(-)

commit f00b4e060008d319ae813710deec9866f9e93335
Merge: efc3694 bbdbd1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 17 16:09:38 2012 +0000

    Merge "Bump XenServer plugin version"

commit a5d06c2d12135f91aa2616b3bb8d28aa14c217ca
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed May 16 20:19:36 2012 -0700

    fixes typo that completely broken Quantum/Nova integration
    
    bug 1000887
    
    fixes bug introduced in ba76b954e69de56f76f9db5cade1780bc351be67 that
    prevented the serializer in the Quantum client code from correctly
    serializing request body data.  Instead, the serializer always returned
    None, meaning that requests would have no body, causing the Quantum
    server to return a 400.
    
    Change-Id: I410fb408435da8774f418f0e62ffb59eac2354f3

 nova/network/quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit efc3694a3a9b6cc7ea5ce02a7a969e16553d6992
Author: Dan Prince <dprince@redhat.com>
Date:   Wed May 16 22:24:07 2012 -0400

    Make Iptables FW Driver handle dhcp_server None.
    
    Updates the IptablesFirewallDriver so it doesn't set iptables rules
    for the DHCP server if dhcp_server is None in network info.
    
    Fixes LP Bug #1000522.
    
    Change-Id: I08bcae49fb75f685c9eab4e10936fdab5b304e2b

 nova/virt/firewall.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 7d1571bae1bd7c96f580965782e614b2be9efba0
Merge: 5d90b39 7b75fe7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 23:02:30 2012 +0000

    Merge "Optional timeout for servers stuck in build"

commit 5d90b39c36e8e8e1db82318e1d43129a8d2e1108
Merge: 3f9c617 7e3e9b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 22:27:36 2012 +0000

    Merge "Remove old flagfile support."

commit 389764174e8e9a14cceb2a114f5d093c49e7529e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jan 4 14:33:45 2012 -0800

    Add aliases to .mailmap for comstud and belliott.
    
    Change-Id: Id12e0347b11784b9739ed9713d3e151a94cf8f10

 .mailmap |    2 ++
 1 file changed, 2 insertions(+)

commit 3f9c617f6e801b322470dadd53da8f89406d5cf9
Merge: 27f5ec2 b1d5caf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 22:01:48 2012 +0000

    Merge "Update nova's copy of image metadata on rebuild"

commit f799f7713052ac406e5ff8b72c959ba2d1c3fe58
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 25 02:58:19 2012 +0000

    Add eventlet backdoor to facilitate troubleshooting.
    
    This provides a FLAG to turn on Eventlet's builtin backdoor server which
    allows you to connect over telnet and receive a Python prompt (which is
    immensely helpful for debugging running systems).
    
    Fixes bug 1000366
    
    Change-Id: I779247a0796d34ba2a5478436d85b30ba76c4a01

 nova/common/eventlet_backdoor.py |   69 ++++++++++++++++++++++++++++++++++++++
 nova/service.py                  |    5 ++-
 2 files changed, 73 insertions(+), 1 deletion(-)

commit 27f5ec2754ddffb6ab1ccdeecc69816db2bfd776
Merge: eb96b41 4eafbbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 21:17:01 2012 +0000

    Merge "Updated instance state on resize error."

commit eb96b41a022fb2786a6bb7a4950b2826a2de46c6
Merge: 93cb89e f50a5ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 20:21:40 2012 +0000

    Merge "Add __repr__ to least_cost scheduler."

commit 93cb89ebef52290463f1cb2681e14b9cb3559c8f
Merge: c5f9d86 c7eae70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 19:36:49 2012 +0000

    Merge "Add s3_listen and s3_listen_port options."

commit c5f9d86a3c8d6f831458435af080a0e49bbfd1d6
Merge: 01f968e 0624b7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 19:17:01 2012 +0000

    Merge "handle updated qemu-img info output"

commit 01f968e6c440c1eae0069639571a9a8c07cf229f
Merge: e4d8b48 a3a5f23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 18:55:05 2012 +0000

    Merge "Remove XenAPI use of eventlet tpool"

commit b1d5caf80aeb07140562e0c911b4f922b6073a21
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 14 21:48:13 2012 +0000

    Update nova's copy of image metadata on rebuild
    
    Fixes bug 999318
    
    Change-Id: Ib2ea908466e5ee4f05e94e68aecd77247e3f4a15

 nova/compute/api.py        |   31 +++++++++++++++++++++++++++++++
 nova/tests/test_compute.py |   19 +++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)

commit 7b75fe7f571dd95287307f9d1138fb476a6bf721
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Thu May 3 14:55:03 2012 -0400

    Optional timeout for servers stuck in build
    
    Fixes bug 994786
    
    Change-Id: Iae86c002073f45b48acde8eae07f9b0f62488f90

 nova/compute/manager.py    |   21 +++++++++
 nova/tests/test_compute.py |  104 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

commit ed3bf4692f380e28719a235f029a2ed56f67d666
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 26 01:51:48 2012 +0000

    Add configurable timeout to Quantum HTTP connections.
    
    Fixes bug 1000371
    
    Change-Id: I02805d5607feb0b2443e71c30fe7e9042d9b062a

 nova/network/quantum/client.py             |   19 ++++++++++++-------
 nova/network/quantum/quantum_connection.py |   10 +++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

commit ad5cf3e86bab1c536693e31a5960e9958c87f76f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Apr 30 05:02:27 2012 +0000

    Modify vm_vdi_cleaner to handle `-orig`.
    
    Also modifies the code to better handle various race conditions.
    
    Fixes bug 1000359
    
    Change-Id: I421b5827330da550810598cfbacc5bb679b477c7

 tools/xenserver/vm_vdi_cleaner.py |   57 +++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 15 deletions(-)

commit f50a5ec1fc53d77d7a4f33392ec6adc4637a53b5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Feb 8 23:53:20 2012 +0000

    Add __repr__ to least_cost scheduler.
    
    Change-Id: I883dd5a734ef71cef915abf95a7125926e07f3d0

 nova/scheduler/least_cost.py |    5 +++++
 1 file changed, 5 insertions(+)

commit bbdbd1b87bfe5c0edda1907bbe1d611c63334c75
Author: Antony Messerli <ant@openstack.org>
Date:   Wed Mar 7 11:39:54 2012 -0600

    Bump XenServer plugin version
    
    Change-Id: I7a9389a8b07b78dec083f2a39c0ca6d9f3705ad3

 .../rpmbuild/SPECS/openstack-xen-plugins.spec      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e4d8b4824d0a1492271e262d46b1f8f464128fb8
Merge: dc9c3cb 406ff30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 15:34:39 2012 +0000

    Merge "Rearchitect quota checking to partially fix bug 938317."

commit 0624b7aab0c0fe4869111ad8e302151548d6ba20
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed May 16 13:44:46 2012 +0100

    handle updated qemu-img info output
    
    Originally `qemu-img info` always output an (actual path: ...)
    even if it was duplicated with that already on the line.
    
     $ instances=/var/lib/nova/instances/
     $ qemu-img info $instances/instance-00000017/disk | grep 'backing'
     backing file: $instances/_base/24083... (actual path: $the_same)
    
    Whereas after the change referenced at:
    https://lists.gnu.org/archive/html/qemu-devel/2012-05/msg01468.html
    It suppresses a duplicate (actual path:)
    
     $ instances=/var/lib/nova/instances/
     $ qemu-img info $instances/instance-00000017/disk | grep 'backing'
     backing file: $instances/_base/24083...
    
    * nova/virt/libvirt/utils.py (get_disk_backing_file):
    Avoid an indexError exception when parsing the newer format.
    Fixes bug 1000261
    
    Change-Id: Ie2889b6da8a5c93e0e874e7a330529f6e6e71b0b

 nova/virt/libvirt/utils.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 406ff304bb09f144a59448e0e9d2d01160c7d553
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri May 4 19:27:43 2012 -0500

    Rearchitect quota checking to partially fix bug 938317.
    
    This is a rearchitecting/rewriting of quota handling to correct the
    quota atomicity issues highlighted by bug 938317.  Partially implements
    blueprint quota-refactor as well.
    
    This change is fairly substantial.  To make it easier to review, it has been
    broken up into 3 parts.  This is the first part.
    
    Change-Id: I805f5750c08de17487e59fe33fad0bed203188a6

 nova/db/api.py                                     |  112 +-
 nova/db/sqlalchemy/api.py                          |  397 ++++-
 .../versions/097_quota_usages_reservations.py      |  106 ++
 nova/db/sqlalchemy/models.py                       |   41 +
 nova/exception.py                                  |   25 +
 nova/quota.py                                      |  744 +++++++++
 nova/scheduler/manager.py                          |    7 +
 nova/tests/test_quota.py                           | 1634 +++++++++++++++++++-
 8 files changed, 3026 insertions(+), 40 deletions(-)

commit c7eae70e1fd72eacca36a4baf08325dd00957f2c
Author: Dan Prince <dprince@redhat.com>
Date:   Wed May 16 09:23:00 2012 -0400

    Add s3_listen and s3_listen_port options.
    
    Adds s3_listen and s3_listen_port options to the Nova Objectstore
    service so that it matches config options from other Nova API services.
    
    Fixes LP Bug #1000220.
    
    Change-Id: Ie6d89af7fc8de0c5cef846315171d0f9c9e3db35

 etc/nova/nova.conf.sample    |    4 ++++
 nova/objectstore/s3server.py |   20 ++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

commit dc9c3cb3e376e6af263e4ffae88471317f830e0a
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed May 16 06:01:43 2012 +0000

    Misused and not used config options
    
    Fixes bug #1000071
    
    [nova.flag.py]
    stub_network: StrOpt -> BoolOpt
    
    [nova.api.sizelimit.py]
    osapi_max_request_body_size: BoolOpt -> IntOpt
    
    [nova.compute.api.py]
    find_host_timeout: not used
    
    [nova.rpc.__init__.py]
    allowed_rpc_exception_modules: IntOpt -> ListOpt
    
    [nova.virt.vmwareapi_conn.py]
    vmwareapi_api_retry_count: FloatOpt -> IntOpt
    
    [nova.volume.driver.py]
    num_shell_tries: StrOpt -> IntOpt
    num_iscsi_scan_tries: StrOpt -> IntOpt
    
    [nova.volume.driver.py]
    san_thin_provision: 'true' -> True
    san_is_local: 'false' -> False
    
    Change-Id: I07ab60b1d881c9475f4f2517a432f1e934d8ae52

 nova/api/sizelimit.py       |    6 +++---
 nova/compute/api.py         |    5 -----
 nova/flags.py               |    8 ++++----
 nova/rpc/__init__.py        |    2 +-
 nova/virt/vmwareapi_conn.py |   10 +++++-----
 nova/volume/driver.py       |    4 ++--
 nova/volume/san.py          |    4 ++--
 7 files changed, 17 insertions(+), 22 deletions(-)

commit 823a114727e514f153b500a16c7cad98253300f5
Merge: 9c71fd6 5de77ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 16 06:58:56 2012 +0000

    Merge changes I36ff7c05,If43658b9
    
    * changes:
      Stop using nova.exception from nova.rpc.
      Make use of openstack.common.jsonutils.

commit a3a5f23487e9ca4257551fd3d430d8ebcfca131a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 16 06:37:28 2012 +0000

    Remove XenAPI use of eventlet tpool
    
    XenAPI implementation does not block, even with it using SSL, therefore
    there's no need to use eventlet's tpool.
    
    Change-Id: I33ef4140068c8af06d27a075f52379581790c647

 nova/virt/xenapi/connection.py |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

commit 9c71fd6aef64acfc4c026b17e10d6075c03d037e
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Mon Apr 9 11:26:49 2012 +0530

    Fixed compute periodic task. Fixes bug 973331.
    
    1. Moved the poll_unconfirmed_resizes implementation to compute manager (as
    it is not hypervisor specific).
    2. Added unit test case coverage.
    
    Change-Id: Ic58502f44326c5d59439087b4fa9ae7aa79c1e17

 nova/compute/manager.py         |   54 ++++++++++++++++++++++-
 nova/tests/test_compute.py      |   71 ++++++++++++++++++++++++++++++
 nova/tests/test_virt_drivers.py |    4 --
 nova/tests/test_xenapi.py       |   92 ---------------------------------------
 nova/virt/driver.py             |    5 ---
 nova/virt/fake.py               |    3 --
 nova/virt/libvirt/connection.py |   21 ---------
 nova/virt/xenapi/connection.py  |    4 --
 nova/virt/xenapi/vmops.py       |   56 ------------------------
 9 files changed, 124 insertions(+), 186 deletions(-)

commit f0dd8b0af87cf5d838457100430b529379d70916
Author: John Griffith <john.griffith@solidfire.com>
Date:   Mon May 14 14:01:32 2012 -0600

    get instance details results in volumes key error
    
    * fixes bug 999043
    * this code was still looking for instance FK in volumes
    * changed contrib/compute volume.api:attach to use bdm
    * added minimal tests for changes in Attach class
    
    Change-Id: I19c7aff25182aa55741ec4d80b7e30f7e66ca998

 nova/api/ec2/cloud.py                              |   11 +-
 nova/api/openstack/compute/contrib/volumes.py      |   90 +++++++++++------
 nova/compute/api.py                                |    5 +
 nova/db/sqlalchemy/models.py                       |   10 +-
 .../api/openstack/compute/contrib/test_volumes.py  |  105 ++++++++++++++++++++
 5 files changed, 179 insertions(+), 42 deletions(-)

commit caf7461aff60ef68a366ab329f136d09e19d9b0b
Merge: 94108a8 6275225
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 22:41:11 2012 +0000

    Merge "Fix bug 988034 - Quantum Network Manager - not clearing ips"

commit 94108a8a0994590a68613a149709ff0c8afe6fe9
Merge: ae8437a 35a472d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 21:10:04 2012 +0000

    Merge "Alphabetize imports in nova/api/"

commit 627522525e0268a1bc54695ce3dedf16d6fb413d
Author: Somik Behera <somikbehera@gmail.com>
Date:   Mon Apr 30 17:43:14 2012 -0700

    Fix bug 988034 - Quantum Network Manager - not clearing ips
    
    Added a line in nova_ipam_lib.QuantumNovaIPAMLib init
    method to ensure we clean up IPs and explanation of whats
    going on.
    
    Also, nuked release_fixed_ip as that is not
    needed in QuantumManager anymore.
    
    Change-Id: Ic2ad1e87441c448c10ff097b28d2b6347eef5401

 Authors                               |    1 +
 nova/network/quantum/manager.py       |    8 --------
 nova/network/quantum/nova_ipam_lib.py |   15 +++++++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

commit ae8437ae92f89271117d47832436e9a469e591c4
Merge: c8cafc6 9ec0d1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 19:46:32 2012 +0000

    Merge "Alphabetize imports in nova/virt/"

commit 5de77cad7104cff71ce9191296448d3fe50d08c8
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 15 14:43:18 2012 -0400

    Stop using nova.exception from nova.rpc.
    
    This patch is a part of continuing to remove dependencies from nova.rpc
    on the rest of nova.  One RPC related exception was defined in
    nova.exception, so that was moved to nova.rpc.common where the rest of
    them live.  These exceptions were changed to no longer use NovaException
    as their base.  Instead, there is a new RPCException base.
    
    One other change that should be reviewed closely is the removal of using
    nova.exception.wrap_exception() in nova.rpc.amqp.  As far as I can tell,
    this didn't actually do anything since nothing was being passed in to
    wrap_exception().
    
    Change-Id: I36ff7c05ab0467ad8506b56d561c532eadf8dff8

 nova/exception.py  |    4 ----
 nova/rpc/amqp.py   |    4 +---
 nova/rpc/common.py |   31 ++++++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 10 deletions(-)

commit ba76b954e69de56f76f9db5cade1780bc351be67
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 15 12:54:16 2012 -0400

    Make use of openstack.common.jsonutils.
    
    This patch imports jsonutils from openstack-common.  It removes the
    equivalent code from nova.utils and then converts the code base to use
    jsonutils.  The primary motivator for this change was to remove the rest
    of the dependencies from nova.rpc on nova.utils.
    
    Change-Id: If43658b9b098ed56cba018c81be268b8c3e2916a

 nova/api/ec2/__init__.py                           |   11 +-
 nova/api/openstack/wsgi.py                         |    8 +-
 nova/compute/api.py                                |    5 +-
 nova/compute/manager.py                            |    9 +-
 nova/network/manager.py                            |    3 +-
 nova/network/quantum/client.py                     |   11 +-
 nova/notifier/api.py                               |    3 +-
 nova/openstack/common/jsonutils.py                 |  133 ++++++++++++++++++++
 nova/rpc/common.py                                 |    6 +-
 nova/scheduler/driver.py                           |    3 +-
 .../openstack/compute/contrib/test_disk_config.py  |   32 ++---
 .../compute/contrib/test_scheduler_hints.py        |    8 +-
 nova/tests/api/openstack/fakes.py                  |    3 +-
 nova/tests/baremetal/test_proxy_bare_metal.py      |    6 +-
 nova/tests/notifier/test_capacity_notifier.py      |    4 +-
 nova/tests/test_libvirt.py                         |    9 +-
 nova/tests/test_utils.py                           |   87 -------------
 nova/utils.py                                      |  100 ---------------
 nova/virt/baremetal/dom.py                         |    6 +-
 nova/virt/libvirt/connection.py                    |   18 +--
 openstack-common.conf                              |    2 +-
 21 files changed, 210 insertions(+), 257 deletions(-)

commit 35a472d13e183f8122af17e24e9a7c11f178311c
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon May 14 13:50:55 2012 -0700

    Alphabetize imports in nova/api/
    
    Change-Id: I2a265ffded604265bdb9c75db36112aebf1e5270

 nova/api/openstack/common.py                       |    2 +-
 nova/api/openstack/compute/__init__.py             |    4 ++--
 nova/api/openstack/compute/contrib/__init__.py     |    2 +-
 nova/api/openstack/compute/contrib/certificates.py |    2 +-
 nova/api/openstack/compute/contrib/cloudpipe.py    |    2 +-
 .../openstack/compute/contrib/console_output.py    |    4 ++--
 nova/api/openstack/compute/contrib/consoles.py     |    4 ++--
 .../openstack/compute/contrib/createserverext.py   |    2 +-
 .../openstack/compute/contrib/flavorextradata.py   |    2 +-
 .../openstack/compute/contrib/flavorextraspecs.py  |    2 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |    2 +-
 .../openstack/compute/contrib/floating_ip_pools.py |    2 +-
 nova/api/openstack/compute/contrib/hosts.py        |    2 +-
 nova/api/openstack/compute/contrib/keypairs.py     |    2 +-
 .../api/openstack/compute/contrib/quota_classes.py |    2 +-
 nova/api/openstack/compute/contrib/quotas.py       |    4 ++--
 .../openstack/compute/contrib/security_groups.py   |    2 +-
 nova/api/openstack/compute/contrib/volumes.py      |    4 ++--
 nova/api/openstack/compute/flavors.py              |    2 +-
 nova/api/openstack/compute/ips.py                  |    2 +-
 nova/api/openstack/compute/servers.py              |    2 +-
 nova/api/openstack/urlmap.py                       |    2 +-
 nova/api/openstack/volume/__init__.py              |    2 +-
 nova/api/openstack/volume/contrib/__init__.py      |    2 +-
 nova/api/openstack/volume/snapshots.py             |    2 +-
 nova/api/openstack/volume/volumes.py               |    2 +-
 nova/api/openstack/wsgi.py                         |    4 ++--
 27 files changed, 33 insertions(+), 33 deletions(-)

commit c8cafc6e9df3a389330da08cbcbf60fb6ca1b238
Merge: 671c2c1 6cb7801
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 18:42:17 2012 +0000

    Merge "Alphabetize imports"

commit a78902c73f980123a4860d4793f4273ec357cd73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 15 10:20:02 2012 -0700

    Remove unused _get_target code from xenapi
    
     * Removes _get_target code from volume_utils
     * Code was changed to pull iscsi from connection_info
       in eb03d47fecd3bfc24243da29ee01679b334a08fe
     * Removes associated stubs
    
    Change-Id: I50b4b40ac53c5bc76f32a953b94eaa024dc464b3

 nova/tests/test_xenapi.py        |    3 ---
 nova/tests/xenapi/stubs.py       |   10 ----------
 nova/virt/xenapi/volume_utils.py |   27 ---------------------------
 3 files changed, 40 deletions(-)

commit 671c2c113be856f92bc415c5f0e23362dc0680eb
Merge: 8823f7b fb96f7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 16:23:00 2012 +0000

    Merge "Pass 'nova' project into ConfigOpts."

commit cdcb64f045764017a7fba4d86207e2ec30a957f9
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 15 10:54:13 2012 -0400

    Implement get_hypervisor_hostname for libvirt.
    
    Implements get_hypervisor_hostname so that the
    OS-EXT-SRV-ATTR:hypervisor_hostname extension can properly
    display this information when using libvirt.
    
    Fixes LP Bug #999729.
    
    Change-Id: I124d48ca352dc225f88999046f9d212ffb9e4c6e

 nova/tests/fakelibvirt.py       |    3 +++
 nova/tests/test_libvirt.py      |    4 ++++
 nova/virt/libvirt/connection.py |    6 ++++++
 3 files changed, 13 insertions(+)

commit 8823f7bef2142a807b3c92e512f602b6b415a3e2
Merge: fbae8d0 ec0a65d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 09:02:36 2012 +0000

    Merge "Create an internal key pair API."

commit 6cb7801ac7d0f25dfbca0d8eb891feffdec695c5
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon May 14 14:46:11 2012 -0700

    Alphabetize imports
    
    Except for nova/api/, nova/tests/, nova/virt/
    In preparation for automated checking being enabled (N306)
    
    Change-Id: I5af70ea13b470ce58695ef0a5e0ff9da3ac1b135

 bin/instance-usage-audit                           |    2 +-
 nova/auth/dbdriver.py                              |    2 +-
 nova/auth/manager.py                               |    2 +-
 nova/compute/manager.py                            |    2 +-
 nova/console/manager.py                            |    2 +-
 nova/db/sqlalchemy/api.py                          |   14 +++++++-------
 .../sqlalchemy/migrate_repo/versions/082_essex.py  |    2 +-
 nova/db/sqlalchemy/migration.py                    |    2 +-
 nova/image/s3.py                                   |    4 ++--
 nova/network/__init__.py                           |    2 +-
 nova/network/l3.py                                 |    2 +-
 nova/network/ldapdns.py                            |    2 +-
 nova/network/manager.py                            |    2 +-
 nova/network/quantum/fake_client.py                |    2 +-
 nova/quota.py                                      |    2 +-
 nova/rpc/impl_kombu.py                             |    2 +-
 nova/rpc/impl_qpid.py                              |    2 +-
 nova/test.py                                       |    4 ++--
 nova/testing/runner.py                             |    2 +-
 nova/utils.py                                      |    2 +-
 nova/volume/api.py                                 |    2 +-
 nova/volume/netapp.py                              |    2 +-
 nova/volume/nexenta/jsonrpc.py                     |    2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

commit 9ec0d1b5939408e1b030928563a191b49b902bd5
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon May 14 14:43:43 2012 -0700

    Alphabetize imports in nova/virt/
    
    Change-Id: Ifca489da67cc834284ee2f2beeaafb28f0638f7e

 nova/virt/baremetal/nodes.py     |    8 ++++----
 nova/virt/baremetal/proxy.py     |   12 ++++++------
 nova/virt/baremetal/tilera.py    |    2 +-
 nova/virt/libvirt/connection.py  |    4 ++--
 nova/virt/libvirt/utils.py       |    2 +-
 nova/virt/vmwareapi/vmops.py     |    2 +-
 nova/virt/xenapi/connection.py   |    4 ++--
 nova/virt/xenapi/firewall.py     |    4 ++--
 nova/virt/xenapi/host.py         |    2 +-
 nova/virt/xenapi/pool.py         |    4 ++--
 nova/virt/xenapi/volume_utils.py |    2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

commit fbae8d09fdb9ad370fa827aab0f9bfe0c0c7041f
Author: Craig Vyvial <cp16net@gmail.com>
Date:   Mon May 7 14:03:04 2012 -0500

    Adding notifications for volumes
    
    Added notifications for volumes have been added with tests.
    This includes create/delete/exists events for volumes.
    
    blueprint nova-notifications
    
    Change-Id: I21b74974fac22c3621ccf7564dc5c0d339f8751a

 Authors                         |    1 +
 bin/instance-usage-audit        |    4 +-
 bin/volume-usage-audit          |   84 ++++++++++++++++++++++++++++++++++++++
 nova/db/api.py                  |    7 ++++
 nova/db/sqlalchemy/api.py       |   17 ++++++++
 nova/tests/test_volume.py       |   33 ++++++++++++++-
 nova/tests/test_volume_utils.py |   86 +++++++++++++++++++++++++++++++++++++++
 nova/volume/manager.py          |   11 +++++
 nova/volume/utils.py            |   83 +++++++++++++++++++++++++++++++++++++
 9 files changed, 323 insertions(+), 3 deletions(-)

commit fb96f7dff66e35f59a568e592ecea3bd5e500287
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon May 14 20:06:45 2012 +0000

    Pass 'nova' project into ConfigOpts.
    
    Fixes bug 999305
    
    The problem was that, post refactoring, `ConfigOpts.find_file` was no
    longer searching `/etc/nova` for config files.
    
    Change-Id: I3dee8d8f24ae3912e07dcb9d19086d55eb98ccaa

 nova/flags.py |    2 ++
 1 file changed, 2 insertions(+)

commit b3e2bae38177583201dd7dcdd2d9c16929724573
Merge: 0e09b33 763a367
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 14 18:58:07 2012 +0000

    Merge "Avoid setting up DHCP firewall rules with FlatManager"

commit 0e09b3357bf0fbce93a51996dec1ce5a7b93b859
Merge: 5ada104 8b597f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 14 18:39:18 2012 +0000

    Merge "Make allocation failure a bit more friendly"

commit 5ada1043a16666f6c71ade987711fc1e3f1b6398
Merge: 4ec81d6 5b93a57
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 14 18:29:55 2012 +0000

    Merge "Report memory correctly on Xen. Fixes bug 997014"

commit ae95868e5e6a0294d3ca3d80bed17da13a52096c
Author: Yun Mao <yunmao@gmail.com>
Date:   Mon May 7 18:54:09 2012 -0400

    fixes bug 999206
    
    override the __unicode__() method too for python 2.6
    
    Change-Id: Iec76c49585e29071415d937861e94d14ff22cc04

 nova/rpc/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec0a65d81fd11d26be77b45827a4dd7c77711675
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 11 10:07:06 2012 -0400

    Create an internal key pair API.
    
    Creates an internal key pair API and update the EC2 and OS API's to
    use it. This de-duplicates some of the code used to manage keypairs
    across the APIs.
    
    Fixes LP Bug #998059.
    
    Change-Id: I10d58d7ce68cc2b993c72b6639f66c72def3bfbc

 nova/api/ec2/cloud.py                          |   94 ++++++++--------------
 nova/api/openstack/compute/contrib/keypairs.py |   82 ++++++-------------
 nova/compute/api.py                            |   83 +++++++++++++++++++
 nova/exception.py                              |    4 +
 nova/tests/api/ec2/test_cloud.py               |    5 +-
 nova/tests/test_api.py                         |   13 +--
 nova/tests/test_compute.py                     |  102 ++++++++++++++++++++++++
 7 files changed, 255 insertions(+), 128 deletions(-)

commit 8b597f76f980769e83a36111ca8fcd8b988d236c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Apr 30 21:36:06 2012 -0400

    Make allocation failure a bit more friendly
    
    If the user allocates the wrong address display
    a message about incorrect address rather than a traceback.
    
    Fixes LP: #957707
    
    Change-Id: I8ccd3056f755afb9f873a25fd494428e481ff3a2
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/api/ec2/cloud.py |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 763a3678407b244b680fd0bf2c6bcee60e8352c2
Author: hua zhang <zhhuabj@cn.ibm.com>
Date:   Wed May 9 14:11:00 2012 +0800

    Avoid setting up DHCP firewall rules with FlatManager
    
    Fixes bug #704737
    
    With FlatManager, ensure that the network info's dhcp_server value is not set
    and use that key to decide in the compute service whether DHCP firewall rules should be added.
    
    Change-Id: I8183a6fa3881adea1a09f3f1a29442e6b7a919ce

 nova/compute/utils.py              |    2 +-
 nova/tests/network/test_manager.py |    2 +-
 nova/tests/test_libvirt.py         |   22 ++++++++++++----------
 nova/virt/libvirt/firewall.py      |   13 ++++++++++++-
 nova/virt/libvirt/vif.py           |    3 ++-
 5 files changed, 28 insertions(+), 14 deletions(-)

commit 4ec81d6d5ba78304c40d50d71030e1ec7c2ef231
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon May 14 03:49:36 2012 +0000

    Migrate missing license info
    
    Fixes bug #998965
    
    Some modules in nova/db/sqlalchemy/migrate_repo
    are missing license information
    
    Change-Id: I40efeb2f72b08e117b3a1b1fe25e51d8b4fa9700

 nova/db/sqlalchemy/migrate_repo/__init__.py        |   15 +++++++++++++++
 nova/db/sqlalchemy/migrate_repo/manage.py          |   18 ++++++++++++++++++
 .../sqlalchemy/migrate_repo/versions/082_essex.py  |    2 ++
 .../migrate_repo/versions/083_quota_class.py       |    2 ++
 .../085_add_index_to_fixed_ips_by_address.py       |    2 ++
 .../versions/087_add_uuid_to_bw_usage_cache.py     |    2 ++
 .../versions/093_drop_instance_actions_table.py    |    2 ++
 .../094_update_postgresql_sequence_names.py        |    2 ++
 .../sqlalchemy/migrate_repo/versions/__init__.py   |   15 +++++++++++++++
 9 files changed, 60 insertions(+)

commit b1ece7662c72351ee62a5bb798cb16bfafbaa010
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 13 23:05:25 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Ie1c613e5690d3c2956f5d10f55985d9b4f3a86cc

 nova/locale/bs/LC_MESSAGES/nova.po    | 3069 +++++++++++++-----------
 nova/locale/cs/LC_MESSAGES/nova.po    | 4226 +++++++++++++++++----------------
 nova/locale/da/LC_MESSAGES/nova.po    | 3069 +++++++++++++-----------
 nova/locale/de/LC_MESSAGES/nova.po    | 3075 +++++++++++++-----------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 3114 +++++++++++++-----------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 3080 +++++++++++++-----------
 nova/locale/es/LC_MESSAGES/nova.po    | 3112 +++++++++++++-----------
 nova/locale/fr/LC_MESSAGES/nova.po    | 3128 +++++++++++++-----------
 nova/locale/it/LC_MESSAGES/nova.po    | 3094 +++++++++++++-----------
 nova/locale/ja/LC_MESSAGES/nova.po    | 3114 +++++++++++++-----------
 nova/locale/ko/LC_MESSAGES/nova.po    | 3076 +++++++++++++-----------
 nova/locale/nova.pot                  | 2790 +++++++++++-----------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 3331 ++++++++++++++------------
 nova/locale/ru/LC_MESSAGES/nova.po    | 3090 +++++++++++++-----------
 nova/locale/tl/LC_MESSAGES/nova.po    | 3069 +++++++++++++-----------
 nova/locale/tr/LC_MESSAGES/nova.po    | 3069 +++++++++++++-----------
 nova/locale/uk/LC_MESSAGES/nova.po    | 3072 +++++++++++++-----------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 3035 ++++++++++++-----------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 3076 +++++++++++++-----------
 19 files changed, 32083 insertions(+), 27606 deletions(-)

commit 2c7e0d1e63cae7aaa38095439843c9a2abb0382b
Merge: 8a2d657 a345ee5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 13 21:29:57 2012 +0000

    Merge "Fix libvirt Connection.get_disks method"

commit 8a2d65713d7f8e072b6639dfa06a5aca0a90021c
Merge: cd04e9e 7b5fdac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 22:29:47 2012 +0000

    Merge "Create a utf8 version of the dns_domains table."

commit cd04e9e284ca0cf18db730cad8767488879ade57
Merge: 0768a6a 6ff7f40
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 22:04:13 2012 +0000

    Merge "fix bug 992008, we should config public interface on compute"

commit 0768a6adb71b7a7004b4b5dc4e111bf786e30362
Merge: a07fddf e064a4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 21:56:39 2012 +0000

    Merge "Added img metadata validation. Fixes bug 962117."

commit a07fddf525c74884d5934703206a3564fb8070e2
Merge: b7e9b4b de5cb27
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 21:49:00 2012 +0000

    Merge "Use default qemu-img cluster size in libvirt connection driver"

commit b7e9b4b60470c3cda4c2222e84e399065b07b3b8
Merge: 8c2e073 f608854
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 21:23:33 2012 +0000

    Merge "Setup logging, particularly for keystone middleware"

commit 8c2e0737ff96fd38fe4a3c5527392345bd35e318
Merge: 9668545 95693cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 18:20:59 2012 +0000

    Merge "Destroy system metadata when destroying instance"

commit 96685450ae9239197af3289e9d81c79d0c3871f4
Merge: 15e774d 7d39024
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 16:40:57 2012 +0000

    Merge "Store image properties with instance system_metadata"

commit 15e774deb83c039bf6d07386fa5ce6b76e12e034
Merge: 8374ba0 2549018
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 16:28:31 2012 +0000

    Merge "Provide a transition to new .info files."

commit 8374ba0f03f5038be2868da988f5d06468a68544
Merge: 0598ec2 991953d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 16:18:05 2012 +0000

    Merge changes I144e5331,I96a7222a
    
    * changes:
      Remove unnecessary stubout_loopingcall_start
      Actually use xenapi fake setter

commit a345ee5aff9332560c331947a228e19620033321
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Fri May 11 17:31:38 2012 +0200

    Fix libvirt Connection.get_disks method
    
    The get_disks() method is not used anywhere yet, and is not tested properly,
    but it does not work as reported in bug #998089.
    
    This patch add unit test for it and fixes it so it's now possible to
    retrieve the list of device name associated with a libvirt domain.
    
    Change-Id: If09fb683364174fe02cbcbec4c6bbcda991287d6
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/tests/test_libvirt.py      |   60 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |   21 ++------------
 2 files changed, 63 insertions(+), 18 deletions(-)

commit 7b5fdac84b513c6b606848cc353995d6abb9a7c9
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 4 17:01:14 2012 -0400

    Create a utf8 version of the dns_domains table.
    
    The old dns_domains table was encoded in the 'latin1'
    charset and has its primary key length set to 512.
    This is too long to be a valid pkey in a proper 'utf8' encoded
    table and seems to cause a slew of errors like:
    
    1) Dumping a database with mysqldump and trying to import it fails
    because this table is latin1 but fkeys to utf8 tables (projects).
    
    2) Trying to alter the old dns_domains table fails with errors
    like:
     mysql> ALTER TABLE dns_domains DROP PRIMARY KEY;
     ERROR 1025 (HY000): Error on rename of './nova/#sql-6cf_855'....
    
    This patch creates a new migration that re-creates the dns_domains
    table with a shorter 'domain' column which works with the utf8
    charset.
    
    Fixes LP Bug #993663.
    
    Change-Id: I2060d39cbdabd20f410ebd501160a04c51641755

 .../versions/096_recreate_dns_domains.py           |  145 ++++++++++++++++++++
 1 file changed, 145 insertions(+)

commit 0598ec2d3618022e913c0d1a84feb71d2b6c6a95
Merge: 388e409 42b09d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 15:46:44 2012 +0000

    Merge "Docs for vm/task state transitions."

commit f6088545d2569423f4911bcddccc3a7eac36baf2
Author: Alessio Ababilov <aababilov@griddynamics.com>
Date:   Thu May 10 12:52:03 2012 +0300

    Setup logging, particularly for keystone middleware
    
    Fixes bug 979282 and bug 988951
    
    Change-Id: I895d00ac9648e8b3cb3ad1bf141c9bfe02ef3680

 Authors     |    1 +
 nova/log.py |    3 +++
 2 files changed, 4 insertions(+)

commit 388e4098e36c8f7e997ce1b2b313217a7f090396
Merge: bf6673a dcad314
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 14:41:50 2012 +0000

    Merge "Remove instance Foreign Key in volumes table, replace with instance_uuid"

commit de5cb27e64267ec59e12a495a59880412cecb5e8
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Thu May 10 13:20:20 2012 -0700

    Use default qemu-img cluster size in libvirt connection driver
    
    The recommended cluster size [1] for qcow2 is 64k, which is the default
    when invoking 'qemu-img create ...'.  Remove the cluster_size option
    from qemu-img invocation.
    
    [1] http://www.mail-archive.com/openstack@lists.launchpad.net/msg11371.html
    
    V2: Fix test.
    
    Change-Id: Iafc290720a820cb5f57ded10a2f584fdc5cd5b49

 Authors                    |    1 +
 nova/tests/test_libvirt.py |    2 +-
 nova/virt/libvirt/utils.py |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

commit e064a4ea750a6237dabf03202b1dcb6fa435c7f6
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Tue Mar 27 10:43:02 2012 +0530

    Added img metadata validation. Fixes bug 962117.
    
    1. Added validation for image metadata.
    2. Renamed the method 'check_img_metadata_quota_limit' to
    'check_img_metadata_quota_limit' since it also validates the image metadata.
    3. Added unit test cases.
    
    Change-Id: I0e9dad97c03070363d14977897701e146870e41a

 nova/api/openstack/common.py                       |   15 +++++++++-
 .../api/openstack/compute/contrib/admin_actions.py |    2 +-
 nova/api/openstack/compute/image_metadata.py       |    8 ++++--
 nova/api/openstack/compute/servers.py              |    2 +-
 nova/tests/api/openstack/test_common.py            |   29 ++++++++++++++++++++
 5 files changed, 50 insertions(+), 6 deletions(-)

commit 991953d79c7235e2ddab639319244a6b379a95f1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri May 11 05:04:57 2012 +0000

    Remove unnecessary stubout_loopingcall_start
    
    The xenapi driver no longer uses utils.LoopingCall
    
    Change-Id: I144e5331e871570d8d22b87844ecebb63ed02697

 nova/tests/test_xenapi.py  |    7 -------
 nova/tests/xenapi/stubs.py |    6 ------
 2 files changed, 13 deletions(-)

commit 9ca55d8e50761ee2a11d855b2f55ccd80318451d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri May 11 04:56:15 2012 +0000

    Actually use xenapi fake setter
    
    It was implemented (with a small bug), but never used. Also, lean on
    the xenapi fake over using stubs in the migration tests to ensure we
    test more code.
    
    Change-Id: I96a7222a017302332bd6a3600fa645a74c502944

 nova/tests/test_xenapi.py  |   36 ++++++++++++++++--------------------
 nova/tests/xenapi/stubs.py |   26 +++++---------------------
 nova/virt/xenapi/fake.py   |    4 ++++
 3 files changed, 25 insertions(+), 41 deletions(-)

commit 2549018c81ad6fcc67a3dc89dec18d2310ce2235
Author: Michael Still <mikal@stillhq.com>
Date:   Fri May 11 14:54:34 2012 +1000

    Provide a transition to new .info files.
    
    Change-Id: I2fb6ef93c0652a797dba72cf75fb78baaa9c9c5a

 nova/tests/test_imagecache.py |   17 +++++++++++++++++
 nova/virt/libvirt/utils.py    |   14 +++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

commit 7d390243c4edc8991d0590273ef48e7d793e6113
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 11 00:10:00 2012 +0000

    Store image properties with instance system_metadata
    
    In implementing adding 'image_meta' to instance notifications,
    this was committed:
    
    https://review.openstack.org/#/c/7309
    commit 53adfd289bf7226f1c6f59c17608e42f3083f130
    
    However, it's buggy because an instance could have been deleted after we
    built from it... and bin/instance-usage-audit uses an admin context with
    which we cannot query glance.
    
    This stores image properties with instances in nova as system_metadata
    and notifications will use that data.
    
    Fixes bug 997833
    
    Change-Id: I50575969b5cb28adaae9a713e749dc486772c417

 nova/compute/api.py                              |   10 +++-
 nova/compute/manager.py                          |   19 +++++--
 nova/compute/utils.py                            |   64 ++++++++++++++++------
 nova/tests/api/openstack/compute/test_servers.py |    2 +
 nova/tests/test_compute.py                       |   23 +++++++-
 nova/tests/test_compute_utils.py                 |    9 ++-
 6 files changed, 100 insertions(+), 27 deletions(-)

commit bf6673a5952ed59ed55d504938d195083e23a2ce
Merge: 8aef8b8 16c5dbf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 01:42:15 2012 +0000

    Merge "Use ConfigOpts.find_file() to find paste config"

commit 8aef8b83973843ca8cf7e2add0698690b99b7c11
Merge: 584917c 7ba26ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 11 01:32:02 2012 +0000

    Merge "Generate a Changelog for Nova"

commit 95693cb2a15d5360279f4566e4e965cb6451cef2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 11 00:21:00 2012 +0000

    Destroy system metadata when destroying instance
    
    instance system_metadata was not being marked as deleted when an
    instance is marked as deleted.
    
    Fixes bug 997849
    
    Change-Id: I876b402ca33f4574bb426615f6c467ded6908fc2

 nova/db/sqlalchemy/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 584917cce51d9100abf4e5160c6cf5fa7055f618
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 10 21:17:16 2012 +0000

    Fix XenServer windows agent issue
    
    Windows agent requires an argument of either 'agent' or 'xentools' to
    the 'version' command.  All we care about is 'agent', so add it.  The
    unix agent happily ignores the arg.
    
    Fixes bug 997805
    
    Change-Id: Ic369c8a2850173057da9d3175a02b5864d7a6514

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 16c5dbf156f5aafe113d9ac2c26e99b0e621724d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri May 4 10:46:06 2012 +0100

    Use ConfigOpts.find_file() to find paste config
    
    Use cfg's new helper method to find the paste deploy config file. The
    basic behavior is "look alongside the config file" with a fall back to
    the standard default config paths.
    
    Change-Id: If7a9ac1d456f372e3f5f6c78e237a7b099d1a30e

 nova/tests/fake_flags.py |    1 +
 nova/utils.py            |   23 -----------------------
 nova/wsgi.py             |   10 +++++++++-
 3 files changed, 10 insertions(+), 24 deletions(-)

commit e00e45be42fd569b350ebfd124336133ecef9178
Merge: d9ed812 f926d86
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 10 20:24:51 2012 +0000

    Merge "Use ConfigOpts.find_file() to locate policy.json"

commit dcad314fb9713104f0029311c43907e362ec6d49
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri May 4 11:31:56 2012 -0600

    Remove instance Foreign Key in volumes table, replace with instance_uuid
    
    * Remove the instance relationship and instance_id FK
    * Add instance_uuuid column to volumes table
    * Passed unit tests and devstack tests
    
    Change-Id: Id598f1f1d7915d1af6bf3dd75e5819dce08aaa0f

 etc/nova/nova.conf.sample                          |    2 +-
 nova/api/ec2/ec2utils.py                           |    4 +
 nova/api/openstack/compute/contrib/volumes.py      |    7 +-
 nova/api/openstack/volume/volumes.py               |   12 +-
 nova/compute/api.py                                |    5 +-
 nova/compute/manager.py                            |    9 +-
 nova/db/api.py                                     |    9 +-
 nova/db/sqlalchemy/api.py                          |   32 ++---
 .../versions/095_change_fk_instance_id_to_uuid.py  |   94 ++++++++++++++
 .../migrate_repo/versions/095_sqlite_downgrade.sql |  133 ++++++++++++++++++++
 .../migrate_repo/versions/095_sqlite_upgrade.sql   |  132 +++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    7 +-
 nova/exception.py                                  |    5 +-
 nova/tests/api/ec2/test_cloud.py                   |   42 ++++---
 nova/tests/api/openstack/fakes.py                  |    6 +-
 nova/tests/api/openstack/volume/test_volumes.py    |    5 +-
 nova/tests/scheduler/test_scheduler.py             |    1 -
 nova/tests/test_libvirt.py                         |    4 +-
 nova/tests/test_volume.py                          |   25 ++--
 nova/volume/api.py                                 |    4 +-
 nova/volume/manager.py                             |   12 +-
 21 files changed, 456 insertions(+), 94 deletions(-)

commit 7e3e9b8e9cea4f1bf78d127ffb915b79c854fdbe
Author: Ghe Rivero <ghe@debian.org>
Date:   Tue May 1 14:34:55 2012 +0200

    Remove old flagfile support.
    
    Implements blueprint remove-old-flagfile
    
    nova-manage can still be used to convert old flagfiles style files
    to new .ini files:
    
    $ ./bin/nova-manage  config  convert --help
    Usage: nova-manage config convert <args> [options]
    
    Options:
      -h, --help        show this help message and exit
      --infile=<path>   old-style flagfile to convert to config
      --outfile=<path>  path for output file. Writes configto stdout if not
                        specified.
    
    Change-Id: Ib8fbbd858b1db7faef70d7d97955e5042bf378f2
    Signed-off-by: Ghe Rivero <ghe@debian.org>

 bin/clear_rabbit_queues           |    2 +-
 bin/instance-usage-audit          |    2 +-
 bin/nova-all                      |    2 +-
 bin/nova-api                      |    2 +-
 bin/nova-api-ec2                  |    2 +-
 bin/nova-api-metadata             |    2 +-
 bin/nova-api-os-compute           |    2 +-
 bin/nova-api-os-volume            |    2 +-
 bin/nova-cert                     |    2 +-
 bin/nova-compute                  |    2 +-
 bin/nova-console                  |    2 +-
 bin/nova-consoleauth              |    2 +-
 bin/nova-dhcpbridge               |    2 +-
 bin/nova-manage                   |    8 ++++----
 bin/nova-network                  |    2 +-
 bin/nova-objectstore              |    2 +-
 bin/nova-scheduler                |    2 +-
 bin/nova-volume                   |    2 +-
 bin/nova-xvpvncproxy              |    2 +-
 nova/flags.py                     |    4 +---
 nova/tests/test_flags.py          |   32 --------------------------------
 nova/utils.py                     |   10 +++++-----
 tools/xenserver/vm_vdi_cleaner.py |    2 +-
 23 files changed, 29 insertions(+), 63 deletions(-)

commit d9ed81222048f589b6863aaf2a99983ba5a3094f
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Thu May 10 16:48:49 2012 +0000

    Removed unused snapshot_instance method
    
    Removed snapshot_instance method on base virt driver.  It is
    essentially an unused duplicate of the snapshot method.
    
    Change-Id: I082075d8d6797bd60072d375f3ce16704ff6351e

 nova/virt/driver.py |    3 ---
 1 file changed, 3 deletions(-)

commit 955bfa2c7f1cac4160486f6b083612e15aa7b97d
Merge: 31efac3 53adfd2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 10 16:23:50 2012 +0000

    Merge "Added image metadata to compute.instance.exists"

commit 31efac3a6e818c36a12e0b480f389c7a5d169462
Merge: 1d53273 e625300
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 10 16:12:51 2012 +0000

    Merge "Minor help text related changes"

commit 5b93a576583d8830fd6636df73d65349017bb617
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Thu May 10 10:30:29 2012 +0200

    Report memory correctly on Xen. Fixes bug 997014
    
    /proc/meminfo may show wrong values for the memory when using Xen, so
    this fix computes the memory quering libivrt.
    
    Change-Id: I188e2d34bcee13954653b93b9b816cf4530b8859

 nova/virt/libvirt/connection.py |   35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

commit 53adfd289bf7226f1c6f59c17608e42f3083f130
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Thu May 10 15:24:41 2012 +0000

    Added image metadata to compute.instance.exists
    
    Added image metadata to compute.instance.exists notification.
    This information is a convenience to assist billing/usage systems
    by providing information about the image the instance was built
    from.
    
    Change-Id: I27e8c048ed419858ba2eb3e20c25ac454b0419b6

 nova/compute/utils.py            |   13 ++++++++++++-
 nova/tests/test_compute_utils.py |    3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

commit 1d53273d67f38a096ee334a46d5cae2b3f0b4bd2
Merge: 190775d b5db5a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 10 15:01:26 2012 +0000

    Merge "API does need new image_ref on rebuild immediately."

commit 190775d5ea82364ad1baf2471cd453032e9c60de
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 5 13:55:45 2012 -0400

    Update PostgreSQL sequence names for zones/quotas.
    
    Fixes LP Bug #993667.
    Fixes LP Bug #993669.
    
    Change-Id: Ifcc33929ced617916bd6613fc941257494f4a99b

 .../094_update_postgresql_sequence_names.py        |   52 ++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit e625300b92f2eea7866e8033269ced63023822ba
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Thu May 10 02:01:16 2012 -0700

    Minor help text related changes
    
    based on comments from https://review.openstack.org/#/c/7269
    Removed duplicate declaration from test cases.
    
    Change-Id: I090cd3ba0aa2ed3720223deea5e44cfe71682fe0

 nova/compute/manager.py       |    6 +++---
 nova/tests/test_imagecache.py |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

commit c45595cc33ed295a272117ad710dd75336ee7ecc
Merge: d879dc9 ee705d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 23:23:41 2012 +0000

    Merge "fix bug 977007,make nova create correct size of qcow2 disk file."

commit b5db5a346f9916ecdd630284f7596ea762bf1a5e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 9 21:09:33 2012 +0000

    API does need new image_ref on rebuild immediately.
    
    This restores the DB update for image_ref immediately on rebuild, but
    passes the old image_ref to the manager for use with instance.exists
    notification.
    
    Fixes the fix for bug 997245
    
    Change-Id: I8cf6a8759e8fe605bb023048a320b15eee3bcd80

 nova/compute/api.py                                |    5 +++
 nova/compute/manager.py                            |   41 ++++++++++----------
 nova/compute/utils.py                              |   14 ++++---
 .../api/openstack/compute/test_server_actions.py   |    1 +
 nova/tests/test_compute.py                         |   27 +++++++------
 5 files changed, 49 insertions(+), 39 deletions(-)

commit d879dc9e0d28aa203426729c6cfea48bdbfa3cfd
Author: Dan Prince <dprince@redhat.com>
Date:   Wed May 9 16:33:57 2012 -0400

    Avoid unnecessary inst lookup in vmops _shutdown.
    
    Updates the XenServer vmops.py _shutdown function so that it
    avoids calling get_info/_get_vm_opaque_ref with the instance name.
    Since _shutdown already has the vm_ref there is no need to make
    this call.
    
    This fixes an issue where 'RESIZE' was broken when resizing to
    the same host.
    
    Fixes LP Bug #997313.
    
    Change-Id: Ic5a1a0f92df9a2b809aef20a250843bf48402d75

 nova/virt/xenapi/vmops.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 27873b4196a359e8d7101ff4da0785e4dd8787ab
Merge: 51dc42f 7b641e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 20:32:56 2012 +0000

    Merge "implement blueprint floating-ip-notification."

commit 51dc42ff41915b7bc065b01eeb8c18528542e0ca
Merge: c9b3293 55e6021
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 20:11:16 2012 +0000

    Merge "Defer image_ref update to manager on rebuild"

commit c9b32939c7fe73e930bcde0c8090fccdf1ffd119
Merge: 113300f e0d891e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 20:01:53 2012 +0000

    Merge "Sync to newer openstack.common.cfg"

commit 7b641e9c07a0dc1a1f0312dc8b96c8f14b501633
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Sun May 6 17:54:45 2012 +0800

    implement blueprint floating-ip-notification.
    
    add floating ip alloate/disalloate, associate/disassocaite notify
    events.change releative tests to make changes pass through.
    
    Change-Id: I77257528cd87da44ace896d65a4268a066ed888e

 nova/network/manager.py            |   27 ++++++++++++++++++++++++++-
 nova/tests/network/test_manager.py |    8 +++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

commit 113300f024d83ed07d1920d5ba0c518a5550e49e
Merge: 36a810e e8626ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 19:30:50 2012 +0000

    Merge "Improvement for the correct query extraction."

commit 55e6021ce36b2f2d4ef9222252b9ab784f67d9f7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 9 19:20:46 2012 +0000

    Defer image_ref update to manager on rebuild
    
    We shouldn't update the DB and use it for passing the new image_ref for
    a rebuild.  This causes a usage exists notification for the new image
    instead of the old... and technically the new image is not accurate
    until we shutdown the old instance and try building the new one..
    
    Fixes bug 997245
    
    Change-Id: Ia4bd4b8af90080a11875d9ee56661286bc3f5593

 nova/compute/api.py                                |    2 +-
 nova/compute/manager.py                            |   28 ++++++++---
 nova/compute/utils.py                              |    3 +-
 .../api/openstack/compute/test_server_actions.py   |    1 -
 nova/tests/test_compute.py                         |   51 +++++++++++++++-----
 nova/utils.py                                      |    5 ++
 6 files changed, 67 insertions(+), 23 deletions(-)

commit 36a810e5456e4ef1c328d433c24a68a1c1ce886d
Merge: e951020 8c938d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 19:12:06 2012 +0000

    Merge "Mistake with the documentation about cost function's weight corrected."

commit ee705d048418d63667136cad3951655178861d46
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Wed May 9 17:45:58 2012 +0800

    fix bug 977007,make nova create correct size of qcow2 disk file.
    
    when use live block migration,ephemeral disks with qcow2 format
    should be created in the destination with the same virtual size
    as before.
    
    Change-Id: I5c5b1295bdb3e4dc281698eba38c5ce697aa9bc2

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e95102036137797e13ccdc8e889b8d5cecbedf91
Merge: 76fbda0 f539bf7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 16:43:55 2012 +0000

    Merge "Remove unnecessary shutdown argument to _destroy()"

commit 76fbda0e842e5d9b12ba284764abd7ba9bff5873
Merge: 906e65b d901b44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 16:33:28 2012 +0000

    Merge "Fixes bug 983024"

commit 906e65b72f030d2379504013efa46275f43b60bc
Merge: 3e126c8 c0bbc4b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 9 16:22:52 2012 +0000

    Merge "Run ip link show in linux_net._device_exists as root"

commit f539bf7d0522f4a83a212534ec0dac988c36c87a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 9 04:34:40 2012 +0000

    Remove unnecessary shutdown argument to _destroy()
    
    Xen requires the VM power state be not running before it can be
    destroyed. Xen also requires the VM power state to be running
    to shutdown a VM. The shutdown argument was available to ensure
    that a shutdown was not attempted when the VM was not running.
    
    Since commit f5b051bbd0858294157f911ecbb04542fadbb38d, the
    _shutdown() method checks the power state and determines if it
    should issue the shutdown command or not. As a result, the
    shutdown argument is unnecessary and always calling the
    _shutdown() method will ensure the VM is in the proper state
    for the destroy to succeed.
    
    Change-Id: I9bc6007598da4ac69e8d463be9af51deaf5d6535

 nova/virt/xenapi/vmops.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 3e126c83bf6c26de971c84700888deeaee280a50
Merge: d64e939 4a261ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 20:53:59 2012 +0000

    Merge "Minor refactor of servers viewbuider."

commit d64e93967c8271d1d85e44f4c21aefdbb1b0461c
Merge: 45b4955 b7e894b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 19:34:54 2012 +0000

    Merge "Do not fail on notify when quantum and melange are out of sync."

commit 45b4955b4663e67c5fb3dd0bdd2ffcbe00881f18
Merge: 314cc19 2684947
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 19:06:53 2012 +0000

    Merge "fix bug 982360, multi ip block for dmz_cidr"

commit 314cc19dcac67af59beeac9901c8f03416113685
Merge: 9019705 4465180
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 18:06:43 2012 +0000

    Merge "Remove state altering in live-migration code"

commit b7e894b1962d272dfebc42427f7b7ce0f737d065
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Mar 22 17:41:58 2012 -0500

    Do not fail on notify when quantum and melange are out of sync.
    
    This patch adds the `ignore_missing_network_data` flag which will log
    exceptions rather than raising them when generating usage exists
    notifications.
    
    Change-Id: Ie11bc9028790c2d1b3de1f4709a9e17a67e06f26

 bin/instance-usage-audit |    3 ++-
 nova/compute/utils.py    |   26 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

commit 9019705f70a77293bcc6f4394a274fa15115b0f5
Merge: 5ed2e30 fa02377
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 17:45:09 2012 +0000

    Merge "Fix devref  docs"

commit 5ed2e30915f480577cbd343c251f1555cb882798
Merge: a517891 d9099ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 17:34:54 2012 +0000

    Merge "Find context arg by type rather than by name."

commit a517891b1d33f647bd552f2d2ac6bf15a1440bd5
Merge: 99f3822 c95162e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 17:24:26 2012 +0000

    Merge "Fix bug 983206 : _try_convert parsing string"

commit 99f3822fd3341eecb4bc8d699b9721fdf59aeee8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 4 14:36:52 2012 -0700

    Remove instance action logging mechanism
    
    * Remove InstanceActions db model
    * Remove relevant db api functions
    * Add migration 93 which drops the instance_actions
    * Remove server_action_list API extension
    * Fixes bug 994846
    
    Change-Id: Ibbd787183034314460f41c84b9ad152655739209

 etc/nova/policy.json                               |    1 -
 .../compute/contrib/server_action_list.py          |   78 ---------------
 nova/compute/api.py                                |    5 -
 nova/db/api.py                                     |   10 --
 nova/db/sqlalchemy/api.py                          |   21 -----
 .../versions/093_drop_instance_actions_table.py    |   52 ++++++++++
 nova/db/sqlalchemy/models.py                       |   10 --
 .../compute/contrib/test_server_action_list.py     |   99 --------------------
 .../tests/api/openstack/compute/test_extensions.py |    1 -
 nova/tests/policy.json                             |    2 -
 nova/tests/test_compute.py                         |   21 -----
 nova/tests/vmwareapi/db_fakes.py                   |    5 -
 nova/virt/vmwareapi_conn.py                        |    6 --
 13 files changed, 52 insertions(+), 259 deletions(-)

commit 7ad7e9049c651367e8a864863cde5f75fa45b5c9
Merge: e584456 95d2e90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 15:44:21 2012 +0000

    Merge "A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process. This configures the xvpvncproxy to configure the RPC drivers properly with FLAGS so that xvpvncproxy can run."

commit e5844565440701a810047343d994ff48fc9e0e39
Merge: faa9882 61a515a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 15:20:24 2012 +0000

    Merge "httplib throw "TypeError: an integer is required" when run quantum"

commit faa98823951fb390559adde538c15bd830056655
Merge: 1405b62 86dc475
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 14:51:03 2012 +0000

    Merge "pylint cleanup"

commit 61a515a5a7feeeacd17821456459eb4cc828c695
Author: hua zhang <zhhuabj@cn.ibm.com>
Date:   Tue May 8 16:38:35 2012 +0800

    httplib throw "TypeError: an integer is required" when run quantum
    
    Bug 993149
    
    Change-Id: Ife663ec1cf2b9d094a00c488f849da5857cc34a3

 Authors                                    |    1 +
 etc/nova/nova.conf.sample                  |    2 +-
 nova/network/quantum/quantum_connection.py |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 1405b62cde93669072efb13d78cb0382255c7b21
Merge: d659aaa 6a53bf9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 03:16:05 2012 +0000

    Merge "Implement key pair quotas."

commit 6ff7f4029551093b6c02b675b442f8fc190c27f3
Author: Peng Yong <ppyy@pubyun.com>
Date:   Mon Apr 30 23:24:55 2012 +0800

    fix bug 992008, we should config public interface on compute
    
    Change-Id: I35a7d63c9613161f9fea052edf39759e4e2c6227

 nova/network/manager.py            |    8 ++++----
 nova/tests/network/test_manager.py |   13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

commit 95d2e9082ea4c5263304ec81909109730908f8db
Author: Antony Messerli <ant@openstack.org>
Date:   Mon May 7 20:49:23 2012 -0500

    A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process.
    This configures the xvpvncproxy to configure the RPC drivers properly with FLAGS so that xvpvncproxy can run.
    
    Change-Id: I71d27a06060120448bd3401ee91566dbc3b6a289

 bin/nova-xvpvncproxy |    3 +++
 1 file changed, 3 insertions(+)

commit d659aaac90f266f5cf90f509323b4aa06146093d
Merge: 650fe9c dac6027
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 01:47:49 2012 +0000

    Merge "Remove Deprecated AuthMiddleware"

commit 650fe9c217ccf5739636d70850a847f331ab4da3
Merge: f310db7 9a9a28e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 01:38:12 2012 +0000

    Merge "Fix a race with rpc.register_opts in service.py."

commit f310db78442ba895ab74e731193b502447afe615
Merge: 4e38b78 08403e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 8 00:51:38 2012 +0000

    Merge "adjust logging levels for utils.py"

commit c95162e52899618fc269fb536f6a2d3b26b7794d
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Apr 13 15:12:04 2012 -0400

    Fix bug 983206 : _try_convert parsing string
    
    * _try_convert in ec2utils.py didn't handle strings starting with "0x"
    * Added tests to cover bug
    * Add better float support
    * remove unused complex number support
    
    Change-Id: I382d36f4a8671bcceccfa1ebdbae89a9d2aca207

 nova/api/ec2/ec2utils.py |   35 +++++++++++------------------------
 nova/tests/test_api.py   |   12 ++++++++++++
 2 files changed, 23 insertions(+), 24 deletions(-)

commit 4e38b78f55850916904efbe2c79472659f5594a0
Merge: f729925 3a14368
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 7 22:11:36 2012 +0000

    Merge "Update api-paste.ini to remove unused settings"

commit 86dc475bd6de08c8a329a26f988d0fff8868c8a0
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri May 4 15:54:12 2012 -0700

    pylint cleanup
    
    Mostly remove unused imports
    
    Change-Id: Icdb3ec77537b2568f4e85843bab89eb63cd17d8e

 nova/api/openstack/compute/contrib/floating_ips.py |    1 -
 nova/api/validator.py                              |    2 --
 nova/cloudpipe/pipelib.py                          |    1 -
 nova/consoleauth/manager.py                        |    2 --
 nova/db/sqlalchemy/migration.py                    |    1 -
 nova/network/ldapdns.py                            |    3 ---
 nova/rpc/impl_fake.py                              |    3 ---
 nova/testing/runner.py                             |    2 --
 nova/tests/test_auth.py                            |    2 --
 nova/utils.py                                      |    4 +---
 10 files changed, 1 insertion(+), 20 deletions(-)

commit fa02377645ecac45ba75f152c1f9d8d57fff05cf
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon May 7 14:21:06 2012 -0700

    Fix devref  docs
    
    Fix filter_scheduler namespace (no more distributed_scheduler)
    
    Change-Id: I03ae3403a670ba3fdc33983da8df9e97c728080a

 doc/source/devref/filter_scheduler.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dac602738e17691266673147eaaa780272d67367
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon May 7 14:58:15 2012 -0700

    Remove Deprecated AuthMiddleware
    
    * Remove nova.api.openstack.auth:AuthMiddleware
    * Remove associated tests
    * Remove 'deprecated' api pipelines
    * Partially implements bp remove-deprecated-auth
    
    Change-Id: Ifcfac573a569f982c2626bbd0bc740d3c908c9fa

 etc/nova/api-paste.ini                             |    5 -
 nova/api/openstack/auth.py                         |  198 ---------------
 nova/api/openstack/compute/contrib/hosts.py        |    2 -
 .../api/openstack/compute/contrib/test_accounts.py |    1 -
 .../openstack/compute/contrib/test_snapshots.py    |    1 -
 .../api/openstack/compute/contrib/test_users.py    |    1 -
 .../api/openstack/compute/contrib/test_volumes.py  |    1 -
 nova/tests/api/openstack/compute/test_auth.py      |  262 +-------------------
 .../api/openstack/compute/test_server_actions.py   |    1 -
 nova/tests/api/openstack/compute/test_versions.py  |    1 -
 nova/tests/api/openstack/fakes.py                  |   23 +-
 11 files changed, 8 insertions(+), 488 deletions(-)

commit f729925f5a3231c1b8ec2cb3c9c5fcd2bc68dbbb
Merge: b279d8a54 2f552e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 7 21:52:29 2012 +0000

    Merge "Replaces exceptions.Error with NovaException"

commit b279d8a547628aab8ad98468571c04e2ecd45a56
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat May 5 13:51:32 2012 -0700

    Allow sitepackages on jenkins.
    
    Since our overall environment on the jenkins slaves is controlled,
    it's safe to allow site-packages. BUT - more importantly, it's the
    only way to get python-libvirt to be accessed.
    
    Change-Id: I1181127a134afdfc1de58d0ab819395bb8995647

 tox.ini |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2f552e957fddcd9e042a09a2d32d32fa564c18e7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 3 14:29:50 2012 -0400

    Replaces exceptions.Error with NovaException
    
    Fixes bug 817107
    
    Change-Id: I6253e6bbcc44676c587b315fa32afba6459e676a

 nova/api/openstack/extensions.py           |    3 +-
 nova/auth/manager.py                       |    2 +-
 nova/auth/signer.py                        |   11 ++--
 nova/compute/api.py                        |    4 +-
 nova/db/api.py                             |    4 +-
 nova/db/sqlalchemy/migration.py            |    2 +-
 nova/exception.py                          |   97 +++++++++++++---------------
 nova/image/s3.py                           |   10 +--
 nova/network/linux_net.py                  |    3 +-
 nova/network/manager.py                    |   10 +--
 nova/tests/image/test_s3.py                |    4 +-
 nova/tests/test_exception.py               |    8 ---
 nova/tests/test_libvirt.py                 |    4 +-
 nova/tests/test_signer.py                  |    8 +--
 nova/tests/test_utils.py                   |   22 +++----
 nova/tests/test_volume.py                  |    2 +-
 nova/tests/test_xenapi.py                  |    2 +-
 nova/tests/volume/test_HpSanISCSIDriver.py |    2 +-
 nova/utils.py                              |   27 ++++----
 nova/virt/baremetal/nodes.py               |    2 +-
 nova/virt/baremetal/tilera.py              |    2 +-
 nova/virt/disk/api.py                      |   20 +++---
 nova/virt/libvirt/connection.py            |    9 +--
 nova/virt/libvirt/volume.py                |    4 +-
 nova/virt/vmwareapi/fake.py                |    9 ++-
 nova/virt/vmwareapi/io_util.py             |   14 ++--
 nova/virt/vmwareapi/network_utils.py       |    4 +-
 nova/virt/vmwareapi/vmops.py               |    2 +-
 nova/virt/vmwareapi/vmware_images.py       |    2 +-
 nova/virt/vmwareapi_conn.py                |    4 +-
 nova/virt/xenapi/fake.py                   |    4 +-
 nova/virt/xenapi/vm_utils.py               |   12 ++--
 nova/virt/xenapi/volumeops.py              |   10 +--
 nova/volume/driver.py                      |   11 ++--
 nova/volume/manager.py                     |    5 +-
 nova/volume/netapp.py                      |   34 +++++-----
 nova/volume/san.py                         |   18 +++---
 nova/volume/xensm.py                       |   24 +++----
 38 files changed, 208 insertions(+), 207 deletions(-)

commit 42b09d91f7815ebf9072123cc5bd1817dbf8750d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun May 6 19:27:27 2012 -0400

    Docs for vm/task state transitions.
    
    Added diagrams to RST docs that show  required vm_state / task_state
    transitions for compute api operations.
    
    (Set Sandy Walsh as author since he created the diagrams)
    
    Change-Id: Ie6a9cd4b54321a98fea5429ee52eb781f57f31a4

 doc/source/devref/index.rst                    |    1 +
 doc/source/devref/vmstates.rst                 |   24 ++++++++++++++++++++++++
 doc/source/image_src/PowerStates.odp           |  Bin 0 -> 21916 bytes
 doc/source/images/PowerStates1.png             |  Bin 0 -> 175885 bytes
 doc/source/images/PowerStates2.png             |  Bin 0 -> 254760 bytes
 doc/source/images/run_instance_walkthrough.png |  Bin 0 -> 163164 bytes
 6 files changed, 25 insertions(+)

commit 9a9a28e80ae043bdf7476651ea8d92aedf0ba36c
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 5 22:42:36 2012 -0400

    Fix a race with rpc.register_opts in service.py.
    
    Fixes an issue in service.py where rpc.register_opts may not
    get called before wait() accesses FLAGS... which can cause
    NoneType exceptions with some versions of nova.conf.
    
    Fixes LP Bug #995328.
    
    Change-Id: Ib177c2a082a4cf1c22935c1e6fdf3ba714a33aca

 nova/service.py |    1 +
 1 file changed, 1 insertion(+)

commit 8c938d3f7e364a7c191182cb16ed28af35ee3f02
Author: Dina Belova <dbelova@mirantis.com>
Date:   Thu May 3 15:40:50 2012 +0400

    Mistake with the documentation about cost function's weight corrected.
    
    Change-Id: I131d6abc100682ae78c7ac2edfffadc491b9d437

 doc/source/devref/filter_scheduler.rst |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit eb9e54c1129080ad0f5b569b39dfa09c539f2f11
Merge: 5effc8d 4e20178
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 21:20:18 2012 +0000

    Merge "Fix semantics for migration test environment var"

commit 5effc8d2e87d5014b6e5fdb1a5068d38ae4385f3
Merge: 9d1bc8b 7b29e69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 21:10:10 2012 +0000

    Merge "Clean up weighted_sum logic."

commit 9d1bc8b29b9b51d7e8048b3b66e8124f9363b593
Merge: 87ca557 82319bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 20:59:04 2012 +0000

    Merge "Use fake_libvirt_utils for libvirt console tests."

commit 87ca5570ff8cf8e172e8a1f36128b2b2badc9206
Merge: 90f305c 066d4c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 20:21:10 2012 +0000

    Merge "Add instance_system_metadata modeling."

commit 44651806269f449f81d873353d3291dd72e6360a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri May 4 12:54:40 2012 -0700

    Remove state altering in live-migration code
    
     * Stops live migration from checking volume node because it
       will not be accessible if volumes are a separate service
     * Stops state modification of volumes during live migration
       because the volumes are not migrating
     * Partially implements blueprint volume-decoupling
    
    Change-Id: I07bdbc660ff220e2079e643a002c4c6bb5df6db7

 nova/compute/manager.py                |    4 ---
 nova/exception.py                      |    4 ---
 nova/scheduler/driver.py               |   13 ----------
 nova/tests/scheduler/test_scheduler.py |   44 --------------------------------
 4 files changed, 65 deletions(-)

commit 90f305c3994f2707263ecd2acb70ff1908e20f6d
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 4 15:28:49 2012 -0400

    Register fake flags with rpc init function.
    
    Fixes LP Bug #994775.
    
    Change-Id: I60b6d9b500a9a1dd801919a3b63dc3ddfa291c13

 nova/tests/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit d34c48361de689e8d0e689550dce4b930c1b6621
Merge: 57a2e65 dc440ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 17:57:34 2012 +0000

    Merge "Adds missing copyright to migration 082."

commit 7ba26ad4ba4c79680fe8d84dbe1fd4395dd2d119
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Apr 24 13:52:54 2012 -0400

    Generate a Changelog for Nova
    
    Ubuntu uses a tarball to generate packages for Nova and
    other openstack projects. This allows the user to find out
    what is included in the tarball.
    
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>
    
    Change-Id: I0291e19eee1ff2c5fc98b499571b2563841c6076

 MANIFEST.in                    |    1 +
 nova/openstack/common/setup.py |  145 ++++++++++++++++++++++++++++++++++++++++
 openstack-common.conf          |    2 +-
 setup.py                       |   13 +++-
 4 files changed, 158 insertions(+), 3 deletions(-)

commit d9099ee332b7dace9f0b73c8131ccd960cff5eaa
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Thu May 3 02:38:48 2012 -0500

    Find context arg by type rather than by name.
    
    This requires changes to all the tests that were passing
    in a string as a bogus context; that seems like an improvement.
    
    Change-Id: Ib8fc83cbda25a1cfa8794b72dc13f666549ef892

 nova/exception.py            |   24 +++++++++++-------------
 nova/tests/test_exception.py |    6 ++++--
 nova/tests/test_notifier.py  |   25 +++++++++++++++----------
 3 files changed, 30 insertions(+), 25 deletions(-)

commit 57a2e6523390c4305b5c2ce26268ebe74a2f25ff
Merge: 7d8231a 3e09b7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 17:07:33 2012 +0000

    Merge "Default auto-increment for int primary key columns"

commit 3e09b7cd9020384ab488b5fdef8fa77244e2acb5
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Fri May 4 16:03:00 2012 +0100

    Default auto-increment for int primary key columns
    
    Consistently rely on the default auto-increment flag for integral
    primary key columns (rather than being explicit in some cases and
    implicit elsewhere).
    
    Change-Id: I5da89b286b199b0ddb709ca882699e9419ec68e0

 .../sqlalchemy/migrate_repo/versions/082_essex.py  |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit dc440ca064ac0d79d51a8370782cd1932d0df335
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 4 12:29:37 2012 -0400

    Adds missing copyright to migration 082.
    
    Change-Id: Ib43d3efed1aed8f4d955208aebb627206b106f30

 .../sqlalchemy/migrate_repo/versions/082_essex.py  |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 066d4c0bf25a9e4c6493e9fe575d9086dab2ea33
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 2 21:40:14 2012 +0000

    Add instance_system_metadata modeling.
    
    Implements blueprint instance-system-metadata.
    
    Adds a new table to store system-owned metadata tied to an instance. The
    intent is to provide a key/value store that compute plugins can use to
    persist state.
    
    Change-Id: Ic446fea0f9c8a652f2ac6d554f4f85021ce34fb8

 nova/db/api.py                                     |   19 +++
 nova/db/sqlalchemy/api.py                          |  125 ++++++++++++++++++--
 .../versions/092_add_instance_system_metadata.py   |   71 +++++++++++
 nova/db/sqlalchemy/models.py                       |   19 ++-
 nova/exception.py                                  |    5 +
 nova/tests/test_db_api.py                          |   30 +++--
 6 files changed, 248 insertions(+), 21 deletions(-)

commit 7d8231a58c469b7540ee134a3fe5af0601d306ed
Merge: 6dc6277 4b0f4b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 4 16:06:55 2012 +0000

    Merge "Fix test_mysql_innodb"

commit 82319bf69745f7a20d0f6273821745302ab711e6
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 3 10:06:46 2012 -0400

    Use fake_libvirt_utils for libvirt console tests.
    
    Updates test_libvirt.py so that it users fake_libvirt_utils.
    
    This resolves an issue where the previous tests required
    sudo to properly execute.
    
    Fixes LP Bug #992805.
    
    Change-Id: I9354b8facf82fb861dc2fe6da5fca102d8a33fbf

 nova/tests/fake_libvirt_utils.py |    7 ++++++-
 nova/tests/test_libvirt.py       |   11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

commit 4e20178783c2d014b027e509fc26295eb5bc0768
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 4 09:08:08 2012 -0400

    Fix semantics for migration test environment var
    
    Change-Id: I483f29d826fe1e1d1478e714524661aaf20c1cf3

 nova/tests/test_migrations.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 7b29e6973f56094a24f796cd05690f5c4211c970
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 4 17:04:13 2012 +0400

    Clean up weighted_sum logic.
    
    Change-Id: Ie8ea6af8e94149e06d1096baac4519e132d1f44d

 nova/scheduler/least_cost.py |   35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

commit f926d86530f9d656de7e602304579b18f972a7db
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri May 4 10:46:06 2012 +0100

    Use ConfigOpts.find_file() to locate policy.json
    
    Use cfg's new helper method to find policy config file. The basic
    behavior is "look alongside the config file" with a fall back to
    the standard default config paths.
    
    Change-Id: I763097107c53fc9b7d4e783ee92bf16989d92cff

 nova/policy.py           |    8 +++++++-
 nova/tests/fake_flags.py |    1 -
 nova/utils.py            |    1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

commit e0d891ea0da77ae7fae951a19e7df7f0d7a7e716
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri May 4 10:46:05 2012 +0100

    Sync to newer openstack.common.cfg
    
    Changes since last sync are:
    
     * New ConfigOpts.find_file() for locating conf files
     * Support for directory source of config files
     * Provide file extension when when looking for files
     * Some refactoring of the cfg cache
     * Add caching to openstack.common.cfg
    
    Change-Id: I5fd483b8d1a6e83f7237507132009d31dd8bcb77

 nova/openstack/common/cfg.py |  200 +++++++++++++++++++++++++++++++++---------
 1 file changed, 160 insertions(+), 40 deletions(-)

commit 6dc62775d77c9879fa40e275811715004e7d9fae
Merge: 7137d1e 0aee886
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 23:53:25 2012 +0000

    Merge "Move image checksums into a generic file."

commit 4b0f4b84e5a26526d8cd28c7ccc078c11ba5abb7
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Thu May 3 23:29:59 2012 +0000

    Fix test_mysql_innodb
    
    If the default table engine in MySQL wasn't set to be InnoDB,
    then the sqlalchemy migration version table would cause
    'test_mysql_innodb' to fail.
    
    Change-Id: I38787d4c3e3f2896fdc349d6f7817d3ef78cc2a5

 nova/tests/test_migrations.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7137d1eddaa1bb5049f49bcdef5dcb62905f1dfa
Merge: addeb45 407e16b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 23:08:40 2012 +0000

    Merge "Convert Volume and Snapshot IDs to use UUID"

commit addeb45af864c04283202848a4cc94f86fd9b5ad
Merge: 0d64caa fffaf26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 21:43:05 2012 +0000

    Merge "Remove unused import"

commit 0d64caa6834886f572b785306e2aa0651e22c92a
Merge: e3837c6 ee2f6f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 21:00:11 2012 +0000

    Merge "Compact pre-Folsom database migrations."

commit e3837c632ac9038f316d956a3b55a42842ad9d8e
Merge: 765b3d4 21352ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 20:41:58 2012 +0000

    Merge "Allow blank passwords in changePassword action"

commit 765b3d46bf00b007c7aac037cf7649c1c339cbcd
Merge: 8fc5336 1001a5f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 3 20:31:52 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 6a53bf90d0c1ea547a1c920c45e0eeef7ddfba2e
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Apr 22 19:34:38 2012 -0400

    Implement key pair quotas.
    
    Fixes LP Bug #987058.
    
    Change-Id: Ibefcdc448cb60754d5358fd08d74f7d279c8b16e

 nova/api/ec2/cloud.py                              |   10 +++++
 nova/api/openstack/compute/contrib/keypairs.py     |    6 +++
 nova/db/api.py                                     |    5 +++
 nova/db/sqlalchemy/api.py                          |    7 +++
 nova/quota.py                                      |   20 ++++++++-
 nova/tests/api/ec2/test_cloud.py                   |   29 ++++++++++++
 .../api/openstack/compute/contrib/test_keypairs.py |   46 ++++++++++++++++++++
 .../compute/contrib/test_quota_classes.py          |   10 ++++-
 .../api/openstack/compute/contrib/test_quotas.py   |   15 +++++--
 nova/tests/test_quota.py                           |   22 ++++++++++
 10 files changed, 165 insertions(+), 5 deletions(-)

commit 8fc533699d8ae02da951e0443853159bed80199f
Merge: 4697cac c5a9c75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 18:04:47 2012 +0000

    Merge "Ensure that the dom0 we're connected to is the right one"

commit 4697cac310867f700e3fa7a938d169d0561cb952
Merge: 7ff82ea 2dcd825
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 17:41:29 2012 +0000

    Merge "Pass context to notification drivers when we can."

commit c5a9c7550299cde8d9c4a53f5959baa721ef7e53
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 3 00:07:25 2012 +0000

    Ensure that the dom0 we're connected to is the right one
    
    The XenAPI driver requires the compute domU be running on the same host
    as specified by xenapi_connection_url. Check that we can find the compute
    domU on the host connected to before going too far.
    
    Change-Id: I2a56fa305b6379a7ea97f04240e627bb13223c9f

 nova/virt/xenapi/connection.py |    7 +++++++
 nova/virt/xenapi/vm_utils.py   |   14 ++++++++++++++
 2 files changed, 21 insertions(+)

commit 7ff82ea4ce21728c48ad9d6295d57a906046079b
Merge: e175c5f 03a331c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 07:02:06 2012 +0000

    Merge "Log instance consistently."

commit c0bbc4be369d0b20cd3c5985eb48b8ec66876804
Author: hua zhang <zhhuabj@cn.ibm.com>
Date:   Wed May 2 18:34:01 2012 +0800

    Run ip link show in linux_net._device_exists as root
    
    Bug 993097
    
    Change-Id: Iaad55f2e878df65e9398f0c28786f0c13fb82a95

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee2f6f1bed21a5ef92d84634cd4e949062073d62
Author: Dan Prince <dprince@redhat.com>
Date:   Wed May 2 14:48:25 2012 -0400

    Compact pre-Folsom database migrations.
    
    Compacts the pre-Folsom database migrations into
    a single migration (082_essex.py).
    
    Pre-Folsom users will need to upgrade to Essex before
    running any Folsom migrations.
    
    Implements blueprint db-migration-cleanup.
    
    Testing notes available at:
    
    http://wiki.openstack.org/database_migration_testing
    
    Change-Id: I64c06a3adcf83d6d723c4c11001544ba97668413

 nova/db/migration.py                               |    2 +
 .../sqlalchemy/migrate_repo/versions/001_austin.py |  627 -------------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |  236 -----
 .../versions/002_postgresql_downgrade.sql          |   20 -
 .../migrate_repo/versions/002_sqlite_downgrade.sql |  388 --------
 .../versions/003_add_label_to_networks.py          |   42 -
 .../migrate_repo/versions/003_sqlite_downgrade.sql |  111 ---
 .../migrate_repo/versions/004_add_zone_tables.py   |   66 --
 .../versions/005_add_instance_metadata.py          |   81 --
 .../versions/006_add_provider_data_to_volumes.py   |   54 --
 .../migrate_repo/versions/006_sqlite_downgrade.sql |  113 ---
 .../versions/007_add_ipv6_to_fixed_ips.py          |   70 --
 .../migrate_repo/versions/007_sqlite_downgrade.sql |   79 --
 .../versions/008_add_instance_types.py             |   85 --
 .../versions/009_add_instance_migrations.py        |   70 --
 .../versions/010_add_os_type_to_instances.py       |   45 -
 .../migrate_repo/versions/011_live_migration.py    |   85 --
 .../versions/012_add_ipv6_flatmanager.py           |   90 --
 .../migrate_repo/versions/012_sqlite_upgrade.sql   |  195 ----
 .../versions/013_add_flavors_to_migrations.py      |   43 -
 .../migrate_repo/versions/013_sqlite_downgrade.sql |   69 --
 .../014_add_instance_type_id_to_instances.py       |   74 --
 .../015_add_auto_assign_to_floating_ips.py         |   35 -
 .../migrate_repo/versions/015_sqlite_downgrade.sql |   62 --
 .../versions/016_make_quotas_key_and_value.py      |  213 -----
 .../017_make_instance_type_id_an_integer.py        |   87 --
 .../versions/018_rename_server_management_url.py   |   35 -
 .../versions/019_add_volume_snapshot_support.py    |   82 --
 .../versions/020_add_snapshot_id_to_volumes.py     |   40 -
 .../migrate_repo/versions/020_sqlite_downgrade.sql |  119 ---
 .../migrate_repo/versions/021_rename_image_ids.py  |   38 -
 .../versions/022_set_engine_mysql_innodb.py        |   64 --
 .../versions/023_add_vm_mode_to_instances.py       |   42 -
 .../versions/024_add_block_device_mapping.py       |   92 --
 .../versions/025_add_uuid_to_instances.py          |   45 -
 .../migrate_repo/versions/026_add_agent_table.py   |   89 --
 .../versions/027_add_provider_firewall_rules.py    |   65 --
 .../versions/028_add_instance_type_extra_specs.py  |   76 --
 .../versions/029_add_zone_weight_offsets.py        |   41 -
 .../migrate_repo/versions/030_multi_nic.py         |  146 ---
 .../migrate_repo/versions/030_sqlite_downgrade.sql |  377 --------
 .../031_fk_fixed_ips_virtual_interface_id.py       |   59 --
 .../migrate_repo/versions/031_sqlite_downgrade.sql |   48 -
 .../migrate_repo/versions/031_sqlite_upgrade.sql   |   48 -
 .../versions/032_add_root_device_name.py           |   42 -
 .../migrate_repo/versions/033_ha_network.py        |   42 -
 .../migrate_repo/versions/033_sqlite_downgrade.sql |  193 ----
 .../034_change_instance_id_in_migrations.py        |   46 -
 .../migrate_repo/versions/035_secondary_dns.py     |   39 -
 .../versions/036_change_flavor_id_in_migrations.py |   79 --
 .../versions/037_instances_drop_admin_pass.py      |   42 -
 .../versions/038_add_uuid_to_virtual_interfaces.py |   45 -
 .../migrate_repo/versions/038_sqlite_downgrade.sql |   63 --
 .../versions/039_add_instances_accessip.py         |   49 -
 .../versions/040_add_uuid_to_networks.py           |   45 -
 .../versions/041_add_config_drive_to_instances.py  |   36 -
 .../versions/042_add_volume_types_and_extradata.py |  122 ---
 .../migrate_repo/versions/042_sqlite_downgrade.sql |  129 ---
 .../migrate_repo/versions/043_add_vsa_data.py      |   84 --
 .../versions/044_update_instance_states.py         |  132 ---
 .../versions/045_add_network_priority.py           |   44 -
 .../migrate_repo/versions/046_add_instance_swap.py |   49 -
 .../versions/047_remove_instances_fk_from_vif.py   |   61 --
 .../migrate_repo/versions/047_sqlite_downgrade.sql |   46 -
 .../migrate_repo/versions/047_sqlite_upgrade.sql   |   45 -
 .../migrate_repo/versions/048_add_zone_name.py     |   33 -
 .../versions/049_add_instances_progress.py         |   44 -
 .../versions/050_add_disk_config_to_instances.py   |   37 -
 .../migrate_repo/versions/050_sqlite_downgrade.sql |  207 -----
 .../051_add_vcpu_weight_to_instance_types.py       |   34 -
 .../versions/052_kill_export_devices.py            |   65 --
 ..._add_connection_info_to_block_device_mapping.py |   38 -
 .../migrate_repo/versions/053_sqlite_downgrade.sql |   87 --
 .../versions/054_add_bw_usage_data_cache.py        |   64 --
 .../versions/055_convert_flavor_id_to_str.py       |  112 ---
 .../migrate_repo/versions/056_add_s3_images.py     |   60 --
 .../versions/057_add_sm_driver_tables.py           |  113 ---
 .../versions/058_rename_managed_disk.py            |   37 -
 .../versions/059_split_rxtx_quota_into_network.py  |   61 --
 .../migrate_repo/versions/059_sqlite_downgrade.sql |  137 ---
 .../migrate_repo/versions/059_sqlite_upgrade.sql   |   87 --
 .../versions/060_remove_network_fk_from_vif.py     |   62 --
 .../migrate_repo/versions/060_sqlite_downgrade.sql |   45 -
 .../migrate_repo/versions/060_sqlite_upgrade.sql   |   44 -
 .../versions/061_add_index_to_instance_uuid.py     |   29 -
 .../versions/062_add_instance_info_cache_table.py  |   70 --
 .../versions/063_add_instance_faults_table.py      |   60 --
 ...ange_instance_id_to_uuid_in_instance_actions.py |   80 --
 .../065_add_index_to_instance_project_id.py        |   31 -
 .../066_preload_instance_info_cache_table.py       |  244 -----
 .../067_add_pool_and_interface_to_floating_ip.py   |   45 -
 .../migrate_repo/versions/067_sqlite_downgrade.sql |   69 --
 .../versions/068_add_instance_attribute.py         |   36 -
 .../migrate_repo/versions/068_sqlite_downgrade.sql |  219 -----
 .../migrate_repo/versions/069_block_migration.py   |   50 -
 .../migrate_repo/versions/070_sqlite_downgrade.sql |  103 --
 .../migrate_repo/versions/070_sqlite_upgrade.sql   |   99 --
 .../versions/070_untie_nova_network_models.py      |  100 --
 .../versions/071_add_host_aggregate_tables.py      |  108 ---
 .../migrate_repo/versions/072_add_dns_table.py     |   77 --
 .../migrate_repo/versions/072_mysql_upgrade.sql    |   13 -
 .../migrate_repo/versions/073_add_capacity.py      |   49 -
 .../versions/074_change_flavor_local_gb.py         |  130 ---
 .../migrate_repo/versions/074_sqlite_upgrade.sql   |  313 -------
 .../075_convert_bw_usage_to_store_network_id.py    |   97 --
 .../versions/076_remove_unique_constraints.py      |   84 --
 .../migrate_repo/versions/076_sqlite_upgrade.sql   |   61 --
 .../migrate_repo/versions/077_convert_to_utf8.py   |   61 --
 .../versions/078_add_rpc_info_to_zones.py          |   46 -
 .../migrate_repo/versions/078_sqlite_downgrade.sql |   35 -
 .../versions/079_add_zone_name_to_instances.py     |   30 -
 ...080_add_hypervisor_hostname_to_compute_nodes.py |   30 -
 .../versions/081_drop_instance_id_bw_cache.py      |   69 --
 .../sqlalchemy/migrate_repo/versions/082_essex.py  |  981 ++++++++++++++++++++
 .../migrate_repo/versions/082_zone_to_cell.py      |   35 -
 nova/db/sqlalchemy/migration.py                    |   29 +-
 nova/tests/__init__.py                             |    5 +-
 nova/tests/test_migrations.py                      |   15 +-
 118 files changed, 1006 insertions(+), 9845 deletions(-)

commit fffaf26ced9bb9c162797c7264e7797955301bb4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 2 23:56:29 2012 +0000

    Remove unused import
    
    Not only unused, but using webob exceptions from compute.api is bad
    practice. That should happen in the OS API or EC2 API layers.
    
    Change-Id: Ibfe20148608aaca0884fe123eb32c8957980ca56

 nova/compute/api.py |    2 --
 1 file changed, 2 deletions(-)

commit e175c5f1c0275ed43648d43e6e46129680fc6d1b
Merge: 922d609 ac21815
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 23:36:44 2012 +0000

    Merge "Allow blank adminPass on server create"

commit 922d609480e62f7de156864be527cfe4c8af91f0
Merge: 4db0186 2511f01
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 23:08:47 2012 +0000

    Merge "Use additional task states during resize"

commit 4db018636dcc2c083f5dc92a7dd993766337c86c
Merge: fba02ba d14ac4b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 23:00:29 2012 +0000

    Merge "Adding 'host' info to volume-compute connection information."

commit fba02baf8dbf6d3d9a7ed58a498670157004bce5
Merge: b841b6a 29dc47b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 22:50:49 2012 +0000

    Merge "Use save_and_reraise_exception() from common."

commit 2dcd8256662115e6528c2b784c08c5724c8227e8
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Thu Apr 26 13:54:08 2012 -0500

    Pass context to notification drivers when we can.
    
    Note that previously several notification drivers
    created an admin context and embedded it in their
    messages.  Those drivers now use the passed-in
    context instead if it's available.
    
    For blueprint novaplugins.
    
    Change-Id: Icb89030256022d0a68db4a147611fd37fe83316a

 nova/compute/utils.py                         |    2 +-
 nova/exception.py                             |   28 ++++++++++-
 nova/log.py                                   |    6 ++-
 nova/notifier/api.py                          |   19 +++++---
 nova/notifier/capacity_notifier.py            |    2 +-
 nova/notifier/list_notifier.py                |    6 +--
 nova/notifier/log_notifier.py                 |    2 +-
 nova/notifier/no_op_notifier.py               |    2 +-
 nova/notifier/rabbit_notifier.py              |    5 +-
 nova/notifier/test_notifier.py                |    2 +-
 nova/scheduler/filter_scheduler.py            |    6 +--
 nova/scheduler/manager.py                     |    2 +-
 nova/tests/notifier/test_capacity_notifier.py |    8 ++--
 nova/tests/notifier/test_list_notifier.py     |    6 +--
 nova/tests/test_exception.py                  |    8 ++--
 nova/tests/test_notifier.py                   |   64 +++++++++++++++++++++----
 16 files changed, 124 insertions(+), 44 deletions(-)

commit 29dc47bd5045853d83a2343ec88c36ea89db188d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 1 17:31:26 2012 -0400

    Use save_and_reraise_exception() from common.
    
    This patch common.excutils from openstack-common, which includes
    save_and_reraise_exception().  The patch also converts the code
    base to use it from there instead of nova.utils and then removes
    it from nova.utils.
    
    The initial motivation for this was removing another nova dependency
    from nova.rpc so that it can eventually be moved to openstack-common.
    
    Change-Id: I7354ca51a02aec9c709cf33f77d4abc46acc2742

 nova/compute/manager.py           |   23 ++++++++---------
 nova/openstack/common/excutils.py |   49 +++++++++++++++++++++++++++++++++++++
 nova/rpc/amqp.py                  |    5 ++--
 nova/scheduler/manager.py         |    8 +++---
 nova/utils.py                     |   33 +++----------------------
 nova/virt/libvirt/connection.py   |    3 ++-
 nova/virt/xenapi/vm_utils.py      |    7 +++---
 nova/volume/manager.py            |    9 ++++---
 openstack-common.conf             |    2 +-
 9 files changed, 84 insertions(+), 55 deletions(-)

commit b841b6af4e7b66be5add0d5346fbae68cfde682e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 2 20:04:12 2012 +0000

    Fix innodb tests again
    
    Vish missed a line to change when he moved a method
    
    Change-Id: Idc494aeeaee2948f7d1791ebd71d15efd5422166

 nova/tests/test_migrations.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1
Merge: 96b358d 4c4f0b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 19:51:53 2012 +0000

    Merge "Xen has to create it's own tap device if using libvirt and QuantumLinuxBridgeVIFDriver"

commit 96b358dc41568851f3c1fa54111b4eecbc004ef0
Merge: e9928de a7e4fd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 19:42:21 2012 +0000

    Merge "Make kombu support optional for running unit tests."

commit e9928de9bd73c30a0946ce53f5d4cd40d4520d20
Merge: ca2bb06 524bfb8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 19:32:40 2012 +0000

    Merge "Update common.importutils from openstack-common."

commit 407e16b863bac1dfbf4e954837009abf9c17f018
Author: John Griffith <john.griffith@solidfire.com>
Date:   Thu Apr 12 20:36:48 2012 -0600

    Convert Volume and Snapshot IDs to use UUID
    
    * Three migrations
      1. create id mappings
      2. convert volume_id and snapshot_id from int to string
      3. change volume/snapshot id's from int to uuid
    * DB migration for Volume and Related tables
    * Addition of new volume id mapping tables
    * Added methods in ec2utils
    * Minor tweaks to unit tests
    * Other changes to migration to ensure consistency in id's
    * Fixed bug in the block-device-mapping table (wasn't setting autoinc)
    
    Change-Id: Ic6c3646e0f01c26467a4a3c20e13eebaa2baa97e

 nova/api/ec2/cloud.py                              |   18 +-
 nova/api/ec2/ec2utils.py                           |   70 +++++-
 nova/db/api.py                                     |   23 +-
 nova/db/sqlalchemy/api.py                          |  102 +++++++++
 .../versions/089_add_volume_id_mappings.py         |  116 ++++++++++
 .../versions/090_modify_volume_id_datatype.py      |  236 ++++++++++++++++++++
 .../migrate_repo/versions/090_sqlite_downgrade.sql |  226 +++++++++++++++++++
 .../migrate_repo/versions/090_sqlite_upgrade.sql   |  226 +++++++++++++++++++
 .../versions/091_convert_volume_ids_to_uuid.py     |  145 ++++++++++++
 nova/db/sqlalchemy/models.py                       |   35 ++-
 nova/tests/api/ec2/test_cloud.py                   |   23 +-
 nova/tests/api/ec2/test_ec2_validate.py            |   17 --
 nova/tests/integrated/test_volumes.py              |   12 +-
 nova/tests/test_bdm.py                             |   25 ++-
 nova/tests/test_compute.py                         |   45 ++--
 nova/tests/test_volume.py                          |   15 ++
 16 files changed, 1251 insertions(+), 83 deletions(-)

commit ca2bb061a728bb5db8781f298c18c980d9d91863
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed May 2 11:30:59 2012 -0700

    Remove unused images
    
    Change-Id: I23a3de8197ca34948d55dd3be65c8d9c88bbdd71

 doc/source/images/NOVA_ARCH.png               |  Bin 191332 -> 0 bytes
 doc/source/images/NOVA_ARCH.svg               | 5854 ---------
 doc/source/images/NOVA_ARCH_200dpi.png        |  Bin 439024 -> 0 bytes
 doc/source/images/NOVA_ARCH_66dpi.png         |  Bin 110890 -> 0 bytes
 doc/source/images/NOVA_clouds_A_B.png         |  Bin 77007 -> 0 bytes
 doc/source/images/NOVA_clouds_A_B.svg         |16342 -------------------------
 doc/source/images/NOVA_clouds_C1_C2.svg       | 9763 ---------------
 doc/source/images/NOVA_clouds_C1_C2.svg.png   |  Bin 448574 -> 0 bytes
 doc/source/images/Novadiagram.png             |  Bin 52609 -> 0 bytes
 doc/source/images/base_scheduler.png          |  Bin 17068 -> 0 bytes
 doc/source/images/cloudpipe.png               |  Bin 89812 -> 0 bytes
 doc/source/images/fabric.png                  |  Bin 125915 -> 0 bytes
 doc/source/images/nova.compute.api.create.png |  Bin 50171 -> 0 bytes
 doc/source/images/novascreens.png             |  Bin 27949 -> 0 bytes
 doc/source/images/novashvirtually.png         |  Bin 39000 -> 0 bytes
 doc/source/images/vmwareapi_blockdiagram.jpg  |  Bin 75363 -> 0 bytes
 doc/source/images/zone_aware_overview.png     |  Bin 56142 -> 0 bytes
 doc/source/images/zone_aware_scheduler.png    |  Bin 20902 -> 0 bytes
 doc/source/images/zone_overview.png           |  Bin 51587 -> 0 bytes
 19 files changed, 31959 deletions(-)

commit d14ac4bf38f23e429572f210f7b0560493968b15
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Tue May 1 14:02:16 2012 -0500

    Adding 'host' info to volume-compute connection information.
    
    Added a new key 'host' for the initialize/terminate volume connection
    information. Updated the HpSanISCSIDriver to use teh initialize and
    terminate methods. Added missing unit tests for the HpSanISCSIDriver.
    Fixes bug 992729.
    
    Change-Id: I09fad6b5328cbfb860ab2c7ae5d206010f3dd45d

 nova/tests/test_libvirt.py                 |    8 +-
 nova/tests/test_virt_drivers.py            |    1 +
 nova/tests/volume/__init__.py              |   13 ++
 nova/tests/volume/test_HpSanISCSIDriver.py |  212 ++++++++++++++++++++++++++++
 nova/virt/driver.py                        |    5 +-
 nova/virt/fake.py                          |    2 +-
 nova/virt/libvirt/connection.py            |    1 +
 nova/virt/vmwareapi_conn.py                |    5 +-
 nova/virt/xenapi/connection.py             |   11 +-
 nova/volume/san.py                         |   89 +++++-------
 10 files changed, 286 insertions(+), 61 deletions(-)

commit 524bfb84f5119315af56556cc9911f92c538b5b0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 2 13:44:20 2012 -0400

    Update common.importutils from openstack-common.
    
    This patch updates common.importutils from openstack-common.  The change
    was to remove the usage of common.exception.  The rest of the patch
    includes the changes required in nova to no longer use common.exception,
    as well.
    
    Change-Id: Iacd186b2c466cba84248ae10589ffbb5a9cec0ba

 nova/api/openstack/extensions.py          |    3 +-
 nova/notifier/list_notifier.py            |    1 -
 nova/openstack/common/exception.py        |  147 -----------------------------
 nova/openstack/common/importutils.py      |    7 +-
 nova/scheduler/filter_scheduler.py        |    3 +-
 nova/tests/scheduler/test_host_filters.py |    3 +-
 openstack-common.conf                     |    2 +-
 7 files changed, 7 insertions(+), 159 deletions(-)

commit 718a3f057cee0b1163c40fbcbedda29bd2ef9dfe
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Apr 30 12:59:21 2012 -0400

    Provide better quota error messages.
    
    Refactor the handling of QuotaErrors.
    
    Fixes bug: 990015
    Fixes bug: 991994
    
    Change-Id: I722545fad3c0bdff896a8f56f6c53ba47e433b0c

 .../openstack/compute/contrib/flavorextraspecs.py  |   14 +-
 nova/api/openstack/compute/contrib/volumetypes.py  |    6 -
 nova/api/openstack/compute/server_metadata.py      |   23 +--
 nova/api/openstack/compute/servers.py              |   33 +---
 nova/compute/api.py                                |   27 ++--
 nova/exception.py                                  |   29 ++++
 .../api/openstack/compute/test_server_metadata.py  |   75 ++++++++-
 nova/tests/api/openstack/compute/test_servers.py   |  165 ++++++++++++++++++--
 nova/volume/api.py                                 |    2 +-
 9 files changed, 283 insertions(+), 91 deletions(-)

commit a7e4fd35862e6f515c4384a37afdad5dd730c51a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 2 12:14:56 2012 -0400

    Make kombu support optional for running unit tests.
    
    Fix bug 838386.
    
    Previously, the unit tests required kombu to be installed to run.  This
    patch makes it so the unit tests will still complete successfully, even
    if kombu is not installed.
    
    Change-Id: I06831a37f8c857bbfd0bce1b1c3aeda7d341a589

 nova/tests/rpc/common.py         |   41 ++++++++++++++++++++++++++++++++------
 nova/tests/rpc/test_kombu.py     |   30 ++++++++++++++++++++++++----
 nova/tests/rpc/test_kombu_ssl.py |   23 ++++++++++++++-------
 3 files changed, 77 insertions(+), 17 deletions(-)

commit 994bba6ae7156a565bd160fc8f0f8e8578c28d1b
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 1 18:29:04 2012 -0400

    Fix nova.tests.test_nova_rootwrap on Fedora 17.
    
    Fix bug 992916
    
    This patch resolves a unit test failure on Fedora 17.  The root cause is
    that 'sleep' is '/usr/bin/sleep' instead of '/bin/sleep'.  Update the
    test to allow that.
    
    Change-Id: I5c8e04baec7159a8c10c9beb96cff58fd383e71c

 nova/tests/test_nova_rootwrap.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4c4f0b705fb3dbe828b724b2b0e534ee58fd836c
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed May 2 11:47:59 2012 +0200

    Xen has to create it's own tap device if using libvirt and QuantumLinuxBridgeVIFDriver
    
    fixes bug 993151
    
    Change-Id: Ibc9c8c7a1e8601d596ace9906c7723f4671029fa

 nova/virt/libvirt/vif.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 351e540dbd62fae172da4a1acd9b2fd79ddf1fbc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 1 15:30:46 2012 -0700

    Fix test_migrations to work with python 2.6
    
     * removes use of unittest.skip decorator
     * moves some methods
     * makes test_migrations use our test base class
    
    Change-Id: I20d6e5c331ed77486977dcc190e2aed50c23461b

 nova/tests/test_migrations.py |   81 +++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

commit 3a143681437418dfc12d1417dce81f95cca5b14e
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue May 1 13:54:00 2012 -0700

    Update api-paste.ini to remove unused settings
    
    service_* flags are not used by the new (keystone light) auth_token keystone middleware
    
    Change-Id: Ie89f857325adb6e73434faf909706bc872d1edcf

 etc/nova/api-paste.ini |    3 ---
 1 file changed, 3 deletions(-)

commit f41f14f1e92ec9722d96f2f699dde060cd3980a3
Merge: 7b664b1 ec2dbf0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 20:31:57 2012 +0000

    Merge "Fix test_launcher_app to ensure service actually got started"

commit 7b664b14f02b8b0c7008e294ea6309d6afa8aed7
Merge: a4ecf32 2c3b654
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 18:47:54 2012 +0000

    Merge "Remove hack for xenapi driver tests"

commit ec2dbf02ddf223d06495c6e2264b0c142e599604
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 1 18:32:32 2012 +0000

    Fix test_launcher_app to ensure service actually got started
    
    The test was not allowing the new spawned thread to execute before
    (incorrectly) checking if the port had been assigned.
    
    Change-Id: Ibc5c6eb7ecd78d3f8bbf934346c7b91ea6369d34

 nova/tests/test_service.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit a4ecf32772feea52b89c7bca3d9299b46e02ac41
Merge: 19e03e9 b25752b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 18:27:05 2012 +0000

    Merge "Return a BadRequest on bad flavors param values."

commit 4a261ce583f9ad7970468b5ec42ec2edc07c5efd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 1 14:24:25 2012 -0400

    Minor refactor of servers viewbuider.
    
    No need to construct the flavor link if we don't use it.
    
    Change-Id: I6a06f865de71db1d99cd0fba43a27b753f3f50a4

 nova/api/openstack/compute/views/servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 19e03e95d354c55df4b9c37712ffc4c56b561826
Merge: 6ba7047 995235a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 18:07:51 2012 +0000

    Merge "A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process. This configures the instance audit usage to configure the RPC drivers properly with FLAGS so that the job can run."

commit 6ba704730e7c0a04cf49c154334bf11a7c066789
Merge: e6b1370 f28dcaa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 17:50:17 2012 +0000

    Merge "Enable InnoDB checking"

commit 995235ac26585b5160bd0ab10cfb5db3fda8310e
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Tue May 1 17:36:46 2012 +0000

    A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process.
    This configures the instance audit usage to configure the RPC drivers properly with FLAGS so that the job can run.
    
    Change-Id: Ia189d18d7b25a839de67439ccd363103c5af2f8f

 bin/instance-usage-audit |    2 ++
 1 file changed, 2 insertions(+)

commit 21352eeb0c557b6c71271cdd9b302c6330e34939
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 1 10:32:18 2012 -0700

    Allow blank passwords in changePassword action
    
    * Fixes bug 992661
    
    Change-Id: Ia07e27586719e231f5ef99f4b25b8d9ba6e7f6ca

 nova/api/openstack/compute/servers.py              |    4 ++--
 .../api/openstack/compute/test_server_actions.py   |   21 +++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

commit ac21815ecb977840e90cee807fac7992d060c643
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 1 08:19:02 2012 -0700

    Allow blank adminPass on server create
    
    * Fixes bug 992648
    
    Change-Id: Ib796904b3155300a178e37d129e398817c8747d6

 nova/api/openstack/compute/servers.py            |   17 +++++++++++------
 nova/tests/api/openstack/compute/test_servers.py |    7 ++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

commit b25752b2e742e4bcf872c0dfb9ca59f3e5d51ae9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 1 13:08:10 2012 -0400

    Return a BadRequest on bad flavors param values.
    
    This changes the api to return a 400 bad request when a minRam or minDisk param with a non-integer value is provided when listing flavors.
    
    Fixes bug 992662
    
    Change-Id: I78bd32d0cde842547cb96767e4eb41f546aedbdf

 nova/api/openstack/compute/flavors.py            |    6 +-
 nova/tests/api/openstack/compute/test_flavors.py |  112 +++-------------------
 2 files changed, 18 insertions(+), 100 deletions(-)

commit e6b1370d823cdcdb5201152010f0bb27e424b2d3
Merge: bd17bfb e3515df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 16:18:13 2012 +0000

    Merge "Create name_label local variable for logging message"

commit 08403e5be89122c3d0e20a59f7f7f68d6377a5fa
Author: Peng Yong <ppyy@pubyun.com>
Date:   Tue May 1 23:21:47 2012 +0800

    adjust logging levels for utils.py
    
    Change-Id: I6547d61a32bcd8518aa350eb8fad833a1612b692

 nova/utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bd17bfbbfeb741affd73d6a7f7a1018cb32db1a0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 1 11:04:17 2012 -0400

    Update integration tests to listen on 127.0.0.1
    
    Currently tests are listening on 0.0.0.0 which causes tests to
    unnecessarily listen on all IPs.
    
    Change-Id: Iaad79bd449e61e0639b153d81205a0e666bc29df

 nova/tests/integrated/integrated_helpers.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 03a331cdfe492cb7a9d531021b444384a27bdd56
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:36:24 2012 +1000

    Log instance consistently.
    
    Change-Id: Icd0d5021de768ab16b1b766f27ed03df61546239

 nova/virt/firewall.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit e3515dfe75cd980b7649b059eaa27c4871b6ddfd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 1 05:15:27 2012 +0000

    Create name_label local variable for logging message
    
    The missing local variable will end up logging an exception instead of
    the intended message, however the code will continue functioning fine.
    
    Traceback (most recent call last):
      File "/usr/lib/python2.6/logging/__init__.py", line 776, in emit
        msg = self.format(record)
      File "/usr/lib/python2.6/logging/__init__.py", line 654, in format
        return fmt.format(record)
      File "/home/johannes/openstack/nova/trunk/nova/log.py", line 257, in format
        return logging.Formatter.format(self, record)
      File "/usr/lib/python2.6/logging/__init__.py", line 436, in format
        record.message = record.getMessage()
      File "/usr/lib/python2.6/logging/__init__.py", line 306, in getMessage
        msg = msg % self.args
    KeyError: u'name_label'
    
    Change-Id: I80bd91a8df51d5411e63ba6a44f227251baf2ab2

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2c3b654879a32601f216c27f1e6c5596f73281d4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 1 04:10:15 2012 +0000

    Remove hack for xenapi driver tests
    
    Various changes since the hack was introduced make removing it much
    easier now.
    
    Change-Id: I3237e94e034a1a1011ce4e4307ace8ea2e6432f0

 nova/tests/xenapi/stubs.py   |    4 ++++
 nova/virt/xenapi/vm_utils.py |    6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit fb58a57af6c9e88cc1696378fbd4bb72307bcbcb
Merge: 3105b28 3d28e3d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 02:22:54 2012 +0000

    Merge "Make KillFilter to handle 'deleted' w/o rstrip."

commit 3105b28e6481afe61dfef43bd1237e75bfb7b26b
Merge: dda0360 93bf1a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 02:11:46 2012 +0000

    Merge "Remove workaround for sqlalchemy-migration < 0.6.4"

commit dda036044e2ddb249aef8d483269bcbf97141abd
Merge: 2c72cb3 58af96d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 22:23:11 2012 +0000

    Merge "Migrate block_device_mapping to use instance uuids."

commit 2c72cb3bcee6b64fff6e3eaa738e4bc80828a830
Merge: 207a0a6 fd6b21b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 22:14:16 2012 +0000

    Merge "Removes RST documentation and moves it to openstack-manuals"

commit 207a0a6f71d3f86b9c79d11936e7a2e7ed0a5405
Merge: 7b16b36 7a5c505
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 22:05:14 2012 +0000

    Merge "Clean up ElementTree usage"

commit 7b16b366963c2b45c2271a985815a3eeb4ebe33c
Merge: 9c1e5e5 5f2eab3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 21:56:26 2012 +0000

    Merge "Fix InnoDB migration bug in migrate script 86."

commit 9c1e5e5d8f766b08f407c71afb1ab819f43d5da4
Merge: 89be028 7593a69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 21:47:16 2012 +0000

    Merge "Use openstack.common.importutils."

commit 89be02810fd02497beaf8541b35345c31c03bde0
Merge: 62bcf37 15c0847
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 21:18:34 2012 +0000

    Merge "Port types and extra specs to volume api"

commit 58af96d3e01c7fbe993344374190d8afe1a1d0ff
Author: Michael Still <mikal@stillhq.com>
Date:   Sun Apr 8 11:50:12 2012 +1000

    Migrate block_device_mapping to use instance uuids.
    
    This started out as wanting cleanup_volumes to take a UUID instead
    of an instance ID, and ended up as a wander through the joys of
    schema updates. I am assuming that we actually want to transition
    these tables across to using the instance UUID instead of just the
    ID.
    
    This is my first attempt at a schema update, so please review this
    patch with skepticism. Resolves bug 977975. Partially resolves
    blueprint finish-uuid-conversion.
    
    Change-Id: Ib5a6f8a872ea0530e201c70e9ac01cd14f82c557

 nova/api/ec2/cloud.py                              |    8 +-
 nova/api/metadata/handler.py                       |    2 +-
 nova/compute/api.py                                |   17 ++--
 nova/compute/manager.py                            |   50 +++++-----
 nova/db/api.py                                     |    9 +-
 nova/db/sqlalchemy/api.py                          |   14 +--
 ..._instance_id_to_uuid_in_block_device_mapping.py |   81 ++++++++++++++++
 .../migrate_repo/versions/088_sqlite_downgrade.sql |   97 ++++++++++++++++++++
 .../migrate_repo/versions/088_sqlite_upgrade.sql   |   97 ++++++++++++++++++++
 nova/db/sqlalchemy/migration.py                    |    5 +
 nova/db/sqlalchemy/models.py                       |   10 +-
 nova/tests/api/ec2/test_cloud.py                   |   32 ++++---
 nova/tests/api/ec2/test_ec2_validate.py            |    2 +-
 nova/tests/test_compute.py                         |   35 +++----
 nova/tests/test_metadata.py                        |   33 ++++---
 15 files changed, 390 insertions(+), 102 deletions(-)

commit 62bcf379597c15606fca6a0255dc731a048a5029
Merge: 4513e75 689c931
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 20:32:17 2012 +0000

    Merge "Keep uuid with bandwidth usage tracking to handle the case where a MAC address could be recycled between instances."

commit 4513e75031bb2fab239cc065fb0ed4d4918e5a77
Merge: c1b664f 8a29400
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 20:15:37 2012 +0000

    Merge "Remove unnecessary return statements"

commit c1b664fd16e8c258eff7e983f6f8b7e00445eeb4
Merge: e41056f 8327425
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 20:01:39 2012 +0000

    Merge "Minor spelling fix"

commit e41056fc8720f0f38076e3ac6d1679ff96bd22f5
Merge: 1c127f7 2b3a1e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 19:54:01 2012 +0000

    Merge "support a configurable libvirt injection partition"

commit 8a2940052134db8ef0700597e121c3c9c43d9bd5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Apr 30 19:39:14 2012 +0000

    Remove unnecessary return statements
    
    If they're at the end of a function/method and don't return a value,
    then it's superfluous
    
    Change-Id: Ibd8d43a15ee83cf51c5b7cea0b1cb6ea13d1357d

 nova/rpc/amqp.py                |    1 -
 nova/tests/test_api.py          |    4 ----
 nova/tests/test_netapp.py       |    2 --
 nova/virt/libvirt/connection.py |    2 --
 4 files changed, 9 deletions(-)

commit 7a5c505a3bc22a1542791b6f32ceaf0f0ec17a63
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Apr 30 13:52:37 2012 -0400

    Clean up ElementTree usage
    
    Use lxml in favor of ElementTree to
    make things more consistent.
    
    Fixes LP: #953449
    
    Change-Id: I7f48528d7df47fe7207ca88bce196dea7535df0e
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/image/s3.py                      |    4 ++--
 nova/tests/api/ec2/test_middleware.py |    5 ++---
 nova/tests/fakelibvirt.py             |   21 ++++++++-------------
 nova/tests/test_fakelibvirt.py        |   10 +++++-----
 nova/tests/test_libvirt.py            |   20 ++++++++++----------
 nova/tests/test_libvirt_vif.py        |   14 +++++++-------
 nova/virt/libvirt/connection.py       |   25 ++++++++++++-------------
 nova/volume/san.py                    |    9 +++++----
 8 files changed, 51 insertions(+), 57 deletions(-)

commit 1c127f79c3331bc74b0b74c4eade87be695a8828
Merge: 8fe6eda 8577aeb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 18:54:52 2012 +0000

    Merge "Adds better bookending and robustness around the instance audit usage generation"

commit 8fe6eda0b0d240f600f4c066d9cc3a136edffe34
Merge: 9d7666e 8af5639
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 18:43:24 2012 +0000

    Merge "Pass instance to resize_disk() to fix exception"

commit 9d7666e798b30f2f18020f1b49b1a724626a61f6
Merge: 6886dee ae0f5db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 18:22:08 2012 +0000

    Merge "Add libvirt get_console_output tests: pty and file"

commit 6886dee48aa23583721ca67ad88c88f1d3ac7229
Merge: ca50cf4 190b4e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 18:11:03 2012 +0000

    Merge "Ignore common code in coverage calculations."

commit 8577aeb12819fe188a3a2773f9610e07b5683df0
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Mon Apr 30 18:01:49 2012 +0000

    Adds better bookending and robustness around the instance audit usage generation
    
    Change-Id: Ib5f68ea0b8d4ed866b5dade268e63cf99241ce4b

 bin/instance-usage-audit |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 8af5639cbb4d9d1c7732a644329d5c6853a87981
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Apr 30 17:58:50 2012 +0000

    Pass instance to resize_disk() to fix exception
    
    Fixes bug 992098
    
    Change-Id: I844e153c2c7cb8ed4da6a4967537dd294377763c

 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 83274252adbfd70e055d80c0128342e16b59d5c4
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Apr 30 10:59:52 2012 -0700

    Minor spelling fix
    
    Change-Id: Icf0a677f0c2ff826db6d2239ab953bc7d1824400

 nova/scheduler/filters/availability_zone_filter.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd6b21b9483f8f49d38b2278720cfb32e1ff30c4
Author: annegentle <anne@openstack.org>
Date:   Mon Apr 30 12:45:10 2012 -0500

    Removes RST documentation and moves it to openstack-manuals
    
    Avoiding redundant information and confusion.
    
    Change-Id: Iab1913ff359699db977b74554bad6088fab6ab2f

 doc/source/api_ext/ext_aggregates.rst          |  123 -----------
 doc/source/api_ext/ext_config_drive.rst        |  227 --------------------
 doc/source/api_ext/ext_floating_ip_dns.rst     |  203 ------------------
 doc/source/api_ext/ext_floating_ips.rst        |  165 ---------------
 doc/source/api_ext/ext_keypairs.rst            |  103 ---------
 doc/source/api_ext/ext_multinic.rst            |  111 ----------
 doc/source/api_ext/ext_quotas.rst              |  100 ---------
 doc/source/api_ext/ext_rescue.rst              |  111 ----------
 doc/source/api_ext/ext_security_group.rst      |  112 ----------
 doc/source/api_ext/ext_virtual_interfaces.rst  |  110 ----------
 doc/source/api_ext/ext_volumes.rst             |  112 ----------
 doc/source/api_ext/index.rst                   |   56 -----
 doc/source/api_ext/rst_extension_template.rst  |  105 ---------
 doc/source/cloud101.rst                        |   90 --------
 doc/source/community.rst                       |  103 ---------
 doc/source/index.rst                           |   32 +--
 doc/source/installer.rst                       |   12 --
 doc/source/nova.concepts.rst                   |  231 --------------------
 doc/source/object.model.rst                    |   77 -------
 doc/source/quickstart.rst                      |   31 ---
 doc/source/runnova/binaries.rst                |   57 -----
 doc/source/runnova/euca2ools.rst               |   49 -----
 doc/source/runnova/flags.rst                   |   36 ----
 doc/source/runnova/index.rst                   |   96 ---------
 doc/source/runnova/managing.images.rst         |   26 ---
 doc/source/runnova/managing.instance.types.rst |   86 --------
 doc/source/runnova/managing.instances.rst      |   59 ------
 doc/source/runnova/managing.networks.rst       |   92 --------
 doc/source/runnova/managing.projects.rst       |   77 -------
 doc/source/runnova/managing.users.rst          |   82 -------
 doc/source/runnova/managingsecurity.rst        |   37 ----
 doc/source/runnova/monitoring.rst              |   27 ---
 doc/source/runnova/network.flat.rst            |   60 ------
 doc/source/runnova/network.vlan.rst            |  176 ---------------
 doc/source/runnova/nova.manage.rst             |  263 -----------------------
 doc/source/runnova/vncconsole.rst              |  271 ------------------------
 doc/source/service.architecture.rst            |   77 -------
 doc/source/vmwareapi_readme.rst                |  226 --------------------
 38 files changed, 6 insertions(+), 4005 deletions(-)

commit ca50cf405a7aefc79b7ae6cb707dcbdec5cc5593
Merge: 0604675 97f0f80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 16:08:59 2012 +0000

    Merge "Trivial spelling fix"

commit 0604675cdca3679bcf867296258f137542da6c5c
Merge: ba11ef1 4374a18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 16:00:41 2012 +0000

    Merge "Remove unnecessary references to resize_confirm_window flag"

commit 97f0f80adac4ef0e099f867c6ab0c635fd28676f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Apr 30 15:38:59 2012 +0000

    Trivial spelling fix
    
    Change-Id: Ib5ba181886a073742ace4a8927061f5d4dcd0773

 tools/xenserver/vm_vdi_cleaner.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba11ef122fd548eb4d4c39f4ccee489aa5a100f6
Merge: 76bb37e b33eb7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 30 14:28:14 2012 +0000

    Merge "Implements EC2 DescribeAddresses by specific PublicIp."

commit 93bf1a0a6e4e017d221afde32679fb4f1d6aa00f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Apr 30 11:35:40 2012 +0100

    Remove workaround for sqlalchemy-migration < 0.6.4
    
    We now require >=0.7.2
    
    Change-Id: I07101a77e9f332c426eeabc74f9619827ce087e6

 nova/db/sqlalchemy/migration.py |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 4374a180dd2f40a0aae016dc07cee7fa761792b3
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Apr 30 11:28:28 2012 +0100

    Remove unnecessary references to resize_confirm_window flag
    
    The value of the resize_confirm_window flag is passed into the
    poll_unconfirmed_resizes() method so there is no need to reference
    FLAGS.resize_confirm_window directly for logging.
    
    Change-Id: Ia9729cda4bf4408c2f5fce19709e9bdb474ad721

 nova/tests/test_xenapi.py       |    2 +-
 nova/virt/libvirt/connection.py |    9 ++++-----
 nova/virt/xenapi/vmops.py       |   10 ++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

commit 5f2eab36345b2e2ac5ca72843c7dc69d35c106da
Author: Russell Sim <russell.sim@gmail.com>
Date:   Mon Apr 30 14:48:15 2012 +1000

    Fix InnoDB migration bug in migrate script 86.
    
    Fixes bug 991672
    
    Only change tables that aren't already InnoDB.  Attempting to migrate
    an InnoDB table to InnoDB will causes an obscure "Error on rename"
    error if the table has foreign key relationships.
    
    Change-Id: I7bd5c964da851a8dd9cc0a6af3f93c07786b6781

 .../versions/086_set_engine_mysql_innodb.py        |   38 ++++++++------------
 1 file changed, 15 insertions(+), 23 deletions(-)

commit 7593a6948c43c907893bfba5fff65a6b5acf5c2d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Apr 27 14:14:18 2012 -0400

    Use openstack.common.importutils.
    
    Use import_class(), import_object(), and import_module() from
    openstack-common's importutils module.  The equivalent functions have
    been removed from nova.utils.  A few modules had import order cleaned up
    in passing, as well.
    
    My initial motivation for this was to remove some more usage of nova
    bits from nova.rpc as another step towards being able to move nova.rpc
    import openstack-common.  Since I was pulling importutils into nova, I
    went ahead and converted the whole thing.
    
    Change-Id: I7c7786cf0001bcd06db52b9a99ff4284a3f6c6fa

 bin/nova-dhcpbridge                                |    7 +-
 bin/nova-manage                                    |   13 +-
 nova/api/ec2/__init__.py                           |    3 +-
 nova/api/ec2/cloud.py                              |    3 +-
 nova/api/manager.py                                |    4 +-
 nova/api/openstack/auth.py                         |    3 +-
 .../openstack/compute/contrib/security_groups.py   |    5 +-
 nova/api/openstack/compute/limits.py               |    4 +-
 nova/api/openstack/extensions.py                   |    9 +-
 nova/auth/manager.py                               |    5 +-
 nova/compute/__init__.py                           |    5 +-
 nova/compute/manager.py                            |    9 +-
 nova/console/manager.py                            |    3 +-
 nova/console/vmrc_manager.py                       |    4 +-
 nova/db/base.py                                    |    4 +-
 nova/image/__init__.py                             |    4 +-
 nova/image/glance.py                               |    3 +-
 nova/network/__init__.py                           |    4 +-
 nova/network/linux_net.py                          |    4 +-
 nova/network/manager.py                            |   13 +-
 nova/notifier/api.py                               |    3 +-
 nova/notifier/list_notifier.py                     |    8 +-
 nova/openstack/common/exception.py                 |  147 ++++++++++++++++++++
 nova/openstack/common/importutils.py               |   45 ++++++
 nova/rpc/__init__.py                               |    4 +-
 nova/rpc/common.py                                 |    4 +-
 nova/scheduler/driver.py                           |    3 +-
 nova/scheduler/filter_scheduler.py                 |    7 +-
 nova/scheduler/filters/__init__.py                 |    6 +-
 nova/scheduler/manager.py                          |    3 +-
 nova/scheduler/multi.py                            |    8 +-
 nova/service.py                                    |    5 +-
 nova/tests/api/ec2/test_ec2_validate.py            |    4 +-
 .../api/openstack/compute/test_server_actions.py   |    3 +-
 nova/tests/network/test_manager.py                 |   17 +--
 nova/tests/scheduler/test_host_filters.py          |    3 +-
 nova/tests/test_compute.py                         |    3 +-
 nova/tests/test_compute_utils.py                   |    3 +-
 nova/tests/test_console.py                         |    4 +-
 nova/tests/test_consoleauth.py                     |    5 +-
 nova/tests/test_libvirt.py                         |   35 ++---
 nova/tests/test_linux_net.py                       |    3 +-
 nova/tests/test_volume.py                          |    8 +-
 nova/tests/test_xenapi.py                          |    6 +-
 nova/utils.py                                      |   28 +---
 nova/virt/libvirt/connection.py                    |    7 +-
 nova/virt/vmwareapi/vmops.py                       |    4 +-
 nova/virt/xenapi/vmops.py                          |    5 +-
 nova/volume/__init__.py                            |    5 +-
 nova/volume/manager.py                             |    3 +-
 openstack-common.conf                              |    2 +-
 51 files changed, 354 insertions(+), 146 deletions(-)

commit 190b4e27c805b9b15da89141b2a8acd70b94ec42
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat Apr 28 22:01:56 2012 -0400

    Ignore common code in coverage calculations.
    
    Ignore nova/openstack/common code when calculating coverage.
    
    We do this because the unit tests for the common code are in a
    different repository.
    
    Change-Id: I0103b8acfc4cdaace68a18b1d1723a13595debe2

 run_tests.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2511f01f42c7cc57bd17ad06f239723bd19ed1de
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Sun Apr 29 00:43:11 2012 +0000

    Use additional task states during resize
    
    Fixes bug lp990805
    
    Adds 3 additional state changes to instance during resize. Specifially:
    RESIZE_MIGRATING
    RESIZE_MIGRATED
    RESIZE_FINISH
    
    Change-Id: I61a1c98c8b179c50747717525e1aaed01d372b4b

 nova/compute/manager.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 76bb37e049818cbde4ca890566d01e85439ce517
Merge: 33ab99a 98b8001
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 28 12:10:18 2012 +0000

    Merge "Make rebuilds with an emtpy name raise BadRequest."

commit 33ab99a1af28f731eb75b32d93c772fedb8ca2b0
Merge: f8343bb f2d0d29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 28 11:54:50 2012 +0000

    Merge "Fix timeout in EC2 CloudController.create_image()"

commit ae0f5db3d784ed1f36fa5915bb7e50160bf3a591
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 27 21:40:02 2012 -0400

    Add libvirt get_console_output tests: pty and file
    
    Add two new libvirt tests for the get_console_output:
     - test_get_console_output_pty
     - test_get_console_output_file
    
    Fixes LP Bug #990237.
    
    Change-Id: I308862c131c4c9c9c4accab1822039f8f5a775b4

 nova/tests/test_libvirt.py      |   82 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)

commit 689c93135de37abe9df5c5ab71f903f43d8c1216
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Fri Apr 27 21:04:08 2012 +0000

    Keep uuid with bandwidth usage tracking to handle the case where a MAC address could be recycled between instances.
    
    Change-Id: Ibea25c2b7fcb13777ab35fdc47dd6e8178bf9e57

 nova/compute/manager.py                            |    8 +--
 nova/compute/utils.py                              |    9 ++--
 nova/db/api.py                                     |    8 +--
 nova/db/sqlalchemy/api.py                          |    8 +--
 .../versions/087_add_uuid_to_bw_usage_cache.py     |   56 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/tests/test_compute_utils.py                   |    2 +-
 nova/tests/test_xenapi.py                          |    8 ++-
 nova/virt/driver.py                                |    2 +-
 nova/virt/xenapi/connection.py                     |   29 +++++++---
 10 files changed, 109 insertions(+), 22 deletions(-)

commit f8343bb3c2592404197c0d56fc987fd8b779a307
Merge: cd57400 090bef6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 20:48:27 2012 +0000

    Merge "Do not allow blank adminPass attribute on set password"

commit cd57400a21cabb3c10bb02184145fe4704859be2
Merge: f041ada 7988fd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 19:16:50 2012 +0000

    Merge "Fix instance delete notifications."

commit f041adaeaec7e746c9b78ae79bc196dfb80d8bfd
Merge: 19209a3 79548eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 17:04:22 2012 +0000

    Merge "Added the validation for name check for rebuild of a server"

commit 19209a3307afbffbefce207e0cf8f46863e9a2a0
Merge: a2249f1 df4c02f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 16:39:15 2012 +0000

    Merge "Disconnect stale instance VDIs when starting nova-compute"

commit 79548ebc7786d8d9d5405fcc5b0be4abb5f5d5c0
Author: Nikhil Komawar <nikhil.komawar@rackspace.com>
Date:   Thu Apr 26 16:55:31 2012 +0000

    Added the validation for name check for rebuild of a server
    
    Fixes bug 973591
    
    Change-Id: I3fad8f92dc7aa9ec319fdfb8d1c8df247b84157d

 nova/api/openstack/compute/servers.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a2249f187caed7c97934cea6fce50ae5360bd0aa
Merge: 8972e95 bd30eb3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 16:14:26 2012 +0000

    Merge "Add additional capabilities for computes"

commit 3d28e3d3f9cc755389c933e86b9be1edf8ba1dc3
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 27 09:36:34 2012 -0400

    Make KillFilter to handle 'deleted' w/o rstrip.
    
    The initial code for this fixed used rstrip incorrectly.
    This implementation uses endswith and rindex instead
    and should read a bit more easily.
    
    Also added a unit test to test that 'deleted' exe's are
    filtered correctly.
    
    Fixes LP Bug #967931.
    
    Change-Id: I1783a8e2d59edd35734673b23e295f5a0b80b988

 nova/rootwrap/filters.py         |    3 ++-
 nova/tests/test_nova_rootwrap.py |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

commit 7988fd139865b5399be58aea75b07436dc7c2f21
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Apr 27 01:14:46 2012 +0000

    Fix instance delete notifications.
    
    Remove extra exists event horking uptime calculations.
    Fix broken deleted_at time in notifications (was blank due to being
    pulled from the wrong field on the instance)
    
    Change-Id: I8ca05593031f03c284c17df9d6fca64b22b16baf

 nova/compute/manager.py    |    5 +----
 nova/compute/utils.py      |    5 ++++-
 nova/tests/test_compute.py |   22 +++++++++++++---------
 3 files changed, 18 insertions(+), 14 deletions(-)

commit df4c02f6303809e1c2627555c1ee18fff8efc3cc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 26 23:25:42 2012 +0000

    Disconnect stale instance VDIs when starting nova-compute
    
    Fixes bug 989306
    
    If nova-compute is killed, or the compute domU is shutdown uncleanly,
    instance VDIs can remain attached to the compute domU. This complicates
    cleaning up unused VDIs, but can also result in reaching a limit on
    the number of VBDs for the compute domU, preventing new instances
    from being built.
    
    Change-Id: Ie56e0561aa02178d6718b74a87bbb591fa869007

 nova/tests/test_xenapi.py      |   17 ++++++++++++++++
 nova/tests/xenapi/stubs.py     |    8 +++-----
 nova/virt/xenapi/connection.py |   10 +++++-----
 nova/virt/xenapi/fake.py       |   43 ++++++++++++++++++++++------------------
 nova/virt/xenapi/vm_utils.py   |   38 +++++++++++++++++++++++++++--------
 5 files changed, 79 insertions(+), 37 deletions(-)

commit 8972e9544dead61c198037f24eecf0f04558a914
Merge: 5491507 0b11668
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 14:42:01 2012 +0000

    Merge "Refactor nova.rpc config handling."

commit f2d0d2926961a0758c071ae6e4743260a837b7c4
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Fri Apr 27 15:11:57 2012 +0100

    Fix timeout in EC2 CloudController.create_image()
    
    Fixes bug 989764
    
    The timeout bounding the wait for the instance to stop is intended
    to be 1 hour, but the code incorrectly specifies 60 hours instead
    (no practical client is going to wait that long for a response).
    
    Change-Id: I7aa4b539393df15f3b2c950cf7aeca4691ed3d73

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5491507f30fd292abee14a9888c87d8090c67a97
Merge: 4cde26d c94011f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 09:13:05 2012 +0000

    Merge "Add instance to several log messages."

commit bd30eb36bbf2c5164ac47256355c543f6b77e064
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Apr 24 12:39:15 2012 +0000

    Add additional capabilities for computes
    
    This allows compute hosts to advertise additional capabilities
    for use by custom schedulers. This is an interim solution to
    provide this functionality until it is replaced by more general
    HostAggregate functionality later in Folsom.
    
    Change-Id: Ia288146fa92aec61f50641c2e4f7a3580ab03a32

 nova/compute/manager.py    |   30 +++++++++++++++++++++++++++---
 nova/tests/test_compute.py |   31 +++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

commit 0aee8864f19334211e2c52af9cf62e7fd3eecd1f
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 19 02:27:56 2012 +1000

    Move image checksums into a generic file.
    
    This will allow us to store other information about an image on a
    single compute node. This is required for prefetching to be
    implemented.
    
    Change-Id: Ic65b04cc1ef2101a1ac588595b943b813abdd50d

 nova/tests/test_imagecache.py   |  201 +++++++++++++++++++++++++++++----------
 nova/virt/libvirt/imagecache.py |   73 +++-----------
 nova/virt/libvirt/utils.py      |   98 +++++++++++++++++++
 3 files changed, 262 insertions(+), 110 deletions(-)

commit 4cde26d516cade49317724fbb79104165f5a1a2c
Merge: 0935a2a 33617ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 02:48:48 2012 +0000

    Merge "Add a force_config_drive flag"

commit 0935a2a6a7c8e921711235bc41878d3662e846a8
Merge: 7c4434f 181744d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 02:39:40 2012 +0000

    Merge "Make the filename that image hashes are written to configurable."

commit 7c4434f8f86929915a354c8031d24aabf856c501
Merge: 9978dcb 1bee4db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 02:09:50 2012 +0000

    Merge "Fixes bug 989271, fixes launched_at date on notifications."

commit c94011fba47277a88d7eb8dd33b11db66f6ac0d4
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 11:40:28 2012 +1000

    Add instance to several log messages.
    
    Change-Id: I6e073effc628b1192c5289de224b3c36e61fdf39

 nova/api/openstack/compute/contrib/volumes.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9978dcb90570b330fe32aa4f0ef6d9eb7b1c47e6
Merge: 6dbb014 60b1154
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 00:04:38 2012 +0000

    Merge "Imports to human alphabetical order"

commit 6dbb01419e34aaac58bb7582b65ad44fd58a9068
Merge: c98c9f8 ff19fd4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 23:38:21 2012 +0000

    Merge "make all mysql tables explicitly innodb"

commit 60b1154b141601c018e91f39f356592086b6e62e
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Apr 26 15:20:43 2012 -0700

    Imports to human alphabetical order
    
    Problems identified by enabling N306 in run_tests.sh
    
    Change-Id: Ifddfe58da020dd041bcbbf5f14941514a09f61c1

 bin/nova-all                                  |    2 +-
 bin/nova-consoleauth                          |    2 +-
 bin/nova-dhcpbridge                           |    2 +-
 bin/nova-objectstore                          |    2 +-
 nova/scheduler/multi.py                       |    2 +-
 nova/scheduler/simple.py                      |    4 ++--
 nova/tests/api/ec2/test_faults.py             |    2 +-
 nova/tests/scheduler/fakes.py                 |    2 +-
 nova/tests/scheduler/test_chance_scheduler.py |    2 +-
 nova/tests/scheduler/test_filter_scheduler.py |    4 ++--
 nova/virt/driver.py                           |    2 +-
 tools/clean_file_locks.py                     |    2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

commit c98c9f8ddbf002e80870fceefb0d110500b1bdc5
Merge: bfb57fe cc05a8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 22:38:24 2012 +0000

    Merge "Fix 986922"

commit 1bee4db0e2bbe0067f811974b1b24e83a7f1af6b
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Apr 26 22:22:53 2012 +0000

    Fixes bug 989271, fixes launched_at date on notifications.
    
    Also adds unittests to prevent regression of bug 984219,
    and adds missing backstop compute.instance.exists event.
    
    Change-Id: I77278009962ea7f7fb940704dbb7bba637aa8e96

 nova/compute/manager.py    |   26 +++++-----
 nova/tests/test_compute.py |  120 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+), 12 deletions(-)

commit bfb57fe267ab132ffd3dc19756e983b8d340251d
Merge: d42c424 6153f2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 20:09:12 2012 +0000

    Merge "Add instance logging to vmware_images.py"

commit f28dcaa183bdc2b3187a10c4c0b016657252ccc8
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Tue Apr 24 17:29:33 2012 -0400

    Enable InnoDB checking
    
    Addresses bug #978304
    
    Refactor _walk_versions for readability and pep8 compliance
    
    Change-Id: I94d17f2ec81a4115ae3ea3863c79b88462ceb835

 nova/tests/test_migrations.py |  156 +++++++++++++++++++++++++++++------------
 tools/test-requires           |    1 +
 2 files changed, 114 insertions(+), 43 deletions(-)

commit ff19fd40ea90da1b47bdaa26522f0a30ca18e73f
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Mon Apr 9 15:19:11 2012 -0400

    make all mysql tables explicitly innodb
    
    Fixes bug #972831
    
    Change-Id: I5692ea3a5c03e65ac8392ba9697dbb4dca285f9c

 .../versions/086_set_engine_mysql_innodb.py        |   52 ++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit d42c424cb957de7a506bf9ae353dcf870bb9cbd1
Merge: b75f5e7 2cea9b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 19:08:06 2012 +0000

    Merge "Disallow network creation when label > 255. Fixes bug 965008"

commit b75f5e7547a4bb4efdb409b4e6339e3b63973019
Merge: ffde6f9 589f3f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 18:58:58 2012 +0000

    Merge "Add instance to log messages."

commit ffde6f92635ea7a9fd3e4bc3ba793c5de07b8a8e
Merge: a564f67 72d0299
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 18:39:13 2012 +0000

    Merge "Introduced _atomic_restart_dhcp() Fixes Bug 977875"

commit a564f67ee7804838ea3999bb31ad31c37e7991ba
Merge: 9273199 6a4c092
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 18:12:28 2012 +0000

    Merge "Make updating hostId raises BadRequest."

commit 92731994a51f1779fb063d1f1f8d298f7c6a1651
Merge: 563872e b05d1d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 18:02:56 2012 +0000

    Merge "Use instance_get_by_uuid since we're looking up a UUID"

commit 563872e3e85490e71834a65574d1ad6ff339270f
Merge: 12ddc43 bc0c584
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 17:02:46 2012 +0000

    Merge "Add instance logging to vmops.py"

commit 12ddc43a246fc26d8bae3f0f0b36da8fa1c82709
Merge: 41dfaaa 0e79084
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 16:42:27 2012 +0000

    Merge "Log instance."

commit 41dfaaa84d94a497ccaef3d08276f08928baffd1
Merge: d4cd983 139c77c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 16:32:10 2012 +0000

    Merge "Log instance information for baremetal."

commit b05d1d8982c398353652f80e110c2ea11a14c0d6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 26 16:17:06 2012 +0000

    Use instance_get_by_uuid since we're looking up a UUID
    
    Change-Id: I60869ace0890dcef887a7984e41abd9cf16ea9e3

 tools/xenserver/vm_vdi_cleaner.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4cd9832b57a28a3a11926b93ce2f6b9e41103c0
Merge: 8a8f071 b00acbb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 16:01:53 2012 +0000

    Merge "Include instance in log message."

commit 8a8f0712af9d8b86a5fbc9c12cbf8d661a1e58b8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 26 15:18:35 2012 +0000

    Use nova_uuid attribute instead of trying to parse out name_label
    
    The name_label parsing code is out-of-date since key support was
    added to the format string, but it's not needed anymore since
    the internal uuid was added to other-config for a while now.
    
    Change-Id: I2902320ae7118e42cd3d18f2d6d0fab0fcbec687

 tools/xenserver/vm_vdi_cleaner.py |   74 ++-----------------------------------
 1 file changed, 3 insertions(+), 71 deletions(-)

commit 4a2132c0e00a948ba80fc9a99509cbc0a22d14c8
Merge: d89fe1d 467b76b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 15:15:58 2012 +0000

    Merge "Ensure all messages include instance."

commit d89fe1d5df2e99994fbacd6847042a5bc6fb52e5
Merge: 081cef2 cddd0cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 14:58:04 2012 +0000

    Merge "Log instance."

commit 081cef2ce5e490b713696675bc9487325a2b9cb8
Merge: caa1b28 f40c102
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 26 14:39:15 2012 +0000

    Merge "Include instance in log message."

commit 33617adb34e458e06de9498922d991f3c78e039a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Apr 25 16:30:37 2012 -0700

    Add a force_config_drive flag
    
    Config drive can currently only be requested via the API.  That
    doesn't play nice with horizon, and requires the caller to know
    what the image expects.
    
    Currently, only None or 'always' are documented (although any
    value is treated as 'always').  I expect we'll want 'never',
    'byimage' etc in future.
    
    Bug #988556
    
    Change-Id: I895a6a9fd3e6395bb00f54f26531b6faf0c9f4f1

 nova/virt/libvirt/connection.py |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit cc05a8defbb0d36ae6531acd2c5a9677c2f7ce97
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Apr 26 10:26:57 2012 -0400

    Fix 986922
    
    Fix typo in nova/network/manager.py
    
    Change-Id: I4fdb2f08a9d4ee8a1056267b50aa27c3201b4d7a
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8626ced188dbfc4d33a5d0bd74dfcd4ed18c4f4
Author: Dina Belova <dbelova@mirantis.com>
Date:   Mon Apr 23 16:37:06 2012 +0400

    Improvement for the correct query extraction.
    
    Change-Id: I6bf318dc42e9bc1cebb94a7d1c561b3e89ae6ec5

 nova/scheduler/filters/json_filter.py     |    5 ++++-
 nova/tests/scheduler/test_host_filters.py |   32 ++++++++++++++---------------
 2 files changed, 20 insertions(+), 17 deletions(-)

commit d901b44fea897a038ce9a8afa32751ab79ffa210
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Thu Apr 26 04:24:26 2012 -0700

    Fixes bug 983024
    
    enable_dhcp, kill_dhcp and update_dhcp calls are sent to remote
    nova-network, when a network is not associated with current host.
    
    Change-Id: If7c7c6e58700cc171a8f56669e6455037df7f7e7

 nova/network/quantum/manager.py |   46 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 6 deletions(-)

commit 6a4c092cb8d9bd2f99a29392bc3b5e566f858b52
Author: vaddi-kiran <vaddi_kiran@persistent.co.in>
Date:   Mon Apr 9 06:38:54 2012 -0400

    Make updating hostId raises BadRequest.
    
    fixes bug 944028
    
    Change-Id: I563f51dd7afea1d0a9c7391c9e641e7c8c493216

 Authors                               |    1 +
 nova/api/openstack/compute/servers.py |    4 ++++
 2 files changed, 5 insertions(+)

commit 2cea9b04139a0b64f1bda5b777c062e207d739f9
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Mon Apr 2 03:02:22 2012 -0700

    Disallow network creation when label > 255. Fixes bug 965008
    
    Added length check for label. Without length check,
    label is truncated. Warning is shown by sqlalchemy layer.
    
    Raise an InvalidInput exception when validation fails (like
    rest of the surroudning code)
    
    Change-Id: Iae517e03099e36f1c00f4742049834a9231a2fff

 Authors         |    1 -
 bin/nova-manage |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 72d0299d438b9bb25fba3fe4a2f5ade8544055ae
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Thu Apr 12 05:45:24 2012 -0700

    Introduced _atomic_restart_dhcp() Fixes Bug 977875
    
    Introduced a new method which executes update_dhcp_text_file
    and restart_dhcp as one atomic unit - to avoid race between these
    steps.
    
    Change-Id: I6fda9fbfcaf59fa6a4859b361574d98e16331882

 nova/network/quantum/manager.py |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit 181744d10a2e5b3f4bb33674c84fde5039e05396
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Apr 18 07:37:09 2012 +1000

    Make the filename that image hashes are written to configurable.
    
    This is a baby step towards storing more than just a checksum in
    these files. The specific use case is I need to store whether or
    not the image was prefetched in here as well.
    
    Change-Id: Ia1d67ac1ac766f22c6ecb814182150a789c91095

 nova/tests/test_imagecache.py   |   71 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/imagecache.py |   43 +++++++++++++++++++++---
 2 files changed, 109 insertions(+), 5 deletions(-)

commit caa1b282c701d5e9b9e02ffdb07d432d9b35ed13
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed Apr 25 15:55:14 2012 -0700

    Xen: Pass session to destroy_vdi
    
    Change-Id: I34c59ff536abfdff9221cdb3d9ecc45d1e7a1a90

 nova/virt/xenapi/volumeops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6153f2a1ef021a93996d6959651ffd98129faf6f
Author: Michael Still <mikal@stillhq.com>
Date:   Fri Apr 13 01:40:48 2012 +1000

    Add instance logging to vmware_images.py
    
    Change-Id: I92e81d777b4e866abbbc2f8b5d173089bfe48b52

 nova/virt/vmwareapi/vmware_images.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit bc0c58417425de7b75e4e9979f52f43c9ddb7b41
Author: Michael Still <mikal@stillhq.com>
Date:   Fri Apr 13 01:39:28 2012 +1000

    Add instance logging to vmops.py
    
    Change-Id: I9d1f61f568e8d5c8b45c4097e5240facc13191d6

 nova/virt/vmwareapi/vmops.py |  130 ++++++++++++++++++++++--------------------
 1 file changed, 69 insertions(+), 61 deletions(-)

commit 1335352df30c3802df8d430e30e7bb7564d01132
Author: Peng Yong <ppyy@pubyun.com>
Date:   Mon Mar 19 15:11:24 2012 +0800

    fix bug #980452 set net.ipv4.ip_forward=1 on network
    
    Change-Id: I03c569252f896330cc6396267e00b626e9232fb7

 nova/network/linux_net.py    |    2 ++
 nova/rootwrap/network.py     |    3 +++
 nova/tests/test_linux_net.py |    4 ++++
 3 files changed, 9 insertions(+)

commit 0e7908473fcd7935b4336206d694cec4b080fbc8
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:34:29 2012 +1000

    Log instance.
    
    Even though this is a fake, its at least consistent.
    
    Change-Id: Ib5ae787b068c94cedcfd7f1d2dd843110129f299

 nova/virt/fake.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 139c77c486533e6aacaebe8a8bc2a03a6feabb87
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:32:25 2012 +1000

    Log instance information for baremetal.
    
    Change-Id: I38b230b2d4506bc6f7758698a381b3e1ae392e2b

 nova/virt/baremetal/proxy.py |   56 +++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 22 deletions(-)

commit f40c10281d79169ee7d2d8ca6a3976e6dc719abe
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:15:53 2012 +1000

    Include instance in log message.
    
    Change-Id: I350a6a7670a0d5b1b917ac33b86d77a4f010fd19

 nova/network/manager.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit cddd0cc4741e62ecf93384e5f55c2a64398dd003
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:10:27 2012 +1000

    Log instance.
    
    Change-Id: I8fbfd7fdc6e16d555151d63657fb8435077a006e

 nova/console/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 467b76b7a2081ffce0f1f0a52ba4d8cf7bbb53bd
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 11:42:57 2012 +1000

    Ensure all messages include instance.
    
    Change-Id: I6d870cd8cba796c26d7893f132c85510bd8f6d43

 nova/api/openstack/compute/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 589f3f108c2edcd66de48891a92e875b7d2823c9
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 11:38:53 2012 +1000

    Add instance to log messages.
    
    Change-Id: I53b166c7f53c0094951cb13ed8942e0b7bbb8b55

 .../openstack/compute/contrib/server_start_stop.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b00acbbe6556d29813cb8e98f826a04fad648c71
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 11:35:30 2012 +1000

    Include instance in log message.
    
    Change-Id: Id4f8be8cf01d04602feaf62f388702011dea692e

 nova/api/openstack/compute/contrib/multinic.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0b11668e64450039dc071a4a123abd02206f865f
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Apr 9 18:08:50 2012 -0400

    Refactor nova.rpc config handling.
    
    This patch does a couple of things:
    
    1) Remove the dependency of nova.rpc on nova.flags.  This is a step
    toward decoupling nova.rpc from the rest of nova so that it can be moved
    to openstack-common.
    
    2) Refactor nova.rpc so that a configuration object is passed around as
    needed instead of depending on nova.flags.FLAGS.
    
    This was done by avoiding changing the nova.rpc API as much as possible
    so that existing usage of nova.rpc would not have to be touched.  So,
    instead, a config object gets registered, cached, and then passed into
    the rpc implementations as needed.  Getting rid of this global config
    reference in nova.rpc will require changing the public API and I wanted
    to avoid doing that until there was a better reason than this.
    
    Change-Id: I9a7fa67bd12ced877c83e48e31f5ef7263be6815

 bin/clear_rabbit_queues          |    1 +
 bin/nova-dhcpbridge              |    2 +
 bin/nova-manage                  |    3 +-
 nova/rpc/__init__.py             |   55 +++++++++++-----
 nova/rpc/amqp.py                 |   93 +++++++++++++++-----------
 nova/rpc/common.py               |   27 ++------
 nova/rpc/impl_fake.py            |   23 +++----
 nova/rpc/impl_kombu.py           |  132 ++++++++++++++++++++-----------------
 nova/rpc/impl_qpid.py            |  135 +++++++++++++++++++++-----------------
 nova/service.py                  |    2 +
 nova/tests/__init__.py           |    3 +
 nova/tests/rpc/common.py         |   34 +++++-----
 nova/tests/rpc/test_common.py    |    8 +--
 nova/tests/rpc/test_kombu.py     |   39 ++++++-----
 nova/tests/rpc/test_kombu_ssl.py |    6 +-
 nova/tests/rpc/test_qpid.py      |   15 +++--
 16 files changed, 319 insertions(+), 259 deletions(-)

commit ca4aee67e3ef851c64150af39aa7dca3d2cab349
Merge: db136ae 208c635
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 20:08:50 2012 +0000

    Merge "Don't leak RPC connections on timeouts or other exceptions"

commit db136ae87d8f5e2fae0e2212c7d26a069db7e202
Merge: f58fe27 b224759
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 19:50:37 2012 +0000

    Merge "Fixes bug 987335."

commit f58fe27540e40af751d1ff77f04ec2b855138cc9
Merge: cebdcf1 a72f25d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 19:02:34 2012 +0000

    Merge "allow power state "BLOCKED" for live migrations if using Xen by libvirt"

commit cebdcf15d722b839fa9ecc411f5b368d8e7ecb93
Merge: d5878e8 82e1019
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 18:41:20 2012 +0000

    Merge "Number of missing imports should always be shown"

commit d5878e8946688aca135b159b5dc7880670185e9f
Merge: 587fee8 30c8293
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 17:42:30 2012 +0000

    Merge "QuantumManager will start dnsmasq during startup. Fixes bug 977759"

commit 208c635a7d064fafc14dab97172c98cd5d8e6fc6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Apr 25 17:34:53 2012 +0000

    Don't leak RPC connections on timeouts or other exceptions
    
    Fixes bug 968843
    
    Change-Id: I9e0f1e306cab203bf4c865050b7a45f96127062e

 nova/rpc/amqp.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 587fee84ebd6ac042582ccc03a132c7f16043704
Merge: a936ab9 22dd874
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 16:41:41 2012 +0000

    Merge "Small cleanup to attach_volume logging"

commit a936ab93a86604421c63d52b221f90b3f77d2d58
Merge: d813d20 148dba8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 15:12:48 2012 +0000

    Merge "Validate min_ram/min_disk on rebuild."

commit 22dd8749304f09026e28362eaac613cc35c1038b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 24 16:12:08 2012 -0400

    Small cleanup to attach_volume logging
    
    Change-Id: I92b044b0b56ab7385ee423df38a08bd657feaed5

 nova/compute/manager.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit b33eb7ec75f9e6ae66e7b92ea9e50f4b04955dbe
Author: MotoKen <motokentsai@gmail.com>
Date:   Wed Apr 25 11:31:39 2012 +0800

    Implements EC2 DescribeAddresses by specific PublicIp.
    
    Fix bug 988189 and add a test case to verify.
    
    Change-Id: I653c29cd99feee8d811c9f64dd280b6f49a5262c

 nova/api/ec2/cloud.py            |   48 ++++++++++++++++++++------------------
 nova/tests/api/ec2/test_cloud.py |   18 ++++++++++++++
 2 files changed, 43 insertions(+), 23 deletions(-)

commit d813d20c3b996f90974a3c02aa658b97df9f7607
Merge: 9bd0504 647e458
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 07:30:38 2012 +0000

    Merge "Introduced flag base_dir_name. Fixes bug 973194"

commit 9bd0504bd341a07e4a3649c7540036c03280984c
Merge: da834cf bcb53df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 07:09:13 2012 +0000

    Merge "Scope coverage report generation to nova module."

commit da834cf8aee734837e873b5a8bd78ff40be15caa
Merge: 5999008 56dfbb5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 06:53:39 2012 +0000

    Merge "Fixed metadata validation err. Fixes bug 965102."

commit 647e4584773716d4b0e3fc114cc5db9c550ec078
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Thu Apr 5 01:33:34 2012 -0700

    Introduced flag base_dir_name. Fixes bug 973194
    
    rebased from master.
    
    If user faces locking related problem when two nova-compute hosts
    sharing same disk area via nfs, try to download same image into
    cache concurrently - Then base_dir_name can be set to "_base_$my_ip" in
    nova.conf
    
    Default value for base_dir_name is "_base" thus retaining existing
    behavior.
    
    Change-Id: Icff10ed75ba83f7256731614dc9e01e578b347a4

 Authors                         |    1 +
 nova/compute/manager.py         |    6 ++++++
 nova/tests/test_imagecache.py   |    8 +++++---
 nova/tests/test_libvirt.py      |    7 ++++---
 nova/virt/libvirt/connection.py |    3 ++-
 nova/virt/libvirt/imagecache.py |    6 ++++--
 6 files changed, 22 insertions(+), 9 deletions(-)

commit 5999008f39357aa1c81310affc04886a164c4b77
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 25 02:44:16 2012 +0000

    Set a more reasonable default RPC thread pool size
    
    No service should be doing over 1000 different tasks at once. It can
    only possibly end up overloading other dependent services. 64 should
    be a more reasonable starting point.
    
    Change-Id: I7690ad4a9cfc5ee11e1990d5cecdf23522f11f72

 nova/rpc/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f60e6e338db5a043102b30f8dd507d723235fc53
Merge: d0392a2 4bd4f75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 25 01:26:32 2012 +0000

    Merge "Removes unnecessary code in _run_instance."

commit 82e1019edb3e2aec7426e80fc29d9fd2e99415f9
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Apr 24 11:42:32 2012 -0700

    Number of missing imports should always be shown
    
    In tools/hacking.py
    
    Change-Id: I1219dcc140594be97fc680981a122157fed2e279

 tools/hacking.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit d0392a27e7bb713c06d1f300d5eac9651b36981d
Merge: 9341bd6 57a62af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 18:53:22 2012 +0000

    Merge "Use utils.save_and_reraise_exception"

commit 9341bd6995854152a0d08b1ff2661b8593b72e61
Merge: d10077d d55823d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 17:54:16 2012 +0000

    Merge "Typo fix in bin/instance-usage-audit."

commit d10077d18e929bab837a7e5de1e918fc42df39b9
Merge: 86905d7 7ee0d78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 17:35:10 2012 +0000

    Merge "Improved tools/hacking.py"

commit 86905d70fff56f843bb3d8490cbc1e68cc8f3c3c
Merge: b11209b 8f9c2ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 17:27:26 2012 +0000

    Merge "nova.virt.xenapi_conn -> nova.virt.xenapi.connection"

commit d55823d8d444cb680c8f3984cb522e95e9f6bd9a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Apr 24 17:03:53 2012 +0000

    Typo fix in bin/instance-usage-audit.
    
    The notify method now requires a context, which in this case should be
    `admin_context` not `context`.
    
    Change-Id: I53275d0e1c9a898a7c0d9685382bb52ffb2efa2c

 bin/instance-usage-audit |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b11209ba8831f08188ef07dc0160b234ecf3ac63
Merge: dab653b 9d9939d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 17:03:33 2012 +0000

    Merge "Include name being searched for in exception message"

commit dab653b3ac6d44d6d10f290c5d732aa679c8cdbd
Merge: 2c786ff 1744e68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 16:53:37 2012 +0000

    Merge "Removing XenAPI class variable, use session instead."

commit 7ee0d7848d9292c0f888c890c492b011299a3bc3
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Apr 13 16:46:42 2012 -0400

    Improved tools/hacking.py
    
    * cleaner output
    * fix bug 980009
    * Fix N201
    * N306: alphabetical order imports
    * N401: docstring start
    * N402: one line docstring start
    * N403: multi line docstring end
    * Until fixed, N40* will be disabled by default
    
    Change-Id: I9addafdaa7a1f8fb950e14a5409f661dec6c7b87

 HACKING.rst                     |    2 +-
 nova/virt/libvirt/connection.py |    2 +-
 run_tests.sh                    |    5 +-
 tools/hacking.py                |  183 ++++++++++++++++++++++++++++++---------
 4 files changed, 146 insertions(+), 46 deletions(-)

commit 2c786ff3ad0d3fa85735d98f9927e9f92b686edb
Merge: f05841c 4c4c779
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 16:27:09 2012 +0000

    Merge "Remove unused time keyword arg"

commit bcb53dfc6a149f94b4509ce90f89120b526f5582
Author: Renier Morales <renierm@us.ibm.com>
Date:   Mon Apr 23 22:36:19 2012 -0400

    Scope coverage report generation to nova module.
    
    Coverage report generation was not using --include filters.
    This resulted in generating a report that included all external
    dependencies. Some of these may include problematic characters for
    utf8 decoding. In the odd case this was found, coverage would fail
    with a UnicodeDecodeError.
    
    Fixes bug #987077.
    
    Change-Id: I276698e65ac1037972209a406058168433cd826b

 .gitignore   |    1 +
 Authors      |    1 +
 run_tests.sh |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

commit f05841caf3dbf7e659b55513f07e9837b1cf22f6
Merge: b916b06 b22f17c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 24 07:34:36 2012 +0000

    Merge "Logging updates in IptablesFirewallDriver."

commit 4bd4f756f107f94a264d8894203c00d10af322ee
Author: MotoKen <motokentsai@gmail.com>
Date:   Mon Apr 23 19:24:14 2012 +0800

    Removes unnecessary code in _run_instance.
    
    * Remove _is_instance_terminated and _shutdown_instance_even_if_deleted
      since run/terminate instance is synchronized.
    * Avoid potential deadlock.
    * Fixes bug 981316.
    
    Change-Id: I4fe7e2ea00b85d9e0802fe93655e67db3909e86b

 nova/compute/manager.py |   36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

commit 148dba871ef76841e93b1a278155340c395b4a64
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 23 23:12:46 2012 -0400

    Validate min_ram/min_disk on rebuild.
    
    Update compute API rebuild function so that it checks min_ram
    and min_disk on the specified image.
    
    Fixes LP Bug #919367.
    
    Change-Id: Ifa38b303656709e537fa6e4e729f39715f23f552

 nova/api/openstack/compute/servers.py            |    4 ++
 nova/compute/api.py                              |   12 +++--
 nova/tests/api/openstack/compute/test_servers.py |   54 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)

commit b916b06f1059611a1f7ecfa6781e1d27036d053e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Apr 23 21:30:15 2012 +0000

    Adding context to usage notifications.
    
    This patch passes context objects all the way down to the usage
    generating code. This allows that code (in future) patches to make
    context-dependent calls in order to augment the usage_info dict.
    
    Change-Id: I6592d7aecd99750cab6a91bbadc2c761155d2d4d

 bin/instance-usage-audit         |    2 +-
 nova/compute/manager.py          |  102 ++++++++++++++++++++++----------------
 nova/compute/utils.py            |   17 ++++---
 nova/tests/test_compute_utils.py |    2 +-
 4 files changed, 69 insertions(+), 54 deletions(-)

commit cee3e5a20794e4a73fb42488b905207f6a1caf74
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Apr 23 21:00:41 2012 +0000

    Making `usage_from_instance` private.
    
    This reduces the surface area of usage notifications down to just
    `compute_utils.notify_about_instance_usage`, making future refactoring
    easier.
    
    Change-Id: If70aff191c0135c1883c39c9783f5c8433953a4e

 nova/compute/manager.py                 |   32 ++++++++++++++----------------
 nova/compute/utils.py                   |   33 ++++++++++++++++++++++---------
 nova/tests/api/ec2/test_cloud.py        |    4 ++--
 nova/tests/api/ec2/test_ec2_validate.py |    2 +-
 4 files changed, 42 insertions(+), 29 deletions(-)

commit 8829a3bf7ef7c5405cbc2670f4ad35ba52ea1621
Merge: c9aa1f0 18e5e54
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 19:54:18 2012 +0000

    Merge "Remove unused variable"

commit c9aa1f06a613c2d1d0b9db88c5695a1fb1293493
Merge: 5af8e54 2b490fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 19:06:23 2012 +0000

    Merge "Exclude xenapi plugins from pep8/hacking checks."

commit 5af8e54bb18de0392339d49c15e038e2a808c0b3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Apr 23 09:54:29 2012 -0700

    Remove __init__.py from locale dir
    
    Previously, the __init__.py indicated that we have a custom locale package,
    preventing imports of the locale package that ships with python itself.
    
    * Fixes bug 977021
    
    Change-Id: I5fcfb8936137b9db8a556439ca53ffeec6bbe67c

 0 files changed

commit 446cdef5371a81806486e4c5a29e5f3a5dc4731f
Merge: 4fed7ab 8a2e945
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 15:36:40 2012 +0000

    Merge "Improve instance logging in compute/manager."

commit b2247590ae422588db541f279c7b137e36ee836f
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Mon Apr 23 16:40:38 2012 +0200

    Fixes bug 987335.
    
    Revert bug introduced by commit a837f92e that removed
    console_log from get_console_output()
    
    Change-Id: I22a14b5f50c2df0486420b38137328ac87844c1f

 nova/virt/libvirt/connection.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 4fed7ab47fb1914d22321f71fe87ce533b447ab2
Merge: bb11b3c 1f57ab6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 15:16:22 2012 +0000

    Merge "Log instance."

commit bb11b3cd0c839618d9ab4abe375b1f54c177ddc2
Merge: dd37492 576b21f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 14:44:14 2012 +0000

    Merge "Log instance consistently."

commit dd37492d3d94792e30c77e900ae317832cb43a3d
Merge: 820b470 fe4dce7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 23 14:33:17 2012 +0000

    Merge "Log instances consistently."

commit a72f25dba2cccbbcdd8c8927f0bc6199272b67ce
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Apr 23 13:09:21 2012 +0200

    allow power state "BLOCKED" for live migrations if using Xen by libvirt
    
    fixes bug 985587
    
    Change-Id: I7184dd639733a68f6b31e5e3e4311c7aa8d50220

 nova/scheduler/driver.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 2b490fd2ef3a74402147893be646c00505da8628
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Apr 22 21:11:03 2012 -0400

    Exclude xenapi plugins from pep8/hacking checks.
    
    Fixes LP Bug #987055.
    
    Change-Id: I7132b88c5e0a90b16d0f8e35df45b82e7991280f

 run_tests.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1001a5f6a4c8f8d6ec8b42d1742c99a6486fb93c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 22 23:03:48 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I5e60309271831ff54c9c72289aed2953308ec89c

 nova/locale/bs/LC_MESSAGES/nova.po    | 1751 +++++++++++-----------
 nova/locale/cs/LC_MESSAGES/nova.po    | 2666 +++++++++++++++++----------------
 nova/locale/da/LC_MESSAGES/nova.po    | 1751 +++++++++++-----------
 nova/locale/de/LC_MESSAGES/nova.po    | 1754 +++++++++++-----------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 1774 +++++++++++-----------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 1767 +++++++++++-----------
 nova/locale/es/LC_MESSAGES/nova.po    | 1788 +++++++++++-----------
 nova/locale/fr/LC_MESSAGES/nova.po    | 1987 ++++++++++++------------
 nova/locale/it/LC_MESSAGES/nova.po    | 1759 +++++++++++-----------
 nova/locale/ja/LC_MESSAGES/nova.po    | 1772 +++++++++++-----------
 nova/locale/ko/LC_MESSAGES/nova.po    | 1756 +++++++++++-----------
 nova/locale/nova.pot                  | 1677 ++++++++++-----------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 1767 +++++++++++-----------
 nova/locale/ru/LC_MESSAGES/nova.po    | 1774 +++++++++++-----------
 nova/locale/tl/LC_MESSAGES/nova.po    | 1751 +++++++++++-----------
 nova/locale/tr/LC_MESSAGES/nova.po    | 1751 +++++++++++-----------
 nova/locale/uk/LC_MESSAGES/nova.po    | 1755 +++++++++++-----------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 1743 ++++++++++-----------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 1751 +++++++++++-----------
 19 files changed, 17619 insertions(+), 16875 deletions(-)

commit 820b470e938dd4b490cbda9c9bc1b2d22785629d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 20 15:44:52 2012 +0000

    Remove unnecessary power state translation messages
    
    The messages don't provide any extra value in debugging since
    compile_info is only called in a few cases. Also, they are
    anonymous and don't include information about what instance
    the power state is for.
    
    Change-Id: Ib4dae30a2e9c14d8b3bb9c47fe54742897dd3492

 nova/virt/xenapi/vm_utils.py |    4 ----
 1 file changed, 4 deletions(-)

commit f8aa96679552935e22bc47851a30e712beadd629
Author: Michael Still <mikal@stillhq.com>
Date:   Fri Apr 13 01:42:06 2012 +1000

    Add instance logging.
    
    Change-Id: Icff3d19fe6ee707388185d56446c980ec98fde25

 nova/virt/xenapi/connection.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 791bb0a64b0a286e3bd591da4099d835115531be
Merge: e6b4c64 0acc214
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 20 18:38:59 2012 +0000

    Merge "Keep nova-manage commands sorted"

commit 57a62af0eebfd3f831f4be5b6e812c9d5019d0b7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 20 16:29:08 2012 +0000

    Use utils.save_and_reraise_exception
    
    It's less code and also logs when exceptions gets dropping instead
    of silently dropping them
    
    Change-Id: I407049861b1a402549f58939b654d1760cdb2d26

 nova/compute/manager.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 1744e68d196deb083268cc26cb0003f683277415
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Apr 19 22:22:33 2012 +0000

    Removing XenAPI class variable, use session instead.
    
    This is part of a series of refactoring which aim move towards using
    functions instead of classes + classmethods within vm_utils and
    volume_utils.
    
    Change-Id: Id0d7d21a240dd3cbf2237d480dc23dfd4d8c0dc1

 nova/virt/xenapi/__init__.py     |    6 ++----
 nova/virt/xenapi/vm_utils.py     |   16 ++++++++--------
 nova/virt/xenapi/vmops.py        |    1 -
 nova/virt/xenapi/volume_utils.py |   22 +++++++++++-----------
 nova/virt/xenapi/volumeops.py    |    3 ---
 5 files changed, 21 insertions(+), 27 deletions(-)

commit 576b21ff9d88d4493ada644b160513a0087e0b48
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:48:34 2012 +1000

    Log instance consistently.
    
    Change-Id: I5f85dcc1001e94886a14127d7517acdf4c2298be

 nova/virt/libvirt/vif.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 0acc214602ae91776c242bec68efc726e7a190be
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 20 16:58:29 2012 +0000

    Keep nova-manage commands sorted
    
    Change-Id: Id9934ff278a87c3ccb629cb6c9b27fd57276992c

 bin/nova-manage |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fe4dce7fb5a43b62635c16bef833cf34cee6f8ca
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:40:13 2012 +1000

    Log instances consistently.
    
    Change-Id: I9f4ab63405e7214b082e726cc9d59626ca503c66

 nova/virt/libvirt/connection.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit e6b4c646b35e9db85272f93c6214bf6a94cb3446
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Apr 20 04:09:08 2012 +0000

    Moves `usage_from_instance` into nova.compute.utils.
    
    Change-Id: If6ae23847fb6d150f97a538dc37d47279c183243

 nova/compute/manager.py                 |    8 ++++----
 nova/compute/utils.py                   |   32 ++++++++++++++++++++++++++++++-
 nova/tests/api/ec2/test_cloud.py        |    5 +++--
 nova/tests/api/ec2/test_ec2_validate.py |    3 ++-
 nova/utils.py                           |   30 -----------------------------
 5 files changed, 40 insertions(+), 38 deletions(-)

commit 1f57ab61d4f4835f5946a4c809832a9cf2c87444
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Apr 12 12:24:32 2012 +1000

    Log instance.
    
    Change-Id: I603eaa43b784e38532e88e9d2c844183730d44e9

 nova/scheduler/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8f9c2bae1ee5bb99e565eb04b977a1228fe2aa5b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 19 23:45:35 2012 +0000

    nova.virt.xenapi_conn -> nova.virt.xenapi.connection
    
    This fixes a couple of references that were missed in the recent move
    
    Change-Id: I653b8b85294838a39f9d805bef094938f692e7be

 tools/xenserver/vm_vdi_cleaner.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4c4c77925c5df36643b4f91cbe3b220e3551431e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 19 21:51:40 2012 +0000

    Remove unused time keyword arg
    
    It's not used anywhere, it aliases the imported time module and is
    broken at best if given since we want to use the eventlet sleep
    anyway (which is monkey patched into time.sleep)
    
    Change-Id: I7322ab5b5526afd3c02f48eb85066570b556bb75

 nova/compute/manager.py    |    5 +----
 nova/tests/test_compute.py |   11 ++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

commit 18e5e54a3ee6fb58018b80bc4b3c2ecd3ab727e3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 19 22:58:41 2012 +0000

    Remove unused variable
    
    Change-Id: I80710b266d8bd089828996060a0746cd0a0fef01

 nova/virt/xenapi/vmops.py |    1 -
 1 file changed, 1 deletion(-)

commit 2b3a1e7e83e00c1fda9cf50e0a67109fbd8e13a7
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Apr 18 23:27:31 2012 +0100

    support a configurable libvirt injection partition
    
    This is useful if all guest images have the same structure,
    and the root partition is not the first partition.
    
    This is also handy to enable inspection in libguestfs,
    which can handle disparate and complicated image layouts.
    
    In future we may change to a StrOpt to support
    searching by partition label.
    
    Change-Id: Ie94d61bec8fe4b41d6d2d6d3efa9a4364cf027fe

 nova/virt/disk/mount.py         |    6 ++++--
 nova/virt/libvirt/connection.py |   12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

commit ca5d8fae4d92afd0f015f0e9bd0905f231bf85d3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Apr 14 00:30:19 2012 -0500

    Refactor instance image property inheritance out to a method.
    
    Change-Id: I14c3ff3981b610893296b59ea6a09a9f21b19133

 nova/compute/api.py |   56 +++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

commit 7b34a2d767b60e053ac1f49d1cdd8c853b8d9133
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Apr 13 23:53:14 2012 -0500

    Refactor availability zone handling out to a method.
    
    Also moves filter_properties closer to where it's used.
    
    Change-Id: Ic2a95c2f15d138632e807249da0c26082dd1a7bf

 nova/compute/api.py |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

commit 9d9939d8785d92c4aed2873f98457baff593984b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 19 17:23:54 2012 +0000

    Include name being searched for in exception message
    
    Otherwise, it's not always clear what was happening while looking at
    logs. Also, remove unused instance kwarg, this isn't a logging call.
    
    Change-Id: Ib1be2d7ed5b3c658dc2a3ac4094b812ba95a5d3c

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2d8ebfeda8db3b3232506c6b142c4004bb206092
Merge: abe04a0 4d7c404
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 19 17:40:52 2012 +0000

    Merge "Add deleted_at to instance usage notification."

commit abe04a0548dba801c67b8e2998dbd7d739f7b543
Merge: 07d54c2 c808df7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 19 17:17:05 2012 +0000

    Merge "Make run_tests.sh just a little bit less verbose"

commit 07d54c27a32e66884495b00ec7c19d679cdb823f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 19 15:06:27 2012 +0000

    Be more tolerant of deleting failed builds
    
    Fixes bug 985705
    
    If an instance fails to build, the xen server may not have an instance.
    This can cause _get_opaque_vm_ref to unnecessarily raise an exception
    and add an instance fault that is misleading.
    
    Change-Id: I068d0af284a5671f429b2d8b13a25b629ede59bd

 nova/virt/xenapi/vmops.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit b22f17cd09c8fa0447503b7a5a84477d0a943d18
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 2 13:01:42 2012 -0400

    Logging updates in IptablesFirewallDriver.
    
    Update IptablesFirewallDriver so that it uses the debug log channel
    when logging specifics about each firewall rule.
    
    Fixes LP Bug #969545.
    
    Change-Id: Ie50a3607fff17f032d577af8a87d5f4582bcc919

 nova/virt/firewall.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 1f644d210557b1254f7c7b39424b09a45329ade7
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 3 14:07:07 2012 -0400

    Implement security group quotas.
    
    Fixes LP Bug #969545
    
    Change-Id: I60d4300aa04597e2d8b0eea31ab0303b0b3c48f9

 nova/api/ec2/cloud.py                              |   12 +++++
 .../openstack/compute/contrib/security_groups.py   |   12 +++++
 nova/db/api.py                                     |   10 ++++
 nova/db/sqlalchemy/api.py                          |   15 ++++++
 nova/quota.py                                      |   36 +++++++++++++-
 nova/tests/api/ec2/test_cloud.py                   |   25 ++++++++++
 .../compute/contrib/test_quota_classes.py          |   26 ++++++++--
 .../api/openstack/compute/contrib/test_quotas.py   |   29 +++++++++--
 .../compute/contrib/test_security_groups.py        |   31 ++++++++++++
 nova/tests/test_quota.py                           |   52 ++++++++++++++++++++
 10 files changed, 238 insertions(+), 10 deletions(-)

commit 090bef6ce12ba83706dd328e697d4794c23f2572
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 18 18:22:16 2012 -0400

    Do not allow blank adminPass attribute on set password
    
    Fixes bug 985263
    
    Change-Id: I846248a4b8cb22fcaca9e51cc477813f80f6d602

 nova/api/openstack/compute/servers.py              |    2 +-
 .../api/openstack/compute/test_server_actions.py   |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

commit 98b8001407ef06e1cdb8434571288dc56dba7bc0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 18 17:39:58 2012 -0400

    Make rebuilds with an emtpy name raise BadRequest.
    
    Fixes bug 973591
    
    Change-Id: I87f189175c55a6922e7277857b85d526b9bfa6e1

 nova/api/openstack/compute/servers.py              |    5 ++++-
 .../api/openstack/compute/test_server_actions.py   |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

commit ab7e5907ff0fdad759d5e00a351c757c1e5de452
Merge: fa554ec 30ccfc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 18 20:47:03 2012 +0000

    Merge "Updates launched_at in the finish and revert_migration calls"

commit fa554ec6076cba413c29ae6e8e50d6908f58f6e5
Merge: 79ba78a efab710
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 18 20:18:10 2012 +0000

    Merge "Fix error message to report correct operation"

commit 79ba78ab75bb5bc04e459be5c248c4c5a49558b5
Merge: 5c0b56f cc642ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 18 18:05:33 2012 +0000

    Merge "Reformat docstrings in n/c/a/o/servers as per HACKING."

commit 5c0b56fc3d340a626f8ac395c9f2228c27c1554b
Merge: c457ec0 a2a0a1f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 18 17:03:29 2012 +0000

    Merge "Remove unused variable"

commit 30ccfc35fc51c1ce0666be37b20eeb10162fa143
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Tue Apr 17 12:53:49 2012 -0500

    Updates launched_at in the finish and revert_migration calls
    
    Fixes lp984219
    
    Change-Id: I06b113355acbc954052734ecb33a281649ec5876

 nova/compute/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 4eafbbeb6545dddedb88f8e3d14c7dc13bbf24c5
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Wed Apr 18 11:10:02 2012 +0530

    Updated instance state on resize error.
    
    Fixes bug 980685.
    Set instance vm_state to ERROR if network node down during resize.
    
    Change-Id: I2e2f7a98be4b2edfc7d51a4d8d9e31b7b418f2ba

 nova/compute/manager.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit cc642ff1d3317e00796f0b0508eeb8210ab901bc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Apr 15 21:44:15 2012 -0400

    Reformat docstrings in n/c/a/o/servers as per HACKING.
    
    Change-Id: I80926766c1cc8d41a9fe35a625018022e732140a

 nova/api/openstack/compute/servers.py |   64 ++++++++++++++-------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

commit 268494769f0d9f82719f122161f0227372cb8824
Author: Peng Yong <ppyy@pubyun.com>
Date:   Sun Apr 15 23:01:24 2012 +0800

    fix bug 982360, multi ip block for dmz_cidr
    
    Change-Id: I289110e70e3336704ffff24f1887669c11a559b9

 nova/network/linux_net.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit c457ec03806269785c994af9b75383a0f52d628d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Apr 14 02:08:21 2012 +0000

    Refactor checking instance count quota.
    
    Change-Id: I8ab738f3042ccf451d769c62b9fee2d20fa23953

 nova/compute/api.py |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

commit 9f80e3bd86f73eedf1181f74d7b146ddb104bc9b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Apr 14 01:50:54 2012 +0000

    Small code cleanup for config_disk handling.
    
    Change-Id: I3456b4c98aa6527d10452e8f578a30e95a65db8e

 nova/compute/api.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit c7127311d1915c74a43105eb636b6b73878730f2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Apr 14 01:36:32 2012 +0000

    Refactors kernel and ramdisk handling into their own method.
    
    The size of `_create_instance` is making it increasingly difficult to
    work with. This is part of a series of patches aims to break it up into
    smaller, more digestible pieces.
    
    Change-Id: Ic668f0414937b255b1b1e1392c204307665822aa

 nova/compute/api.py |   54 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 17 deletions(-)

commit 8a2e9459718e6fe09c5b52fac9c27afc1959b43c
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Apr 11 10:21:00 2012 +1000

    Improve instance logging in compute/manager.
    
    This adds instance logging coverage to all of
    nova/compute/mananger.py. Resolves bug 977976.
    
    Change-Id: I9392cb6202ac7997cdfd994c67374e738e8c8b10

 nova/compute/manager.py |  127 +++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 65 deletions(-)

commit 548cba06371baa4877cff7ac0e1695af17d7a09c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 13 22:26:13 2012 +0000

    Merge _spawn and _configure_instance in xenapi driver
    
    They were separated only to make it easier to stubout, but we want
    more test coverage, not less. So merge them together and fix the
    tests while we're at it.
    
    Change-Id: I18333017868b91fb71b8d3dce831463a1cd5bf81

 nova/tests/db/fakes.py     |    5 +++
 nova/tests/test_xenapi.py  |   10 +++---
 nova/tests/xenapi/stubs.py |    4 ---
 nova/virt/xenapi/fake.py   |    8 +++++
 nova/virt/xenapi/vmops.py  |   79 +++++++++++++++++++++-----------------------
 5 files changed, 55 insertions(+), 51 deletions(-)

commit 4d7c40423d8bb8e22dab8a59d0ba381871eb8a8e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Apr 13 00:10:39 2012 +0000

    Add deleted_at to instance usage notification.
    
    This makes it easier to determine the uptime of a particular instance.
    
    Change-Id: If94d811b07120662ec3c8ce0a275f4c6178be56d

 nova/utils.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit f6a691b7af63ea24dcb767c7a2942af7d5588b4f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 21:37:15 2012 +0000

    Simplify _get_vm_opaque_ref in xenapi driver
    
    Full instance objects are passed to all methods now, so it no longer
    needs to handle three different variants of argument. Also, make sure
    most code uses _get_vm_opaque_ref instead of calling VMHelper.lookup
    directly so it checks that a vm_ref was actually returned.
    
    Change-Id: Icc8b819e1d4b8bf342867d09e61fe05e6eab9e70

 nova/tests/test_xenapi.py |    9 ++++---
 nova/virt/xenapi/vmops.py |   62 +++++++++++----------------------------------
 2 files changed, 20 insertions(+), 51 deletions(-)

commit 8413e60b8e8d91ec2d1656bb3c16eafa3ee832b5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 13 21:08:01 2012 +0000

    Test unrescue works as well
    
    The only unrescue test that happens right now is that it fails if not
    already in rescue. This test fills out to test unrescue works as
    intended. Also, remove unnecessary stub from rescue test.
    
    Change-Id: I4451afe5a7d2ada8dfaefad804345b66ac895094

 nova/tests/test_xenapi.py  |   18 ++++++++++++------
 nova/tests/xenapi/stubs.py |   10 +---------
 nova/virt/xenapi/fake.py   |   40 ++++++++++++++++++++++------------------
 3 files changed, 35 insertions(+), 33 deletions(-)

commit a2a0a1f3853cb41373974130bca9e96a3d6d08f6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 13 20:55:01 2012 +0000

    Remove unused variable
    
    Change-Id: I0a30c61db57d4704eb001f1d96127acc41878bfe

 nova/virt/xenapi/vmops.py |    1 -
 1 file changed, 1 deletion(-)

commit 15c0847341b2a182019c865ec787c129fb21dae6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 11 20:12:38 2012 -0700

    Port types and extra specs to volume api
    
     * Fixes bug 979089
     * Adds pollicy for new extensions
     * Fixes __init__ in testing directories
     * Cleans up existing volume types tests
     * Adds tests for type management
     * Adds tests for extra specs management
     * Removed unused Quota handling
     * Fixed typo in db volume_type_get
    
    Change-Id: Ic80190ecf1d6d6ad0229e5af642a50c7c53bbbf9

 etc/nova/policy.json                               |    4 +
 nova/api/openstack/compute/contrib/volumetypes.py  |   27 +--
 .../openstack/volume/contrib/types_extra_specs.py  |  152 +++++++++++++++
 nova/api/openstack/volume/contrib/types_manage.py  |   91 +++++++++
 nova/db/sqlalchemy/api.py                          |    2 +-
 nova/tests/api/openstack/__init__.py               |   19 ++
 nova/tests/api/openstack/compute/__init__.py       |    5 +-
 .../api/openstack/compute/contrib/__init__.py      |    6 +-
 nova/tests/api/openstack/volume/__init__.py        |    5 +-
 .../tests/api/openstack/volume/contrib/__init__.py |   19 ++
 .../volume/contrib/test_types_extra_specs.py       |  202 ++++++++++++++++++++
 .../openstack/volume/contrib/test_types_manage.py  |  103 ++++++++++
 .../api/openstack/volume/extensions/__init__.py    |   15 ++
 .../api/openstack/volume/extensions/foxinsocks.py  |   94 +++++++++
 nova/tests/api/openstack/volume/test_extensions.py |  156 +++++++++++++++
 nova/tests/api/openstack/volume/test_types.py      |   26 +--
 nova/tests/policy.json                             |    7 +-
 17 files changed, 883 insertions(+), 50 deletions(-)

commit 042a4d0d96b33ab2c86ef4e5e46560fef16d011f
Merge: 3e5e3ac dbff603
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 13 15:25:52 2012 +0000

    Merge "Log more information when sending notifications"

commit 3e5e3accdaf3a5708fa581715c038939e6139308
Merge: d207b37 b5af39b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 13 15:02:16 2012 +0000

    Merge "Make exposed methods clearer in xenapi.vmops"

commit b5af39bba53c907a2ad98916b3cfc529d6da1747
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 18:06:35 2012 +0000

    Make exposed methods clearer in xenapi.vmops
    
    VMOps is only used by connection.py, but it's not always obvious
    which methods are intended to be public and which are used
    internally for implementation reasons. Prefix any internal methods
    with _ to make that clearer.
    
    Change-Id: I50244c18233d6d7463057cf5df42d5a5a3a6fab9

 nova/tests/test_xenapi.py  |    7 ++++++-
 nova/tests/xenapi/stubs.py |    4 ----
 nova/virt/xenapi/vmops.py  |   35 ++++++++++++++++-------------------
 3 files changed, 22 insertions(+), 24 deletions(-)

commit efab71005da664428cff6fde75957afc34e0435f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 17:43:59 2012 +0000

    Fix error message to report correct operation
    
    Change-Id: Ied2595b56da7e0a5b17d17282c2aa8dc066ef9f3

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c808df700502b6292a4b7b8b8285445a0f0ba922
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 17:01:40 2012 +0000

    Make run_tests.sh just a little bit less verbose
    
    Change-Id: I9d4dc11083cb51040677eeda2d28d4b23539a304

 run_tests.sh |    1 -
 1 file changed, 1 deletion(-)

commit dbff603c4a5cfc66bb7e0075b0ee3361c0211d1b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 16:42:20 2012 +0000

    Log more information when sending notifications
    
    For debugging purposes, it's useful to see what event type is being sent
    and not just where it's being sent
    
    Change-Id: I809a15a76204c79d37ed68b649cd2aea80ad3db2

 nova/rpc/amqp.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6d750971fde9be564dafe6c4ca25fa8872bf44f3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 12 14:41:53 2012 +0000

    xenapi_conn -> xenapi.connection
    
    This keeps all of the XenAPI related code together in one directory,
    like libvirt.
    
    Change-Id: I1de51eb8bcead0695e9f8ede466416e0257d0148

 nova/tests/test_xenapi.py         |    2 +-
 nova/tests/xenapi/stubs.py        |    2 +-
 nova/virt/connection.py           |    2 +-
 nova/virt/xenapi/connection.py    |  613 +++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi_conn.py          |  613 -------------------------------------
 nova/volume/xensm.py              |    2 +-
 tools/xenserver/vm_vdi_cleaner.py |    2 +-
 7 files changed, 618 insertions(+), 618 deletions(-)

commit d207b37fa6a149f84e059d6028370e3f58f61d33
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Thu Apr 12 12:44:06 2012 +0000

    Renamed current_audit_period function to last_completed_audit_period to clarify its purpose.
    
    Change-Id: I7bcfbd1a0545f992b1deae54e4deb956ae33e15d

 bin/instance-usage-audit |    2 +-
 nova/compute/manager.py  |    2 +-
 nova/compute/utils.py    |    2 +-
 nova/tests/test_utils.py |   24 ++++++++++++------------
 nova/utils.py            |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

commit 30c8293ea7d4c9464e0139fb488e202fd0947f52
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Wed Apr 11 01:43:22 2012 -0700

    QuantumManager will start dnsmasq during startup. Fixes bug 977759
    
    Added _setup_network_on_host method, which calls update_dhcp
    if quantum_use_dhcp is set.
    
    Change-Id: I193212037873001a03da7b7a484f61a5c13b5de8

 nova/network/quantum/manager.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 56dfbb59f9ad61d7f45d97f233db5d1cf0a46879
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Mon Apr 2 11:52:37 2012 +0530

    Fixed metadata validation err. Fixes bug 965102.
    
    1. Fixed the error message on specifying invalid server metadata key/value.
    2. Added check to disallow specifying blank metadata key.
    3. Added unit test coverage.
    
    Addressed review comments.
    
    Change-Id: I1f0002971dc236045d6e622641f46a4a30249d54

 nova/api/openstack/compute/server_metadata.py      |   14 ++++-
 nova/api/openstack/compute/servers.py              |    5 ++
 nova/compute/api.py                                |   12 +++--
 .../api/openstack/compute/test_server_metadata.py  |   54 ++++++++++++++++++++
 4 files changed, 79 insertions(+), 6 deletions(-)

commit 42f3bec10c7f7374ad4e9752b275b02ca2b2fdb9
Merge: 6489b23 47166a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 11 21:42:41 2012 +0000

    Merge "adjust logging levels for linux_net"

commit 6489b23c9304e4e20e871a20ae6c3bb54a710507
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Apr 11 09:36:11 2012 -0400

    Remove python-novaclient dependency from nova.
    
    Nova should not depend on python-novaclient. Remove it.
    
    Note: In order to get unit tests to pass I had to add in
    a temporary dependency on httplib2. This is due to the fact
    that pip installing glance does not properly setup all
    the dependencies. See LP Bug #975483 for details.
    
    Fixes LP Bug #978992.
    
    Change-Id: I50c00139f9dc303223601230fd962abac977cd5e

 nova/compute/api.py |    1 -
 nova/exception.py   |    1 -
 tools/pip-requires  |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

commit e7ebcf34c13e33811e20d8dca1c5e8e7af3ea4ca
Merge: 0030c6e dc13198
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 23:55:48 2012 +0000

    Merge "add libvirt_inject_key flag fix bug #971640"

commit 0030c6ed02776a104c5ecec82347bb6422a1473d
Merge: 690dabd 88e6597
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 23:31:09 2012 +0000

    Merge "Extend instance UUID logging."

commit 690dabd741d65e0dd3b4ad6267d0f7f12ea2fb08
Merge: 148332c 60625ce
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 10 23:14:44 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 148332c964e0caccff1481b29fd64c84cefc55eb
Merge: 664598d ef1f173
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:59:24 2012 +0000

    Merge "Clean up read_deleted support in host aggregates code"

commit 664598d86b168742d91a2c416b845b3f45860990
Merge: adea1bf 55d282a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:51:53 2012 +0000

    Merge "Log kwargs on a failed String Format Operation"

commit adea1bffcc6511c136bee13fa633fc8937fa7930
Merge: 4f631ca 9737704
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:42:21 2012 +0000

    Merge "remove unused flag: baremetal_injected_network_template baremetal_uri baremetal_allow_project_net_traffic"

commit 4f631ca24b9652cfcf761c121441a07b63571e57
Merge: 35005b0 6606f03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:23:11 2012 +0000

    Merge "Update doc to mention nova tool for type creation"

commit 35005b08401f571ccd079e4f03595b78ae0cbe38
Merge: a6ac8ce 8fbd897
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:11:26 2012 +0000

    Merge "Remove references to RemoteError in os-networks"

commit a6ac8ce04909a4f9f230373957e46d340ec93ece
Merge: f73dc32 a0e37c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 22:01:47 2012 +0000

    Merge "Fix errors in os-networks extension"

commit f73dc32a2a1e4e4fb32f1ea80848d868c680b92a
Merge: 7a1957d 48c191f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 21:52:19 2012 +0000

    Merge "fix TypeError with unstarted threads in nova-network"

commit 88e6597678226c4330ee8933e7a91573500fdd1f
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Apr 7 18:58:58 2012 +1000

    Extend instance UUID logging.
    
    Add instance logging coverage to some methods in
    nova/compute/manager.py
    
    Change-Id: Ib1979d2bcc316cc5642c84b15af3b8ce89c3311e

 nova/compute/manager.py |   74 +++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

commit 8fbd897b5f55be8fe56dac583c726086beb0c8b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 10 13:30:48 2012 -0700

    Remove references to RemoteError in os-networks
    
     * this is a separate commit to make backporting easier
    
    Change-Id: I10ff04567809a2cdfbea8882f3f2c19571a60a40

 nova/api/openstack/compute/contrib/networks.py     |   16 ----------------
 .../api/openstack/compute/contrib/test_networks.py |    3 +--
 2 files changed, 1 insertion(+), 18 deletions(-)

commit a0e37c6d29c57cde416b047cd38c93b6a9588005
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 9 22:11:10 2012 -0700

    Fix errors in os-networks extension
    
     * Makes sure the uuid is returned as id if it exists
     * Simplifies db get for manager.get_networks
     * Removes direct db access from manager which was breaking test
     * Updates tests to verify the new logic
     * Makes sure Remote NotFounds are turned into 404s
       (The RemoteError blocks can be removed once
        https://review.openstack.org/5749 lands)
     * Fixes bug 977712
     * Fixes bug 977723
    
    Change-Id: I6aa815960782c7ae5165aeebd83bdaaa62c19b04

 nova/api/openstack/compute/contrib/networks.py     |   21 +++++++++++-
 nova/network/manager.py                            |   17 ++++------
 .../api/openstack/compute/contrib/test_networks.py |   34 +++++++++++++-------
 nova/tests/fake_network.py                         |    3 ++
 nova/tests/network/test_manager.py                 |   28 ++++++++--------
 5 files changed, 65 insertions(+), 38 deletions(-)

commit 7a1957dfe91011510d34b849fadbb973b53d0414
Merge: 584c968 36488de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 20:31:29 2012 +0000

    Merge "Removes dead code around start_tcp in Server"

commit 584c968259d40a9c5a4a2e75c50fda45990996a5
Merge: d222953 a0150a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 20:11:45 2012 +0000

    Merge "Add the serialization of exceptions for RPC calls."

commit 36488de1145e4ed7244d9f41c534c4fac74b0fd5
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Tue Apr 10 15:34:18 2012 -0400

    Removes dead code around start_tcp in Server
    
    Remove dead code from nova/wsgi.py in Server around
    the irrelevant start_tcp method.
    
    Change-Id: I3222d90f6208bb3ff38d79f56365b22e551f2029

 nova/wsgi.py |   21 ---------------------
 1 file changed, 21 deletions(-)

commit d222953038e3b602c2074199049a210344cbc0f6
Merge: 0294070 1513cc1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 19:29:24 2012 +0000

    Merge "Improve grammar throughout nova."

commit 02940702e93e4d5dc47094986d06a2db909f6179
Merge: 1e133f6 9707466
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 19:21:51 2012 +0000

    Merge "Standardize quota flag format"

commit 1e133f60c70fbbdf1021d14bce21a4952654a439
Merge: 013cf05 4fe6f83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 19:14:02 2012 +0000

    Merge "Improved localization testing."

commit 1513cc178eaf1407228e54d9e375a7756018d71f
Author: Paul McMillan <paul.mcmillan@nebula.com>
Date:   Tue Apr 10 10:29:32 2012 -0700

    Improve grammar throughout nova.
    
    Fixes some "its" and "it's" mistakes, and unifies the tense of
    some documentation.
    
    Change-Id: I9b83aba535b554e80b2cf1e048bb3a4e5cac0e5e

 Authors                              |    1 +
 nova/auth/ldapdriver.py              |    2 +-
 nova/db/sqlalchemy/api.py            |    2 +-
 nova/network/quantum/manager.py      |    6 +++---
 nova/tests/test_imagecache.py        |    2 +-
 nova/volume/san.py                   |    2 +-
 nova/wsgi.py                         |    2 +-
 plugins/xenserver/doc/networking.rst |   28 +++++++++++++++-------------
 8 files changed, 24 insertions(+), 21 deletions(-)

commit 013cf05a130c35b4daf52445a30bd1ef34850ad0
Merge: 66c9000 2c14f18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 18:05:00 2012 +0000

    Merge "Remove nova Direct API"

commit 4fe6f839bd87b25380819256167f7b6247b27c1b
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Feb 24 16:13:44 2012 +0400

    Improved localization testing.
    
    Moved localization tests to tools/hacking.py.
    
    Change-Id: I903b90dfb09a46a72b1c64c30301f90661999f5b

 bin/nova-all                                   |    2 +-
 bin/nova-manage                                |   10 ++-
 nova/api/openstack/compute/contrib/networks.py |    2 +-
 nova/api/validator.py                          |    8 +-
 nova/compute/api.py                            |    2 +-
 nova/compute/manager.py                        |    8 +-
 nova/exception.py                              |    2 +-
 nova/network/manager.py                        |    6 +-
 nova/network/quantum/client.py                 |    6 +-
 nova/network/quantum/nova_ipam_lib.py          |    2 +-
 nova/network/quantum/quantum_connection.py     |    4 +-
 nova/notifier/list_notifier.py                 |    2 +-
 nova/notifier/rabbit_notifier.py               |    2 +-
 nova/rpc/impl_kombu.py                         |    4 +-
 nova/rpc/impl_qpid.py                          |    4 +-
 nova/tests/fake_utils.py                       |    2 +-
 nova/tests/test_localization.py                |   97 ------------------------
 nova/tests/test_xenapi.py                      |    8 +-
 nova/utils.py                                  |   28 ++++---
 nova/virt/baremetal/proxy.py                   |    4 +-
 nova/virt/baremetal/tilera.py                  |   12 ++-
 nova/virt/libvirt/connection.py                |    4 +-
 nova/virt/xenapi/vm_utils.py                   |    2 +-
 nova/volume/api.py                             |    2 +-
 nova/volume/driver.py                          |    6 +-
 nova/volume/san.py                             |   12 +--
 tools/esx/guest_tool.py                        |    5 +-
 tools/hacking.py                               |   91 ++++++++++++++++++++++
 28 files changed, 163 insertions(+), 174 deletions(-)

commit 66c900084e4242a40364ed4b6e9dcf749fabf650
Merge: ace0ac8 07bbe57
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 17:36:06 2012 +0000

    Merge "Run tools/hacking.py instead of pep8 mandatory."

commit ace0ac8bbfcbbb7ad0a7c642da469fb86fb621d6
Merge: 3717686 c7dbed9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 17:26:43 2012 +0000

    Merge "Add validation on quota limits (negative numbers)."

commit 371768644986d20c024eff2dc63cbcab15f48c4d
Merge: e80c6fe 14f0bc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 17:17:44 2012 +0000

    Merge "Use thread local storage from openstack.common."

commit 55d282a089bd8c682b1846aefb266177ef2119a4
Author: Andrew Clay Shafer <acs@parvuscaptus.com>
Date:   Mon Apr 2 10:01:04 2012 -0400

    Log kwargs on a failed String Format Operation
    
    fixes bug 971552
    
    If the string format operation in NovaException raises an exception be sure to
    log the kwargs at log level error
    
    Change-Id: Idfc54b8c05256bd7c849c86dc45f0b493727fe58

 nova/exception.py            |    5 +++++
 nova/tests/test_exception.py |    7 +++++++
 2 files changed, 12 insertions(+)

commit e80c6fe323ee64545c3c3a917b598d646f299161
Merge: d5daf41 63c59b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 16:31:35 2012 +0000

    Merge "migration_get_all_unconfirmed() now uses lowercase "finished" Fixes bug 977719"

commit d5daf415b922ce4128ef31602ba2dc8318a9bb28
Merge: a597466 995d3e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 16:14:25 2012 +0000

    Merge "Change Diablo document reference to trunk"

commit a597466e868d9321f6a63e4595ca5320ae1a911f
Merge: 384b758 6792934
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 15:23:02 2012 +0000

    Merge "Allow instance logging to use just a UUID."

commit 97074667b58a980de0a2ddd2d1ddfc6078ecfc75
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Apr 10 10:28:10 2012 -0400

    Standardize quota flag format
    
    Only three quota flags used max_ even though all quotas are max
    
    Change-Id: I0eb26bdca863d96df2bd00e59f7e8b9827308be7

 etc/nova/nova.conf.sample |    6 +++---
 nova/quota.py             |   12 ++++++------
 nova/tests/test_quota.py  |   38 +++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 28 deletions(-)

commit 2c14f1818d95cfc9e5dcbc6592b74cac79fb8dfb
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Apr 9 14:16:14 2012 -0400

    Remove nova Direct API
    
    blueprint remove-nova-direct-api
    
    Change-Id: I3229f8d7f37d66fcd6b978966f3a428a69e08bb1

 bin/nova-direct-api       |  110 -------------
 bin/stack                 |  162 -------------------
 nova/api/direct.py        |  378 ---------------------------------------------
 nova/tests/test_direct.py |  216 --------------------------
 setup.py                  |    4 +-
 tools/pip-requires        |    1 -
 6 files changed, 1 insertion(+), 870 deletions(-)

commit 63c59b877513a02ee94e29978314971734148de0
Author: Mandar Vaze <mandar.vaze@vertex.co.in>
Date:   Tue Apr 10 05:05:17 2012 -0700

    migration_get_all_unconfirmed() now uses lowercase "finished" Fixes bug
    977719
    
    status set in _finish_resize is lower case, but
    migration_get_all_unconfirmed() was filtering using FINISHED
    Also updated corresponding test case to use lower case "finished"
    Updated Authors file
    
    Change-Id: Ia30e66e541bba91a9dd3d3af1429b2312870793a

 Authors                   |    1 +
 nova/db/sqlalchemy/api.py |    2 +-
 nova/tests/test_db_api.py |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 07bbe577542b1e0c81d8fe9880df9955e0583d73
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Mar 14 07:35:05 2012 +0400

    Run tools/hacking.py instead of pep8 mandatory.
    
    Change-Id: I81db73588ece36dec4dba90b9841ed6d0fac6a8f

 nova/network/quantum/melange_ipam_lib.py |    2 +-
 nova/test.py                             |    4 ++--
 run_tests.sh                             |   23 ++++-------------------
 3 files changed, 7 insertions(+), 22 deletions(-)

commit 384b758166ed72fc16da7c5ad18eedc044bbc633
Merge: 24effa3 761e4e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 00:18:57 2012 +0000

    Merge "Delete fixed_ips when network is deleted"

commit 24effa38bdfb846ab52ff6654503c3e65bd613d3
Merge: 1e63b8d bc9f8d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:54:41 2012 +0000

    Merge "Cloudpipe tap vpn not always working"

commit 1e63b8d182f99623460139c4d7a48ba925b11409
Merge: a0c8015 1478aa3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:52:38 2012 +0000

    Merge "Create compute.api.BaseAPI for compute APIs to use"

commit 761e4e0cbe12b9d196f8e63146dce9513718ece1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 3 11:30:57 2012 -0700

    Delete fixed_ips when network is deleted
    
     * adds failing test
     * adds exception that is raised when network is in use
     * fixes bug 754900
    
    Change-Id: Ib95dc5927561b979b1eea237d4d6dc323483d4a5

 nova/db/sqlalchemy/api.py |   13 +++++++++++++
 nova/exception.py         |    4 ++++
 nova/tests/test_db_api.py |   19 +++++++++++++++++++
 3 files changed, 36 insertions(+)

commit a0c80152de14b93f960b4631f39339bd0d11b617
Merge: ca40779 7205082
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:48:55 2012 +0000

    Merge "Give all VDIs a reasonable name-label and name-description"

commit ca40779dc579bd0061bb2cf9b30a5daec75827e5
Merge: 2c3a4f1 203d51f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:44:47 2012 +0000

    Merge "Remove unecessary --repeat option for pep8."

commit 2c3a4f1cf85de84bee3e40215cbde4ca835a0841
Merge: 689fd02 c1e397b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:43:46 2012 +0000

    Merge "Information about DifferentHostFilter and SameHostFilter added."

commit 689fd02c06c97ac76605022a72d871045117a003
Merge: f4f66c8 f7a6c58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:41:10 2012 +0000

    Merge "HACKING fixes, sqlalchemy fix."

commit f4f66c8783fa83603b9f276972e92924c3eb8c77
Merge: 7be39f1 27ea547
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 23:21:44 2012 +0000

    Merge "Add index to fixed_ips.address"

commit 203d51f0e447c52a867c46c67eb39c363db47323
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Apr 9 20:43:50 2012 +0000

    Remove unecessary --repeat option for pep8.
    
    Fixes bug 977489
    
    --repeat became the default in 0.7; since we're now requiring 1.0 or
    above, this can go away.
    
    Change-Id: I85ee8ab274594ce96ece6610247dfd8a6f082af5

 run_tests.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 1478aa3478d50c587913e095f4ee14746b54dc98
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Apr 9 19:23:03 2012 +0000

    Create compute.api.BaseAPI for compute APIs to use
    
    Fixes bug 960226 where compute.api.HostAPI called non-existent methods
    
    Regression was introduced here:
    https://review.openstack.org/#change,5252
    
    Added tests for HostAPI
    
    Change-Id: Id17927bc608ff638ea9b0b5509f0f0bb14503f85

 nova/compute/api.py        |   36 ++++++++++++++++++---------------
 nova/tests/test_compute.py |   48 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 17 deletions(-)

commit 72050828c07bac76965a11ab6184aa4df9c84fee
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 22:55:18 2012 +0000

    Give all VDIs a reasonable name-label and name-description
    
    Add image id to cached glance images as well as disk type so it's easy
    to see if a VDI is an os, swap or ephemeral disk.
    
    Change-Id: I7c1e21e26a98bd38898483f4230ede3099c6099d

 nova/tests/xenapi/stubs.py   |    3 ++
 nova/virt/xenapi/vm_utils.py |  111 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    |   11 ++---
 3 files changed, 63 insertions(+), 62 deletions(-)

commit 7be39f19a0a022cc6ccca026fc9c64179f85d318
Merge: 22008a9 549616d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 19:41:46 2012 +0000

    Merge "bug 968452"

commit 22008a96fca32ccacde76a1efb602d79f8a9460e
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Apr 9 15:09:51 2012 -0400

    Remove last two remaining hyperV references
    
    Change-Id: I6fd21df97884234eee53c67023e9ce0f58f6d133

 doc/source/nova.concepts.rst |    1 -
 nova/compute/manager.py      |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 549616d12270a64548a907213c8e486bf0265dc8
Author: Brian Elliott <brian.elliott@rackspace.com>
Date:   Mon Apr 9 19:01:43 2012 +0000

    bug 968452
    
    Update test-requires to use pep8>=1.0.  Removed PEP8 warning suppression
    around 3-arg raises.
    
    Change-Id: Ib4ed42adc167aa1e8078619a36b409b76b9f5d73

 Authors             |    1 +
 run_tests.sh        |   18 ++----------------
 tools/test-requires |    2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

commit 27ea547fbd7c936bd017b64b31ecf09ed991c6c0
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Thu Mar 29 16:44:56 2012 -0400

    Add index to fixed_ips.address
    
    Addresses one of the Critical items in bug #964824
    
    Add migration to add an index to fixed_ips.address to remove a table
    scan from active code.
    
    Change-Id: Ic5a56bbddd0d434f8a37ad049753e6d25c7ca760

 .../085_add_index_to_fixed_ips_by_address.py       |   31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit 93874bacf7ec60fbc218f7aba32691255b6ae8ce
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Apr 9 15:34:19 2012 +0000

    Use 'root' instead of 'os' in XenAPI driver
    
    Instance types define disk names as root, swap and ephemeral. The
    XenAPI driver however uses os, swap and ephemeral. Standardize on
    calling them 'root' disks instead of 'os' disks.
    
    Change-Id: Ia34346d463d06cb971537c305602926ceb0dc175

 nova/tests/xenapi/stubs.py                         |    6 +++---
 nova/virt/xenapi/vm_utils.py                       |    8 ++++----
 nova/virt/xenapi/vmops.py                          |    6 +++---
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

commit 1c47d8a9cfbe5f6925b040ce7a268b6d00354436
Merge: 21dbbaa 0f7db90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 9 16:53:33 2012 +0000

    Merge "Fixes bug 952176"

commit c1e397b7465e92e4021d4f542e9edc16c624d1f3
Author: Dina Belova <dbelova@mirantis.com>
Date:   Mon Apr 9 16:59:45 2012 +0400

    Information about DifferentHostFilter and SameHostFilter added.
    
    Change-Id: Ice5f03db5f3d24455c43af86bf5722b863cbe959

 doc/source/devref/filter_scheduler.rst |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit f7a6c58d920cc4310132d4e0cb06838202de407b
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Sun Mar 11 19:04:26 2012 +0400

    HACKING fixes, sqlalchemy fix.
    
    Add exceptions to hacking.py make sqlalchemy stuff legal and prevent
    clutter.
    
    Change-Id: I44b100b4c0c4dfcec81beea7aba2d8598d5a08d0

 HACKING.rst      |   10 ++++++++--
 tools/hacking.py |   17 +++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

commit 21dbbaa3861b277b98ba8642a85b1f4f2722866f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Apr 8 17:08:59 2012 -0700

    Add test to check extension timestamps
    
    * Prevents bug 975287 from cropping up in the future
    
    Change-Id: Ief04c285cb2356db5ea6695c55416cee76512842

 .../tests/api/openstack/compute/test_extensions.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 0f7db908f9d18b0d2fef30af09a53018b130394a
Author: MotoKen <motokentsai@gmail.com>
Date:   Mon Apr 9 10:33:55 2012 +0800

    Fixes bug 952176
    
    Checks if value is string or not before decode.
    
    Change-Id: I3f839770fdd7b00223ce02b95b2a265d903fa00e

 bin/nova-manage |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 6606f036a6b0b5c100374767c3a05ab06d410852
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Sun Apr 8 22:21:43 2012 -0400

    Update doc to mention nova tool for type creation
    
    Change-Id: I5ce1b4b7032f6f82dfaa7a8f60139e148a250db8

 doc/source/runnova/managing.instance.types.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 995d3e295fd61679468dee6c401e5a70e20d4be8
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Sun Apr 8 22:01:41 2012 -0400

    Change Diablo document reference to trunk
    
    Change-Id: I1e43668ec8624f722c32e2ffebc81a387551cebc

 doc/source/nova.concepts.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 60625ce76f56e209b60721f93261d467c602588f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 8 23:05:42 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I1eac99495dc2ed1b23ce12377aa93534ef4eb527

 nova/locale/bs/LC_MESSAGES/nova.po    | 1009 ++++++++++++++-------------
 nova/locale/cs/LC_MESSAGES/nova.po    | 1220 ++++++++++++++++++---------------
 nova/locale/da/LC_MESSAGES/nova.po    | 1009 ++++++++++++++-------------
 nova/locale/de/LC_MESSAGES/nova.po    | 1013 ++++++++++++++-------------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 1021 ++++++++++++++-------------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 1021 ++++++++++++++-------------
 nova/locale/es/LC_MESSAGES/nova.po    | 1016 ++++++++++++++-------------
 nova/locale/fr/LC_MESSAGES/nova.po    | 1138 ++++++++++++++++--------------
 nova/locale/it/LC_MESSAGES/nova.po    | 1060 +++++++++++++++-------------
 nova/locale/ja/LC_MESSAGES/nova.po    | 1021 ++++++++++++++-------------
 nova/locale/ko/LC_MESSAGES/nova.po    | 1021 ++++++++++++++-------------
 nova/locale/nova.pot                  |  827 ++++++++++------------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 1018 ++++++++++++++-------------
 nova/locale/ru/LC_MESSAGES/nova.po    | 1019 ++++++++++++++-------------
 nova/locale/tl/LC_MESSAGES/nova.po    | 1006 ++++++++++++++-------------
 nova/locale/tr/LC_MESSAGES/nova.po    | 1009 ++++++++++++++-------------
 nova/locale/uk/LC_MESSAGES/nova.po    | 1003 ++++++++++++++-------------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 1002 ++++++++++++++-------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 1013 ++++++++++++++-------------
 19 files changed, 10407 insertions(+), 9039 deletions(-)

commit bc9f8d4fff225da6130691de2f2eea22215a4f17
Author: Cor Cornelisse <cor@hyves.nl>
Date:   Fri Apr 6 15:54:16 2012 +0200

    Cloudpipe tap vpn not always working
    
    Fixes bug 975043
    
    Since Essex, all instances will have an eth0 MAC address in the range
    of FA:16:3E, which is near the end of the MAC address space.
    
    When openvpn is started, a TAP interface is created with a random
    generated MAC address. Chances are high the generated MAC address is
    lower in value than the eth0 MAC address. Once the tap interface is
    added to the bridge interface, the bridge interface will no longer have
    the eth0 MAC address, but take over the TAP MAC address. This is a
    feature of the linux kernel, whereby a bridge interface will take the
    MAC address with the lowest value amongst its interfaces. After the ARP
    entries expire, this will result in the cloudpipe instance being no
    longer reachable.
    
    This fix, randomly generates a MAC address starting with FA:17:3E, which
    is greater than FA, and will thus ensure the brige will keep the eth0 MAC
    address.
    
    Change-Id: I0bd994b6dc7a92738ed23cd62ee42a021fd394e2

 nova/cloudpipe/bootscript.template |    5 +++++
 1 file changed, 5 insertions(+)

commit 679293467630f1a4aca2e27506db313131b51863
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Apr 7 17:42:32 2012 +1000

    Allow instance logging to use just a UUID.
    
    Sometimes all you have is an instance UUID, and its not worth
    building an instance dict just for logging. Allow callers to pass
    just the UUID if that's all they have. Resolves bug 975774.
    
    I have included a sample use as well.
    
    Change-Id: I1eb50515d837869ed7fdc5e766d8700be7da3286

 nova/compute/manager.py |   14 +++++++-------
 nova/log.py             |   21 +++++++++++++++++----
 2 files changed, 24 insertions(+), 11 deletions(-)

commit 5f5295b884f456033d742d08388862615ff3b82b
Merge: 27acf7b f49d144
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 6 21:45:22 2012 +0000

    Merge "Use -1 end-to-end for unlimited quotas"

commit 27acf7b0667d06ab786101d82ef8b502e467046f
Merge: b573276 0d03119
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 6 19:42:29 2012 +0000

    Merge "Stop libvirt test from deleting instances dir"

commit a0150a4d9e751ec222221558dfe89a66b0c118ab
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Mar 21 19:13:16 2012 +0000

    Add the serialization of exceptions for RPC calls.
    
    This change uses json to serialize an exception so that it can be sent
    through RPC calls to be reconstructed on the other side. The traceback is added
    to the exception message. If recreating the exception fails for whatever reason
    then a RemoteError is created containing all of the exception information.
    
    Adds flag 'allowed_rpc_exception_modules' to prevent dangerous modules from
    being accessed and allowing arbitrary code to be run.
    
    Fixes bug 920705
    Fixes bug 940500
    
    Change-Id: Ife3b64b19fe8abbc730184d4ee7d9fcabfd29db3

 etc/nova/nova.conf.sample                          |    5 +
 nova/api/ec2/cloud.py                              |   12 +-
 nova/api/openstack/compute/contrib/floating_ips.py |   17 +--
 nova/network/api.py                                |   24 +---
 nova/rpc/amqp.py                                   |   11 +-
 nova/rpc/common.py                                 |   79 +++++++++++
 nova/rpc/impl_fake.py                              |   12 +-
 nova/scheduler/driver.py                           |   19 +--
 .../openstack/compute/contrib/test_floating_ips.py |   15 +-
 nova/tests/rpc/common.py                           |   32 +----
 nova/tests/rpc/test_common.py                      |  147 ++++++++++++++++++++
 nova/tests/rpc/test_kombu.py                       |   53 ++++++-
 12 files changed, 330 insertions(+), 96 deletions(-)

commit b573276e00f486120b35d84b892df2c0fa617acc
Merge: 72c1dd6 2fde229
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 6 16:44:45 2012 +0000

    Merge "Cleanup xenapi driver logging messages to include instance"

commit 72c1dd677b2ea67820c07a12372904e0016742c9
Merge: 7a51a3f 4e46056
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 6 16:02:30 2012 +0000

    Merge "Remove unused user_id and project_id parameters to fetch_image()"

commit 2fde2294d8fcf536acf640f5840c4e551b9dd433
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 21:26:10 2012 +0000

    Cleanup xenapi driver logging messages to include instance
    
    Also, use the logging instance kwarg so it gets logged in a consistent
    format.
    
    Change-Id: I4429e9660ff72e1f79d889f89b5abbf1949720de

 nova/tests/test_xenapi.py    |   20 ++---
 nova/utils.py                |    4 +-
 nova/virt/xenapi/vm_utils.py |   79 +++++++++---------
 nova/virt/xenapi/vmops.py    |  189 ++++++++++++++++++++----------------------
 4 files changed, 140 insertions(+), 152 deletions(-)

commit 0d03119e2059e50105b3045eb019940c860489c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 5 17:00:25 2012 -0700

    Stop libvirt test from deleting instances dir
    
     * fixes bug 974293
    
    Change-Id: Id41ab20193a70246ad2e3e1cc18edf47059d312d

 nova/tests/test_libvirt.py |   37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

commit 7a51a3f9626fe1135a85c77cb9d2a3a119783474
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 21:26:10 2012 +0000

    Move product_version to XenAPISession
    
    This keeps it together with host_uuid and is_slave
    
    Change-Id: Ib408586baec116def6c73c6cda1ff4eba15a3127

 nova/tests/xenapi/stubs.py |   10 ++++------
 nova/virt/xenapi/vmops.py  |    5 ++---
 nova/virt/xenapi_conn.py   |   15 +++++++--------
 3 files changed, 13 insertions(+), 17 deletions(-)

commit 5f184e9d95503759b63e6e7ff124c759c31b34ea
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 18:16:29 2012 +0000

    glance plugin no longer takes num_retries parameter
    
    Change-Id: Ic377a1f8ff0f012de82791cec01f6fcb33554f11

 nova/virt/xenapi/vm_utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 4e4605694f02ec0c65fc1ced88c9f86dccd48dcb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 17:56:04 2012 +0000

    Remove unused user_id and project_id parameters to fetch_image()
    
    Change-Id: I36d3b5d849b23cd4ebf55c5a2ef8ba14e3808ee6

 nova/tests/xenapi/stubs.py   |    3 +--
 nova/virt/xenapi/vm_utils.py |   26 +++++++++++---------------
 2 files changed, 12 insertions(+), 17 deletions(-)

commit a69e3efa54bd90eac8f536c477d0deaf240bdf3f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 16:39:47 2012 +0000

    Cleanup _make_plugin_call()
    
    Not all calls to plugins need a path argument, so make it optional.
    Fix TODO to use _make_agent_call() again. Use 'instance' instead of
    'vm' to make it clearer what kind of object it is.
    
    Change-Id: I279317cd07a5753b6c8dd686d2b4786ff24b66df

 nova/virt/xenapi/vmops.py |   48 +++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

commit 30bdadad886ddb21597397522fadf09c6083b20c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 16:32:17 2012 +0000

    Push id generation into _make_agent_call()
    
    None of the callers use the id generated for any purpose other than
    passing to _make_agent_call(), so just have _make_agent_call()
    generate it for the caller
    
    Change-Id: I5bd4392d2666dcb609891f3017fb9eb0d8c243ad

 nova/virt/xenapi/vmops.py |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

commit 5265a66e9d174d5b47645ff80cc823b0ceda534e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 16:28:58 2012 +0000

    Remove unused path argument for _make_agent_call()
    
    Change-Id: I6b516fa506be06446b496555d42510c25e656ce1

 nova/virt/xenapi/vmops.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 5e09136303b06b241d4e28ef6bc3cc9cb01ea4ad
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 16:05:06 2012 +0000

    Remove unused xenstore methods
    
    Since we're in there, fix a TODO to use helper method instead of
    session directly and simplify a couple of methods that don't need to
    be so complicated
    
    Change-Id: I6eeb290e4112844381ebe0c710e54f67ca61596e

 nova/tests/test_xenapi.py |    1 +
 nova/virt/xenapi/vmops.py |  158 +++------------------------------------------
 2 files changed, 11 insertions(+), 148 deletions(-)

commit 7f4a7b3916bc91d0919252257929c68ba384d303
Merge: 7ae6524 bc173ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 5 16:19:46 2012 +0000

    Merge "Fixed bug 962840, added a test case."

commit 7ae65242bd525ce08b1168100ba16a220f73fddd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 5 05:00:41 2012 +0000

    Combine call_xenapi and call_xenapi_request
    
    The comment is incorrect and all commands can be used with either variant.
    In XenAPI.py, they have somewhat different calling styles, but our
    wrappers only differ by a tuple.
    
    Change-Id: Ideadc0deb5bd870135f732ffadd9c09d90460c83

 nova/virt/xenapi/vmops.py |   15 +++++++--------
 nova/virt/xenapi_conn.py  |   13 +------------
 2 files changed, 8 insertions(+), 20 deletions(-)

commit bc173ec44e6c3a42af22976122b46fd25546559b
Author: Yun Mao <yunmao@gmail.com>
Date:   Tue Apr 3 11:17:50 2012 -0400

    Fixed bug 962840, added a test case.
    
    eventlet.tpool.Proxy doesn't work with old-style class in __str__()
    or __repr__() calls. See bug #962840 for details.
    We perform a monkey patch to replace those two instance methods.
    
    Change-Id: Ia51bbd3e71cad7df45da5b3b27eef70f9d9e9002

 nova/tests/test_libvirt.py      |   18 ++++++++++++++++++
 nova/virt/libvirt/connection.py |   18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

commit f49d1441f789f73ac359ed6161579911a816a542
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Wed Apr 4 15:57:19 2012 +0100

    Use -1 end-to-end for unlimited quotas
    
    Dispense with the mapping of -1 to None for unlimited quota and
    quota-class thresholds.
    
    Now -1 is persisted directly in the quotas table to represent unlimited.
    
    Avoids the asymmetry of -1 representing unlimited on quotas create/update
    versus None for quotas show.
    
    Change-Id: Ic9d3e22c4d68447af6a7f79a9703fa6ac26f01cc

 nova/db/sqlalchemy/api.py                          |    6 ---
 .../migrate_repo/versions/084_quotas_unlimited.py  |   43 +++++++++++++++
 nova/quota.py                                      |    5 +-
 nova/tests/test_quota.py                           |   55 +++++++-------------
 4 files changed, 64 insertions(+), 45 deletions(-)

commit c7532c62ea6afb4bfcf3d00e42a58cc72b12405b
Author: Mike Lundy <mike@pistoncloud.com>
Date:   Wed Apr 4 11:38:54 2012 -0700

    fix bug where nova ignores glance host in imageref
    
    This is related to bug 883328.
    
    Change-Id: Iadd1aec8d1bda3bd75bd0ab7f6797b643626db90

 nova/image/glance.py            |    8 ++++----
 nova/tests/image/test_glance.py |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 7ac5fbcc3054ec192ddc699f332a4006b3d8259f
Merge: e26bca7 6ca1718
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 4 18:18:31 2012 +0000

    Merge "Extend FilterScheduler documentation."

commit e26bca75e5676460ee0b68ea14d49b21972a2534
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 4 17:16:40 2012 +0000

    Remove unused _parse_xmlrpc_value
    
    Change-Id: Ic38592ab09c1f0a569dec2b644bdefd29ee00dff

 nova/virt/xenapi_conn.py |   12 ------------
 1 file changed, 12 deletions(-)

commit f698eba45752fddddd914892ed2bf1d5ef7e484e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Apr 4 12:36:42 2012 -0400

    Fix traceback in image cache manager.
    
    When nova is running as a different user, the image
    cache manager can cause tracebacks because it is not
    able to access the file. This fixes bug: 973377
    
    Change-Id: I7902b024e7d564fbda97ce8532c1de84ab1a4206
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/tests/test_imagecache.py   |    5 +++++
 nova/virt/libvirt/imagecache.py |    1 +
 2 files changed, 6 insertions(+)

commit cabe27b955918cbfc410ad20cf9244d5ed4439bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 4 16:14:50 2012 +0000

    Fixes regression in release_dhcp
    
     * regression from c96e75d6804d016da7c6356bf593eb86dcb2f257
     * fixes out of order update and retrieval of vif_id
     * includes failing test
     * fixes bug 973442
    
    Change-Id: I3bea1c754042ad5960f285fbcdc1d45445079f81

 nova/network/manager.py            |    5 ++---
 nova/tests/network/test_manager.py |   43 ++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

commit 14f0bc7c986b3ede8170a304b79011148f6a71a5
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Apr 4 10:28:26 2012 -0400

    Use thread local storage from openstack.common.
    
    nova.local was recently added to openstack-common.  Remove nova.local
    and use openstack.common.local instead.
    
    One benefit of this change is that it is another step toward decoupling
    nova.rpc from the rest of nova.
    
    Change-Id: I0240f4291a81f8390d3f329a11f207a1453d7cab

 nova/context.py                |    2 +-
 nova/local.py                  |   37 ----------------------------
 nova/log.py                    |    2 +-
 nova/openstack/common/local.py |   37 ++++++++++++++++++++++++++++
 nova/rpc/amqp.py               |    2 +-
 nova/tests/test_local.py       |   53 ----------------------------------------
 openstack-common.conf          |    2 +-
 7 files changed, 41 insertions(+), 94 deletions(-)

commit 6ca171810e596217f05d59ff6fdda314f9a2402f
Author: Dina Belova <dbelova@mirantis.com>
Date:   Wed Apr 4 19:36:22 2012 +0400

    Extend FilterScheduler documentation.
    
    Added more specific information on filters and weight functions.
    
    Change-Id: If0463cd9d29568dfe44c6e5ce3f2e42af5ffe240

 doc/source/devref/filter_scheduler.rst   |  284 ++++++++++++++++++++++--------
 doc/source/images/costs_weights.png      |  Bin 35723 -> 0 bytes
 doc/source/images/dating_service.png     |  Bin 31945 -> 0 bytes
 doc/source/images/filtering.png          |  Bin 18779 -> 0 bytes
 doc/source/images/filteringWorkflow1.png |  Bin 0 -> 66997 bytes
 doc/source/images/filteringWorkflow2.png |  Bin 0 -> 75288 bytes
 6 files changed, 213 insertions(+), 71 deletions(-)

commit c7dbed99d115989ad8d03db7dc3ffbcaa6fb78c3
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Apr 4 09:38:59 2012 -0400

    Add validation on quota limits (negative numbers).
    
    Quotas should not accept negative numbers other than -1.
    
    Fixes LP Bug #973034.
    
    Change-Id: Icc647d80df42d09928717d48ae95dfc8b76c4795

 nova/api/openstack/compute/contrib/quotas.py       |    7 +++++++
 .../api/openstack/compute/contrib/test_quotas.py   |   12 ++++++++++++
 2 files changed, 19 insertions(+)

commit d9019f7aa6e1817d2aabcd59e7dde3d212b4e092
Merge: 01b9cec 01f24ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 4 01:17:14 2012 +0000

    Merge "Allow unprivileged RADOS users to access rbd volumes."

commit 01b9cece5ca4232648ca305eb7e08e8b45176426
Merge: 06407be cf7c0a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 4 00:42:23 2012 +0000

    Merge "Get unit tests functional in OS X"

commit 06407be0da134db23cfd02fe320caa5c444315c2
Merge: d4aab5b c96e75d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 23:31:20 2012 +0000

    Merge "Grab the vif directly on release instead of lookup"

commit d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c
Merge: 4726e3d 12d9a5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 22:48:03 2012 +0000

    Merge "Make sure cloudpipe extension can retrieve network"

commit 4726e3d8e1f6700dd19f5ec72a249d5c2dfb1efd
Merge: c147878 ee2b378
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 22:38:34 2012 +0000

    Merge "Do not fail to build a snapshot if base image is not found"

commit c1478783866ff3d3807e0d0407b0906581042662
Merge: 7f226a7 16b01aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 22:29:43 2012 +0000

    Merge "Auto-confirming resizes would bail on exceptions"

commit cf7c0a7c10723495953be9bf99aedbe3838e0787
Author: Matt Stephenson <mattstep@mattstep.net>
Date:   Tue Apr 3 14:38:09 2012 -0700

    Get unit tests functional in OS X
    
    * Add detection for directio to ensure the python runtime is built with O_DIRECT
    * Extend stubbing in test_libvirt to also stub out _supports_direct_io
    
    Change-Id: Id793d4039311396f0b3c3a52d2a1d951ec3c5e48

 nova/tests/test_libvirt.py      |    6 ++++++
 nova/virt/libvirt/connection.py |    6 ++++++
 2 files changed, 12 insertions(+)

commit 12d9a5a38b9968f488b26822dc082ecbc484bbe9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 3 13:47:40 2012 -0700

    Make sure cloudpipe extension can retrieve network
    
     * includes failing test
     * fixes bug 972583
    
    Change-Id: Idadac82c6a0fda8a1b912fb974e5754a1e82df39

 nova/api/openstack/compute/contrib/cloudpipe.py    |    7 +++++++
 .../openstack/compute/contrib/test_cloudpipe.py    |    7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 7f226a7bd560fe76cfa6f2211b1694c4c6b4dd47
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 3 15:23:48 2012 -0400

    Treat -1 quotas as unlimited.
    
    Updates quota db API calls so they treat -1 quotas as unlimited
    for consistency with the Nova flags.
    
    Fixes LP Bug #972034.
    
    Change-Id: I56456c2780110f8fd55afa9d1fe30193bf99d928

 nova/db/sqlalchemy/api.py |    6 ++++++
 nova/tests/test_quota.py  |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

commit 16b01aa96532d789dba189029764aad82ab6c362
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Apr 2 22:19:26 2012 +0000

    Auto-confirming resizes would bail on exceptions
    
    Fixes bug 971939
    
    Fixes a few things.  If instance went to error, we should set the
    migration to error so we don't retry.  Also, if we get any other
    exceptions when trying to confirm resizes, we should not bail out of the
    loop.  Also: be nice to other greenthreads and yield on each iteration.
    
    Includes complete unit test for xenapi poll_unconfirmed_resizes which
    didn't exist prior to this patch.
    
    Change-Id: I6f7c1ccfd4be0f1497727d817130a821902d134d

 nova/tests/test_xenapi.py |  120 ++++++++++++++++++++++++++++++++++++++++-----
 nova/virt/xenapi/vmops.py |   53 ++++++++++++++------
 2 files changed, 148 insertions(+), 25 deletions(-)

commit adb212405684c798464861f6e188db3de0f04605
Merge: 32f07e6 7c26534
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 18:08:40 2012 +0000

    Merge "ensure atomic manipulation of libvirt disk images"

commit c96e75d6804d016da7c6356bf593eb86dcb2f257
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 3 10:07:05 2012 -0700

    Grab the vif directly on release instead of lookup
    
     * adds extra error handling and logging
     * safer fix for bug 968457
    
    Change-Id: I6d8c27c642e70dc701548550c0d94a8e0e64ce99

 nova/network/manager.py            |   22 ++++++++++++++++++----
 nova/tests/network/test_manager.py |    5 ++---
 2 files changed, 20 insertions(+), 7 deletions(-)

commit 32f07e62e9358ab8560ed70f17326009de2b04ae
Merge: 4ceb1ad a5e7645
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 3 11:40:21 2012 +0000

    Merge "Remove auth_uri, already have auth_host, auth_port"

commit 4ceb1adc487b8ae55b881596f9f406d867df902d
Author: Gabriel Hurley <gabriel@strikeawe.com>
Date:   Mon Apr 2 18:29:26 2012 -0700

    Corrects an AttributeError in the quota API.
    
    Fixes bug 972001.
    
    Change-Id: Iaf833bb6dae9cc17689e9f13eff917e91a2b722a

 Authors                                      |    1 +
 nova/api/openstack/compute/contrib/quotas.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 01f24caba86c987b0109f743979a4e99e8afed11
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Mon Apr 2 16:41:07 2012 -0700

    Allow unprivileged RADOS users to access rbd volumes.
    
    This makes it possible to access rbd volumes with RADOS users with
    restricted privileges. Previously, the admin user was always used.
    
    This requires libvirt 0.9.8 or higher.
    
    Change-Id: Ia4665c2a93a58a1c1290f467a3d9cd6cd22d7bd5

 nova/tests/test_libvirt.py        |   53 +++++++++++++++++++++++++++++++++++++
 nova/tests/test_libvirt_config.py |   25 +++++++++++++++++
 nova/virt/libvirt/config.py       |   10 +++++++
 nova/virt/libvirt/volume.py       |    5 ++++
 nova/volume/driver.py             |   15 +++++++++--
 5 files changed, 106 insertions(+), 2 deletions(-)

commit 276716e790b4f240347ae81357f58beeb4faf7a7
Merge: f83d60b 70a7129
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 2 23:14:30 2012 +0000

    Merge "Remove nova.rpc.impl_carrot."

commit 70a712921f1d9253653ebe0d25a2c23d5cf5d750
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Apr 2 18:23:09 2012 -0400

    Remove nova.rpc.impl_carrot.
    
    This module was marked as deprecated and scheduled for removal in Essex.
    Remove it now that Folsom development is open.  nova.rpc.impl_kombu
    should be used instead.
    
    This patch also removes nova.testing.fake.rabbit, since as far as I can
    tell, it isn't used anymore and was the last thing still using the
    carrot dependency.
    
    Change-Id: I8cfb2d09ee5eed439ec1d152261f7097faf08ad6

 nova/rpc/impl_carrot.py       |  684 -----------------------------------------
 nova/test.py                  |    5 -
 nova/testing/fake/rabbit.py   |  153 ---------
 nova/tests/rpc/test_carrot.py |   41 ---
 tools/pip-requires            |    1 -
 5 files changed, 884 deletions(-)

commit f83d60b2e4f29be7b0fb69baada59645b4b72668
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Apr 2 17:44:22 2012 -0400

    Sync openstack.common.cfg from openstack-common.
    
    Change-Id: I54c7afc1c20f5fbec02dc879f7a753d07adfb5db

 nova/openstack/common/cfg.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit dc131983bac9d01355d7337241871b615866f6e6
Author: Peng Yong <ppyy@pubyun.com>
Date:   Mon Apr 2 23:36:20 2012 +0800

    add libvirt_inject_key flag
    fix bug #971640
    
    Change-Id: I48efc5babdd9b233342a33c87c461aabf5f5915b

 nova/virt/libvirt/connection.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ee2b37877d555bbd02d28606de1bb54d284698c1
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Mar 29 11:22:21 2012 +0200

    Do not fail to build a snapshot if base image is not found
    
    This fixes bug #968066
    
    Change-Id: I1959e4dd7cb19acef54f0e857f4d8b3d40985b77

 nova/tests/test_libvirt.py      |   34 ++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    8 ++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

commit 48c191ffeaf2063a338eec21f9e46878e3204e77
Author: Ionuț Arțăriși <iartarisi@suse.cz>
Date:   Mon Apr 2 16:34:48 2012 +0200

    fix TypeError with unstarted threads in nova-network
    
    (nova): TRACE: File "/usr/lib64/python2.6/site-packages/nova/utils.py",
    line 860, in __init__
    (nova): TRACE: self.tname = "-%x-%x" % (ident & 0xffffffff, gident &
    0xffffffff)
    (nova): TRACE: TypeError: unsupported operand type(s) for &: 'NoneType'
    and 'int'
    
    Fixes: bug 971629
    
    Change-Id: I3d34816c36a11cd6fc2dd9c889c93c5872133a2c

 Authors       |    1 +
 nova/utils.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 9737704df0c022dca6ce0f790a5f21cfd0389da7
Author: Peng Yong <ppyy@pubyun.com>
Date:   Mon Apr 2 23:04:34 2012 +0800

    remove unused flag:
    baremetal_injected_network_template
    baremetal_uri
    baremetal_allow_project_net_traffic
    
    Change-Id: I9766924cc7621e14fc52088a558b95cfd5d7ce8d

 nova/virt/baremetal/proxy.py |    9 ---------
 1 file changed, 9 deletions(-)

commit a8aa3ffdeb4d171ec8b7b07472ed9008df1efb75
Merge: 389ee12 fb8dff3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Apr 2 00:21:02 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 389ee1231def22d5769660f3931197cd928781fb
Merge: 6b5448b d0aa024
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 1 23:17:31 2012 +0000

    Merge "Ensure floating ips are recreated on reboot"

commit fb8dff3a99be0f699bebd6eeda823947bf0e61e4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 1 23:05:04 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Ieebf53552ab0c3e1d0e77386d2d5089d35f5389a

 nova/locale/bs/LC_MESSAGES/nova.po    |  994 +++++++++--------
 nova/locale/cs/LC_MESSAGES/nova.po    | 1935 +++++++++++++++++----------------
 nova/locale/da/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/de/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/en_AU/LC_MESSAGES/nova.po |  993 +++++++++--------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 1072 +++++++++---------
 nova/locale/es/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/fr/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/it/LC_MESSAGES/nova.po    |  994 +++++++++--------
 nova/locale/ja/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/ko/LC_MESSAGES/nova.po    |  994 +++++++++--------
 nova/locale/nova.pot                  |  961 ++++++++--------
 nova/locale/pt_BR/LC_MESSAGES/nova.po |  993 +++++++++--------
 nova/locale/ru/LC_MESSAGES/nova.po    | 1048 +++++++++---------
 nova/locale/tl/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/tr/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/uk/LC_MESSAGES/nova.po    |  993 +++++++++--------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 1868 +++++++++++++++----------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po |  994 +++++++++--------
 19 files changed, 10822 insertions(+), 9968 deletions(-)

commit 6b5448bba94c12edef376ae7bab8296cd759ff89
Merge: f51b453 6ec0ac3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 1 22:58:03 2012 +0000

    Merge "fixed postgresql flavor-create"

commit f51b4534f9152811a80d1430fab9ba7b53816a71
Merge: cbcd3fb 6883447
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 1 22:47:39 2012 +0000

    Merge "Add rootwrap for touch"

commit cbcd3fb2bf4f698efcd4899a1c3935a6fd91d85b
Merge: 37dad35 b893608
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 1 20:24:45 2012 +0000

    Merge "Make kombu failures retry on IOError"

commit 6ec0ac30c760328aa52474ad77d0ace40550e3d3
Author: J. Daniel Schmidt <jdsn@suse.de>
Date:   Fri Mar 30 12:20:21 2012 +0200

    fixed postgresql flavor-create
    
    fixes bug 968190
    nova flavor-create failed on postgresql DB
    because sqlalchemy tried to write an integer into a varchar field
    
    Change-Id: Ib47d8d10e96fedb2158f454503fe1ca3493c16bb
    Signed-Off-By: Bernhard M. Wiedemann <bwiedemann suse.com>

 Authors                        |    1 +
 nova/compute/instance_types.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 6883447ea0723bec1f53c207b8854e6a4891b033
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Mar 31 15:05:44 2012 -0700

    Add rootwrap for touch
    
     * fixes bug 969959
    
    Change-Id: I8baca18c57ed1311a2f3aeb93ad92e34be380c50

 nova/rootwrap/compute.py |    3 +++
 1 file changed, 3 insertions(+)

commit d0aa02485614ba8e6258c6743d03e83bc8983f2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Mar 31 14:48:30 2012 -0700

    Ensure floating ips are recreated on reboot
    
     * includes failing test
     * fixes bug 970041
    
    Change-Id: Ifee5b95b86278dcf2320460cf700293fd3a21153

 nova/network/manager.py            |   12 +++++++++---
 nova/tests/network/test_manager.py |   27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

commit 37dad352a17203102b4b9b828f84db9b75c57071
Author: Michael Still <mikal@stillhq.com>
Date:   Mon Mar 26 14:37:48 2012 +1100

    Handle instances being missing while listing floating IPs
    
    This resolves bug 964950, which is a nova-manage crash while
    listing floating IPs when an instance has gone missing.
    
    Change-Id: Ib628356608bc0cbb9089029876ab1df7e9f02531

 bin/nova-manage |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 3842f2f7bdfcf21d2ea44b23e4b9e7d575561d2d
Merge: 3b3c6fb 46d65ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 31 01:14:23 2012 +0000

    Merge "Allow snapshots in error state to be deleted."

commit 3b3c6fbf0527f9709a8f2306b512be542257bb8b
Merge: 92c26eb b207ba3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 31 00:52:46 2012 +0000

    Merge "Fix traceback when sending invalid data."

commit 92c26eba183ee1804ca1208a1b398d4694a2da98
Merge: 0d70b48 02f32ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 31 00:30:19 2012 +0000

    Merge "Add a faq to vnc docs."

commit 0d70b486c595f71e6da84367ca9a4e98e4f316d5
Merge: 6643abc a68156c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 31 00:19:14 2012 +0000

    Merge "bug 965335"

commit 46d65edcc948781aeea1d611735d81c2b29322f3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 29 16:41:21 2012 -0700

    Allow snapshots in error state to be deleted.
    
     * Fixes bug 968682
    
    Change-Id: I37fd8e84e50b2f824f978eb7e3181ffb6ddde537

 nova/tests/test_volume.py |   20 ++++++++++++++++++++
 nova/volume/api.py        |    4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

commit 6643abc49899a75c958bdd9876f6dd3b8a135a95
Merge: a4dd6b6 283ea4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 23:34:14 2012 +0000

    Merge "Export user id as password to keystone when using noauth"

commit a4dd6b6f06d222f49bd0d2582dfe0f2925a1638f
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Mar 28 18:52:41 2012 -0700

    Ensure a functional database connection
    
    Allow retrying database connection in get_engine() at an interval.  Resolves
    the issue of nova components erroring at startup if a database connection is
    unavailable, particularly at boot. Borrowed from a similar commit to glance,
    (https://review.openstack.org/#change,5552).
    
    Fixes Bug #959426 for nova.
    
    Update: * Properly return an engine (fixes tests)
            * Setting sql_max_retries to -1 will retry infinitely
            * Bumped options count in nova.conf.sample
            * i18n log warning
            * Add note to flag help about -1 == infinite
            * Pep8 fix
    
    Change-Id: Id34eda9e0bad6b477a74e9a7d3575e513e6291d5

 etc/nova/nova.conf.sample     |    4 +++-
 nova/db/sqlalchemy/session.py |   36 ++++++++++++++++++++++++++++++++++--
 nova/flags.py                 |    4 ++++
 3 files changed, 41 insertions(+), 3 deletions(-)

commit 02f32ae981062906ff4930f11678cd886bff9962
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Mar 30 11:15:15 2012 -0700

    Add a faq to vnc docs.
    
     * Also remove an old reference to vnc_redux
     * Fixes bug 969445
    
    Change-Id: I918aaa8b81f595dea31596c6db4ac40b55d3d6b4

 doc/source/runnova/vncconsole.rst |   96 ++++++++++++++++++++++++++++++++++---
 1 file changed, 90 insertions(+), 6 deletions(-)

commit 24dae1be55bced54501c4a06969ee0b3c203e633
Merge: f1410fd e1580f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 18:19:32 2012 +0000

    Merge "Handle not found in check for disk availability"

commit f1410fd86eb927db5ec5f832d491b3f4106d6823
Merge: 741c2e3 668af39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 18:10:48 2012 +0000

    Merge "Check that DescribeInstance works with deleted image"

commit 47166a0fea339455387e12e610fccae9a93ef99a
Author: Peng Yong <ppyy@pubyun.com>
Date:   Sat Mar 31 00:39:04 2012 +0800

    adjust logging levels for linux_net
    
    Change-Id: Ifb199d644ce47c5a222f1f1bfc22a14a42f75686

 nova/network/ldapdns.py   |   30 +++++++-------
 nova/network/linux_net.py |   97 ++++++++++++++++++++++-----------------------
 2 files changed, 63 insertions(+), 64 deletions(-)

commit 741c2e32ce0f34b8128d1b4234fed8b02a4940af
Merge: ad4e65a b302e41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 17:15:57 2012 +0000

    Merge "Acccept metadata ip so packets aren't snatted"

commit e1580f2f99e8900aabdb5a049198adcc5af86229
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 30 10:05:45 2012 -0700

    Handle not found in check for disk availability
    
     * includes failing test
     * fixes bug 968339
    
    Change-Id: I92951a9d2f2027464e915608e8aaf205543f3c93

 nova/tests/test_libvirt.py      |   16 ++++++++++++++++
 nova/virt/libvirt/connection.py |    3 +++
 2 files changed, 19 insertions(+)

commit ad4e65a6688fceecac3f44f9d8eb46e35b6ed6d8
Merge: 0a6ffe3 43c63d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 16:38:27 2012 +0000

    Merge "Check that volume has no snapshots before deletion"

commit b302e41785920a910013b07b40c0384b2294172c
Author: Peng Yong <ppyy@pubyun.com>
Date:   Fri Mar 30 23:25:32 2012 +0800

    Acccept metadata ip so packets aren't snatted
    
     * fixes bug 968453
    
    Change-Id: I12a7967bb711fe5fd9a7ebc2473209833d33f546

 nova/network/linux_net.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 0a6ffe3f2a570aa222814efa149882edf8a7b224
Merge: 7567681 a837f92
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 16:25:21 2012 +0000

    Merge "Fix libvirt rescue."

commit a68156c100022b9d1e5640ed532b0c734e422c38
Author: John Kennedy <john.m.kennedy@intel.com>
Date:   Fri Mar 30 14:23:22 2012 +0100

    bug 965335
    
    Resolves unclear formatting of compute extensions documentation at
    http://nova.openstack.org/api_ext/index.html
    
    The rst extensions template has been updated to include extension name as
    top level hierarchy, and demote all other content.
    
    All existing documentation pages have been reformatted as per the updated
    template.
    
    The ext_aggreagates.rst file has also been added to index.rst.
    
    Amendments:
     - Author added to Authors file
     - Typo in ext_volumes.rst fixed
    
    Change-Id: Id67ef91a6e8eaaf4fba46abbd57759c77aaf8991

 Authors                                       |    1 +
 doc/source/api_ext/ext_aggregates.rst         |   33 ++++++------
 doc/source/api_ext/ext_config_drive.rst       |   34 ++++++------
 doc/source/api_ext/ext_floating_ip_dns.rst    |   36 +++++++------
 doc/source/api_ext/ext_floating_ips.rst       |   33 ++++++------
 doc/source/api_ext/ext_keypairs.rst           |   34 +++++++-----
 doc/source/api_ext/ext_multinic.rst           |   36 +++++++------
 doc/source/api_ext/ext_quotas.rst             |   44 ++++++++--------
 doc/source/api_ext/ext_rescue.rst             |   39 +++++++-------
 doc/source/api_ext/ext_security_group.rst     |   41 +++++++--------
 doc/source/api_ext/ext_virtual_interfaces.rst |   36 ++++++++-----
 doc/source/api_ext/ext_volumes.rst            |   43 +++++++++------
 doc/source/api_ext/index.rst                  |    1 +
 doc/source/api_ext/rst_extension_template.rst |   70 ++++++++++++++-----------
 14 files changed, 263 insertions(+), 218 deletions(-)

commit 283ea4a16622287c476141736d373405119f3e79
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 30 14:34:14 2012 +0100

    Export user id as password to keystone when using noauth
    
    Fixes bug #969208
    
    When using noauth, a user's password is her user id (e.g. in novarc).
    
    When we export to keystone, we should make sure the same credentials
    keep working rather than effectively switching all the passwords to
    random UUIDs which users would never have seen before.
    
    Change-Id: Ie77c622ce1952d03e836bb64167184022a02e902

 bin/nova-manage                |   11 +++++++++--
 nova/tests/test_nova_manage.py |   24 +++++++++++++++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)

commit 668af3986888a2e2368d5d3fd01e674e849990e2
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Mar 22 14:40:10 2012 +0100

    Check that DescribeInstance works with deleted image
    
    This test checks that even if the image is non-existant, DescribeInstances
    returns correctly an answer and does not fails because of ImageNotFound".
    
    This has been the case previously (essex-4), and its now fixed with other
    another issue listed in bug #948286, but I wrote a test to be sure of that.
    
    Change-Id: I34df7a3fbc492f4418b2751b2b8bc527a7bbe335
    Signed-off-by: Julien Danjou <julien@danjou.info>

 nova/tests/api/ec2/test_cloud.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 43c63d11417de8624d120ca78a9849d09ffa8cf6
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 29 16:57:19 2012 -0700

    Check that volume has no snapshots before deletion
    
     * Raise a helpful error message if existing snapshots are detected
     * Fixes bug 968700
     * Fixes bug 968649
    
    Change-Id: I470db6bd51a103249aae9bfcb2167f0a486732c2

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    7 +++++++
 nova/tests/test_volume.py |   23 +++++++++++++++++++++++
 nova/volume/api.py        |    6 ++++++
 4 files changed, 41 insertions(+)

commit 75676812e867a36778fa5b1beb3d2dbfcb87bec2
Merge: 7bd863f 1892c28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 00:49:19 2012 +0000

    Merge "Allow self-referential groups to be created"

commit 7bd863faf454a19c8e1caac556cefaf24722887d
Merge: 3b41516 b24c11b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 30 00:28:24 2012 +0000

    Merge "Update KillFilter to handle 'deleted' exe's."

commit 3b415162bd3c523a408525e763503184d5910a26
Merge: 307fa34 be80a55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 23:02:20 2012 +0000

    Merge "Check vif exists before releasing ip"

commit 307fa34af0322fc1d4adcb0a3912cb72000a979e
Merge: ebd7a68 d4d081a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 21:15:28 2012 +0000

    Merge "Default scheduler to spread-first"

commit a837f92e39c74f1a97e358f1a8ecfcdb0915bf6c
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 29 16:25:10 2012 -0400

    Fix libvirt rescue.
    
    Updates libvirt connection.py so that it chowns console.log
    correctly when performing a rescue.
    
    Fixes LP Bug #968587.
    
    Change-Id: I38a97df92330a9f20f43e9e4598da3375c6a22dc

 nova/virt/libvirt/connection.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit be80a55d41f03a9e22d8d90a91bf6b9c09c0c692
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 29 11:44:34 2012 -0700

    Check vif exists before releasing ip
    
     * adds test to make sure code doesn't raise
     * fixes bug 968457
    
    Change-Id: I7110cb18a45fb955769247a9a0c5fb721ab3935a

 nova/network/manager.py            |    3 ++-
 nova/tests/network/test_manager.py |   26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

commit ebd7a689a653117fd52856d2b3a5853855d20877
Merge: 8079d82 5874779
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 19:14:31 2012 +0000

    Merge "Minor xenapi driver cleanups"

commit 8079d82e6c0d419017fdea079fe02fe7cde002d8
Merge: b5e92a3 dc5a29d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 19:06:24 2012 +0000

    Merge "Continue on the the next tenant_id on 400 codes"

commit b893608b77dac11fceb0b0392f8f908de586970b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Mar 29 18:44:16 2012 +0000

    Make kombu failures retry on IOError
    
    Fixes bug 797770
    
    Unfortunately if rabbit decides protocol negotiation is taking too long,
    it will close the socket on us.  This ends up raising IOError with a
    'socket closed' message.  This patch will catch IOError and re-try.
    
    Change-Id: I9110c845b71118c0fad760d90e91c585e6db46ed

 nova/rpc/impl_kombu.py       |    4 ++--
 nova/tests/rpc/test_kombu.py |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

commit b5e92a337b783d787cb551877f8a6f8cbc0a5a6e
Merge: 65cc21d 2c5112e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 18:53:39 2012 +0000

    Merge "Touch in use image files when they're checked."

commit 65cc21d58b4c29cdbfe0ec3a55b43b2a9fd76425
Merge: 9cc356c 0384aa5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 18:40:07 2012 +0000

    Merge "Fix disassociate query to remove foreign keys"

commit 9cc356cbcf5f1cac9c7727f0fca5dad3db3187bd
Merge: 0941100 6432997
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 18:26:46 2012 +0000

    Merge "Support sql_connection_debug to get SQL diagnostic information"

commit 0941100bc7dc588d2dec55db7af7aebf4da2d753
Merge: 95f980c 9546e3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 18:09:45 2012 +0000

    Merge "adjust logging levels for libvirt error conditions"

commit 95f980c4f9563b4822c065549335c1f3020dd54e
Merge: f2e822c 497502c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 17:46:08 2012 +0000

    Merge "Fix marker behavior for flavors"

commit f2e822cc312b216eeab4db5bda3a73bbf9e1710e
Merge: f0cb908 318d82b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 17:35:43 2012 +0000

    Merge "Support timestamps as prefixes for traceback log lines."

commit f0cb9083057dcf89affc64cc0c4b6d6a7ccade41
Merge: e7068fd 9b1bbc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 17:27:14 2012 +0000

    Merge "When dnsmasq fails to HUP log an error."

commit e7068fd481f6cb887da3a8488435d7c911539bb2
Merge: 484f0a4 0fa7d12
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 17:18:09 2012 +0000

    Merge "Adds middleware to limit request body sizes."

commit 484f0a42be3c36aaf508264e1109e0c9b1abc07e
Merge: 431f13c 38bc2d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 17:03:41 2012 +0000

    Merge "Base image signature files are not images."

commit 431f13c4f3457f04224e5d0095d91772750dffc1
Merge: b325b87 e52cd4f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 16:38:43 2012 +0000

    Merge "Fix exception type in _get_minram_mindisk_params"

commit b325b873635840d10686ac67d8f7dcc25a9e9c72
Merge: 1e07b60 954de21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 16:27:44 2012 +0000

    Merge "fixed bug lp:968019 ,fix network manager init floating ip  problem."

commit 1e07b607366cbb30b48eb4816a0424a00100daf1
Merge: df6a6bc c7f526f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 29 15:32:34 2012 +0000

    Merge "Add validation for OSAPI server name length."

commit 0fa7d12dbfb7ae016657dd91034b4c0781ea43de
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 23 15:40:57 2012 -0400

    Adds middleware to limit request body sizes.
    
    Fixes LP Bug #962515.
    
    Change-Id: Ic1be1459515654d45febd89da58b19e0840aaf9d

 etc/nova/api-paste.ini           |   19 ++++++++------
 nova/api/sizelimit.py            |   54 ++++++++++++++++++++++++++++++++++++++
 nova/tests/api/test_sizelimit.py |   51 +++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 8 deletions(-)

commit c7f526fae6062e9ab51f65474af71d496aa66554
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 23 15:03:19 2012 -0400

    Add validation for OSAPI server name length.
    
    Fixes LP Bug #962515.
    
    Change-Id: Iee895604f8e9101a341a5909fc5ba2dd8e708b4b

 nova/api/openstack/compute/servers.py            |    4 +++
 nova/tests/api/openstack/compute/test_servers.py |   42 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)

commit 9546e3f3df0f4949a96392b84db53df9442d9890
Author: Peng Yong <ppyy@pubyun.com>
Date:   Thu Mar 29 12:55:05 2012 +0800

    adjust logging levels for libvirt error conditions
    
    Change-Id: I07d42169a9b3ef0bcaa0a3b033607669361f78e5

 nova/virt/libvirt/connection.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e52cd4f3420d6f3b437277e7bc9e75d5c0221290
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Mar 29 10:52:04 2012 +0200

    Fix exception type in _get_minram_mindisk_params
    
    This fixes bug #968066
    
    Change-Id: I5bdb8602fe1d808f9af72252670b40b67b8d41c9

 nova/compute/api.py        |    2 +-
 nova/tests/test_compute.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 954de21488a9e3eb8364ec9185435ad8e4b2cd57
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Thu Mar 29 15:15:38 2012 +0800

    fixed bug lp:968019 ,fix network manager init floating ip  problem.
    
    Change-Id: If2507256abcb609e7e3ee45d1585b7ba85624dee

 nova/network/manager.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 9b1bbc330fbd02caf8008e40551460c164543e3d
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 28 22:10:51 2012 -0400

    When dnsmasq fails to HUP log an error.
    
    Fixes LP Bug #967937.
    
    Change-Id: I492de5094bfb740499a65b8483d6a6f26b070042

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b24c11b4c390d6315efed595d1f92c2df6602bec
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 28 22:00:11 2012 -0400

    Update KillFilter to handle 'deleted' exe's.
    
    Updates KillFilter so that it handles the case where the executable
    linked to by /proc/PID/exe is updated or deleted.
    
    Fixes LP Bug #967931.
    
    Change-Id: I368a01383bf62b64b7579d573b8b84640dec03ae

 nova/rootwrap/filters.py |    3 +++
 1 file changed, 3 insertions(+)

commit 0384aa5416dedc61b661a347e625c827aa6f94a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 27 15:54:40 2012 -0700

    Fix disassociate query to remove foreign keys
    
     * fixes bug 965333
    
    Change-Id: I3f7605717825f91fc34d15c14a5fe86824bd3799

 nova/db/sqlalchemy/api.py |   24 +++++++++++++---------
 nova/tests/test_db_api.py |   50 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 10 deletions(-)

commit 2c5112e5938e3d567504748f923fb198fad3117e
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Mar 28 21:13:26 2012 +1100

    Touch in use image files when they're checked.
    
    It was intended that FLAGS.remove_unused_resized_minimum_age_seconds
    would indicate the number of seconds a base file was unused before it
    was removed. This however isn't true at the moment. Because instances
    are COW mostly, this will be the time since the resize occurred,
    which is normally instantly true once the image isn't being used any
    more. This small patch corrects that by touching the base image during
    check cycles which find it in use. Resolves bug 967845.
    
    Change-Id: I75bf06cf758c9a2d7a8bde5ce67c789d7e299174

 nova/tests/test_imagecache.py   |    4 ++++
 nova/virt/libvirt/imagecache.py |    2 ++
 2 files changed, 6 insertions(+)

commit 38bc2d329581bf85d131e0025a13c7e87ea9f107
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Mar 28 15:00:45 2012 +1100

    Base image signature files are not images.
    
    Stop treating base image signature files as images. Resolves bug 967843.
    
    Change-Id: Iad2f27e07a6a9887785bb4dab44476c62cd11a69

 nova/tests/test_imagecache.py   |    1 +
 nova/virt/libvirt/imagecache.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 318d82b910255751e32144604ea45c9bea9a2d26
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Mar 27 07:14:12 2012 +1100

    Support timestamps as prefixes for traceback log lines.
    
    Traceback lines in the log are now formatted to match other log
    lines. So, instead of getting something like:
    
    2012-03-26 14:53:26 ERROR nova.rpc.common [-] AMQP server on 10.55.58.1:5672 is unreachable: Socket closed. Trying again in 1 secon
    ds.
    (nova.rpc.common): TRACE: Traceback (most recent call last):
    (nova.rpc.common): TRACE:   File "/usr/lib/python2.7/dist-packages/nova/rpc/impl_kombu.py", line 446, in reconnect
    (nova.rpc.common): TRACE:     self._connect()
    (nova.rpc.common): TRACE:   File "/usr/lib/python2.7/dist-packages/nova/rpc/impl_kombu.py", line 423, in _connect
    (nova.rpc.common): TRACE:     self.connection.connect()
    [snip]
    
    You would get something like:
    
    2012-03-26 14:53:26 ERROR nova.rpc.common [-] AMQP server on 10.55.58.1:5672 is unreachable: Socket closed. Trying again in 1 secon
    ds.
    2012-03-26 14:53:26 TRACE nova.rpc.common Traceback (most recent call last):
    2012-03-26 14:53:26 TRACE nova.rpc.common   File "/usr/lib/python2.7/dist-packages/nova/rpc/impl_kombu.py", line 446, in reconnect
    2012-03-26 14:53:26 TRACE nova.rpc.common     self._connect()
    2012-03-26 14:53:26 TRACE nova.rpc.common   File "/usr/lib/python2.7/dist-packages/nova/rpc/impl_kombu.py", line 423, in _connect
    2012-03-26 14:53:26 TRACE nova.rpc.common     self.connection.connect()
    [snip]
    
    This is tracked by bug 967842.
    
    Change-Id: Ie017317f7e0b636016a220cb21a3543ab569dea5

 nova/log.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit df6a6bc79e09da872140e0e82b37db301c9b4adf
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Mar 15 11:35:30 2012 -0500

    get_instance_uuids_by_ip_filter to QM
    
    Adding a get_instance_uuids_by_ip_filter to the
    QuantumManager. Also adds the supporting calls in
    melange_ipam_lib an connector to support this. It
    currently only works with Melange, I still need to
    add a conditional that falls back on the original
    implementation in the FlatManager if not using
    Melange.
    
    update: rebase
    
    Change-Id: I9468de130c6cd1e0520f9d92c43f98aa6b36dce6

 nova/network/quantum/manager.py            |   10 +++++++++
 nova/network/quantum/melange_connection.py |    8 +++++++
 nova/network/quantum/melange_ipam_lib.py   |    5 +++++
 nova/tests/test_melange_ipam_lib.py        |    8 +++++++
 nova/tests/test_quantum.py                 |   33 ++++++++++++++++++++++++++++
 5 files changed, 64 insertions(+)

commit 998e57b29629946a9da96db3aed013ab895dc482
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Mar 28 19:21:11 2012 +0000

    Updated docstrings in /tools as per HACKING
    
    Change-Id: I06db6653784eb298ef7f78ebe99865b9c635aade

 tools/install_venv.py |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

commit 587477926c3657d3340c80a6b70f1155e8197191
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Mar 28 18:18:23 2012 +0000

    Minor xenapi driver cleanups
    
    Remove reference to Deferred that has been incorrect for a while now.
    Remove unnecessary __init__
    Cleanup whitespace and some unnecessary +'s
    
    Change-Id: Ice754ece564e88d46cd71d8ba56767d9df19dc0d

 nova/virt/xenapi/__init__.py |    3 ---
 nova/virt/xenapi/vm_utils.py |   26 ++++++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

commit dc5a29d8bd5f041c3864aed915f8ceb70ce7978a
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Mar 28 11:15:00 2012 -0500

    Continue on the the next tenant_id on 400 codes
    
    * Melange connection raises Exception if the response is > 400
    * Fixes lp967261
    
    Change-Id: I4592e5907276d290f4a54aa27dd4e91a62cc83e8

 nova/network/quantum/melange_ipam_lib.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 497502cbf833d063c964975448dfacd0e1db2ef4
Author: Phlip Knouff <philip.knouff@mailtrust.com>
Date:   Mon Mar 26 22:16:27 2012 +0000

    Fix marker behavior for flavors
    
    Fixes Bug #956096
    
    Change-Id: Ifa94a70f2aec3b9527c291e27d4710336a1d1834

 nova/api/openstack/common.py                     |    6 ++++-
 nova/api/openstack/compute/flavors.py            |   13 ++++++----
 nova/tests/api/openstack/compute/test_flavors.py |   28 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)

commit a5e76458b95608248ed0a69e1f53a3731b3272c0
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Mar 27 14:43:42 2012 -0700

    Remove auth_uri, already have auth_host, auth_port
    
    Remove to clarify config
    
    From keystone docs:
    `auth_uri``: (optional, defaults to `auth_protocol`://`auth_host`:`auth_port`)
    
    Change-Id: I4349cd9545c571b37886ae38416c27b841e797f8

 etc/nova/api-paste.ini |    1 -
 1 file changed, 1 deletion(-)

commit 930be36538e42effc0a3b03c9a3d8a06cb1693ed
Merge: f8f69dc 5638ef4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 27 16:03:39 2012 +0000

    Merge "Reduce the image cache manager periodic interval."

commit f8f69dc2edd0da19e2726a5e2068dd22e7ced0a2
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Mar 27 14:30:37 2012 +1100

    A missing checksum does not mean the image is corrupt.
    
    This is a logic error in the code. A missing checksum should not
    imply that the image is corrupt. Note that corrupt images are only
    logged, not removed, so there is no data loss for users with this
    bug.
    
    Change-Id: Ic644517d3b8e9646fe943e5cef485c4168ebb5b5

 nova/tests/test_imagecache.py   |    3 +++
 nova/virt/libvirt/imagecache.py |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit d4d081ad4cb028f9f9d389e0d7d4af3873c94cb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 26 14:33:39 2012 -0700

    Default scheduler to spread-first
    
     * Fixes bug 965732
    
    Change-Id: I239b2b235905b30879974144263037eba6ed409f

 etc/nova/nova.conf.sample                     |    4 ++--
 nova/scheduler/least_cost.py                  |    6 ++++--
 nova/tests/scheduler/test_filter_scheduler.py |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

commit 2483dbfe42a43ce372876afbd7c40c3c8daede6f
Merge: a003e45 42585a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 27 00:07:25 2012 +0000

    Merge "Handle Forbidden and NotAuthenticated glance exc."

commit 5638ef4d0b152dfdc3ec61d82f4be5a60ec36d3a
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Mar 27 10:11:38 2012 +1100

    Reduce the image cache manager periodic interval.
    
    When this code was written, I (incorrectly) believed a periodic
    task tick was about a second. It turns out that by default they're
    between 60 seconds and 120 seconds depending on a random value.
    Therefore, reduce the interval to something more reasonable.
    
    Change-Id: Id840c755f954e3e371d7238243f2248e8d402c7b

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a003e45af56e4f4c197c40fedc3b7d19a9684132
Merge: 81587ba d3b01e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 21:57:48 2012 +0000

    Merge "Destroy src and dest instances when deleting in RESIZE_VERIFY"

commit 42585a3b2559329f0e563bcd04ff6c8c19115439
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 26 14:50:17 2012 -0700

    Handle Forbidden and NotAuthenticated glance exc.
    
     * Remove references to deprecated NotAuthorized exception
     * Handle Forbidden and NotAuthenticated
     * Fixes bug 965540
    
    Change-Id: Ib5eef3015239e0fafdb01c975a0f5d553f70519e

 nova/image/glance.py            |    6 ++++--
 nova/tests/image/test_glance.py |   13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

commit 81587ba245c0929944e1edaf79909b5070c9a92e
Merge: bcae3c0 30aec4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 21:30:45 2012 +0000

    Merge "Clean up the shared storage check (#891756)"

commit d3b01e4476cbee9fde01238dbdf0a41f0220e3a3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Mar 26 14:58:27 2012 +0000

    Destroy src and dest instances when deleting in RESIZE_VERIFY
    
    Fixes bug 963630
    
    Since deletes are allowed during RESIZE_VERIFY, we need to ensure that
    the original instance is also deleted so we don't leak resources.
    
    Change-Id: Ibfd5ad4e427c247f1cd5fddcf4f43b30839a6c4f

 nova/compute/api.py |   34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

commit bcae3c0427d78a7ba1b043db60e7aba2eece9695
Merge: 575ad8f 80a5517
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 21:20:39 2012 +0000

    Merge "Don't set instance ACTIVE until it's really active"

commit 1892c2851d33eb2f5e6bb1faf0610c710888cd68
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 26 20:38:03 2012 +0000

    Allow self-referential groups to be created
    
     fixes bug 965674
    
    Change-Id: I41db135f6437e1f1cb496528ae4d134c0d9cb744

 .../openstack/compute/contrib/security_groups.py   |    4 ----
 .../compute/contrib/test_security_groups.py        |    9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 575ad8f77dc7095c8a0ba9dd8deb41bf2fddae1f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Mar 26 20:43:43 2012 +0000

    Fix unrescue in invalid state
    
    Fixes bug 965667
    
    Unrescue did not check for InstanceInvalidState exception and return the
    appropriate error.
    
    Change-Id: I3ca2c1dae09bd149086bfe67e2233c8359d5c8f8

 nova/api/openstack/compute/contrib/rescue.py       |    6 +++++-
 .../api/openstack/compute/contrib/test_rescue.py   |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

commit 30aec4a3f67144d55caded298c691503a6a57ed1
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Fri Mar 2 21:25:25 2012 +0000

    Clean up the shared storage check (#891756)
    
    The shared storage check for live and block migration is currently
    very confusing e.g.
    
      * The mounted_on_same_shared_storage() method raises FileNotFound
        for the caller to catch rather than just returning a boolean to
        indicate whether the hosts share storage
    
      * mounted_on_same_shared_storage() has a "filename is not None" check
        in its finally clause which doesn't make sense
    
      * InvalidSharedStorage is not raised in the live migration case,
    
      * instead
        FileNotFound is raised
    
    Clean all this up by having mounted_on_same_shared_storage() simply
    return a boolean and have simple logic to raise InvalidSharedStorage for live
    migration where no shared storage is available or for block migration where
    shared storage is available.
    
    Change-Id: I96f354fe41d9ce77c4cc98903f0d5a9de99ac4f6

 nova/scheduler/driver.py               |   47 ++++++++++++--------------------
 nova/tests/scheduler/test_scheduler.py |   18 ++++++------
 2 files changed, 26 insertions(+), 39 deletions(-)

commit 3433fd65d5f70d83ffa4db013f96c55970ea293e
Merge: ff150b3 2b3e368
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 19:54:20 2012 +0000

    Merge "Improve performance of safe_log()."

commit 80a55176e11da1594c9d663df0e4a0a755018c16
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Mar 26 17:25:12 2012 +0000

    Don't set instance ACTIVE until it's really active
    
    Fixes bug 963656
    
    Reverting a resize would end up setting the instance ACTIVE before the
    driver had finished all of the work starting up the original instance.
    If the instance is deleted quickly after the revert, a race condition
    could occur between restarting the original instance and deleting it.
    
    Change-Id: Iba26ad7d1bc1049137f94e13898be86698963fb3

 nova/compute/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ff150b326e649f75ee523ab42f9f0a409c0f4eca
Merge: fa9f8e6 9576d92
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 18:42:27 2012 +0000

    Merge "Fix 'nova-manage config convert'"

commit fa9f8e6d266bc86cfe82dd19e36904d1e6e7ce19
Merge: 129150c 3034b4c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 18:19:19 2012 +0000

    Merge "Add another libvirt get_guest_config() test case"

commit b207ba3ed30a4750eec60a44e4dba66c59491e7b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 26 09:41:10 2012 -0400

    Fix traceback when sending invalid data.
    
    Running euca-terminate-instance with invalid data results
    in a traceback and a hang. This fixes bug 965225
    
    Change-Id: I0b547d527bca5fb86ff650188ac903066361d933

 nova/api/ec2/__init__.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 6432997f672f5b20b3d5b6b961fc3b9bf1117022
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 26 09:32:43 2012 -0700

    Support sql_connection_debug to get SQL diagnostic information
    
    We've had a few reports of SQL issues; it'll be very helpful to be able to get SQL information
    into our log.
    
    Bug #964844
    
    Change-Id: I9d08991a3677bc6cbed45a930ede9271d685cac1

 nova/db/sqlalchemy/session.py |    6 ++++++
 nova/flags.py                 |    4 ++++
 2 files changed, 10 insertions(+)

commit 2b3e3685ff45ad0662c1bffc8896261eaa6cfbcc
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Mar 26 09:47:26 2012 -0400

    Improve performance of safe_log().
    
    This patch addresses a minor performance regression in a recent change
    to this function.  This change ensures that the deep copy is only done
    if we really need to.  Previously, the deep copy was being done for all
    messages that included a 'method', not just messages with a method that
    contain an argument to be sanitized.
    
    Change-Id: I190c5963ecaf70b0aea4e12a2fdc19deb5c1fea2

 nova/rpc/common.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 129150c853c635b28238b2ac6bd3193c453b08a7
Merge: f34b904 d1409ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 26 11:18:58 2012 +0000

    Merge "Reordered the alphabet."

commit 9576d9258672f5fa61a1f8a35bc007d4ee34bdd8
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Mar 26 09:53:46 2012 +0100

    Fix 'nova-manage config convert'
    
    Fixes bug #965069
    
    Looks like this never worked. The dest of the infile and outfile
    arguments sets up an unknown kwarg.
    
    Change-Id: I428f56564b39f5586229325db03dccb0b4a01ef6

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3034b4c57bc892812481577c5f8d2f0f3f16a89d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Mar 26 06:35:27 2012 +0100

    Add another libvirt get_guest_config() test case
    
    This would have caught bug #964843
    
    Change-Id: Id871a81ee4d5d639fd0e976b71bcd860623f6e4c

 nova/tests/test_libvirt.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit f34b904078c2b70ebf22fc9cfa0d87c7ef548381
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Mar 25 18:45:35 2012 -0400

    Fix libvirt global name 'xml_info' is not defined.
    
    Remove a line setting a stale xml_info variable.
    
    This caused failures when performing a rebuild w/ libvirt.
    
    Fixes LP Bug #964843.
    
    Change-Id: If8cbdb3198742d488325153c50d90a2ece67a3af

 nova/virt/libvirt/connection.py |    1 -
 1 file changed, 1 deletion(-)

commit e29248862785d0d248c72dc3cd059731a4e8cdae
Merge: 0c75d24 aa29a67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 25 22:00:48 2012 +0000

    Merge "makes volume versions display properly"

commit ef1f1738f23909feb5c5b2a617b1cb88986989ee
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sun Mar 25 21:59:29 2012 +0100

    Clean up read_deleted support in host aggregates code
    
    tl;dr - this is a cleaner fix for bug #949038
    
    It seems clear to me that all of the DB APIs should not explicitly pass
    read_deleted='no' or read_deleted='yes' to model_query without good
    reason.
    
    We want to allow callers to specify read_deleted via the context and
    that only works if we don't explicitly pass it to model_query().
    
    If we don't explicitly specify it to model_query(), we use the value
    from the context which defaults to 'no'.
    
    Given all that, there is no need to support read_deleted to any of the
    DB API calls because they should support specifying the flag via the
    context. There should also be no need to pass read_deleted='no' because
    that is the default.
    
    Really, the only place there should be any mention of read_deleted is
    where we want read_deleted='yes' behaviour e.g.
    
      - In tests, where we want to check the operational_state of an
        aggregate after it has been deleted
    
      - Where we want to support undeleting an aggregate or aggreate host
    
    Change-Id: I916a8d189a33d7f30838cccb26531a024066ef96

 nova/compute/api.py        |    9 +++----
 nova/db/api.py             |   20 +++++++--------
 nova/db/sqlalchemy/api.py  |   59 +++++++++++++++++++-------------------------
 nova/tests/test_compute.py |    4 +--
 nova/tests/test_db_api.py  |   15 +++++------
 5 files changed, 46 insertions(+), 61 deletions(-)

commit 0c75d24e625f82ad946c1b8f905447058d94d9a5
Merge: 12992e7 da1a151
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 24 08:15:02 2012 +0000

    Merge "Import recent openstack-common changes"

commit 7c265343159bb76e0322f150f8d194ecd342b637
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Mar 16 03:43:49 2012 +0000

    ensure atomic manipulation of libvirt disk images
    
    This pattern could probably be used elsewhere,
    but only libvirt disk images are considered for now.
    This change ensures there are no stale files left
    anywhere in the path from glance, through the libvirt image cache.
    These could cause subsequent operational errors either
    directly or indirectly through disk wastage.
    
    * nova/utils.py: Add a new remove_path_on_error() context manager
    that is used to remove the passed PATH on a raised exception.
    * nova/virt/images.py: Ensure temporary downloaded and
    converted images are protected.
    * nova/virt/libvirt/connection.py: Ensure all the images in
    the image cache and instance dirs are protected.
    
    Change-Id: I81a5407665a6998128c0dee41387ef00ebddeb4d

 nova/utils.py                   |   21 +++++++++---
 nova/virt/images.py             |   69 +++++++++++++++++----------------------
 nova/virt/libvirt/connection.py |   16 +++++----
 3 files changed, 57 insertions(+), 49 deletions(-)

commit 12992e7e189388fa033fc001877292b16160f785
Merge: b9a9f6b 8b3f327
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 22:34:19 2012 +0000

    Merge "Add periodic_fuzzy_delay option."

commit da1a151dfc9ffcb8591fa0972db0a769bd86668a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 23 22:00:49 2012 +0000

    Import recent openstack-common changes
    
    Fixes MultiStrOpt, plus also adds secret kwarg for sanitizing logs
    
    Change-Id: I87b979b38084f82b012872054262fc49d291e99e

 nova/openstack/common/cfg.py       |  160 +++++++++++++++++++++++++++++-------
 nova/openstack/common/iniparser.py |  126 ++++++++++++++++++++++++++++
 openstack-common.conf              |    2 +-
 3 files changed, 256 insertions(+), 32 deletions(-)

commit aa29a67d5cecfa320f98fa9989bf0b9179240016
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 23 20:27:34 2012 +0000

    makes volume versions display properly
    
     * The compute versions controller changed during a refactor and broke
       the volume versions controller (since we are using it as a base class)
     * Added naive test
     * fixes bug 963357
    
    Change-Id: Ica9c65952b800d316d264db11f89e369e56bcade

 nova/api/openstack/volume/versions.py          |   22 +++++++++++++---------
 nova/tests/api/openstack/volume/test_router.py |    9 +++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

commit d1409adb0c4b94cda3f07e47ed208a2642ba8cf4
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Fri Mar 23 16:26:27 2012 -0500

    Reordered the alphabet.
    
    Just putting this out there... I'm pretty sure that
    
       import nova.flags
    
    comes after
    
       from nova.endpoint import cloud
    
    Unless I'm totally misunderstanding how this is supposed to work,
    which is likely.
    
    Change-Id: I51096ab25dbca42d73a593872b83b25f2c451210

 HACKING.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b3f327df03d2ca530d094342710ff3f75ae3934
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 22 23:50:36 2012 +0000

    Add periodic_fuzzy_delay option.
    
    Fixes bug 962665
    
    This random delay is intended to reduce the stampeding behavior
    associated with periodic tasks when compute workers are restarted in
    unison across a cluster.
    
    Change-Id: Ie3771d94af29049061c129b8ea562ee447a61771

 nova/service.py                       |   35 ++++++++++++++++++++++++++-------
 nova/tests/integrated/test_servers.py |   11 ++++-------
 nova/tests/xenapi/stubs.py            |    2 +-
 nova/utils.py                         |    7 ++++---
 nova/virt/baremetal/proxy.py          |    6 +++---
 nova/virt/libvirt/connection.py       |   14 ++++++-------
 nova/virt/vmwareapi_conn.py           |    2 +-
 7 files changed, 48 insertions(+), 29 deletions(-)

commit b9a9f6b9a5a2adf5dfa3fe964ced1ee6a505bcef
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 21 12:32:19 2012 +0000

    Add a test case for generation of libvirt guest config
    
    Replace the test case for checking XML template info which was
    deleted earlier, with a new test case checking the XML config
    objects.
    
    blueprint libvirt-xml-config-apis
    Change-Id: I1ddd945111dcde0e67aba280bf0d11a8dab6c44a
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py |   54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit 6249d6c1f6c8548d3a867eb0357e5c1c1094ccf1
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 12:49:29 2012 -0500

    Convert libvirt connection class to use config APIs for CPU comparisons
    
    Currently the libvirt connection class uses a Cheetah template to
    build up the CPU XML document, for doing host CPU comparisons.
    Remove this template and replace it with use of the new config
    API LibvirtConfigCPU
    
    The nova 'cpu_xml_template' configuration parameter is also removed since
    it is now obsolete
    
    blueprint libvirt-xml-config-apis
    Change-Id: I1d608f5f9d77302a9e08486f67ad3a39b224e9d5
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/cpuinfo.xml.template  |    9 ---------
 nova/virt/libvirt/connection.py |   26 +++++++++++---------------
 2 files changed, 11 insertions(+), 24 deletions(-)

commit 81ac4e729c0ca9e8fdb8064db30ae05eb8ce74a7
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 12:49:38 2012 -0500

    Introduce a class for storing libvirt CPU configuration
    
    Extend the libvirt config APIs to include a new class
    LibvirtConfigCPU for storing host/guest CPU configuration
    data
    
    blueprint libvirt-xml-config-apis
    Change-Id: Ib508637c1e0ca69860d461b0a480347c59165e6b
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_config.py |   37 ++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/config.py       |   40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

commit c0f678778afefc71649253e685e8f5d6af96b3a9
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Mar 8 11:34:54 2012 -0500

    Convert libvirt connection class to use config APIs for guests
    
    Remove the entire Cheetah XML template for libvirt guests
    and make the libvirt connection class use LibvirtConfingGuest
    classes instead
    
    The nova 'libvirt_xml_template' config parameter is now obsolete
    and removed.
    
    blueprint libvirt-xml-config-apis
    Change-Id: I5ff4ed7cbc69c8c141db840f4d6fc368a13f7f7a
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |   57 -----------------
 nova/virt/libvirt/connection.py |  129 ++++++++++++++++++++++-----------------
 2 files changed, 73 insertions(+), 113 deletions(-)

commit 0b10c3f1a042003f917a4af95712a2d85561e53e
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Mar 8 11:33:47 2012 -0500

    Convert libvirt connection class to use config APIs for filesystem devices
    
    Remove the <filesystem> element from the Cheetah XML template
    and make the libvirt connection class use the LibvirtConfigGuestFilesys
    class for it instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: I9dad031703161d1dff86af03eff7b1ebf657fc0c
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |    7 +------
 nova/virt/libvirt/connection.py |    9 +++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

commit 720b96363b8c2973d43c763ccaf4e213e0e2e02d
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 13:10:07 2012 -0500

    Introduce a class for storing libvirt snapshot configuration
    
    Extend the libvirt config APIs to include a new class
    LibvirtConfigGuestSnapshot for storing information about
    guest snapshots
    
    blueprint libvirt-xml-config-apis
    Change-Id: Icc54f6f5cf41b05d904659e0a337bddb4bef5733
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_config.py |   13 +++++++++++++
 nova/virt/libvirt/config.py       |   15 +++++++++++++++
 2 files changed, 28 insertions(+)

commit 80b70c6b30d89fe856b4a305cc641ef0dd7a8b80
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 12:14:21 2012 -0500

    Move NIC devices back after disk devices
    
    Originally the NIC devices were listed in the XML after the
    disk devices. Restore that order, simply for consistency.
    No functional change.
    
    blueprint libvirt-xml-config-apis
    Change-Id: If62446292850d58e133b0c4cc42ca83018e1fca1
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt/connection.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 983ac72be4d57a4108edead00d56a3d189c6d499
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Mar 8 11:24:35 2012 -0500

    Convert libvirt connection class to use config APIs for disk devices
    
    Remove all the <disk> elements from the Cheetah XML template
    and make the libvirt connection class use the LibvirtConfigGuestDisk
    class for them instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: I0f09a86e72e5e34bbd780b31177a65eb40fb5419
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |   63 ----------
 nova/virt/libvirt/connection.py |  251 ++++++++++++++++++++++++++-------------
 2 files changed, 169 insertions(+), 145 deletions(-)

commit bbf078a6d95d3434da532040e14b825af1f3bcce
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Mar 8 11:21:48 2012 -0500

    Convert libvirt connection class to use config APIs for input devices
    
    Remove the <input> elements form the Cheetah XML template
    and make the libvirt connection class use the LibvirtConfigGuestInput
    class for it instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: I4fba2ddae2d32b0ff49685245fd905651885b61b
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |    3 ---
 nova/virt/libvirt/connection.py |    6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 7dfa07713aaf6200eba225ccee936277410835d5
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Mar 8 11:20:09 2012 -0500

    Convert libvirt connection class to use config APIs for serial/console devices
    
    Remove the <serial> and <console> elements from the Cheetah XML template
    and make the libvirt connection class use the LibvirtConfigGuestConsole
    and LibvirtConfigGuestSerial classes for them instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: I67031dad2969c9b36e2fe9230689c1b7bfbecfce
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |   13 -------------
 nova/virt/libvirt/connection.py |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

commit 30dc7d11c13c1075d441a72932957e26ef3355b7
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 11:24:47 2012 -0500

    Convert libvirt connection class to use config APIs for graphics
    
    Remove the <graphics> element from the Cheetah XML template and
    make the libvirt connection class use the LibvirtConfigGuestGraphics
    class for it instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: Ifa18cab2aa6983c9439c6230a9109e40a6a0bbe3
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/virt/libvirt.xml.template  |    4 ----
 nova/virt/libvirt/connection.py |    9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 77b7d39cf9a177a5947d3a59461661cde5d3af32
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 06:57:36 2012 -0500

    Convert libvirt vif classes over to use config API
    
    The classes in the libvirt/vif.py file build up dictionaries
    and partial XML snippets, which are then passed onto Cheetah
    templating for XML generation. Instead of building up
    dictionaries of parameters, return LibvirtConfigGuestInterface
    object instances instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: I4e977225e21219f408dd729ac280dcbfc6b8ba8f
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_vif.py  |   53 +++++++-------------
 nova/virt/libvirt.xml.template  |   46 +----------------
 nova/virt/libvirt/connection.py |   16 ++----
 nova/virt/libvirt/vif.py        |  103 +++++++++++++++++++++++----------------
 4 files changed, 85 insertions(+), 133 deletions(-)

commit 172ba65bdce30862fc393984d4ed57468b8fb8ab
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 08:39:19 2012 -0500

    Convert libvirt volume classes over to use config API
    
    The classes in the libvirt/volume.py file build up XML
    strings using printf style substitutions. Convert this
    over to use the LibvirtConfigGuestDisk config class
    instead
    
    blueprint libvirt-xml-config-apis
    Change-Id: Ied1fad47db6fb23b74edc4405015768c764a4d10
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py      |   20 +++++++-------
 nova/virt/libvirt/connection.py |   18 ++++++-------
 nova/virt/libvirt/volume.py     |   55 +++++++++++++++++++++------------------
 3 files changed, 49 insertions(+), 44 deletions(-)

commit 58b2ecced2491441c6dac739a7e50e8ab6be4d66
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 11:24:18 2012 -0500

    Delete the test_preparing_xml_info libvirt test
    
    The test_preparing_xml_info test case is about to be intentionally
    broken by refactoring in following patches. It will be replaced
    by a new test at the end
    
    blueprint libvirt-xml-config-apis
    Change-Id: I2c5f19a071983e581ed5ed3bc8a84e14fbb6897b
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py |   14 --------------
 1 file changed, 14 deletions(-)

commit f6bddbe4161bfb6ff02a807d5455c018c98d607d
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 08:39:07 2012 -0500

    Introduce a set of classes for storing libvirt guest configuration
    
    With the current Cheetah template based approach to XML
    generation, there is never any canonical representation
    of the guest configuration. When generating XML, a hash
    is filled in with parameters to be used to generate XML,
    an even some pre-built XML snippets. When reading XML,
    typically XPath is used, but sometimes manual DOM traversal
    is used.
    
    This change introduces a set of classes for explicitly
    representing the guest configuration. They are intended
    to allow the guest config to be read/written using normal
    programatic APIs, avoiding the need for any code to know
    about XML.
    
    This first impl though, only supports writing of XML.
    The code to parse an existing XML doc is not yet written.
    The class hierarchy is as follows
    
      LibvirtConfigObject
       |
       + LibvirtConfigGuest
       + LibvirtConfigGuestDevice
          |
          +- LibvirtConfigGuestDisk
          +- LibvirtConfigGuestFilesys
          +- LibvirtConfigGuestInterface
          +- LibvirtConfigGuestInput
          +- LibvirtConfigGuestGraphics
          +- LibvirtConfigGuestChar
              |
              +- LibvirtConfigGuestSerial
              +- LibvirtConfigGuestConsole
    
    The base LibvirtConfigObject class provides some generic
    boilerplate code. Subclasses need to override the "format_dom"
    method for generating XML DOMS, and "parse_dom" for reading XML
    DOMs. The conversion from DOM <-> XML String is handled by
    the base class. The DOMs are based on the lxml.etree.Element
    class.
    
     * nova/tests/test_libvirt_config.py: Test cases for XML formatting
       of all config object classes
     * nova/virt/libvirt/config.py: Config object classes for libvirt
       guest XML schema
    
    blueprint libvirt-xml-config-apis
    Change-Id: I0474b6640b47ad0e5bb74503a5ff99a8a41bcdc4
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt_config.py |  363 +++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/config.py       |  358 ++++++++++++++++++++++++++++++++++++
 2 files changed, 721 insertions(+)

commit 1c6fff4906eb7fd7af9cd507014bea20fb39b7d6
Merge: 112af23 78f3e76
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 19:08:56 2012 +0000

    Merge "Fix launching of guests where instances_path is on GlusterFS"

commit 112af23d623cbbd68bf6e09a6e507170c57abe6b
Merge: a508866 71172ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 18:58:29 2012 +0000

    Merge "Send a more appropriate error response for 403 in osapi"

commit a5088664a7e433be15bac6405f361513aeacfe06
Merge: 03f80af 58bcbc1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 18:48:11 2012 +0000

    Merge "Volumes API now uses underscores for attrs"

commit 03f80af9194a55f4f9acee4c8e18a4818a2a0d7e
Merge: c0974bf 64c1593
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 18:44:49 2012 +0000

    Merge "Remove unused certificate SQL calls."

commit 71172ac4bb190496c4ef668c3cba6fa9bf5834aa
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Mar 23 09:50:39 2012 -0700

    Send a more appropriate error response for 403 in osapi
    
     * Don't use resizeNotAllowed for 403
     * Fixes bug 949444
    
    Change-Id: Ib2b5acba291a04e0c0296fa5e8438019983dda20

 nova/api/openstack/wsgi.py              |    2 +-
 nova/tests/api/openstack/test_faults.py |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

commit c0974bf9dfdb990463b6c48ae93c5eb784d358e5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 23 16:45:13 2012 +0000

    Use key in locals() that actually exists
    
    Fixes bug 963263
    
    Also, fix whitespace so we don't end up with two almost identical
    strings to internationalize
    
    Change-Id: I4c4faa0c335bdafca9426e2056113bb6f87abc3a

 nova/compute/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 78f3e76d695898aaf846efb9c420e146a982e689
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 21 11:35:43 2012 +0000

    Fix launching of guests where instances_path is on GlusterFS
    
    The FUSE module does not (currentl) support O_DIRECT on files.
    This prevents QEMU from starting guests using 'cache=none' for
    their disks located on a GlusterFS filesystem. The same also
    applies for a handful of other filesystems (notably tmpfs, or
    any other FUSE filesystem).
    
    This patch introduces a startup check in Nova compute service
    which tries to create a file $instances_path/.direct_io.test
    using the O_DIRECT flag. If this succeeds, then cache=none
    will be used for all disks, otherwise it will fallback to
    using cache=writethrough. While the latter does not have
    performance which is as consistent as cache=none, it is still
    host-crash safe and preserves data integrity with migration,
    if the filesystem is cache coherant (cluster filesystems like
    GlusterFS are, NFS by constrast is not).
    
    By doing the dynamic check for O_DIRECT, we ensure that if
    future FUSE modules gain O_DIRECT support, Nova will automatically
    do the right thing.
    
    * nova/tests/test_libvirt.py: Stub out os.open in
      the _check_xml_and_disk_driver() to enable testing of
      both O_DIRECT and non-O_DIRECT code paths
    * nova/tests/test_virt_drivers.py: Set instances_path to
      the current directory
    * nova/virt/libvirt.xml.template: Replace hardcoded 'none'
      string with the '$cachemode' variable for all disks.
      Add missing 'cache' attribute for the config disk
    * nova/virt/libvirt/connection.py: Check whether O_DIRECT
      is supported on the "FLAGS.instances_path" directory
      and use 'none' for cachemode if it is, 'writethrough'
      otherwise
    
    Bug: 959637
    Change-Id: I60cbff1c3ad8299fe2aa37099390f9235f6724d0
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py      |   26 ++++++++++++++++++++++
 nova/tests/test_virt_drivers.py |    5 +++++
 nova/virt/libvirt.xml.template  |   14 ++++++------
 nova/virt/libvirt/connection.py |   47 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 7 deletions(-)

commit 58bcbc1151c7c509054bcfdfd0e4af7b62f71e9e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 22 14:39:52 2012 -0700

    Volumes API now uses underscores for attrs
    
    * Fixes bug 943053
    
    Change-Id: I7066e963b4377a4a1f8a3c259e6273e6a0ca073f

 nova/api/openstack/volume/snapshots.py            |   16 +--
 nova/api/openstack/volume/volumes.py              |   38 +++---
 nova/tests/api/openstack/volume/test_snapshots.py |   36 +++---
 nova/tests/api/openstack/volume/test_volumes.py   |  132 ++++++++++-----------
 nova/tests/integrated/test_volumes.py             |    2 +-
 5 files changed, 112 insertions(+), 112 deletions(-)

commit 5c5a5fbaa03f1864b434bed47796b7b745a24442
Merge: f320856 c2de5c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 23 15:34:18 2012 +0000

    Merge "Tweak security port validation for ICMP"

commit 64c1593503c1f8879515123d1baffad56ae963f9
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 23 11:00:05 2012 -0400

    Remove unused certificate SQL calls.
    
    Remove unused certificate_destroy and certificate_update functions
    from the DB api.
    
    Fixes LB Bug #953235.
    
    Change-Id: I2e3e07235467b2a5a11e228c2ed8db752c403ce3

 nova/db/api.py            |   14 --------------
 nova/db/sqlalchemy/api.py |   22 ----------------------
 2 files changed, 36 deletions(-)

commit f32085653e0947f3371f3e95b8fb6438d360bce8
Merge: 164fb0c b15bfc2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 23:47:16 2012 +0000

    Merge "Fixed status validation. Fixes bug 960884."

commit 164fb0cd52f00dafb506952374168ce20309a5ea
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 22 18:21:00 2012 -0400

    Assume migrate module missing __version__ is old
    
    Fixes bug 962592
    
    Change-Id: I9675b99df89d4f2d47e0a2fbfd13147fa1c7aeb7

 nova/db/sqlalchemy/migration.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit b5506fd87e296bb239f645d6ef2d5aa7fd409c46
Merge: b9c9a34 02afb4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 21:17:54 2012 +0000

    Merge "Remove tools/nova-debug"

commit b9c9a347a37fc904a0b15847121cb70fadee40fc
Merge: 5ff9c3b 9c87d20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 21:07:39 2012 +0000

    Merge "Inlining some single-use methods in XenAPI vmops."

commit 5ff9c3be7b25db2f1f663494d7cfb7535a9dc32c
Merge: 0b0dc20 0e0d0d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 20:57:25 2012 +0000

    Merge "Modify nova.wsgi.start() should check backlog parameter."

commit 0b0dc20b1edf6feeac9634165869a1246122a11f
Merge: 1bfa451 5ca931c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 20:33:15 2012 +0000

    Merge "Re-instate security group delete test case"

commit 1bfa451b4c9f131bd0d30f522897361087dfaabe
Merge: 79807e1 155ef7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 20:27:03 2012 +0000

    Merge "Make sqlite in-memory-db usable to unittest"

commit 02afb4d60c93169b9e2aeb7c907fa8919447d561
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Mar 15 15:07:48 2012 -0700

    Remove tools/nova-debug
    
    Broken and outdated (last updated on Mon Jun 27 2011)
    
    Change-Id: I3ed67430e01c2db531b89bc3ffd6e7b174791fbc

 setup.py         |    3 +-
 tools/nova-debug |   97 ------------------------------------------------------
 2 files changed, 1 insertion(+), 99 deletions(-)

commit 9c87d20cfdf84357fd1260e692634a3e5855804f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 21 23:53:43 2012 +0000

    Inlining some single-use methods in XenAPI vmops.
    
    Change-Id: I28247b6fe782f3a1007c6f47eb8e221cf885772f

 nova/virt/xenapi/vmops.py |   44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

commit 79807e11a1e066e79edd8460d9306824ce83b0e5
Author: James E. Blair <jeblair@hp.com>
Date:   Thu Mar 22 10:52:27 2012 -0700

    Change mycloud.com to example.com (RFC2606).
    
    From RFC2606:
       To reduce the likelihood of conflict and confusion, a few top level
       domain names are reserved for use in private testing, as examples in
       documentation, and the like.
    
    Currently the documentation contains URLs that point to mycloud.com,
    which is registered and not affiliated with OpenStack.  It's better
    to use example.com which exists for this purpose.
    
    Change-Id: I7ebd9b2c0d650f15e5924798cc54611d47961f8f

 doc/source/api_ext/ext_aggregates.rst         |    4 ++--
 doc/source/api_ext/ext_config_drive.rst       |    2 +-
 doc/source/api_ext/ext_floating_ip_dns.rst    |    2 +-
 doc/source/api_ext/ext_floating_ips.rst       |    2 +-
 doc/source/api_ext/ext_keypairs.rst           |    2 +-
 doc/source/api_ext/ext_multinic.rst           |    4 ++--
 doc/source/api_ext/ext_quotas.rst             |    2 +-
 doc/source/api_ext/ext_rescue.rst             |    2 +-
 doc/source/api_ext/ext_security_group.rst     |    2 +-
 doc/source/api_ext/ext_virtual_interfaces.rst |    2 +-
 doc/source/api_ext/ext_volumes.rst            |    2 +-
 doc/source/api_ext/rst_extension_template.rst |    2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

commit 2317a9e83a880bfd4e0cd735b2ea2780e9ac0470
Merge: 0d8d69c bcdcb40
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 17:34:34 2012 +0000

    Merge "Remove useless dhcp_domain flags in EC2"

commit 0d8d69caadab60ae6da23976e60b477fe4602b77
Merge: 3d9a122 9d32862
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 17:23:09 2012 +0000

    Merge "Handle correctly QuotaError in EC2 API"

commit 3d9a122a658a45035a20a9cdb73fa334319be94f
Merge: 785df3f 5365e74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 17:12:10 2012 +0000

    Merge "Avoid unplugging VBDs for rescue instances"

commit bcdcb40b65b3199da4607d147ffa865d336534dc
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Mar 22 16:31:13 2012 +0100

    Remove useless dhcp_domain flags in EC2
    
    Change-Id: I4e3102db4e99f23197a085dfd298220ad3f577d1
    Signed-off-by: Julien Danjou <julien@danjou.info>

 nova/api/ec2/cloud.py |    1 -
 1 file changed, 1 deletion(-)

commit 785df3f1d50e0b0b0fd9a72c99f30fb108b38af7
Merge: 298aac4 0a2c40b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 22 16:50:35 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 9d328628dea9530de629f829faa569fd87e0ac90
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Mar 22 16:42:05 2012 +0100

    Handle correctly QuotaError in EC2 API
    
    Without this patch, EC2 API returns UnknownError when quota is exceeded, see bug #853381
    
    This patch fixes that by handling the exception. Now euca-run-instances returns useful information:
    
    $ euca-run-instances --instance-count 10 --instance-type m1.8gb.2cpus.diskless ami-00000012
    QuotaError: Quota exceeded: code=InstanceLimitExceeded
    
    Change-Id: I1f7b381b34d2f538b7cc2d9582a40fd8bf88fbc3
    Signed-off-by: Julien Danjou <julien@danjou.info>

 nova/api/ec2/__init__.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 5365e74305e3ad485c380f41b2441b2bbe09beb0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Mar 21 22:02:22 2012 +0000

    Avoid unplugging VBDs for rescue instances
    
    Fixes bug 961524
    
    Unplugging can only happen if the instance is running and that might
    not be the case. So instead of unplugging the root disk VBD, just
    ignore it when it comes to deleting VDIs.
    
    Change-Id: Id6c01527befed7775fdd7a4d30d0d3bee1178c51

 nova/tests/test_xenapi.py |    5 -----
 nova/virt/xenapi/vmops.py |   47 +++++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

commit 0a2c40b0daafa9b5303ccc0468069926dbae653c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 22 16:24:38 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Ia0c5a38248ca86809d8b22e4642049537da3a7b7

 nova/locale/bs/LC_MESSAGES/nova.po    | 3325 +++++++++++-----------
 nova/locale/cs/LC_MESSAGES/nova.po    | 3327 +++++++++++-----------
 nova/locale/da/LC_MESSAGES/nova.po    | 3327 +++++++++++-----------
 nova/locale/de/LC_MESSAGES/nova.po    | 3327 +++++++++++-----------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 3348 +++++++++++-----------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 3333 +++++++++++-----------
 nova/locale/es/LC_MESSAGES/nova.po    | 3406 +++++++++++-----------
 nova/locale/fr/LC_MESSAGES/nova.po    | 3352 +++++++++++-----------
 nova/locale/it/LC_MESSAGES/nova.po    | 3329 +++++++++++-----------
 nova/locale/ja/LC_MESSAGES/nova.po    | 3348 +++++++++++-----------
 nova/locale/ko/LC_MESSAGES/nova.po    | 3329 +++++++++++-----------
 nova/locale/nova.pot                  | 2985 +++++++++-----------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 3343 +++++++++++-----------
 nova/locale/ru/LC_MESSAGES/nova.po    | 5026 +++++++++++++++++----------------
 nova/locale/tl/LC_MESSAGES/nova.po    | 3337 +++++++++++-----------
 nova/locale/tr/LC_MESSAGES/nova.po    | 3327 +++++++++++-----------
 nova/locale/uk/LC_MESSAGES/nova.po    | 3330 +++++++++++-----------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 3335 +++++++++++-----------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 3336 +++++++++++-----------
 19 files changed, 33520 insertions(+), 31250 deletions(-)

commit 298aac4bbf69c3c208673dbebb30c3e24396c3ca
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 21 23:16:25 2012 +0000

    Rollback create_disks handles StorageError exception.
    
    Fixes bug 961762
    
    Change-Id: I146cecdd801a92b84adb4cc40bdf0a8c43950dd5

 nova/virt/xenapi/vm_utils.py |    5 +----
 nova/virt/xenapi/vmops.py    |   41 +++++++++++++++++++----------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

commit f02503adbe89b0155d4ea94095ac4eeea5f2efe8
Merge: 280326d eacfb8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 15:18:28 2012 +0000

    Merge "Capture SIGTERM and Shut down python services cleanly."

commit 280326dff38799d2d945b561c25d15831723dc13
Merge: 66e152f 5de274c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 22 14:30:29 2012 +0000

    Merge "Strip auth token from log output."

commit eacfb8fe53b4bb6fab15e2fd8c34acc350214a8c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 16 15:16:51 2012 -0500

    Capture SIGTERM and Shut down python services cleanly.
    
    This is the first step in clean shut downs. Does not yet support eventlet threads.
    
    Change-Id: Ibcd26ed61cf56947a8bdbe291d87cb211fc1ccd8

 nova/service.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit b15bfc2edd5d3dd0dca805786bdcf22d3fb0339d
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Thu Mar 22 11:19:45 2012 +0530

    Fixed status validation. Fixes bug 960884.
    
    Fixed the status value validation in os-hosts extension and added a negative
    scenario in unit test for os-hosts extension.
    
    Change-Id: Ib4166757561e531494a1a4d3070d7c8971b57dc5

 nova/api/openstack/compute/contrib/hosts.py        |    2 +-
 .../api/openstack/compute/contrib/test_hosts.py    |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 66e152f718f227ebb830fd325685103c50234d99
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 21 21:18:43 2012 +0000

    Clarify HACKING's shadow built-in guidance.
    
    Change-Id: Icf38d3ec3254e83d2289b7b17966ec44d9757b8c

 HACKING.rst |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 5de274c98c82bae579396fc8e5062ac15d82934e
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Mar 21 16:25:14 2012 -0400

    Strip auth token from log output.
    
    Fix bug 956777.
    
    This patch updates _safe_log, which is used for rpc debug logs, to not
    include auth tokens.
    
    Change-Id: I36bb4233acd356f85b0e6006a6b812a67605b393

 nova/rpc/amqp.py   |    2 +-
 nova/rpc/common.py |   41 ++++++++++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 14 deletions(-)

commit 521108d5b91d7a7aa2ff1e594f3dc48d0c2a7311
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 21 20:14:39 2012 +0000

    Fail-fast for invalid read_deleted values
    
    Fixes bug 961588
    
    Change-Id: Ib02d89485cdf4626698b959a2136841109cdc51f

 nova/context.py            |   18 +++++++++++++++---
 nova/tests/test_context.py |   10 ++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

commit 4944a612e0926cfe542e0cb146cc9fabf70256f6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Mar 21 18:59:57 2012 +0000

    Only shutdown rescue instance if it's not already shutdown
    
    Fixes bug 961507
    
    Change-Id: Ib48d6ea3ad7c89e922cde8e0c0952d1bee2ca7bf

 nova/virt/xenapi/vmops.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0e0d0d54f2db4d534a2e450c4cdd88f41a5252ba
Author: Sean Dague <sdague@linux.vnet.ibm.com>
Date:   Wed Mar 21 14:46:09 2012 -0400

    Modify nova.wsgi.start() should check backlog parameter.
    
    Fixes bug 883292.
    
    Forward ported from
    https://github.com/ntt-pf-lab/nova/tree/openstack-qa-nova-883292
    
    Change-Id: I8839851a72fcf0910a532d558ffe66a39a7db1e8

 Authors      |    1 +
 nova/wsgi.py |    4 ++++
 2 files changed, 5 insertions(+)

commit f934beea9f22d8320d9b5ba9eb7051050c649122
Merge: f25cb41 22fd25d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 21 16:48:33 2012 +0000

    Merge "Don't send snapshot requests through the scheduler"

commit f25cb41f5ea351bbbc0abbc1b040cfba8ef25186
Merge: 41c57e2 6a38b65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 21 16:29:34 2012 +0000

    Merge "Implement quota classes."

commit 41c57e267752d7cf51a5cbd6bfab7332d218382b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Mar 20 23:06:14 2012 +0000

    Fix unplug_vbd to retry a configurable number of times
    
    Fixes bug 960655
    
    A previous cleanup ended up changing the exception raised by unplug_vbd
    which caused vbd_unplug_with_retry to fail to retry. Since it's common
    to retry, bake that functionality straight into unplug_vbd for other
    users too.
    
    Change-Id: I3370c560a1997459ab37b9d5f1181464fa5b0f0c

 nova/virt/xenapi/vm_utils.py |   71 ++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

commit 22fd25d869190772a0a859c291ec9af37f6e709f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 20 11:30:27 2012 -0700

    Don't send snapshot requests through the scheduler
    
     * If there is more than one volume host, snapshots need to be
       created on the host that has the volume.  Sending the request
       through the scheduler means that the snapshot will sometimes
       be created on the wrong host and fail.
     * Fixes bug 960437
    
    Change-Id: If8562bd533226cf9aee1d3be522f799d233581a9

 nova/volume/api.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 5bd6b532bc7c0541caccd87a14b9636d27d084ce
Merge: 285264d 1cd050e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 20 16:24:55 2012 +0000

    Merge "Fixes bug 949038"

commit 6a38b650c001ec8e6da435856c37a28737401aaf
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Mar 13 17:13:02 2012 -0500

    Implement quota classes.
    
    Allows entire classes of quotas to be associated with projects, which
    makes it easier to set specific quotas across multiple projects.
    
    TODO:
    
    * (?) Adding a mapping between projects and quota classes
    
    Change-Id: I6b6477481187d16af225d33c1989430e4071d5a8

 etc/nova/policy.json                               |    1 +
 .../api/openstack/compute/contrib/quota_classes.py |   99 ++++++++++
 nova/api/openstack/compute/contrib/quotas.py       |   11 +-
 nova/context.py                                    |    7 +-
 nova/db/api.py                                     |   33 ++++
 nova/db/sqlalchemy/api.py                          |   83 +++++++++
 .../migrate_repo/versions/083_quota_class.py       |   61 +++++++
 nova/db/sqlalchemy/models.py                       |   25 ++-
 nova/exception.py                                  |    4 +
 nova/quota.py                                      |   29 ++-
 .../compute/contrib/test_quota_classes.py          |  163 +++++++++++++++++
 .../api/openstack/compute/contrib/test_quotas.py   |    8 +-
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/policy.json                             |    1 +
 nova/tests/test_quota.py                           |  190 ++++++++++++++++++++
 15 files changed, 692 insertions(+), 24 deletions(-)

commit 285264d1151d50a0c07ea66f06f0dea733e1ce17
Merge: de6fdec d423424
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 20 15:41:11 2012 +0000

    Merge "Fixes bug 957708."

commit 1cd050e767c4dd5e9a6664911f4f8e408f437f41
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Tue Mar 20 10:14:58 2012 +0000

    Fixes bug 949038
    
    Make the api calls better fit the standard pattern where
    read_deleted can be changed using context.read_deleted
    
    I have retained the ability to pass read_deleted
    explicitly. If that is not specified, it uses the value in
    the context.
    
    Note: read_deleted defaults to "no" in the context.
    
    The two exceptions are:
     aggregate_host_get_all
     aggregate_get_all
    
    In this case, it is better for read_deleted=yes to be the default
    So in this case the context cannot be used, as that would default
    to read_deleted=no. In this case you must explicity override
    read_deleted, the context is totally ignored, as before.
    
    Change-Id: Idb048a592d8c6b788651d131a3345e70989c0ec4

 nova/db/api.py            |   20 ++++++++++----------
 nova/db/sqlalchemy/api.py |   42 ++++++++++++++++++++++--------------------
 nova/tests/test_db_api.py |   12 +++++++-----
 3 files changed, 39 insertions(+), 35 deletions(-)

commit de6fdec71055daa97fdc0d8e33cd643817b06c25
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Mar 20 08:17:40 2012 +0100

    Open Folsom
    
    Switch version to 2012.2 to formally open Folsom.
    
    Change-Id: If2e9e624a13444e4cb6a08f3bb76ca3027d7ef46

 nova/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4234242bb810d7840ec7e2c4c9f877f53b2210b
Author: MotoKen <motokentsai@gmail.com>
Date:   Tue Mar 20 13:46:38 2012 +0800

    Fixes bug 957708.
    
    Work around bug in netaddr 0.7.5
    https://github.com/drkjam/netaddr/issues/2
    
    Change-Id: I3e064860c3865d5029481e6d63c5284d275a0081

 nova/utils.py |    4 ++++
 1 file changed, 4 insertions(+)

commit ba9ddb95874dd5549c08bbb7d4424531c53fe712
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 19 22:21:54 2012 -0700

    Improvements/corrections to vnc docs.
    
     * Fixes bug 959929
    
    Change-Id: Ieb8234a3b9e432ae39d33d89b24a8148a01454e3

 doc/source/runnova/vncconsole.rst |   70 ++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

commit ca989b683a34ba3d64cac5a492ab221490a36c52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 19 16:04:51 2012 -0700

    Allow rate limiting to be disabled via flag
    
     * fixes bug 947776
    
    Change-Id: I892394ead2d1921ac8390e54312c5229929042f5

 etc/nova/api-paste.ini    |    2 ++
 etc/nova/nova.conf.sample |    4 +++-
 nova/api/auth.py          |    6 +++++-
 nova/flags.py             |    3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

commit 1f1b9de4bf6ee69a0baaa9171cc163bd790ec2da
Merge: 79a2cc4 13ca1b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 20 03:26:56 2012 +0000

    Merge "Strip out characters that should be escaped from console output"

commit 79a2cc44bce8c922278e95f643b85376f257408e
Merge: ffb9361 e5ecf77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 20 03:17:02 2012 +0000

    Merge "Fix lxc console regression"

commit ffb9361596c1708d7d009c195b4b3bc74d00a01c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 19 09:01:16 2012 -0700

    Improve performance of generating dhcp leases
    
     * Dont make 2 * instances queries when generating dhcp leases
     * Uses some nasty joins to minimize necessary changes
     * Adds test to verify functionality
     * Uses old sqlalchemy compatible join syntax
     * Uses vif_id as nw identifier for single_host_gateway mode
     * Cleans up tests in linux_net
     * Fixes bug 959378
    
    Change-Id: I1c74d114dd7caad1781180585bb65691e536bcf9

 nova/db/api.py               |    4 +-
 nova/db/sqlalchemy/api.py    |   48 +++++++++--
 nova/network/linux_net.py    |  126 +++++++++++----------------
 nova/tests/test_db_api.py    |   26 ++++++
 nova/tests/test_linux_net.py |  192 ++++++++++++++----------------------------
 5 files changed, 182 insertions(+), 214 deletions(-)

commit e5ecf777a452cdb439f0c5be72a2a298669b9c26
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 19 21:06:48 2012 -0400

    Fix lxc console regression
    
    Dont always assume that console is a file.
    Fixes bug 959843
    
    Change-Id: I6e0512b85a770ecb3963512751a535ccab91a9a8
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/virt/libvirt/connection.py |   36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

commit 13ca1b923e479905f9d1debdea6125be92f44808
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 19 16:33:16 2012 -0700

    Strip out characters that should be escaped from console output
    
    Minidom has a bug where it doesn't escape characters < 32 correctly.
    That is http://bugs.python.org/issue5752
    
    We probably want to move to lxml anyway.
    
    Console-output is particularly likely to have invalid characters,
    because ANSI output include the ESC character (0x1B).  Strip out
    invalid characters for this case (although the problem is still
    present anywhere we write a string in the XML)
    
    Bug #939386
    
    Change-Id: I4689c0f26fb4887867a8d5b6f5e5fb5e2590be91

 .../openstack/compute/contrib/console_output.py    |    5 +++++
 1 file changed, 5 insertions(+)

commit cb0a25e825a9a09f39aa496a66ad4171ff659af8
Merge: bc3f3cd 4071161
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 19 22:47:06 2012 +0000

    Merge "Stop notifications from old leases"

commit bc3f3cd5eb0ae7947a2777f19da27cbb477d560c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 19 14:47:31 2012 -0700

    Remove unnecessary data from xenapi test
    
    Change-Id: I321af485aa28e654cff27d0db5753020f7fc3c20

 nova/tests/xenapi/vm_rrd.xml |10946 ++----------------------------------------
 1 file changed, 377 insertions(+), 10569 deletions(-)

commit 7f4f6c0bfa45e4bb18c88e796715b286e9d273bf
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 19 16:05:39 2012 -0400

    Correct accessIPv6 error message.
    
    Fixes LP Bug #959661.
    
    Change-Id: I95d497de1df4d10cfa1213c31cb6bfd120f7c6b3

 nova/api/openstack/compute/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4071161f3860dbceb091913d46adbb804d9c6893
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 19 07:56:07 2012 -0700

    Stop notifications from old leases
    
     * Fixes performance issue with lots of instances
     * Also removes some commented out code
     * Fixes bug 959356
    
    Change-Id: I6e4cf3cd6ebe9d5d1ae4fc2472ef1765d13f49f6

 bin/nova-dhcpbridge |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit 74aa84b0ec5bf406b7cf324bef0267da4e653823
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Sun Mar 18 22:44:59 2012 -0700

    Fix typo in server diagnostics extension.
    
     * Fixes bug 957716
     * Tweak test to catch regression
    
    Change-Id: I71cafadfec90d907a65429e1c1ca1812d1069b25

 .../compute/contrib/server_diagnostics.py          |    2 +-
 .../compute/contrib/test_server_diagnostics.py     |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 898f86cef99b386b22fec1cd47515ffe991e5eb9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 18 20:37:43 2012 -0700

    Stub-implement floating-ip functions on FlatManager
    
    This was messing up horizon in a way that would probably be difficult to fix.
    It also is probably a bit tricky to implement floating ips properly for
    FlatManager at this stage of the release cycle.  Stub them out for now,
    to keep horizon happy.
    
    Bug #954580
    Bug #937227
    
    Change-Id: Icb8d689860b893ebeeee02e248e836c52830b2de

 nova/network/manager.py |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 58bed5a7a07cdc1b302a96c7fa2be13056fa2333
Merge: 9e34244 a1c2849
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 18 23:20:04 2012 +0000

    Merge "various cleanups"

commit 9e342447c5a7d52cc498561b4636abadd8c997ca
Merge: 9a608ae 7f64fa8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 18 23:09:19 2012 +0000

    Merge "Debug messages for host filters."

commit 9a608aec62bb9abaa5b2049483d52458727da526
Merge: bf337f1 1d94d55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 18 23:02:05 2012 +0000

    Merge "allow the compute service to start with missing libvirt disks"

commit bf337f199eefbb8e4ca6d3322b30bd7eca1b3bc4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 16 08:36:03 2012 +0000

    Update etc/nova.conf.sample for ship
    
    Change-Id: Ib4ea40116151566a328fedfb360d00b3140e3714

 etc/nova/nova.conf.sample |   83 +++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 36 deletions(-)

commit 04e58cb7ee63ad6b55cb5442bd0734d35440f62c
Merge: fe7055a caf25ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 17 23:17:16 2012 +0000

    Merge "nonblocking libvirt mode using tpool"

commit 155ef7daab08d7f3fb8f7838df1d715bf1dc2f3f
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Thu Mar 8 16:43:32 2012 +0800

    Make sqlite in-memory-db usable to unittest
    
    Move migrate monkey patch from nova.tests.test_migrations to
    nova.db.sqlalchemy.migration
    
    Change-Id: I018e44903558cad6311fd368787583322f962d0c

 nova/db/sqlalchemy/migration.py |   55 ++++++++++++++++++++++++++++++++-------
 nova/db/sqlalchemy/session.py   |   45 ++++++++++++++++++++------------
 nova/test.py                    |    4 +--
 nova/tests/__init__.py          |   45 +++++++++++++++++++++++++-------
 nova/tests/fake_flags.py        |    2 +-
 nova/tests/test_migrations.py   |   34 ++----------------------
 6 files changed, 114 insertions(+), 71 deletions(-)

commit fe7055a5bd25bef33fe10f4fee858ad8cd30a6ea
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Mar 16 16:51:03 2012 -0700

    Fix run/terminate race conditions.
    
     * synchronize run,terminate,stop,start on instance_uuid
     * don't surpress error when unfiltering instance, which
       can result in a zombified instance.
     * Fixes bug 956719
     * Remove debug raise
    
    Change-Id: I8b2eaffdabfd5c1a9414adb1b5ed11e4c48711fc

 nova/compute/manager.py         |   56 +++++++++++++++++++++++++--------------
 nova/exception.py               |    4 +++
 nova/tests/test_compute.py      |   25 +++++++----------
 nova/virt/libvirt/connection.py |   12 +++++++--
 nova/virt/libvirt/firewall.py   |    7 ++++-
 5 files changed, 66 insertions(+), 38 deletions(-)

commit eb42e7fcd7bb67ab951c9bc6c80a78cd23011458
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 16 13:25:05 2012 -0700

    Workaround issue with greenthreads and lockfiles
    
     * Adds a GreenLockFile that always works in greenthreads
     * Adds test to verify that regular Lockfile is broken
     * Adds test to verify that GreenLockfile works
     * Adds note about limitation of external locks
     * Adds test showing limitation of nested locks
     * Fixes bug 956313
    
    Change-Id: I11cd1206611aa4862dadd2fcc077c4c2e0f798f6

 nova/tests/test_misc.py  |   16 ++++++++++++++++
 nova/tests/test_utils.py |   39 +++++++++++++++++++++++++++++++++++++++
 nova/utils.py            |   44 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 98 insertions(+), 1 deletion(-)

commit 1d94d55775b78a5d37658bb641c225bc49510620
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Mar 16 16:00:43 2012 +0000

    allow the compute service to start with missing libvirt disks
    
    * nova/virt/libvirt/connection.py: Program defensively and handle
    the case of missing instance disks and log the error rather than
    propagating that exception up (which triggers nova.service to fail).
    * Fixes bug 957110
    
    Change-Id: I1a414f56661843ff6b886e6ebf6f614fcb5a5f31

 nova/virt/libvirt/connection.py |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

commit 1ecf2c5b77d21015bbb4cc9edf7abf96355bb8e3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 16 15:03:39 2012 +0000

    Destroy rescue instance if main instance is destroyed
    
    Fixes bug 955166
    
    If the main instance was destroyed while an instance was in rescue mode
    the rescue instance would not be destroyed. Ensure it gets destroyed
    too.
    
    Change-Id: I7d411a2b532fae7ba90c0639527805f47913fce6

 nova/virt/xenapi/vmops.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit c2de5c61b25dccb6d355640e6c8c9eedd94fdef4
Author: Greg Althaus <galthaus@austin.rr.com>
Date:   Fri Mar 16 06:41:54 2012 -0700

    Tweak security port validation for ICMP
    
    Horizon allows for ICMP to be type:code.
    Type and code can be from -1 to 255.
    
    API refers to both EC2 and Nova APIs
    
    This patch attempts to resolve:
    1. API code throws exceptations when 0 is passed for either field
    2. API code validates type:code like from->to range.  type and code
       are independent
    3. Update unit tests for this new set of operations.
    
    A side effect is that the following are allowed type:code.
    -1:X
    X:-1
    
    The code assumes that -1 is a wildcard for the field.
    
    bug 956967
    
    Change-Id: Ieb6989815afc6986b72e0efc7611c2cc353ab5d8

 Authors                                            |    1 +
 nova/api/ec2/cloud.py                              |   17 +++++----
 .../openstack/compute/contrib/security_groups.py   |   15 ++++----
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 .../compute/contrib/test_security_groups.py        |   36 ++++++++++++++++++++
 nova/tests/test_api.py                             |   16 ++++++---
 6 files changed, 68 insertions(+), 19 deletions(-)

commit 7f64fa81414f9596c4327f1930f5568757fdecf0
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Mar 15 15:04:37 2012 +1100

    Debug messages for host filters.
    
    This will help people work out why they have NoValidHosts when
    things go wrong. Resolves bug 955650
    
    Change-Id: I042937351010e85648cbc1aa0f029dbb5a402eb7

 nova/scheduler/host_manager.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit a1c28495aa8d970df0c1afa4efac1d10bdb24825
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Thu Feb 2 10:07:50 2012 +0000

    various cleanups
    
    No functional changes
    
    Change-Id: I19e118e6e0c47fccfe5a817e727f3ab27e26aa79

 nova/utils.py                   |    4 ++--
 nova/virt/images.py             |    1 -
 nova/virt/libvirt/imagecache.py |    2 --
 nova/virt/libvirt/utils.py      |    6 +++---
 4 files changed, 5 insertions(+), 8 deletions(-)

commit a3bab242db16d036a415aa6ce3e95803b001bcc6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 14 17:24:07 2012 -0700

    Remove Virtual Storage Array (VSA) code
    
    * Remove core vsa code (api, manager, drivers)
    * Remove nova-vsa executable
    * Remove OpenStack Compute API v2 vsa extension
    * Remove vsa scheduler
    * Remove vsa db api methods
    * Remove Zadara volume driver
    * Do not migrate out any existing data
    * Fixes bug 954490
    
    Change-Id: Idab3d60796d5edbc23ef9f0887fcc1af558c6215

 bin/nova-all                                       |    2 +-
 bin/nova-manage                                    |  475 -------------
 bin/nova-vsa                                       |   49 --
 etc/nova/nova.conf.sample                          |   36 -
 .../compute/contrib/virtual_storage_arrays.py      |  701 --------------------
 nova/db/api.py                                     |   36 -
 nova/db/sqlalchemy/api.py                          |   82 ---
 nova/db/sqlalchemy/models.py                       |   34 -
 nova/exception.py                                  |   12 -
 nova/flags.py                                      |   18 -
 nova/rootwrap/volume.py                            |    3 -
 nova/scheduler/vsa.py                              |  532 ---------------
 .../api/openstack/compute/contrib/test_vsa.py      |  637 ------------------
 .../tests/api/openstack/compute/test_extensions.py |    1 -
 nova/tests/api/openstack/fakes.py                  |    9 +-
 nova/tests/scheduler/test_vsa_scheduler.py         |  626 -----------------
 nova/tests/test_vsa.py                             |  171 -----
 nova/tests/test_vsa_volumes.py                     |  133 ----
 nova/volume/driver.py                              |  322 ---------
 nova/volume/manager.py                             |   21 -
 nova/volume/volume_types.py                        |   21 -
 nova/vsa/__init__.py                               |   16 -
 nova/vsa/api.py                                    |  412 ------------
 nova/vsa/connection.py                             |   25 -
 nova/vsa/fake.py                                   |   22 -
 nova/vsa/manager.py                                |  181 -----
 nova/vsa/utils.py                                  |   80 ---
 setup.py                                           |    1 -
 28 files changed, 2 insertions(+), 4656 deletions(-)

commit 30b8e35e80486b26eeb71bc62d92bae240cb72f2
Merge: 3dce8e5 036c34f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 03:27:19 2012 +0000

    Merge "Fix up docstring"

commit 3dce8e5e49ce3cb567ea234c63eb7b2c949e095f
Merge: ddf1d6a 2d142f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 03:16:34 2012 +0000

    Merge "Use getLogger for nova-all"

commit ddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74
Merge: 026943b dd6c190
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 03:06:10 2012 +0000

    Merge "db api: Remove check for security groups reference"

commit 5ca931c6d0e3a4759e7392cc7ee5f728d66c182f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Mar 15 22:52:49 2012 -0400

    Re-instate security group delete test case
    
    While fixing lp#956366, we realized that it's fine to delete a security
    group referenced by an ingress rule of another security group because
    the ingress rule gets deleted.
    
    Re-instate the test for this specific case, but test that the ingress
    rule gets deleted rather than an exception being thrown.
    
    Change-Id: I81ad16431f5f8f13561dfcb320213366e1e8864e

 nova/tests/api/ec2/test_cloud.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 026943be287edaae4a34e430606d4923eb9c9824
Merge: 31cf494 6657f70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 02:55:27 2012 +0000

    Merge "Allow proper instance cleanup if state == SHUTOFF"

commit 31cf494a50896bf41c2934a83e103ac92886a7b9
Merge: 67b84dd a58a50e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 02:45:23 2012 +0000

    Merge "Fix OpenStack Capitalization"

commit dd6c1907c6634ccb41c3d94ed3296498e32333b0
Author: Adam Gandelman <adamg@canonical.com>
Date:   Thu Mar 15 15:38:11 2012 -0700

    db api: Remove check for security groups reference
    
    security_group_in_use() should only be checking that a security
    group is associated with running instances, not that other groups
    are referencing it in their rules.  With this check in place, it
    becomes impossible to delete self-referential security groups.
    
    Fixes bug 956366.
    
    Update: Remove obsolete test as well
    
    Change-Id: I31f49c655b044dbaf0fb66dfaadb876c9dc3d167

 nova/db/sqlalchemy/api.py        |   14 --------------
 nova/tests/api/ec2/test_cloud.py |   17 -----------------
 nova/tests/test_api.py           |    9 ---------
 3 files changed, 40 deletions(-)

commit 6657f70ee3e792b39e45a2a96fb5d4b380f0ae91
Author: Adam Gandelman <adamg@canonical.com>
Date:   Thu Mar 15 18:08:35 2012 -0700

    Allow proper instance cleanup if state == SHUTOFF
    
    Removes an obsolete check for instance's power_state
    on shutdown_instance().  With it in place, volume detachment
    and disassociation never takes place.  Compute should instead rely
    on virt drivers to handle this case and raise accordingly. libvirt's
    destroy() currently handles powered off instances fine, and properly
    detaches any existing volume connections.
    
    Fixes bug 954692
    
    Change-Id: I200d5b2073e5b52a9733d8324d016b14bdc96067

 nova/compute/manager.py |    7 -------
 1 file changed, 7 deletions(-)

commit 67b84ddccc05b22a6e7e27a4c42893a6c50e5db9
Merge: 0b89a35 682f612
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 02:23:31 2012 +0000

    Merge "Stop setting promisc on bridge"

commit 2d142f3b1ca2d9eb993cee7989ff5954a6cc815c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 15 17:41:30 2012 -0700

    Use getLogger for nova-all
    
     * logging.exception is not defined to to logging refactor
    
    Change-Id: Id95b3ca4dd3fd2cf3396e0b90d90c4a0edf90cf6

 bin/nova-all |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 682f612b2c35ab3c967b76c457bde80af0caec54
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 15 16:32:13 2012 -0700

    Stop setting promisc on bridge
    
     * With hairpin mode the old workaround is now broken
     * Fixes bug 956474
    
    Change-Id: Ib06baa5292ad59138041b2c641673a96263b5ff8

 nova/network/linux_net.py    |    6 ------
 nova/tests/test_linux_net.py |    4 ----
 2 files changed, 10 deletions(-)

commit a58a50e060c8f8367b1b74e2bdb6bd804052bfaa
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Mar 15 16:10:53 2012 -0700

    Fix OpenStack Capitalization
    
    Openstack => OpenStack
    for nova/*py
    
    Change-Id: Ibcfae4776422a515a109e59510fc84f8b63c00b9

 nova/console/api.py                                |    2 +-
 nova/console/fake.py                               |    2 +-
 nova/console/manager.py                            |    2 +-
 nova/console/xvp.py                                |    2 +-
 nova/consoleauth/__init__.py                       |    2 +-
 nova/consoleauth/manager.py                        |    2 +-
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/flags.py                                      |    2 +-
 nova/ipv6/__init__.py                              |    2 +-
 nova/ipv6/api.py                                   |    2 +-
 nova/rootwrap/__init__.py                          |    2 +-
 nova/rootwrap/compute.py                           |    2 +-
 nova/rootwrap/filters.py                           |    2 +-
 nova/rootwrap/network.py                           |    2 +-
 nova/rootwrap/volume.py                            |    2 +-
 nova/rootwrap/wrapper.py                           |    2 +-
 nova/scheduler/__init__.py                         |    2 +-
 nova/scheduler/api.py                              |    2 +-
 nova/scheduler/chance.py                           |    2 +-
 nova/scheduler/driver.py                           |    2 +-
 nova/scheduler/filter_scheduler.py                 |    2 +-
 nova/scheduler/filters/__init__.py                 |    2 +-
 nova/scheduler/filters/all_hosts_filter.py         |    2 +-
 nova/scheduler/filters/availability_zone_filter.py |    2 +-
 nova/scheduler/filters/compute_filter.py           |    2 +-
 nova/scheduler/filters/core_filter.py              |    2 +-
 nova/scheduler/filters/isolated_hosts_filter.py    |    2 +-
 nova/scheduler/filters/json_filter.py              |    2 +-
 nova/scheduler/filters/ram_filter.py               |    2 +-
 nova/scheduler/host_manager.py                     |    2 +-
 nova/scheduler/least_cost.py                       |    2 +-
 nova/scheduler/manager.py                          |    2 +-
 nova/scheduler/multi.py                            |    2 +-
 nova/scheduler/scheduler_options.py                |    2 +-
 nova/scheduler/simple.py                           |    2 +-
 nova/tests/api/__init__.py                         |    2 +-
 nova/tests/api/ec2/__init__.py                     |    2 +-
 .../api/openstack/compute/contrib/test_hosts.py    |    2 +-
 nova/tests/image/__init__.py                       |    2 +-
 nova/tests/image/test_glance.py                    |    2 +-
 nova/tests/network/__init__.py                     |    2 +-
 nova/tests/notifier/__init__.py                    |    2 +-
 nova/tests/rpc/__init__.py                         |    2 +-
 nova/tests/scheduler/__init__.py                   |    2 +-
 nova/tests/scheduler/test_host_manager.py          |    2 +-
 nova/tests/test_console.py                         |    2 +-
 nova/vnc/__init__.py                               |    2 +-
 nova/vnc/xvp_proxy.py                              |    2 +-
 nova/vsa/api.py                                    |    2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

commit 0b89a35f25b62537457a3d327d1b5ac3e1fad056
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 15 15:50:12 2012 -0700

    Remove improper use of redirect for hairpin mode
    
     * Fixes bug 943316
    
    Change-Id: I7fb5ffa812f7474613500bd7d9f141f83ad70614

 nova/virt/libvirt/connection.py |    2 --
 1 file changed, 2 deletions(-)

commit bb1e383ae328517593ad4757cc168bf58d951111
Merge: 6c3fd5a 6a3e22a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 22:50:43 2012 +0000

    Merge "fix timestamps to match documented ec2 api"

commit 6c3fd5ada0fb286af173ac65f20bf36049b0372f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Mar 15 14:42:01 2012 -0700

    Fix OpenStack Capitalization
    
    Openstack => OpenStack
    
    Change-Id: I13921ae3fcc40a85ace84a32e52a1507b802f691

 nova/api/metadata/__init__.py                      |    2 +-
 nova/api/openstack/compute/consoles.py             |    2 +-
 .../api/openstack/compute/contrib/admin_actions.py |    2 +-
 nova/api/openstack/compute/contrib/cloudpipe.py    |    2 +-
 .../openstack/compute/contrib/deferred_delete.py   |    2 +-
 .../compute/contrib/extended_server_attributes.py  |    2 +-
 .../openstack/compute/contrib/extended_status.py   |    2 +-
 .../openstack/compute/contrib/flavorextradata.py   |    2 +-
 .../openstack/compute/contrib/flavorextraspecs.py  |    2 +-
 nova/api/openstack/compute/contrib/hosts.py        |    2 +-
 nova/api/openstack/compute/contrib/keypairs.py     |    2 +-
 nova/api/openstack/compute/contrib/rescue.py       |    2 +-
 .../compute/contrib/virtual_interfaces.py          |    2 +-
 .../compute/contrib/virtual_storage_arrays.py      |    4 ++--
 nova/api/openstack/compute/contrib/volumes.py      |    4 ++--
 nova/api/openstack/compute/contrib/volumetypes.py  |    4 ++--
 nova/api/openstack/compute/image_metadata.py       |    2 +-
 nova/api/openstack/compute/ips.py                  |    2 +-
 nova/api/openstack/compute/server_metadata.py      |    2 +-
 nova/api/openstack/compute/views/limits.py         |    2 +-
 nova/api/openstack/volume/types.py                 |    2 +-
 nova/api/openstack/wsgi.py                         |    2 +-
 22 files changed, 25 insertions(+), 25 deletions(-)

commit a123f26a3f99bd0382ca48706dbfa363e11a9619
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Mar 6 12:47:47 2012 +0400

    HACKING fixes, TODO authors.
    
    Looks like this fixes all HACKING problems that were around.
    Thanks to Dina Belova and Alexander Kovalev for this work.
    
    Change-Id: I63ae1ab2f1bb37daa236cde4096c3c893fd80dd2

 bin/nova-manage                                    |    4 ++--
 nova/api/ec2/apirequest.py                         |    2 +-
 nova/api/openstack/common.py                       |    2 +-
 .../compute/contrib/virtual_storage_arrays.py      |    4 ++--
 nova/image/glance.py                               |    2 +-
 nova/tests/baremetal/test_proxy_bare_metal.py      |    2 +-
 nova/tests/rpc/common.py                           |    3 ++-
 nova/tests/test_auth.py                            |    2 +-
 nova/virt/libvirt/connection.py                    |    2 +-
 nova/virt/xenapi/fake.py                           |    2 +-
 nova/virt/xenapi/host.py                           |    2 +-
 nova/virt/xenapi/vmops.py                          |    2 +-
 nova/volume/xensm.py                               |    5 ++---
 nova/vsa/api.py                                    |    7 ++++---
 14 files changed, 21 insertions(+), 20 deletions(-)

commit 4012a3f792ca5958616b31f7594f200d18665d71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 15 13:02:07 2012 -0700

    Keep context for logging intact in greenthreads
    
     * fixes bug 942918
    
    Change-Id: Ia0fcf459c53b95a8675472adcfbba08014e34e5b

 nova/context.py         |    5 ++++-
 nova/image/s3.py        |    1 +
 nova/rpc/amqp.py        |    2 +-
 nova/rpc/impl_carrot.py |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

commit 6a3e22a25c9ee3b259084df2f31c61b37f097e39
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Mar 15 15:47:23 2012 -0400

    fix timestamps to match documented ec2 api
    
    fixes bug: 823503
    
    Update to the dateTime format to provide three places of precision to
    microseconds.  This change makes the API match the ec2 documents.
    
    Change-Id: I765e64e99042ade9fa996dfb1dee603d363f9b2c

 Authors                    |    1 +
 nova/api/ec2/apirequest.py |    2 +-
 nova/tests/test_api.py     |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 97eb92880e0886a3f257f32a88ba9e55b8ec8a90
Merge: c303abc 1ddee03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 18:01:22 2012 +0000

    Merge "Add ssl and option to pass tenant to s3 register"

commit c303abc2ee08ee5cb34bf90b58ba3daa80d5d256
Merge: 241ea3a 51b3510
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 17:51:10 2012 +0000

    Merge "Fix LXC volume attach issue"

commit 241ea3a0635061589473061dfe36606a63696e05
Merge: 810e54a b684d65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 17:03:55 2012 +0000

    Merge "Refix mac change to work around libvirt issue"

commit 810e54a1643b7f7835db209791d596351c64cd34
Merge: 6f538ff b76abb6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 16:58:21 2012 +0000

    Merge "Make extended status not admin-only by default."

commit 6f538ff12f466bda2cb14a42c9ac36a3dbf8e14f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Mar 15 14:00:42 2012 +0100

    Include babel.cfg in tarballs
    
    Include babel.cfg in produced tarballs. Fixes bug 955975.
    
    Change-Id: I3284775638a2aff0be6e753f4b56b2ef94617001

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 51b3510387cafec87e39c2a52e8578a66f3488d4
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Mar 15 10:58:57 2012 +0100

    Fix LXC volume attach issue
    
    Fix erroneous use of echo to set permissions on LXC volume access.
    Fixes bug 943304.
    
    Note that based on input from the duplicate bug (948193), we set:
    b x:x rwm
    to /sys/fs/cgroup/devices/libvirt/lxc/x/devices.allow
    
    instead of:
    c x:x rwm
    to /sys/fs/cgroup/devices/sysdefault/libvirt/lxc/x/devices.allow
    
    Change-Id: Ia048d3f46799839b4b85c781bb50488e09ba9b5e

 nova/virt/disk/api.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit b76abb654762adaa401c28e7f54da9ace5ecf72e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 14 23:04:03 2012 -0700

    Make extended status not admin-only by default.
    
     * Fixes bug 955737
     * Fixes bug 955735
    
    Change-Id: Ie8d6b67b50d50390edabdde180ed6e29764e2041

 etc/nova/policy.json |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da079747516b5d2cd067e3663297f27db1d740f1
Merge: 1bdd301 d64564d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 04:03:55 2012 +0000

    Merge "Remove broken bin/*spool* tools"

commit 1bdd301ee33724936da076ec3d7153c3c0e798fe
Merge: 3cf1b03 9a40d6e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 01:36:35 2012 +0000

    Merge "libvirt/connection.py: Set console.log permissions"

commit 3cf1b0312c3e18228c38a02f4d71b768dbbb7e53
Merge: e0d14ca 22b484a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 01:26:31 2012 +0000

    Merge "Allow errored volumes to be deleted"

commit e0d14ca213198500014bf53d5843fa07aaded366
Merge: 8fe00c5 4c8dbf8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 22:39:54 2012 +0000

    Merge "metadata speed - revert logic changes, just caching"

commit 1ddee034ac367839495c52fd8adec384693511b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Mar 10 15:58:59 2012 -0800

    Add ssl and option to pass tenant to s3 register
    
     * needed to support swift/s3 authentication
     * also adds option for ssl if swift is secured
     * fixes bug 954505
    
    Change-Id: I6656592020b02ba46e44c793d6f0f1fde9f8178d

 nova/image/s3.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit d64564d4be2302393389e379983f84d4a2273f45
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Mar 14 15:33:19 2012 -0700

    Remove broken bin/*spool* tools
    
    Change-Id: Ia67f35374917d7037887b2d2c39ca92ff79587c8

 bin/nova-logspool    |  155 --------------------------------------------------
 bin/nova-spoolsentry |   92 ------------------------------
 setup.py             |    2 -
 3 files changed, 249 deletions(-)

commit 8fe00c545ea6e8a2b14f7a35b009b84dc0e2c29a
Merge: f403575 db3c63d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 22:29:28 2012 +0000

    Merge "Cleanup flags"

commit 22b484a6d0b65c2a41fd4c730a5ebddf98c70c84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 14 09:26:40 2012 -0700

    Allow errored volumes to be deleted
    
     * Allow volumes with no host set to be deleted from db
     * Allow volumes in state error to be deleted
     * Replicates code from nova-manage command
     * Fixes bug 953594
    
    Change-Id: Ia8b4594a626df58f030406b12dd003f5c9215612

 nova/tests/test_vsa_volumes.py |   11 +++++------
 nova/volume/api.py             |    8 ++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

commit 036c34f44f48cdd35cf5de95c08b4d242bc1f07a
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Mar 14 15:16:43 2012 -0700

    Fix up docstring
    
    Change-Id: I0b9e29455393c34e2861360418297b60bd073d9d

 bin/instance-usage-audit |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9a40d6e714246b40b5b41f65197941fe29eb8ff1
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Mar 14 14:49:23 2012 -0700

    libvirt/connection.py: Set console.log permissions
    
    A required call to libvirt_utils.chown() was lost in
    this weeks changes to get_console_output() for file
    based console logs.
    
    Fixes bug 955351
    
    Change-Id: Ib8da92c1ff025f10a939c33b87495ffdef0d4da3

 nova/virt/libvirt/connection.py |    1 +
 1 file changed, 1 insertion(+)

commit caf25ef8d3bdb49a6f23ee9789342558c53b9172
Author: Yun Mao <yunmao@gmail.com>
Date:   Tue Mar 13 16:15:19 2012 -0400

    nonblocking libvirt mode using tpool
    
    Add an option libvirt_nonblocking (disabled by default) to use a thread
    pool to execute all libvirt API calls. Previously all the calls except
    one in firewall.py are blocking in the eventlet thread model.
    
    Change-Id: I665ed7a629bb029011b181e8d2844fc2276502d9

 etc/nova/nova.conf.sample       |    2 ++
 nova/virt/libvirt/connection.py |   15 ++++++++++++++-
 nova/virt/libvirt/firewall.py   |    8 +++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

commit 4c8dbf81d9a9f27faeb19271b774ea4f130e516c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Mar 14 13:20:07 2012 -0700

    metadata speed - revert logic changes, just caching
    
     * reverts most of https://review.openstack.org/5042
     * keep changes that cache the results so subsequent calls are fast
    
     fixes bug 954377
    
    Change-Id: Ia047f1d04dc360dd657d4d80d3dff8c8101635cd

 nova/api/metadata/handler.py |  223 ++++++++++++++----------------------------
 nova/tests/test_metadata.py  |    8 +-
 2 files changed, 76 insertions(+), 155 deletions(-)

commit f40357574245d2e3b8cb7995cb27adc8e9b99175
Merge: edca430 f48f1bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 19:36:47 2012 +0000

    Merge "Make fixed_ip_disassociate_all_by_timeout work."

commit edca430b52631fd4fac150923cc339fe1e2cd351
Merge: a236fdd 722c54a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 18:47:07 2012 +0000

    Merge "Fixes bug 954833 By adding the execute bit to the xenhost xenapi plugin"

commit b684d651f540fc512ced58acd5ae2ef4d55a885c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 14 10:34:33 2012 -0700

    Refix mac change to work around libvirt issue
    
     * fixes bug 921838
    
    Change-Id: I11278a03c4429686499b2f62c66a7f442258f5a6

 nova/utils.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit a236fdd380bec0793b6198e5e8eb40aa30ab729d
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 14 10:53:36 2012 -0400

    Update transfer_vhd to handle unicode correctly.
    
    Python 2.4's shlex implementation doesn't seem to like unicode.
    This updates the XenServer migration plugin so it converts to
    ascii before shlex'ing the rsync args.
    
    Fixes OSAPI resizes when using XenServer.
    
    Fixes LP Bug #955064.
    
    Change-Id: I7f2681bfe64ccde449a87c68b9739866a381a213

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 722c54a069d3007e92a62faf14f123cdbfe98695
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Wed Mar 14 09:36:11 2012 +0000

    Fixes bug 954833
    By adding the execute bit to the xenhost xenapi plugin
    
    Change-Id: Id1e12b84ef5c9a286d86a32b3ea1c7f3c83be47c

 0 files changed

commit db3c63d199275b92f9106b275e76fdc1eb62d6ba
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Mar 13 18:03:28 2012 -0700

    Cleanup flags
    
    sql_max_retries: removed (unused)
    instance_usage_audit_period: fixed help
    default_schedule_zone: fixed help
    
    Change-Id: I952b38497987780d30622fef526edd2d53860f99

 nova/console/manager.py |    2 +-
 nova/flags.py           |    9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 78a067e9d3b848067b933d58a2abecc96753bc36
Merge: b155d34 aa204ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 22:26:21 2012 +0000

    Merge "Fix backing file cp/resize race condition."

commit b155d34e73f4328955d29c5389e8094e558c6744
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Mar 13 14:51:24 2012 -0700

    fix bug 954488
    
    Docstring update
    
    Change-Id: Ic0c60818a7097e777927f3801dd674ce72571224

 nova/openstack/common/cfg.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aa204ea41b88e6896f5505df2d35cdb275cf6187
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 13 14:44:31 2012 -0700

    Fix backing file cp/resize race condition.
    
     * Fixes bug 953831
    
    Change-Id: I39950b16c9b76159b16203f7b8b504cae5475516

 nova/virt/libvirt/connection.py |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

commit dec0e49db2b031e09f7a73ce645a6000bc6ab932
Merge: 0e971ef 1991fd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 21:12:31 2012 +0000

    Merge "Map image ids to ec2 ids in metadata service"

commit 0e971ef9e990e48f81271d81c7e46b08f538abbd
Merge: de10c0d e41f586
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 21:02:02 2012 +0000

    Merge "Remove date_dhcp_on_disassociate comment and docs."

commit de10c0d7d26ff5ed012f4a4a1b9f0ae9000dfe71
Merge: cf09a21 c8ad7f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 20:51:20 2012 +0000

    Merge "Use a FixedIp subquery to find networks by host"

commit cf09a214c3007a8fa8dbe98f4cb6fcf732e09932
Merge: bf047a4 ee98cd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 20:40:53 2012 +0000

    Merge "add convert_unicode to sqlalchemy connection arguments"

commit c8ad7f7c406b4684391bfd5aa0b309b4d9dafe70
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Mar 13 14:14:36 2012 -0500

    Use a FixedIp subquery to find networks by host
    
    * Fixes LP954341
    * The FK removals missed this FK reference. Updated function to use
        a subquery in the filter
    
    Change-Id: Ia61d6536deb78e1aa16c5a94956bf919aa3356ba

 nova/db/sqlalchemy/api.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit bf047a4e456b00eb39e1c3c4eb47cb87274eb4b8
Merge: 8be6b86 42a96d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 19:08:43 2012 +0000

    Merge "refactoring code, check connection in Listener. refer to Bug #943031"

commit 8be6b8673673c7915d6f6052a948d883c2a36d9a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 12 13:20:26 2012 -0700

    Changes remove_fixed_ip to pass the instance host
    
     * fixes bug 953379
    
    Change-Id: I9c507b68af04d51d5d248b0c52f34646a46bd882

 nova/compute/manager.py            |    8 +++++---
 nova/network/api.py                |   14 +++++++-------
 nova/network/manager.py            |    5 +++--
 nova/tests/fake_network.py         |    2 +-
 nova/tests/network/test_manager.py |    5 +++--
 5 files changed, 19 insertions(+), 15 deletions(-)

commit 8bec631791eba835cc9a698da68260a6b49072e0
Merge: 0929e3a 9120a7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 18:06:54 2012 +0000

    Merge "Hack to fixup absolute pybasedir in nova.conf.sample"

commit 1991fd682563474dab1f299a5c8842d2637fe887
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 12 20:51:40 2012 -0700

    Map image ids to ec2 ids in metadata service
    
    * Fixes bug 953319
    
    Change-Id: I96c1a7f260833adc40b0b07d38bccba4a233e091

 nova/api/metadata/handler.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit e41f586d0701e4b2d3e7ad8de4a05e8be216e096
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 13 13:31:40 2012 -0400

    Remove date_dhcp_on_disassociate comment and docs.
    
    Remove date_dhcp_on_disassociate comments/docs.
    This option no longer exists.
    
    Change-Id: Ia1462abf6166a4a7c53fba7fe231dc13a542480d

 etc/nova/nova.conf.sample |    2 --
 nova/network/manager.py   |    2 --
 2 files changed, 4 deletions(-)

commit f48f1bb72474e564f4f8b01da97730f612a868f9
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 13 13:15:49 2012 -0400

    Make fixed_ip_disassociate_all_by_timeout work.
    
    Fix an issue in the SQL api where fixed_ip_disassociate_all_by_timeout
    was getting an array of tuples instead of IDs from a model_query.
    
    This should resolves issues where fixed IPs don't get dissassociated
    via the network managers periodic task.
    
    Fixes LP Bug #953708.
    
    Change-Id: Iac485cdcda072ee248237e6c4a31113685f5b980

 nova/db/sqlalchemy/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 0929e3a289af39fc38b46c4a55db06b8888e671e
Author: Maru Newby <mnewby@internap.com>
Date:   Mon Mar 12 23:19:16 2012 -0700

    Refactor glance id<->internal id conversion for s3
    
     * Moves nova.image.s3.S3ImageService functions for converting
       between glance ('image_uuid') and internal (db) ids to ec2utils:
    
           get_image_id => ec2utils.glance_id_to_id
           get_image_uuid => ec2utils.id_to_glance_id
    
     * Refactors ec2utils.glance_id_to_id to create a new S3Image
       object associating a glance id to an internal id if such a
       mapping does not already exist.  Previously, only calls to
       nova.api.ec2.cloud.CloudController.describe_images would
       add new mappings, but now any attempt to convert a glance id
       to an internal id will succeed, resolving bug 948286.
    
     * Adds 2 convenience methods to ec2utils, as per bcwaldon:
    
           ec2_id_to_glance_id
           glance_id_to_ec2_id
    
     * Since this is a strict refactor and only streamlines existing
       well-tested functionality, this change includes no new tests.
    
    Change-Id: I810afe05223228df1bcc20a0ac688d8c62c472b4

 nova/api/ec2/cloud.py    |   28 +++++++++-------------------
 nova/api/ec2/ec2utils.py |   26 ++++++++++++++++++++++++++
 nova/image/s3.py         |   40 +++++++++++-----------------------------
 3 files changed, 46 insertions(+), 48 deletions(-)

commit 094985ea657f590936906829486829846a558f05
Merge: 67435c3 a3a7464
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 16:59:53 2012 +0000

    Merge "Sort results from describe_instances in EC2 API."

commit 67435c32690c87b355cfbcf9d36b00d60789015e
Merge: 7c50652 397c681
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 16:16:53 2012 +0000

    Merge "Removes default use of obsolete ec2 authorizor."

commit a3a7464a8de96e219f40049fdd03b41cb8eb65ca
Author: Russell Bryant <rbryant@redhat.com>
Date:   Sat Mar 10 13:12:27 2012 -0500

    Sort results from describe_instances in EC2 API.
    
    Fix bug 827619.
    
    This bug pointed out that EC2 sorts the results of of describe_instances
    by the launch time.  Make our implementation of the EC2 API behave the same
    way.  Previously, instances coming out of the db API were sorted by the
    key we wanted, but in the opposite order.  You can now specify both a
    sort key and order.  The behavior is the same by default, but the EC2
    API sets the parameter to do an ascending sort.
    
    Change-Id: Ifd0bc79ad4c4c8c45809dbb1ac2dadf8abcfd4c3

 nova/api/ec2/cloud.py                            |    3 +-
 nova/compute/api.py                              |   15 ++++--
 nova/db/api.py                                   |    6 ++-
 nova/db/sqlalchemy/api.py                        |    7 ++-
 nova/tests/api/ec2/test_cloud.py                 |   57 ++++++++++++++++++++++
 nova/tests/api/openstack/compute/test_servers.py |   42 ++++++++++------
 6 files changed, 107 insertions(+), 23 deletions(-)

commit 7c50652a97fe7ebd74ce38572cbd9744c76b2f71
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Mar 5 16:21:41 2012 +0900

    virt/firewall: NoopFirewallDriver::instance_filter_exists must return True
    
    Otherwise, virt.libvirt.connection.ensure_filtering_rules_for_instance()
    results in infinite loop.
    And eliminate NullFirewallDriver as it's same to NoopFirewallDriver.
    This patch fixes bug 953781.
    
    Change-Id: I7936b3c69e9269041defd1ef7e5dda2de1f96dab

 nova/tests/test_libvirt.py |   32 ++------------------------------
 nova/virt/firewall.py      |    3 +++
 2 files changed, 5 insertions(+), 30 deletions(-)

commit 777852191aa9bad3297ab3fe48701e8ec5266d17
Merge: 4e3c9ea 22ee737
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 07:27:13 2012 +0000

    Merge "fix nova-manage floating delete"

commit 4e3c9ea110a7f71fa423e80c8c4d1b3548fe5c68
Merge: da23487 4b8e3d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 05:38:34 2012 +0000

    Merge "Improve vnc proxy docs."

commit 22ee7378c632fdb6e395cab5b12a5acf304fc964
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Mar 12 22:10:49 2012 -0700

    fix nova-manage floating delete
    
    use address_to_hosts
    
    bug 953716
    
    Change-Id: I041b12204028d43a30cc412a8ea6c17f1fc6f6ff

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da23487487d442cffeb252236428abbda3f45746
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 12 23:52:40 2012 -0400

    fixed list warn when ip allocated to missing inst.
    
    Update 'nova-manage fixed list' so it prints a warning if an IP
    is allocated to a deleted/missing instance.
    
    Fixes LP Bug #953685.
    
    Change-Id: I72b7ad2cb01e31cf9bb6cab904ab10d8769a3526

 bin/nova-manage |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 397c681e279c76914617f3183c48f5c7cfac0936
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 6 22:22:32 2012 -0800

    Removes default use of obsolete ec2 authorizor.
    
     * Removes old ec2 authorizor from pipeline
     * Fixes bug 948728
    
    Change-Id: Ibf510b0fae8f5272c88badee8f9e5aeca19495bd

 etc/nova/api-paste.ini |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fd80f1b2e1dc03b77fa51cfa27dedce1c593201d
Merge: 5c20aee 6857fd2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 23:27:41 2012 +0000

    Merge "Fixes bug 943188"

commit 5c20aee542fd9af473ca845020ecac9fe9df2d41
Merge: b9b30e0 1d030ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 23:06:42 2012 +0000

    Merge "Additional extensions no longer break unit-tests"

commit b9b30e0ff8e8a7e0ddcfc6f5007f647eee54e6f1
Merge: f734f75 77664b2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 22:56:05 2012 +0000

    Merge "Checks image virtual size before qemu-img resize."

commit f734f751759c7ad5c9d6f0f98f04284742d3b68f
Merge: 821684f 00592cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 22:45:34 2012 +0000

    Merge "Use cPickle and not just pickle."

commit 821684f3088fd4cd2564ebc4aa0516a0f9f7079e
Merge: 277ef20 1747cc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 22:35:02 2012 +0000

    Merge "Move (cast|call)_compute_message methods back into compute API class"

commit 1d030abae59a427d2f4d78e810f503982e42e0c3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Mar 12 22:30:54 2012 +0000

    Additional extensions no longer break unit-tests
    
    Fixes bug 953492
    
    Change-Id: Iecdf22bcd8356db2a6f0d77b7ea0dc37ca88e83e

 .../tests/api/openstack/compute/test_extensions.py |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

commit 277ef20f0b4c0fe8f364f1233a3725064c1241e0
Merge: 7b74964 440a85f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 22:24:35 2012 +0000

    Merge "doc/source/conf.py: Fix man page building"

commit 7b749644c924f71c1030bfcbbd0ebb52d1e77fd3
Merge: d15fbe9 625c5e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 22:03:36 2012 +0000

    Merge "Fix libvirt get_console_output for Python < 2.7"

commit d15fbe92e7d0cf7df72fa9c3cf21d31bd9d49df0
Merge: e189962 c5e5141
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 21:57:47 2012 +0000

    Merge "Avoid nova-manage floating create <IP addr>/32"

commit 00592cfa0b90c66682be2bc31428277c35a35c48
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Mar 12 21:49:11 2012 +0000

    Use cPickle and not just pickle.
    
    Fixes bug 953423
    
    cPickle is up to 1000 times faster than pickle. We should use it instead.
    
    Change-Id: I1facbdcf60d88c9fba56687abf75524498d2502e

 bin/nova-spoolsentry                               |    5 +----
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 nova/virt/xenapi/vmops.py                          |    2 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

commit 1747cc366dd93534db78ca393ec8e39a7652dc27
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Mar 12 20:13:39 2012 +0000

    Move (cast|call)_compute_message methods back into compute API class
    
    Those calls need to be able to be overridden in a subclass to support
    compute cells, at least initially.  A prior patch that moved them to
    module functions broke the cells work.
    
    Change-Id: I6c35fa1ac646fe686bbc2c5eed2da7e286d32a15

 nova/compute/api.py        |  213 +++++++++++++++++++++-----------------------
 nova/tests/test_compute.py |    6 +-
 2 files changed, 106 insertions(+), 113 deletions(-)

commit 625c5e45db62c59691b16fadde464a192af3ac3f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Mar 12 21:27:19 2012 +0000

    Fix libvirt get_console_output for Python < 2.7
    
    Fixes bug 953410
    
    Unit tests fail when using Python 2.6.  This fixes it.
    
    Change-Id: Ic53d16a75f5e4e134a92f27597a77404dd78d0f6

 nova/virt/libvirt/connection.py |   41 +++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

commit 440a85f1417cc6f771981f4c18da494a7c97f103
Author: Adam Gandelman <adamg@canonical.com>
Date:   Mon Mar 12 14:16:27 2012 -0700

    doc/source/conf.py: Fix man page building
    
    Commit 29df6cd70 renamed novamanage to nova-manage but did
    not update doc/source/conf.py accordingly causing build_sphinx
    failures.
    
    Also removes a stale conf.py backup created some time ago
    
    Change-Id: Ia00b6d88eab90e0e77992375d7ccc7036c9d5f34

 doc/source/conf.py      |    2 +-
 doc/source/conf_back.py |  226 -----------------------------------------------
 2 files changed, 1 insertion(+), 227 deletions(-)

commit e18996253ccde16aaf65866d85d05372b75b3a1f
Merge: ff1e2b6 1bcf5f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 21:08:43 2012 +0000

    Merge "improve speed of metadata"

commit ff1e2b6ccad4f5eafcd169a269746d05b860d5f1
Merge: f4a3b2c c63c421
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 20:58:22 2012 +0000

    Merge "Update floating auto assignment to use the model"

commit f4a3b2cc92b83459d3633c33fed7f680fe887b3c
Merge: 641b68b 35ec9f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 20:39:50 2012 +0000

    Merge "Make nova-manage syslog check /var/log/messages."

commit 641b68b0ad756196fb3ebc89ffd03c29a1d01cd4
Merge: b057ab6 7dbf9c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 20:10:59 2012 +0000

    Merge "Make snapshots with qemu-img instead of libvirt"

commit c63c42146704fdf19f2f163ade62033313e27dc9
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed Mar 7 17:45:12 2012 -0700

    Update floating auto assignment to use the model
    
     * addresses bug 928819
     * previously submitted changes (#change,4236)
     * unit tests added that don't use fakes for everything
     * added testAssert to check assignment process
     * added call to deallocate as well
    
    Change-Id: I46503e6e88031a6e1ab3ac76163402091168c6b0

 nova/api/openstack/common.py       |    3 ++-
 nova/network/manager.py            |    6 ++----
 nova/tests/network/test_manager.py |   40 ++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 5 deletions(-)

commit 35ec9f3c251c1bed1980108a4645485fbf39a3d3
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 12 15:55:25 2012 -0400

    Make nova-manage syslog check /var/log/messages.
    
    Updates nova-manage syslog so that it checks /var/log/messages.
    
    Fixes LP Bug #953354.
    
    Change-Id: I0b4b61225285e9f0668f6f0af3928896e2700840

 bin/nova-manage |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit b057ab60a39eb8dfa6604d6f207625c29df6cd70
Merge: 9b9656e f36f2f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:49:26 2012 +0000

    Merge "fix up nova-manage man page"

commit 9b9656ea00968d7798695ce715e5f81b35fa18c4
Merge: 43b95ca 23c576a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:38:40 2012 +0000

    Merge "Change default of running_deleted_instance_action"

commit 1bcf5f5431d3c9620596f5329d7654872235c7ee
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Mar 7 13:05:28 2012 -0800

    improve speed of metadata
    
     * don't load every possible answer, only do what is needed
     * cache instance data for a given address for a 15 seconds
       using either memcache or fake memcache (in-memory).
       This means only a single queue/db lookup for multiple calls
       to metadata service
     * add cache expirey to fake memcache (don't grow forever)
       and move it to nova.common.memorycache
    
    Addresses Bug #851159
    
    Change-Id: Icf794156e055b18915b8b5be9ba2ab97d2338bbe

 nova/api/ec2/__init__.py      |    2 +-
 nova/api/metadata/handler.py  |  216 +++++++++++++++++++++++++++++------------
 nova/auth/ldapdriver.py       |    2 +-
 nova/auth/manager.py          |    2 +-
 nova/common/memorycache.py    |   64 ++++++++++++
 nova/testing/fake/__init__.py |    1 -
 nova/testing/fake/memcache.py |   59 -----------
 nova/tests/test_metadata.py   |    8 +-
 8 files changed, 225 insertions(+), 129 deletions(-)

commit 43b95ca29ec5ad318c771d03d151a9425e138cec
Merge: 4214fea ec6be8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:27:30 2012 +0000

    Merge "Bug #922356 QuantumManager does not initiate unplug on the linux_net driver"

commit 4214fea02f65ccb66d34ba2a9af454c7491f1349
Merge: 58ced12 1265104
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:12:36 2012 +0000

    Merge "Fix linux_net.py interface-driver loading."

commit 58ced1211ae3f39c7d869d86c8711acd472346de
Merge: 7bb4f83 77495cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:01:51 2012 +0000

    Merge "Fix nova-manage backend_add with sr_uuid"

commit 7bb4f83cfd4f641fc8361fab147df81db7bd4052
Merge: 5810e20 6fd9d32
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 18:47:35 2012 +0000

    Merge "Nuke some unused SQL api calls."

commit 1265104b873d4cd791cecc62134ef874b4656003
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Mar 12 11:43:23 2012 -0700

    Fix linux_net.py interface-driver loading.
    
    bug 950381
    
    linux_net.py previously set the value of interface_driver based on a flag
    when the module was loaded.  This breaks when nova-manage is used to
    invoke anything using the interface_driver, as nova-manage loads the
    nova.network.linux_net module before flags are properly set.  This patch
    moves the initialization of the interface_driver variable to within a
    function that will only be called once flags are properly loaded.
    
    Note: this patch also fixes the unplug() action for the OVS vif-plugging
    code to actually remove the device created to act as the gateway device.
    Also tweaks the plug() to use the get_dev() method, reducing duplicate
    code.
    
    Change-Id: I97a17c010d4d6a67e2340a81315da00775c67eea

 nova/network/linux_net.py |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit 5810e2062d0df0485ba0774a927ae6dfd5da2d4e
Merge: 39a8abf ad53f91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 18:36:54 2012 +0000

    Merge "Don't use glance when verifying images."

commit 23c576a396ae963262a99f8fdf7c7d422ddb8bd2
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Fri Mar 9 16:56:25 2012 +0000

    Change default of running_deleted_instance_action
    
    fixes bug #944997
    
    Change-Id: I3baea3a05c23b8869e4a4d13d4a31fdc67793f0f

 etc/nova/nova.conf.sample |    2 +-
 nova/compute/manager.py   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6fd9d326d97b24ee203b0cf3074074864283178d
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 12 13:55:21 2012 -0400

    Nuke some unused SQL api calls.
    
    Fixes LP bug #953235.
    
    Change-Id: Iafb33a74397a9037c31718018275d3a7d064f59b

 nova/db/api.py            |   73 ------------------
 nova/db/sqlalchemy/api.py |  181 ---------------------------------------------
 2 files changed, 254 deletions(-)

commit 39a8abf3572cdf5e7233f41f638d0111540eaa90
Merge: 9b82756 33def9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 17:58:24 2012 +0000

    Merge "Fix live-migration in multi_host network"

commit 9b8275659b5de8c8291d64d48a11edd83a276837
Merge: e9b3d43 e3f7712
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 17:27:40 2012 +0000

    Merge "Simply & unify console handling for libvirt drivers"

commit c5e51415282330030385304c5af8216e47b84991
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Mar 12 10:27:24 2012 +0000

    Avoid nova-manage floating create <IP addr>/32
    
    Fixes bug 951161
    
    Avoid the counter-intuitive use of the /32 range to indicate a specific
    individial IP address.
    
    Instead a floating IP for a specific individual address is created by
    dropping the range specifier altogether, e.g.:
    
      nova-manage floating create 192.168.1.150
    
    Change-Id: I54b124e961accefa47f6faa7f201809c545c3fa5

 bin/nova-manage |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

commit e9b3d432d3f85de330a2916c802c831ad8bc85ae
Merge: 9a227e1 deb71cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 17:02:50 2012 +0000

    Merge "Add a serializer for os-quota-sets/defaults."

commit 9a227e1970a507c312025d9e092577ae82662e42
Merge: fd6be5d e6cf7fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 16:51:54 2012 +0000

    Merge "Add VDI chain cleanup script."

commit deb71cf6643efbe47b383565f6dc5d346ada29a4
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Mar 12 11:46:33 2012 -0500

    Add a serializer for os-quota-sets/defaults.
    
    This fixes bug 953182.
    
    Change-Id: I273a1d3559a8218a0b1e1f3d973e55d079e92062

 nova/api/openstack/compute/contrib/quotas.py |    1 +
 1 file changed, 1 insertion(+)

commit fd6be5dd2da49156b4d41d3296c2335f89278794
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Mar 12 16:01:25 2012 +0000

    Import nova.exception so exception can be used
    
    Change-Id: Id51e6763c73e5e705ae40c71c251d6a7198a74a6

 nova/network/quantum/melange_connection.py |    1 +
 1 file changed, 1 insertion(+)

commit 0cca58be35d0ef493b5f608eeb43c5fcd405e0ea
Merge: b9eaccb 52c9883
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 15:24:34 2012 +0000

    Merge "Replaced use of webob.Request.str_GET"

commit b9eaccb855651cd5b13568ce91436ae0cb7d98b1
Merge: 4a14427 a44f4c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 15:09:37 2012 +0000

    Merge "Set 'dhcp_server' in _teardown_network_on_host."

commit 42a96d7ca0d6dc1fe5c048e67d5649bf5b513d0d
Author: Peng Yong <ppyy@pubyun.com>
Date:   Sun Mar 11 11:51:31 2012 +0800

    refactoring code, check connection in Listener. refer to Bug #943031
    
    Change-Id: Ic04d1a918fedd5fd71f58af8e27b58deef070ee2

 Authors                       |    1 +
 nova/db/sqlalchemy/session.py |   49 +++++++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 21 deletions(-)

commit 33def9e714fbd13a6dc4b755ade4841c971f7ae5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 8 12:53:44 2012 -0800

    Fix live-migration in multi_host network
    
     * call teardown after live migration
     * call update a second time after migration for dhcp
     * moves the instance state update into post_live_migrate
     * completes the fix for bug 939060
     * fixes bug 947326
    
    Change-Id: I042567573b9bb46381c5447aa08e83cd1916b225

 nova/compute/manager.py    |   30 +++++++++++++++++-------------
 nova/tests/test_compute.py |   16 +++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

commit 4a144270c82949189ff43028a55272e92dc2839d
Merge: fa4751e 676b459
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 06:45:47 2012 +0000

    Merge "fixup ldapdns default config"

commit fa4751edef2c12c4e28372659d39c8902f2e9990
Merge: 2cc409c b5f7525
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 02:46:11 2012 +0000

    Merge "Sub in InstanceLimitExceeded in overLimit message"

commit 2cc409c6f0ae61b1c1833ce679b603d0369b42e8
Merge: c87dce8 5e7fd25
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 01:39:10 2012 +0000

    Merge "Remove update lockmode from compute_node_get_by_host"

commit ee98cd1d5efeb2938f2716700134717ac5e1c6b0
Author: Peng Yong <ppyy@pubyun.com>
Date:   Sun Mar 11 15:41:04 2012 +0800

    add convert_unicode to sqlalchemy connection arguments
    
    Change-Id: Ie886e8ecadb51cb01a4e0964791dc311e90bbebb

 nova/db/sqlalchemy/session.py |    1 +
 1 file changed, 1 insertion(+)

commit c87dce824f81d0ecc0455ae6ed8dfd85fb0bc62a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Mar 10 15:31:55 2012 -0800

    Fixes xml representation of ext_srv_attr extension
    
     * adds tests for xml extended_server_attributes
     * modifies extended_status to match
     * fixes bug 951863
    
    Change-Id: I54aa55bac9ce62b071e62c510ba1b71f1d5b1288

 .../compute/contrib/extended_server_attributes.py  |    2 +-
 .../contrib/test_extended_server_attributes.py     |   36 ++++--
 .../compute/contrib/test_extended_status.py        |  120 ++++++++++++++++++++
 .../compute/contrib/test_extendedstatus.py         |  101 ----------------
 4 files changed, 149 insertions(+), 110 deletions(-)

commit b5f75253048438891a8740a1ea4719e5f3208ccb
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Fri Mar 9 15:15:23 2012 +0000

    Sub in InstanceLimitExceeded in overLimit message
    
    Fixes bug 950768
    
    Previously the error message in the 413 overLimit response returned
    by the OS compute API was missing a parameter subsitution indicating
    the actual quota that was breeched:
    
      'Quota exceeded: code=%(code)s'
    
    This is now properly reported as:
    
      'Quota exceeded: code=InstanceLimitExceeded'
    
    Also a potentially useful log message is no longer discarded.
    
    Change-Id: I7e1f8b078329a6530bb7d7ea3b006ff578cdcdd3

 nova/api/openstack/compute/servers.py            |    3 ++-
 nova/compute/api.py                              |   11 +++++------
 nova/tests/api/openstack/compute/test_servers.py |   19 +++++++++++++++++++
 nova/tests/api/openstack/fakes.py                |    6 ++++++
 4 files changed, 32 insertions(+), 7 deletions(-)

commit 5e7fd2584ad8b20635d284bbe448e45a59c37792
Author: Derek Higgins <derekh@redhat.com>
Date:   Sat Mar 10 22:49:29 2012 +0000

    Remove update lockmode from compute_node_get_by_host
    
    Fixes bug #948066
    
    This commit removes the usage of an update cursor so postgres
    doesn't raise the error below
    SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of
    an outer join
    
    Change-Id: Ia1ede22df38d5f6a24372e0ad8ec25151ad195c7

 nova/db/sqlalchemy/api.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit a44f4c779f4c8beda98075cdb63582a15613a808
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Mar 10 12:14:53 2012 -0500

    Set 'dhcp_server' in _teardown_network_on_host.
    
    Update _teardown_network_on_host so that it sets 'dhcp_server'
    on network objects for compatability when using flat dhcp with
    linux_net.
    
    Fixes LP bug #951642. ('Network' object has no attribute 'dhcp_server')
    
    Change-Id: I53ab99155ea6e4163c9eb0b28b765f962f99a2b1

 nova/network/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 7322c59ef45d14c94e171bebc2c9bf13710b25a8
Merge: ac557d5 dc68e51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 11:24:17 2012 +0000

    Merge "Allow soft_reboot to work from more states:"

commit ac557d5778089d4f83160901039db3b1c766dc78
Merge: 53739e6 a6ac8af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 05:21:40 2012 +0000

    Merge "Display owner in ec2 describe images"

commit ec6be8e59e7021939c8a04d64be1c13403291d67
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Mar 9 21:02:22 2012 -0800

    Bug #922356 QuantumManager does not initiate unplug on the linux_net driver
    
    remove_gateway() being added to L3 driver API which gets invoked from
    QuantumManager when a network is deleted. remove_gateway()
    implementation for LinuxNetL3 calls unplug on the linux_net driver.
    
    Change-Id: I42d12cf8653c61436e89e97eaa384f26ee2ed707

 nova/network/l3.py              |   10 ++++++++++
 nova/network/quantum/manager.py |    1 +
 2 files changed, 11 insertions(+)

commit 53739e6115aef12a02186796e326f610486a2b43
Merge: 2105899 a186df0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 04:18:07 2012 +0000

    Merge "Use a high number for our default mac addresses"

commit 210589984f868034bf73075fc408c3c2b6a38f47
Merge: 75c5e95 81c1d70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 04:07:29 2012 +0000

    Merge "Clean up setup and teardown for dhcp managers"

commit 75c5e956b7341ae2ac95440ab7c69c02168ffe43
Merge: 9f94026 ee0bb74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 03:55:58 2012 +0000

    Merge "Fix issues with security group auths without ports."

commit 81c1d70754543360e11e3aaba2ed403872b21302
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 8 12:51:36 2012 -0800

    Clean up setup and teardown for dhcp managers
    
     * use update_dhcp on teardown, not release_dhcp
     * clean up setup / teardown to not require vif and address
     * make dnsmasq only configure allocated ips
     * prepares the fix for bug 939060
    
    Change-Id: Ie85860c5549339befee74c951ccb0d72a92f6d6c

 nova/db/sqlalchemy/api.py |    1 +
 nova/network/manager.py   |   65 ++++++++++++++++++---------------------------
 2 files changed, 27 insertions(+), 39 deletions(-)

commit 9f9402693a4465346e2b901055f798ba139c130b
Merge: da2f9da 2d11e87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 03:31:46 2012 +0000

    Merge "Use cache='none' for all disks"

commit da2f9daf9c816164a9bfbe15d1a1004adfe60a58
Merge: 0f8f175 77ca96b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 03:15:47 2012 +0000

    Merge "Update cfg from openstack-common"

commit 0f8f1757ae8b8e55bfba5644254b653dc9af8223
Merge: 0bd40aa 5aef0e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 02:56:21 2012 +0000

    Merge "Add pybasedir and bindir options"

commit 0bd40aa0031f62d143a5425dc6cc25189f8f3085
Merge: 6f67c9d e0f8f3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 02:23:28 2012 +0000

    Merge "Use utils.temporary_chown to ensure permissions get reset"

commit a6ac8af69351cb39aa07f53e3327ff29b90383bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 9 18:19:29 2012 -0800

    Display owner in ec2 describe images
    
     * use owner field from glance
     * remove unneccessary project_id field in s3 registration
     * fixes bug 798998
    
    Change-Id: I8d88ff258b914899212d63a7d31d83722d0cb559

 nova/api/ec2/cloud.py            |    2 +-
 nova/image/s3.py                 |    1 -
 nova/tests/api/ec2/test_cloud.py |    3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 6f67c9d043ebd104e07a59f0cd2e9eaca003a4c1
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 8 15:09:38 2012 -0500

    EC2 KeyName validation.
    
    According to EC2 API Documentation, the keyname
    is acccetable as a  alphanumeric characters,
    spaces, dashes, and underscores.
    
    As well as make sure that the keyname doesnt
    exceed 255 characters.
    
    Make sure that the key that is being created is valid.
    Fixes bug 947750.
    
    Change-Id: I083af7f2cbc417150fadb79b307083bb3ba229d6
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/api/ec2/cloud.py            |   11 +++++++++++
 nova/tests/api/ec2/test_cloud.py |   18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

commit ee0bb74cbcf521071965ccd63f8232e8c434229d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Mar 7 15:03:35 2012 -0500

    Fix issues with security group auths without ports.
    
    Fix bug 946427.
    
    There was a bug where a security group would get completely opened in
    cases where only icmp, udp, or tcp should be opened.  For example, any
    of the following three commands would result in opening everything:
    
        euca-authorize -P icmp -o test-ports test-ports
        euca-authorize -P tcp -o test-ports test-ports
        euca-authorize -P udp -o test-ports test-ports
    
    This patch resolves this and these commands now only open the protocol
    that was specified.  Unit tests have been added to verify the fix and
    also verify that this only works when a source group is specified.
    While the bug was originally reported against the EC2 API, the same
    updates and similar unit tests have gone in to the equivalent code for
    the OpenStack API.
    
    Change-Id: I4c87c5f5f4ccee60c6c16da4e659d73ab3f4a34f

 nova/api/ec2/cloud.py                              |   12 +++++
 .../openstack/compute/contrib/security_groups.py   |   12 +++++
 nova/tests/api/ec2/test_cloud.py                   |   54 ++++++++++++++++++++
 .../compute/contrib/test_security_groups.py        |   36 +++++++++++++
 4 files changed, 114 insertions(+)

commit 52c9883ca9dac4fc4369646ac4c323168f9d3ba9
Author: Maru Newby <mnewby@internap.com>
Date:   Fri Mar 9 17:07:30 2012 -0800

    Replaced use of webob.Request.str_GET
    
     * Changed webob.Request.str_GET => webob.Request.GET to
       ensure compatibility with WebOb >= 1.2.
     * Fixes bug 950478
    
    Change-Id: I21d0d477340d31caa4c92fa76270a392b5eb2cca

 nova/api/openstack/compute/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bd2d89dd567dc8544201042487ac23c2096a4b8d
Merge: 88b5e07 c919ba6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 00:50:50 2012 +0000

    Merge "Since 'net' is of nova.network.model.VIF class and 'ips' is an empty list, net needs to be pulled from hydrated nw_info.fixed_ips(), and appended to ips."

commit dc68e51c51b9d423601f6c1bfd627716df1e66bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 9 15:45:49 2012 -0800

    Allow soft_reboot to work from more states:
    
     * update sync_power_states to update other states
     * only attempt to shutdown the domain if it is running
     * attempt to start the domain from shutoff and crashed
     * fixes bug 951235
    
    Change-Id: Icaa071ac59700385d9985315b99c0468415e444a

 nova/compute/manager.py         |    5 ++++-
 nova/virt/libvirt/connection.py |   12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

commit 88b5e07717352d9ae7149a9d2cc6b56539991f31
Merge: f936594 c3cdf8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 10 00:39:58 2012 +0000

    Merge "Fixes os-volume/snapshot delete"

commit 7dbf9c7de23623223ef60c0566d9330797c5f87e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 8 16:26:13 2012 -0800

    Make snapshots with qemu-img instead of libvirt
    
     * snapshot is only supposed to snapshot the root drive, whereas
       libvirt snapshots snapshot the memory and all attached disks
     * removes silly qemu_img flag
     * fixes bug 946830
    
    Change-Id: I6afc9dbaa855f06864cd5a37f89ad63555e35d23

 nova/rootwrap/compute.py         |    4 ++++
 nova/tests/fake_libvirt_utils.py |    8 +++++++
 nova/tests/test_libvirt.py       |   10 ++++++--
 nova/virt/libvirt/connection.py  |   35 +++++++++++++--------------
 nova/virt/libvirt/utils.py       |   48 ++++++++++++++++++++++++++++----------
 5 files changed, 74 insertions(+), 31 deletions(-)

commit e0f8f3a5ed0b567971d8353c6d7bf6ec54cf0269
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 9 23:02:01 2012 +0000

    Use utils.temporary_chown to ensure permissions get reset
    
    Change-Id: I8df1851acebf62f633e8422a2549a8d0227b307d

 nova/rootwrap/compute.py     |    2 +-
 nova/tests/test_utils.py     |   11 +++++++++++
 nova/virt/xenapi/vm_utils.py |   10 +++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

commit e6cf7fc7f48a80e87f24e4f7b6f57d273f9d2a27
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 9 23:26:25 2012 +0000

    Add VDI chain cleanup script.
    
    References bug 949477
    
    Change-Id: I819d4ed56675a4ef4e46adca2978b433386e128d

 tools/xenserver/vdi_chain_cleanup.py |  128 ++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

commit f936594d9e37abf4d8c22c2545a9b67ed8f25c90
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 9 21:02:38 2012 +0000

    Reduce duplicated code in xenapi
    
    Reduce three implementations of creating VBDs to one. Use helper
    functions in other places.
    
    Change-Id: I34ea03fc1fb3cb5d5d343cffa28da5bf3dff888b

 nova/tests/test_xenapi.py        |    8 ++--
 nova/virt/xenapi/vm_utils.py     |   90 ++++++++++++++++----------------------
 nova/virt/xenapi/vmops.py        |   40 ++++++++---------
 nova/virt/xenapi/volume_utils.py |   24 ----------
 nova/virt/xenapi/volumeops.py    |   14 ++----
 5 files changed, 63 insertions(+), 113 deletions(-)

commit 07f8da5c46ded41aa9ccf9b9d56712a182270974
Merge: 1c68d20 627d9e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 9 21:10:15 2012 +0000

    Merge "Switch all xenapi async plugin calls to be sync"

commit c919ba6602d3e99b23f133b68ec3a484aca3c78d
Author: Ante Karamatić <ivoks@ubuntu.com>
Date:   Thu Mar 1 09:38:37 2012 +0100

    Since 'net' is of nova.network.model.VIF class and 'ips' is an empty
    list, net needs to be pulled from hydrated nw_info.fixed_ips(), and
    appended to ips.
    
    bug 942593
    
    Change-Id: I9c2f55e300d1dad503b15c261027d988073e8e61

 Authors                    |    1 +
 nova/tests/test_libvirt.py |   24 ++++++++++--------------
 nova/tests/test_xenapi.py  |   23 ++++++++++-------------
 nova/virt/firewall.py      |    9 +++++----
 4 files changed, 26 insertions(+), 31 deletions(-)

commit 77495cfed17f12f225e11fbc10e0f8db516dadf2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 21:56:56 2012 +0000

    Fix nova-manage backend_add with sr_uuid
    
    Fixes bug 950964
    
    Remove FIXME in db.sm_backend_conf_get_by_sr
    Add first() to sm_backend_conf_get_by_sr query
    Change db/api.py:sm_backend_conf_get_by_sr to call correct impl method
    Have nova-manage generate an actuall sr_uuid instead of always 'None'
    Actually update backend values when specifying uuid
    
    Change-Id: I620da4563d8c936b5a072c4683ae145280104fc2

 bin/nova-manage           |   48 +++++++++++++++++++++------------------------
 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    4 ++--
 3 files changed, 25 insertions(+), 29 deletions(-)

commit 1c68d20e4bc9ca48a01b932f4c511f55cd54f4a9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Mar 9 17:07:37 2012 +0000

    Update values in test_flagfile to be different.
    
    This will ensure the test is actually getting the correct values
    
    Change-Id: I648488c0f573a4d402408cfaf66c1f144c116e1d

 nova/tests/test_flags.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 627d9e99481db537fe71639dd38daf205a9e0728
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 9 16:20:01 2012 +0000

    Switch all xenapi async plugin calls to be sync
    
    Originally all calls were required to be async because of integration
    with twisted, but that has long since been changed and just using the
    synchronous calls is easier and less code.
    
    Change-Id: Ib86fc721326de34fd71d68bbec42ecd65280aa8a

 nova/tests/xenapi/stubs.py   |    1 -
 nova/virt/xenapi/firewall.py |    4 +--
 nova/virt/xenapi/host.py     |   11 +++---
 nova/virt/xenapi/pool.py     |    4 +--
 nova/virt/xenapi/vm_utils.py |   21 +++++-------
 nova/virt/xenapi/vmops.py    |   21 ++++--------
 nova/virt/xenapi_conn.py     |   77 +++++-------------------------------------
 7 files changed, 30 insertions(+), 109 deletions(-)

commit 0c3c67e085018316d2e6174d852bbc8cd2e4ccb1
Merge: 76a2da5 86bcb49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 9 16:19:45 2012 +0000

    Merge "Simplify unnecessary XenAPI Async calls to be synchronous"

commit 76a2da5ebc46e52d0939a430dbacb94bb9f837f2
Merge: 18efc74 4578f4c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 9 16:13:11 2012 +0000

    Merge "Cleanup XenAPI tests"

commit 18efc742fd10280d5dfb42b71c66c626c6c144d9
Merge: 17396f6 26b97b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 9 15:57:07 2012 +0000

    Merge "Fix XML namespaces for limits extensions and versions"

commit 9120a7df376108515e3beee34c53925d969cf2b5
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 9 11:05:13 2012 +0000

    Hack to fixup absolute pybasedir in nova.conf.sample
    
    We want to avoid e.g. /home/markmc or /Users/vishvananda in this
    file.
    
    /usr/lib/python/site-packages is pretty dumb too, but it's suffices
    as an example.
    
    Change-Id: I851841a30ca01790c7b5a9b6bdbd160f4a84467c

 etc/nova/nova.conf.sample |  249 ++++++++++++++++++++++++++-------------------
 tools/conf/create_conf.py |   31 ++++--
 2 files changed, 169 insertions(+), 111 deletions(-)

commit 676b45993cd15f49b7afa60c5bf97c0a225cad78
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Mar 9 15:16:40 2012 +0000

    fixup ldapdns default config
    
    This results in cleaner sample configs
    generated from the new generator tool
    
    Change-Id: I2a8b7dd1ef3840cfb4e7e4ebcc416aaead2972ea

 nova/network/ldapdns.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d11e87d2332577170cb983d6f41441bc534cd7e
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Fri Mar 9 06:01:35 2012 -0500

    Use cache='none' for all disks
    
    The default QEMU disk cache mode has changed several times in
    QEMU's history. This means OpenStack launched VMs have unpredictable
    data consistency guarantees and performance characteristics. Using
    cache=none bypasses the host page cache by using direct IO. This
    ensures:
    
     - Consistent I/O performance for VMs
     - Avoids data loss on a host OS crash
     - Avoids data corruption of images during migration
    
    Change-Id: I099dac55b8cfa1f0ec5d0e49d1d9ffbe4ae2560d
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/test_libvirt.py     |   17 +++++++++++++++++
 nova/virt/libvirt.xml.template |   12 ++++++------
 nova/virt/libvirt/volume.py    |    6 +++---
 3 files changed, 26 insertions(+), 9 deletions(-)

commit 77ca96b5469069e1f96f665f46e96bfaa8961b6c
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 9 11:34:25 2012 +0000

    Update cfg from openstack-common
    
    Change-Id: Ic4eba98d6fe1868f8da82e02eb2ab3d6e37b1b40

 nova/openstack/common/cfg.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 9 11:05:13 2012 +0000

    Add pybasedir and bindir options
    
    Add a pybasedir option so that it can be used for interpolation in the
    default values of other options. This helps eliminate hard-coded paths
    from the sample config file.
    
    Also add a bindir option for similar reasons, but it also helps with
    packaging.
    
    Change-Id: Iadc746dcf2a24adbdf9bac945b5b330f01faeeb5

 nova/auth/manager.py            |    4 ++--
 nova/cloudpipe/pipelib.py       |    2 +-
 nova/console/xvp.py             |    2 +-
 nova/flags.py                   |   11 +++++++++--
 nova/network/linux_net.py       |    7 +------
 nova/utils.py                   |    4 ----
 nova/virt/baremetal/proxy.py    |    2 +-
 nova/virt/disk/api.py           |    2 +-
 nova/virt/libvirt/connection.py |    4 ++--
 9 files changed, 18 insertions(+), 20 deletions(-)

commit e3f77127fe65872a81280061157512886b84d469
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 06:49:44 2012 -0500

    Simply & unify console handling for libvirt drivers
    
    Currently the libvirt.xml.template file contains the following
    console definitions
    
            <!-- The order is significant here.  File must be defined first -->
            <serial type="file">
                <source path='${basepath}/console.log'/>
                <target port='1'/>
            </serial>
    
            <console type='pty' tty='/dev/pts/2'>
                <source path='/dev/pts/2'/>
                <target port='0'/>
            </console>
    
            <serial type='pty'>
                <source path='/dev/pts/2'/>
                <target port='0'/>
            </serial>
    
    There are multiple things wrong with this
    
     - LXC and Xen guests don't honour the <serial> elements
     - The <console> element shouldn't have any <source> element
       of 'tty' attribute set when type=pty, since they are
       dynamically allocated
     - The <console> element will ignored if the <serial>
       element is set and the hypervisor supports this
     - It doesn't say why multiple serial elements are used
       or why the order is important. The reason is that
       the QEMU pty driver throws away data when no client
       is connected. This means we can't use it as a basis
       for the persistent log file. Instead we need two
       separate serial ports, the first of which is used for
       the logfile
    
    In addition in the nova/virt/libvirt/connect.py class the
    'get_console_output' method has separate special-case
    handling for Xen and LXC despite the fact that both work
    in the same way.
    
    All this can be significantly simplified, to unify console
    handling across all libvirt drivers. First replacing all
    the existing XML with just
    
      #if $type == 'qemu'
            <serial type='file'>
                <source path='${basepath}/console.log'/>
            </serial>
            <serial type='pty'/>
      #else
            <console type='pty'/>
      #end if
    
    This lets Xen/UML/LXC just use a regular PTY based console,
    while special casing QEMU. It is minimal XML, letting
    libvirt automatically fill in other attributes
    
    In the code, the get_console_output method can remove the
    explicit checks for Xen/LXC and instead be conditionalized
    based on what the XML shows.
    
    Finally calling out to 'virsh ttyiname' is pointless since
    nova already has a connection to libvirt which can be used
    to fetch the XML & extract the TTY path.
    
    Change-Id: I6a966df4ea72e07dbc227683c4225670984fc507
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 nova/tests/fakelibvirt.py       |   11 +++++--
 nova/tests/test_libvirt.py      |   17 +++++++++--
 nova/virt/libvirt.xml.template  |   23 +++++++--------
 nova/virt/libvirt/connection.py |   60 +++++++++++++++++----------------------
 4 files changed, 60 insertions(+), 51 deletions(-)

commit 4578f4ce85afd8878def1bc58d09033bca96f97f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 9 04:38:46 2012 +0000

    Cleanup XenAPI tests
    
    It's not necessary to define a function and then immediately call it
    
    Change-Id: I867934f8f83b1aa189de69fa9b60a6d39fe8e25a

 nova/tests/test_xenapi.py |   58 +++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

commit 17396f6a08b694b28538462baca582266152da86
Merge: 0b59188 1e551c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 9 01:50:49 2012 +0000

    Merge "boto shouldn't be required for production deploys"

commit f36f2f9a2cbc00c64fa55d6d9e2f65086dd8e046
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Mar 8 17:32:33 2012 -0800

    fix up nova-manage man page
    
    Change-Id: If78542faef536b9897f771a091f096745b3ece8a

 doc/source/man/nova-manage.rst |  281 ++++++++++++++++++++++++++++++++++++++++
 doc/source/man/novamanage.rst  |  271 --------------------------------------
 2 files changed, 281 insertions(+), 271 deletions(-)

commit ad53f91e623f05cfe994101d56d6d2cf54cd8412
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Mar 6 16:45:40 2012 +1100

    Don't use glance when verifying images.
    
    Using glance means that admin contexts need to know how to use
    keystone when that is enabled. Its safer to avoid calling glance
    at all from inside the periodic task.
    
    This should resolve bug 934464.
    
    Change-Id: Ib730e3f57721fca7080d90ae80b5f8916c1dc76c

 nova/tests/test_imagecache.py   |   86 ++++++++++++++------------------------
 nova/virt/libvirt/imagecache.py |   87 +++++++++++++++------------------------
 2 files changed, 64 insertions(+), 109 deletions(-)

commit c3cdf8c2384fa124c39ed2b38723a1659ab1f474
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 8 16:06:15 2012 -0800

    Fixes os-volume/snapshot delete
    
     * includes test
     * fixes bug 929773
    
    Change-Id: I4c37617dc9377e26c491fb42c3e3e60a58e2404f

 nova/api/openstack/compute/contrib/volumes.py      |    3 ++-
 .../openstack/compute/contrib/test_snapshots.py    |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

commit a186df0ef557de984691d3042a21f0ba331009b4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 8 15:36:31 2012 -0800

    Use a high number for our default mac addresses
    
     * FE has the locally administered bit set and multicast bit unset
     * fixes bug 921838
    
    Change-Id: Id33a06985c4150da4c5367c700f894590fdac2b9

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0b591886a6b6dff759832a6c1e940f6181e18175
Merge: b43b424 0e867f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 23:09:54 2012 +0000

    Merge "Fixing image snapshots server links"

commit b43b42475584f348916fa1c2650ad1982660121e
Merge: d0cc16a 5f217aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 22:59:05 2012 +0000

    Merge "Make EC2 API a bit more user friendly."

commit d0cc16a11a306c32c99a1b5f2a38985191d40454
Merge: 5052268 68f5b9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 22:48:27 2012 +0000

    Merge "Change a fake classes variable to something other than id."

commit 86bcb49b43e052b17fc173520ce8094dcc1db965
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 8 20:08:34 2012 +0000

    Simplify unnecessary XenAPI Async calls to be synchronous
    
    It's silly to make an Async call and then immediately block waiting for
    the result
    
    Change-Id: I197d786679fd9e2a287fa39d374c5f7e12bf121c

 nova/tests/test_xenapi.py    |   14 ++++++++------
 nova/virt/xenapi/vm_utils.py |   22 ++++++++--------------
 nova/virt/xenapi/vmops.py    |   40 ++++++++++++++--------------------------
 3 files changed, 30 insertions(+), 46 deletions(-)

commit 5052268c63aa0fae5433220ee11084f44d37cffa
Merge: ec96681 b10acf1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 22:01:10 2012 +0000

    Merge "Remove an obsolete FIXME comment."

commit ec9668126ae7a7919e66dd7d90e3d772b2758614
Merge: 5555446 c7b3ff2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 21:48:41 2012 +0000

    Merge "Renaming user friendly fault name for HTTP 409"

commit b10acf14a4726fea9b328d5d5ac127794f3e1cc0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 21:46:46 2012 +0000

    Remove an obsolete FIXME comment.
    
    Change-Id: I68fe90d6cfe844880e70fe5fdb7f2899b1d7c6fb

 nova/db/sqlalchemy/api.py |    2 --
 1 file changed, 2 deletions(-)

commit 0e867f3d85773369a45d0680043ffaf40e4b1848
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 8 19:47:10 2012 +0000

    Fixing image snapshots server links
    
    The responses for images that are snapshots should honor the configured
    link prefix for the server links.
    
    Change-Id: Ie6218c532fe5f012307309832e6b079f72f52a5b

 nova/api/openstack/compute/views/images.py      |    2 ++
 nova/tests/api/openstack/compute/test_images.py |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 5555446d877223341c2723e4be169d996ab2ce3b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 8 19:13:26 2012 +0000

    Wait for rescue VM shutdown to complete before destroying it
    
    Fixes bug 950168
    
    Also, wait for the VM and VDI destroys to complete so any errors can
    get logged
    
    Change-Id: I2c2237ed6f95828198824db8628d267ac5b26b3a

 nova/virt/xenapi/vmops.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a5fba51ce08e6f93134b434fccd5a960f7e215ec
Merge: a3b799e c2bf284
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 19:43:35 2012 +0000

    Merge "Moving nova/network tests to more logical home."

commit c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 19:40:59 2012 +0000

    Renaming user friendly fault name for HTTP 409
    
    Change-Id: I7d2185d71be2ec2ad6ac78f70657047bdf3621e3

 nova/api/openstack/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3b799e3e6e39ca25627d2b9a2dfa9871ba00a29
Merge: 90faa27 e6b70b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 19:32:47 2012 +0000

    Merge "Increase logging for xenapi plugin glance uploads"

commit 90faa27050be670bc45aee7b6ee5da0cc0cfcbf2
Merge: 30a9ae2 55c7ac1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 19:22:30 2012 +0000

    Merge "Handle kwargs in deallocate_fixed_ip for FlatDHCP."

commit c2bf2843646ce8fd98312c7ea8b710d391332ece
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 15:36:40 2012 +0000

    Moving nova/network tests to more logical home.
    
    The directory structure of the tests should mimic the directory structure of the code. Hopefully this will encourage missing network tests to be written.
    
    Change-Id: I22d40a304f2681d1a792737b6dcb25857a37e113

 nova/tests/network/__init__.py     |   17 +
 nova/tests/network/test_manager.py | 1594 ++++++++++++++++++++++++++++++++++++
 nova/tests/test_network.py         | 1594 ------------------------------------
 3 files changed, 1611 insertions(+), 1594 deletions(-)

commit 68f5b9e4bef40810df4a061b95541e79de72d6f3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 19:08:59 2012 +0000

    Change a fake classes variable to something other than id.
    
    Removes an old FIXME
    
    Change-Id: I980e0a06bf8b3ca4a7c4ad0bc09a63bdba17c0b6

 nova/tests/api/openstack/fakes.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit e6b70b5c37070579c916cc5a1ea511ff9934851b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 7 15:53:30 2012 -0500

    Increase logging for xenapi plugin glance uploads
    
    Without this change, the glance plugin is pretty quiet about image
    uploads. But it can definitely be helpful to debugging to have
    information such as which glance server is handling the upload, how much
    data was sent, and more information about the glance server response if
    it was something other than 200 OK.
    
    Change-Id: I0269478ad1061fc2021ef4b5d9c3c1dea9b2f6cb

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 30a9ae2f923cf89f6b0acaa30d441170d1d5539c
Merge: bfee9e9 98ced06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 19:01:29 2012 +0000

    Merge "Deprecate carrot rpc code"

commit bfee9e9c622865ea87adc1003203bd7d11c63af8
Merge: 814f0e5 c01cef9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 18:50:36 2012 +0000

    Merge "Use sqlalchemy reflection in migration 080"

commit 814f0e5cc3287bf8a182dfb7cd52db81483fa93e
Merge: af6f0d8 b0f1f1f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 18:39:53 2012 +0000

    Merge "allow block migration to talk to glance/keystone"

commit 98ced066649f72c59a07944996755503edf9908c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Mar 8 10:33:13 2012 -0800

    Deprecate carrot rpc code
    
    Fixes bug 950153
    
    carrot rpc code is not being maintained anymore and is buggy.  Use
    kombu, instead.
    
    Change-Id: Ifcd6d8997adb4fc07fce45486f0663d57954be1d

 nova/rpc/impl_carrot.py |    3 +++
 1 file changed, 3 insertions(+)

commit af6f0d8cb31515307503cb85c688a0ec5462c781
Merge: 7b44ad2 bee9963
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 18:29:15 2012 +0000

    Merge "Don't use ec2 IDs in scheduler driver"

commit 4b8e3d9425e6fb3125cea434cc54ad12540db6e9
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 8 18:14:45 2012 +0000

    Improve vnc proxy docs.
    
    Change-Id: I306be059a3215b6c51b6cd8d546a208479dfe5e3

 doc/source/runnova/vncconsole.rst |   43 +++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 7 deletions(-)

commit 7b44ad2756dc47bdb7eaa5bda298b8f0d57aab47
Merge: be29164 90dc29f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 18:18:54 2012 +0000

    Merge "Update paste file to use service tenant."

commit be29164340c53f63552325fff144fd8f36ec46ef
Merge: 00b2a8f 13f2bac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 18:08:20 2012 +0000

    Merge "Add a few missing tests regarding exception codes."

commit 00b2a8f69671c22eff17a2278958b6c6b335a9e1
Merge: f437964 eba95d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 17:57:34 2012 +0000

    Merge "Add kwargs to RequestContext __init__"

commit f43796426bb5815252f76152d4f18058fdc5dadb
Merge: ccce644 cdf0753
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 17:47:08 2012 +0000

    Merge "Require a more recent version of glance"

commit ccce64403a09f74b8ff815406c49e655342616c9
Merge: 8febfb5 010f8b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 17:31:46 2012 +0000

    Merge "Further cleanup of XenAPI."

commit 8febfb5ad19a83e9b11438d09374b34e2b41e2df
Merge: 2932753 50b19a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 17:20:47 2012 +0000

    Merge "Set logdir to a tempdir in test_network"

commit 293275338134ea8311716a2fcc1dbd9cc38b84f8
Merge: fb95972 24f4e09
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 17:10:21 2012 +0000

    Merge "info_cache is related to deleted instance"

commit fb959728245300910222edfd5e19a3431a454cb9
Merge: 846c3a1 98fe2b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 16:59:23 2012 +0000

    Merge "Set lock_path to a tempdir in TestLockCleanup"

commit cdf07535269836c1d6e90252f13c2e7df7656e88
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 8 16:40:07 2012 +0000

    Require a more recent version of glance
    
    Recent changes started using a recently added exception to
    glance.common.exception, so update pip-requires to require a version
    of glance that has that.
    
    Change-Id: I56ca02bdb98a8e2ed40dcd8f08c9d69d5a043add

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 846c3a17601371f50e208da192f9cdb725153194
Merge: 251a66b b2a2534
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 16:49:00 2012 +0000

    Merge "Late load rabbit_notifier in test_notifier"

commit 5f217aa13254c27bc52f43088fefd2116f77fb3c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 8 11:42:53 2012 -0500

    Make EC2 API a bit more user friendly.
    
    Inform users that volume operations have failed.
    Fixes bug 950055.
    
    Change-Id: Ia33965031495e03e539e3c7ce2fbbda8ef48b5e5
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/api/ec2/cloud.py |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit 251a66b3e29d1e0542353d639dfcfea242b9c3d1
Merge: 10c568a 08b4e6c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 16:38:28 2012 +0000

    Merge "Fix racey snapshots."

commit eba95d1e42992056edf6f0d6f84e8e230f331cd7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Mar 8 00:07:30 2012 -0800

    Add kwargs to RequestContext __init__
    
    Fixes bug 949726
    
    This allows processing of rpc messages that contain older versions of
    RequestContext to not raise an exception.
    
    Change-Id: I4891a44280fcb8accf0cef1c00c1123029abcc96

 nova/context.py            |   12 +++++++++++-
 nova/tests/test_context.py |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

commit 10c568aacdb4f2b1eb816097ddfffd6092249f5e
Merge: 0dfcdaa 1da6a00
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 16:27:52 2012 +0000

    Merge "Validate VDI chain before moving into SR."

commit 24f4e093b6c7290de06b7aaaa1e4dda96e17e5f9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 7 22:22:16 2012 -0600

    info_cache is related to deleted instance
    
    fixes lp948586
    
    what is now possible:
    http://pastie.org/3546474
    
    the problem was there were entities hitting the api to get network data
    for instances that were deleted. Deleted instances did not have the
    backref to info_cache available. The api would then go to network to get
    the info, but since the network structures had already been torn down,
    there was nothing to return. The bug then is that network_info at time
    of instance deletion was expected to be accessible through the
    instance['info_cache'].
    
    Change-Id: I8ce6ce92e2abe6241d408192ced9526562e978db

 nova/db/sqlalchemy/models.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 55c7ac12c0aa11e328243f79931b3d9721816389
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 8 11:04:13 2012 -0500

    Handle kwargs in deallocate_fixed_ip for FlatDHCP.
    
    Fixes TypeError's that occur when deallocate_fixed_ip gets called
    using FlatDHCP.
    
    Fixes LP Bug #950029.
    
    Change-Id: I7357277ce56d7ad4c9e7a716cbd6f25952aa1b8d

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 13f2bac16b8fc4f3e3f4df9c7b1a0024be236ef1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Mar 8 15:52:51 2012 +0000

    Add a few missing tests regarding exception codes.
    
    Change-Id: I051f47555669af6a74fba058867a6ac2cff45a65

 nova/tests/test_exception.py |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 77664b256856980cfaf35173d59d463c16562673
Author: MotoKen <motokentsai@gmail.com>
Date:   Thu Mar 8 15:37:53 2012 +0800

    Checks image virtual size before qemu-img resize.
    
    Checks virtual size instead of file size. Fixes bug 905350.
    
    Change-Id: I1772b0996b7c9a2e07d3e298b156f777df67ef5f

 nova/virt/disk/api.py |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 50b19a871a32be1452080c70c237bc8d7a1f1eb1
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Fri Mar 2 21:17:23 2012 +0800

    Set logdir to a tempdir in test_network
    
    Fixes bug #945364
    
    Change-Id: Id7a28bee19f6b78d0608462059c1ed9daf71637c

 nova/tests/test_network.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 98fe2b504bfcebb57fee621346a37e1f48fbacaa
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Fri Mar 2 22:32:05 2012 +0800

    Set lock_path to a tempdir in TestLockCleanup
    
    Fixes bug #945363
    
    Change-Id: I2e2b81eebbfce0c10e431041f6b9d45bcf26f1c0

 nova/tests/test_utils.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 0dfcdaa16eef1910b1a271bba32d4e365cff7e51
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Mar 8 01:36:44 2012 -0800

    Exceptions unpacking rpc messages shouldn't hang the daemon
    
    Fixes bug 949731
    
    Change-Id: I83218012c37f7e5f16b2de8d26a738ac71eb89b4

 nova/rpc/impl_kombu.py        |    7 +++++--
 nova/rpc/impl_qpid.py         |    5 ++++-
 nova/tests/rpc/common.py      |   45 ++++++++++++++++++++++++++++++++++++++---
 nova/tests/rpc/test_carrot.py |    2 +-
 nova/tests/rpc/test_fake.py   |    2 +-
 nova/tests/rpc/test_kombu.py  |    2 +-
 6 files changed, 54 insertions(+), 9 deletions(-)

commit c01cef9340a3d55884fe38b60b209dbad5f97ea6
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Thu Mar 8 16:45:51 2012 +0800

    Use sqlalchemy reflection in migration 080
    
    Change-Id: If2a0e59461d108d59c6e9907d3db053ba2b44f57

 ...080_add_hypervisor_hostname_to_compute_nodes.py |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

commit b2a253420ac700081a91a304784f680159953acb
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Fri Mar 2 21:25:35 2012 +0800

    Late load rabbit_notifier in test_notifier
    
    Fixes bug #945358
    
    Change-Id: I7a323da5c340fca56bc5fd96eb7f936f586372e7

 nova/tests/test_notifier.py |    2 ++
 1 file changed, 2 insertions(+)

commit 1e551c06bc549b43daa8aa19282c68614ef86c97
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 22:43:12 2012 -0800

    boto shouldn't be required for production deploys
    
    ... if you're not using ec2/s3.
    
    Fixes bug 949631
    
    bin/nova-manage imports auth.manager which imports auth.signer which
    tries to import boto...  but nova-manage doesn't try to authenticate.
    
    This patch allows bin/nova-manage to work if you don't have boto
    installed.
    
    Change-Id: I9b7929a15b991498ab0491821521ec20ed0da65c

 nova/auth/signer.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit bee9963beb24408e81d7dca0fe1050eb57bfed47
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 21:01:47 2012 -0800

    Don't use ec2 IDs in scheduler driver
    
    Fixes bug 949650
    
    Change-Id: I5dddd84a0062a9aac3d608b6483deec0414e4b28

 nova/scheduler/driver.py               |   18 ++++++++----------
 nova/tests/scheduler/test_scheduler.py |   13 +++++--------
 2 files changed, 13 insertions(+), 18 deletions(-)

commit 0193d1253c48c719b7f10bb19505ebb4b52defd3
Merge: 72fc313 4d7f428
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 06:12:38 2012 +0000

    Merge "Don't swallow snapshot exceptions."

commit 72fc31386446e22c1c420eb9779b01e807e4ceba
Merge: 996c222 e347d1a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 8 04:43:46 2012 +0000

    Merge "pyflakes cleanups on libvirt/connection.py"

commit e347d1a37ec104cdf1859719e12ba495716afa3d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 19:58:21 2012 -0800

    pyflakes cleanups on libvirt/connection.py
    
    This happens to fix another issue I ran into where boto was being
    required when trying to start up the compute manager.  This is because
    virt/connection.py would import virt/libvirt/connection.py which would
    import nova.auth.manager which would import nova.auth.signer which would
    try to import boto.
    
    Fortunately, we don't need to import nova.auth.manager in
    libvirt/connection.py as it's no longer required.
    
    Change-Id: I85f8e874ef3dc6f53667918ae081512115608d83

 nova/virt/libvirt/connection.py |   33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

commit 1da6a00a3b351e035998345e92c44a94b502d0f8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 8 01:26:04 2012 +0000

    Validate VDI chain before moving into SR.
    
    Fixes bug 949477
    
    Change-Id: Ia3f283d82f189e680c5c8dd4fcf71bf5fe5f9889

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   40 ++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

commit 08b4e6c2b808011ea7ae9b367bfb829cb332f4e7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 8 02:55:04 2012 +0000

    Fix racey snapshots.
    
    Fixes bug 949475
    
    Atomically tests and sets the instance task_state before allowing a
    snapshot or backup to be initiated.
    
    Change-Id: I40671a80f5e75337e176a715837f62d400cc21b6

 nova/compute/api.py       |   17 ++++++++++++-----
 nova/compute/manager.py   |   10 +---------
 nova/db/api.py            |    9 +++++++++
 nova/db/sqlalchemy/api.py |   34 ++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 14 deletions(-)

commit 4d7f428a2809765ed1c5e05ad790b1e33d905801
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 8 01:45:39 2012 +0000

    Don't swallow snapshot exceptions.
    
    Fixes bug 949471
    
    This raise is needed so that calling code can be notified to teardown
    the failed snapshot.
    
    Change-Id: I25a78e36b4bdb4ca52f1f999168a750dde134056

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0f1f1feb59bbca3196d9bba52cd32f46aa84b87
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 7 15:02:13 2012 -0800

    allow block migration to talk to glance/keystone
    
     * removes unnecessary get_admin_context()
     * addresses bug 949438
    
    Change-Id: Iec9352f4c07179a39c796d235f0787ade30d5747

 nova/virt/libvirt/connection.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 996c222dab5a49179450701af176fcd81f5fd107
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 7 15:04:54 2012 -0800

    Remove cruft and broken code from nova-manage
    
     * Deletes live migration code. This code will not work in keystone
       installs, and there is an api extension that can be used through
       the python-novaclient cli
     * Deletes image management code. This was for upgrading pre-diablo
       images and doesn't work properly with glance/keystone. The glance
       cli already has the necessary functionality for uploading images.
    
    Change-Id: Id7257833a280663af6d0b90085d03344d75a502f

 bin/nova-manage |  227 -------------------------------------------------------
 1 file changed, 227 deletions(-)

commit 90dc29f384c6f7f41bcef507bc51e59aa4618a6e
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 7 18:05:49 2012 -0500

    Update paste file to use service tenant.
    
    Update the keystone section of api-paste.ini with example settings
    for the keystone service tenant.
    
    Removed the admin_token example line.
    
    Change-Id: If4ec08ec1f1882347a1b0842e65b665fccbcaeaa

 etc/nova/api-paste.ini |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 70f0ea588e9b0ddf47c15531b86e81aa59556199
Merge: 4242b68 4170a91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 23:03:11 2012 +0000

    Merge "Remove the <acpi/> feature from UML/LXC guests"

commit 010f8b14041090fe8a1ea57956b8d66dc382ecfe
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 7 15:58:07 2012 -0600

    Further cleanup of XenAPI.
    
    Change-Id: If29e326f67ca8a81f26fe0b1b0b8989ccfc05aaf

 nova/tests/test_xenapi.py    |    2 +-
 nova/virt/xenapi/fake.py     |    2 --
 nova/virt/xenapi/pool.py     |    4 ++--
 nova/virt/xenapi/vm_utils.py |    1 -
 nova/virt/xenapi/vmops.py    |    4 ----
 nova/virt/xenapi_conn.py     |    1 -
 6 files changed, 3 insertions(+), 11 deletions(-)

commit 4242b6883ec0181e9dcfca6721824d637bb83f5d
Merge: 06305fa 89c652d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 22:49:48 2012 +0000

    Merge "setup.py: Fix doc building"

commit 26b97b5515c81ae104c714a217dc3fdf3f7c37cf
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Wed Mar 7 22:43:48 2012 +0000

    Fix XML namespaces for limits extensions and versions
    
    fixes bug #949098
    
    Change-Id: I7e745c45fc142eb18e16dca63da15ebc3cb6ba36

 nova/api/openstack/compute/limits.py               |    2 +-
 .../openstack/compute/schemas/v1.1/extension.rng   |    2 +-
 .../openstack/compute/schemas/v1.1/extensions.rng  |    2 +-
 nova/api/openstack/compute/schemas/v1.1/limits.rng |    2 +-
 .../api/openstack/compute/schemas/v1.1/version.rng |    2 +-
 .../openstack/compute/schemas/v1.1/versions.rng    |    2 +-
 nova/api/openstack/compute/versions.py             |    2 +-
 nova/api/openstack/extensions.py                   |    2 +-
 nova/api/openstack/xmlutil.py                      |    1 +
 .../tests/api/openstack/compute/test_extensions.py |    2 +-
 nova/tests/api/openstack/compute/test_limits.py    |    2 +-
 nova/tests/api/openstack/compute/test_versions.py  |    2 +-
 nova/tests/integrated/test_xml.py                  |    4 ++--
 13 files changed, 14 insertions(+), 13 deletions(-)

commit 06305fa15d9cb87cf16be8466730c83f0f7f258e
Merge: aeea00e bacbfd2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 22:14:06 2012 +0000

    Merge "Minor clarifications for the help strings in nova config options"

commit aeea00e33e87b48a940d4f0281c1d923dee4ad4b
Merge: 9d5820e 6de3fe6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 21:53:14 2012 +0000

    Merge "Add adjustable offset to audit_period."

commit 4170a91f45563060ea5f0c414713646fc7372e88
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Wed Mar 7 06:48:33 2012 -0500

    Remove the <acpi/> feature from UML/LXC guests
    
    The <acpi/> feature is only relevant to Xen paravirt or Xen/KVM/QEMU
    fullvirt guests. Remove it from UML/LXC guests
    
    Change-Id: I782b99455549ae49bf8adc8f40f5ea73b57f790e

 nova/virt/libvirt.xml.template |    2 ++
 1 file changed, 2 insertions(+)

commit 89c652d762ad40061ec5b05da524b745ee377784
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Mar 7 11:06:11 2012 -0800

    setup.py: Fix doc building
    
    Commit 5702f80a0 updated local_BuildDoc's parameters without
    also updating references to the original parameters.  This fixes
    the issue and gets './setup.py build_sphinx' working again.
    
    Change-Id: I3483c906c13347a718e1794786830f06af700ebd

 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9d5820effe83dda1192d57a29a6538d7a166facc
Merge: 855aae0 d854a1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 18:48:45 2012 +0000

    Merge "Fix multi_host column name in setup_networks..."

commit 855aae0f9cfc81b86d175e2fde69d5d888fc2a1b
Merge: edac47a e430c84
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 18:01:36 2012 +0000

    Merge "nova-manage: allow use of /32 IP range"

commit edac47a9cadda3d1f200c6748dda7758df268412
Merge: ddfa36d b8f2262
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 17:50:35 2012 +0000

    Merge "api-paste.ini: Add /1.0 to default urlmap"

commit ddfa36d9e5f3543a459c38ef73d5762c7a05268a
Merge: ff58a84 76e67bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 17:39:56 2012 +0000

    Merge "Make test_compute console tests more robust"

commit ff58a84547fc3fb6cb9615d750db685d23190d40
Merge: 8623fd9 882062b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 17:29:32 2012 +0000

    Merge "test_compute stubs same thing multiple times"

commit 8623fd981b9a1e29a68a0853e07aa8d016b8d99b
Merge: f9b0497 fb7d1fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 17:08:00 2012 +0000

    Merge "Clear created attributes when tearing down tests"

commit f9b049734f2b973790924779fd1f3c45c1545833
Merge: 871d564 01a938f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 16:57:17 2012 +0000

    Merge "HACKING fixes, all but sqlalchemy."

commit 871d5649c23d840923732e592dbb92baa02bc2fc
Merge: d8324bb ec20076
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 16:46:31 2012 +0000

    Merge "bug 944145: race condition causes VM's state to be SHUTOFF"

commit 6de3fe69f64fd0c304ee3f8e4bdcafada0d48117
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Mar 7 00:49:57 2012 +0000

    Add adjustable offset to audit_period.
    
    Allows audit periods to be offset, so daily periods can begin at local
    midnight, instead of UTC, monthly periods can begin on the 15th
    instead of the 1st, etc.
    
    Fixes bug 948601
    
    Change-Id: I38f6af0a5a513f888b791a4b9ca39467030105f2

 nova/tests/test_utils.py |  164 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py            |   83 ++++++++++++++++++-----
 2 files changed, 230 insertions(+), 17 deletions(-)

commit e430c8424a62d9d397980899ae0458a5e947704e
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Tue Feb 14 16:31:46 2012 +0100

    nova-manage: allow use of /32 IP range
    
    The current code does not allow to add an IP range which is /32, because
    netaddr considers that there's no host in such a network. While this is
    probably debatable, it disallow to add specific IP address in a pool, which
    is really handy and was possible before.
    This patch fix that by treating the /32 subnet as a special case.
    
    Change-Id: I38685e6f1a3541519d1f2a9ec8d3b00dd522b44a

 bin/nova-manage |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

commit fb7d1fb8253e55437858358793c9fb02fbff0ba0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Mar 6 16:58:03 2012 +0000

    Clear created attributes when tearing down tests
    
    unittest will keep each test case around after completion pinning any
    objects references by attributes on the test case. This can bloat
    the memory used during a full test suite run to the point where
    the test suite will require much more memory than running all of
    the services does. On systems witout lots of memory, test suite
    failures will occur as test cases cannot fork to execute programs.
    
    Clearing out __dict__ of any attributes that don't start with a _
    (since some are needed by unittest itself) reduces memory
    significantly. This does require the super class tearDown to be
    called last in some cases however.
    
    Change-Id: I0e660b6c2a77c5613c5a523ba0a64c3d7f6dd128

 HACKING.rst                |   12 ------------
 nova/test.py               |    6 ++++++
 nova/testing/README.rst    |   22 ++++++++++++++++++++++
 nova/tests/test_network.py |    8 ++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

commit d854a1d4f3da949e364e3b80827cf25aff7c7344
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 7 08:49:35 2012 -0500

    Fix multi_host column name in setup_networks...
    
    Use the correct DB column name for multi_host in the
    Nova network manage setup_networks_on_host function.
    
    Fixes LP Bug #948965.
    
    Change-Id: Id2a7bf9a2b5173d2b5fdec17a19e364e54c9a2c4

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 01a938f7fe4dea274713e49f124fcc45702f80a0
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Mar 6 12:53:07 2012 +0400

    HACKING fixes, all but sqlalchemy.
    
    Looks like this fixes all HACKING problems that were around.
    Thanks to Dina Belova and Alexander Kovalev for this work.
    
    Change-Id: I8157f0d4890184c1216aab63ef7180ee8b7a184d

 Authors                                            |    2 +
 nova/api/ec2/cloud.py                              |    8 +-
 nova/api/openstack/compute/consoles.py             |    4 +-
 nova/api/openstack/compute/contrib/aggregates.py   |    5 +-
 nova/api/openstack/compute/contrib/floating_ips.py |    6 +-
 nova/api/openstack/compute/contrib/hosts.py        |    4 +-
 .../compute/contrib/simple_tenant_usage.py         |    4 +-
 .../compute/contrib/virtual_storage_arrays.py      |   10 +--
 nova/compute/__init__.py                           |    2 -
 nova/console/__init__.py                           |    1 -
 nova/notifier/list_notifier.py                     |    4 +-
 nova/notifier/rabbit_notifier.py                   |    2 +
 nova/rpc/__init__.py                               |    5 +-
 nova/rpc/amqp.py                                   |    4 +-
 nova/rpc/impl_carrot.py                            |    5 +-
 nova/rpc/impl_qpid.py                              |    3 +-
 nova/scheduler/driver.py                           |    5 +-
 nova/scheduler/vsa.py                              |    7 +-
 nova/testing/runner.py                             |   10 +--
 nova/tests/api/ec2/test_middleware.py              |    4 +-
 .../api/openstack/compute/contrib/test_accounts.py |    6 +-
 .../openstack/compute/contrib/test_floating_ips.py |    3 +-
 .../api/openstack/compute/contrib/test_vsa.py      |   32 +++----
 nova/tests/api/openstack/compute/test_api.py       |   10 +--
 nova/tests/api/openstack/compute/test_consoles.py  |   18 ++--
 nova/tests/api/openstack/compute/test_servers.py   |    4 +-
 nova/tests/api/openstack/test_common.py            |   53 ++++++------
 nova/tests/fakelibvirt.py                          |   21 ++---
 nova/tests/notifier/test_list_notifier.py          |    9 +-
 nova/tests/rpc/common.py                           |   10 +--
 nova/tests/scheduler/test_scheduler.py             |    2 +-
 nova/tests/test_SolidFireSanISCSIDriver.py         |   57 ++++++++-----
 nova/tests/test_api.py                             |   29 ++++---
 nova/tests/test_compute.py                         |    6 +-
 nova/tests/test_fakelibvirt.py                     |   10 +--
 nova/tests/test_instance_types.py                  |    4 +-
 nova/tests/test_libvirt.py                         |   30 +++----
 nova/tests/test_libvirt_vif.py                     |   14 ++-
 nova/tests/test_migrations.py                      |    9 +-
 nova/tests/test_netapp.py                          |    4 +-
 nova/tests/test_notifier.py                        |   15 ++--
 nova/tests/test_quantum.py                         |    4 +-
 nova/tests/test_volume_types.py                    |    4 +-
 nova/tests/test_vsa.py                             |    2 +-
 nova/tests/test_vsa_volumes.py                     |    4 +-
 nova/virt/libvirt/vif.py                           |   10 +--
 nova/virt/vmwareapi/fake.py                        |    4 +-
 nova/virt/vmwareapi/io_util.py                     |    6 +-
 nova/virt/vmwareapi/vif.py                         |    4 +-
 nova/virt/vmwareapi_conn.py                        |    4 +-
 nova/virt/xenapi/fake.py                           |    8 +-
 nova/virt/xenapi/firewall.py                       |    4 +-
 nova/virt/xenapi/network_utils.py                  |    4 +-
 nova/virt/xenapi/vif.py                            |   20 ++---
 nova/virt/xenapi/vm_utils.py                       |   26 +++---
 nova/virt/xenapi/volume_utils.py                   |    4 +-
 nova/virt/xenapi/volumeops.py                      |   90 ++++++++++----------
 nova/virt/xenapi_conn.py                           |    8 +-
 nova/volume/san.py                                 |    7 +-
 nova/volume/xensm.py                               |   12 +--
 nova/vsa/__init__.py                               |    2 -
 nova/vsa/manager.py                                |   13 ++-
 .../xensource/scripts/ovs_configure_base_flows.py  |   14 +--
 .../xensource/scripts/ovs_configure_vif_flows.py   |   25 +++---
 .../networking/etc/xensource/scripts/vif_rules.py  |   15 ++--
 setup.py                                           |   12 ++-
 tools/hacking.py                                   |   10 ++-
 67 files changed, 387 insertions(+), 370 deletions(-)

commit d8324bb3d089acd444bd1639a3efc07e89556f69
Merge: f5f5ad4 6825f39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 07:54:11 2012 +0000

    Merge "Cleanup some test docstrings"

commit f5f5ad427a1036325620a55804ba5a8c6073f16f
Merge: 44b3269 61d49f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 07:43:19 2012 +0000

    Merge "Fix bug 948611. Fix 'nova-manage logs errors'"

commit 44b32692055478199a18e0b527d01cb0360920cd
Merge: 342c9f9 8231215
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 07:32:05 2012 +0000

    Merge "Adds nova-manage command to convert a flagfile"

commit 342c9f9ce2e145cc31c13985258349c5d55c4671
Merge: 153203f cede470
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 07:20:53 2012 +0000

    Merge "Don't use _ for variable name"

commit 153203fabb5385017e5d138bb95e1878f80ed38c
Merge: 9a042d3 8ecdc44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 07:09:58 2012 +0000

    Merge "remove undocumented, unused mpi 'extension' to ec2 metadata"

commit 9a042d3c501477772ff65802819016ead430b719
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Wed Mar 7 13:43:37 2012 +0800

    Remove trailing whitespaces in regular file
    
    Fixes bug #945346
    
    Change-Id: I07a303c2e503e50d7138585c683e0d1310339276

 doc/source/_static/jquery.tweet.js             |    6 +-
 doc/source/_static/tweaks.css                  |    4 +-
 doc/source/api_ext/index.rst                   |    4 +-
 doc/source/community.rst                       |   12 +-
 doc/source/conf.py                             |    2 +-
 doc/source/conf_back.py                        |    2 +-
 doc/source/devref/filter_scheduler.rst         |   18 +-
 doc/source/devref/index.rst                    |    2 +-
 doc/source/devref/network.rst                  |    2 +-
 doc/source/devref/threading.rst                |    2 +-
 doc/source/index.rst                           |    8 +-
 doc/source/nova.concepts.rst                   |   10 +-
 doc/source/runnova/managing.images.rst         |    2 +-
 doc/source/runnova/managing.instance.types.rst |   16 +-
 doc/source/runnova/monitoring.rst              |    2 +-
 doc/source/runnova/network.flat.rst            |    4 +-
 doc/source/runnova/network.vlan.rst            |   24 +-
 doc/source/runnova/vncconsole.rst              |    2 +-
 doc/source/service.architecture.rst            |    2 +-
 doc/source/vmwareapi_readme.rst                |  452 ++++++-------
 run_tests.sh                                   |    2 +-
 tools/esx/guest_tool.py                        |  808 ++++++++++++------------
 22 files changed, 693 insertions(+), 693 deletions(-)

commit 8ecdc44690ced882205112e017f79dc98cd6aaca
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Mar 6 20:49:16 2012 -0800

    remove undocumented, unused mpi 'extension' to ec2 metadata
    
    Change-Id: I06fc99964ebfc6210bf6b462bc576a23ca3a01d9

 nova/api/metadata/handler.py |   21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

commit bacbfd2b7e58c8bfc493294ba619ce91ae3eaf1c
Author: Matt Stephenson <mattstep@mattstep.net>
Date:   Tue Mar 6 15:57:52 2012 -0800

    Minor clarifications for the help strings in nova config options
    
    Change-Id: I10e7277b2d9b7a905b83192f8db47f425c5ae11a

 Authors       |    1 +
 nova/flags.py |  129 +++++++++++++++++++++++++++++++--------------------------
 2 files changed, 71 insertions(+), 59 deletions(-)

commit cede470913db51a4a086b472db6bcd017fd8e247
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Mar 7 04:25:19 2012 +0000

    Don't use _ for variable name
    
    _ is reserved for gettext use and using _ for variable names can result
    in runtime failures when trying to lookup string translations
    
    Change-Id: I8835142fd19ba5f395ddef959c38167f4144b813

 nova/network/manager.py     |    2 +-
 nova/tests/test_misc.py     |    2 +-
 nova/virt/fake.py           |    2 +-
 nova/virt/vmwareapi_conn.py |    2 +-
 nova/virt/xenapi/fake.py    |    2 +-
 nova/virt/xenapi/pool.py    |    2 +-
 nova/virt/xenapi_conn.py    |    4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

commit 76e67bbf80a5819329c9cf2f427ef5596d7c17a9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 04:04:56 2012 +0000

    Make test_compute console tests more robust
    
    Also:
    
    remove unused variables..
    _assert_state method was duplicated so 1 of them was removed.
    
    Change-Id: Id88f7dd13382c2cd6253b773542318c0d5d8f5c4

 nova/tests/test_compute.py |   96 +++++++++++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 37 deletions(-)

commit 882062bf0526a216834548d530f70e1271c5f1a2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 03:28:46 2012 +0000

    test_compute stubs same thing multiple times
    
    Cleans up test_compute stubbing of network API's get_instance_nw_info
    
    Change-Id: I70126220343fade4b4cba40d9a4e22b4567cfa35

 nova/tests/test_compute.py |   86 +++-----------------------------------------
 1 file changed, 5 insertions(+), 81 deletions(-)

commit d954b11944a32b2465b62396855f249e6d09cdc6
Merge: 6ee8a08 d94f22d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 03:05:56 2012 +0000

    Merge "Ignore InstanceNotFound when trying to set instance to ERROR"

commit d94f22dc7a24ec8f769a4fbbffeb1b34780bbf3d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 7 02:10:18 2012 +0000

    Ignore InstanceNotFound when trying to set instance to ERROR
    
    Fixes bug 948632
    
    There's a race condition where an instance can be deleted from an API
    call... immediately before some other error occurs during build.
    
    Also: compute tests should not test raising quantum exceptions, as
    those could never possibly make it back to us.  rpc.call only raises
    RemoteError... so use that instead.
    
    Change-Id: Iacfe511a37e937eaec1d6213bf73153aa4d4e9bf

 nova/compute/manager.py    |   10 +++++++---
 nova/tests/test_compute.py |   27 ++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

commit 6ee8a083f01efa183d4611566ef77d3e530df96a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 6 16:08:33 2012 -0800

    Cleans up the create_conf tool
    
     * Makes it adhere to the config file format
     * Puts the sample output in etc/nova/nova.conf.sample
     * Updating sample is as easy as ./tools/conf/generate_sample.sh
    
    Change-Id: I01e72cb58dd598a74f50c2c17f102d24df325f2e

 etc/nova/nova.conf.sample     | 1088 +++++++++++++++++++++++++++++++++++++++++
 nova/flags.py                 |    3 -
 tools/conf/create_conf.py     |   36 +-
 tools/conf/generate_sample.sh |   25 +
 tools/conf/run.sh             |   19 -
 5 files changed, 1134 insertions(+), 37 deletions(-)

commit 52d2ba8237d72b98cae63af65fc8ec00fa50bac4
Merge: 11ba52f 0c7a54b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:45:33 2012 +0000

    Merge "Setup and teardown networks during migration"

commit 11ba52fb202ad58a6133cf7b80886cb539117981
Merge: e374ad9 b1de27f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:34:42 2012 +0000

    Merge "fix restructuredtext formatting in docstrings that show up in the developer guide"

commit e374ad975f1679fad6110fe9a9fc4793fbf2fc24
Merge: a29158f df84270
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:23:26 2012 +0000

    Merge "Fix test_attach_volume_raise_exception"

commit a29158ffb24cbef1c320cd25796ae6bbfc379d64
Merge: 86662f8 be385d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:19:16 2012 +0000

    Merge "Fix nova-manage floating create docs."

commit 61d49f9ddfcab9a25563fcd8f2bcc58272d7bc17
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Mar 6 17:13:52 2012 -0800

    Fix bug 948611. Fix 'nova-manage logs errors'
    
    Change-Id: Ica0de2bebfbadbaede698ae0e9db9bff208c358c

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86662f8d17c40ec87068ccc7340f03e1a7a1f1d5
Merge: 0f377e7 ff3f920
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:13:18 2012 +0000

    Merge "Add missing directive to tox.ini."

commit 0f377e7527383996a6a8989da09943f25627be60
Merge: f3559e1 0356f8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:12:08 2012 +0000

    Merge "Cleans up a bunch of unused variables in XenAPI."

commit f3559e1ac4f4fa20d8af46d00cee622c6c1faf0f
Merge: 314dd69 bac3576
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 01:07:53 2012 +0000

    Merge "Fix references to novncproxy_base_url in docs."

commit 314dd69ab00cb35b0683a384023e0cae9844428b
Merge: 5674c7e ba2c9cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:56:24 2012 +0000

    Merge "Replaces pipelines with flag for auth strategy"

commit 5674c7ec743941ffd9f066735791d6a2b3909084
Merge: 5aaf235 e817959
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:45:24 2012 +0000

    Merge "Add support for lxc consoles."

commit b8f22627e477e32dc278168f0e73f0b599d93ee4
Author: Adam Gandelman <adamg@canonical.com>
Date:   Tue Mar 6 16:28:44 2012 -0800

    api-paste.ini: Add /1.0 to default urlmap
    
    The metadata handler lists 1.0 as a supported version, but there is no
    mapping for /1.0 to the meta pipeline in the default paste config, resulting
    in requests to 169.254.169.254/1.0/ re-serving the metaversions pipeline instead.
    
    Fixes bug 948595
    
    Change-Id: Ib9cb54a04170ad86bbcbbb59557be97f05de13f9

 etc/nova/api-paste.ini |    1 +
 1 file changed, 1 insertion(+)

commit 82312155898f966704f9490e110a288e1bf71bf0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 6 16:41:35 2012 -0800

    Adds nova-manage command to convert a flagfile
    
    Change-Id: I80edabc99f8934168956c8687103d8870c5137e7

 bin/nova-manage |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 5aaf2355c2de6f057c6ce7884df275a8874126b5
Merge: 060d455 dab9de9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:33:57 2012 +0000

    Merge "Do not invoke kill dnsmasq  if no pid file was found."

commit 060d45584c6a532664d9fc1bd6017002956259d1
Merge: 6461ad0 3d4213d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:24:58 2012 +0000

    Merge "Reset instance to ACTIVE when no hosts found"

commit 6461ad0a18d024c50f507ed220d1c1a6a28bf024
Merge: d524ea2 6c31605
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:23:28 2012 +0000

    Merge "Distinguish rootwrap Authorization vs Not found errors"

commit d524ea2ea5c9c81d41e17f6b2359f0b0edc3f800
Merge: 0bd3b47 84114e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:19:19 2012 +0000

    Merge "Update fixed_ip_associate to not use relationships"

commit ec20076d24455860b38fd9a143910f75741ac8f6
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Thu Mar 1 19:10:54 2012 +0000

    bug 944145: race condition causes VM's state to be SHUTOFF
    
    ensure we close down the contention window between _sync_power_states
    and live migration/host evacuation.
    
    Change-Id: Ie6cbd9bf2eee206b4a821a4b77a6dced409f3983

 nova/compute/manager.py  |   46 ++++++++++++++++++++++++++++++++++++++++++----
 nova/virt/xenapi/host.py |   14 ++++++++++----
 2 files changed, 52 insertions(+), 8 deletions(-)

commit 0bd3b4703240a41c09fe6926348cd4d10df4acae
Merge: 3383800 21c779d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 7 00:03:33 2012 +0000

    Merge "Bug #943178: aggregate extension lacks documentation"

commit 6825f392157746283eb7216fd7cebd15157c9244
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Mar 6 15:37:42 2012 -0800

    Cleanup some test docstrings
    
    Change-Id: Id5ad29de31027cd30870d2782012356a48dc6e50

 nova/tests/test_compute.py       |    5 ++---
 nova/tests/test_compute_utils.py |    4 +---
 nova/tests/test_console.py       |    4 +---
 nova/tests/test_metadata.py      |    2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

commit 3383800bd5b5b8d74b07523c0819fd5236716344
Merge: 0e687ee 3b081fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 23:52:01 2012 +0000

    Merge "Finally fix the docs venv bug."

commit 0e687ee0ed25f4fee6ee728851c506a80aaa2612
Merge: a8f5628 a0001c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 23:41:19 2012 +0000

    Merge "Shorten FLAGS.rpc_response_timeout"

commit a8f562845b4980c947df836419eb8d2a8b3dc6e7
Merge: 6771530 86bf227
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 23:30:41 2012 +0000

    Merge "Only pass image uuids to compute api rebuild"

commit 0356f8c1decdc6a2a50e53d148f9a2d8884a4b6f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 6 16:18:55 2012 -0600

    Cleans up a bunch of unused variables in XenAPI.
    
    Also fixes a bug in XenAPI where xml.parsers.expat was not
    imported, but was being used to catch an exception.
    
    Change-Id: Idfb3b94317ecc13210fa221396c6f2dc10be3ac9

 nova/tests/test_xenapi.py    |    4 ++--
 nova/virt/xenapi/host.py     |    4 ++--
 nova/virt/xenapi/pool.py     |    4 ++--
 nova/virt/xenapi/vm_utils.py |   39 +++++++++++++++++++--------------------
 nova/virt/xenapi/vmops.py    |    9 +++------
 5 files changed, 28 insertions(+), 32 deletions(-)

commit 67715309a1cda8cc56bf4e528774f75e652bf6d5
Merge: 922420f ff716de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 23:05:12 2012 +0000

    Merge "Ensure image status filter matches glance format"

commit a0001c57e7b7555801577bb568b8cd630adb152d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 21 15:51:32 2012 -0800

    Shorten FLAGS.rpc_response_timeout
    
     * Fixes bug 938287
     * Bump timeout to 60 seconds
    
    Change-Id: I0f38fe0bdfc950386f1fce221069e395e7e81f2a

 nova/rpc/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d4213d1faa76179a6fafba653845ede1c73a7bb
Author: Andrew Clay Shafer <acs@parvuscaptus.com>
Date:   Thu Mar 1 22:41:15 2012 -0500

    Reset instance to ACTIVE when no hosts found
    
    bug 928521
    
    modified nova/scheduler/manager.py to reset vm_state to ACTIVE and set
    task_state to None when prep_resize raises a NoHostsFound
    
    refactored run_instance and prep_resize so they don't go through
    _schedule and now must be implemented in driver
    
    Changed behavior to set vm_state to error on any other exception in
    prep_resize.
    
    Change behavior to change instance vm_state to ERROR on exceptions
    
    Added tests that the vm_state gets updated
    
    Added tests that schedule_prep_resize and schedule_run_instance
    have no implementation in the Driver base class
    
    Had to adjust methods and tests for Multi scheduler to reflect the
    new Scheduler contract
    
    Change-Id: Ibcac7ef0df3456793a2132beb7a711849510da80

 nova/scheduler/driver.py                     |   12 ++-
 nova/scheduler/manager.py                    |  100 ++++++++++++------
 nova/scheduler/multi.py                      |   12 ++-
 nova/tests/scheduler/test_multi_scheduler.py |   11 +-
 nova/tests/scheduler/test_scheduler.py       |  142 ++++++++++++++++++++++++--
 5 files changed, 226 insertions(+), 51 deletions(-)

commit 922420faf353f0296eacee00e8c0ba372c04fbea
Merge: 31b0e17 f56cef9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 21:02:10 2012 +0000

    Merge "Better glance exception handling"

commit 31b0e17d7b5e1c3483fa84a80593c888b622e857
Merge: 40f5412 2511341
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 20:50:59 2012 +0000

    Merge "Rename files/dirs from 'rabbit' to 'rpc'."

commit 40f541270c1b046479737feb4210199d8473a726
Merge: 5fb0bdd b6f6e1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 20:39:58 2012 +0000

    Merge "Change references to RabbitMQ to include Qpid."

commit ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 5 22:35:25 2012 -0800

    Replaces pipelines with flag for auth strategy
    
     Forcing deployers to modify a paste config file to change auth
     strategies is very fragile. This simplifies things by keying
     pipeline construction off of a single flag. Note that this will
     require a small change to devstack.
    
    Change-Id: I49728c356266e6084ecafb6c59542390137f89e9

 etc/nova/api-paste.ini          |   35 ++++++++++++++++-------------------
 nova/api/auth.py                |   12 +++++++++++-
 nova/api/ec2/__init__.py        |    1 -
 nova/auth/manager.py            |    5 +----
 nova/context.py                 |    7 ++-----
 nova/flags.py                   |    4 ++++
 nova/image/glance.py            |    5 ++---
 nova/tests/image/test_glance.py |    2 +-
 nova/tests/test_auth.py         |    2 +-
 9 files changed, 38 insertions(+), 35 deletions(-)

commit 5fb0bdd7bf807a0886261ae6cf260dc7b6425e22
Merge: ce016b2 bf5ce18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 20:29:15 2012 +0000

    Merge "Check all migrations have downgrade in test_misc"

commit ce016b2772f0935782ad1542cb2bebacf9a47e83
Merge: 225286d a81130b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 20:10:21 2012 +0000

    Merge "Rename DistributedScheduler as FilterScheduler"

commit 0c7a54b3b44f849bf397bb4068ab16c576c3559c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 27 19:07:31 2012 -0600

    Setup and teardown networks during migration
    
    * fixes lp939060
    * live migration and resize nova appropriately setup
      and teardown networking related to network hosts
    * deallocate_fixed_ip is now run on the correct host
      resulting in the network structures being torn down
      correctly
    
    Change-Id: I2c86989ab7c6593bf346611cde8c043116d55bc5

 nova/compute/manager.py          |   46 ++++++++++--
 nova/db/sqlalchemy/models.py     |    2 +
 nova/network/api.py              |   20 +++++
 nova/network/manager.py          |  154 +++++++++++++++++++++++++++++++-------
 nova/network/quantum/manager.py  |    4 +
 nova/tests/api/ec2/test_cloud.py |    3 +-
 nova/tests/test_compute.py       |    8 ++
 nova/tests/test_network.py       |    2 +-
 8 files changed, 204 insertions(+), 35 deletions(-)

commit 225286d8bb36c34334d3da73e96e2117121537c3
Merge: 80eaaad 0d78045
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:59:21 2012 +0000

    Merge "Fixes for ec2 images"

commit 80eaaad9b3377ccc80382bf2f91ffb70b23ab106
Merge: a231aca 094c769
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:48:32 2012 +0000

    Merge "Ensures that we don't exceed iptables chain max"

commit a231acabb678288b1b09e8b5dbd2a8aa4e365dac
Merge: 3427789 37a392d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:37:21 2012 +0000

    Merge "Fixes bug 942556 and bug 944105"

commit 342778997f866129b9786737737019fdbe672222
Merge: 4bbc792 5671515
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:26:26 2012 +0000

    Merge "Test creating a server with metadata key too long."

commit 4bbc792624c67f3b5df65c5bce3909e5a7371642
Merge: 0dcf607 b425676
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:13:36 2012 +0000

    Merge "Fixing incorrect use of instance keyword in logging."

commit 0dcf6072e08370b63898da4a3cccd40cc1ab7f3b
Merge: 7459e8f db056da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 19:02:33 2012 +0000

    Merge "Provide a provider for boto.utils"

commit 7459e8f39738d083604c144d87dd58b41149fe02
Merge: cab9a48 702a474
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 18:50:31 2012 +0000

    Merge "Get rid of all of the autodoc import errors."

commit cab9a483e873fa05906d72be980adf20f9ef2c1e
Merge: ca8effc 93cee60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 18:39:05 2012 +0000

    Merge "Decode nova-manage args into unicode."

commit ca8effc57406987df6cb4babaeb8bae517f9e233
Merge: 7004598 f9c0f1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 18:28:07 2012 +0000

    Merge "No longer ignoring man/novamanage"

commit f56cef93ea6e3746a17152bcd1850ccf4b3dad3d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 2 15:57:55 2012 -0500

    Better glance exception handling
    
    - Adds a conversion step that turns glance exceptions into nova
      exceptions
    - Converts Invalid to HTTPBadRequest in /images and /images/detail,
      fixing bug 944846
    - Makes stub glance client return glance exceptions instead of nova
      exceptions
    - Rebased off of http://review.openstack.org/4788 to pick up
      MissingCredentialError handling as well, and added a test
    - A few small, miscellaneous testing fixes for issues I noticed
    
    Change-Id: I88eebfe7a7ac21cc5cd84ad84d64b311ddccf91e

 nova/api/openstack/compute/images.py            |   14 ++++--
 nova/image/glance.py                            |   59 ++++++++++++++++++-----
 nova/tests/api/openstack/compute/test_images.py |   25 +++++++++-
 nova/tests/glance/stubs.py                      |   10 ++--
 nova/tests/image/test_glance.py                 |   37 +++++++++++++-
 5 files changed, 124 insertions(+), 21 deletions(-)

commit 700459891e93c6502f0f7a7dd78ead7011a2c81d
Merge: 01dbefb 60afa73
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 18:16:46 2012 +0000

    Merge "sm volume driver: fix backend adding failure"

commit 6c31605ea3b1bdbb5047019b82af941a140acfa9
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Tue Mar 6 18:11:33 2012 +0000

    Distinguish rootwrap Authorization vs Not found errors
    
    Rootwrap will return "not authorized" for a command
    that is defined in the rootwrap filters but not
    installed on the system.  Therefore return the first
    matching filter for such a command so that sudo will
    try to execute it and return a more appropriate error.
    
    Change-Id: I77eeff229e73d55083a735af7a9029469132c800

 nova/rootwrap/wrapper.py         |   10 +++++++---
 nova/tests/test_nova_rootwrap.py |    7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

commit 01dbefb085e7509cb7381ff7cf56bd1b03788cab
Merge: 52b65f2 cce1c21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 18:05:16 2012 +0000

    Merge "Nova options tool enhancements"

commit 21c779dd1e9bd006d204762117fc18839cd8d14c
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Feb 29 14:19:35 2012 +0000

    Bug #943178: aggregate extension lacks documentation
    
    add rst docs for this extension.
    
    Change-Id: I74080c240a0a6911271674177ac08a113b4c50d1

 doc/source/api_ext/ext_aggregates.rst |  122 +++++++++++++++++++++++++++++++++
 doc/source/devref/aggregates.rst      |   65 ++++++++++++++++++
 2 files changed, 187 insertions(+)

commit 2511341840c24052501c1a588981756c749696bf
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Mar 6 12:09:09 2012 -0500

    Rename files/dirs from 'rabbit' to 'rpc'.
    
    Now that the rpc API includes more than RabbitMQ, update a filename and
    directory name to be 'rpc' instead of 'rabbit'.
    
    Change-Id: Ib7fcccdd77fae128b6de3ee490fee3d6325ca7c5

 doc/source/devref/index.rst        |    2 +-
 doc/source/devref/rabbit.rst       |  151 ---------
 doc/source/devref/rpc.rst          |  151 +++++++++
 doc/source/images/rabbit/arch.png  |  Bin 26690 -> 0 bytes
 doc/source/images/rabbit/arch.svg  |  292 -----------------
 doc/source/images/rabbit/flow1.png |  Bin 40982 -> 0 bytes
 doc/source/images/rabbit/flow1.svg |  617 ------------------------------------
 doc/source/images/rabbit/flow2.png |  Bin 30650 -> 0 bytes
 doc/source/images/rabbit/flow2.svg |  423 ------------------------
 doc/source/images/rabbit/rabt.png  |  Bin 44964 -> 0 bytes
 doc/source/images/rabbit/rabt.svg  |  581 ---------------------------------
 doc/source/images/rabbit/state.png |  Bin 38543 -> 0 bytes
 doc/source/images/rpc/arch.png     |  Bin 0 -> 26690 bytes
 doc/source/images/rpc/arch.svg     |  292 +++++++++++++++++
 doc/source/images/rpc/flow1.png    |  Bin 0 -> 40982 bytes
 doc/source/images/rpc/flow1.svg    |  617 ++++++++++++++++++++++++++++++++++++
 doc/source/images/rpc/flow2.png    |  Bin 0 -> 30650 bytes
 doc/source/images/rpc/flow2.svg    |  423 ++++++++++++++++++++++++
 doc/source/images/rpc/rabt.png     |  Bin 0 -> 44964 bytes
 doc/source/images/rpc/rabt.svg     |  581 +++++++++++++++++++++++++++++++++
 doc/source/images/rpc/state.png    |  Bin 0 -> 38543 bytes
 21 files changed, 2065 insertions(+), 2065 deletions(-)

commit b6f6e1b7f4719aab82b81750ce47c92b99793bfb
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Feb 28 10:33:19 2012 -0500

    Change references to RabbitMQ to include Qpid.
    
    Update the documentation that referred to RabbitMQ to clarify that Qpid
    can be used, as well.
    
    Change-Id: I3abe32c2074bfdd3b5129ea65e9ca36cc9555c27

 doc/source/devref/rabbit.rst |   42 +++++++++++++++++++++---------------------
 doc/source/nova.concepts.rst |    2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

commit 52b65f2f1407591fb3c9d612a2748a4953ab9543
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Mar 6 16:43:30 2012 +0000

    Avoid running code that uses logging in a thread
    
    Fixes bug 946687
    
    This avoids problems with code that uses logging from running in a thread
    which isn't necessary for unit tests anyway.
    
    Change-Id: I9c296c3c46317c9aaba7f1a92cd565a35682ce23

 nova/tests/xenapi/stubs.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit f9c0f1e7ab45f98313a7db37c2a52fcc5f762c09
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue Mar 6 16:37:59 2012 +0000

    No longer ignoring man/novamanage
    
    Fixes Bug #948165
    man/novamanage is a manpage and should be included
    
    Change-Id: I497b3d2a348dc74f8ebcd08e628a6b9324dd3a8f

 doc/source/conf.py |    1 -
 1 file changed, 1 deletion(-)

commit b425676da955b13dd033db6ac67ba1bb7dcf28c8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Mar 6 16:28:00 2012 +0000

    Fixing incorrect use of instance keyword in logging.
    
    Fixes bug 948154
    
    Change-Id: I8adc48482c26528d1e671c8e038c23caaa0f861d

 nova/compute/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c16cd04cf61fc6411fe953e1653385d62ca1ab82
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Thu Mar 1 16:54:28 2012 -0500

    Fix rst formatting and cross-references
    
    blueprint sphinx-doc-cleanup
    bug 944385
    
    - Fix formatting and markup issues that produce error messages
    - Update TOC lists for missing/new files
    - Fix a few links
    - Update instructions with dependencies for building the documentation
    - Updated base on review comments from oubiwann to fix trailing whitespace in modified files
    
    Change-Id: I589152bfab9c543d2b11fa8bed2344259aa90675

 .mailmap                                      |    1 +
 doc/README.rst                                |   24 ++-
 doc/generate_autodoc_index.sh                 |    2 +-
 doc/source/api_ext/ext_config_drive.rst       |  236 +++++++++++++------------
 doc/source/api_ext/ext_floating_ip_dns.rst    |   32 ++--
 doc/source/api_ext/ext_keypairs.rst           |    5 +-
 doc/source/api_ext/ext_quotas.rst             |    5 +-
 doc/source/api_ext/ext_rescue.rst             |    5 +-
 doc/source/api_ext/ext_security_group.rst     |   18 +-
 doc/source/api_ext/ext_virtual_interfaces.rst |    2 +-
 doc/source/api_ext/ext_volumes.rst            |    7 +-
 doc/source/api_ext/rst_extension_template.rst |   33 ++--
 doc/source/code.rst                           |   92 ----------
 doc/source/community.rst                      |    6 +-
 doc/source/conf.py                            |    7 +-
 doc/source/devref/addmethod.openstackapi.rst  |   12 +-
 doc/source/devref/development.environment.rst |   58 +++---
 doc/source/devref/fakes.rst                   |    2 +-
 doc/source/devref/index.rst                   |    2 +-
 doc/source/devref/modules.rst                 |   19 --
 doc/source/index.rst                          |    7 +-
 doc/source/nova.concepts.rst                  |    9 +-
 doc/source/object.model.rst                   |    2 +-
 doc/source/runnova/flags.rst                  |   17 +-
 doc/source/runnova/index.rst                  |    9 +-
 doc/source/runnova/managing.networks.rst      |    9 +-
 doc/source/runnova/managing.projects.rst      |   11 +-
 doc/source/runnova/managing.users.rst         |    2 +-
 doc/source/runnova/nova.manage.rst            |    4 +-
 doc/source/runnova/vncconsole.rst             |   22 ++-
 doc/source/vmwareapi_readme.rst               |    7 +-
 31 files changed, 339 insertions(+), 328 deletions(-)

commit db056da98252e02ab3a10045a65b2d6a6972c6b0
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Fri Mar 2 22:05:55 2012 +0800

    Provide a provider for boto.utils
    
    Fixes bug #945355
    
    Change-Id: I0b09f6d8d2373f52359806945de467585421fb65

 nova/auth/signer.py |    2 ++
 1 file changed, 2 insertions(+)

commit 86bf2276d9adf2365e46a880d7ec4a276780d3ed
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 5 16:48:18 2012 -0500

    Only pass image uuids to compute api rebuild
    
    Addresses bug 881641
    
    Change-Id: I9c0270d5ceb126387a0052c83937ae778d1f49cb

 nova/api/openstack/compute/servers.py              |   22 +++++----
 .../api/openstack/compute/test_server_actions.py   |   48 +++++++++++++++++++-
 2 files changed, 61 insertions(+), 9 deletions(-)

commit 89797436539478a8409352f4d805b3f41510b91f
Merge: 9bb2a33 9627c88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 04:34:17 2012 +0000

    Merge "Allows new style config to be used for --flagfile"

commit 3b081fea0868070a10ffb924a51314af24438e74
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Mar 5 20:17:41 2012 -0800

    Finally fix the docs venv bug.
    
    Closes bug 902846.
    
    Turns out that without providing a default css file,
    docutils tries to pull one in from a location using
    very bad path logic. Glance was providing the css file
    explicitly and it worked, so I just copied them.
    
    Change-Id: I6cc9d0ca148149637104c27f6c020030bdbcfe18

 doc/source/_static/basic.css   |  416 ++++++++++++++++++++++++++++++++++++++++
 doc/source/_static/default.css |  230 ++++++++++++++++++++++
 2 files changed, 646 insertions(+)

commit 702a4743f05370c16c92094fc43de14168031e96
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Feb 25 12:44:28 2012 -0800

    Get rid of all of the autodoc import errors.
    
    This hasn't worked right in a bazillion years.
    
    Change-Id: I4db20ce97f920cdb7254d51e18a0630b0283b39d

 doc/ext/nova_autodoc.py       |    6 ++----
 doc/find_autodoc_modules.sh   |    4 ++--
 doc/generate_autodoc_index.sh |    4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

commit 9bb2a335903e996a8c7b781152c10310d867dcb8
Merge: 43b52f7 913ecb8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 6 03:08:00 2012 +0000

    Merge "Raise 409 when rescuing instance in RESCUE mode"

commit a81130b1a95ab89cf253c429cb4f0a00f1afb83d
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Mar 5 17:53:57 2012 -0800

    Rename DistributedScheduler as FilterScheduler
    
    Change-Id: I1091609d5997c4ba9c26a3f2426496ff7f1e64fa

 doc/source/devref/distributed_scheduler.rst        |  103 --------
 doc/source/devref/filter_scheduler.rst             |  103 ++++++++
 doc/source/devref/index.rst                        |    2 +-
 nova/scheduler/distributed_scheduler.py            |  260 --------------------
 nova/scheduler/filter_scheduler.py                 |  260 ++++++++++++++++++++
 nova/scheduler/multi.py                            |    2 +-
 nova/tests/scheduler/fakes.py                      |    6 +-
 nova/tests/scheduler/test_distributed_scheduler.py |  177 -------------
 nova/tests/scheduler/test_filter_scheduler.py      |  177 +++++++++++++
 9 files changed, 545 insertions(+), 545 deletions(-)

commit 9627c88d688fd276d82c06bb7d11aefecce5e7d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 5 16:54:57 2012 -0800

    Allows new style config to be used for --flagfile
    
     * includes tests
     * fixes bug 947549
    
    Change-Id: Ibf319ea75a2d6156c5d8f1112cd58a33e5a98fe0

 nova/compat/flagfile.py            |    4 ++++
 nova/tests/test_compat_flagfile.py |    9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 43b52f7bd224209771245d987c3ff0f2506803ec
Merge: e8bc00e 83c3ee9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 6 00:45:21 2012 +0000

    Merge "Imported Translations from Launchpad"

commit e81795995abd911e477f5478cdfe84c5785a1a90
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Feb 27 12:54:22 2012 -0500

    Add support for lxc consoles.
    
    Add lxc console support. Similar to how we get console
    on libvirt-xen domains. This fixes bug 853602.
    
    Change-Id: Ib39953b804dc3284132651f29f33ad5783d1959a
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/virt/libvirt.xml.template  |    1 +
 nova/virt/libvirt/connection.py |   12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

commit bac357663c89ac14d41719b53b9a64612ac80d99
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 5 15:43:34 2012 -0800

    Fix references to novncproxy_base_url in docs.
    
     * Add note about nova-console, to avoid confusion with nova-consoleauth
    
    Change-Id: Ic064e70836d0c31f43b6459cce81e28f821769b5

 doc/source/runnova/vncconsole.rst |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit e8bc00eff22288c31a8ea36bf1faaa362d60d3cd
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Mar 5 14:03:46 2012 -0800

    Add  assertRaises check to tools/hacking.py as N202
    
    Change-Id: I25113bcc73ff642cae146f0558f319684b4568d0

 tools/hacking.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit b1de27f68a9f80db723c1b3545f95c5c9c8e7e9d
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Mon Mar 5 14:33:40 2012 -0500

    fix restructuredtext formatting in docstrings that show up in the developer guide
    
    blueprint sphinx-doc-cleanup
    bug 945160
    
    - Correct parameter declarations, list formatting, cross-references, etc.
    - We don't need "let" in generate_autodoc_index.sh since we aren't doing math.
    - Change conf.py to not prefix class and function names with full namespace
      in generated output to save width on the screen.
    
    Change-Id: I9adc8681951913fd291d03e7142146e9d46841df

 doc/generate_autodoc_index.sh                      |    3 +-
 doc/source/conf.py                                 |    2 +-
 nova/api/openstack/common.py                       |   27 ++-
 .../openstack/compute/contrib/flavorextradata.py   |    7 +-
 nova/api/openstack/compute/contrib/hosts.py        |    4 +-
 nova/api/openstack/compute/limits.py               |    4 +-
 nova/api/validator.py                              |   10 +-
 nova/auth/fakeldap.py                              |    6 +-
 nova/auth/manager.py                               |  174 ++++++++++----------
 nova/cert/manager.py                               |    5 +-
 nova/common/policy.py                              |   91 +++++-----
 nova/compat/flagfile.py                            |    2 +-
 nova/network/model.py                              |   34 ++--
 nova/notifier/api.py                               |   36 ++--
 nova/objectstore/s3server.py                       |    2 +-
 nova/openstack/common/cfg.py                       |   43 ++---
 nova/policy.py                                     |   10 +-
 nova/scheduler/driver.py                           |    1 +
 nova/scheduler/least_cost.py                       |   15 +-
 nova/scheduler/manager.py                          |   11 +-
 nova/tests/api/openstack/test_faults.py            |    2 +-
 nova/utils.py                                      |   97 ++++++-----
 nova/virt/driver.py                                |   32 ++--
 nova/virt/firewall.py                              |    4 +-
 nova/virt/libvirt/connection.py                    |   19 ++-
 nova/virt/vmwareapi/vmops.py                       |   20 ++-
 nova/virt/xenapi/vm_utils.py                       |   18 +-
 nova/virt/xenapi/vmops.py                          |   23 +--
 nova/volume/driver.py                              |   19 ++-
 nova/volume/manager.py                             |    6 +-
 nova/vsa/api.py                                    |    8 +-
 31 files changed, 396 insertions(+), 339 deletions(-)

commit 5f9cee0c9c95b61d548730e7918e5c623301b3b1
Merge: 84dc739 c4a2e17
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 20:05:08 2012 +0000

    Merge "Retry download_vhd with different glance host each time"

commit 913ecb84d286413cfec3dff7cf1b1b71f93bcfce
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Mon Mar 5 19:41:12 2012 +0000

    Raise 409 when rescuing instance in RESCUE mode
    
    fixes bud #940581
    
    Change-Id: I8c6b600d36a35ef4e32f35b888f8f2eb8effebcd

 nova/api/openstack/compute/contrib/rescue.py       |    8 +++++++-
 nova/api/openstack/extensions.py                   |    2 ++
 .../api/openstack/compute/contrib/test_rescue.py   |   16 ++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

commit 84dc739b289a81848134184f8bfadfe69835feee
Merge: f31d94d 3c62c9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 19:21:21 2012 +0000

    Merge "bug #941794 VIF and intf drivers for Quantum Linux Bridge plugin"

commit f31d94d27248afef8b5fecddb1249a01a9112bf3
Merge: 2badee2 534a894
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 18:34:12 2012 +0000

    Merge "Only raw string literals should be used with _()"

commit 2badee254b64c8561f61ffff1e594d14bd7a1dee
Merge: f31ab49 6b49f4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 18:15:40 2012 +0000

    Merge "Remove unnecessary code in test setUp/tearDown"

commit f31ab49e311b47c031b70de30afd445973d4feff
Merge: c4e5d65 7ab0489
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 17:10:53 2012 +0000

    Merge "Log a certain rare instance termination exception"

commit c4e5d655e64b3b707fbfdfac11ffbcc8c8bf3660
Merge: 6122a3b 4a2cf65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 16:23:53 2012 +0000

    Merge "populate glance 'name' field through ec2-register"

commit 6122a3bab5eb2845a0ae07a15c6db2020d2a5667
Merge: e6c2164 eea6aec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 16:13:14 2012 +0000

    Merge "Allows --flat_interface flag to override db"

commit 7ab0489bc4f15fdc6025056c2d9e08543fde5129
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 4 23:35:17 2012 -0500

    Log a certain rare instance termination exception
    
    - Clean up logging per Michael Still's comments
    
    Change-Id: I3b7e647dde582dca4644b557bb30251e31644c17

 nova/compute/manager.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 84114e426f3973d78fc0f6766f3ad7577349da7a
Author: Maru Newby <mnewby@internap.com>
Date:   Thu Mar 1 20:55:53 2012 -0800

    Update fixed_ip_associate to not use relationships
    
     * fixed_ip_associate was using the FixedIp.instance and FixedIp.network
       relationships, which were removed.  This change updates the method to
       use instance_id and network_id instead.
     * Adds unit tests for fixed_ip_associate
     * Resolves bug 943029
    
    Change-Id: I0829d110058b8799a520ab68b5fa1b2370b9cc3e

 nova/db/sqlalchemy/api.py |   12 ++++--------
 nova/tests/test_db_api.py |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

commit 6b49f4e66c738f6fec56bf0d2dffd4673c4707a4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Mar 4 23:43:37 2012 +0000

    Remove unnecessary code in test setUp/tearDown
    
    Change-Id: I41c033dceafdf1ce39ff3dc11f11b54a909cec12

 nova/tests/test_libvirt.py |    2 --
 1 file changed, 2 deletions(-)

commit e6c21648d5faa33983d0157fac1478ae79ba5919
Merge: 8813ab1 d304d82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 4 23:37:38 2012 +0000

    Merge "Added docs on MySQL queries blocking main thread."

commit 83c3ee91879c002819f67e498ebd00475af1fb44
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 4 23:02:22 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Icea78b1823c1948639da73552b156a6bdeef3ea3

 nova/locale/bs/LC_MESSAGES/nova.po    | 1860 ++++++++++++----------
 nova/locale/cs/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/da/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/de/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 1864 ++++++++++++----------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 1863 ++++++++++++----------
 nova/locale/es/LC_MESSAGES/nova.po    | 1864 ++++++++++++----------
 nova/locale/fr/LC_MESSAGES/nova.po    | 1864 ++++++++++++----------
 nova/locale/it/LC_MESSAGES/nova.po    | 1863 ++++++++++++----------
 nova/locale/ja/LC_MESSAGES/nova.po    | 1864 ++++++++++++----------
 nova/locale/ko/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/nova.pot                  | 1830 +++++++++++----------
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 1864 ++++++++++++----------
 nova/locale/ru/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/tl/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/tr/LC_MESSAGES/nova.po    | 1860 ++++++++++++----------
 nova/locale/uk/LC_MESSAGES/nova.po    | 1861 ++++++++++++----------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 2795 +++++++++++++++++----------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 1860 ++++++++++++----------
 19 files changed, 19281 insertions(+), 16997 deletions(-)

commit 534a894ad18c180791aaa685e97cc5264acce922
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Mar 4 19:06:31 2012 +0000

    Only raw string literals should be used with _()
    
    Fix a number of places where formatted strings were used with _() (causing
    gettext to not match the string) or variables with _() (causing xgettext
    to not extract a string)
    
    Also, there's no value in internationalizing an empty string
    
    Change-Id: Iac7dbe46eeaa8ddf03c2a357ecd52f69aa8678aa

 nova/api/ec2/cloud.py                             |   32 +++++++++----------
 nova/api/openstack/compute/contrib/disk_config.py |    2 +-
 nova/api/openstack/compute/contrib/networks.py    |    2 +-
 nova/api/openstack/compute/limits.py              |    6 ++--
 nova/api/openstack/wsgi.py                        |    2 +-
 nova/api/validator.py                             |    8 +++--
 nova/compute/manager.py                           |    8 ++---
 nova/db/sqlalchemy/api.py                         |    8 ++---
 nova/network/manager.py                           |    6 ++--
 nova/network/quantum/client.py                    |   16 +++++-----
 nova/network/quantum/manager.py                   |    4 +--
 nova/network/quantum/melange_connection.py        |    2 +-
 nova/network/quantum/nova_ipam_lib.py             |    6 ++--
 nova/network/quantum/quantum_connection.py        |    4 +--
 nova/notifier/api.py                              |    6 ++--
 nova/rpc/impl_carrot.py                           |    2 +-
 nova/rpc/impl_kombu.py                            |    2 +-
 nova/rpc/impl_qpid.py                             |    4 +--
 nova/scheduler/distributed_scheduler.py           |    6 ++--
 nova/scheduler/scheduler_options.py               |    2 +-
 nova/scheduler/vsa.py                             |    2 +-
 nova/tests/fake_utils.py                          |    2 +-
 nova/tests/test_xenapi.py                         |    8 ++---
 nova/utils.py                                     |   34 ++++++++++-----------
 nova/virt/baremetal/dom.py                        |    2 +-
 nova/virt/baremetal/proxy.py                      |    6 ++--
 nova/virt/baremetal/tilera.py                     |   15 +++++----
 nova/virt/disk/api.py                             |    2 +-
 nova/virt/libvirt/connection.py                   |    6 ++--
 nova/virt/xenapi/vm_utils.py                      |    4 +--
 nova/virt/xenapi/vmops.py                         |    4 +--
 nova/volume/san.py                                |   14 ++++-----
 32 files changed, 114 insertions(+), 113 deletions(-)

commit 8813ab185d0b6ad1c111e7f9e346e2ce91c8113b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sat Mar 3 17:53:41 2012 +0000

    assertRaises(Exception, ...) considered harmful
    
    Expecting that Exception is raised can end up passing an a test when an
    unexpected error occurs. For instance, errors in the unit test itself
    can be masked:
    
    https://review.openstack.org/4848
    https://review.openstack.org/4873
    https://review.openstack.org/4874
    
    Change a variety of unit tests to expect a more specific exception so
    we don't run into false positive tests in the future.
    
    Change-Id: Ibc0c63b1f6b5574a3ce93d9f02c9d1ff5ac4a8b0

 HACKING.rst                     |   12 +++++++++
 nova/exception.py               |    4 +++
 nova/network/quantum/manager.py |    3 +--
 nova/test.py                    |    4 +++
 nova/tests/fakelibvirt.py       |    4 +--
 nova/tests/test_api.py          |   53 ++++++++++++++++++---------------------
 nova/tests/test_compute.py      |   27 ++++++++++----------
 nova/tests/test_exception.py    |   11 +++++---
 nova/tests/test_fakelibvirt.py  |    2 +-
 nova/tests/test_quantum.py      |    5 ++--
 nova/tests/test_vmwareapi.py    |   20 +++++++++------
 11 files changed, 86 insertions(+), 59 deletions(-)

commit d304d828d0422025af93bbb76b76843f5886a45f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Mar 2 09:39:36 2012 -0500

    Added docs on MySQL queries blocking main thread.
    
    Added to the RST docs to describe how queries to MySQL will block a nova
    service.
    
    Change-Id: I4ae209e2827978cc5469162d386197f2e46b342d

 .mailmap                        |    1 +
 Authors                         |    2 +-
 doc/source/devref/threading.rst |   46 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 7 deletions(-)

commit df842706c32c2ee2bb982a0f8d90923e5fa77b91
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sat Mar 3 18:01:23 2012 +0000

    Fix test_attach_volume_raise_exception
    
    The arguments for attach_volume have changed, but the test failure was
    being masked by an overly broad check for the Exception type.
    
    Change-Id: I0a54efaee8520d734357e867e2fec0fc9be2cec6

 nova/tests/test_xenapi.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d0cae6b5a16a5873afbcd47ba8ee5e97b6a25072
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sat Mar 3 16:14:19 2012 +0000

    Fix test_unrescue to actually test unrescue
    
    Another case where assertRaises(Exception, ...) masked a bug in the
    unit test. The unrescue method takes another argument now. When
    TypeError was raised, it was caught by the broad match to Exception
    as well.
    
    Change-Id: I6b948baa41f2061ea413e14ae6aba054e6f22ecf

 nova/tests/test_xenapi.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3c62c9d65deb463782546afee257af6183cc0928
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Feb 27 00:26:14 2012 -0800

    bug #941794 VIF and intf drivers for Quantum Linux Bridge plugin
    
    Drivers have been reviewed earlier by Quantum reviewers and are being
    moved here on their request.
    
    Also incorporating Soren,Dan, pp-draigbrady and Vish's suggestions.
    
    Change-Id: If04807c473542e2f0259faa6d243c3e6e9539f64

 Authors                        |    1 +
 nova/network/linux_net.py      |   82 ++++++++++++++++++++++++++++++++++++++++
 nova/rootwrap/compute.py       |    1 +
 nova/rootwrap/network.py       |    1 +
 nova/tests/test_libvirt_vif.py |   22 ++++++++++-
 nova/virt/libvirt/vif.py       |   29 ++++++++++++++
 6 files changed, 135 insertions(+), 1 deletion(-)

commit f3a7149a85f78843422a1bf2c822ff8f47f08d7b
Merge: 67eb98d fe87151
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 07:06:45 2012 +0000

    Merge "Fix test_migrate_disk_and_power_off_exception"

commit 67eb98de58ed33607df4c1caae63866cb830999d
Merge: d02e2d2 8d5e0e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 04:10:20 2012 +0000

    Merge "Use self.mox instead of create a new self.mocker"

commit d02e2d2c5e659a3deef8b50da2447a27e69294f1
Merge: a222583 137b427
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 03:56:02 2012 +0000

    Merge "Remove unused _setup_other_managers method from test case"

commit a222583af29af259a7f12b63c46fc8b87b1ea262
Merge: 5001d77 7428cf5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 03:25:59 2012 +0000

    Merge "fix for bug 821252.  Smarter default scheduler"

commit 5001d77272612b5b76267d43424f25e531e674e2
Merge: 75baa3e 1911420
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 03:15:41 2012 +0000

    Merge "fakes.fake_data_store doesn't exist, so don't reset it"

commit 75baa3e9d7949c9490d520a5a20756663f3ad68f
Merge: d9097f3 6c22d2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 02:05:22 2012 +0000

    Merge "Display error for invalid CIDR."

commit 094c7695e8e8261c256c862eaa6774742746f3b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 1 10:26:22 2012 -0800

    Ensures that we don't exceed iptables chain max
    
     * Fixes bug 944184
    
    Change-Id: Ifb25f253ab32c9895aae276e946058eb62e14957

 nova/network/linux_net.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit eea6aecf4ad18108e35cf86ab1be7e98e748fca6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 2 15:16:34 2012 -0800

    Allows --flat_interface flag to override db
    
     * this replicates what commit 8efe15209 did for vlan_interface
     * includes a test to verify that the override works
     * cleans up memory usage in the vlan test
     * Fixes bug 944734
    
    Change-Id: I21a04a43051f723029513c4c9548003f959cff37

 nova/network/linux_net.py    |    3 ++-
 nova/tests/test_linux_net.py |   35 ++++++++++++++++++++++++++++++++---
 nova/virt/libvirt/vif.py     |    3 ++-
 3 files changed, 36 insertions(+), 5 deletions(-)

commit d9097f35cd391fcd5a8ec735abd3b53e634bfa14
Merge: 065df7c 2efb017
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 00:52:58 2012 +0000

    Merge "Adds soft-reboot support to libvirt"

commit 065df7cdf41fbe453cd7ca165777a3f55e9e29e1
Merge: bb9a2c7 7aa5f75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 00:42:25 2012 +0000

    Merge "Use test.TestCase instead of manually managing stubout"

commit bb9a2c7e93b2fab0f421e5db191017e35ccdd3bf
Merge: 49f6071 e13f72a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 3 00:05:24 2012 +0000

    Merge "Remove unused test_obj parameter to setUp()"

commit 8d5e0e8e4325182ff702378543b58c67abe60caa
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sat Mar 3 00:02:15 2012 +0000

    Use self.mox instead of create a new self.mocker
    
    Change-Id: I3406ae9f59e4880ad036329168cbba710aa4dea0

 nova/tests/rpc/test_qpid.py |   47 ++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

commit 49f60715e682d8ef6139d1d2b30f744bf43bb2f5
Merge: 665c453 d7acf13
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 23:54:37 2012 +0000

    Merge "Handle InstanceNotFound during server update"

commit fe87151dacebcf1b1e7475247b4e156f3c2295c5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 23:48:42 2012 +0000

    Fix test_migrate_disk_and_power_off_exception
    
    The test asserts that Exception is raised, which means any number of
    failures within the test itself will cause it to pass. In this case
    there were two bugs in the test case:
    
    1) Too many arguments to migrate_disk_and_power_off
    2) fake_get_instance_disk_info should return a JSON string
    
    I changed the assert to catch an AssertionError exception instead to
    avoid this kind of bug in the future
    
    Change-Id: I5e0f57b093ee1b2830696542d343c2dd89c383d6

 nova/tests/test_libvirt.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 665c453ec2c1c8cc7ccdd5870fbbf0c01e2cf2db
Merge: 8f33fd5 a7e1fe4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 23:44:18 2012 +0000

    Merge "Use stubout instead of manually stubbing out os.path.exists"

commit 8f33fd5d5328722145f5ca33b5de18058117c998
Merge: 0bb5250 2a2bab8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 23:33:55 2012 +0000

    Merge "Remove superfluous __init__ from test case"

commit 0bb52500249488e235bad4a64eaeee68e670e7f4
Merge: 9a63d6f 7244dfe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 23:23:24 2012 +0000

    Merge "Use stubout instead of manually stubbing out versions.VERSIONS"

commit 19114203330b0bce8880cef39507faded18e3a71
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 23:20:33 2012 +0000

    fakes.fake_data_store doesn't exist, so don't reset it
    
    Change-Id: Ic1aa13d33fa376974ed1e4b6ccf3216bbebb7d1e

 nova/tests/api/openstack/compute/test_auth.py |   12 ------------
 1 file changed, 12 deletions(-)

commit 9a63d6f02cbe2d770778942cfb733cf28659581c
Merge: f0a172e efdf56f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 23:12:49 2012 +0000

    Merge "Remove unused session variable in test setup"

commit 4a2cf658dca26965cb06f478ad030ecda4d7fc43
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Feb 10 15:19:49 2012 -0500

    populate glance 'name' field through ec2-register
    
    For images registered via RegisterImage in the ec2 api, populate
    glance's 'name' field.  If the name is not supplied in the ec2
    request, then set it to be the location.
    
    This has the added value of 'glance index' now showing ec2 registered
    images.  Previously, they were not listed because of the empty Name
    field.
    
    Additionally, when responding to DescribeImages in the ec2 api,
    populate the name field.  Previously we were not populating this at
    all.  In the case where there is no name, use image_location.
    
    Fixes bug 930314
    
    Change-Id: I10bcac9ab298a2bf127b5228c62c3cf4f009abd6

 nova/api/ec2/cloud.py            |   22 +++++++++++----
 nova/tests/api/ec2/test_cloud.py |   58 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)

commit 137b427297dd7aec9e0cf132de49c858e2823e2a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:54:40 2012 +0000

    Remove unused _setup_other_managers method from test case
    
    Change-Id: I4a965987335a6fc1333bca43d8180b7f05d2f7dd

 nova/tests/test_compute.py |    5 -----
 1 file changed, 5 deletions(-)

commit e13f72aa12b92f8c8bb413d0e9d2f1d8e1d6c170
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:51:17 2012 +0000

    Remove unused test_obj parameter to setUp()
    
    Looks like it was copies from test_vsa.py
    
    Change-Id: I6ac4d5163e1d43dc6cf75461209f086abc69ec3c

 .../api/openstack/compute/contrib/test_volumes.py  |   48 +++++++-------------
 1 file changed, 17 insertions(+), 31 deletions(-)

commit a7e1fe42919108ab2aba3b7167e4aa74ca63ce08
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:47:19 2012 +0000

    Use stubout instead of manually stubbing out os.path.exists
    
    Change-Id: I76105662003c7dfdea29a9a7dea20b003111e399

 nova/tests/test_wsgi.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit 2a2bab8918f72f59bd0f78874bc8f68e90150479
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:44:38 2012 +0000

    Remove superfluous __init__ from test case
    
    Change-Id: I4bb9855a8999df2ef91ddcac8e84b476523e753b

 nova/tests/test_migrations.py |    3 ---
 1 file changed, 3 deletions(-)

commit 7aa5f751cd4a06c95116d8e8eed0f2296f4b0f1f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:42:41 2012 +0000

    Use test.TestCase instead of manually managing stubout
    
    Change-Id: I785e86af37ae484235ef7a933335cd484769ae80

 nova/tests/api/openstack/compute/test_limits.py |   20 +++++++-------------
 nova/tests/test_compat_flagfile.py              |   10 +++-------
 2 files changed, 10 insertions(+), 20 deletions(-)

commit d7acf13525aaac43a08fa4763bc149e708ab7d39
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 2 17:39:58 2012 -0500

    Handle InstanceNotFound during server update
    
    fixes bug 945206
    
    Change-Id: I4e5519cf03e61db78ee1f147f07bc2d1c0e01c49

 nova/api/openstack/compute/servers.py            |    3 +--
 nova/tests/api/openstack/compute/test_servers.py |   26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

commit 7244dfe4085bf1c5bb90f9136b408cd612c6dfc7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:36:32 2012 +0000

    Use stubout instead of manually stubbing out versions.VERSIONS
    
    Change-Id: Id8277989aa0ad0e91464c37cde41ee854356144e

 nova/tests/api/openstack/compute/test_versions.py |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit efdf56f12719d169ab2cb0d05f98aeb1baeac269
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 22:29:14 2012 +0000

    Remove unused session variable in test setup
    
    Change-Id: Ib53a0d76d660cc7a002894ef63bc25c293f92fa0

 nova/tests/test_instance_types.py |    4 ----
 1 file changed, 4 deletions(-)

commit f0a172ea8bcd5b241115210fcdbe33cf268ef051
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 2 22:26:20 2012 +0000

    Cleanup swap in _create_vm undo
    
    Fixes bug 945198
    
    Change-Id: I697fab1bbfdd45fc22d5490524e138c4f377bc58

 nova/virt/xenapi/vmops.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit dab9de9357567bec845c1ac050b88ca07fe09217
Author: JC Martin <jcmartin@ebaysf.com>
Date:   Thu Mar 1 18:52:29 2012 -0800

    Do not invoke kill dnsmasq  if no pid file was found.
    
    fixes Bug 943690
    
    Change-Id: I2b1f5cc66ba6ef02219c0d4445487bdd3a541f4b

 Authors                   |    1 +
 nova/network/linux_net.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 0d78045e72efe7313ca54e726dd403793eb30b52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 1 16:52:07 2012 -0800

    Fixes for ec2 images
    
     * Fixes s3 image service to convert back to uuids on update
     * Adds exception for attempt to update an unowned image
     * Adds error messages to ec2 for failure cases
     * Adds tests to verify changes
     * Fixes bug 942865
    
    Change-Id: I35331c635756f10c02b30dd43ab3fe0ad98bc28c

 nova/api/ec2/cloud.py            |    9 ++++++++-
 nova/exception.py                |    6 +++++-
 nova/image/glance.py             |    3 +++
 nova/image/s3.py                 |   22 ++++++++++++++++++++
 nova/tests/api/ec2/test_cloud.py |   41 +++++++++++++++++++++++++++++++++-----
 5 files changed, 74 insertions(+), 7 deletions(-)

commit c4a2e17dcfbd7b6434a7dfae3c7a3e5f30a3fc87
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 1 18:49:44 2012 +0000

    Retry download_vhd with different glance host each time
    
    Fixes bug 944096
    
    Change-Id: I33aa3774ba7f266e85f09c6c569fdd0f895478b4

 nova/exception.py                                  |    4 ++
 nova/virt/xenapi/vm_utils.py                       |   69 +++++++++++++-------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   49 +++++---------
 3 files changed, 68 insertions(+), 54 deletions(-)

commit 6c22d2a5ecd5fdb6e87c282d280145008cd7c52b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Feb 17 14:32:19 2012 -0500

    Display error for invalid CIDR.
    
    Display an error to the user when giving an
    invalid CIDR. Fixes bug 917982.
    
    Change-Id: I5def054f5cc8e14bc8ebd981744d7d7af7f5710b

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8a530832c599f8866e98947976d74a5332d877af
Merge: 1f7ba20 a969459
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 17:44:43 2012 +0000

    Merge "update copyright, add version information to footer"

commit 1f7ba20f4b33f81536b7194348d7a960702ab19f
Merge: c94c9aa 5c39464
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 16:44:56 2012 +0000

    Merge "Remove empty setUp/tearDown methods"

commit c94c9aaab8e809ad0f4aefe72192cf9b7a8cb71f
Merge: 0681315 2fbab4b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 16:34:36 2012 +0000

    Merge "Call super class tearDown correctly"

commit 0681315df60385592004605eea6495c961f6f63c
Merge: 45146b3 c9aa0f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 16:18:24 2012 +0000

    Merge "Refactor spawn to use UndoManager."

commit 5c39464c50b39ca9545f46a48564e1b495fd2c45
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 00:08:25 2012 +0000

    Remove empty setUp/tearDown methods
    
    Python will call into the parent classes implementation of setUp/tearDown
    if there is no implementation in the child
    
    Also, make sure all setUp implementations subclassed off test.TestClass
    call the parent setUp so everything gets setup correctly
    
    Change-Id: If410cd412d9557a0d3172ec96b592fbd3fd67ffd

 .../compute/contrib/test_createserverext.py        |    7 -------
 .../compute/contrib/test_flavor_manage.py          |    3 ---
 .../compute/contrib/test_security_groups.py        |    6 ------
 .../compute/contrib/test_server_start_stop.py      |    3 ---
 .../compute/contrib/test_virtual_interfaces.py     |    3 ---
 .../api/openstack/compute/contrib/test_volumes.py  |    3 ---
 .../api/openstack/compute/contrib/test_vsa.py      |    6 ------
 nova/tests/api/openstack/compute/test_limits.py    |    5 +----
 .../api/openstack/compute/test_server_actions.py   |    4 +---
 nova/tests/api/openstack/volume/test_volumes.py    |    3 ---
 nova/tests/api/test_auth.py                        |    4 +---
 nova/tests/rpc/test_carrot.py                      |    3 ---
 nova/tests/rpc/test_fake.py                        |    3 ---
 nova/tests/rpc/test_kombu_ssl.py                   |    2 +-
 nova/tests/scheduler/test_host_manager.py          |    3 ---
 nova/tests/scheduler/test_least_cost.py            |   10 ----------
 nova/tests/test_SolidFireSanISCSIDriver.py         |    3 ---
 nova/tests/test_bdm.py                             |    6 ------
 nova/tests/test_compute.py                         |    6 ------
 nova/tests/test_consoleauth.py                     |    3 ---
 nova/tests/test_db_api.py                          |    3 ---
 nova/tests/test_nova_rootwrap.py                   |    3 ---
 nova/tests/test_signer.py                          |    3 ---
 nova/tests/test_xenapi.py                          |    3 ---
 24 files changed, 4 insertions(+), 94 deletions(-)

commit 2fbab4b6706fd2c4b2fecc05f653b3051aa2ffa2
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Mar 2 16:09:21 2012 +0000

    Call super class tearDown correctly
    
    Change-Id: I39dcf337f57a59cab1ad69a649505b588bfda87b

 nova/tests/test_policy.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 45146b337bba2cf1422b276a6988ee00e4c2e3c0
Merge: 27013e8 a6589d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 2 16:08:05 2012 +0000

    Merge "Remove unnecessary setting up and down of mox and stubout"

commit 37a392dc4ccb96e26865ffc3708f46d76488a5f8
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Wed Feb 29 15:50:14 2012 +0000

    Fixes bug 942556 and bug 944105
    
    Ensures the calls in the xenhost plugin work when the host is in
    a xenserver pool managed by the host aggregates feature.
    
    Change-Id: I51ca6b9f6d0e8d86d53afde5bf46cfabde17a44e

 nova/virt/xenapi_conn.py                           |   59 ++++++++++++--------
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   43 +++++++-------
 2 files changed, 55 insertions(+), 47 deletions(-)

commit a9694595a629baba10549e82a1bb73e972cef7d9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Mar 1 21:40:58 2012 -0800

    update copyright, add version information to footer
    
    Change-Id: Ic957de1d986f7df6193228aa0051bd93f75945ba

 doc/source/conf.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c9aa0f57b6200313ea1f6c3839d65828024e2d37
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 29 23:38:56 2012 +0000

    Refactor spawn to use UndoManager.
    
    UndoManager provides a mechanism for automatically rolling back on
    exceptions.  An additional benefit of this approach is that undo code is
    spatially close to the roll-forward code.
    
    This patch should be considered an intermediate step towards a more
    complete Command pattern based approach down the road.
    
    Change-Id: Ib429420d67324422a5d13cdea6872fd9c57c857e

 nova/tests/test_xenapi.py  |    3 +-
 nova/tests/xenapi/stubs.py |   24 +++-
 nova/utils.py              |   26 ++++
 nova/virt/xenapi/vmops.py  |  310 ++++++++++++++++++++++++--------------------
 4 files changed, 216 insertions(+), 147 deletions(-)

commit 27013e87f53cccbfd2e203f065e416437ba08987
Author: Mike Lundy <mike@pistoncloud.com>
Date:   Fri Mar 2 00:15:04 2012 +0000

    Fail gracefully when the db doesn't speak unicode
    
    When sqlalchemy/mysql doesn't contain the charset=utf8 or use_unicode=1
    parameters (and the default mysql connection charset is not utf8),
    sqlalchemy will connect to mysql in ascii mode; In ascii mode, it will
    attempt to reencode all input data to latin-1 regardless of the
    database/table collation setting. This catches that error and turns it
    into an invalid parameter.
    
    (The error message associated with this is something like
    UnicodeEncodeError: 'latin-1' codec can't encode character u'\u2026' in
    position 30: ordinal not in range(256))
    
    This fixes bug 944034 and is related to bug 898808
    
    Change-Id: I082b7568ef9e9d2104e13aa58d207535ef201bd3

 nova/api/openstack/wsgi.py |    3 +++
 nova/exception.py          |    7 +++++++
 2 files changed, 10 insertions(+)

commit a6589d313a30e304caac60fe9f1a64c390ae6fca
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 1 23:38:17 2012 +0000

    Remove unnecessary setting up and down of mox and stubout
    
    test.TestCase already sets up self.mox and self.stubs as well as calling
    self.mox.UnsetStubs(), self.stubs.UnsetAll(), self.stubs.SmartUnsetAll()
    and self.mox.VerifyAll() during tearDown.
    
    Change-Id: I74f0824ca1e8daa7b0ee7d7a62b226ba51206e6f

 .../compute/contrib/test_deferred_delete.py        |    4 --
 .../openstack/compute/contrib/test_snapshots.py    |    6 --
 .../openstack/compute/contrib/test_volume_types.py |    4 --
 .../api/openstack/compute/contrib/test_vsa.py      |    4 --
 nova/tests/api/openstack/compute/test_flavors.py   |    4 --
 nova/tests/api/openstack/compute/test_images.py    |   26 --------
 .../api/openstack/compute/test_server_actions.py   |    7 --
 nova/tests/api/openstack/compute/test_versions.py  |    2 -
 nova/tests/api/openstack/volume/test_types.py      |    4 --
 nova/tests/baremetal/test_proxy_bare_metal.py      |   67 +++++++-------------
 nova/tests/baremetal/test_tilera.py                |   31 ++++-----
 nova/tests/image/test_glance.py                    |    6 --
 nova/tests/notifier/test_list_notifier.py          |    1 -
 nova/tests/scheduler/test_distributed_scheduler.py |    1 -
 nova/tests/scheduler/test_host_manager.py          |   10 ---
 nova/tests/test_compute.py                         |    4 --
 nova/tests/test_crypto.py                          |    6 --
 nova/tests/test_network.py                         |    2 -
 nova/tests/test_notifier.py                        |    7 --
 nova/tests/test_nova_manage.py                     |   12 ----
 nova/tests/test_utils.py                           |    1 -
 nova/tests/test_volume.py                          |    4 --
 nova/tests/test_vsa.py                             |    6 --
 nova/tests/test_vsa_volumes.py                     |    1 -
 nova/tests/test_xenapi.py                          |   23 -------
 25 files changed, 36 insertions(+), 207 deletions(-)

commit 20346926533a6ef6f4cd1ddf4e4123ecefbabc72
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 1 23:01:34 2012 +0000

    Remove unnecessary variables from tests
    
    Change-Id: Id83ea12ee89ee6511277aa2f0929f9bedb8f638b

 nova/tests/api/ec2/test_cloud.py                   |    1 -
 .../compute/contrib/test_admin_actions.py          |    2 --
 .../api/openstack/compute/contrib/test_keypairs.py |    3 ---
 .../openstack/compute/contrib/test_multinic_xs.py  |    2 --
 .../api/openstack/compute/contrib/test_networks.py |    2 --
 .../api/openstack/compute/contrib/test_quotas.py   |    8 --------
 .../compute/contrib/test_server_action_list.py     |    3 +--
 .../compute/contrib/test_server_diagnostics.py     |    3 +--
 .../compute/contrib/test_server_start_stop.py      |    2 --
 .../compute/contrib/test_virtual_interfaces.py     |    1 -
 .../api/openstack/compute/contrib/test_vsa.py      |    4 ----
 nova/tests/api/openstack/compute/test_flavors.py   |    1 -
 nova/tests/api/openstack/compute/test_images.py    |    1 -
 nova/tests/api/openstack/compute/test_limits.py    |    7 -------
 .../api/openstack/compute/test_server_actions.py   |    3 ---
 nova/tests/api/openstack/compute/test_servers.py   |   14 +-------------
 nova/tests/api/openstack/compute/test_versions.py  |    2 --
 nova/tests/baremetal/test_proxy_bare_metal.py      |    2 --
 nova/tests/test_SolidFireSanISCSIDriver.py         |    2 --
 nova/tests/test_access.py                          |    1 -
 nova/tests/test_compute.py                         |    3 ---
 nova/tests/test_libvirt.py                         |    4 ----
 nova/tests/test_log.py                             |    1 -
 nova/tests/test_nova_manage.py                     |    1 -
 nova/tests/test_vmwareapi.py                       |    2 --
 nova/tests/test_volume.py                          |    1 -
 nova/tests/test_volume_types.py                    |    2 --
 27 files changed, 3 insertions(+), 75 deletions(-)

commit ff716dee035dd51257b240fad842ecfd70d9d90d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 1 14:51:03 2012 -0800

    Ensure image status filter matches glance format
    
    * Fixes bug 943259
    
    Change-Id: Id5172aa40be2f5a337b3e192b4bee8139c16c4d3

 nova/api/openstack/compute/images.py            |    5 +++++
 nova/tests/api/openstack/compute/test_images.py |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 7428cf5bc53c7630510644fee4ff20bb392f1331
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Mar 1 12:59:54 2012 -0800

    fix for bug 821252.  Smarter default scheduler
    
    compute_scheduler_driver = DistributedScheduler
    
    Change-Id: I8123a120afd80c2b088a387eaab8f5a99a877fe0

 nova/scheduler/filters/ram_filter.py        |    2 +-
 nova/scheduler/multi.py                     |    3 ++-
 nova/tests/api/ec2/test_cloud.py            |    2 ++
 nova/tests/fake_flags.py                    |    1 +
 nova/tests/integrated/integrated_helpers.py |    2 ++
 nova/tests/scheduler/test_host_filters.py   |    1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

commit d65a4e4023e9994c8a14a1da4aa4eeb4f6452640
Merge: 07ca6f6 1ea445c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 1 22:38:41 2012 +0000

    Merge "blueprint sphinx-doc-cleanup bug 944381"

commit 07ca6f64de76b5955c233b830122877dc07df142
Merge: 34d50ed f1bf466
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 1 22:28:05 2012 +0000

    Merge "Minor cleanup based on HACKING"

commit 1ea445c377d25970cb73f5f35004e02c5e066ca4
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Thu Mar 1 16:51:21 2012 -0500

    blueprint sphinx-doc-cleanup
    bug 944381
    
    Add logic to generate_autodoc_index.sh to produce rst underlines to match the heading strings.
    
    Change-Id: Ib0f54a45fcc4ab6dfaa593c756682f1a25fdb420

 Authors                       |    1 +
 doc/ext/nova_autodoc.py       |    1 +
 doc/generate_autodoc_index.sh |   11 +++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

commit 2efb017a06afeb10b474245455310ec21601a701
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 29 17:29:02 2012 -0800

    Adds soft-reboot support to libvirt
    
     * Falls back to hard reboot if guest doesn't respond
     * Cleans up reboot/rescue/unrescue interaction
     * Fixed fake for tests
     * Added a force hard reboot test to verify fallback works
     * Fixes bug 939557
    
    Change-Id: I8d0c9a35725de5e5bfb8f13a2d869c6122ba44ef

 nova/tests/fakelibvirt.py       |    6 +++-
 nova/tests/test_virt_drivers.py |    4 +++
 nova/virt/libvirt/connection.py |   63 ++++++++++++++++++++++++++++++++-------
 3 files changed, 62 insertions(+), 11 deletions(-)

commit 34d50ed65fc6f68fa5efb524ab4d82eea8e499f0
Merge: 04d8721 7dde170
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 1 21:57:48 2012 +0000

    Merge "Remove unused imports and variables from OS API"

commit 04d8721211614d4df2c3cf53db6ed89bd2f296a1
Merge: 04e57f1 aff4a39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 1 21:47:33 2012 +0000

    Merge "notifications for delete, snapshot and resize"

commit f1bf4661ff1e1938a5bc1ef55ccec99cae4f2af7
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Feb 29 23:06:09 2012 -0800

    Minor cleanup based on HACKING
    
    Change-Id: I59f02c33c3ecb0c446755a07562060a12f85e177

 .../compute/contrib/simple_tenant_usage.py         |   22 +++++++++++---------
 nova/image/glance.py                               |    4 ++--
 nova/network/quantum/melange_ipam_lib.py           |    9 ++++----
 nova/notifier/list_notifier.py                     |    4 ++--
 .../api/openstack/compute/contrib/test_users.py    |   11 ++++++----
 nova/tests/api/openstack/fakes.py                  |   17 ++++++++-------
 nova/tests/scheduler/test_distributed_scheduler.py |    3 ++-
 nova/tests/test_misc.py                            |    5 ++---
 nova/tests/test_utils.py                           |    3 ++-
 9 files changed, 43 insertions(+), 35 deletions(-)

commit 04e57f169646dff5309177ce5dfa444f668bf8a1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Mar 1 11:52:33 2012 -0800

    libvirt driver calls unplug() twice on vm reboot.
    
    bug 944168
    
    Also prevents OVS vif plugging driver from raising an exception
    if deleting the OVS port fails.  We already log an error and
    print the exception, and there's
    no reason that failing to delete the OVS port should cause the whole operation
    to fail.
    
    Change-Id: I01c22ab8627762831a106b407f758f6592363f33

 nova/virt/libvirt/connection.py |    1 -
 nova/virt/libvirt/vif.py        |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

commit fc0f5bdc15d41dbed489a9a4fcbc6149672065b7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Mar 1 19:02:26 2012 +0000

    Add missing format string type on some exception messages
    
    Change-Id: I21929456eeb142cb5e28899bbf308b47192adf41

 nova/exception.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit b9ad66139f1e1adb079c5c5cb0d41979bd879669
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 1 17:30:55 2012 +0000

    Fixing a request-id header bug
    
    The request-id header was only showing up in 2XX responses. It did not
    show up in error responses, which is when it would be most helpful.
    
    Change-Id: Ie20894b7040cc831ab8fb3088378702033bc01a2

 nova/api/openstack/wsgi.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 777af73adde217a13fb7cf5237cdcda883b5546d
Merge: 29d021b a8b1148
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 1 17:25:14 2012 +0000

    Merge "sm vol driver: Fix regression in sm_backend_conf_update"

commit 5671515f693c90b68f784748843a07214880a1f8
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 23 15:51:48 2012 -0500

    Test creating a server with metadata key too long.
    
    Related to bug 917484.
    
    This bug reported that the OpenStack API returned the wrong type of
    error when creating an instance with a metadata key that was too long.
    I added this unit test to try it out and it appears to work as expected,
    so might as well just keep the test around.
    
    Change-Id: Ie4bcf81741a268fd8319e1ecaad5639ad8c9b6f7

 nova/tests/api/openstack/compute/test_servers.py |   30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 29d021ba9063a9db16b29a327af9581b58a8e2f7
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Feb 29 17:07:39 2012 -0600

    Fixes lp931801 and a key_error
    
    The quantum manager should log the errors it
    receives from quantum, even when charging ahead
    with the deletes.
    
    update: pep8 and less some testing code
    update: checking log is called and consolidate
            error messages
    
    Change-Id: I8f533e8e54c5e4487614a61a73d9c8e2e756058d

 nova/network/quantum/manager.py |   11 +++++------
 nova/tests/test_quantum.py      |   30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

commit aff4a399ec7fc480c8359d0df40304049ff44d79
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 29 08:03:11 2012 -0800

    notifications for delete, snapshot and resize
    
    Change-Id: I67a6d190afde915551acd5bdf80ace8b666e27ef

 nova/compute/manager.py    |   24 ++++++++++++++++++++++++
 nova/tests/test_compute.py |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

commit 05958d176cd9438c2fd5028256260f9f9ae9ff20
Merge: 8738309 14f1536
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 22:58:31 2012 +0000

    Merge "Be consistent with disabling periodic tasks."

commit 873830948c19012931a5b220f7e7f1089149b538
Merge: 07c85f5 ff95c90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 22:48:08 2012 +0000

    Merge "Ensure that context read_deleted is only one of 'no', 'yes' or 'only'"

commit 07c85f5a835a93a2b4a828510a09adbc30505761
Merge: 3b241d2 52bb427
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 22:38:00 2012 +0000

    Merge "register Cell model, not Zone model"

commit 3b241d2b5889f2bc8b9c05f205c4ff848375a508
Merge: 362d780 42a0d3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 22:07:32 2012 +0000

    Merge "Option expose IP instead of dnshost in ec2 desc'"

commit ff95c90f51d1d1e70a247cb7e94bb7cb757ac37d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 29 21:52:01 2012 +0000

    Ensure that context read_deleted is only one of 'no', 'yes' or 'only'
    
    Fixes bug 942690
    
    Change-Id: I1b1867062a8af7b3fb0eb575e6b9570a964cfefa

 nova/compute/manager.py    |    2 +-
 nova/context.py            |    4 ++++
 nova/tests/test_context.py |   13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

commit 362d78069d9c15ab765806dea72b512e4f71cf5c
Merge: eb9b2b6 fe33216
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 21:57:32 2012 +0000

    Merge "Remove old ratelimiting code"

commit 52bb427171e430877fb6c3abd87e726fb03fe9f0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Feb 29 21:40:30 2012 +0000

    register Cell model, not Zone model
    
    A rename was missed when registering sqlalchemy models.
    
    Change-Id: I11b1318ebd26a4a98627509cf194de6080192da7

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eb9b2b6e0eb3e24569ad5dd7808ad22d5049c924
Merge: dffef53 8a143d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 21:37:10 2012 +0000

    Merge "Fix _sync_power_states to obtain correct 'state'."

commit dffef53503a30eab271639ce06366cec2af1ecbe
Merge: 0e5b7f5 b6a1756
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 21:05:55 2012 +0000

    Merge "Destroy VM before VDIs during spawn cleanup"

commit 0e5b7f5f4dfc73beddce322e470622522d5c1d0e
Merge: 99233ac c8b0a9a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 20:54:03 2012 +0000

    Merge "Ensures that keypair names are only AlphaNumeric."

commit 42a0d3a4b0e7228a28675fc6a6315654914f8c10
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Wed Feb 29 13:48:56 2012 +0000

    Option expose IP instead of dnshost in ec2 desc'
    
    As documented in bug 901594, previous nova releases, the IP address
    was exposed as the DNS hostname, which worked well with euca-tools.
    This is unfortunately not always ideal for private clouds.
    
    Whilst it is expected to be able to euca-describe-instances --ipv4
    in newer euca2ools releases, this behaviour is not always desired.
    
    This patchset allows the nova admin to set a global flag of:
    --ec2_private_dns_show_ip=True, to restore legacy nova behaviour.
    
    This does not change the current default behaviour of nova.
    
    Change-Id: I7c71ffe63929d90d45d9c724ab3409dcdee52b44

 .mailmap                 |    1 +
 Authors                  |    2 +-
 nova/api/ec2/__init__.py |    4 ++++
 nova/api/ec2/cloud.py    |    5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

commit 99233ace206a2c74bfccebc5739e1553c4adcefe
Merge: 3c67029 3b7fa6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 20:32:08 2012 +0000

    Merge "Adds netapp volume driver"

commit 3c67029a62a02bd7d8768083328833e9119e1a55
Merge: e73a0bc 5bcbb65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 20:22:05 2012 +0000

    Merge "Add missing filters for new root commands"

commit e73a0bc048ff08b1f7cfdb113803c34121951419
Merge: 9540a8c fd915aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 19:59:50 2012 +0000

    Merge "Cast vcpu_weight to string before calling xen api"

commit 8a143d3a5ba4f2b2cd1c8a0a95cb0233083d0f8a
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Feb 29 14:51:13 2012 -0500

    Fix _sync_power_states to obtain correct 'state'.
    
    Update the compute manager to obtain state from the get_info
    dict correctly.
    
    Fixes 'dict' object has no attribute 'state' error that occur
    when syncing power states.
    
    Fixes LP Bug #934276.
    
    Change-Id: I3e3602018f4c38f78b48186bfca78eda362a9e54

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9540a8c2913bb0efc59d34c5f72022dffa9dcb0a
Merge: f38281d 067f0a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 19:49:44 2012 +0000

    Merge "Initialize progress to 0 for build and resize."

commit c8b0a9a3be7ca276d91d470a629fdd0209812993
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Sun Feb 26 22:23:30 2012 -0600

    Ensures that keypair names are only AlphaNumeric.
    
    Throws a 400 error if keypair contains any unsafe characters.
    
    Safe characters are '_-', digits, and ascii_leters.
    
    Added test_keypair_create_with_non_alphanumeric_name.
    
    Fixes bug 937408.
    
    Change-Id: If9b1393ee8f36113d2fa8a3b97ca526cc2e6ccf1

 nova/api/openstack/compute/contrib/keypairs.py     |   10 ++++++++++
 .../api/openstack/compute/contrib/test_keypairs.py |   14 ++++++++++++++
 2 files changed, 24 insertions(+)

commit fd915aa78d8fbc09395c77ca84728b361edab416
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Feb 29 13:54:27 2012 -0500

    Cast vcpu_weight to string before calling xen api
    
    Fixes bug 943490
    
    - style changes per s1rp
    
    Change-Id: If6444aa0bff35c54c6c3d57f97507b16b1e27d6a

 nova/virt/xenapi/vmops.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f38281d60c033b61f30aff2ad05ed4b87d1f6ade
Merge: 5f44c8f 65a7a67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 19:31:43 2012 +0000

    Merge "Perform image show early in the resize process"

commit 5bcbb65f3c0383a22ebb749a9251f689755e464c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Feb 29 16:22:42 2012 +0100

    Add missing filters for new root commands
    
    Add missing rootwrap filters for 'ovs-ofctl', 'cp' and 'mkfs'.
    Do not run 'rm' as root since it's unnecessary.
    Add documentation to try to prevent future misses.
    Fixes bug 943293.
    
    Change-Id: Ia680048a28a75f661a136d8447ff0aaf195649ba

 nova/rootwrap/compute.py |    9 +++++++++
 nova/rootwrap/network.py |    3 +++
 nova/utils.py            |    2 ++
 nova/virt/disk/api.py    |    4 ++--
 4 files changed, 16 insertions(+), 2 deletions(-)

commit b6a175664042dfd486fa6217b5e199a46dacefb6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 29 18:39:13 2012 +0000

    Destroy VM before VDIs during spawn cleanup
    
    Fixes bug 943453
    
    Change-Id: I65fd4c61f9f91abeb04d0d1956506a1c69cef72e

 nova/virt/xenapi/vmops.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 5f44c8f86691649fb4e0f1e21e71544234d674a8
Merge: f0bef90 0c483d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 19:04:20 2012 +0000

    Merge "Add lun number to provider_location in create_volume * Fixes bug 938876"

commit f0bef902d13ecc55e21166eb9acc8d9ef0864f88
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 29 12:05:28 2012 -0600

    Include hypervisor_hostname in the extended server attributes.
    
    Change-Id: I5424ee3defea76ac4cdbfcf6fe8675aad8e66c7a

 .../compute/contrib/extended_server_attributes.py  |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit e85b6bc5c758cc59a4c466ac47e81a4260b7d62c
Merge: 0ab9f2c 8bc87c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 18:05:48 2012 +0000

    Merge "Provide retry-after guidance on throttled requests"

commit fe332168aeb788fbd0ef60b8b3eeb5f9a6375a46
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Feb 29 09:45:30 2012 -0800

    Remove old ratelimiting code
    
    This code hasn't been modified in 8 months and isn't used anywhere.
    
    Change-Id: I55d641095fb9a8541a1e86939a33b4d0e9c492a5

 doc/source/code.rst                                |    1 -
 doc/source/devref/api.rst                          |   17 --
 .../api/openstack/compute/ratelimiting/__init__.py |  222 --------------------
 3 files changed, 240 deletions(-)

commit 65a7a677c0b1956268939637e384f82ef16cd412
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Feb 24 08:52:51 2012 -0500

    Perform image show early in the resize process
    
    This change addresses bug 943421 by performing glance interactions
    much earlier in the resize process. This prevents token expiration
    from breaking resizes.
    
    - added a comment to the compute api change to give some context and
      help prevent regression on this bug
    
    Change-Id: I21619f9f6189d5bdec64de47988985cbc3b8016d

 nova/compute/api.py        |    6 +++++-
 nova/compute/manager.py    |   24 +++++++++++++-----------
 nova/tests/test_compute.py |   32 ++++++++++++++++----------------
 3 files changed, 34 insertions(+), 28 deletions(-)

commit 0ab9f2cbaee13207d41e1475bc19e70db7046113
Merge: 36100f6 e3530a0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 16:55:35 2012 +0000

    Merge "Include launch_index when creating instances."

commit 3b7fa6b605703b2378559ff95dd151417f61f288
Author: Rob Esker <esker@netapp.com>
Date:   Fri Feb 24 09:43:59 2012 -0600

    Adds netapp volume driver
    
     * includes a fake implementation of the netapp soap api
     * implements blueprint netapp-volume-driver
    
    Change-Id: I8e2781e8bd4a552354f46a32c4a7ecdfd19f3e7a

 Authors                   |    2 +
 nova/tests/test_netapp.py |  929 +++++++++++++++++++++++++++++++++++++++++++++
 nova/volume/netapp.py     |  676 +++++++++++++++++++++++++++++++++
 3 files changed, 1607 insertions(+)

commit 6857fd2d952e5602a227a5f24173c75ba3e70f7b
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Wed Feb 29 11:28:12 2012 +0000

    Fixes bug 943188
    
    Enusre when an aggregate is re-created, it is in the created state,
    not just the state it was when last created.
    
    Change-Id: Ie8d63e3d334a872d52d81a9bd66730f08323d5c9

 nova/compute/api.py       |    2 --
 nova/db/sqlalchemy/api.py |    9 +++++----
 nova/tests/test_db_api.py |    3 +++
 3 files changed, 8 insertions(+), 6 deletions(-)

commit 7dde170529574c9862e3f2149f8cd79cebce9a6c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Feb 29 08:12:38 2012 +0000

    Remove unused imports and variables from OS API
    
    Also spotted and fixed a bug in multinic compute extension (extension.*
    was typoed as extensions.*)
    Also noted a potential bug in 'virtual_storage_arrays' extension
    
    Change-Id: Iee2f67b13b3e321f8de3df5684c1c9eb13db95eb

 nova/api/openstack/auth.py                         |    3 +--
 nova/api/openstack/common.py                       |    2 --
 .../api/openstack/compute/contrib/admin_actions.py |   14 +++++++-------
 nova/api/openstack/compute/contrib/consoles.py     |    2 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |    1 -
 nova/api/openstack/compute/contrib/floating_ips.py |    2 +-
 nova/api/openstack/compute/contrib/multinic.py     |    2 +-
 .../openstack/compute/contrib/security_groups.py   |    2 +-
 .../compute/contrib/simple_tenant_usage.py         |    2 --
 .../compute/contrib/virtual_storage_arrays.py      |    2 ++
 nova/api/openstack/compute/images.py               |    1 -
 nova/api/openstack/compute/server_metadata.py      |    8 ++------
 nova/api/openstack/compute/servers.py              |    4 ++--
 nova/api/openstack/extensions.py                   |    5 +----
 nova/api/openstack/wsgi.py                         |    2 +-
 nova/api/openstack/xmlutil.py                      |    1 -
 nova/scheduler/api.py                              |    5 +++--
 17 files changed, 23 insertions(+), 35 deletions(-)

commit 36100f6f99b317ef9f10f101f7cecfb1639255a8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 28 17:11:05 2012 -0800

    Return empty list when volume not attached
    
    * The api used to return a list of a single empty dict
    * Fixes bug 942990
    
    Change-Id: I9926515acfcedf711e81615aa13cec0bbf968086

 nova/api/openstack/volume/volumes.py            |    6 ++--
 nova/tests/api/openstack/fakes.py               |   42 +++++++++++++----------
 nova/tests/api/openstack/volume/test_volumes.py |   22 ++++++++++++
 3 files changed, 48 insertions(+), 22 deletions(-)

commit 9a6dfec8276520a200cd7dfa4e7e2997ffeb45d6
Merge: c11625b 5ab7378
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 05:19:05 2012 +0000

    Merge "Cast volume-related ids to str"

commit c11625b3eac009c56647cc5562c0825c622808ef
Merge: 2fa6e23 43f2492
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 29 04:58:26 2012 +0000

    Merge "Fix for bug 942896: Make sure network['host'] is set"

commit 14f1536ff3d5591dd4aa10535ff1e4b01d95507e
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Feb 29 11:11:57 2012 +1100

    Be consistent with disabling periodic tasks.
    
    Other periodic tasks use an interval of zero to signal that they are
    disabled. Use that for the libvirt image cache manager as well.
    
    Change-Id: I12fddd52fe587d3975004c696c65dae5427498fa

 nova/compute/manager.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 5ab7378357312a8f326bf82cf2b6076d14b53d6b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 28 17:48:49 2012 -0800

    Cast volume-related ids to str
    
    * This is preparing the interface for uuids
    * Fixes bug 943006
    
    Change-Id: I7d27506118a830ae7257755032354ae7411567d3

 nova/api/openstack/volume/snapshots.py            |    5 +++--
 nova/api/openstack/volume/types.py                |    2 ++
 nova/api/openstack/volume/volumes.py              |   13 ++++++++---
 nova/tests/api/openstack/volume/test_snapshots.py |   13 ++++++-----
 nova/tests/api/openstack/volume/test_types.py     |    1 +
 nova/tests/api/openstack/volume/test_volumes.py   |   24 ++++++++++-----------
 nova/tests/integrated/test_volumes.py             |   12 +++++------
 7 files changed, 40 insertions(+), 30 deletions(-)

commit 43f2492175d11a3f8ea4198e65b2a6a6b38cbbb6
Author: Brad Hall <brad@nicira.com>
Date:   Tue Feb 28 13:57:01 2012 -0800

    Fix for bug 942896: Make sure network['host'] is set
    
    The floating ip mixin requires network['host'] to be set.  We now set it
    during create_network and also update it at startup time to make sure it is
    set.
    
    Change-Id: Ide0fe265d08a2ef322d9f7b6bfed5ba8b510c246

 nova/network/quantum/manager.py |   19 ++++++++++++++++---
 nova/tests/test_quantum.py      |   17 +++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

commit 2fa6e23e9cefb8e45bd5a6cec36b1ac6b7ac65c3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 28 16:18:53 2012 -0800

    Allow xvd* to be supplied for volume in xenapi
    
    * Fixes bug 942880
    
    Change-Id: I7d0817051b837e3ba17f4edd8c47fd2c730c9822

 nova/tests/test_xenapi.py        |   22 ++++++++++++++++++++++
 nova/virt/xenapi/volume_utils.py |    4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

commit 067f0a2d2971ab64ee6fa6f3689fc1158471af18
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 28 23:14:01 2012 +0000

    Initialize progress to 0 for build and resize.
    
    Fixes bug 942956
    
    Change-Id: I65031bcd61b49bcae9bd886d7a9f070cba5caad0

 nova/compute/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 315a45a35bd577129a49c4c3b08a1319f7d2e9a6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Feb 28 16:09:28 2012 -0500

    Fix issue starting nova-compute w/ XenServer
    
    In a fresh-install environment, nova-compute will fail to start
    due to missing record in compute_nodes table. I have moved the
    db update to be included in the update_available_resources function.
    
    Fixes bug 942893
    
    Change-Id: I4b4f6a493ef0bbe81224c7408d0985e14fa9f1bc

 nova/virt/xenapi_conn.py |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

commit e5ad06a8be11041f271cb9f727deb109e0413410
Merge: 0b99bc2 3f42e11
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 20:48:09 2012 +0000

    Merge "Make scheduler filters more pluggable"

commit 0b99bc205c8ea2a7b1be7edd5d2498cfa7bfece6
Merge: 1ea9986 9f7595a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 20:37:22 2012 +0000

    Merge "Fixes bug 942549"

commit 8bc87c62a118c75a6cbf69c0edfa3ba5acbf3950
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Tue Feb 28 20:22:19 2012 +0000

    Provide retry-after guidance on throttled requests
    
    Fixes bug 942874
    
    Guide the caller's redrive strategy with a Retry-After hint in
    the 413 response emitted when rate limits are exceeded.
    
    The simplest format of Retry-After is used, i.e. number of seconds
    as opposed to a HTTP time string.
    
    Change-Id: I8b1a28f964a111008b1a88d9c0f96c5a0abd8314

 nova/api/openstack/wsgi.py                      |   12 +++++++++++-
 nova/tests/api/openstack/compute/test_limits.py |    4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

commit 1ea998649058f78f63a167dd697cf5f6732596ff
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Feb 28 10:55:38 2012 -0500

    Use constant time string comparisons for auth.
    
    Fix bug 942644.
    
    Use constant time string comparisons when doing authentication to help
    guard against timing attacks.
    
    Change-Id: Iaaefb13f7618b06834630d9ccb97aff056b4bf4c

 nova/api/openstack/auth.py |    2 +-
 nova/auth/manager.py       |    6 +++---
 nova/tests/test_utils.py   |    5 +++++
 nova/utils.py              |   20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

commit f9d23c69e25a2ce5e8c3a37d1e771d02c43cbfb5
Merge: 8e9f7f0 78df211
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 19:38:06 2012 +0000

    Merge "Rename zones table to cells and Instance.zone_name to cell_name"

commit 8e9f7f0e739872cda81137addb562a3823a1f997
Merge: d034c78 3047510
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 19:27:44 2012 +0000

    Merge "Ensure temporary file gets cleaned up after test"

commit d034c7838e2bb22a9451446e922eb67e78aba7b1
Merge: 9d6d72d 6e6ef55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 19:17:07 2012 +0000

    Merge "OS X Support fixed, bug 942352"

commit 78df2115035cba78c9a3e31d23abe04a8d497fb0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Feb 28 08:20:25 2012 +0000

    Rename zones table to cells and Instance.zone_name to cell_name
    
    Vish made an executive decision to use the term 'Cell' to refer to the
    former 'Zone'.  :)  This fixes up the core code required for the future
    Cells branch.
    
    Change-Id: Iff0fb01f0c2862a646bfb2d3fd4e218f1d2b7a93

 nova/db/api.py                                     |   30 +++++++--------
 nova/db/sqlalchemy/api.py                          |   40 ++++++++++----------
 .../migrate_repo/versions/082_zone_to_cell.py      |   35 +++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   10 ++---
 nova/exception.py                                  |    6 +--
 5 files changed, 78 insertions(+), 43 deletions(-)

commit 9d6d72deb0b9241b924909e86ec9a54aacda4bf4
Merge: 85f844c 63980c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 19:06:49 2012 +0000

    Merge "Add NoopFirewallDriver"

commit 30475107888b849d50a34e0857bef89238159bc2
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 28 16:53:00 2012 +0000

    Ensure temporary file gets cleaned up after test
    
    Change-Id: Ia70dcddedd9bffcf55c266f93052fe37aca98260

 nova/tests/test_policy.py |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

commit 9f7595aa0f464dc7344e0639951ea731dcfbeca5
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Tue Feb 28 18:14:25 2012 +0000

    Fixes bug 942549
    
    Ensure a more meaninful error is reported when an aggregate is created in a
    non-exsistent availability zone.
    
    Change-Id: I15ea6c884bb6f326df1d88019ee0ecf070196d1e

 nova/api/openstack/compute/contrib/aggregates.py   |    3 ++-
 .../openstack/compute/contrib/test_aggregates.py   |   11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

commit 85f844c26e1a51665891ede3e5696d13433a7c59
Merge: 5b9fc41 d99b12c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 17:01:59 2012 +0000

    Merge "Do not hit the network_api every poll"

commit 5b9fc411db9c7781e16da170ab2837b009d6aae6
Merge: 6f1eb77 44067ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 16:09:45 2012 +0000

    Merge "Call detach_volume when attach fails"

commit 6f1eb773befe81a22bb9e2d4da87cd1da598f96e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Feb 28 10:08:44 2012 -0500

    Use assertDictMatch to keep 2.6 unit tests passing
    
    Change-Id: I5cdcbeec8bd36250e6d6dff34b2bbbd12f10d280

 .../openstack/compute/contrib/test_cloudpipe.py    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f8163bb28136698fb9f65bd003b4feb9dd08d4f
Merge: d2bb5db 0c2ce39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 15:04:30 2012 +0000

    Merge "Handle case where instance['info_cache'] is None"

commit d2bb5db9fa308cd98a26a4a9629410ad43d1a109
Merge: 54956b2 fab893f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 14:54:39 2012 +0000

    Merge "TypeError API exceptions get logged incorrectly"

commit 0c2ce3980459526a01696b63ea5d5294987ad19b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Feb 28 07:53:29 2012 +0000

    Handle case where instance['info_cache'] is None
    
    Fixes bug 942443
    
    Change-Id: I77c3495d1de0a9b73acc576dd0638b430a4ce16e

 nova/api/ec2/ec2utils.py     |    3 ++-
 nova/api/openstack/common.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 54956b21387327f2731bf935db76678b298fa77a
Merge: b793dd9 8da178d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 09:17:18 2012 +0000

    Merge "Fixes cloudpipe extension to work with keystone"

commit 60afa733c176f790e31653940ddd1c0f20906dac
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Mon Feb 27 15:38:01 2012 -0800

    sm volume driver: fix backend adding failure
    
    Fixes bug 915085
    
    Change-Id: I908d2090815a90bae479d5caf8516e52fd879c8e

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8b1148a5424cc29269009460941386a68f2366f
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed Jan 11 17:10:24 2012 -0800

    sm vol driver: Fix regression in sm_backend_conf_update
    
    Fixes bug 915108
    
    Change-Id: Iffa9a1a51f6e9da0cba9fdae373135ea6a70990f

 nova/db/sqlalchemy/api.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit b793dd9b870438d8f9936fa9216a023e8dc1f052
Merge: e9b627a f0d5df5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 07:38:57 2012 +0000

    Merge "Add utils.tempdir() context manager for easy temp dirs"

commit fab893f333fa80567ef12f6817d52459b28c84a4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Feb 28 07:34:08 2012 +0000

    TypeError API exceptions get logged incorrectly
    
    Fixes bug 942431
    
    LOG.exception() always logs sys.exc_info() which does not always
    represent the real exception we want to log.  This changes the wsgi
    ResourceExceptionHandler context manager to LOG.error() the traeback
    info that's passed to __exit__()
    
    Change-Id: I0c3728a9ee740597feb828a513aea76e7849efc6

 nova/api/openstack/wsgi.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 63980c7ed130025bd3d2638672c7b7e13cdae1bc
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Feb 28 06:35:49 2012 +0000

    Add NoopFirewallDriver
    
    It is possible that the firewall is managed by an external network
    service, therefore we need a firewall driver which does nothing.
    
    Change-Id: Icfda92534421fa908b398acd8a811c01d4bc3dbd

 nova/virt/firewall.py        |   12 ++++++++++++
 nova/virt/xenapi/firewall.py |    1 +
 2 files changed, 13 insertions(+)

commit f0d5df523b982ef1737dc0ee2e698b13041af64c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 28 05:54:48 2012 +0000

    Add utils.tempdir() context manager for easy temp dirs
    
    Fixes bug 883323 (and others)
    
    Users of tempfile.mkdtemp() need to make sure the directory is cleaned
    up when it's done being used. Unfortunately, not all of the code does
    so at all, or safely (by using a try/finally block).
    
    Change-Id: I270109d83efec4f8b3dd954021493f4d96c6ab79

 nova/auth/manager.py            |   77 +++++++------
 nova/cloudpipe/pipelib.py       |   63 ++++++-----
 nova/compat/flagfile.py         |    2 +
 nova/crypto.py                  |  104 ++++++++----------
 nova/tests/test_crypto.py       |   19 +---
 nova/tests/test_imagecache.py   |  232 ++++++++++++++++-----------------------
 nova/tests/test_libvirt.py      |   36 +++---
 nova/utils.py                   |   14 +++
 nova/virt/libvirt/connection.py |   33 +++---
 nova/virt/xenapi/vm_utils.py    |    7 +-
 10 files changed, 261 insertions(+), 326 deletions(-)

commit bf5ce18c337d1ee1fb6cfb0e17115da97ebc5912
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Tue Feb 28 13:21:33 2012 +0800

    Check all migrations have downgrade in test_misc
    
    Fixes bug #942406
    
    Change-Id: Ifbc74c12a4c58d4e2117295c088051062a0b3b1c

 nova/tests/test_misc.py |   26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

commit e9b627a1c8203e5316067e79ab2a008b43b97656
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 28 04:26:48 2012 +0000

    Remove monkey patching in carrot RPC driver
    
    It's already handled more appropriately by nova/testing/runner.py and
    by the individual executables in bin
    
    Change-Id: I8a0dcc699a859ce78575b0c3d2b9dc8faea0b847

 nova/rpc/impl_carrot.py |    3 ---
 1 file changed, 3 deletions(-)

commit 44067ba758b378c4c2c2ff88b0d1b7a3c27ac812
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Feb 27 17:37:57 2012 -0800

    Call detach_volume when attach fails
    
    * Fixes bug 914974
    * Raise exception.DeviceBusy when volume cannot attach
    
    Change-Id: Ie18377ba6acd6226612c70fa209185cc579c2d85

 nova/exception.py               |    4 ++++
 nova/virt/libvirt/connection.py |   13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

commit d99b12c085e858b9d805f41bdb4f1a6b555bf24e
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Feb 23 23:37:16 2012 -0600

    Do not hit the network_api every poll
    
    * Store only the mac address in the bw cache
    * Gather bw records by the list of macs from an instance
    * Fixed LP940069
    
    Change-Id: I58ccb314d1fcd218ddd0bbd7857223e6435952fb

 nova/compute/manager.py                            |    5 --
 nova/compute/utils.py                              |    7 +-
 nova/db/api.py                                     |    6 +-
 nova/db/sqlalchemy/api.py                          |    7 +-
 .../versions/081_drop_instance_id_bw_cache.py      |   69 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 -
 6 files changed, 77 insertions(+), 18 deletions(-)

commit 6e6ef5589e8898f898b0d986db90e1e2356e889f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Feb 27 17:20:21 2012 -0800

    OS X Support fixed, bug 942352
    
    Change-Id: I3aa28ba46b0418310637dfeacbdea60361a7a280

 nova/tests/test_utils.py |    2 +-
 nova/utils.py            |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 3f42e11ca0dfedf07f50f4d5e1805914230e5edc
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Feb 24 00:01:57 2012 +0000

    Make scheduler filters more pluggable
    
    Filters are supposed to be pluggable, but they are not, since you have
    to modify __init__.py.
    
    This adds a --scheduler_availabile_filters setting which replaces the
    hardcoding in __init__.py.  This setting is a MultiStr (a list, which
    you can specify more than once) containing the full paths to filter
    classes to make available to the scheduler.  Using a value of
    'nova.scheduler.filters.standard_filters' maps to all standard filters
    included in nova under nova.scheduler.filters.  This is the default
    setting and matches what was in __init__.py before.
    
    Also renamed --default_host_filters to --scheduler_default_filters to
    make the flag a bit more clear.
    
    Change-Id: I10eb54e9982b6d42316adfb2cc2600b44a9c3bdf

 doc/source/devref/distributed_scheduler.rst        |   27 +++--
 nova/scheduler/filters/__init__.py                 |   96 ++++++++++++-----
 nova/scheduler/filters/abstract_filter.py          |   25 -----
 nova/scheduler/filters/affinity_filter.py          |    4 +-
 nova/scheduler/filters/all_hosts_filter.py         |    4 +-
 nova/scheduler/filters/availability_zone_filter.py |    4 +-
 nova/scheduler/filters/compute_filter.py           |    4 +-
 nova/scheduler/filters/core_filter.py              |    4 +-
 nova/scheduler/filters/isolated_hosts_filter.py    |    4 +-
 nova/scheduler/filters/json_filter.py              |    4 +-
 nova/scheduler/filters/ram_filter.py               |    4 +-
 nova/scheduler/host_manager.py                     |   32 +++---
 nova/tests/scheduler/test_host_filters.py          |  112 +++++++++++++-------
 nova/tests/scheduler/test_host_manager.py          |    5 +-
 14 files changed, 194 insertions(+), 135 deletions(-)

commit f01b9b8dd25d763e652259a0f99264d93661b29f
Merge: 81a1b0a 6315eb5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 27 22:18:38 2012 +0000

    Merge "Adds temporary chown to sparse_copy."

commit 6315eb5086a96e4ba614ba01c9bbfaec8bd8504b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 27 21:01:49 2012 +0000

    Adds temporary chown to sparse_copy.
    
    `sparse_copy` needs read and write access to the devices. Since we
    cannot shell out to a run-as-root command here, we temporarily take
    ownership of the device.
    
    Change-Id: I891c38dbcba7177286dca729684c88ac065bd085

 nova/utils.py                |   20 ++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py |   43 +++++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 19 deletions(-)

commit 81a1b0a15ad5b0a656bd56d9f87715a8707f986e
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sun Feb 26 02:39:08 2012 +0100

    make nova-network usable with Python < 2.6.5
    
    there is in issue in Python < 2.6.5 with using unicode strings as
    keyword arguemnts. see http://bugs.python.org/issue4978 for details.
    
    because several not-yet-outdated enterprise distributions are using
    Python < 2.6.5 the unicode strings in the keys of the dictionaries in
    used as keyword arguments nova/network/model.py should be converted.
    
    fixes bug 940941
    
    Change-Id: Ib1d9955677e228fce6cc8e17fddc780d1a839d84

 nova/network/model.py |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit b88cd9439c2d655b4dcf5e6cb214a1e4aeffa9b7
Merge: 715cea2 6aa0bf7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 27 20:28:39 2012 +0000

    Merge "Re-adds ssl to kombu configuration and adds flags that are needed to pass through to kombu."

commit 715cea2170e87858a47a10f3ae670dc5a2c92ee0
Merge: 92662cf 86e9269
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 27 19:38:53 2012 +0000

    Merge "Fix bug 900864 Quantum Manager flag for IP injection."

commit 6aa0bf7d688c0b0d7922ec0c793b3c7dd0625608
Author: Joshua Harlow <harlowja@yahoo-inc.com>
Date:   Fri Feb 10 14:16:07 2012 -0800

    Re-adds ssl to kombu configuration and adds flags that are needed to pass through to kombu.
    
    Implements part of blueprint ssl-endpoints
    
    Adds in configuration options:
    
    kombu_ssl_version (ssl version)
    kombu_ssl_keyfile (ssl keyfile)
    kombu_ssl_certfile (ssl certfile)
    kombu_ssl_ca_certs (ssl ca certfile)
    
    This adds onto rabbit_use_ssl (which must be True for the above to have any effect) and allows
    users to specify in greater detail (more than just True/False) how SSL is going to be configured.
    
    Change-Id: I2186a6aa9397df857321324bf4007bc8310b85ce

 Authors                          |    1 +
 nova/rpc/impl_kombu.py           |   49 +++++++++++++++++++++++++++++++++-
 nova/tests/rpc/test_kombu_ssl.py |   54 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 1 deletion(-)

commit 92662cff19e4b9f24a21d325e977b996364a24ab
Merge: 4652760 a0b4b70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 27 12:39:42 2012 +0000

    Merge "Remove unused import"

commit 465276003b8062e7b4f90f1cb5a2f212de10a458
Merge: 2379548 2199f45
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 27 08:15:30 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 23795489ddd9ec80f1ca78a6e36fc411d75103f3
Merge: f96dcc3 dd68529
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 27 08:05:24 2012 +0000

    Merge "Cleanup .rescue files in libvirt driver unrescue."

commit a0b4b70e77cd37599fedb889459e5b3a376b3f4c
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Feb 27 07:32:17 2012 +0000

    Remove unused import
    
    Introduced by f96dcc39, "Make sure detail view works for volume snaphots"
    
    Change-Id: Ie076cbbf05392ca3102c0e8430c0b5da78986046

 nova/tests/api/openstack/volume/test_snapshots.py |    1 -
 1 file changed, 1 deletion(-)

commit f96dcc39c764f78c1a81cfc13e598f6acc033ddb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 24 12:54:34 2012 -0800

    Make sure detail view works for volume snaphots
    
     * adds tests for volume router
     * test uncovered bug in versions that now fixed
     * fixes bug 940616
    
    Change-Id: I3f780d59d2fd60ebca3d142277a747400fe35336

 nova/api/openstack/volume/__init__.py             |    3 +-
 nova/api/openstack/volume/versions.py             |    6 +-
 nova/tests/api/openstack/volume/test_router.py    |   96 +++++++++++++++++++++
 nova/tests/api/openstack/volume/test_snapshots.py |    1 +
 4 files changed, 102 insertions(+), 4 deletions(-)

commit 2199f455b98505141928f706dc211d90b7754515
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 26 23:03:49 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I8152b3e86a991e691d804663da403f9a2f72c4d2

 nova/locale/bs/LC_MESSAGES/nova.po    | 2702 +++++++-----------
 nova/locale/cs/LC_MESSAGES/nova.po    | 2698 +++++++-----------
 nova/locale/da/LC_MESSAGES/nova.po    | 2690 +++++++-----------
 nova/locale/de/LC_MESSAGES/nova.po    | 2981 ++++++++------------
 nova/locale/en_AU/LC_MESSAGES/nova.po | 3913 ++++++++++++-------------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 3240 +++++++++------------
 nova/locale/es/LC_MESSAGES/nova.po    | 3815 +++++++++++--------------
 nova/locale/fr/LC_MESSAGES/nova.po    | 3964 ++++++++++++--------------
 nova/locale/it/LC_MESSAGES/nova.po    | 3204 +++++++++------------
 nova/locale/ja/LC_MESSAGES/nova.po    | 3924 ++++++++++++--------------
 nova/locale/ko/LC_MESSAGES/nova.po    | 3027 ++++++++------------
 nova/locale/nova.pot                  | 1830 +++++++-----
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 3618 +++++++++++-------------
 nova/locale/ru/LC_MESSAGES/nova.po    | 2993 ++++++++------------
 nova/locale/tl/LC_MESSAGES/nova.po    | 2692 +++++++-----------
 nova/locale/tr/LC_MESSAGES/nova.po    | 2668 +++++++-----------
 nova/locale/uk/LC_MESSAGES/nova.po    | 2854 ++++++++-----------
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 5020 +++++++++++++++------------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 2873 ++++++++-----------
 19 files changed, 26118 insertions(+), 34588 deletions(-)

commit 93cee6047f74e256c3695451b5dc51256208f76f
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Wed Feb 15 13:08:27 2012 -0600

    Decode nova-manage args into unicode.
    
    This improves handling of non-ASCII args... it's not
    exactly a comprehensive solution, though.
    
    Partial (demonstration) fix for bug 931667.
    
    Change-Id: Icc2aabe9c0c521732003f7013438630ebc8d2238

 bin/nova-manage |    4 ++++
 1 file changed, 4 insertions(+)

commit dd6852992b9b63e0cfb387e20f1dae4490c7ead3
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Feb 26 14:44:20 2012 -0500

    Cleanup .rescue files in libvirt driver unrescue.
    
    Updates the libvirt driver so that it cleans up the .rescue
    image files in an unrescue operation.
    
    Fixes LP Bug #941591.
    
    Change-Id: Ib9f66834b8189912ec8408eeeb0d4ef35d41d39a

 nova/virt/libvirt/connection.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 8da178d7f7334dfa0027a8ae74129943856c1fb2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 24 18:29:34 2012 -0800

    Fixes cloudpipe extension to work with keystone
    
     * Removes deprecated auth from cloudpipe extension
     * Fixes pipelib to not use ec2_api
     * Changes vpn_image_id to be a uuid
     * Uses network api to retrieve information
     * Simplifies cloudpipe tests
     * Removes nova-manage cloudpipe launching
     * Removes related unused db methods
     * Fixes bug 940744
    
    Change-Id: I5fd1fb49a9e11b89062aa754501fed29874cb6ee

 bin/nova-manage                                    |   67 -------
 etc/nova/policy.json                               |    2 +-
 nova/api/openstack/common.py                       |   11 +-
 nova/api/openstack/compute/contrib/cloudpipe.py    |   88 ++++++----
 nova/cloudpipe/pipelib.py                          |   44 ++---
 nova/crypto.py                                     |    2 +-
 nova/db/api.py                                     |   10 --
 nova/db/sqlalchemy/api.py                          |    8 -
 .../openstack/compute/contrib/test_cloudpipe.py    |  182 +++++++-------------
 nova/tests/test_db_api.py                          |   10 --
 10 files changed, 151 insertions(+), 273 deletions(-)

commit ff3f92008c5ace89cdc48874456e8c4a2d464187
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Feb 25 12:25:56 2012 -0800

    Add missing directive to tox.ini.
    
    Change-Id: Ib6d178af62f631de76e66c2bb6c07fd6b277fa97

 tox.ini |    1 +
 1 file changed, 1 insertion(+)

commit e2be2d8238c906de430611d4d0c1187b8699e87b
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Feb 25 16:43:34 2012 -0500

    Update EC2KeystoneAuth to grab tenant 'id'.
    
    Updates the EC2KeystoneAuth middleware so that it supports
    formatting changes to the Keystone /ec2tokens extension.
    Instead of setting project_id to a tenant dict this change
    correctly sets it to an id.
    
    Fixes LP Bug #941119.
    
    Change-Id: I318ed594929162eafb5d7c3d8b9583cb109b73d4

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e60398ba2ce95a0cd36ecfedb5a2df57552b2f82
Merge: 2172e49 a7df900
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 04:07:56 2012 +0000

    Merge "Monkey patch migrate < 0.7.3"

commit a7df90089557516a82c0ba8f7368cdd541099059
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Feb 24 10:10:21 2012 -0600

    Monkey patch migrate < 0.7.3
    
    * Works around migrate issue 72 [1] by monkey patching migrate prior
      to import.
    * Removes previous workaround
    * Refactor test config to work under nosetests directly
    * Fixes LP940407
    
    1: https://code.google.com/p/sqlalchemy-migrate/issues/detail?id=72
    
    Change-Id: I219e4cecf8bb2e34ae238ac270428f496378ee61

 nova/tests/test_migrations.py |   44 +++++++++++++++++++++++++++++++++++------
 run_tests.sh                  |   10 ----------
 2 files changed, 38 insertions(+), 16 deletions(-)

commit 2172e49e8359a62182f58d94d2a9c465a85d9a95
Author: mbasnight <mbasnigh@rackspace.com>
Date:   Fri Feb 24 20:04:39 2012 -0600

    Fixes bug lp#940734 - Adding manager import so AuthMiddleware works
    
    Change-Id: Ia4653daf02c14c41bab8e62f063e7673321073f4

 Authors                    |    1 +
 nova/api/openstack/auth.py |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 48c5a7f621a291f5e7075385c3bbbc8e1cac7574
Merge: b02cefe 5a080e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 01:34:19 2012 +0000

    Merge "fix unicode triggered failure in AuthManager"

commit b02cefe64631d51cebdfb5e3a83d22cdfea3b767
Merge: f7140d6 2fbccc0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 01:24:23 2012 +0000

    Merge "Clean stale lockfiles on service startup : fixes bug 785955"

commit f7140d66c9a476a8d38fc428d4d011356cb87823
Merge: 48c08d0 31e579f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 01:14:02 2012 +0000

    Merge "Improve unit test coverage per bug/934566."

commit 2fbccc0c693193533284330325f5803c8c6ce52a
Author: Mike Pittaro <mikeyp@LaHondaResearch.org>
Date:   Fri Feb 24 09:56:26 2012 -0800

    Clean stale lockfiles on service startup : fixes bug 785955
    
    Adds cleanup_files_locks() to nova/utils, which cleans up stale locks
    left behind after process failures.
    
    Adds a call to clean up locks on service startup for nova-api, nova-cert,
    nova-compute, nova-network, nova-objectstore, and nova-scheduler.
    
    Adds tools/clean_file_locks.py, which can be used to manually clean
    stale locks.
    
    Change-Id: I752e0b24d3c7fc5f1dc290da355cbd7f430789b8

 nova/service.py           |    2 +
 nova/tests/test_utils.py  |  149 +++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py             |   85 +++++++++++++++++++++++++-
 tools/clean_file_locks.py |   63 +++++++++++++++++++
 4 files changed, 298 insertions(+), 1 deletion(-)

commit 48c08d048bfe8c60cf3cd03c1078e2605bbb0a18
Merge: bfa6b0b f006c92
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 22:07:39 2012 +0000

    Merge "Don't delete security group in use from OS API."

commit bfa6b0b4f44e451551c4ed910b35b2270aa65c9a
Merge: 7a5c0c0 f4bf828
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 20:01:02 2012 +0000

    Merge "Example config_drive init script, label the config drive"

commit be385d81fc354b606cea021182eb6268ab4d222a
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Feb 24 10:38:34 2012 -0500

    Fix nova-manage floating create docs.
    
    Fix RST docs that describe nova-manage floating create syntax.
    
    Change-Id: I743a750b55b2007cc756cfd3c1b34d07c479fb5a

 doc/source/man/novamanage.rst      |    5 +++--
 doc/source/runnova/nova.manage.rst |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 7a5c0c0e1526f2a0f1355ef090432da6dee7700a
Merge: b905255 0d487d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 16:13:14 2012 +0000

    Merge "Copy data when migration dst is on a different FS"

commit b905255183162e5af4900021163b8c72fdd80038
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 24 15:55:44 2012 +0100

    Fix MANIFEST.in to include missing files
    
    Fix MANIFEST.in to include missing files in generated tarballs.
    Fixes bug 940360.
    
    Change-Id: I8abba2c952c95f653a4ceb4595600d67ccdeed8d

 MANIFEST.in |    6 ++++++
 1 file changed, 6 insertions(+)

commit f4bf828775db8bed77df12a5947de64427ddad3b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 24 00:48:13 2012 -0800

    Example config_drive init script, label the config drive
    
    Configuration with DHCP & cloud-init can be painful.  The config_drive is great,
    and it avoids disk injection, but there's no example of how to use it.
    
    So here's a little example init.d script for contrib, and a code patch to make
    sure the config drive gets a nice volume label.
    
    Change-Id: I22a1d6a824856ca9651b435d0fe54e348ab107fe

 contrib/openstack-config        |   65 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    8 +++--
 nova/virt/libvirt/utils.py      |    9 ++++--
 3 files changed, 77 insertions(+), 5 deletions(-)

commit 5a080e5b46436e82472687d370c0fd72e750baf8
Author: Russell Sim <russell.sim@gmail.com>
Date:   Fri Feb 24 13:50:34 2012 +1100

    fix unicode triggered failure in AuthManager
    
    * Always return a string from AuthManager._build_mc_key()
    * Fixes bug 938375
    
    Change-Id: Iffceffab8ae62830202de07e3237230dab4e5a60

 Authors              |    1 +
 nova/auth/manager.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 86e9269015638511ee4c6960bd0cbbf7b01c603b
Author: Dave Lapsley <dlapsley@nicira.com>
Date:   Thu Feb 23 21:09:05 2012 -0500

    Fix bug 900864 Quantum Manager flag for IP injection.
    
    Re-uses FlatManager flat_injected flag to enable/disable
    IP injection in QuantumManager.
    
    Change-Id: I52c7a2c3aed452045cadb2282a59851c1083a812

 nova/network/quantum/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 8924ad8d6d57810d4de6ce4ce61efdccc759b066
Merge: 7c4e31e d7d94ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 01:42:46 2012 +0000

    Merge "Fix instance stop in EC2 create_image"

commit e3530a06c4d84e101e07bbe22075a0e2b3a72086
Author: Mike Milner <mike.milner@canonical.com>
Date:   Thu Feb 23 15:13:51 2012 -0400

    Include launch_index when creating instances.
    
    Fixes bug 934534.
    
    The launch_index column in the database is used as the ami-launch-index value
    provided by the metadata service.
    
    If launch_index is not specified it defaults to 1. This is incorrect for the
    single instance case (should be 0) and doesn't correctly handle multi-instance
    starts.
    
    This branch changes the default launch_index to 0 (to handle the single
    instance case) and adds the launch_index in the schedulers for multi-instance
    starts.
    
    Change-Id: Ifc45abf4cd9f50f732ba4a4b68c0a6242a6c9710

 Authors                                            |    1 +
 nova/compute/api.py                                |    6 +--
 nova/scheduler/chance.py                           |    1 +
 nova/scheduler/distributed_scheduler.py            |    1 +
 nova/scheduler/simple.py                           |    1 +
 nova/tests/scheduler/test_chance_scheduler.py      |   53 +++++++++++++++++++
 nova/tests/scheduler/test_distributed_scheduler.py |   54 +++++++++++++++++++-
 nova/tests/test_compute.py                         |    3 +-
 8 files changed, 114 insertions(+), 6 deletions(-)

commit 7c4e31e639c0a96778fb7a158f6e5106bc3f2abb
Merge: daa9124 127a675
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 01:32:52 2012 +0000

    Merge "Fix vnc docs: novaclient now supports vnc consoles."

commit daa91248fe2120aa3a0279745b7acdd9087f94f5
Merge: 2b42812 9d7346e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 01:22:06 2012 +0000

    Merge "libvirt vif-plugging fixes.  Fixes bug 939252 , bug 939254"

commit 2b42812e3c0f45cbbde6fe556f0fda50a1076cde
Merge: 4c74a80 695fa6c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 01:11:27 2012 +0000

    Merge "Fixes error if Melange returns no networks"

commit 0d487d4f2350e42d6a63febd413b70e663053a1b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Feb 23 18:39:03 2012 -0500

    Copy data when migration dst is on a different FS
    
    Fixes bug 939916
    
    Change-Id: I678e15a13f99b59b16bd446f566b2c48dcba6057

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 4c74a80064b249f6ae77291a984347f19d3720d6
Merge: 129a6a2 ab69635
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 24 01:01:12 2012 +0000

    Merge "Print error if nova-manage should be run as root."

commit 129a6a21a6d4201a1af9756a97831d4b30c76162
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Feb 23 17:45:29 2012 -0600

    bigger-than-unit test for cleanup_running_deleted_instances
    
    My team is going to lambaste me for this, but the
    cleanup_running_deleted_instances was missing a
    unit test. This lead to a bug in the refactor.
    This patch fixes both issues; however
    utils.temporary_mutation makes it hard to write a
    proper unit test, this one hits the DB.
    
    Change-Id: I93a595ffce4f17261f18a52d4c2a11434653a630

 nova/compute/manager.py    |    9 +++++++--
 nova/tests/test_compute.py |   29 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

commit cce1c217eb39998c5390d37ba61f2c7f0056b25e
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Tue Feb 21 20:50:08 2012 +0800

    Nova options tool enhancements
    
    Fixes bug #936898
    
    1. Just import the modules and only look at nova.flags.FLAGS
       when they're all imported
    
    2. ConfigOpts is iterable, there should be no need to iterate
       the private FLAGS._opts dict
    
    3. Output should be .ini style
    
    4. The output should only contain comments
       i.e. each option default should be commented out
    
    Change-Id: I15835bb437bc6d575e8311d7c55b3a29d67b006d

 nova/flags.py             |    4 ++++
 tools/conf/create_conf.py |   28 +++++++---------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

commit 5baaa3117ab2c1cab8a573a2bd488a55478b6189
Merge: e1001f6 3e157d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 22:02:03 2012 +0000

    Merge "Add hypervisor_hostname to compute_nodes table and use it in XenServer."

commit e1001f6f11d14c2f69eb666888c9a3f3eb9eed8b
Merge: d419937 5ad1dea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 21:33:41 2012 +0000

    Merge "nova-network can't deallocate ips from deleted  instances"

commit 3e157d586fddb1430f5cacc343fd158de4b803cc
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 23 15:01:30 2012 -0600

    Add hypervisor_hostname to compute_nodes table and use it in XenServer.
    
    This ensures the dom0 hostname is available to the API even when dom0 is "offline."
    
    Change-Id: I1230c1871606fadc30f63ed97b56d54e51fd8833

 nova/db/api.py                                     |    4 +--
 nova/db/sqlalchemy/api.py                          |    5 +--
 ...080_add_hypervisor_hostname_to_compute_nodes.py |   33 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/virt/xenapi_conn.py                           |   19 ++++++++++-
 5 files changed, 57 insertions(+), 5 deletions(-)

commit 695fa6ca4467e0cddb8964a4b9cd10a69ec83161
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Feb 23 14:24:38 2012 -0600

    Fixes error if Melange returns no networks
    
    If melange returns no networks for the tenant the
    loop that loads instance from the DB will not run,
    causing an error. This loop also loads the same
    instance every iteration, which is inefficient.
    This small change fixes that.
    
    Change-Id: I34d410fae3919e9e3f268d98efd01eecd2ed0a3f

 nova/network/quantum/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab69635cc1c91f09efc20b31512554722e4a7928
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 23 13:32:14 2012 -0500

    Print error if nova-manage should be run as root.
    
    Fix bug 939531.
    
    This patch makes nova-manage print out a more friendly error message if
    it needs to be run as root instead of failing with an exception
    traceback.  It catches an EACCES error when opening the config file or
    opening log files and exits cleanly.
    
    Change-Id: I2bd2bf3750c2bd3d672a037edb56f2b0b9bf1379

 bin/nova-manage |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit d4199375078311961c2d65bb575556adf669e40f
Merge: b9ead4d 3c63218
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 19:49:08 2012 +0000

    Merge "Prevent infinite loop in PublishErrorsHandler"

commit b9ead4d26b69ead8d101c2729bae28a51f864eed
Merge: 1ae4f4e fd280da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 19:38:51 2012 +0000

    Merge "Fix quantum get_all_networks() signature (lp#936797)"

commit 1ae4f4eb21abe85600dc1137146cb8d85f1c03ea
Merge: dd851ff 169cacb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 19:28:28 2012 +0000

    Merge "bug 939480"

commit f006c920e0dc3d3465b0af27b0154aeee3fad373
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 23 14:00:42 2012 -0500

    Don't delete security group in use from OS API.
    
    Fix bug 938853.
    
    This patch adds a check to the OpenStack API so that a security group
    still in use can not be deleted.  This same check just recently went in
    for the EC2 API.
    
    Change-Id: I75dc47c5f5d227b94c45ba8a0f00c37bd63f09fc

 .../openstack/compute/contrib/security_groups.py   |    3 +++
 .../compute/contrib/test_security_groups.py        |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

commit 5ad1dea4daf264fe11429288597d26dc4974fe05
Author: François Charlier <francois.charlier@enovance.com>
Date:   Thu Feb 23 16:32:54 2012 +0100

    nova-network can't deallocate ips from deleted  instances
    
    Allow nova-network to deallocate assigned IPs from deleted instances
    
    Fix bug #939580
    
    Change-Id: Ib24fea0701cf640721cd0b021c78c8c5dfbb507b
    Signed-off-by: François Charlier <francois.charlier@enovance.com>

 nova/network/manager.py    |   33 ++++++++++++++++++++++++---------
 nova/tests/test_network.py |    6 ++++++
 2 files changed, 30 insertions(+), 9 deletions(-)

commit dd851ff62b04da2c2d922dea6b9c175dc44ae234
Merge: 2736b2d d0cc37f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 18:32:53 2012 +0000

    Merge "Add attaching state for Volumes"

commit 2736b2d493e5129257061739d339d4cd4d8a5f25
Merge: 041b97d 2d2ebd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 18:22:25 2012 +0000

    Merge "Making link prefixes support https."

commit 041b97dc3d2dde7f0a0c8c175f723e36feae8777
Merge: 939f082 6cb1658
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 18:11:41 2012 +0000

    Merge "Actual fix for bug 931608."

commit 2d2ebd676a81a0443824990a710eda4df72b9987
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Feb 23 17:53:14 2012 +0000

    Making link prefixes support https.
    
    bug: 924090
    Change-Id: Ie474b6c4412c8621e538ddfba0f2cef4d681c2a5

 nova/api/openstack/common.py                    |    2 +-
 nova/tests/api/openstack/compute/test_images.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 3c63218ae65953273b761433a0cc4cada041253a
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Thu Feb 23 16:08:44 2012 +0000

    Prevent infinite loop in PublishErrorsHandler
    
    Fixes bug #883293
    
    Note: this is an update of https://review.openstack.org/#change,1747
    originally author by Donald Ngo
    
    Change-Id: Ie6ae4f961fb0519df98408baf0a3f8fac0eb6682

 nova/log.py            |    3 +++
 nova/tests/test_log.py |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

commit 939f082cc2fb0b71bb601f80e3ea95d0be355e4c
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Feb 17 16:17:44 2012 +0000

    blueprint host-aggregates: host maintenance - xenapi implementation
    
    this changeset introduces the following:
    
    - refactoring around host-related operations for xenapi
    - increased test coverage
    - first cut at implementing host evacuation for a XS/XCP host
    
    Change-Id: I8509cdde95f6777ecfa928663b0c4bedbccf5d38

 nova/compute/api.py                                |    4 +-
 nova/compute/manager.py                            |    6 +
 nova/tests/test_xenapi.py                          |   83 ++++----
 nova/tests/xenapi/stubs.py                         |    3 +-
 nova/virt/driver.py                                |    5 +
 nova/virt/fake.py                                  |    5 +
 nova/virt/libvirt/connection.py                    |    5 +
 nova/virt/vmwareapi_conn.py                        |    9 +-
 nova/virt/xenapi/fake.py                           |   43 +++--
 nova/virt/xenapi/host.py                           |  201 ++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py                       |    7 +-
 nova/virt/xenapi/vmops.py                          |   37 ----
 nova/virt/xenapi_conn.py                           |   76 +-------
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    3 +-
 14 files changed, 321 insertions(+), 166 deletions(-)

commit 169cacb67c3306412eee445f18035cc29098e145
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 23 18:36:18 2012 +0530

    bug 939480
    
    Updated vmwareapi readme file as per latest sources.
    
    Change-Id: I511589cabdc49a76b660f1ef54f0dec39eebd11b

 doc/source/vmwareapi_readme.rst |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9d7346eaaee370055a686324ad63814e34eed0cf
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Feb 22 22:02:01 2012 -0800

    libvirt vif-plugging fixes.  Fixes bug 939252 , bug 939254
    
    - fix OVS vif-plugging on red hat / fedora by supporting recent libvirt
    change that provides OVS + libvirt integration.
    - Create unit tests that provide coverage for all libvirt vif drivers
    - Correctly set vm-uuid flag in existing OVS vif-plugging mechanism.
    
    Change-Id: I29eeeda92d44a1c026d1c17cf169a1bf2b5a0cc1

 nova/tests/test_libvirt_vif.py |  159 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt.xml.template |    8 ++
 nova/virt/libvirt/vif.py       |   22 +++++-
 3 files changed, 188 insertions(+), 1 deletion(-)

commit 0c6765a71ad5538a7569dbc03dd8fe95713dc818
Merge: e63775a 8e825c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 02:52:43 2012 +0000

    Merge "Make database downgrade works"

commit e63775afca665f9e3cece0f3a1d3a6b81caea69d
Merge: 6166b73 82d78b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 00:55:11 2012 +0000

    Merge "Speeding up resize down with sparse_copy"

commit 82d78b979558b0e26b5159ea0f6cb205610b0260
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 22 23:17:06 2012 +0000

    Speeding up resize down with sparse_copy
    
    Fixes bug 939084
    
    Change-Id: I78f7476adda427d729b67e7c32efc2a4dd2d7234

 nova/virt/xenapi/vm_utils.py |   60 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 6 deletions(-)

commit 6166b73a50270c617d1dc7e36cfe095d0eeeef3f
Merge: 08fa534 112dd3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 23 00:21:57 2012 +0000

    Merge "Move get_info to taking an instance."

commit 08fa534a0d28fa1be48aef927584161becb936c7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Feb 17 00:42:10 2012 +0000

    Remove network_api fallback for info_cache from APIs
    
    Fixes bug 932395
    
    OS API and EC2 would query the network API when instance['info_cache']
    had no network info.. or network info was an empty list.  The ideal was
    to fall back to querying the network IP in case the cache was busted.
    
    However, reality says this case is extremely common as it is the case
    when instances are freshly built and haven't had network info assigned
    yet.  The calls to network API are expensive and goes against the whole
    idea of this "cache".
    
    So, this patch removes the fallback to querying the network API.  In its
    place, it adds a periodic task to the compute manager to periodically
    sync the cache entry.
    
    Since I had to fix a number of tests, I consolidated some things there
    as well with regards to instance stubbing.
    
    Change-Id: I493f811bcba4e99ac6a5756bcab473557d5c0104

 nova/api/ec2/ec2utils.py                           |   32 +-
 nova/api/openstack/common.py                       |   32 +-
 nova/compute/manager.py                            |   58 +++
 .../compute/contrib/test_createserverext.py        |   38 +-
 .../api/openstack/compute/test_server_actions.py   |   95 +----
 nova/tests/api/openstack/compute/test_servers.py   |  375 ++++++--------------
 nova/tests/api/openstack/fakes.py                  |   70 +++-
 nova/tests/api/openstack/test_common.py            |   10 -
 nova/tests/test_compute.py                         |   91 ++++-
 nova/tests/test_metadata.py                        |    1 +
 10 files changed, 332 insertions(+), 470 deletions(-)

commit 9196e1c7b07be8d3f9dbe7947cace9fd4e862f9c
Merge: d8e35d7 4ba4fb6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 23:23:19 2012 +0000

    Merge "Add Nexenta volume driver."

commit d8e35d78ccca801e099f1fb9654e6ac5ab3faac4
Merge: 143711d 7f788eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 22:54:47 2012 +0000

    Merge "refactor a conditional for testing and understanding"

commit 143711d04db3c6729adc0348d324a700df129fb9
Merge: beb49b6 9caffcc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 22:44:16 2012 +0000

    Merge "Disable usb tablet support for LXC."

commit 31e579fd3ffc87d0917fd2f461eaf6272029222f
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Feb 18 16:16:24 2012 +1100

    Improve unit test coverage per bug/934566.
    
    Add unit test coverage for the last untested method in imagecache.py.
    This brings the coverage for this module to 100%.
    
    Change-Id: I9d4c0a521842bdbb72f4ae5b54839c15ab49f38e

 nova/tests/test_imagecache.py   |  168 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/imagecache.py |   26 +++---
 2 files changed, 180 insertions(+), 14 deletions(-)

commit beb49b664cde757784f4f93d2a0ea5346288ed37
Merge: 1ef939b 1767e0a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 22:05:58 2012 +0000

    Merge "Return 40x for flavor.create duplicate."

commit 1ef939bf40e18a73cfce2d8bc039211ae044c379
Merge: 7427454 0a8546c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 21:43:31 2012 +0000

    Merge "Improve unit test coverage per bug/934566."

commit 1767e0ae9595003c22facc86e590b7c9b1ed6a75
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 21 21:10:57 2012 -0800

    Return 40x for flavor.create duplicate.
    
     * Fixes bug 938194
     * Return error 409 instead of 400
    
    Change-Id: Ia3c597dc996d88e7026f76d1104058259c96301c

 nova/api/openstack/compute/contrib/flavormanage.py |    9 ++++---
 .../compute/contrib/test_flavor_manage.py          |   27 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

commit 7f788eb1672cf1731817f83e6987f7b128599154
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Feb 22 13:30:24 2012 -0600

    refactor a conditional for testing and understanding
    
    _cleanup_running_deleted_instances was getting
    difficult to understand, so I extracted a method
    that contained the calculation about what is to be
    deleted. Also, added tests for that method.
    
    update: _shutdown_instance has an arity of three,
    the existing code gives four arguments, one was
    passed through to driver.destroy, which now has a
    default argument that defaults to True, the passed
    value.
    
    update 2: Doh! pep8
    
    Change-Id: I1a32512a4e0d80ba4dcc911b96790c29c1f36710

 nova/compute/manager.py    |   67 ++++++++++++++++++++++----------------------
 nova/tests/test_compute.py |   29 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 35 deletions(-)

commit 7427454d71006f4b14683e630c8e6c834f7cb950
Merge: 160e6b6 74396d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 20:58:47 2012 +0000

    Merge "nova-manage: Fix 'fixed list'"

commit 9caffcc9106d9bd67d65fca9157f6273c94fe398
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sat Feb 18 15:57:26 2012 -0500

    Disable usb tablet support for LXC.
    
    libvirt does not support usb tablets. Disable it
    if running libvirt-lxc. Fixes bug 935744
    
    Change-Id: Ic648df4b3a5b66da089c7153971f0e8dd53bacdd
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/virt/libvirt.xml.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ba4fb6a4e09e4be9a17f6da78820834a6676b92
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Feb 15 21:31:51 2012 +0400

    Add Nexenta volume driver.
    
    Covers blueprint nexenta-volume-driver.
    
    Change-Id: Iac30886981355f99e450a7ffbca24e7c23e4e97d

 nova/tests/test_nexenta.py      |  281 ++++++++++++++++++++++++++++++++++++++
 nova/volume/nexenta/__init__.py |   33 +++++
 nova/volume/nexenta/jsonrpc.py  |   84 ++++++++++++
 nova/volume/nexenta/volume.py   |  282 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 680 insertions(+)

commit 0a8546c7d142acd2a1e68de7a36b71a3680ab0e1
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Feb 18 14:22:02 2012 +1100

    Improve unit test coverage per bug/934566.
    
    bug/934566 identified an error which should have been caught by
    more complete unit test coverage. This review extends unit test
    coverage to include handle_base_image and is one of a series I
    will be sending.
    
    Change-Id: I287fc50ea6a92239f11a107f65da84d3ff0c8b3b

 nova/tests/test_imagecache.py   |  166 ++++++++++++++++++++++++++++++++++++---
 nova/virt/libvirt/imagecache.py |   14 +++-
 2 files changed, 163 insertions(+), 17 deletions(-)

commit 160e6b6eee05f4273dc52770575d445e27b42508
Merge: 05ea850 0f9326a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 20:21:47 2012 +0000

    Merge "Add 'nova-manage export auth'"

commit 05ea850af58c3b9aeadcfc1fa0a8edcdb9a1ef5e
Merge: 0c55687 2a9b66c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 19:50:56 2012 +0000

    Merge "Don't store connection pool in RpcContext."

commit 0c556871e8415cbc756466f05f3266aa7f4131f0
Merge: 00f8caa acb2dac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 19:07:20 2012 +0000

    Merge "Add exception SnapshotIsBusy to be handled as VolumeIsBusy."

commit 74396d58810e9851a6d33aef3dc3b2185154abcb
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Feb 22 10:58:12 2012 -0800

    nova-manage: Fix 'fixed list'
    
    Fix  'nova-manage fixed list'
    
    Fixes bug 938702
    
    Change-Id: I65a0a57ac8e16b605eeee963146d4dba582dc077

 bin/nova-manage |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 0c483d1970879cf04a2f1ba2119b0ed6605f39b1
Author: john-griffith <john.griffith@solidfire.com>
Date:   Wed Feb 22 11:42:08 2012 -0700

    Add lun number to provider_location in create_volume
    * Fixes bug 938876
    
    Change-Id: I22ccda1df7a0b718697588b0a808af5c58181ed8

 nova/volume/san.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 00f8caaeff15b03062db99290b8ebbe96a6712c5
Merge: ad0e030 02130b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 18:30:02 2012 +0000

    Merge "Fix WeightedHost"

commit ad0e030103ba34f2ac50ffe3bc09d8a1d1c22d46
Merge: 60cec0a 3dc539b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 17:41:32 2012 +0000

    Merge "Don't allow EC2 removal of security group in use."

commit 60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2
Merge: f300018 424de7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 17:20:24 2012 +0000

    Merge "blueprint host-aggregates: improvements and clean-up"

commit f300018b1a731a9e427e6b77a05376d78fa8f9ec
Merge: be56fd7 9c6bf7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 17:10:12 2012 +0000

    Merge "Support fixed_ip range that is a subnet of the network block"

commit 02130b6f9ab6d3443918ae987b419d3b229b39fa
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Feb 22 11:55:05 2012 -0500

    Fix WeightedHost
    
    WeightedHosts don't have zone attributes.
    
    Let me know if I'm missing something and should be adding a hasattr
    check instead of removing the zone reference.
    
    Change-Id: If76f23fa46c965fc9004e35dd10da33e2bbb48dc

 nova/scheduler/least_cost.py            |    2 --
 nova/tests/scheduler/test_least_cost.py |   22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

commit be56fd77ad9cfc221a1fea9e0380cb3a44181bee
Merge: 861c0d9 1fc7c0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 16:53:11 2012 +0000

    Merge "Clarify use of Use of deprecated md5 library"

commit 861c0d9e214aed8ba6633aff56270d05fa69e640
Merge: 55fb5df 9c1de0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 15:32:29 2012 +0000

    Merge "Makes HTTP Location Header return as utf-8 as opposed to Unicode."

commit d7d94ac975743585675978890bc8e737db627b9d
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Mon Feb 20 11:54:43 2012 +0100

    Fix instance stop in EC2 create_image
    
    Change-Id: Iceee28165ec447d5fa294b73d121fbbf601c4332
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 55fb5df69d475ffdb6f2d953cedf899afaace13e
Merge: d7fb579 c867e08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 11:31:39 2012 +0000

    Merge "Rework base file checksums."

commit d7fb579cf9e192dbbace1b11f2a2bc84555d4c71
Merge: ae99fe8 ade948d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 11:21:40 2012 +0000

    Merge "Backslash continuations (nova.api.openstack)"

commit 424de7eea2588a3f4143e5874aac01d0dd1917e6
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Feb 15 21:17:06 2012 +0000

    blueprint host-aggregates: improvements and clean-up
    
    This changeset addresses a number of issues found during testing:
    
    - avoid name conflicts during aggregate creation (see db/* changes)
    - avoid masking of XenAPI.Failure if pool-join fails (see plugins/* changes)
    - preserve VM placement decisions made during scheduling (see xenapi/vmops.py)
    - ensure plugins are called on the right hosts in XS pools (see xenapi_con.py)
    - stores master uuid in aggregate metadata for use in VM live migration and
      raise InvalidAction rather than Aggregate error if we attempt to remove
      a mster (see xenapi/pool.py and compute/manager.py)
    - clean-up of unit tests
    
    Change-Id: I881a94d87efe1e81bd4f86667e75f5cbee50ce91

 nova/compute/manager.py                            |   17 +++++++----
 nova/db/api.py                                     |    5 +++
 nova/db/sqlalchemy/api.py                          |   32 ++++++++++++++++++--
 nova/tests/test_db_api.py                          |   23 ++++++++++++++
 nova/tests/test_xenapi.py                          |    7 +++--
 nova/tests/xenapi/stubs.py                         |   18 +++++------
 nova/virt/xenapi/pool.py                           |   16 +++++-----
 nova/virt/xenapi/vmops.py                          |    4 ++-
 nova/virt/xenapi_conn.py                           |   26 ++++++++++++++--
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    8 ++---
 10 files changed, 119 insertions(+), 37 deletions(-)

commit ae99fe81f542f3c8f4e509742afa3d5a87c7cadf
Merge: b084bca b88e67c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 04:03:03 2012 +0000

    Merge "blueprint host-aggregates: host maintenance"

commit b084bca867ef8d3f47810fe26f859537322688c9
Merge: efc00f8 5a728f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:52:41 2012 +0000

    Merge "xenapi: nova-volume support for multiple luns"

commit efc00f89f704110ce4393ea1a70fc934d08f4e09
Merge: 6b3e1b0 8d758d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:42:30 2012 +0000

    Merge "Scheduler notifications added."

commit 6b3e1b09b28a10e69480cd84d3a1109350cacfa4
Merge: c4ff7ef 47da325
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:32:32 2012 +0000

    Merge "Alter output format of volume types resources"

commit c4ff7ef07c50deccf3cb7877ecab2245724f3091
Merge: 11d82fc 424f32f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:22:30 2012 +0000

    Merge "blueprint host-aggregates: xenapi implementation"

commit 11d82fc7d4d17b6edf435633501ddf7a44d6adf5
Merge: 69d2330 0433472
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:12:41 2012 +0000

    Merge "Avoid copying file if dst is a directory."

commit 69d2330975fb66b61a6b56e31e6d6ed71f391f41
Merge: d9be021 1fe0992
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 03:02:27 2012 +0000

    Merge "Fix error that causes 400 in flavor create."

commit d9be021f1eb55a62e4202274af0fcf2669162a9b
Merge: adaf904 1765406
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 22 02:52:37 2012 +0000

    Merge "Extract get_network in quantum manager"

commit 112dd3c1b824097acf5f89cd3afa8785623e4f9e
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Feb 22 12:30:37 2012 +1100

    Move get_info to taking an instance.
    
    This is a first step towards using uuids in this interface instead
    of instance names (which are synonyms for instance ids).
    
    Change-Id: I54b32a5020b0dbc21ba7156ed38ed188c483086b

 nova/compute/manager.py                       |   12 ++++----
 nova/tests/baremetal/test_proxy_bare_metal.py |    3 +-
 nova/tests/test_libvirt.py                    |   15 ++++++----
 nova/tests/test_virt_drivers.py               |    5 ++--
 nova/tests/test_vmwareapi.py                  |   32 ++++++++++-----------
 nova/tests/test_xenapi.py                     |    2 +-
 nova/virt/baremetal/proxy.py                  |    4 +--
 nova/virt/driver.py                           |    2 +-
 nova/virt/fake.py                             |    8 +++---
 nova/virt/libvirt/connection.py               |   38 ++++++++++---------------
 nova/virt/vmwareapi/vmops.py                  |    6 ++--
 nova/virt/vmwareapi_conn.py                   |    4 +--
 nova/virt/xenapi/vmops.py                     |    7 ++---
 nova/virt/xenapi_conn.py                      |    4 +--
 14 files changed, 68 insertions(+), 74 deletions(-)

commit 9c6bf7cf462346ed9379ff217774e2787e64f5f5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 6 11:25:40 2012 -0800

    Support fixed_ip range that is a subnet of the network block
    
    This enables flat deployments where the instances live on the
    'general' network.  For example, a typical home router uses
    192.168.0.0/16 for the private network.  Cloud machines can be
    assigned 192.168.100.0/24.  An example network create command:
    
    nova-manage network create private 192.168.0.0/16 1 65536 \
       --fixed_cidr=192.168.100.0/24 --gateway=192.168.1.1
    
    Change-Id: I17edd81e9bc21ca3320233b606c99e03e25201bc

 bin/nova-manage            |   10 ++++++++--
 nova/network/manager.py    |   14 ++++++++------
 nova/tests/fake_network.py |    2 +-
 nova/tests/test_network.py |    2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

commit 5a728f90d1ccf9a5264ef14648c7ec1fd35ee229
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue Feb 14 16:23:06 2012 -0800

    xenapi: nova-volume support for multiple luns
    
    Change-Id: I012fe76a8e2fb4ddd3c24c5fd43a9b2126d2773d

 nova/virt/xenapi/volume_utils.py |   11 ++++++++++-
 nova/virt/xenapi/volumeops.py    |    7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

commit 1fe09926c8c1523d83aa834d2b143d266fde14ad
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 21 13:59:29 2012 -0800

    Fix error that causes 400 in flavor create.
    
     * Fixes bug 938212
     * Fix style per bcwaldon's comment
    
    Change-Id: I5c4a024c29634f1b786a36ca93050b9f2de41dea

 .../openstack/compute/contrib/flavorextradata.py   |    4 ++--
 .../compute/contrib/test_flavor_manage.py          |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 9c1de0b4cd7b9b1c7db65798a5308ae76fad1780
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue Feb 21 14:32:55 2012 -0600

    Makes HTTP Location Header return as utf-8 as opposed to Unicode.
    
    Fixes bug 938114
    
    Change-Id: Ie8a495a8743d2f261fc8f9600cfa1df28a2d5b1e

 nova/api/openstack/compute/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b88e67c445e618ee7e515d9dd50238afc4f5229b
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Feb 10 19:16:29 2012 +0000

    blueprint host-aggregates: host maintenance
    
    First cut at implementing host maintenance (aka host evacuation). This allows
    zero-downtime upgrades of the hosts by moving VMs off of to another host to
    carry out hypervisor upgrades.
    
    A number of issues have been addressed in this changeset:
    
    - improved the semantic of update operation on hosts (as per dabo comment)
    - refactored host-related operations into a separate class in to improve
      readability/maintainability
    - refactored test_hosts to reduce duplicated code
    - added first stub of host-maintenance operation
    
    Change-Id: I933f7cb8736e56c9ecea5255936d8826ef6decec

 nova/api/openstack/compute/contrib/hosts.py        |   38 ++-
 nova/compute/__init__.py                           |    1 +
 nova/compute/api.py                                |  271 ++++++++++----------
 .../api/openstack/compute/contrib/test_hosts.py    |   67 +++--
 nova/tests/test_compute.py                         |    6 +-
 5 files changed, 204 insertions(+), 179 deletions(-)

commit 424f32f04d9c6c97f684782b35e1c25fbf83ce05
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Feb 1 15:01:26 2012 +0000

    blueprint host-aggregates: xenapi implementation
    
    This commit introduces some clean-up/improvements on the current model
    and api for host aggregates. It also introduces a first version of the
    xenapi implementation. More precisely:
    
    - it lays out the structure of the virt driver,
    - it introduces compute and xenapi unit tests coverage,
    - it deals with join/eject of pool master and slaves,
    - it fixes xenapi_conn, when used in resource pool configurations
    
    More commits to follow (to ensure that VM placement, networking setup,
    performance metrics work just as well in cases where resource pools
    are present). However, these may be outside the scope of this blueprint
    and considered as ad-hoc bug fixes.
    
    Change-Id: Ib3cff71160264c5547e1c060d3fd566ad87337cb

 nova/api/openstack/compute/contrib/aggregates.py   |   57 +++---
 nova/compute/api.py                                |   19 +-
 nova/compute/manager.py                            |   36 +++-
 nova/db/sqlalchemy/api.py                          |    9 +-
 nova/db/sqlalchemy/models.py                       |  103 +++++++---
 nova/exception.py                                  |    5 +
 nova/tests/test_compute.py                         |  108 ++++++++--
 nova/tests/test_db_api.py                          |   56 ++---
 nova/tests/test_virt_drivers.py                    |    8 +
 nova/tests/test_xenapi.py                          |  147 ++++++++++++++
 nova/virt/driver.py                                |    7 +
 nova/virt/xenapi/fake.py                           |   11 +-
 nova/virt/xenapi/pool.py                           |  214 ++++++++++++++++++++
 nova/virt/xenapi_conn.py                           |   27 ++-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   54 +++++
 15 files changed, 749 insertions(+), 112 deletions(-)

commit c867e089b1a945bd4181cbe651ad12649b345674
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Feb 16 08:00:09 2012 +1100

    Rework base file checksums.
    
    The libvirt image cache manager wants to verify that the images it
    is managing have not become corrupt. We therefore write checksums
    for these images to disk and verify them as part of the cache
    management periodic task. This checksumming was originally done as
    part of the setup for a new virtual machine. This has been
    refactored so that generating a checksum on a large file will not
    delay the startup of a VM.
    
    Note that these checksums are intended for detecting corruption,
    not malicious system admins.
    
    Change-Id: I781877b342207cb2cf03eb48bd89456846cbf487

 nova/tests/test_imagecache.py   |    6 +++++
 nova/virt/libvirt/connection.py |    5 ++++
 nova/virt/libvirt/imagecache.py |   53 +++++++++++++++++++++++++++++----------
 3 files changed, 51 insertions(+), 13 deletions(-)

commit 043347267bdb2ea49d562d02c03fe8d242b641c9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 21 22:00:03 2012 +0000

    Avoid copying file if dst is a directory.
    
    Fixes bug 938153
    
    `shutil.move` in Python 2.4 will fallback to copying the file if dst is
    a directory. See http://bugs.python.org/issue1577.
    
    Change-Id: I2390337d82db5a72fef0e63877401134b1dcca55

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit 0f9326a1adcb257a296646e68edfd9d8d17146db
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Feb 20 13:20:55 2012 -0800

    Add 'nova-manage export auth'
    
    * Introduce ability to dump auth data to json blob for consumption by keystone
    * Implements bp keystone-export-rewrite
    
    Change-Id: Ic8c0ade8350daa449fb6df7ad3c55c3ae2b0c2c7

 bin/nova-manage                |   68 +++++++++++++++++++++++++++++++++++++++
 nova/tests/test_nova_manage.py |   69 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 129 insertions(+), 8 deletions(-)

commit 47da3250da90bb960b310dc85f60e850979fe3fe
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 21 12:06:44 2012 -0800

    Alter output format of volume types resources
    
    * volumes types lists now fit in with the rest of our API
    * Fixes bug 934435
    
    Change-Id: Ia67318be363230fcb2819c0df976b44f19dd0876

 nova/api/openstack/compute/contrib/volumetypes.py  |    6 +++---
 nova/api/openstack/volume/types.py                 |    6 +++---
 .../openstack/compute/contrib/test_volume_types.py |   15 +++++++++------
 nova/tests/api/openstack/volume/test_types.py      |   15 +++++++++------
 4 files changed, 24 insertions(+), 18 deletions(-)

commit 8d758d4dbe194b4608af34c3ca6520d620d3cdc3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 7 20:59:04 2012 -0800

    Scheduler notifications added.
    
    Re-added lost fake virt hypervisor info (required for local dev).
    Added multiple exchange topic support to RabbitNotifier.
    
    Change-Id: I33cc9076ee35061c21852cabba3275006fc87b86

 nova/notifier/rabbit_notifier.py        |   15 ++++++++++-----
 nova/scheduler/distributed_scheduler.py |   20 ++++++++++++++++++++
 nova/scheduler/least_cost.py            |    8 ++++++++
 nova/scheduler/manager.py               |   10 ++++++++++
 nova/tests/test_notifier.py             |    4 ++--
 nova/virt/fake.py                       |   31 ++++++++++++++++++++++++++++++-
 6 files changed, 80 insertions(+), 8 deletions(-)

commit 2a9b66c3dba5f7fb13c7b4e7442eae2bc5dbc130
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Feb 21 11:33:51 2012 -0500

    Don't store connection pool in RpcContext.
    
    Fix bug 934575.
    
    As Chris pointed out in the bug, there is a downside to this approach to
    fixing the bug, in that a manager will no longer be able to use
    context.reply(). However, it wasn't being used at all, and it's no loss
    in functionality.  A remote method can still return multiple values (in
    response to a multicall()) by using yield.
    
    Change-Id: I0e5aff2e8a40ffd8390c0e19d89dd17e60a74130

 nova/rpc/amqp.py         |   23 ++++++++++++-----------
 nova/tests/rpc/common.py |   23 -----------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

commit 127a67545a1cd7f46a34d46a4701a318a192e5c2
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 21 10:29:41 2012 -0800

    Fix vnc docs: novaclient now supports vnc consoles.
    
     * novaclient now supports retrieval of vnc consoles, so remove
       reference to outdated branch.
    
    Change-Id: Ifb8d7e6d2e15d3674fd32f074d1a92e5035ed941

 doc/source/runnova/vncconsole.rst |    4 ----
 1 file changed, 4 deletions(-)

commit adaf9049c8fb3652c0962909a3c835e1724d8a17
Merge: 0774865 49eefc8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 21 18:01:06 2012 +0000

    Merge "Update api-paste.ini with new auth_token settings."

commit 0774865a2f6d92052bfa71bdac9585d24216085a
Merge: 13ebb49 ef6c0a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 21 17:16:01 2012 +0000

    Merge "Don't inherit controllers from each other, we don't want the methods of our parent"

commit 13ebb49925c4081b01e1a11f3c3f02eac527d278
Merge: c28e4b5 5121008
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 21 17:06:12 2012 +0000

    Merge "Support tox-based unittests."

commit 1fc7c0c534b6b03feaf9be3d7aa0f5b3e4f42a9d
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Feb 20 22:38:52 2012 -0800

    Clarify use of Use of deprecated md5 library
    
    See Invalid bug 937463 for more details
    Also change run_tests.sh to ignore more '*.pyc' files
    
    Change-Id: I8c8ded902833fe4268966ff7a9630daaaad43a19

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    1 +
 run_tests.sh                                       |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 17654068a65d260f4c82841dd989cf12814c50a4
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Feb 15 18:36:18 2012 -0600

    Extract get_network in quantum manager
    
    To aid understanding, testing and refactoring
    allocate_for_instance
    
    update: rebase
    update: rebase and trailingslashectomy
    
    Change-Id: I85364b925082ec598c1645c33f3db4a25f3242a8

 nova/network/quantum/manager.py |   72 +++++++++++++++++++++++++++------------
 nova/tests/test_quantum.py      |   35 +++++++++++++++++--
 2 files changed, 83 insertions(+), 24 deletions(-)

commit acb2dacb2045942e67579a8050460c34a43958f3
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Nov 8 18:57:11 2011 +0400

    Add exception SnapshotIsBusy to be handled as VolumeIsBusy.
    
    This is helpful when driver can not delete snapshot if it has volumes
    created from it.
    Add tests for both VolumeIsBusy and SnapshotIsBusy cases.
    
    Change-Id: I3fcc6b1ffdfbc7e22ed30ac832db500eb3260d04

 nova/exception.py         |    5 +++++
 nova/tests/test_volume.py |   42 ++++++++++++++++++++++++++++++++++++++++++
 nova/volume/manager.py    |    6 ++++++
 3 files changed, 53 insertions(+)

commit c28e4b526aed5c3dacee17729241c6a12859fc0b
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Feb 21 00:10:04 2012 -0800

    Exception cleanup
    
    Do not write "except:", use "except Exception:" at the very least
    
    Change-Id: I539c013132309791f18c46819232102e9232e917

 bin/nova-manage                                    |    2 +-
 ...ange_instance_id_to_uuid_in_instance_actions.py |    2 +-
 nova/tests/test_SolidFireSanISCSIDriver.py         |    4 ++--
 nova/tests/test_compute.py                         |    4 ++--
 nova/virt/baremetal/dom.py                         |    8 ++++----
 nova/virt/baremetal/proxy.py                       |    4 ++--
 nova/virt/baremetal/tilera.py                      |    2 +-
 nova/virt/libvirt/connection.py                    |    2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

commit 65ec81c1cb3cce8d716614a9b0bbdb219bd6e759
Merge: f86ec68 b9e4788
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 23:38:51 2012 +0000

    Merge "Improve unit test coverage per bug/934566."

commit f86ec68be715073fbdcc6ef21f6053deea710289
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 20 12:21:59 2012 -0800

    Stop ignoring E202.
    
    There is absolutely no reason to ignore E202 in the pep8 checks.
    
    Change-Id: I4abf767639dd94e9e8b7b4a405b4a702a554b876

 nova/tests/api/openstack/compute/test_servers.py |    2 +-
 nova/virt/disk/api.py                            |    2 +-
 run_tests.sh                                     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 51210081a86938a35eaf066cfcfcdc7993a221c7
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Jan 7 19:34:41 2012 -0800

    Support tox-based unittests.
    
    Change-Id: I6a0a616a979688595762e6b772d77a14f1968070

 .gitignore            |    4 ++++
 tools/install_venv.py |    2 ++
 tools/pip-requires    |    8 --------
 tools/test-requires   |   10 ++++++++++
 tox.ini               |   37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 8 deletions(-)

commit eab6a9fa761cb6631609366927fc02b0efe2555d
Merge: 1d5b9dc 1ebf522
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 14:36:28 2012 +0000

    Merge "Fix broken method signiture"

commit 1d5b9dca8b237b53a8f09aa8a4dd7846796ea96b
Merge: c1939e5 ea0e925
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 14:26:25 2012 +0000

    Merge "Escape apostrophe in utils.xhtml_escape() (lp#872450)"

commit d0cc37f8095bef38605930683af43af7ddb7e4a8
Author: Liam Kelleher <liam.kelleher@hp.com>
Date:   Thu Jan 5 15:37:18 2012 +0000

    Add attaching state for Volumes
    
    bug 897726 Add "attaching" status for volumes and clear state on error
    This closes a gap where multiple calls of attach for the same volume
    can happen before the volume is actually attached.
    
    Change-Id: I59d22ceda83729c1a455af9994c9ffec1912e23b

 Authors                    |    1 +
 nova/compute/api.py        |    1 +
 nova/compute/manager.py    |   17 +++++++++++++----
 nova/tests/policy.json     |    2 ++
 nova/tests/test_compute.py |    6 +++++-
 nova/utils.py              |    6 ++++++
 nova/volume/api.py         |   10 ++++++++++
 7 files changed, 38 insertions(+), 5 deletions(-)

commit c1939e576be7ce96735c4734913ae9274752fed9
Merge: 9a17418 b12c20f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 14:16:13 2012 +0000

    Merge "Don't tell Qpid to reconnect in a busy loop."

commit fd280dac74a199e32819dd46efd04d8f3e9fd8ee
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Mon Feb 20 17:35:07 2012 +0900

    Fix quantum get_all_networks() signature (lp#936797)
    
    The base NetworkManager get_all_networks() method requires
    a context argument.
    
    Change-Id: I8276caf879c3711f411cb16a0fc288cfc9b47965

 nova/network/quantum/manager.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit ea0e925972c944ac4586887d7fd2e9c27225dd83
Author: Nick Bartos <nick@pistoncloud.com>
Date:   Sun Feb 19 19:15:12 2012 -0800

    Escape apostrophe in utils.xhtml_escape() (lp#872450)
    
    Also remove comment which is no longer relevant.
    
    Change-Id: I33a951d08a34510b2a9dbacb9fb3ebf6bee978b4

 Authors                  |    1 +
 nova/tests/test_utils.py |    4 ++++
 nova/utils.py            |    5 +----
 3 files changed, 6 insertions(+), 4 deletions(-)

commit ade948dd77139390dc03f62564b0050df3ef54f3
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Feb 10 16:51:54 2012 +0800

    Backslash continuations (nova.api.openstack)
    
    Fixes bug #925286
    
    Backslash continuations removal for package nova.api.openstack
    
    Change-Id: I204b6d53bea224859e23771d5f4c96c1aff6fd03

 nova/api/openstack/__init__.py                     |    2 +-
 nova/api/openstack/auth.py                         |   14 +++++++++-----
 nova/api/openstack/compute/__init__.py             |    7 +++----
 nova/api/openstack/compute/contrib/certificates.py |    4 ++--
 .../openstack/compute/contrib/console_output.py    |    4 ++--
 .../openstack/compute/contrib/createserverext.py   |    4 ++--
 .../openstack/compute/contrib/deferred_delete.py   |    4 ++--
 .../openstack/compute/contrib/extended_status.py   |    4 ++--
 .../openstack/compute/contrib/flavorextradata.py   |    4 ++--
 .../openstack/compute/contrib/flavorextraspecs.py  |    4 ++--
 .../openstack/compute/contrib/floating_ip_pools.py |    4 ++--
 .../openstack/compute/contrib/scheduler_hints.py   |    4 ++--
 .../compute/contrib/server_action_list.py          |    4 ++--
 .../compute/contrib/server_diagnostics.py          |    4 ++--
 .../compute/contrib/simple_tenant_usage.py         |   12 ++++++------
 .../compute/contrib/virtual_interfaces.py          |    4 ++--
 .../compute/contrib/virtual_storage_arrays.py      |   16 ++++++++--------
 nova/api/openstack/compute/images.py               |    4 ++--
 nova/api/openstack/compute/limits.py               |    5 +++--
 nova/api/openstack/compute/servers.py              |   12 ++++++------
 nova/api/openstack/compute/views/limits.py         |    8 ++++----
 nova/api/openstack/wsgi.py                         |    4 ++--
 22 files changed, 68 insertions(+), 64 deletions(-)

commit 9a174189b42fc59de9467f60eb6ca0ba4d80f6c8
Merge: 933566c 8dabc7b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 09:14:55 2012 +0000

    Merge "Backslash continuations (nova.virt.baremetal)"

commit 933566c1d17cad36e3431b7a25db9d4310e98fcd
Merge: cf75c2d fc69f03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 09:05:02 2012 +0000

    Merge "Backslash continuations (nova.tests)"

commit cf75c2d45cf1ddb73564bb1f0193bcc8d3c85044
Merge: 757d8aa 942762d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 08:54:20 2012 +0000

    Merge "Add additional information to servers output."

commit 1ebf522fbe21387a33add48c3df92aa834fa5b46
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Mon Feb 20 16:47:55 2012 +0900

    Fix broken method signiture
    
    GET on a network in os-networks API would fail because
    of the signiture mismatch. This fixes the issue.
    
    Change-Id: I4865e93a6a2ad26aa4abcc78b1056152c2b59369

 nova/network/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 757d8aa6f5e412aae08c2b1fb2d0c6f174d2f29c
Merge: 6f3751f c30193f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 07:19:39 2012 +0000

    Merge "Support non-UTC timestamps in changes-since filter"

commit 6f3751fcbd6a13902d33374d5ef884ad88748048
Merge: 94d3d19 9e16a2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 20 07:03:15 2012 +0000

    Merge "nova.conf sample tool"

commit 94d3d198555b550b1895e55f5199500709769b2c
Author: chris fattarsi <chris.fattarsi@pistoncloud.com>
Date:   Sun Feb 19 18:03:35 2012 -0800

    Handle OSError which can be thrown when removing tmpdir. Fixes bug 883326.
    
    Change-Id: Ie1f40fcce6ce6af4ab71961c725dcd626eda8aea

 Authors        |    1 +
 nova/crypto.py |   17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

commit 49eefc85977a81cd34f383884c8fc20eca6e675a
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Feb 10 13:11:04 2012 -0500

    Update api-paste.ini with new auth_token settings.
    
    Update api-paste.ini with new 'admin_user' and 'admin_password' settings
    for the keystone auth_token middleware. By default username and password
    are options commented out.
    
    Fixes LP bug #930310.
    
    Change-Id: I04f91df5641d377d52c9578cade131bce5bfd4a4

 etc/nova/api-paste.ini |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 7ab28c4a1bc90b5755bb8ec25d25a214d1dd017b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 19 23:06:39 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I1d6b7a7f3ec11089289fcbd6f41a1c5d77f7f20f

 nova/locale/bs/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/cs/LC_MESSAGES/nova.po    |  936 ++++++++++++++++----------------
 nova/locale/da/LC_MESSAGES/nova.po    |  936 ++++++++++++++++----------------
 nova/locale/de/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/en_AU/LC_MESSAGES/nova.po |  934 ++++++++++++++++----------------
 nova/locale/en_GB/LC_MESSAGES/nova.po |  937 ++++++++++++++++----------------
 nova/locale/es/LC_MESSAGES/nova.po    |  949 +++++++++++++++++----------------
 nova/locale/fr/LC_MESSAGES/nova.po    |  934 ++++++++++++++++----------------
 nova/locale/it/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/ja/LC_MESSAGES/nova.po    |  934 ++++++++++++++++----------------
 nova/locale/ko/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/nova.pot                  |  933 ++++++++++++++++----------------
 nova/locale/pt_BR/LC_MESSAGES/nova.po |  946 ++++++++++++++++----------------
 nova/locale/ru/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/tl/LC_MESSAGES/nova.po    |  936 ++++++++++++++++----------------
 nova/locale/tr/LC_MESSAGES/nova.po    |  936 ++++++++++++++++----------------
 nova/locale/uk/LC_MESSAGES/nova.po    |  937 ++++++++++++++++----------------
 nova/locale/zh_CN/LC_MESSAGES/nova.po |  943 ++++++++++++++++----------------
 nova/locale/zh_TW/LC_MESSAGES/nova.po |  937 ++++++++++++++++----------------
 19 files changed, 9126 insertions(+), 8687 deletions(-)

commit b12c20fc48d82a6b888dee761dd46959d21d556a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 9 15:07:51 2012 -0500

    Don't tell Qpid to reconnect in a busy loop.
    
    Fix bug 929784.
    
    Don't set any of the reconnect timing options unless they have been set
    in the configuration.  Setting them all to zero puts Qpid in a mode
    where it will reconnect in a busy loop.  By not setting these unless a
    non-zero value has been provided, Qpid goes back to its default
    behavior, which is to use an exponential backoff on reconnect attempts
    (after 1 second, then 2, 4, 8, etc).
    
    Change-Id: Ia587bbe96db9ea6e429af289c3d586f4c6706648

 nova/rpc/impl_qpid.py |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit ef6c0a270c398e9e1b2a11e92457ddcde30da532
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 17 13:54:09 2012 -0800

    Don't inherit controllers from each other, we don't want the methods of our parent
    
    Bug #934478
    
    Change-Id: I6871b42b00db2ce7d9345204cba1cc778bf04e58

 .../openstack/compute/contrib/security_groups.py   |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit b9e47884e16ea6516769bf9f454fd66922a4282c
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Feb 18 12:14:52 2012 +1100

    Improve unit test coverage per bug/934566.
    
    bug/934566 identified an error which should have been caught by
    more complete unit test coverage. This review extends unit test
    coverage and is one of a series I will be sending.
    
    Change-Id: I76b966fc2bf18940d0dc0475f3776f8a3148a78d

 nova/tests/test_imagecache.py   |   97 +++++++++++++++++++++++++++++++++++----
 nova/virt/libvirt/imagecache.py |    5 ++
 2 files changed, 92 insertions(+), 10 deletions(-)

commit 86148ed2918334ca9a0be20f0dd4e2a4bddfc898
Merge: ecf4910 0e1ceb4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 02:17:05 2012 +0000

    Merge "Setting access ip values on server create."

commit ecf49105e11fc112574490203bdef9f8f62a0b6a
Merge: 77558a1 4cf898b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 18 02:06:50 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 77558a1cc2796f4d5e390c55e6d67f6cb92a7af4
Merge: 1e60fa2 b6b5639
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 01:43:18 2012 +0000

    Merge "Add ephemeral storage to flavors api."

commit 1e60fa261e61b9651f7bc981033ed9d476bd6225
Merge: e411eaa 1463839
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 01:32:59 2012 +0000

    Merge "Add support for admin_password to LibVirt"

commit e411eaa86b5b5cd03a5b7a9eba8012b20a029991
Merge: 834dfcf 3326628
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 01:22:41 2012 +0000

    Merge "Resolve bug/934566."

commit 834dfcfeb484b8fcf0af906db57253f4f5d46915
Merge: 8807e17 4289b64
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 01:12:43 2012 +0000

    Merge "fix pre_block_migration() interaction with libvirt cache"

commit 8807e17f379a9fc529c78651c72a8dcf1d074c66
Merge: c0f1227 8297a1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 01:02:48 2012 +0000

    Merge "bug 929462: compile_diagnostics in xenapi erronously catch XenAPI.Failure"

commit c0f1227c7bc0a57e4ccf228444f7a16f8a57f8de
Merge: 0a95518 5d3dbb4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 00:52:54 2012 +0000

    Merge "Query directly for just the ip"

commit 0a955186f295dddde1b70b5944464a70fe2cdcaf
Merge: 63c0677 7da145a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 00:42:08 2012 +0000

    Merge "Partial fix for bug 919051"

commit 0e1ceb4d753f2b4cd3b6aaee5e3f68caaf424c57
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Feb 14 19:46:19 2012 +0000

    Setting access ip values on server create.
    
    Change-Id: Id67c5e9d7bb00227e88ecbc2ffb0e772fcd69066

 nova/compute/api.py        |    1 +
 nova/compute/manager.py    |   29 +++++++++++++++++++++++++++++
 nova/flags.py              |    7 +++++--
 nova/tests/test_compute.py |   33 ++++++++++++++++++++++++++++++++-
 4 files changed, 67 insertions(+), 3 deletions(-)

commit 63c0677b0fe937ab565322cd719c3bbb39ff0a56
Merge: 731561c a0651f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 00:32:20 2012 +0000

    Merge "Use new style instance logging in compute api."

commit 731561cf7e7e6753ea1e99186e0b14430adc8669
Merge: dc9e5fe 13789e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 00:12:16 2012 +0000

    Merge "Fix traceback running instance-usage-audit"

commit dc9e5feae403e08e1a778afc2700cd95744d530e
Merge: 53b2cc8 b4fae48
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 18 00:01:13 2012 +0000

    Merge " remove unused nwfilter methods and tests."

commit 9e16a2edb1770018c0ad164ff7ef7e77a6cdace1
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Jan 20 01:10:58 2012 -0500

    nova.conf sample tool
    
    Fixes bug #918621
    
    A tool to generate a sample nova.conf file
    
    Change-Id: I2646d7e674ef3d1759558e820f051cc5e7f3b4ae

 .gitignore                   |    1 +
 doc/source/runnova/flags.rst |    4 +-
 nova/openstack/common/cfg.py |    2 +-
 tools/conf/create_conf.py    |  152 ++++++++++++++++++++++++++++++++++++++++++
 tools/conf/run.sh            |   19 ++++++
 5 files changed, 176 insertions(+), 2 deletions(-)

commit 4cf898b5220693ccebd09bbfa9d027d88a2fdb8f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 17 23:36:08 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: Ia7c1a081afd51fa48868ae26271615a8a6f11412

 nova/locale/bs/LC_MESSAGES/nova.po    | 8176 +++++++++++++++++++++++-----
 nova/locale/cs/LC_MESSAGES/nova.po    | 8185 +++++++++++++++++++++++-----
 nova/locale/da/LC_MESSAGES/nova.po    | 8152 +++++++++++++++++++++++-----
 nova/locale/de/LC_MESSAGES/nova.po    | 8329 ++++++++++++++++++++++++-----
 nova/locale/en_AU/LC_MESSAGES/nova.po | 9226 +++++++++++++++++++++++++-------
 nova/locale/en_GB/LC_MESSAGES/nova.po | 8520 ++++++++++++++++++++++++------
 nova/locale/es/LC_MESSAGES/nova.po    | 9181 +++++++++++++++++++++++++-------
 nova/locale/fr/LC_MESSAGES/nova.po    | 9379 +++++++++++++++++++++++++--------
 nova/locale/it/LC_MESSAGES/nova.po    | 8466 +++++++++++++++++++++++------
 nova/locale/ja/LC_MESSAGES/nova.po    | 9251 +++++++++++++++++++++++++-------
 nova/locale/ko/LC_MESSAGES/nova.po    | 8359 ++++++++++++++++++++++++-----
 nova/locale/nova.pot                  | 2736 +++++-----
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 8827 +++++++++++++++++++++++++------
 nova/locale/ru/LC_MESSAGES/nova.po    | 8340 ++++++++++++++++++++++++-----
 nova/locale/tl/LC_MESSAGES/nova.po    | 8108 +++++++++++++++++++++++-----
 nova/locale/tr/LC_MESSAGES/nova.po    | 8162 +++++++++++++++++++++++-----
 nova/locale/uk/LC_MESSAGES/nova.po    | 8184 +++++++++++++++++++++++-----
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 8570 ++++++++++++++++++++++++------
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 8193 +++++++++++++++++++++++-----
 19 files changed, 127177 insertions(+), 29167 deletions(-)

commit 53b2cc83c6329c112ce69d4d2c45fa7686347d00
Merge: 492acb2 509e5ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 23:32:13 2012 +0000

    Merge "Fixes nova-volume support for multiple luns"

commit 492acb2649174a1d965a01485caf08768d37976f
Merge: 55bc3d9 269c0fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 23:21:38 2012 +0000

    Merge "Fix bug 933147 Security group trigger notifications."

commit 1463839ff37c1baa7736a88cdd573dee802b29f0
Author: Mike Pittaro <mikeyp@LaHondaResearch.org>
Date:   Fri Feb 10 18:42:38 2012 -0800

    Add support for admin_password to LibVirt
    
    If the config flag --libvirt_inject_password is set, Libvirt now makes
    an attempt to inject the admin_password to instances at startup time.
    
    Fixes bug 767202
    
    Change-Id: I1491c84825bf0bbad43a7d53b379271caa2b76f6

 nova/virt/disk/api.py           |  119 ++++++++++++++++++++++++++++++++++++++-
 nova/virt/libvirt/connection.py |   18 +++++-
 nova/virt/xenapi/vm_utils.py    |    7 ++-
 3 files changed, 136 insertions(+), 8 deletions(-)

commit b6b563938740269f8538748d48f7441f8e09aa37
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 17 12:08:48 2012 -0800

    Add ephemeral storage to flavors api.
    
     * Adds flavor.ephemeral to compliment flavor.disk
     * Fixes bug 932928
    
    Change-Id: Ic15a9094aa6c27fda24deabd7df8633ce61c984b

 etc/nova/policy.json                               |    1 +
 .../openstack/compute/contrib/flavorextradata.py   |  101 ++++++++++++++++-
 nova/api/openstack/compute/contrib/flavormanage.py |    2 +-
 .../compute/contrib/test_flavor_manage.py          |   19 +++-
 .../compute/contrib/test_flavorextradata.py        |  115 ++++++++++++++++++++
 nova/tests/policy.json                             |    1 +
 6 files changed, 228 insertions(+), 11 deletions(-)

commit 3326628ca8da78f75b017afd214533904471474a
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Feb 18 10:07:06 2012 +1100

    Resolve bug/934566.
    
    Change-Id: I09934034527367e731d9ba09dcb860922e2b5017

 nova/virt/libvirt/imagecache.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7da145a67dd9723a4326a9f62998d6cfd967a07e
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Feb 6 19:02:38 2012 -0800

    Partial fix for bug 919051
    
    Test instance and volume IDs
    
    Change-Id: Icbdeb3a082e3e85f7d1698875529bfffbf6fa5f2

 nova/api/ec2/__init__.py                |    6 ++
 nova/api/ec2/cloud.py                   |   24 ++++-
 nova/exception.py                       |   12 ++-
 nova/tests/api/ec2/test_ec2_validate.py |  180 +++++++++++++++++++++++++++++++
 4 files changed, 217 insertions(+), 5 deletions(-)

commit 4289b6459707b656e61ff06669a3ed4baf2433e0
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Feb 15 15:44:29 2012 +0000

    fix pre_block_migration() interaction with libvirt cache
    
    Fixes bug 932179
    
    * nova/virt/libvirt/connection (pre_block_migration):
    Don't pass the 'ephemeral_gb' attribute as the size,
    since this has the wrong units and is the wrong quantity
    to pass anyway.  Also don't check for file existence,
    or create the cow image as this is done within _cache_image()
    
    Change-Id: Id723ec8d119dacd4660e88e546e05af417c736fc

 nova/virt/libvirt/connection.py |   29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

commit 5d3dbb4127785c77604602cd1737b75e30126b6e
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Feb 17 11:07:40 2012 -0600

    Query directly for just the ip
    
    * Fixes LP934356
    
    Change-Id: I99b1501b1ef86eafb89fe9416f2668e4325a3656

 nova/api/metadata/handler.py |   17 +++++++----------
 nova/network/api.py          |    6 ++++++
 nova/network/manager.py      |    6 +++++-
 nova/tests/test_metadata.py  |   13 ++++++++-----
 4 files changed, 26 insertions(+), 16 deletions(-)

commit 55bc3d927739f98a002c4590b196aa6780fa8fbf
Merge: b528c4a 1dcf149
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 22:49:46 2012 +0000

    Merge "Pulls the main components out of deallocate."

commit b528c4a1c9cc38223fa8dee3b3b063359f4fba18
Merge: 2471629 b661919
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 22:39:56 2012 +0000

    Merge "Adding traceback to async faults"

commit 8297a1bed0b00447bd01a4501ab9eac88a5865e3
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Thu Feb 9 15:53:50 2012 +0000

    bug 929462: compile_diagnostics in xenapi erronously catch XenAPI.Failure
    
    ensure we catch the right exception. Plus turn test_diagnostics into a
    more thorough unit test.
    
    Change-Id: I1aae28b9b3b942f08e419cd9cfa48dea003e96d9

 MANIFEST.in                  |    1 +
 nova/tests/test_xenapi.py    |   19 +-
 nova/tests/xenapi/vm_rrd.xml |11293 ++++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/fake.py     |    6 +-
 nova/virt/xenapi/vm_utils.py |    6 +-
 5 files changed, 11320 insertions(+), 5 deletions(-)

commit a0651f4b19f84fe926fd5c9bf81a2da059aa996d
Author: Michael Still <mikal@stillhq.com>
Date:   Sat Feb 18 09:29:10 2012 +1100

    Use new style instance logging in compute api.
    
    Change-Id: I4e5682e902faf0fbcea5c85900d8e3da89482cc8

 nova/compute/api.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 13789e970beaf932add81f71a2ab528aa309a231
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Feb 17 22:11:46 2012 +0000

    Fix traceback running instance-usage-audit
    
    There were two errors here:
        1 was a missed joinload that was causing an error pulling info_cache.
        2 the exception listed in the bug, which was caused by tring to load data for a deleted instance.
    
    This fixes bug 934539
    
    Change-Id: Ifffb6a35c1f7bf8caa6f57d33b29b58d0dbe10b3

 nova/compute/utils.py     |    2 +-
 nova/db/sqlalchemy/api.py |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 6cb1658459d7906d81882c29f22d7d1e5ba22c69
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Feb 14 15:38:22 2012 -0800

    Actual fix for bug 931608.
    
    -x --stop is a nose flag
    Provide short term solution to deal with '--hide-elapsed'
    
    Can be tested by adding a assertTrue(False) in a test and running
    ./run_tests.sh -x
    
    Change-Id: I7357e7cdaa3d6370ed111d6209917a833d084db3

 nova/testing/runner.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 24716297334bccee029de62151bada216d896a3f
Merge: 9535c09 1b207d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 21:41:34 2012 +0000

    Merge "Simple way of returning per-server security groups"

commit 9535c092cb4bb60b5a983c07690412ca6d95ac36
Merge: a485d97 b61e1ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 21:27:13 2012 +0000

    Merge "Enables hairpin_mode for virtual bridge ports, allowing NAT reflection"

commit a485d973b38bb09c764079af274d22da641a512e
Merge: 454ca0c 5993663
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 21:10:57 2012 +0000

    Merge "Add JSONFormatter"

commit 454ca0c12da8967352a1b189256f307d8ad3da3f
Merge: 4a9791b 6a951c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 21:00:48 2012 +0000

    Merge "The security_group name should be an XML attribute"

commit 4a9791b4c76e2516586caa72effda3c1f8e635ab
Merge: 18a8eae 46f7ada
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 20:50:37 2012 +0000

    Merge "improve stale libvirt images handling fix. Bug 801412"

commit c30193fbf5c0f2e77b09a44803246732c10e211d
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Wed Feb 15 16:48:50 2012 +0000

    Support non-UTC timestamps in changes-since filter
    
    Fixes nova aspect of lp 837464
    
    Prevously only Zulu time was supported in the changes-since filter,
    i.e. timestamps formatted as %Y-%m-%dT%H:%M:%SZ
    
    We now support arbitrary timezones, with the offset from UTC expressed
    via the ISO 8601 ±hh:mm notation.
    
    Microsecond accurracy is also optionally supported in timestamps.
    
    Notes:
    
    - nova.utils.parse_isotime(), isotime() & normalized_time() are
      prime candidates for promotion to openstack-common, as these
      methods were duplicated from my corresponding glance patch:
    
        https://review.openstack.org/#change,4198
    
    - this patch introduces a new dependency on python-iso8601, which
      has already been packaged for Fedora, EPEL and Ubuntu/Debian.
    
    Change-Id: I89b45f4f3d910606c578d927420f78cea94f4e3b

 nova/db/sqlalchemy/api.py                        |    2 +-
 nova/tests/api/openstack/compute/test_servers.py |    4 +-
 nova/tests/test_utils.py                         |  109 +++++++++++++++++++++-
 nova/utils.py                                    |   23 ++++-
 tools/pip-requires                               |    1 +
 5 files changed, 132 insertions(+), 7 deletions(-)

commit 18a8eae4bfa6f022ea97155596dfb80ae7401ed6
Merge: ee541f0 d1bc92f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 20:40:15 2012 +0000

    Merge "Fix bug 929427"

commit ee541f0a7e447adb000d7a4f5e9f98e2dce33362
Merge: 8a274a7 dd35a26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 20:25:26 2012 +0000

    Merge "Adding tests for NovaException printing"

commit 942762d48afc81f1f71652b0861953e32c78b124
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Feb 15 15:37:57 2012 -0800

    Add additional information to servers output.
    
     * Improves cloud debugability, by letting admins see on which host a
       server has been launched
     * Addresses blueprint optional-host-and-admin-information
     * Add test
     * Rebase to master, fix tests accordingly
    
    Change-Id: Iba173ca3b1ead716e274f1d287cebbc7961d8a93

 etc/nova/policy.json                               |    1 +
 .../compute/contrib/extended_server_attributes.py  |  129 ++++++++++++++++++++
 .../contrib/test_extended_server_attributes.py     |   95 ++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/policy.json                             |    1 +
 5 files changed, 227 insertions(+)

commit b661919b172f25d9a8f47e3131497c947fa21a9f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Feb 9 00:15:10 2012 +0000

    Adding traceback to async faults
    
    Fixes bug 930278
    
    Change-Id: If70922e07c68275459d0d3ca8d7cfc6fee20f425

 nova/api/openstack/compute/views/servers.py      |   14 ++-
 nova/compute/manager.py                          |   38 ++++---
 nova/exception.py                                |   18 +++-
 nova/tests/api/openstack/compute/test_servers.py |  116 +++++++++++-----------
 nova/tests/test_compute.py                       |   62 +++++++++---
 5 files changed, 157 insertions(+), 91 deletions(-)

commit 8a274a78ed9e989bc26328d020708341e932a984
Merge: 1239741 7ffbff4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 20:14:47 2012 +0000

    Merge "improve injection diagnostics when nbd unavailable. Bug 755854"

commit 1239741ca8267abd54f911400cd87507d1f3b94d
Merge: 638bc90 b541794
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 20:04:18 2012 +0000

    Merge "Move translations to babel locations."

commit 638bc907858e4da06ba2676fe704bfe46177b708
Merge: e5b5a26 d2452da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 19:54:36 2012 +0000

    Merge "bug 931356: nova-manage prints libvirt related warnings if libvirt isn't installed"

commit e5b5a26e26bd327956cc35100333089d74d13580
Merge: 9c1baff e023c28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 19:45:07 2012 +0000

    Merge "Add some more comments to _get_my_ip()."

commit 9c1baff7467ac85fb912dedb580db8c244375e0e
Merge: 1a3aa2d bc79c95
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 19:34:36 2012 +0000

    Merge "Use new style instance logging in compute manager."

commit 1a3aa2d55f99c8598ea61883bc25d1f86ec153da
Merge: 00d2781 181d8de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 19:07:23 2012 +0000

    Merge "Run ovs-ofctl as root"

commit 1dcf149bb3567f84c87c7eb2d6cf539a3b713727
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Feb 15 17:45:31 2012 -0600

    Pulls the main components out of deallocate.
    
    deallocate_for_instances is basically deallocate
    the port, then delete the vif. This separates
    them.
    
    update one: hacking within the lines
    update two: another hacking fix
    update three: rebase
    update four: rebase and detrailingslashify
    
    Change-Id: I01e06a9225d7825af5d404d5815f5084c7660799

 nova/network/quantum/manager.py |  106 +++++++++++++++++++++------------------
 nova/tests/test_quantum.py      |   29 ++++++++++-
 2 files changed, 84 insertions(+), 51 deletions(-)

commit 00d2781b50031c01550192e3bbd8e43b491a17ee
Merge: 095552b b01933a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 18:57:51 2012 +0000

    Merge "Print friendly message if no floating IPs exist."

commit 095552b279372990fb56ddd82076dc26246c6439
Merge: c159145 26a5594
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 18:48:00 2012 +0000

    Merge "LOG.exception does not take an exc_info keyword"

commit 5993663698c148e2747def3cfd21ee1a1d703ada
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Feb 16 12:08:06 2012 -0600

    Add JSONFormatter
    
    * Allows formating log messages in JSON format
    
    Change-Id: I9c5b4e20fff0a055b7178acaf862e838d62abaa0

 nova/log.py            |   50 +++++++++++++++++++++++++++++++++++++++++++-
 nova/tests/test_log.py |   54 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 1 deletion(-)

commit c1591451f69e81ea5563757cbac5f49dc446b3cd
Merge: 97c0895 2f317ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 18:38:07 2012 +0000

    Merge "Allow file logging config"

commit 97c08950ae660a4e60893d57f21f52657156b999
Merge: 63cf956 fcbba45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 18:04:15 2012 +0000

    Merge "InstanceNotFound exceptions for terminate_intance now Log warning instead of throwing exeptions."

commit 63cf95634395dc37bdd46fa7b7dfdbf47592d42a
Merge: 8951762 4a4c274
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:52:22 2012 +0000

    Merge "Get rid of distutils.extra."

commit 895176203640d2608062fab26efc6e8120e11b21
Merge: 52fbabc d02ac90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:42:18 2012 +0000

    Merge "Adding logging for 500 errors."

commit 52fbabc8af78defa00a77f5f24ae98eb28abcb29
Merge: ea653ad e6c07cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:31:51 2012 +0000

    Merge "run_tests.sh fix"

commit 2f317ba79f262a8cd325844a1a258efab22e5fa1
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Feb 13 16:26:31 2012 -0600

    Allow file logging config
    
    * Fixes lp904305
    * remove module level log functions (getLogger to rule them all)
    * Move specific Environment logging to the one place it is used
    * Wrap getLogger to return a logger wrapped in a NovaContextAdapter
    * Do not overwrite the root logger
    * save_and_reraise_exception logs via error for passing exc_info
    * Uses CommonConfigOptions for compatability across Openstack Projects
    * Prefers CommonConfigOptions over legacy options
    * Install a NullHandler on the root logger if configured by FLAGS
    * Include example logging config file to mimic Nova defaults
    
    Change-Id: Ie59c3f755c142e2b7dc3b94b4e82e142e157bfac

 etc/nova/logging_sample.conf |   76 +++++++++
 nova/__init__.py             |    7 +-
 nova/api/ec2/__init__.py     |   10 +-
 nova/flags.py                |   10 +-
 nova/log.py                  |  384 +++++++++++++++++-------------------------
 nova/tests/test_log.py       |   60 ++++---
 nova/tests/test_notifier.py  |    2 +-
 nova/tests/test_volume.py    |   17 +-
 nova/utils.py                |    6 +-
 9 files changed, 284 insertions(+), 288 deletions(-)

commit ea653adbacdaa7ab37c2595af878a729b6b9236d
Merge: 6769652 aee45cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:21:33 2012 +0000

    Merge "Fix API extensions documentation, bug 931516."

commit 676965280136407c9f69072e6fa468e9e2ea14eb
Merge: 8456f26 e48c252
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:10:58 2012 +0000

    Merge "Create a flag for force_to_raw for images"

commit 8456f265b273b38e5ff28940ebfde6ecddae76b0
Merge: 196da29 80c9a27
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 17:00:04 2012 +0000

    Merge "fixed bug 928749"

commit 196da29bb222ba151a4bbdbf26ebab548824f1e1
Merge: e45b8bf 4118c54
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 16:49:31 2012 +0000

    Merge "Syncs vncviewer mouse cursor when connected to Windows VMs"

commit 26a5594cdbb1c399703ee94faa5648d2eba8feae
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Feb 17 16:16:04 2012 +0000

    LOG.exception does not take an exc_info keyword
    
    It will automatically call sys.exc_info() anyway
    
    Change-Id: I6a279bb18d913938d933a486e42a3be38bfaccb4

 nova/virt/xenapi/vmops.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit fcbba45dcf09f6087fabfaff1bcb960f0693ae76
Author: Nikhil Komawar <nikhil.komawar@rackspace.com>
Date:   Fri Feb 17 02:24:08 2012 +0000

    InstanceNotFound exceptions for terminate_intance now Log warning
    instead of throwing exeptions.
    
    fixes bug 933012
    
    Change-Id: Ib6c6c33e26125b561bd5a1bc1e710016746e7e44

 nova/compute/manager.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit e45b8bf0a4b40179319522ccd72bba69565caec6
Merge: a53f057 4711505
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 16:36:35 2012 +0000

    Merge "removed unused method and added another test"

commit a53f057313a7955d9a5024edd7b8c3baa9af558d
Merge: 870b954 e35cc0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 16:26:20 2012 +0000

    Merge "Remove all uniqueness constraints in migration 76"

commit 870b954ec2a50167aae2ff6d3b7599c71e0eeda6
Merge: 57da3b1 75d38d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 16:16:10 2012 +0000

    Merge "Resolve bug/927714 -- get instance names from db."

commit 57da3b12b14ce7676b51904c97a4685692d7b5cc
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Feb 17 11:44:27 2012 +0000

    bug 933620: Error during ComputeManager._poll_bandwidth_usage
    
    add missing session to model query.
    
    Change-Id: I3cb8ebcff1fd286ef198f33514d4ce3d884c5921

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e825c4024f9feb18ca5e2416484ef4096c3bb06
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Wed Feb 8 00:02:54 2012 +0800

    Make database downgrade works
    
    Fixes bug #854905
    
    Use sqlalchemy reflection whenever possible:
        http://sqlalchemy-migrate.readthedocs.org/en/latest/versioning.html
    
    Work around sqlalchemy-migrate sqlite 'bool column not deletable' issue:
        http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=143
        Add following sql scripts for sqlite:
            002_sqlite_downgrade.sql
            015_sqlite_downgrade.sql
            033_sqlite_downgrade.sql
            050_sqlite_downgrade.sql
            068_sqlite_downgrade.sql
    
    Work around sqlalchemy-migrate sqlite 'table with foreign key column not
    deletable' issue:
        http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=94
        Add following sql scripts for sqlite:
            003_sqlite_downgrade.sql
            006_sqlite_downgrade.sql
            007_sqlite_downgrade.sql
            012_sqlite_upgrade.sql
            013_sqlite_downgrade.sql
            020_sqlite_downgrade.sql
            030_sqlite_downgrade.sql
            038_sqlite_downgrade.sql
            042_sqlite_downgrade.sql
            053_sqlite_downgrade.sql
            067_sqlite_downgrade.sql
    
    Work around sqlalchemy-migrate 'migrate drops engine reference' issue:
        http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=72
    
    Add following sql scripts for long primary key to work with utf-8
    mysql table:
        072_mysql_upgrade.sql
    
    Add following sql scripts for postgresql:
        002_postgresql_downgrade.sql
    
    Add snake walk test cases for database migration based on glance migration
    test.
    
    Change-Id: Ib454ecb4662bbf47736c1b12d9a4f969f180ceb6

 .../sqlalchemy/migrate_repo/versions/001_austin.py | 1059 +++++++++++---------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |  364 +++----
 .../versions/002_postgresql_downgrade.sql          |   20 +
 .../migrate_repo/versions/002_sqlite_downgrade.sql |  388 +++++++
 .../versions/003_add_label_to_networks.py          |   36 +-
 .../migrate_repo/versions/003_sqlite_downgrade.sql |  111 ++
 .../migrate_repo/versions/004_add_zone_tables.py   |   63 +-
 .../versions/005_add_instance_metadata.py          |   85 +-
 .../versions/006_add_provider_data_to_volumes.py   |   60 +-
 .../migrate_repo/versions/006_sqlite_downgrade.sql |  113 +++
 .../versions/007_add_ipv6_to_fixed_ips.py          |  101 +-
 .../migrate_repo/versions/007_sqlite_downgrade.sql |   79 ++
 .../versions/008_add_instance_types.py             |   50 +-
 .../versions/009_add_instance_migrations.py        |   62 +-
 .../versions/010_add_os_type_to_instances.py       |   23 +-
 .../migrate_repo/versions/011_live_migration.py    |   90 +-
 .../versions/012_add_ipv6_flatmanager.py           |  174 ++--
 .../migrate_repo/versions/012_sqlite_upgrade.sql   |  195 ++++
 .../versions/013_add_flavors_to_migrations.py      |   31 +-
 .../migrate_repo/versions/013_sqlite_downgrade.sql |   69 ++
 .../014_add_instance_type_id_to_instances.py       |   49 +-
 .../015_add_auto_assign_to_floating_ips.py         |   18 +-
 .../migrate_repo/versions/015_sqlite_downgrade.sql |   62 ++
 .../versions/016_make_quotas_key_and_value.py      |   24 +-
 .../017_make_instance_type_id_an_integer.py        |   11 +-
 .../versions/018_rename_server_management_url.py   |   14 +-
 .../versions/019_add_volume_snapshot_support.py    |   71 +-
 .../versions/020_add_snapshot_id_to_volumes.py     |   31 +-
 .../migrate_repo/versions/020_sqlite_downgrade.sql |  119 +++
 .../migrate_repo/versions/021_rename_image_ids.py  |   12 +-
 .../versions/022_set_engine_mysql_innodb.py        |    5 +-
 .../versions/023_add_vm_mode_to_instances.py       |   21 +-
 .../versions/024_add_block_device_mapping.py       |  102 +-
 .../versions/025_add_uuid_to_instances.py          |   18 +-
 .../migrate_repo/versions/026_add_agent_table.py   |   93 +-
 .../versions/027_add_provider_firewall_rules.py    |   70 +-
 .../versions/028_add_instance_type_extra_specs.py  |   64 +-
 .../versions/029_add_zone_weight_offsets.py        |   25 +-
 .../migrate_repo/versions/030_multi_nic.py         |  102 +-
 .../migrate_repo/versions/030_sqlite_downgrade.sql |  377 +++++++
 .../031_fk_fixed_ips_virtual_interface_id.py       |   11 +-
 .../versions/032_add_root_device_name.py           |   31 +-
 .../migrate_repo/versions/033_ha_network.py        |   14 +-
 .../migrate_repo/versions/033_sqlite_downgrade.sql |  193 ++++
 .../034_change_instance_id_in_migrations.py        |   20 +-
 .../migrate_repo/versions/035_secondary_dns.py     |   11 +-
 .../versions/036_change_flavor_id_in_migrations.py |   41 +-
 .../versions/037_instances_drop_admin_pass.py      |   29 +-
 .../versions/038_add_uuid_to_virtual_interfaces.py |   19 +-
 .../migrate_repo/versions/038_sqlite_downgrade.sql |   63 ++
 .../versions/039_add_instances_accessip.py         |   37 +-
 .../versions/040_add_uuid_to_networks.py           |   18 +-
 .../versions/041_add_config_drive_to_instances.py  |   20 +-
 .../versions/042_add_volume_types_and_extradata.py |  151 +--
 .../migrate_repo/versions/042_sqlite_downgrade.sql |  129 +++
 .../migrate_repo/versions/043_add_vsa_data.py      |   76 +-
 .../versions/044_update_instance_states.py         |   23 +-
 .../versions/045_add_network_priority.py           |   21 +-
 .../migrate_repo/versions/046_add_instance_swap.py |   37 +-
 .../versions/047_remove_instances_fk_from_vif.py   |    5 +-
 .../migrate_repo/versions/047_sqlite_downgrade.sql |    1 -
 .../migrate_repo/versions/048_add_zone_name.py     |   16 +-
 .../versions/049_add_instances_progress.py         |   20 +-
 .../versions/050_add_disk_config_to_instances.py   |   24 +-
 .../migrate_repo/versions/050_sqlite_downgrade.sql |  207 ++++
 .../051_add_vcpu_weight_to_instance_types.py       |   18 +-
 .../versions/052_kill_export_devices.py            |   48 +-
 ..._add_connection_info_to_block_device_mapping.py |   15 +-
 .../migrate_repo/versions/053_sqlite_downgrade.sql |   87 ++
 .../versions/054_add_bw_usage_data_cache.py        |   40 +-
 .../versions/055_convert_flavor_id_to_str.py       |   21 +-
 .../migrate_repo/versions/056_add_s3_images.py     |   44 +-
 .../versions/057_add_sm_driver_tables.py           |  146 +--
 .../versions/058_rename_managed_disk.py            |   11 +-
 .../versions/059_split_rxtx_quota_into_network.py  |   25 +-
 .../migrate_repo/versions/059_sqlite_downgrade.sql |  137 +--
 .../versions/060_remove_network_fk_from_vif.py     |    3 +-
 .../migrate_repo/versions/060_sqlite_downgrade.sql |    1 -
 .../versions/061_add_index_to_instance_uuid.py     |    4 +-
 .../versions/062_add_instance_info_cache_table.py  |   50 +-
 .../versions/063_add_instance_faults_table.py      |   53 +-
 ...ange_instance_id_to_uuid_in_instance_actions.py |   19 +-
 .../065_add_index_to_instance_project_id.py        |    4 +-
 .../066_preload_instance_info_cache_table.py       |    6 +-
 .../067_add_pool_and_interface_to_floating_ip.py   |   15 +-
 .../migrate_repo/versions/067_sqlite_downgrade.sql |   69 ++
 .../versions/068_add_instance_attribute.py         |   20 +-
 .../migrate_repo/versions/068_sqlite_downgrade.sql |  219 ++++
 .../migrate_repo/versions/069_block_migration.py   |   31 +-
 .../migrate_repo/versions/070_sqlite_downgrade.sql |    2 +-
 .../versions/070_untie_nova_network_models.py      |    3 +-
 .../versions/071_add_host_aggregate_tables.py      |  132 +--
 .../migrate_repo/versions/072_add_dns_table.py     |   64 +-
 .../migrate_repo/versions/072_mysql_upgrade.sql    |   13 +
 .../migrate_repo/versions/073_add_capacity.py      |   26 +-
 .../versions/074_change_flavor_local_gb.py         |   22 +-
 .../075_convert_bw_usage_to_store_network_id.py    |  103 +-
 .../versions/076_remove_unique_constraints.py      |    4 +-
 .../migrate_repo/versions/077_convert_to_utf8.py   |    3 +-
 .../versions/078_add_rpc_info_to_zones.py          |   34 +-
 .../migrate_repo/versions/078_sqlite_downgrade.sql |    2 +-
 .../versions/079_add_zone_name_to_instances.py     |    9 +-
 nova/tests/test_migrations.conf                    |    9 +
 nova/tests/test_migrations.py                      |  224 +++++
 run_tests.sh                                       |   13 +
 105 files changed, 5134 insertions(+), 2293 deletions(-)

commit 5073c4506eb0fee2c732509ace2729c3aca05769
Merge: ba930e0 516582b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 06:13:31 2012 +0000

    Merge "077_convert_to_utf8: Convert *all* FK tables early"

commit ba930e035b65eaead5e7ea3525ea5afc5e6d41ad
Merge: 31d1a42 1c8ad45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 04:10:17 2012 +0000

    Merge "Completes fix for LP #928910 - libvirt performance"

commit 181d8de082090f77bb6f5b8b816e172005f6a38c
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Fri Feb 17 10:54:58 2012 +0900

    Run ovs-ofctl as root
    
    Since ovs-ofctl requires root privilege, nova-network would
    fail during allocate_for_instance. This fixes the issue.
    
    Change-Id: I188f1a4fdf4998c51f8626b37efd175039d23227

 nova/network/linux_net.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 516582b62d785d25044b0f852eb7e42a2b22558e
Author: Adam Gandelman <adamg@canonical.com>
Date:   Tue Feb 14 10:40:29 2012 -0800

    077_convert_to_utf8: Convert *all* FK tables early
    
    The original migration only takes care of migrating the instances
    table before all others.  It turns out, when using MySQL with InnoDB
    by default, there are many other tables with FKs that need to be converted
    early on as well (see bug description for schema diagram).
    
    Fixes bug 931602
    
    Update: Convert all tables in a predefined order from within the same
    execution.
    
    Update: Avoid hard-coding database, fixes bug 930863
    
    Update: Fix pep8 spacing
    
    Change-Id: Ideb619eecef2ad067bda5c26612f761674dee924

 .../migrate_repo/versions/077_convert_to_utf8.py   |   47 ++++++++++----------
 1 file changed, 24 insertions(+), 23 deletions(-)

commit 269c0fca4d2dd78fecdd142047c5198b41c4e7d7
Author: Dave Lapsley <dlapsley@nicira.com>
Date:   Wed Feb 15 18:04:23 2012 -0500

    Fix bug 933147 Security group trigger notifications.
    
    Add a lightweight mechanism to allow security group trigger
    notifications to be propagated to quantum security group handlers.
    
    Add a global flag: "security_group_handler" to allow for runtime
    selection of security group handler class.
    
    Change-Id: I8a3768c26c97020071ad4e52d3a22d8898e72e9f

 nova/api/ec2/cloud.py                              |   14 ++
 .../openstack/compute/contrib/security_groups.py   |   14 +-
 nova/flags.py                                      |    3 +
 nova/network/manager.py                            |    5 +-
 nova/network/quantum/sg.py                         |  159 ++++++++++++++++++++
 5 files changed, 193 insertions(+), 2 deletions(-)

commit 509e5ad9ef6ed38caa69d2c76b1adccedcdd315e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 9 15:05:21 2012 -0800

    Fixes nova-volume support for multiple luns
    
     * stores lun in provider_location if specified
     * passes lun in iscsi_properties instead of hard coding
     * adds call to libvirt to list all used block devices
     * make sure to synchronize connect and disconnect commands
     * only disconnect from target if no luns are in use
     * allow double logins to targets
     * fixes typo in get_volume_connector in xenapi_connection
     * fixes bug 929790
    
    Change-Id: I2466dc750a6fa5e0b07f94314d38873740aa6b29

 nova/tests/test_libvirt.py      |   89 ++++++++++++++++++++++++++++++++++++++-
 nova/tests/test_xenapi.py       |    1 +
 nova/virt/libvirt/connection.py |   20 +++++++++
 nova/virt/libvirt/volume.py     |   42 +++++++++++-------
 nova/virt/xenapi_conn.py        |    2 +-
 nova/volume/driver.py           |   40 ++++++++++--------
 6 files changed, 159 insertions(+), 35 deletions(-)

commit 31d1a423761ac2d68d227559f4e3f424487333be
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 16 16:32:56 2012 -0800

    Normalize odd date formats
    
    The 'updated' value on the extension seems to be returned (in the XML) unaltered.
    Some of the date values were 'untraditional', and this broke XML parsing.
    
    Change-Id: I2803e19207af85207b4eca71e1e8b0d5bdcfa4b6

 nova/api/openstack/compute/contrib/disk_config.py  |    2 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |    2 +-
 nova/api/openstack/compute/contrib/networks.py     |    2 +-
 .../openstack/compute/contrib/server_start_stop.py |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit e35cc0baed1024cdf7663e144a28e06c1f4e5d2e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Feb 16 16:26:49 2012 -0800

    Remove all uniqueness constraints in migration 76
    
    Fixes bug 932867
    
    Change-Id: I5b72af7c36cc07ee4f3e23566ed4e91c0c53b10b

 .../versions/076_remove_unique_constraints.py      |   22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit 844035b6c0f725c685cdff56a7bb77efe7825a5f
Merge: 7162ee5 00c77e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 00:16:26 2012 +0000

    Merge "bug 931604: improve how xenapi RRD records are retrieved"

commit 7162ee5077f73f35be1488c413ae485897fc68e7
Merge: 5a21a28 ac1522c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 17 00:03:34 2012 +0000

    Merge "Declare deprecated auth flag before its used."

commit 5a21a28b53e436c6fac9f6f58a09ca2007b8d63b
Merge: 1e5606f c8c9a87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 23:52:59 2012 +0000

    Merge "Add RPC serialization checking, fix exposed problems."

commit 1e5606f4c26b9b01fddcdc2c62199248f9cef004
Merge: 99ba9c1 5f1231d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 23:42:25 2012 +0000

    Merge "Remove instance_get stubs from server action tests"

commit 99ba9c1abc8949f923522b7656c3ea270cd155a1
Merge: 8497435 068f31c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 23:31:36 2012 +0000

    Merge "Don't send a SQLAlchemy model over rpc."

commit c8c9a87b240b562d334c6875a1dd7614d4ae58d5
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 16 15:52:16 2012 -0500

    Add RPC serialization checking, fix exposed problems.
    
    Related to bug 933584.
    
    In this bug, I hit a case where some code tried to send a SQLAlchemy
    model over rpc, which failed since it couldn't be serialized by Qpid.
    This patch adds a simple serialization check to the fake RPC driver
    using json.  It also fixes problems that were exposed by adding this
    check.
    
    If json can't serialize a message sent through the fake RPC
    driver, it will raise TypeError, causing unit tests to fail.  18 unit
    tests failed with the check in place, but it was due to only 2 places
    in the compute API.
    
    Change-Id: I63f3077c0fa35097d4f5d2c485f4e48eede2c751

 nova/compute/api.py   |   20 +++++++++++---------
 nova/rpc/impl_fake.py |   11 ++++++++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

commit 068f31c6cd3eff68f08ee597f7296e4f6e47388f
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Feb 16 14:39:10 2012 -0500

    Don't send a SQLAlchemy model over rpc.
    
    Fix bug 933584.
    
    I noticed this when Qpid blew up because it didn't know how to serialize
    a SQLAlchemy model.  Fix it by making it only consist of primitive types
    before sending it.
    
    Change-Id: I63eb4bbabdb75fa7b277428bbd1aa2c2e1383383

 nova/network/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8497435226aa65bb69abdb68a1d6cc94be7966e9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 16 22:52:54 2012 +0000

    Adds back e2fsck exit code checking.
    
    References bug 931743
    
    Change-Id: Id9e71b722e2a3b18821bceffdf138ba3895cfcf1

 nova/virt/xenapi/vm_utils.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4118c54d9c81b3bfe2b475f5124f329c985d9f5f
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed Feb 8 12:54:41 2012 -0500

    Syncs vncviewer mouse cursor when connected to Windows VMs
    
    Fixes bug#885966
    
    Change-Id: Ie78ab1fc265dda61ceb5553e3156d08902115a65

 nova/virt/libvirt.xml.template  |    3 +++
 nova/virt/libvirt/connection.py |    3 +++
 2 files changed, 6 insertions(+)

commit fc69f038bb3dca554475bbdd6844996d2d07a23e
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon Feb 6 09:50:06 2012 +0800

    Backslash continuations (nova.tests)
    
    Fixes bug #925285
    
    Backslash continuations removal for package nova.tests
    
    Change-Id: I089dfb9a06a807e58ebb21329800a4eff40ed2bb

 .../openstack/compute/contrib/test_aggregates.py   |    6 +-
 .../compute/contrib/test_createserverext.py        |   96 ++++++-------
 .../api/openstack/compute/contrib/test_vsa.py      |   36 ++---
 nova/tests/api/openstack/compute/test_flavors.py   |    4 +-
 nova/tests/api/openstack/compute/test_limits.py    |    4 +-
 nova/tests/api/openstack/compute/test_servers.py   |   12 +-
 nova/tests/api/openstack/fakes.py                  |    4 +-
 nova/tests/api/openstack/test_wsgi.py              |    4 +-
 nova/tests/baremetal/test_proxy_bare_metal.py      |   18 +--
 nova/tests/baremetal/test_tilera.py                |   51 +++----
 nova/tests/db/fakes.py                             |   19 ++-
 nova/tests/scheduler/test_vsa_scheduler.py         |   38 +++---
 nova/tests/test_api.py                             |    4 +-
 nova/tests/test_compute.py                         |   31 ++---
 nova/tests/test_direct.py                          |    4 +-
 nova/tests/test_instance_types.py                  |    4 +-
 nova/tests/test_iptables_network.py                |    8 +-
 nova/tests/test_iscsi.py                           |   36 ++---
 nova/tests/test_libvirt.py                         |   40 +++---
 nova/tests/test_linux_net.py                       |  142 +++++++++-----------
 nova/tests/test_log.py                             |    5 +-
 nova/tests/test_network.py                         |   21 ++-
 nova/tests/test_nova_manage.py                     |    6 +-
 nova/tests/test_quantum.py                         |    8 +-
 nova/tests/test_quota.py                           |    4 +-
 nova/tests/test_volume_types.py                    |    3 +-
 nova/tests/test_xenapi.py                          |   29 ++--
 nova/tests/xenapi/stubs.py                         |   16 +--
 28 files changed, 319 insertions(+), 334 deletions(-)

commit 6a951c77adf6d513a434bf65d46e3a0745b750f7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 16 00:13:41 2012 -0800

    The security_group name should be an XML attribute
    
    It is everywhere apart from in servers.py.  We have to be backwards
    compatible, so we check the attribute first, and then check the element.
    
    Bug #933785
    
    Change-Id: I66b96376043e665a026eff5c33aa0731a81730cc

 nova/api/openstack/compute/servers.py |    6 +++---
 nova/api/openstack/wsgi.py            |   11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

commit 34d77ac8b1919a287865a4bef376579b6bf09b48
Merge: 26227b7 c729ba8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 21:41:43 2012 +0000

    Merge "Core modifications for future zones service."

commit c729ba8c0aa4d283e84d139bc98e0e89fd933c4a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Jan 15 23:29:41 2012 -0800

    Core modifications for future zones service.
    
    Makes compute/network/volume API classes pluggable
    Splits some code out in compute/api
    Adds some race condition checking on deletes in compute/api
    Make instance_delete support UUIDs
    Add support to RPC to cast to specific servers
    Migrations for future zones
    
    Change-Id: Ibee126cd6d325e11770f27589e79dfd0e6104b99

 nova/compute/__init__.py                           |    7 +-
 nova/compute/api.py                                |   55 +++++++++------
 nova/db/sqlalchemy/api.py                          |   16 +++--
 .../versions/078_add_rpc_info_to_zones.py          |   44 ++++++++++++
 .../migrate_repo/versions/078_sqlite_downgrade.sql |   35 ++++++++++
 .../versions/079_add_zone_name_to_instances.py     |   31 +++++++++
 nova/db/sqlalchemy/models.py                       |    7 ++
 nova/flags.py                                      |   11 ++-
 nova/network/__init__.py                           |    7 +-
 nova/rpc/__init__.py                               |   31 +++++++++
 nova/rpc/amqp.py                                   |   22 +++++-
 nova/rpc/impl_kombu.py                             |   44 +++++++++---
 nova/rpc/impl_qpid.py                              |   36 ++++++++--
 .../tests/api/openstack/compute/test_extensions.py |    1 -
 nova/tests/api/openstack/compute/test_servers.py   |    1 +
 nova/tests/rpc/test_kombu.py                       |   60 +++++++++++++++-
 nova/tests/rpc/test_qpid.py                        |   72 +++++++++++++++++---
 nova/volume/__init__.py                            |    7 +-
 18 files changed, 429 insertions(+), 58 deletions(-)

commit 5f1231d5968e644a2be7b43a3cb94cd2a7e6a248
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Feb 16 14:21:09 2012 -0500

    Remove instance_get stubs from server action tests
    
    I noticed these stubs while reviewing the dependent branch. They aren't
    needed anymore. I tried to clean up some of the stub helpers as well.
    
    Change-Id: I41cf93da392f76c150da2fa3125cfe4930a76f11

 .../api/openstack/compute/test_server_actions.py   |   64 ++++++--------------
 1 file changed, 17 insertions(+), 47 deletions(-)

commit 471150506653e697fc5a663d4d8b09ef5fbef19b
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Feb 16 11:41:48 2012 -0600

    removed unused method and added another test
    
    get_network_id_by_cidr is not used, I'm removing
    it and it's tests.
    
    get_tenant_id_by_net_id relies on catching
    exceptions as part of the happy path. I expanded
    the tests to try to exemplify that.
    
    Change-Id: Iaf973da1d176ba8ea89d0fd762e796936d056d0f

 nova/network/quantum/melange_ipam_lib.py |   18 +++-----------
 nova/network/quantum/nova_ipam_lib.py    |    9 -------
 nova/tests/test_melange_ipam_lib.py      |   39 +++++++++++++++---------------
 3 files changed, 23 insertions(+), 43 deletions(-)

commit b61e1ea12cd41ea507b1f6496ec1413c93bd679b
Author: Evan Callicoat <diopter@gmail.com>
Date:   Thu Feb 16 07:28:31 2012 +0000

    Enables hairpin_mode for virtual bridge ports, allowing NAT reflection
    
    * enables hairpin_mode on virtual bridge ports on instance spawn
    * adds conntrack DNAT state criteria to fixed/fixed SNAT exception so reflected traffic SNATs
    * updates get_interface ElementTree to work with Python 2.6/2.7
    * fixes bug 933640
    
    Change-Id: I63b3e91b41898fcffda8a288be503f9b740b4b4e

 Authors                         |    1 +
 nova/network/linux_net.py       |    1 +
 nova/virt/libvirt/connection.py |   18 +++++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

commit 26227b79e9246a87eeb83766cfcc8e96d294d28b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 30 13:10:50 2012 -0800

    Removed zones from api and distributed scheduler
    
    There is a new Zones implementation coming that will use AMQP-to-AMQP
    channels vs. the public API. This is being done for three reasons:
    1. remove complications in the OpenStack API (and possibly allow EC2 Zones)
    2. remove dependencies on keystone and novaclient
    3. faster scheduling (fewer chances for race conditions)
    
    Learn more here:
    http://wiki.openstack.org/EssexSchedulerImprovements
    
    Change-Id: I6fe538923dd5ae19276afac2ac3311a285fd5c99

 doc/source/devref/distributed_scheduler.rst        |  118 +------
 doc/source/devref/zone.rst                         |  125 -------
 .../image_src/zones_distsched_illustrations.odp    |  Bin 182810 -> 0 bytes
 .../images/nova.compute.api.create_all_at_once.png |  Bin 62263 -> 0 bytes
 etc/nova/policy.json                               |    1 -
 .../api/openstack/compute/contrib/admin_actions.py |   20 --
 .../openstack/compute/contrib/console_output.py    |    2 +-
 nova/api/openstack/compute/contrib/consoles.py     |    2 +-
 nova/api/openstack/compute/contrib/disk_config.py  |    6 -
 .../openstack/compute/contrib/extended_status.py   |    2 +-
 .../compute/contrib/server_diagnostics.py          |    3 -
 nova/api/openstack/compute/contrib/zones.py        |  228 ------------
 nova/api/openstack/compute/servers.py              |   58 +--
 nova/compute/api.py                                |   88 +----
 nova/exception.py                                  |   13 -
 nova/flags.py                                      |    9 -
 nova/scheduler/api.py                              |  372 +-------------------
 nova/scheduler/distributed_scheduler.py            |  184 +---------
 nova/scheduler/driver.py                           |   22 +-
 nova/scheduler/least_cost.py                       |   18 +-
 nova/scheduler/manager.py                          |   14 -
 nova/scheduler/multi.py                            |    4 -
 nova/scheduler/vsa.py                              |    2 +-
 nova/scheduler/zone_manager.py                     |  168 ---------
 .../compute/contrib/test_extendedstatus.py         |    4 +-
 .../api/openstack/compute/contrib/test_zones.py    |  283 ---------------
 .../tests/api/openstack/compute/test_extensions.py |    3 +-
 .../api/openstack/compute/test_server_actions.py   |   25 +-
 nova/tests/api/openstack/compute/test_servers.py   |  120 +------
 nova/tests/scheduler/fakes.py                      |    2 -
 nova/tests/scheduler/test_distributed_scheduler.py |  201 +----------
 nova/tests/scheduler/test_scheduler.py             |   32 --
 nova/tests/scheduler/test_zone_manager.py          |  189 ----------
 nova/tests/test_compute.py                         |   31 --
 34 files changed, 99 insertions(+), 2250 deletions(-)

commit d1bc92fdbd3aa42b15beeb5eaf2987365247cfa2
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Wed Feb 15 11:47:28 2012 +0100

    Fix bug 929427
    
    We ensure that we are getting the info from a QCOW2 image, not anything
    else.
    
    Change-Id: I8b6bd504da8d52bb9902c917360f0465f9002551

 nova/virt/libvirt/connection.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f5e17bbc155203feb8bba4f34ed93d22b1b8e95b
Merge: d2f2df5 b624548
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 04:00:21 2012 +0000

    Merge "Tests for a melange_ipam_lib, who is missing tests"

commit d2f2df5a3ba5c3300899d95d4c96c2a80ffc896d
Merge: 0333d6d 99b9691
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 03:23:01 2012 +0000

    Merge "Different exit code in new versions of iscsiadm"

commit 0333d6da8e6710215f05a7532e48328fd6334105
Merge: 3e1cff3 bd99c61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 01:32:19 2012 +0000

    Merge changes I8c559483,If92c613b
    
    * changes:
      fix a syntax error in libvirt.attach_volume() with lxc
      tests: fix LdapDNS to allow running test_network in isolation

commit b6245485b97b2b286b0554059f258148ec5466ff
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Feb 15 11:57:38 2012 -0600

    Tests for a melange_ipam_lib, who is missing tests
    
    Change-Id: I907964370a7fa47af561704a1105b7299314c6ad

 nova/tests/test_melange_ipam_lib.py |  237 +++++++++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)

commit e48c252467b280986660d5ea8ed618f1ccf08d5d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 14 09:03:18 2012 -0800

    Create a flag for force_to_raw for images
    
     * Allows for deployers to use compressed images if they prefer
     * Flag defaults to current behavior
     * Fixes bug 932180
     * Re-enables fetch_to_raw which was being skipped
     * Removes obsolete and broken method from libvirt
     * Checksumming will be re-enabled in a later patch
    
    Change-Id: I40c33cfd3997cae8d127fa45f8cf0aa071418170

 nova/tests/test_libvirt.py      |    4 ++--
 nova/virt/images.py             |   26 ++++++++++++++++++--------
 nova/virt/libvirt/connection.py |   17 +----------------
 nova/virt/libvirt/utils.py      |    4 +---
 4 files changed, 22 insertions(+), 29 deletions(-)

commit 75d38d59f1743ad594831ce5bc1a123be263495a
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Feb 14 19:17:12 2012 +1100

    Resolve bug/927714 -- get instance names from db.
    
    I thought when I wrote the imagecache code for libvirt that the
    instance names were of a fixed format. That is not correct. First
    off the format is set in the instance_name_template flag. Worse
    than that, it can change over time and old instances are not
    renamed. So, now I check the database to see if the directory
    name is a valid instance name (for this machine).
    
    Change-Id: I318215aef5a10cee32959fd947ad628edff293a2

 nova/tests/test_imagecache.py   |   38 +++++++++++++++++++++++++++++++++++---
 nova/virt/libvirt/imagecache.py |   12 +++++++++++-
 2 files changed, 46 insertions(+), 4 deletions(-)

commit aee45cc4abdc0ae311cfb22a08a0fee1139b4fd0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Feb 15 18:51:36 2012 -0500

    Fix API extensions documentation, bug 931516.
    
    This patch fixes the docs so that the API extensions documentation gets
    included.  In passing, also update the API extensions index to include
    an extension that was not listed.
    
    Change-Id: Ia16cab2b29bbc121d940dc4ed9f033340935cde8

 doc/source/api_ext/index.rst |    1 +
 doc/source/index.rst         |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 3e1cff368a6445ea3ae176dcab6fd485c9280ad0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 13 18:33:18 2012 -0600

    misc networking fixes
    
    o fixed dns bug where dns was gotten from the wrong subnet
    o project_id passed to get_instance_nw_info for when context.project_id
      is null
    o removed line breaks around quantum client request to improve
      readability
    o project_id passed into vif creation instead of using context
    o exception handling around get_attached_ports in quantum connection
    o updated object id generation to start with 1 in network_fake
    o updated the fake subnets returned in the network_fake
    o added proper v6 address generation to network_fake
    o improved get_instance_nw_info test
    o update api.openstack.compute.test_servers around improved network fake
    
    Change-Id: I74d0a9dbfcbd38e2fbc7d7fefc2587e578980b6e

 nova/compute/utils.py                            |    2 +-
 nova/network/api.py                              |    3 +-
 nova/network/manager.py                          |    7 +-
 nova/network/quantum/client.py                   |    2 +-
 nova/network/quantum/manager.py                  |   23 +++---
 nova/network/quantum/quantum_connection.py       |   17 +++--
 nova/tests/api/openstack/compute/test_servers.py |   82 +++++++++++-----------
 nova/tests/fake_network.py                       |   37 ++++++----
 nova/tests/test_network.py                       |   43 ++++++------
 nova/tests/test_quantum.py                       |    3 +-
 10 files changed, 121 insertions(+), 98 deletions(-)

commit b01933a2dcb6386ed89684d319bbe6a964d30402
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Feb 15 17:08:36 2012 -0500

    Print friendly message if no floating IPs exist.
    
    Fix bug 932071.
    
    Print out a friendly message from nova-manage when the "floating list"
    command is issued but no floating IPs have been defined.  Prior to this
    change, a generic error message would be printed, pointing to the log
    for further details.
    
    Change-Id: I0d11f93e9f51cf4e99e319bc9296f73380564257

 bin/nova-manage |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit f69b0923b8a81bad075d1972cd342d4d018f8170
Merge: 963d24d e0efd75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 21:41:35 2012 +0000

    Merge "Move connection pool back into impl_kombu/qpid."

commit 963d24d87d489aaf4270bb7bdc1a4b2cbb02a83b
Merge: 5e26719 1406327
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 21:26:26 2012 +0000

    Merge "Expand Quantum Manager Unit Tests + Associated Fixes"

commit 5e267199ea64d4d45b668ace4a497c49eb942d9b
Merge: 3a95d45 2fa3f0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 21:02:16 2012 +0000

    Merge "LOG.exception only works while in an exception handler"

commit 3a95d451edfa622b987cdc8f904cd00262f32cea
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 15 17:38:05 2012 +0000

    Catch httplib.HTTPException as well
    
    Fixes bug 932927
    
    None of the httplib exceptions will get converted into urllib2 exceptions
    
    Change-Id: Iad72821fa1ed54fdb213b371223e94e183dec334

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++++
 1 file changed, 4 insertions(+)

commit 1406327ceeb190ef4584116e49424f2c36dc4a91
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Feb 13 09:58:14 2012 -0800

    Expand Quantum Manager Unit Tests + Associated Fixes
    
    - Add fake quantum client to support more complete testing of Quantum Mgr
    - Fix issue related to filters not being appended to Quantum queries
    - Expand unit tests to check for # vifs, ports created, nic order.
    - Add direct unit tests for quantum_connection class.
    - improve error reporting for get_port_by_attachment
    - remove invalid comment about not supporting floating IPs
    - Remove E-3 hack that only allowed L3 gateway if DHCP was enabled.
    Proper way to disable L3 gateway is to use the nova.network.l3.NullL3
    driver.
    - fix delete_network to properly find UUIDs for project specific networks
    - fix issue with 'requested_networks' not working properly for a provider network.
    - remove dead chunk of code that is unused because all networks in
    quantum currently correspond to an entry in the nova db.
    - make sure validate_networks allows both provider + tenant networks.
    
    Update: incorporated feedback from first round of reviews.
    
    Change-Id: Id63d27d457c63efe7ea27a7fbd7470a0a5709125

 nova/network/quantum/client.py             |    8 +-
 nova/network/quantum/fake_client.py        |  173 ++++++++++
 nova/network/quantum/manager.py            |  119 ++++---
 nova/network/quantum/quantum_connection.py |   15 +-
 nova/tests/test_quantum.py                 |  471 ++++++++++++++--------------
 5 files changed, 478 insertions(+), 308 deletions(-)

commit 4c756df0bd48cc5ccbb672be7f2948ec33b6e17f
Merge: ab548e2 cd75e9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 17:33:39 2012 +0000

    Merge "bw_usage takes a MAC address now."

commit ab548e2e39daafb93ebcb4549a8dfe75c5b5ea94
Merge: 3c7a362 e88a2a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 17:13:07 2012 +0000

    Merge "Prevent Duplicate VLAN IDs"

commit cd75e9e18f19168538d6e6d46c6929ae17b2a693
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 15 11:04:14 2012 -0600

    bw_usage takes a MAC address now.
    
    Change-Id: Ia54a1e21903b96d4f5a07c0513a3dce5ae9f589e

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3c7a362763a6c6ba44570b61a1cc45d9a0f3abe4
Merge: 9f10962 84b9b20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 17:02:58 2012 +0000

    Merge "Fix the description of the --vnc_enabled option"

commit dd35a26a9e7c00152d8176b30b007e90f486f7b1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Feb 15 16:57:27 2012 +0000

    Adding tests for NovaException printing
    
    Change-Id: I23fe7031dc2d8ffe2c8646c9b356045ef2d4d233

 nova/tests/test_exception.py |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 9f109624706289f23437d094d0b98a5e149406b3
Merge: 99c2e02 9b13200
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 16:52:54 2012 +0000

    Merge "Update migration 076 so it supports PostgreSQL."

commit bd99c61fce5c6e1dfe800787f6bc50f78810a38f
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Feb 15 15:58:58 2012 +0000

    fix a syntax error in libvirt.attach_volume() with lxc
    
    This was introduced in commit e40b659d
    
    Change-Id: I8c559483ad5267180ae012b50054f5331f64a437

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e88a2a616b6d3eda01ae739e542bec54ff82922f
Author: Andrew Clay Shafer <acs@parvuscaptus.com>
Date:   Tue Feb 14 01:44:37 2012 -0500

    Prevent Duplicate VLAN IDs
    
    Addresses Bug 708278
    
    Add check for duplicates in api.py
    Add DuplicateVlan to exception.py
    Add test to raise DuplicateVlan in test_db_api.py
    Add to Authors
    
    Change-Id: I9d68d7b7c886071e38df3c9d7d53724758bdd84c

 Authors                   |    1 +
 nova/db/sqlalchemy/api.py |    7 +++++++
 nova/exception.py         |    4 ++++
 nova/tests/test_db_api.py |    8 ++++++++
 4 files changed, 20 insertions(+)

commit dff1ac1dc5c266fd2471f48ad891a666f7ec7758
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Feb 15 11:45:36 2012 +0000

    tests: fix LdapDNS to allow running test_network in isolation
    
    * nova/tests/test_network.py (LdapDNSTestCase): Since the
    ldapdns module imports ldap unconditionally, the following
    will not run on a system without python-ldap installed
      ./run_tests.sh test_network
    Therefore ensure the fake ldap module is used, as is the
    case when running the full test suite.
    
    Change-Id: If92c613bf2684c25cdadf2ac7f53f2005979b2b6

 nova/tests/test_network.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 84b9b20ca6241b6f40dbd5afe22d6df3078751cf
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Wed Feb 15 09:49:15 2012 +0100

    Fix the description of the --vnc_enabled option
    
    Change-Id: If03c8613ec11e6f95f830ef48dd3978e874ecf5d

 doc/source/runnova/vncconsole.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 99b9691e3c9fecc7b2f86cfe77c3bab98776deb8
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue Feb 14 21:48:59 2012 +0000

    Different exit code in new versions of iscsiadm
    
    Fixes bug #932356
    For "iscsiadm: No records found"
    if version <= 2.0-871 iscsiadm returns 255
    newer versions return 21
    
    Change-Id: Ib4319ed11b20a339b439c70574d0d45acc8814fa

 nova/virt/libvirt/volume.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7ffbff485e40bc3f36542f2892877adc5241accf
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Feb 15 10:05:23 2012 +0000

    improve injection diagnostics when nbd unavailable. Bug 755854
    
    It's better to fail immediately with this improved diagnostic.
    Relying on qemu-nbd to detect the issue (no device), is inefficient.
    
    Change-Id: Ib124f6b83d8f04f0b4791c98912603f3499a9d2a

 nova/virt/disk/nbd.py |    3 +++
 1 file changed, 3 insertions(+)

commit 99c2e02b44a1012c8e26fc7658dc40ec4620a1ee
Merge: cc12819 649e32b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 09:03:41 2012 +0000

    Merge "Changing nova-manage error message"

commit b4fae4821fd2d4f31c0c03bdf2e65c984f42e01d
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Tue Feb 14 10:43:39 2012 +0800

     remove unused nwfilter methods and tests.
    
    remove unused methods and classes in nova/virt/libvirt/firewall.py
    and releative function tests. now,nova use nwfilter offered by
    libvirt only for anti ARP and IP spoofing.other security policy use
    iptables.
    
    Change-Id: Ib9866802ef64668e2feba09124bdf7c7fee92f92

 Authors                       |    1 +
 nova/tests/test_libvirt.py    |   41 +------
 nova/virt/libvirt/firewall.py |  259 +----------------------------------------
 3 files changed, 7 insertions(+), 294 deletions(-)

commit cc12819adef88983ef78e9bfb18745df9c39b561
Merge: 9e41317 cb1c1d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 15 00:27:39 2012 +0000

    Merge "Added resize support for Libvirt/KVM."

commit 9e4131741b3c767f97408442048a639a66a3d780
Merge: 903ae99 8d2ae29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 23:51:44 2012 +0000

    Merge "Resolve bug/931794 -- add uuid to fake."

commit 903ae99c78f1c2c90fa9bbb33d9f3b1c46a73281
Merge: e1ae205 6ab1a26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 23:21:41 2012 +0000

    Merge "_() works best with string literals"

commit 2fa3f0b1df62217e8efa20d2b963e61b9659e3d5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 14 23:12:16 2012 +0000

    LOG.exception only works while in an exception handler
    
    It's also unnecessary to set exc_info to sys.exc_info since it does
    this for you
    
    Change-Id: Idd8844d18d4945c029f25dd70de7c842bd9a8305

 nova/api/openstack/compute/servers.py |    4 ++--
 nova/virt/vmwareapi/io_util.py        |    4 ++--
 nova/virt/vmwareapi/vmops.py          |    2 +-
 nova/virt/xenapi/vm_utils.py          |    3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

commit e1ae20537542a28d14c7555301a33c266aa45214
Merge: 14fb5f5 7347a14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 23:11:35 2012 +0000

    Merge "Don't query database with an empty list for IN clause"

commit 6ab1a26fa9b6ecdf704a20c18e4514e0dbfe16d8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 14 22:36:23 2012 +0000

    _() works best with string literals
    
    Otherwise the tools will miss this string and it won't be
    internationalized
    
    Change-Id: I1969e4514adf08f3d67dc9048bf7d44b78700056

 nova/virt/vmwareapi/network_utils.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 14fb5f51cd5fb812c8667d63d9b6155dae5e931f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 14 22:09:18 2012 +0000

    Remove unnecessary constructors for exceptions
    
    They are unnecessary and end up just adding extra code
    
    Change-Id: I1aa6e7be7640dfc0e5fb05a2d662fa42d2cd82c3

 nova/exception.py     |   16 +++-------------
 nova/scheduler/api.py |    2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

commit 3dc539bcb0d9031f81076ac2e1870918400150ed
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Feb 10 19:01:10 2012 -0500

    Don't allow EC2 removal of security group in use.
    
    Fix bug 817872.
    
    This patch modifies the behavior of removing security groups via the EC2
    API to better match the EC2 API spec. The EC2 documentation says that a
    group that is still in use can not be removed.
    
    A new function has been added to the db API to find out whether a
    particular security group is still in use.  "In use" is defined as
    applied to an active instance, or applied to another group that has not
    been deleted.
    
    Unit tests have been updated to ensure that an error is raised when
    these conditions are hit.
    
    Change-Id: I5b3fdf1da213b04084fe266c1a6ed92e01cf1e19

 nova/api/ec2/cloud.py            |    2 ++
 nova/db/api.py                   |    5 +++++
 nova/db/sqlalchemy/api.py        |   35 +++++++++++++++++++++++++++++++
 nova/exception.py                |    4 ++++
 nova/tests/api/ec2/test_cloud.py |   43 ++++++++++++++++++++++++++++++++++++++
 nova/tests/test_api.py           |   10 +++++++++
 nova/tests/test_libvirt.py       |    2 ++
 smoketests/base.py               |   10 +++++++++
 smoketests/test_netadmin.py      |    3 ++-
 9 files changed, 113 insertions(+), 1 deletion(-)

commit 46f7adadaf1d75f36a4544cb9c011056fd6d0e3a
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Tue Feb 14 16:47:00 2012 +0000

    improve stale libvirt images handling fix. Bug 801412
    
    If the unlink fails (because the path wasn't
    even created for example), then that will shroud
    the original failure.  Instead log failure to
    remove the stale image, and raise the original exception.
    
    Change-Id: I36c6968823bcf81d704319739b3a992dae75266a

 nova/virt/images.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit cb1c1d406b98e492931ff19e29735aa592a99f15
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Feb 14 13:48:37 2012 +0900

    Added resize support for Libvirt/KVM.
    
    Implements blueprint libvirt-resize This implmenation using scp to copy VM image, so scp command and ssh-pub-key s
    
    Change-Id: I6450e5bbc5a33abc9ef55cf04366280bd1c5241e

 nova/compute/manager.py         |    7 +-
 nova/tests/test_libvirt.py      |  271 +++++++++++++++++++++++++++++++++++++++
 nova/tests/test_virt_drivers.py |    9 +-
 nova/tests/test_xenapi.py       |    9 +-
 nova/virt/driver.py             |    4 +-
 nova/virt/fake.py               |    5 +-
 nova/virt/libvirt/connection.py |  142 ++++++++++++++++++++
 nova/virt/libvirt/utils.py      |    3 +-
 nova/virt/xenapi_conn.py        |    6 +-
 9 files changed, 443 insertions(+), 13 deletions(-)

commit 9b132000bffecf4cf521ee3dd1cd8eac43e25a78
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Feb 14 09:58:26 2012 -0500

    Update migration 076 so it supports PostgreSQL.
    
    Fixes LP Bug #32154.
    
    Change-Id: I9d6ddfedcc39308811ff5264879b45b4847ec4a8

 .mailmap                                           |    1 +
 Authors                                            |    2 +-
 .../versions/076_remove_unique_constraints.py      |   44 +++++++++++++-------
 3 files changed, 32 insertions(+), 15 deletions(-)

commit 028c62f378d06ffbae8f698611e1d1ce80f1ede2
Merge: a8795a4 e40b659
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 21:44:45 2012 +0000

    Merge "Add support for LXC volumes."

commit a8795a40fd8f4ba42fde1cc4c3c3f0494850f12f
Merge: 3ede145 afd5b22
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 21:34:04 2012 +0000

    Merge "Replace ApiError with new exceptions"

commit 3ede145bfe505ea1d9d60c70d23f0426fb02559c
Merge: c9ca372 4b1bc84
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 21:23:57 2012 +0000

    Merge "e2fsck needs -y"

commit afd5b22368076fc640563b7df6fb71dab57fe627
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Feb 3 13:29:57 2012 -0800

    Replace ApiError with new exceptions
    
    * Convert ApiError to EC2APIError
    * Add new exceptions to replace ApiError where it didn't belong
    * Fixes bug 926250
    
    Change-Id: Ia711440ee0313faf8ea8c87e2c0a2f5b39cc55a2

 bin/nova-manage                                    |    4 +-
 nova/api/ec2/__init__.py                           |    4 +-
 nova/api/ec2/cloud.py                              |   38 ++++++-------
 nova/api/openstack/compute/contrib/cloudpipe.py    |    2 +-
 .../openstack/compute/contrib/console_output.py    |    4 +-
 nova/api/openstack/compute/contrib/consoles.py     |    4 +-
 nova/api/openstack/compute/contrib/floating_ips.py |   10 ++--
 .../openstack/compute/contrib/server_start_stop.py |   32 +++++------
 nova/api/openstack/compute/contrib/volumetypes.py  |    2 +-
 nova/api/openstack/compute/server_metadata.py      |    2 +-
 nova/api/openstack/compute/servers.py              |    8 +--
 nova/api/openstack/volume/types.py                 |    2 +-
 nova/compute/api.py                                |   56 ++++++++++----------
 nova/compute/instance_types.py                     |   20 ++-----
 nova/exception.py                                  |   44 ++++++++++++---
 nova/network/manager.py                            |    6 +--
 nova/tests/api/ec2/test_cloud.py                   |   15 +++---
 .../compute/contrib/test_console_output.py         |   13 ++++-
 .../api/openstack/compute/contrib/test_consoles.py |   13 ++++-
 .../compute/contrib/test_server_start_stop.py      |    7 +--
 nova/tests/scheduler/test_vsa_scheduler.py         |    2 -
 nova/tests/test_SolidFireSanISCSIDriver.py         |    2 +-
 nova/tests/test_compute.py                         |    4 +-
 nova/tests/test_exception.py                       |    6 +--
 nova/tests/test_instance_types.py                  |   14 ++---
 nova/tests/test_volume.py                          |    2 +-
 nova/tests/test_volume_types.py                    |    2 +-
 nova/tests/test_vsa.py                             |    8 +--
 nova/tests/test_vsa_volumes.py                     |    4 +-
 nova/virt/baremetal/proxy.py                       |    4 +-
 nova/virt/vmwareapi/vmops.py                       |   12 ++---
 nova/volume/api.py                                 |   25 +++++----
 nova/volume/san.py                                 |   28 +++-------
 nova/volume/volume_types.py                        |   30 ++++-------
 nova/vsa/api.py                                    |   39 ++++++--------
 35 files changed, 238 insertions(+), 230 deletions(-)

commit 1b207d44340f88d560b469d0a30f99839a63dc61
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 13 12:00:20 2012 -0800

    Simple way of returning per-server security groups
    
    Bug #909207
    
    Change-Id: I7d111222210eaf3abfbae5bc7cccb6e823affc45

 .../openstack/compute/contrib/security_groups.py   |   40 ++++++++++++++++++++
 .../compute/contrib/test_security_groups.py        |   33 ++++++++++++++++
 2 files changed, 73 insertions(+)

commit ac1522cf7ab3cdeb1ff45a88b83d4d4e963e349f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Feb 14 14:13:30 2012 -0500

    Declare deprecated auth flag before its used.
    
    Fixes bug #932156
    
    Change-Id: I52573115d98a2d376e76524aaf31e2b9003a1aed

 nova/image/glance.py |    1 +
 1 file changed, 1 insertion(+)

commit 4b1bc840d372f4cdc16510016c7b6318a65a7282
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 14 19:11:12 2012 +0000

    e2fsck needs -y
    
    Fixes bug 932257
    
    Change-Id: I396c3498bca8f3e1a5131db81e6e0d1900b6f09f

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c9ca372b0b9fe887dd3ac6bdb02514b5495a1917
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Feb 14 12:07:02 2012 -0600

    Standardize logging delaration and use
    
    * Make modules use getLogger(__name__) and log to the result
    
    Change-Id: Ib6d69b4be140ec89affc86ed11e65e422d551df1

 nova/api/auth.py                                   |    3 ++-
 nova/api/ec2/__init__.py                           |    2 +-
 nova/api/ec2/apirequest.py                         |    2 +-
 nova/api/ec2/cloud.py                              |    2 +-
 nova/api/ec2/ec2utils.py                           |    2 +-
 nova/api/metadata/handler.py                       |    2 +-
 nova/api/openstack/__init__.py                     |    2 +-
 nova/api/openstack/auth.py                         |    2 +-
 nova/api/openstack/common.py                       |    2 +-
 nova/api/openstack/compute/__init__.py             |    2 +-
 nova/api/openstack/compute/contrib/__init__.py     |    2 +-
 nova/api/openstack/compute/contrib/accounts.py     |    2 +-
 .../api/openstack/compute/contrib/admin_actions.py |    2 +-
 nova/api/openstack/compute/contrib/aggregates.py   |    2 +-
 nova/api/openstack/compute/contrib/certificates.py |    2 +-
 nova/api/openstack/compute/contrib/cloudpipe.py    |    2 +-
 .../openstack/compute/contrib/console_output.py    |    2 +-
 nova/api/openstack/compute/contrib/consoles.py     |    2 +-
 .../openstack/compute/contrib/deferred_delete.py   |    2 +-
 .../openstack/compute/contrib/extended_status.py   |    2 +-
 nova/api/openstack/compute/contrib/flavormanage.py |    2 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |    2 +-
 .../openstack/compute/contrib/floating_ip_pools.py |    2 +-
 nova/api/openstack/compute/contrib/floating_ips.py |    2 +-
 nova/api/openstack/compute/contrib/hosts.py        |    2 +-
 nova/api/openstack/compute/contrib/multinic.py     |    2 +-
 nova/api/openstack/compute/contrib/networks.py     |    2 +-
 nova/api/openstack/compute/contrib/rescue.py       |    2 +-
 .../openstack/compute/contrib/scheduler_hints.py   |    2 +-
 .../openstack/compute/contrib/security_groups.py   |    2 +-
 .../openstack/compute/contrib/server_start_stop.py |    2 +-
 nova/api/openstack/compute/contrib/users.py        |    2 +-
 .../compute/contrib/virtual_interfaces.py          |    3 +--
 .../compute/contrib/virtual_storage_arrays.py      |    2 +-
 nova/api/openstack/compute/contrib/volumes.py      |    2 +-
 nova/api/openstack/compute/contrib/zones.py        |    2 +-
 nova/api/openstack/compute/extensions.py           |    2 +-
 nova/api/openstack/compute/images.py               |    4 ++--
 nova/api/openstack/compute/ips.py                  |    2 +-
 nova/api/openstack/compute/servers.py              |    2 +-
 nova/api/openstack/compute/views/addresses.py      |    2 +-
 nova/api/openstack/compute/views/servers.py        |    2 +-
 nova/api/openstack/extensions.py                   |    2 +-
 nova/api/openstack/urlmap.py                       |    2 +-
 nova/api/openstack/volume/__init__.py              |    2 +-
 nova/api/openstack/volume/contrib/__init__.py      |    2 +-
 nova/api/openstack/volume/extensions.py            |    2 +-
 nova/api/openstack/volume/snapshots.py             |    2 +-
 nova/api/openstack/volume/volumes.py               |    2 +-
 nova/api/openstack/wsgi.py                         |    2 +-
 nova/api/validator.py                              |    2 +-
 nova/auth/ldapdriver.py                            |    2 +-
 nova/auth/manager.py                               |    2 +-
 nova/auth/signer.py                                |    2 +-
 nova/cert/manager.py                               |    2 +-
 nova/cloudpipe/pipelib.py                          |    2 +-
 nova/compute/api.py                                |    2 +-
 nova/compute/instance_types.py                     |    2 +-
 nova/compute/manager.py                            |    2 +-
 nova/console/manager.py                            |    5 +++--
 nova/console/vmrc_manager.py                       |    2 +-
 nova/console/xvp.py                                |   17 +++++++++--------
 nova/consoleauth/manager.py                        |    2 +-
 nova/crypto.py                                     |    2 +-
 nova/db/sqlalchemy/api.py                          |    2 +-
 .../sqlalchemy/migrate_repo/versions/001_austin.py |    5 +++--
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |    5 +++--
 .../migrate_repo/versions/004_add_zone_tables.py   |    3 ++-
 .../versions/005_add_instance_metadata.py          |    7 +++++--
 .../versions/008_add_instance_types.py             |    9 +++++----
 .../versions/009_add_instance_migrations.py        |    5 +++--
 .../migrate_repo/versions/011_live_migration.py    |    5 +++--
 .../017_make_instance_type_id_an_integer.py        |   20 +++++++++++++++++++-
 .../versions/019_add_volume_snapshot_support.py    |    7 +++++--
 .../versions/024_add_block_device_mapping.py       |    5 +++--
 .../migrate_repo/versions/026_add_agent_table.py   |    5 ++++-
 .../versions/027_add_provider_firewall_rules.py    |    5 +++--
 .../versions/028_add_instance_type_extra_specs.py  |    5 +++--
 .../migrate_repo/versions/030_multi_nic.py         |   11 ++++++-----
 .../031_fk_fixed_ips_virtual_interface_id.py       |    5 +++--
 .../versions/042_add_volume_types_and_extradata.py |    6 ++++--
 .../migrate_repo/versions/043_add_vsa_data.py      |    5 +++--
 .../versions/045_add_network_priority.py           |    4 +++-
 .../versions/047_remove_instances_fk_from_vif.py   |    6 ++++--
 .../versions/049_add_instances_progress.py         |    3 ++-
 .../versions/052_kill_export_devices.py            |    6 ++++--
 .../versions/054_add_bw_usage_data_cache.py        |    6 ++++--
 .../versions/055_convert_flavor_id_to_str.py       |    2 +-
 .../migrate_repo/versions/056_add_s3_images.py     |    3 ++-
 .../versions/057_add_sm_driver_tables.py           |    6 ++++--
 .../versions/060_remove_network_fk_from_vif.py     |    5 +++--
 .../versions/062_add_instance_info_cache_table.py  |    6 ++++--
 .../versions/063_add_instance_faults_table.py      |    3 ++-
 ...ange_instance_id_to_uuid_in_instance_actions.py |    4 ++--
 .../066_preload_instance_info_cache_table.py       |    9 +++++----
 .../migrate_repo/versions/069_block_migration.py   |    4 +++-
 .../versions/070_untie_nova_network_models.py      |    5 +++--
 .../versions/071_add_host_aggregate_tables.py      |    5 +++--
 .../migrate_repo/versions/072_add_dns_table.py     |    5 +++--
 .../versions/074_change_flavor_local_gb.py         |    3 ---
 nova/db/sqlalchemy/session.py                      |    2 +-
 nova/exception.py                                  |    2 +-
 nova/image/fake.py                                 |    2 +-
 nova/image/glance.py                               |    2 +-
 nova/image/s3.py                                   |    2 +-
 nova/manager.py                                    |    2 +-
 nova/network/api.py                                |    2 +-
 nova/network/l3.py                                 |    2 +-
 nova/network/ldapdns.py                            |    2 +-
 nova/network/linux_net.py                          |    2 +-
 nova/network/manager.py                            |    2 +-
 nova/network/quantum/manager.py                    |    2 +-
 nova/network/quantum/melange_ipam_lib.py           |    2 +-
 nova/network/quantum/nova_ipam_lib.py              |    2 +-
 nova/network/quantum/quantum_connection.py         |    2 +-
 nova/notifier/api.py                               |    2 +-
 nova/notifier/capacity_notifier.py                 |    2 +-
 nova/notifier/list_notifier.py                     |    2 +-
 nova/rpc/common.py                                 |    2 +-
 nova/scheduler/api.py                              |    2 +-
 nova/scheduler/distributed_scheduler.py            |    2 +-
 nova/scheduler/driver.py                           |    2 +-
 nova/scheduler/filters/compute_filter.py           |    2 +-
 nova/scheduler/filters/core_filter.py              |    2 +-
 nova/scheduler/filters/ram_filter.py               |    2 +-
 nova/scheduler/host_manager.py                     |    2 +-
 nova/scheduler/least_cost.py                       |    2 +-
 nova/scheduler/manager.py                          |    2 +-
 nova/scheduler/scheduler_options.py                |    2 +-
 nova/scheduler/vsa.py                              |    2 +-
 nova/scheduler/zone_manager.py                     |    2 +-
 nova/service.py                                    |    2 +-
 nova/test.py                                       |    4 ++--
 nova/testing/fake/rabbit.py                        |    2 +-
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 .../openstack/compute/contrib/test_aggregates.py   |    2 +-
 .../api/openstack/compute/contrib/test_hosts.py    |    2 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    2 --
 .../openstack/compute/contrib/test_snapshots.py    |    2 +-
 .../openstack/compute/contrib/test_volume_types.py |    4 +---
 .../api/openstack/compute/contrib/test_vsa.py      |    2 +-
 nova/tests/api/openstack/compute/test_urlmap.py    |    2 +-
 nova/tests/api/openstack/volume/test_snapshots.py  |    2 +-
 nova/tests/api/openstack/volume/test_types.py      |    4 +---
 nova/tests/fake_utils.py                           |    2 +-
 nova/tests/integrated/api/client.py                |    2 +-
 nova/tests/integrated/integrated_helpers.py        |    2 +-
 nova/tests/integrated/test_extensions.py           |    2 +-
 nova/tests/integrated/test_login.py                |    2 +-
 nova/tests/integrated/test_servers.py              |    2 +-
 nova/tests/integrated/test_volumes.py              |    2 +-
 nova/tests/integrated/test_xml.py                  |    2 +-
 nova/tests/rpc/common.py                           |    2 +-
 nova/tests/rpc/test_carrot.py                      |    2 +-
 nova/tests/rpc/test_fake.py                        |    2 +-
 nova/tests/rpc/test_kombu.py                       |    2 +-
 nova/tests/rpc/test_qpid.py                        |    2 +-
 nova/tests/scheduler/test_vsa_scheduler.py         |    2 +-
 nova/tests/test_SolidFireSanISCSIDriver.py         |    2 +-
 nova/tests/test_auth.py                            |    2 +-
 nova/tests/test_compute.py                         |    2 +-
 nova/tests/test_compute_utils.py                   |    2 +-
 nova/tests/test_consoleauth.py                     |    2 +-
 nova/tests/test_imagecache.py                      |    2 +-
 nova/tests/test_instance_types.py                  |    2 +-
 nova/tests/test_ipv6.py                            |    2 +-
 nova/tests/test_libvirt.py                         |    2 +-
 nova/tests/test_linux_net.py                       |    2 +-
 nova/tests/test_network.py                         |    2 +-
 nova/tests/test_network_info.py                    |    2 +-
 nova/tests/test_quantum.py                         |    2 +-
 nova/tests/test_virt_drivers.py                    |    2 +-
 nova/tests/test_volume.py                          |    2 +-
 nova/tests/test_volume_types.py                    |    2 +-
 nova/tests/test_vsa.py                             |    2 +-
 nova/tests/test_vsa_volumes.py                     |    2 +-
 nova/tests/test_xenapi.py                          |    2 +-
 nova/utils.py                                      |    2 +-
 nova/virt/baremetal/dom.py                         |    2 +-
 nova/virt/baremetal/proxy.py                       |    2 +-
 nova/virt/baremetal/tilera.py                      |    2 +-
 nova/virt/connection.py                            |    2 +-
 nova/virt/disk/api.py                              |    2 +-
 nova/virt/disk/mount.py                            |    2 +-
 nova/virt/driver.py                                |    2 +-
 nova/virt/fake.py                                  |    2 +-
 nova/virt/firewall.py                              |    2 +-
 nova/virt/images.py                                |    2 +-
 nova/virt/libvirt/connection.py                    |    2 +-
 nova/virt/libvirt/firewall.py                      |    2 +-
 nova/virt/libvirt/imagecache.py                    |    2 +-
 nova/virt/libvirt/vif.py                           |    2 +-
 nova/virt/libvirt/volume.py                        |    2 +-
 nova/virt/vmwareapi/fake.py                        |    2 +-
 nova/virt/vmwareapi/io_util.py                     |    2 +-
 nova/virt/vmwareapi/network_utils.py               |    2 +-
 nova/virt/vmwareapi/read_write_util.py             |    2 +-
 nova/virt/vmwareapi/vif.py                         |    2 +-
 nova/virt/vmwareapi/vmops.py                       |    2 +-
 nova/virt/vmwareapi/vmware_images.py               |    2 +-
 nova/virt/vmwareapi_conn.py                        |    2 +-
 nova/virt/xenapi/fake.py                           |    2 +-
 nova/virt/xenapi/firewall.py                       |    2 +-
 nova/virt/xenapi/vif.py                            |    2 +-
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 nova/virt/xenapi/vmops.py                          |    2 +-
 nova/virt/xenapi/volume_utils.py                   |    2 +-
 nova/virt/xenapi/volumeops.py                      |    2 +-
 nova/virt/xenapi_conn.py                           |    2 +-
 nova/vnc/xvp_proxy.py                              |    2 +-
 nova/volume/api.py                                 |    2 +-
 nova/volume/driver.py                              |    2 +-
 nova/volume/manager.py                             |    2 +-
 nova/volume/san.py                                 |    2 +-
 nova/volume/volume_types.py                        |    2 +-
 nova/volume/xensm.py                               |    2 +-
 nova/vsa/api.py                                    |    2 +-
 nova/vsa/manager.py                                |    2 +-
 nova/wsgi.py                                       |    2 +-
 219 files changed, 325 insertions(+), 269 deletions(-)

commit b3ade08a21d154109b8cd4c3074f3611670adb1e
Merge: 8312dc6 abe9adf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 18:14:09 2012 +0000

    Merge "Fix WADL/PDF docs referenced in describedby links"

commit 649e32b0dcd8610e4bb248ba508179083a0eb6bd
Author: Derek Higgins <derekh@redhat.com>
Date:   Mon Feb 13 17:48:43 2012 +0000

    Changing nova-manage error message
    
    CA filesystem now created by nova-cert
    Also changing Author details
    
    Change-Id: I456d985810d6f0312a7ef94b21637f347e933303

 .mailmap        |    1 +
 Authors         |    2 +-
 bin/nova-manage |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

commit 8312dc624f89bdc9b3881f012eaf20187d437b2e
Merge: 5d96f7d a1890ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 16:29:54 2012 +0000

    Merge "clean pyc files before running unit tests"

commit 5d96f7dd990ad9b688c6a19fed233c2842437cce
Merge: ca51f98 86b3bd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 16:24:26 2012 +0000

    Merge "typo fix"

commit abe9adf4708aa7d04ea6ff158f06dac94259ba02
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Sat Jan 28 22:29:32 2012 +0000

    Fix WADL/PDF docs referenced in describedby links
    
    These compute API links were broken, previously referring to
    Rackspace URLs with s/v1.0/v1.1/
    
    The links now correctly reference long-lived locations on
    docs.openstack.org.
    
    Change-Id: I10efca2868a05982a1783688e374060acf1d0a69

 Authors                                           |    1 +
 nova/api/openstack/compute/versions.py            |   16 +++++--
 nova/tests/api/openstack/compute/test_versions.py |   47 ++++++++++-----------
 3 files changed, 36 insertions(+), 28 deletions(-)

commit 00c77e0e9af6ae16484e4bee5f33de1eeb812227
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Mon Feb 13 18:46:57 2012 +0000

    bug 931604: improve how xenapi RRD records are retrieved
    
    switch to using FLAGS.xenapi_connection_url to obtain scheme and
    address to talk to in order to fetch RRD XMLs. See bug report for
    more info.
    
    Change-Id: Iad6520cdb15f32e9e50ab0d42026282e57aaa30d

 nova/tests/test_xenapi.py    |    6 ++++++
 nova/virt/xenapi/vm_utils.py |   40 +++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)

commit 8d2ae2935be5f971debe1d1d02fa239fbacdc40e
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Feb 14 19:31:04 2012 +1100

    Resolve bug/931794 -- add uuid to fake.
    
    Change-Id: I07b7b5588f35c05ddd7cb0afa866ecca69aac26d

 nova/tests/test_libvirt.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bc79c95ed8cf6eb830dc5cd13e9d2c9550ea7dfb
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Feb 14 17:07:59 2012 +1100

    Use new style instance logging in compute manager.
    
    Change-Id: I98572bf762da6dc0b5882f6f3d20950440cf4992

 nova/compute/manager.py |  122 +++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 62 deletions(-)

commit ca51f9822f5ac9d66e0454cdbcb8ac17a416958b
Merge: 14b79e7 6c3bc21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 03:38:14 2012 +0000

    Merge "Changes for supporting fast cloning on Xenserver. Implements blueprint fast-cloning-for-xenserver 	1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 	2. image-id is used to tag an image which has already been streamed from glance. 	3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 	4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 	5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 	6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 	7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 	8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host."

commit a1890ea22ffbf75dee468e950da65502e4e56e0a
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Feb 13 17:58:52 2012 -0800

    clean pyc files before running unit tests
    
    Change-Id: If7ad58f131d8b780125df7ecb5c4081014064f72

 run_tests.sh |    3 +++
 1 file changed, 3 insertions(+)

commit d02ac90c6871186a560e9faabdd9a8d2b041d5b3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Feb 14 01:45:19 2012 +0000

    Adding logging for 500 errors.
    
    Change-Id: Ic1f38cf9a3fc48e39af094c90af09dc659e1eb68

 nova/api/openstack/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit 86b3bd141e4fe4406fbd65aec3b645cf8e04cc6f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Feb 13 17:29:00 2012 -0800

    typo fix
    
    Change-Id: I001b5d18c50b71e68fe6277d5f8558551a0ad377

 nova/tests/api/ec2/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e6c07cbc8bcfa344d0577fb284a29d101b259f40
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Thu Feb 9 08:00:09 2012 +0000

    run_tests.sh fix
    
    Fixes bug #929369
    
    Fix "api-paste.ini* to "*api-paste.ini*" and
    remove duplicate definitions of srcfiles.
    
    Change-Id: I859783457d6c5df3f6e998e752cad648ca109b9c

 run_tests.sh |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit 14b79e78176b84f25ae666e9352041905fe8289e
Merge: 498a806 fa295d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 00:56:39 2012 +0000

    Merge "get_user behavior in ldapdriver"

commit 498a8064aa4fc699c01a7975bad2025b5f2c4541
Merge: 46e194f d8a2bda
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 00:46:37 2012 +0000

    Merge "Fsck disk before removing journal"

commit fa295d1278ef43fe2e90902006a5d073d78173ad
Author: john-griffith <john.griffith@solidfire.com>
Date:   Thu Feb 2 22:15:58 2012 -0700

    get_user behavior in ldapdriver
    
    * Addresses bug 744462
    
    Rather than ldapdriver.get_user() returning None for non-existent
    user, this change implements exception.LDAPUserNotFound to more
    closely match the behavior of other drivers (db).
    
    Change was made in public method only, and _check_user_exists()
    which uses get_user() now catches and returns None if applicable.
    Implemented test of NotFound exception in base auth test class.
    
    Change-Id: Ia13af759931ca0c7327d54184730537bafbe52ae

 nova/auth/ldapdriver.py |    7 ++++++-
 nova/tests/test_auth.py |    5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

commit 46e194fdb1ad3675490fd22a6d71e6db7225a4f2
Merge: f038bf5 ed54ff8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 00:36:07 2012 +0000

    Merge "Handle refactoring of libvirt image caching."

commit f038bf5cff13d0b070df5ddba0306759acbcbaf3
Merge: b93d2c7 61e6f4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 00:26:12 2012 +0000

    Merge "bug 929428: pep8 validation on all xapi plugins"

commit b93d2c71503da7bc8c7a339d9c0419ca14684351
Merge: 8b03725 432e04a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 14 00:06:44 2012 +0000

    Merge "Pass instance to log messages."

commit 8b037256f1bd0c95e6a035fbac111894f3b800d1
Merge: 7ead2c5 758ee2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 23:56:46 2012 +0000

    Merge "fix FlatNetworkTestCase.test_get_instance_nw_info"

commit 7ead2c574e216e6b22cd2ee597ff558bafa4bbfa
Merge: 72d985a 0e541e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 23:46:28 2012 +0000

    Merge "remove a private duplicate function"

commit 72d985ab0e5046579cc8734eb6f0155feeec297b
Merge: 6adb426 5bd6b2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 23:36:18 2012 +0000

    Merge "remove unused and buggy function from S3ImageService"

commit d8a2bda822662f3ebc25f8e92d03ae1cf0676be8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 13 16:11:17 2012 -0600

    Fsck disk before removing journal
    
    Fixes bug 931743
    
    Change-Id: Ibf257ca74432f8e6387ffae58f6b38477de59272

 nova/virt/xenapi/vm_utils.py |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

commit 6adb42619b6571c1a779439ddde5ee04a40d5b86
Merge: 2717680 04d38fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 22:19:05 2012 +0000

    Merge "Use stubs in libvirt/utils get_fs_info test"

commit 271768076406fd1ebfb7001546fea63dba39188a
Merge: 6f2ebe0 979c999
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 21:32:24 2012 +0000

    Merge "Adding (-x | --stop) option back to runner.py"

commit 6f2ebe058ebc68f4de490b7f7d57d50345229be4
Merge: 632789c 95771cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 21:22:25 2012 +0000

    Merge "dont show blank endpoint headers"

commit 7347a14213919aa78ad156b50deee846ec333b6a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Feb 13 20:51:29 2012 +0000

    Don't query database with an empty list for IN clause
    
    Fixes bug 931687
    
    Change-Id: Ieec2c43c1d56c8d54d5bce606db9909b2ef5d6d4

 nova/api/openstack/compute/contrib/disk_config.py  |    2 ++
 .../openstack/compute/contrib/extended_status.py   |    3 +++
 nova/compute/api.py                                |    3 +++
 3 files changed, 8 insertions(+)

commit 04d38feb65b06d33224d356f6db1b9202532e2ed
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Feb 13 16:04:59 2012 -0500

    Use stubs in libvirt/utils get_fs_info test
    
    This test frequently breaks for me because of a race condition where
    some small change will happen to the file system between when df is
    called and when os.statvfs is called. By refactoring the test to stubs,
    we can eliminate the race condition. Note that I do not modify the code
    under test at all in this change, so the risk of introducing a defect is
    zero.
    
    Change-Id: I83e4b38b25fef7e5e27fcf81b5e5a566406b05dd

 nova/tests/test_libvirt.py |   39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

commit 979c999464975f869b9ee05792e31c784aaf08f4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Feb 13 20:00:11 2012 +0000

    Adding (-x | --stop) option back to runner.py
    
    fixes bug 931608
    
    Change-Id: I355a3bba38367c820a0eddc006ef480e5134b317

 nova/testing/runner.py |    1 +
 1 file changed, 1 insertion(+)

commit 632789c55b505e3a6cf122329eeae6c616077eba
Merge: 2a22d5b df9d79e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 18:00:09 2012 +0000

    Merge "Remove duplicate variable"

commit df9d79e9f6859e761afe50a7ae444f28c6d9fe21
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Feb 13 17:42:24 2012 +0000

    Remove duplicate variable
    
    Change-Id: Ie92a534c566dd411c2bd3e73031336974b1e5505

 ...ange_instance_id_to_uuid_in_instance_actions.py |    2 --
 1 file changed, 2 deletions(-)

commit 2a22d5bd3a85c9cb2376a78cbe1a792ca84a0a52
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Feb 9 03:51:24 2012 +0000

    Fixing a unicode related metadata bug.
    
    When a server had metadata with unicode characters in the values, doing a GET
    on servers details would return a 500 error. This fixes that bug.
    
    bug: 929281
    Change-Id: I6162532c9a5a615802eb23e7bf9a80d3faf6e7a0

 nova/api/openstack/compute/views/servers.py      |    2 +-
 nova/tests/api/openstack/compute/test_servers.py |    6 +-----
 nova/tests/api/openstack/fakes.py                |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

commit df687ab091311c13ca4bad5c67613483d65adf44
Merge: 4b2dd96 adcccc6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 16:48:27 2012 +0000

    Merge "Make melange_port an integer"

commit d2452dae6e780787dcf6685632d59d433a490307
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Mon Feb 13 15:59:44 2012 +0000

    bug 931356: nova-manage prints libvirt related warnings if libvirt isn't installed
    
    move flag declaration close to where it is used.
    
    Change-Id: I88c3d1362a9de5ea559411e80c1e5bc79bd1a614

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4b2dd96f02baa093c9e8f90c85cec2214213c42d
Merge: af552ef b70bd00
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 15:52:22 2012 +0000

    Merge "Log instance id consistently inside the firewall code."

commit af552efe4d64a72c3233eeadd2d8e95d70807406
Merge: d8f8bad 7fb02c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 13 15:27:39 2012 +0000

    Merge "Fix minor typo in runner.py"

commit adcccc6d26e0f0c24590845291a2efabc9e54c01
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Feb 13 15:11:08 2012 +0000

    Make melange_port an integer
    
    It's nonsensical as anything but an integer and it makes it clearer what
    type it should be.
    
    Change-Id: Icd62023b1835d33fb977302208744657e4557d2a

 nova/network/quantum/melange_connection.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0e541e27a987f04cab2248b852ab897a23801047
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Feb 10 13:19:40 2012 +0000

    remove a private duplicate function
    
    * nova/network/ldapdns.py (utf-8): This function is already
    available in nova.utils.  Note this duplicate was catching
    impossible to trigger exceptions, and was referencing an
    undefined variable 'val'
    
    Change-Id: I0e47f8b976a3326c99927990f91be473c0a85f78

 nova/network/ldapdns.py |   29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

commit 6c3bc216c1f35c42604b685eebd8fa25828d0e0e
Author: Devdeep Singh <devdeep.singh@citrix.com>
Date:   Tue Jan 17 18:59:14 2012 +0530

    Changes for supporting fast cloning on Xenserver.
    Implements blueprint fast-cloning-for-xenserver
    	1. use_cow_images flag is reused for xenserver to check if copy on write images should be used.
    	2. image-id is used to tag an image which has already been streamed from glance.
    	3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance.
    	4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host.
    	5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance.
    	6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance.
    	7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too.
    	8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host.
    
    Change-Id: I54838a24b061c134877f3479c925c6ee78da14bc

 Authors                                            |    1 +
 nova/flags.py                                      |    6 +
 nova/tests/test_xenapi.py                          |    9 +-
 nova/tests/xenapi/stubs.py                         |    2 +-
 nova/virt/libvirt/connection.py                    |    3 -
 nova/virt/xenapi/fake.py                           |   31 ++++
 nova/virt/xenapi/vm_utils.py                       |  177 +++++++++++++++++++-
 nova/virt/xenapi/vmops.py                          |    6 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   53 +++++-
 9 files changed, 268 insertions(+), 20 deletions(-)

commit 1c8ad4553b4b8d404f941c5297e3f6e42c9f7e6a
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Sun Feb 12 13:34:14 2012 -0500

    Completes fix for LP #928910 - libvirt performance
    
    This patch adds the remainder of the recommended fixes
    from the original bug report:
    
    * Modifies methods in the compute manager that relied on
      the DB power state to be in sync with the virt driver to
      instead just query the power state of the instance from the
      virt driver. This enables us to set the periodic tick to 10
      for the problematic compute.manager.Manager._sync_power_states()
      method.
    * Modifies the _sync_power_states method in the following ways:
     ** Replace the call to driver.list_instances_detail() to a new,
        driver-overrideable get_num_instances() call
     ** For each instance known by the database, call driver.get_info()
        separately inside the loop instead of calling the expensive
        list_instances_detail() method that can take a very long time
        to complete on hosts with lots of instances
     ** Call greenthread.sleep(0) before each call to update the
        database power state, enabling other periodic tasks to do work
    
    Once again, I left an inefficient default implementation of the
    new driver.get_num_instances() method in the base driver class. I
    need help from folks who understand the Xen/VMWare drivers to do
    an override for get_num_instances() in those drivers that calls
    the underlying XenAPI or VMWare API.
    
    Change-Id: I88002689cdda32124423da320f8c542e286be51b

 nova/compute/manager.py         |   66 ++++++++++++++++++++++++---------------
 nova/tests/test_compute.py      |   13 +++++++-
 nova/virt/driver.py             |   13 ++++++++
 nova/virt/libvirt/connection.py |    4 +++
 4 files changed, 69 insertions(+), 27 deletions(-)

commit e023c28a81a2b43786d60dacf9d324537ee2dfd0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Sun Feb 12 13:18:49 2012 -0500

    Add some more comments to _get_my_ip().
    
    bug 930513.
    
    This patch adds some additional comments to _get_my_ip() to try to make
    the code a bit more clear and to clarify that no traffic is actually
    sent out by this code.
    
    Change-Id: I6f8d4a0a51596e5c531da53f3c79c5bffca59b39

 nova/flags.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit d8f8bad0f26b4438986ab1a469d89d03b22551db
Merge: d03692c b196f4b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 11 18:42:50 2012 +0000

    Merge "Converting db tables to utf8."

commit 5bd6b2aa51d189feee6cd17f19b1b4b0424c267a
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Feb 10 12:32:55 2012 +0000

    remove unused and buggy function from S3ImageService
    
    * nova/image/s3.py (S3ImageService.get): Remove
    
    Change-Id: Ibe4526c821b9d05025956d49a6cb840d11ce013a

 nova/image/s3.py |    4 ----
 1 file changed, 4 deletions(-)

commit d03692c4ee39f9ee93af416d2e26a582ff220963
Merge: 3858bcf aee2671
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 11 03:23:51 2012 +0000

    Merge "remove all instance_type db lookups from network"

commit 7fb02c209ae5f1f76e714f424fb6abd357eacadf
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Sat Feb 11 11:07:10 2012 +0800

    Fix minor typo in runner.py
    
    Fixes bug #930519
    
    Change-Id: I53f5f85d1ef8117f6a40a90ee1e9eb12a27dcd53

 nova/testing/runner.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3858bcfbbc0a1cc7b0a455dbef16675c25b322a4
Merge: 7c7632b 27c11c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 11 01:03:58 2012 +0000

    Merge "Remedies LP Bug #928910 - Use libvirt lookupByName() to check existence"

commit 7c7632bd194fea29c58a0ea597ca4d1c5cf32421
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Feb 10 16:16:47 2012 -0800

    Remove relative imports from scheduler/filters
    
    Change-Id: I576740e512c92fb633f0029f4ab738d74600d8f9

 nova/scheduler/filters/__init__.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 600314f6cfcdf3f858f76df7b047732ecf314339
Merge: 8e1ef66 58f8f93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 11 00:05:30 2012 +0000

    Merge "Handle network api failures more gracefully"

commit 8e1ef669640f575bf44e69b9b58634bfc78a4fe3
Merge: 99b6b21 332921f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 23:55:54 2012 +0000

    Merge "remove unused and buggy function from baremetal proxy"

commit 99b6b214057279ae221e88c9f613ddb66b3b9816
Merge: ea87222 13abc29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 23:55:43 2012 +0000

    Merge "Retry on network failure for melange GET requests"

commit b196f4be831659904d33fe1e3955eaf5224497e0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Feb 9 01:16:21 2012 +0000

    Converting db tables to utf8.
    
    bug: 929232
    Change-Id: I6bea01b243e0c9dbd7e3b3559adbb73e42484a4c

 .../migrate_repo/versions/077_convert_to_utf8.py   |   61 ++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit ea872225ca46de5070d03fb6a4d2e85b45218103
Merge: 3f30010 b3a88b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 23:29:10 2012 +0000

    Merge "Automatic confirmation of resizes on libvirt"

commit aee267182ab86814bac22e28fed0beb370fa2293
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Feb 10 17:21:52 2012 -0600

    remove all instance_type db lookups from network
    
    increases efficiency without requiring extra parameters
    
    Change-Id: I858067afb94007c8e71748373873f7cc8bd54662

 nova/network/api.py              |    4 ++--
 nova/network/manager.py          |   24 +++++++++++-------------
 nova/network/quantum/manager.py  |   18 +++++++-----------
 nova/tests/api/ec2/test_cloud.py |    3 +--
 nova/tests/fake_network.py       |   16 +---------------
 nova/tests/test_quantum.py       |   12 ++++++------
 nova/tests/test_xenapi.py        |    2 +-
 7 files changed, 29 insertions(+), 50 deletions(-)

commit 3f30010b490232b31c17f6b52c0d8dbf884242a0
Merge: b9e0c50 4804690
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 23:13:55 2012 +0000

    Merge "linux_net: Also ignore shell error 2 from ip addr"

commit b9e0c50c7e33213652870ad2e9fc7780b4f5d150
Merge: 810749b d0366b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 23:04:15 2012 +0000

    Merge "Fix exception by passing timeout as None"

commit 810749b07bbfcd7c1ac55dac5c29938d9a000bf5
Merge: d808ce1 cfa774e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 22:33:16 2012 +0000

    Merge "Force imageRef to be a string"

commit 27c11c4bb4e5c54282caf49cba666f45cfc590c2
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Wed Feb 8 15:51:59 2012 -0500

    Remedies LP Bug #928910 - Use libvirt lookupByName() to check existence
    
    Make determining if an instance exists on a host
    more efficient by adding an instance_exists() method to the
    base virt driver that can be overridden by drivers that
    have a more efficient mechanism of looking up an instance
    by its ID / name. Modifies the _check_instance_already_created
    method of the compute manager to use this new instance_exists() method.
    
    Someone from Citrix should look into how to make the instance_exists()
    method in the Xen and VMWare virt drivers more efficient than the
    base "loop over all domains and see if the instance ID exists" method
    now in the base driver class.
    
    Change-Id: Ibf219788f9c104698057367da89300a060945778

 nova/compute/manager.py         |    2 +-
 nova/virt/driver.py             |   15 +++++++++++++++
 nova/virt/libvirt/connection.py |    8 ++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

commit d808ce11668c08bd896771f578f70e15f1eeb88d
Merge: 4e31ecb faa938c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 22:10:54 2012 +0000

    Merge "Removes constraints from instance and volume types"

commit 4e31ecb49c743090f8dd988e3480ad2f6f4208cf
Merge: 246fbd4 6a823d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 22:00:38 2012 +0000

    Merge "Ensures that hostId's are unique"

commit 246fbd403395efce01cdd53706921fb235080e42
Merge: 24b7890 ea3513b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 21:51:10 2012 +0000

    Merge "Remove unused compute_service from images controller"

commit 24b7890963b1238a6919f95168890b105c4aa34d
Merge: 754320e 13b82db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 21:32:14 2012 +0000

    Merge "Optimizes ec2 keystone usage and handles errors"

commit cfa774eecee8f1fa800e9028f2c7f52a2ae028f6
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Feb 10 15:10:47 2012 -0600

    Force imageRef to be a string
    
    Fixes lp930409
    
    Change-Id: Iff07a9b70210a43eb9442222e4d6cac60dd8f375

 nova/api/openstack/compute/servers.py            |    2 +-
 nova/tests/api/openstack/compute/test_servers.py |   21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

commit 754320ec661c628d1a7263dc34fd98d6554e652b
Merge: f6f8d96 d1888a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 21:13:11 2012 +0000

    Merge "Remove the last of the gflags shim layer"

commit 13abc292eee66d2390e2318657fe9e8611060804
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Feb 10 18:54:48 2012 +0000

    Retry on network failure for melange GET requests
    
    Fixes bug 929041
    
    The melange service may need to periodically be restarted for various
    operations reasons, so retry GET requests if we receive a socket error.
    
    Change-Id: I010650dac7793d0041d41be067eb4b32e2171c8a

 nova/exception.py                          |    4 +++
 nova/network/quantum/melange_connection.py |   37 ++++++++++++++++++----------
 2 files changed, 28 insertions(+), 13 deletions(-)

commit f6f8d96b2686733800ffcd804a490f44ea707185
Merge: 5fe4131 4c3a79e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 21:01:35 2012 +0000

    Merge "Fix disk_config typo"

commit 5fe4131ad6e4d42962d3e4ee78b4f67b95c9f863
Merge: 3d19639 9974dcb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 20:43:32 2012 +0000

    Merge "Extend glance retries to show() as well"

commit 3d196395284d6df84abff6b6bd17e3ee8ef96514
Merge: 8cc4fdc f7deddb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 20:34:04 2012 +0000

    Merge "Fix status transition when reverting resize"

commit 58f8f93b52e7de2d3751dd3291427a65a3c1079b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Feb 10 13:46:24 2012 -0500

    Handle network api failures more gracefully
    
    addresses bug 930329
    
    Change-Id: Idb0934b9dd6ebc0e5e81495fb4454e4e50bc1f57

 nova/api/openstack/common.py            |   11 +++++++++--
 nova/tests/api/openstack/test_common.py |   11 +++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

commit 8cc4fdc9ef3b828f85bdbb4e2d78912e7638bb9e
Merge: 6fb0adc 90ded87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 19:56:15 2012 +0000

    Merge "Pass in project_id in ext. authorizer"

commit b3a88b528648423c4854f6c9f882857fd3320365
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Wed Feb 8 19:53:32 2012 -0500

    Automatic confirmation of resizes on libvirt
    
    fixes bug #911217
    
    Change-Id: I135002a3010416e8c63b3dce303f4e4d47c7c6d3

 nova/virt/driver.py             |   10 +++++++++-
 nova/virt/libvirt/connection.py |   20 +++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

commit d0366b6554e250126bd1776f9f6dd80dbed6f1e4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Feb 10 18:31:20 2012 +0000

    Fix exception by passing timeout as None
    
    The call method takes a new timeout argument, but not all uses of it
    were updated to pass the new argument.
    
    Change-Id: Ie4377419aafa5606ade803f8e4cd715cb53b1547

 nova/rpc/impl_fake.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9974dcbd304a4e092e952e937f4dc78f9500e304
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Feb 10 17:40:10 2012 +0000

    Extend glance retries to show() as well
    
    Fixes bug 930245
    
    nova/image/glance.py would already retry get() requests if there was a
    connection error, but didn't do so for show() requests.
    
    Change-Id: Ifb1a17da18b7e10ddaaec46e124efcc963681c80

 nova/exception.py    |    4 ++++
 nova/image/glance.py |   36 +++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

commit 6fb0adc066f0f8a64a5ec1fdcbe374b26935485a
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 10 17:19:22 2012 +0000

    Disable ConfigParser interpolation (lp#930270)
    
    This breaks e.g.
    
      volume_name_template=volume-%08x
      instance_name_template=instance-%08x
    
    and is not part of the API contract anyway. We use $opt based value
    interpolation.
    
    Change-Id: I7659c7a304aac4d30a79751176ecf683bd664e6f

 nova/openstack/common/cfg.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 758ee2b84c36aec1665de7ab477e43a5899679c5
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Feb 10 16:09:07 2012 +0000

    fix FlatNetworkTestCase.test_get_instance_nw_info
    
    Most of this function was bypassed and the
    bypassed portion contained syntax errors.
    So reneable the skipped branch and adjust to pass.
    
    Change-Id: I364ccfbe5be5bc050ba0004133f353beed97fae7

 nova/tests/test_network.py |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit 332921f3c25dfd9eea0dad4fb09c78315dd8ba3f
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Feb 10 15:18:50 2012 +0000

    remove unused and buggy function from baremetal proxy
    
    * nova/virt/baremetal/proxy.py (_fetch_image): This function
    reference 'images' which is undefined.  So just remove it
    as it's unused.
    
    Change-Id: I7016f6e8a68fefab4342adadd032e93f963a074e

 nova/virt/baremetal/proxy.py |    5 -----
 1 file changed, 5 deletions(-)

commit ea3513b16f6b74fe8a868ae214cd81778246cb91
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 10 08:21:27 2012 +0000

    Remove unused compute_service from images controller
    
    Seems to be unused since v1.0 was removed; it used to be needed for
    snapshot support.
    
    Change-Id: I799ea4b188e396548792006e5a40dfab96d37957

 nova/api/openstack/compute/images.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 8dabc7baeecb0aebd65f89d7c6bda0ea97f1ca28
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Feb 10 02:44:22 2012 -0500

    Backslash continuations (nova.virt.baremetal)
    
    Fixes bug #929998
    
    Backslash continuations removal for package nova.virt.baremetal
    
    Change-Id: I74beb27b5f5f13fbd6a391a2dc8acf2834846066

 nova/virt/baremetal/fake.py   |    2 +-
 nova/virt/baremetal/proxy.py  |   12 +++++------
 nova/virt/baremetal/tilera.py |   46 ++++++++++++++++++++---------------------
 3 files changed, 30 insertions(+), 30 deletions(-)

commit 80c9a27b80741bb9aaf7adbab1d9b3befeac49c4
Author: Thorsten Tarrach <thorsten@atomia.com>
Date:   Wed Feb 8 11:08:23 2012 +0100

    fixed bug 928749
    
    During the process of creating an instance
    for the first time from a glance server,
    nova tries to execute this command:
    
    mkfs.ntfs --fast --label ephemeral0
    /var/lib/nova/instances/_base/ephemeral_0_500_windows
    
    This in turn fails with this error:
    
    /var/lib/nova/instances/_base/ephemeral_0_500_windows
    is not a block device.
    Refusing to make a filesystem here!
    
    The reason is that mkfs.ntfs needs the
    --force flag to create a filesystem in a file.
    
    Change-Id: If6c424400317a5f19ab117daec4c791476245753

 nova/virt/disk/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b70bd00cf84fb1c78037efcea030df313ff1f923
Author: Michael Still <mikal@stillhq.com>
Date:   Fri Feb 10 11:59:36 2012 +1100

    Log instance id consistently inside the firewall code.
    
    This brings this code inline with the way connection.py does
    instance logging now.
    
    Change-Id: I3a9b256cb87bc273352f4b9338ae32dbc1faa6f6

 nova/tests/test_virt_drivers.py |    3 ++-
 nova/virt/libvirt/firewall.py   |   20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

commit d1888a3359345acffd8d0845c137eefd88072112
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 00:50:58 2012 +0000

    Remove the last of the gflags shim layer
    
    Make FLAGS a ConfigOpts instance and fix up all the places where we
    expected FlagValues behaviour.
    
    Change-Id: I8f96f42e0d8d30ba6b362d29861e717cf0fa9e89

 bin/clear_rabbit_queues                            |    2 +-
 bin/nova-direct-api                                |    2 +-
 bin/nova-manage                                    |    2 +-
 nova/api/auth.py                                   |    2 +-
 nova/api/ec2/__init__.py                           |    2 +-
 nova/api/openstack/compute/__init__.py             |    2 +-
 nova/auth/ldapdriver.py                            |    4 +-
 nova/auth/manager.py                               |    2 +-
 nova/cloudpipe/pipelib.py                          |    2 +-
 nova/compute/api.py                                |    2 +-
 nova/compute/manager.py                            |    2 +-
 nova/console/manager.py                            |    2 +-
 nova/console/vmrc.py                               |    2 +-
 nova/console/vmrc_manager.py                       |    2 +-
 nova/console/xvp.py                                |    2 +-
 nova/consoleauth/__init__.py                       |    2 +-
 nova/consoleauth/manager.py                        |    2 +-
 nova/crypto.py                                     |    2 +-
 nova/db/api.py                                     |    4 +-
 nova/db/base.py                                    |    2 +-
 nova/db/migration.py                               |    7 +-
 nova/flags.py                                      |  100 ++-------------
 nova/image/s3.py                                   |    2 +-
 nova/ipv6/api.py                                   |    4 +-
 nova/log.py                                        |    2 +-
 nova/network/ldapdns.py                            |    2 +-
 nova/network/linux_net.py                          |    2 +-
 nova/network/manager.py                            |    2 +-
 nova/network/quantum/manager.py                    |    2 +-
 nova/network/quantum/melange_connection.py         |    2 +-
 nova/network/quantum/quantum_connection.py         |    2 +-
 nova/notifier/api.py                               |    2 +-
 nova/notifier/list_notifier.py                     |    2 +-
 nova/notifier/rabbit_notifier.py                   |    2 +-
 nova/objectstore/s3server.py                       |    2 +-
 nova/policy.py                                     |    2 +-
 nova/quota.py                                      |    2 +-
 nova/rpc/__init__.py                               |    2 +-
 nova/rpc/common.py                                 |    2 +-
 nova/rpc/impl_qpid.py                              |    2 +-
 nova/scheduler/api.py                              |    2 +-
 nova/scheduler/driver.py                           |    2 +-
 nova/scheduler/filters/core_filter.py              |    2 +-
 nova/scheduler/filters/ram_filter.py               |    2 +-
 nova/scheduler/host_manager.py                     |    2 +-
 nova/scheduler/least_cost.py                       |    2 +-
 nova/scheduler/manager.py                          |    2 +-
 nova/scheduler/multi.py                            |    2 +-
 nova/scheduler/scheduler_options.py                |    2 +-
 nova/scheduler/simple.py                           |    2 +-
 nova/scheduler/vsa.py                              |    2 +-
 nova/scheduler/zone_manager.py                     |    2 +-
 nova/service.py                                    |    2 +-
 nova/test.py                                       |   13 +-
 nova/testing/runner.py                             |   19 ++-
 .../compute/contrib/test_createserverext.py        |    1 -
 .../compute/contrib/test_extendedstatus.py         |    1 -
 .../api/openstack/compute/test_image_metadata.py   |    2 +-
 nova/tests/baremetal/test_proxy_bare_metal.py      |    6 +-
 nova/tests/declare_flags.py                        |    2 +-
 nova/tests/fake_flags.py                           |   32 ++---
 nova/tests/runtime_flags.py                        |    2 +-
 nova/tests/test_compute.py                         |    2 +-
 nova/tests/test_consoleauth.py                     |    4 +-
 nova/tests/test_flags.py                           |  128 +++++---------------
 nova/tests/test_instance_types.py                  |    2 +-
 nova/tests/test_libvirt.py                         |    5 +-
 nova/tests/test_service.py                         |    2 +-
 nova/tests/test_virt_drivers.py                    |    4 +-
 nova/tests/test_vsa.py                             |    7 +-
 nova/utils.py                                      |    5 +-
 nova/virt/baremetal/nodes.py                       |    4 +-
 nova/virt/baremetal/proxy.py                       |    4 +-
 nova/virt/baremetal/tilera.py                      |    4 +-
 nova/virt/disk/api.py                              |    2 +-
 nova/virt/disk/nbd.py                              |    2 +-
 nova/virt/firewall.py                              |    2 +-
 nova/virt/libvirt/connection.py                    |    4 +-
 nova/virt/libvirt/imagecache.py                    |    2 +-
 nova/virt/libvirt/utils.py                         |    2 +-
 nova/virt/libvirt/vif.py                           |    2 +-
 nova/virt/vmwareapi/vif.py                         |    2 +-
 nova/virt/vmwareapi/vim.py                         |    2 +-
 nova/virt/vmwareapi/vmops.py                       |    2 +-
 nova/virt/vmwareapi_conn.py                        |    2 +-
 nova/virt/xenapi/vif.py                            |    2 +-
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 nova/virt/xenapi/vmops.py                          |    4 +-
 nova/virt/xenapi_conn.py                           |    2 +-
 nova/vnc/__init__.py                               |    2 +-
 nova/vnc/xvp_proxy.py                              |    2 +-
 nova/volume/driver.py                              |    2 +-
 nova/volume/iscsi.py                               |    2 +-
 nova/volume/manager.py                             |    2 +-
 nova/volume/san.py                                 |    2 +-
 nova/vsa/api.py                                    |    2 +-
 nova/vsa/manager.py                                |    2 +-
 97 files changed, 178 insertions(+), 336 deletions(-)

commit 4c3a79e54f3573961e578f1bd5093a6d09df6136
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 10 06:26:46 2012 +0000

    Fix disk_config typo
    
    rezise vs resize
    
    Obviously we're lacking some unit test coverage here.
    
    Change-Id: I06fab62eb16fd9aa344606a5f8b8237acec3cf31

 nova/api/openstack/compute/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ad971810aaedcf5c9efd1b56add0e23921899ae
Merge: eacbde0 5adaf44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 01:53:30 2012 +0000

    Merge "Backslash continuations (nova.virt)"

commit eacbde00db549b23929d3aaa0793dd0550c91dcd
Merge: e97ba69 e0c60a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 01:52:03 2012 +0000

    Merge "Handle --flagfile by converting to .ini style"

commit e97ba69cf77bf718b903c97574c80dec1cabeab8
Merge: 511a621 0d34747
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 01:51:49 2012 +0000

    Merge "Fix logging in xenapi vmops"

commit 511a6219315dc5e9394c3df1e596fda96dbea121
Merge: ab568d4 567c0e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 01:50:02 2012 +0000

    Merge "Backslash continuations (nova.db)"

commit 432e04aa1a54cccae2c68803473164b780c5dd53
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Feb 7 13:31:52 2012 +1100

    Pass instance to log messages.
    
    This patch converts more log messages to passing their instance.
    Having the instance in a consistant format in the logs makes it
    easier for operations staff to debug instance problems.
    
    Change-Id: I842f26309e17c0923e71fbfb00bdcdb033f92297

 nova/tests/test_virt_drivers.py |    3 ++-
 nova/virt/libvirt/connection.py |   47 +++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

commit ab568d4d457735a3a20fd1b926c2151da13f09f3
Merge: b8944ef 525ba40
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 10 00:39:50 2012 +0000

    Merge "Backslash continuations (misc.)"

commit 0d34747a4395a507e8d1f5960917e66120e607fb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Feb 9 15:44:21 2012 -0800

    Fix logging in xenapi vmops
    
    1 case of sqlalchemy Instance model being logged which is useless
    Fixed other cases of instance name beingg logged instead of instance
    uuid
    
    Change-Id: Ia0e6354905a65d3ab571d2e6ad06225e176c3c1f

 nova/virt/xenapi/vmops.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 6a823d0e1670507a6f4674d5f70e8d9ce0b4c3df
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Wed Feb 8 17:32:13 2012 -0500

    Ensures that hostId's are unique
    
    fixes bug #928015
    
    Change-Id: I26e1e036ee56e0ee4344f9254df4c7024e0ceddf

 nova/api/openstack/compute/views/servers.py      |    4 +++-
 nova/tests/api/openstack/compute/test_servers.py |   22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

commit b8944efb1e2c87a9136f941eddaf90fc02b7fffb
Merge: c730f66 7cd4b62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 9 17:26:30 2012 +0000

    Merge "optimize libvirt image cache usage"

commit c730f664a473b4de524d3f4a87c54b1c9295bb56
Merge: 508c73b a878911
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 9 17:16:54 2012 +0000

    Merge "Backslash continuations (network, scheduler)"

commit 508c73bcf8845a230457955ce0143fe1a79cbc5b
Merge: 164e17c f33de5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 9 16:57:57 2012 +0000

    Merge "Fix confirm_resize policy handling"

commit 164e17cd6653ab817d38425691f9a83742e6930b
Merge: 1815aaf 2b53844
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 9 16:35:58 2012 +0000

    Merge "Use named logger when available"

commit f33de5c9ad6217a9daa1bafd8f1d3e71f618dda2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 8 06:52:14 2012 +0000

    Fix confirm_resize policy handling
    
    Fixes bug 928649
    
    markwash:
     - fixed pep8 violation
    
    Change-Id: Ie1c3136256dac0e350e430ac7c69eba4cb98b158

 nova/context.py           |    5 +++++
 nova/virt/xenapi/vmops.py |   18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

commit 7cd4b62098e46b26f4df4932b100f3be07ad4516
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Feb 1 21:29:28 2012 +0000

    optimize libvirt image cache usage
    
    When dealing with cow images, minimize the number of downloads,
    by caching both the original download and a resized derivative,
    with extra disk space being used for the downloaded image.
    This part was suggested by Vish Ishaya.
    
    When dealing with raw images, don't bother caching the resized
    derivative, as it's quicker to just copy the downloaded image
    to the instance dir and resize in place.  Similarly when
    generating a raw image, do so directly to the instance dir.
    
    Change-Id: I1458b2c39a51d7d9f5bdfff53155431c863b8a40

 nova/virt/libvirt/connection.py |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit 61e6f4e34aebdcc79d377fafede563dbd9e63019
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Thu Feb 9 10:32:24 2012 +0000

    bug 929428: pep8 validation on all xapi plugins
    
    check every python file under <nova_root>/plugins/xenserver/.
    Ignore patch files.
    
    Change-Id: Ib1170ddabe03de746aae570d30b133aaffb09c88

 run_tests.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit b54179438e53e26a45c8cf046bc3714fe027dc22
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Feb 8 00:16:50 2012 -0800

    Move translations to babel locations.
    
    If we structure things like this, we can get things
    actually, you know, installed.
    
    Locales ast and oc aren't supported by babel. We'll re-import them
    from Launchpad once we get babel updated.
    
    If you want translations installed, run:
    
      python setup.py compile_catalog
    
    Before you run either setup.py sdist or setup.py install
    
    More work is needed to actually properly use the installed translations, but
    we're closer.
    
    Change-Id: I4a4bedd982c89063aa09688c9cbcf97054bcb34b

 .gitignore                            |    2 +-
 MANIFEST.in                           |    7 +-
 nova/locale/bs/LC_MESSAGES/nova.po    | 2804 +++++++++++++
 nova/locale/cs/LC_MESSAGES/nova.po    | 2791 ++++++++++++
 nova/locale/da/LC_MESSAGES/nova.po    | 2789 ++++++++++++
 nova/locale/de/LC_MESSAGES/nova.po    | 2817 +++++++++++++
 nova/locale/en_AU/LC_MESSAGES/nova.po | 2860 +++++++++++++
 nova/locale/en_GB/LC_MESSAGES/nova.po | 2835 +++++++++++++
 nova/locale/es/LC_MESSAGES/nova.po    | 2894 +++++++++++++
 nova/locale/fr/LC_MESSAGES/nova.po    | 2979 +++++++++++++
 nova/locale/it/LC_MESSAGES/nova.po    | 2825 +++++++++++++
 nova/locale/ja/LC_MESSAGES/nova.po    | 2895 +++++++++++++
 nova/locale/ko/LC_MESSAGES/nova.po    | 2807 +++++++++++++
 nova/locale/nova.pot                  | 7459 +++++++++++++++++++++++++++++++++
 nova/locale/pt_BR/LC_MESSAGES/nova.po | 2867 +++++++++++++
 nova/locale/ru/LC_MESSAGES/nova.po    | 2808 +++++++++++++
 nova/locale/tl/LC_MESSAGES/nova.po    | 2791 ++++++++++++
 nova/locale/tr/LC_MESSAGES/nova.po    | 2803 +++++++++++++
 nova/locale/uk/LC_MESSAGES/nova.po    | 2797 ++++++++++++
 nova/locale/zh_CN/LC_MESSAGES/nova.po | 2831 +++++++++++++
 nova/locale/zh_TW/LC_MESSAGES/nova.po | 2805 +++++++++++++
 po/ast.po                             | 2789 ------------
 po/bs.po                              | 2804 -------------
 po/cs.po                              | 2791 ------------
 po/da.po                              | 2789 ------------
 po/de.po                              | 2817 -------------
 po/en_AU.po                           | 2860 -------------
 po/en_GB.po                           | 2835 -------------
 po/es.po                              | 2894 -------------
 po/fr.po                              | 2979 -------------
 po/it.po                              | 2825 -------------
 po/ja.po                              | 2895 -------------
 po/ko.po                              | 2807 -------------
 po/oc.po                              | 2794 ------------
 po/pt_BR.po                           | 2867 -------------
 po/ru.po                              | 2808 -------------
 po/tl.po                              | 2791 ------------
 po/tr.po                              | 2803 -------------
 po/uk.po                              | 2797 ------------
 po/zh_CN.po                           | 2831 -------------
 po/zh_TW.po                           | 2805 -------------
 setup.cfg                             |   10 +-
 setup.py                              |    1 -
 43 files changed, 58467 insertions(+), 56591 deletions(-)

commit 4a4c274c834728a03bce7e5384c562321821eaf8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Feb 7 14:32:15 2012 -0800

    Get rid of distutils.extra.
    
    We moved to DistUtilsExtra because it promised a more automatic workflow
    from setup.py. It doesn't actually deliver though, and it also vomits
    warnings during setup.py usage, and also breaks pip integration.
    
    So this is going back to babel. Mostly folks shouldn't need to know
    anything about this. We'll need to update the translations import
    jobs in Jenkins, and we might need to add a corresponding translations
    upload job that runs post-merge.
    
    Translations installation doesn't fully work - but it actually wasn't fully
    working before. Getting this part of the project done now though is a
    pre-requisite for using tox for multi-python testing (tox starts by
    creating an sdist tarball and then installing it into the venv, which
    is just 100% broken with DistUtilsExtra)
    
    Change-Id: I126e1bcfab0656eab6ca10de67d3d2aaa8b844f3

 .gitignore         |    2 +-
 babel.cfg          |    2 ++
 setup.cfg          |   23 +++++++++++++++++++++++
 setup.py           |   16 +---------------
 tools/pip-requires |    1 +
 5 files changed, 28 insertions(+), 16 deletions(-)

commit a878911d6d9a2080f8308a179dfb4a9cda929dc0
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Feb 3 14:01:36 2012 +0900

    Backslash continuations (network, scheduler)
    
    Fixes bug #925281
    
    Backslash continuations removal for packages
    nova.network and nova.scheduler
    
    Change-Id: I84f886d6bc179ecf5d09e57d278bfa644d5d851d

 nova/network/linux_net.py                  |   45 +++++++--------
 nova/network/manager.py                    |   17 +++---
 nova/network/model.py                      |    4 +-
 nova/network/quantum/client.py             |    4 +-
 nova/network/quantum/manager.py            |   21 +++----
 nova/network/quantum/melange_connection.py |   32 +++++------
 nova/scheduler/api.py                      |   11 ++--
 nova/scheduler/distributed_scheduler.py    |    6 +-
 nova/scheduler/filters/core_filter.py      |    7 +--
 nova/scheduler/filters/ram_filter.py       |    7 +--
 nova/scheduler/host_manager.py             |    8 +--
 nova/scheduler/manager.py                  |    7 +--
 nova/scheduler/scheduler_options.py        |   12 ++--
 nova/scheduler/simple.py                   |    4 +-
 nova/scheduler/vsa.py                      |   84 +++++++++++++---------------
 15 files changed, 127 insertions(+), 142 deletions(-)

commit 1815aaf13af1c5d6d4225fa0f8f4adb2b10548e6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 8 23:05:53 2012 +0000

    Remove unnecessary use of LoopingCall in nova/virt/xenapi/vm_utils.py
    
    The code synchronously blocks waiting on the LoopingCall to finish
    anyway and the use of a maximum of number of attempts ends up being
    awkwardly fit in.
    
    Also, remove an out-of-date comment about future use of LoopingCall
    
    Change-Id: Ife397e171f28fff5e73c70e6957cecdd09a42d68

 nova/virt/xenapi/vm_utils.py |   28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

commit e456d2b4e258880f7a34044aacf13eb02cbfd532
Merge: 4f9994b 6ab291f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 23:03:27 2012 +0000

    Merge "Stop using LoopingCall in nova.virt.xenapi_conn:wait_for_task()"

commit 4f9994be44cb3329d13f9158f50aa64609e48348
Merge: 650d822 f0da794
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 22:57:24 2012 +0000

    Merge "Fix deprecated warning"

commit 650d822dbd24de3586c61319576117ff4568bd2c
Merge: 6ca8e79 041e325
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 22:51:10 2012 +0000

    Merge "Consistently update instance in nova/compute/manager.py"

commit 6ca8e79dca4e8e9767fff61e95040aa61f51014b
Merge: 85ae58c c7243ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 22:36:04 2012 +0000

    Merge "Add flag to include link local in port security"

commit 6ab291fb54591836ea3798ec214555e5d63e7f22
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 8 22:28:18 2012 +0000

    Stop using LoopingCall in nova.virt.xenapi_conn:wait_for_task()
    
    The use of utils.LoopingCall is unnecessary since code waits immediately
    for the LoopingCall to finish. This results in code that is more
    complicated than necessary, but also it creates an extra greenthread
    that ends up obfuscating stack trace in case of exceptions.
    
    Change-Id: Iaf0909a4f2307e8657e7baa15cb5a7852ba6feca

 nova/virt/xenapi_conn.py |   80 ++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 45 deletions(-)

commit ed54ff8c9d59169308d5a39e7e24c66c7be2f440
Author: Michael Still <mikal@stillhq.com>
Date:   Mon Feb 6 15:02:33 2012 +1100

    Handle refactoring of libvirt image caching.
    
    This patch handles the refactored image caching for libvirt. The
    new scheme keeps multiple copies of an image:
    
      <fingerprint>:        the image from glance
      <fingerprint>_<size>: the resized image
    
    The resized image is then copied or CoW'd across to the instance
    disk. We also want to keep original images from glance longer than
    we keep the resized images, as they're smaller and this reduces the
    load on glance. Therefore a new flag to handle the differing rules
    has been added.
    
    Change-Id: If6d9471b3d67cb8fac3f168b1b4a3cd57b9cc9a7

 nova/tests/test_imagecache.py   |   90 ++++++++++++++++++++++---
 nova/virt/libvirt/imagecache.py |  141 +++++++++++++++++++++++----------------
 2 files changed, 167 insertions(+), 64 deletions(-)

commit 4804690ba401a23d62df489875da6c546d3224bb
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Feb 8 14:16:08 2012 -0800

    linux_net: Also ignore shell error 2 from ip addr
    
    Ignores error code 2 from 'ip addr {add, del}' which, in recent
    versions of iproute2, means the address has already been removed
    or added.
    
    Fixes bug 929127
    
    Change-Id: I09274454847ff834ac3da0e38022b30a7a7f1676

 nova/network/linux_net.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 041e325dd03cbe5874770708f8e3f2b4a73d756c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 8 22:03:17 2012 +0000

    Consistently update instance in nova/compute/manager.py
    
    The code used a mix of self.db.instance_update and self._update_instance,
    so settle on self._update_instance. Also, the code used a mix of
    self._update_instance and self._set_instance_error_state, so settle on
    self._set_instance_error_state. This also changes the code to not clear
    task_state in all cases, leaving it set for debugging purposes.
    
    Change-Id: I5c841ebfb60ba4acf62382060e416ea780bd66ba

 nova/compute/manager.py    |   22 +++++++---------------
 nova/tests/test_compute.py |    2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

commit 2b538441a8aafde5dcc48939a091f22d1303f3bf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 7 20:11:55 2012 +0000

    Use named logger when available
    
    Cleanup a handful of places where named loggers are created for a
    particular module but aren't used consistently. Also fix a couple
    of log entries that aren't internationalized
    
    Change-Id: I38186d47e7f31626b3ead779707d8ee5a15f56ac

 nova/compute/api.py                       |    4 ++--
 nova/scheduler/host_manager.py            |    6 +++---
 nova/service.py                           |   24 ++++++++++++------------
 nova/tests/scheduler/test_host_manager.py |    4 ++--
 nova/utils.py                             |    2 +-
 nova/virt/libvirt/firewall.py             |    4 ++--
 nova/virt/xenapi/vm_utils.py              |    4 ++--
 nova/virt/xenapi/vmops.py                 |   14 +++++++-------
 nova/volume/driver.py                     |    4 ++--
 9 files changed, 33 insertions(+), 33 deletions(-)

commit f0da7946b30d85ca41a940a00df0726970e68c6b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 8 21:12:56 2012 +0000

    Fix deprecated warning
    
    Fixes bug 929101
    
    The message attribute of exceptions is deprecated, use unicode() instead
    
    Change-Id: I81ecd96807d6ad2ac2bcf64edf35600c705e53aa

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85ae58c21fc9019dfef5585accd53bdc667debde
Merge: 0827508 fdd92c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 21:49:21 2012 +0000

    Merge "Added ability to load specific extensions."

commit 082750832e6ad45200016845334de08ff76d2d67
Merge: 799713e 71247a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 21:21:03 2012 +0000

    Merge "Require newer versions of SA and SA-Migrate"

commit e40b659d320b3c6894862b87adf1011e31cbf8fc
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jan 31 20:53:24 2012 -0500

    Add support for LXC volumes.
    
    This introduces volume support for LXC containers in Nova.
    The way that this works is that when a device is attached to an
    LXC container is that, the xml is parsed to find out which device to
    connect to the LXC container, binds the device to the LXC container,
    and allow the device through cgroups.
    
    This bug fixes LP: #924601.
    
    Change-Id: I00b41426ae8354b3cd4212655ecb48319a63aa9b
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/tests/test_libvirt.py      |   21 ++++++++++++++
 nova/virt/disk/api.py           |   20 +++++++++++++
 nova/virt/libvirt/connection.py |   60 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 99 insertions(+), 2 deletions(-)

commit fdd92c4ad987407dae96ab46a36e0db407ded718
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 8 15:29:02 2012 -0500

    Added ability to load specific extensions.
    
    For example, the following nova.conf configuration file:
    
    --osapi_compute_extension=nova.api.openstack.compute.contrib.select_extensions
    --osapi_compute_ext_list=Createserverext,Extended_status
    
    Would load only the Createserverext and Extended_status extensions.
    
    Change-Id: I8c2a444683c6e4114875827b44ef01e457eb94ac

 nova/api/openstack/compute/contrib/__init__.py |    7 +++++++
 nova/api/openstack/extensions.py               |   17 +++++++++++------
 nova/api/openstack/volume/contrib/__init__.py  |    7 +++++++
 nova/flags.py                                  |   10 ++++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)

commit 799713e4db7f55ccc6acaa033fa082075e28a6a9
Merge: 1a0c3d5 7eca1ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 20:56:25 2012 +0000

    Merge "Adding the request id to response headers. Again."

commit 1a0c3d5d2fbbafd545b8c70cedf82ef5973c5534
Merge: 5137966 5d85be4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 20:49:31 2012 +0000

    Merge "Handle service failures during finish_resize gracefully"

commit c7243aeff06792d49868e1386273ec60ec8684d0
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Feb 8 14:44:25 2012 -0600

    Add flag to include link local in port security
    
    Fixes LP929090
    
    Change-Id: I797e2e8299bc4a2cbb07fa210e7c25750b9bf8c3

 nova/network/quantum/manager.py |   32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

commit 513796626d6564e1a30ed664fca7bd6ce9ff762a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 8 03:18:03 2012 +0000

    Allow e2fsck to exit with 1
    
    Fixes bug 928603
    
    Change-Id: I431979bceb7ff5835167aceb10dfb0652b8fe310

 nova/virt/xenapi/vm_utils.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 06e82edc801559c7983744c5ee560422810b43d1
Merge: 00c8151 459145e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 19:49:45 2012 +0000

    Merge "Allows test_virt_drivers to work when run alone"

commit 00c81514adf228d33f5e9aafcedef1c121151efe
Merge: b42839b b1c4315
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 19:40:01 2012 +0000

    Merge "tests.integrated fails with devstack"

commit faa938c1650d892b945795112eb2850212b28ccb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 18:53:17 2012 -0800

    Removes constraints from instance and volume types
    
     * Gets rid of annoying purge semantics
     * removes unique constraints from the db
     * deletes extra specs when a volume is deleted
     * adds exceptions for when the type already exists
     * fixes bug 854930
     * fixes bug 925823
    
    Change-Id: I4618759e31501b2e85325f4e9b9895f04dc151d0

 bin/nova-manage                                    |   56 +++---
 nova/compute/instance_types.py                     |   10 --
 nova/db/api.py                                     |   18 --
 nova/db/sqlalchemy/api.py                          |  182 ++++++++++----------
 .../versions/076_remove_unique_constraints.py      |   66 +++++++
 .../migrate_repo/versions/076_sqlite_upgrade.sql   |   61 +++++++
 nova/db/sqlalchemy/models.py                       |   22 ++-
 nova/exception.py                                  |    8 +
 .../compute/contrib/test_flavor_manage.py          |    4 -
 nova/tests/scheduler/test_vsa_scheduler.py         |    4 +-
 nova/tests/test_instance_types.py                  |   28 +--
 nova/tests/test_instance_types_extra_specs.py      |    2 +-
 nova/tests/test_volume_types.py                    |   43 +----
 nova/tests/test_volume_types_extra_specs.py        |   10 +-
 nova/tests/utils.py                                |    1 +
 nova/volume/volume_types.py                        |   12 --
 16 files changed, 278 insertions(+), 249 deletions(-)

commit 5d85be45a53d0a065622e84de30c65c1ce75faca
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 8 19:07:43 2012 +0000

    Handle service failures during finish_resize gracefully
    
    Fixes bug 928474
    
    If exceptions occur in the network or image service during finish_resize(),
    the instance can be left in RESIZE state. This change will ensure those
    exceptions will move the instance to ERROR as well.
    
    Change-Id: I638db27da27310ccd55d52453c3aadaa41634040

 nova/compute/manager.py |   74 +++++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

commit b42839be64c19896924208105317336a465dd8c1
Merge: e7ac662 a933e36
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 19:04:28 2012 +0000

    Merge "Check return code instead of output for iscsiadm"

commit e7ac6629fea1e1561c772ed0946174350abd4734
Merge: 85f4255 2a872a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 19:00:00 2012 +0000

    Merge "Add an alias to the ServerStartStop extension"

commit 85f4255cdd853adb46545e3215c224c4b9906826
Merge: 2b1c523 a359665
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 18:55:52 2012 +0000

    Merge "Fixes volume snapshotting issues and tests"

commit 2b1c523026ea07e4fa4e7ff42e345b9dcbca23f6
Merge: 3432aa5 229221e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 18:52:04 2012 +0000

    Merge "Fix bug 921814 changes handling of adminPass in API."

commit 3432aa51a00e96db06dcbb88948b82e1dca4cd75
Merge: d7b032b 6b2fbd4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 18:35:15 2012 +0000

    Merge "pep8 check on api-paste.ini when using devstack"

commit d7b032b0d5f99c865e320e2e0d75f36d689d49fe
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Feb 8 11:50:26 2012 -0600

    Set port security for all allocated ips
    
    Fixes LP929018
    
    Change-Id: Iab56cb815381eb4832358053bde8ddc70f9c4ef6

 nova/network/quantum/manager.py          |    4 ++--
 nova/network/quantum/melange_ipam_lib.py |   12 ++++++------
 nova/network/quantum/nova_ipam_lib.py    |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

commit e0efd7551d0d4e1c23111419f0622a1994601fda
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Feb 7 22:31:27 2012 -0500

    Move connection pool back into impl_kombu/qpid.
    
    Fix bug 928996.
    
    This patch moves the creation of the connection pool from nova.rpc.amqp
    back into nova.rpc.impl_kombu and nova.rpc.impl_qpid.  The pool now gets
    passed into nova.rpc.amqp using arguments as needed.
    
    The previous method worked fine unless both rpc implementations got
    loaded into the same Python instance.  In that case, whichever one got
    loaded 2nd had control over what type of connections nova.rpc.amqp would
    create.  With these changes in place, this conflict between impl_kombu
    and impl_qpid is resolved.
    
    Change-Id: I72bc0c95bfc04ccdfb89d3456332f622ca5ffa42

 nova/rpc/amqp.py            |   76 +++++++++++++++++++++----------------------
 nova/rpc/impl_kombu.py      |   21 ++++++------
 nova/rpc/impl_qpid.py       |   20 ++++++------
 nova/tests/rpc/test_qpid.py |    9 +++--
 4 files changed, 63 insertions(+), 63 deletions(-)

commit 6b2fbd44f9bb3646d492a8593cdb5c9da3a5a7c9
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed Feb 8 11:44:39 2012 -0500

    pep8 check on api-paste.ini when using devstack
    
    Fixes bug #928976
    
    Avoid pep8 check on api-paste.ini
    
    Change-Id: I14e84e3c704c4e90d87c73e484d8eb3b63803743

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 459145e5d520a6ea4095448ad36366ab5d81d8b2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 23:14:29 2012 -0800

    Allows test_virt_drivers to work when run alone
    
     * Properly sets fake_resize using a stub in test_libvirt
     * Adds a stub for test_virt_drivers
     * Fixes typo and misuse of flags in setUp and TearDown
     * Fixes bug 925891
    
    Change-Id: I015e942305f6a08941168ca0ccadb2382db064d7

 nova/tests/test_libvirt.py      |    7 ++-----
 nova/tests/test_virt_drivers.py |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

commit 2a872a606b2ed8e32de335c8a8a0d8b178ddba0c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Feb 8 08:13:23 2012 -0800

    Add an alias to the ServerStartStop extension
    
    Fixes bug 928954
    
    Change-Id: I0c7e230e9b68139056c60c5477d3902c252ef413

 .../openstack/compute/contrib/server_start_stop.py |    1 +
 .../tests/api/openstack/compute/test_extensions.py |    7 +++++++
 2 files changed, 8 insertions(+)

commit b1c4315fce34e8664bbf3cb969312afe5e56f114
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Wed Feb 8 08:26:52 2012 -0500

    tests.integrated fails with devstack
    
    Fixes bug #928836
    
    Change-Id: Ib703d2fce73b668b5872ea75f8ab4fd1cfd1960a

 nova/tests/integrated/integrated_helpers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5adaf449dfcdb09c558afcfaf289eb27fcf590ba
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Fri Feb 3 15:56:08 2012 +0900

    Backslash continuations (nova.virt)
    
    Fixes bug #925283
    
    Backslash continuations removal for package nova.virt
    
    Change-Id: Ia47eae3b80d90cdac044e2f875d7ece8ed9ad715

 nova/virt/firewall.py                  |    7 ++---
 nova/virt/libvirt/connection.py        |   14 ++++-----
 nova/virt/libvirt/firewall.py          |   54 ++++++++++++++++----------------
 nova/virt/libvirt/utils.py             |    7 ++---
 nova/virt/libvirt/vif.py               |    7 ++---
 nova/virt/vmwareapi/error_util.py      |    5 ++-
 nova/virt/vmwareapi/fake.py            |   10 +++---
 nova/virt/vmwareapi/io_util.py         |    9 +++---
 nova/virt/vmwareapi/read_write_util.py |    4 +--
 nova/virt/vmwareapi/vif.py             |    5 ++-
 nova/virt/vmwareapi/vim.py             |   20 ++++++------
 nova/virt/vmwareapi/vim_util.py        |    6 ++--
 nova/virt/vmwareapi/vm_util.py         |   49 +++++++++++++----------------
 nova/virt/vmwareapi/vmops.py           |   50 ++++++++++++++---------------
 nova/virt/xenapi/fake.py               |   16 +++++-----
 nova/virt/xenapi/network_utils.py      |    4 +--
 nova/virt/xenapi/vif.py                |   20 ++++++------
 nova/virt/xenapi/vm_utils.py           |    8 ++---
 nova/virt/xenapi/vmops.py              |   39 +++++++++++------------
 nova/virt/xenapi/volume_utils.py       |   16 +++++-----
 nova/virt/xenapi_conn.py               |    8 ++---
 21 files changed, 168 insertions(+), 190 deletions(-)

commit 27ac9d5f0ca4279753ee2984769094f2b4191619
Merge: f04360b 2a9271e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 10:02:34 2012 +0000

    Merge "Fix xvpvncproxy error in nova-all (lp#928489)"

commit f04360b375302db48b171ce94ac71485bbd5bf4f
Merge: 4a73c4f 40206cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 09:54:45 2012 +0000

    Merge "nova-rootwrap: wait() for return code before exit"

commit 4a73c4fc6c3f096710f48ee2c825eb45bbc53426
Merge: 4ce6645 7141072
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 09:46:41 2012 +0000

    Merge "Remove ajaxterm from Nova"

commit 71247a627e367e8732f583fb4e197c23f0b5ec6f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 8 05:33:40 2012 +0000

    Require newer versions of SA and SA-Migrate
    
    Fixes bug 928637
    
    Change-Id: I27d06d945449f70a6da00c1f5d306bd5fe43b253

 tools/pip-requires |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 13b82dbbcfe280eda15fd9248a494cb8ce4e5056
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 6 16:29:30 2012 -0800

    Optimizes ec2 keystone usage and handles errors
    
     * breaks out gen_request_id so we can return it in error msg
     * breaks out ec2_error so we can use it in multiple middlewares
     * adds new middleware (remove old after devstack change)
     * skips extra call to keystone for second authentication
     * fixes bug 922373
    
    Change-Id: If765d149289255b0bf0e0c1b647ebb547ce5759b

 etc/nova/api-paste.ini   |    5 +-
 nova/api/auth.py         |    1 -
 nova/api/ec2/__init__.py |  140 ++++++++++++++++++++++++++++++++++++----------
 nova/context.py          |    7 ++-
 4 files changed, 119 insertions(+), 34 deletions(-)

commit 4ce6645f08fffa194f76e5d4105bfb77b6c8cd14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 3 15:44:29 2012 -0800

    Makes sure killfilter doesn't raise ValueError
    
     * Fixes bug 926412
     * Includes failing test
    
    Change-Id: Ie0105ff777575d6dd794ce5b5e08545fb54ecf8b

 nova/rootwrap/filters.py         |    7 ++++---
 nova/tests/test_nova_rootwrap.py |   10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

commit a3596658c83ed84970cfaba40d7f489728a00d48
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 7 16:56:04 2012 -0800

    Fixes volume snapshotting issues and tests
    
     * changes call for create_snapshot from contrib/volumes.py
     * fixes some raises in volume/snaphsots.py
     * rewrites volume api tests to use the right endpoint
     * updates contrib snapshots test to catch the error
     * fixes bug 928567
     * fixes bug 928588
    
    Change-Id: Ifa6bd8b70dc0df5c8811b0123072ba83eb170a45

 nova/api/openstack/compute/contrib/volumes.py      |    6 +-
 nova/api/openstack/volume/snapshots.py             |    4 +-
 .../openstack/compute/contrib/test_snapshots.py    |    1 +
 nova/tests/api/openstack/volume/test_snapshots.py  |  154 +++++---------------
 4 files changed, 42 insertions(+), 123 deletions(-)

commit 525ba40417256f6448c52939274ee2505fbc6b78
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Thu Feb 2 14:15:39 2012 +0900

    Backslash continuations (misc.)
    
    Fixes bug #925166
    
    This patch for packages which have few backslash continuations.
    
    Follow up patches will be for packages network, scheduler, virt,
    db/sqlalchemy, tests, and api/openstack.
    
    Change-Id: I4200010b47b33fa8b9115b5d379b543200f6668d

 nova/api/auth.py                 |    9 ++++----
 nova/api/ec2/cloud.py            |   21 +++++++++--------
 nova/api/metadata/handler.py     |    3 +--
 nova/auth/ldapdriver.py          |    4 ++--
 nova/compute/api.py              |   46 ++++++++++++++++++--------------------
 nova/compute/manager.py          |   16 ++++++-------
 nova/console/vmrc.py             |    9 ++++----
 nova/consoleauth/__init__.py     |    7 +++---
 nova/ipv6/account_identifier.py  |    4 ++--
 nova/ipv6/api.py                 |    7 +++---
 nova/ipv6/rfc2462.py             |    4 ++--
 nova/log.py                      |    7 +++---
 nova/notifier/list_notifier.py   |    7 +++---
 nova/notifier/rabbit_notifier.py |    7 +++---
 nova/objectstore/s3server.py     |   30 ++++++++++++-------------
 nova/openstack/common/cfg.py     |   45 +++++++++++++++++--------------------
 nova/rpc/__init__.py             |    7 +++---
 nova/rpc/impl_carrot.py          |    4 ++--
 nova/rpc/impl_qpid.py            |    8 +++----
 nova/testing/runner.py           |    8 +++----
 nova/utils.py                    |   11 +++++----
 nova/volume/api.py               |    4 ++--
 nova/volume/driver.py            |   14 +++++++-----
 nova/volume/iscsi.py             |    7 +++---
 nova/volume/volume_types.py      |   12 +++++-----
 nova/volume/xensm.py             |   24 +++++++++-----------
 nova/vsa/api.py                  |   23 +++++++++----------
 nova/vsa/manager.py              |   22 +++++++++---------
 28 files changed, 173 insertions(+), 197 deletions(-)

commit 40206cb80a8a1636eac0733360a0cc67bea9a6da
Author: Adam Gandelman <adamg@canonical.com>
Date:   Tue Feb 7 15:57:38 2012 -0800

    nova-rootwrap: wait() for return code before exit
    
    nova-rootwrap does not wait() for the subprocess it executes to complete before
    returning its return code. This often ends up in 0 being returned regardless of
    failure/success and causing unforeseen problems in Nova.
    
    Fixes bug #928566
    
    Change-Id: I9b6d85c747513086d0e774cb92ba403886b3283c

 bin/nova-rootwrap |    1 +
 1 file changed, 1 insertion(+)

commit b0a708f67407256a449414a000b070752e51dba2
Merge: ae00630 4cad8ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 8 00:05:06 2012 +0000

    Merge "Send image properties to Glance"

commit ae0063057bd0db84c13e01b440ac923b7385d2d1
Merge: 8f7bc2e 259d3e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 23:53:42 2012 +0000

    Merge "Update cfg from openstack-common"

commit 229221ec9780112981aedfc8849272aa49a9b25b
Author: Mike Pittaro <mikeyp@LaHondaResearch.org>
Date:   Fri Feb 3 15:46:01 2012 -0800

    Fix bug 921814 changes handling of adminPass in API.
    
    Add a new nova configuration flag, boolean, enable_instance_password.
    
    When the flag is True (default), existing behavior is unchanged.
    
    When the flag is False, responses from the create or
    rebuild API calls don't include the adminPass attribute.
    
    Change-Id: Icb2bd703770f3a39bb1e458dc31e1489d48da7c1

 Authors                                            |    1 +
 nova/api/openstack/compute/servers.py              |    7 +-
 nova/flags.py                                      |    4 +
 .../api/openstack/compute/test_server_actions.py   |   65 ++++++++-
 nova/tests/api/openstack/compute/test_servers.py   |  153 +++++++++++++++++++-
 5 files changed, 221 insertions(+), 9 deletions(-)

commit 4cad8add2085d8c2ca2ddcb4acb8d3662d609dee
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 7 23:34:48 2012 +0000

    Send image properties to Glance
    
    Fixes bug 928549
    
    Change-Id: Ie89e9c49c1fe25ed4acd680dd8c2c5e84173cdcd

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++++
 1 file changed, 4 insertions(+)

commit a933e3628ba8cc2fb985665a724799ee0a58aa16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 7 11:23:59 2012 -0800

    Check return code instead of output for iscsiadm
    
     * iscsiadm returns 255 on no records
     * Refixes bug 922232
    
    Change-Id: If177c3c79c6ad974c2bed0ad72a62e956af451e0

 nova/virt/libvirt/volume.py |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 8f7bc2ee6c14fe6dc16d27353869a7a35f4931f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 16:35:49 2012 -0800

    Make swap default to vdb if there is no ephemeral
    
     * Fixes bug 912066
    
    Change-Id: Ie463a8953fd0ac07a9def0dd86379d06d9259bc5

 nova/virt/libvirt/connection.py |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

commit e0c60a83f512f2c406ffdaeda27be10753ab95c6
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 00:50:58 2012 +0000

    Handle --flagfile by converting to .ini style
    
    Add code to translate flagfiles into .ini config files so that we can
    deprecate and, eventually remove, --flagfile.
    
    By using the flagfile compat code, we no longer need to process the
    contents of flagfiles as CLI options and we can reduce the number
    of CLI options to a sane set:
    
      --verbose
      --logdir
      --logfile
      --use_syslog
      --use_stderr
      --connection_type
      --sql_connection
      --api_paste_config
      --state_path
      --lock_path
      --fake_network
      --fake_rabbit
    
    This, in turn, means we can remove the evil hacks which we needed in
    order to register CLI options after the initial parsing of the command
    line.
    
    Change-Id: I9e24008fa634d7c8378b253c1f7a6d2169076086

 nova/compat/__init__.py            |   15 +++
 nova/compat/flagfile.py            |  182 ++++++++++++++++++++++++++++++++++++
 nova/flags.py                      |  142 ++++++++++++----------------
 nova/log.py                        |    9 --
 nova/service.py                    |    3 -
 nova/tests/test_compat_flagfile.py |  174 ++++++++++++++++++++++++++++++++++
 nova/tests/test_flags.py           |   80 +++++++---------
 7 files changed, 464 insertions(+), 141 deletions(-)

commit 259d3e356b18aa65e6a8d8e3981648a51913252e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 00:50:58 2012 +0000

    Update cfg from openstack-common
    
    Use openstack-common's update.py script to pull in some recent changes:
    
     * Add the Mapping interface to cfg.ConfigOpts
     * Add support to cfg for disabling interspersed args
    
    Make use of both of these in nova/flags.py.
    
    Add some dire warnings to HACKING about directly modifying the copy of
    openstack-common code. I'm confident they won't be ignored :-)
    
    Change-Id: I7ef75d18922c0bbb8844453b48cad0418034bc11

 HACKING.rst                  |   15 ++++++
 nova/flags.py                |   10 ++--
 nova/openstack/common/README |   13 +++++
 nova/openstack/common/cfg.py |  112 ++++++++++++++++++++++++++++++++++--------
 openstack-common.conf        |    7 +++
 5 files changed, 132 insertions(+), 25 deletions(-)

commit 2a9271eab0fdde82e63ae28b9617f97152499c92
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 18:33:19 2012 +0000

    Fix xvpvncproxy error in nova-all (lp#928489)
    
    Running nova-all, I see:
    
      (nova): TRACE: NoSuchOptError: no such option: xvpvncproxy_manager
    
    xvp_proxy is a WSGIService, not a Service.
    
    Change-Id: I073d6536134a4fc8d819c808a6c96b02390b556d

 bin/nova-all |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 16882ad36b630fe8cc6c80a51cebf1a7f8f7cbf9
Merge: b7f5288 fd9c3af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 21:27:56 2012 +0000

    Merge "Implements blueprint heterogeneous-tilera-architecture-support"

commit b7f5288d4a81526f0daf9e9de3285512d25c0314
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 7 21:56:26 2012 +0100

    Update MANIFEST.in to account for moved schemas
    
    Change-Id: I0b2b1402cd59333fddf04fab8e6b5759fad59455

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71410724cd1516608ee58c37077bf9080da38de2
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 7 16:37:34 2012 +0100

    Remove ajaxterm from Nova
    
    Removes copy of ajaxterm code, nova-ajax-console-proxy,
    and support for get_ajax_console from Nova proper.
    
    Implements blueprint remove-ajaxterm
    Fixes bug 917963
    
    Change-Id: I2c0ff427c53c0f63a18b10475d6b4cbe9a085d83

 bin/nova-ajax-console-proxy           |  146 ----
 nova/compute/api.py                   |   13 -
 nova/compute/manager.py               |    9 -
 nova/flags.py                         |    9 -
 nova/tests/fake_libvirt_utils.py      |    4 -
 nova/tests/policy.json                |    1 -
 nova/tests/test_compute.py            |   21 -
 nova/tests/test_libvirt.py            |   14 -
 nova/tests/test_virt_drivers.py       |    8 -
 nova/tests/test_vmwareapi.py          |    3 -
 nova/virt/driver.py                   |    4 -
 nova/virt/fake.py                     |    5 -
 nova/virt/libvirt/connection.py       |   26 -
 nova/virt/libvirt/utils.py            |   12 -
 nova/virt/vmwareapi/vmops.py          |    4 -
 nova/virt/vmwareapi_conn.py           |    4 -
 nova/virt/xenapi/vmops.py             |    5 -
 nova/virt/xenapi_conn.py              |    6 +-
 run_tests.sh                          |    6 +-
 setup.py                              |    1 -
 tools/ajaxterm/README.txt             |  120 ---
 tools/ajaxterm/ajaxterm.1             |   35 -
 tools/ajaxterm/ajaxterm.css           |   64 --
 tools/ajaxterm/ajaxterm.html          |   25 -
 tools/ajaxterm/ajaxterm.js            |  279 -------
 tools/ajaxterm/ajaxterm.py            |  586 --------------
 tools/ajaxterm/configure              |   32 -
 tools/ajaxterm/configure.ajaxterm.bin |    2 -
 tools/ajaxterm/configure.initd.debian |   33 -
 tools/ajaxterm/configure.initd.gentoo |   27 -
 tools/ajaxterm/configure.initd.redhat |   75 --
 tools/ajaxterm/configure.makefile     |   20 -
 tools/ajaxterm/qweb.py                | 1356 ---------------------------------
 tools/ajaxterm/sarissa.js             |  647 ----------------
 tools/ajaxterm/sarissa_dhtml.js       |  105 ---
 tools/euca-get-ajax-console           |  169 ----
 36 files changed, 3 insertions(+), 3873 deletions(-)

commit ae377f42e95b18438f4855c13230e077a870c64b
Merge: d1b4f80 dd4562e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 19:32:15 2012 +0000

    Merge "Fix quantum client filters"

commit d1b4f805a6e6697953972f25dbdfc9486ba23419
Merge: bedef20 5d5302a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 19:09:24 2012 +0000

    Merge "Add nova/tests/policy.json to tarball"

commit 7eca1aed7db7d3d60192f88aaecc43f8001106ec
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Feb 7 17:06:13 2012 +0000

    Adding the request id to response headers. Again.
    
    This feature used to exist in nova. A major refactor inadvertently
    removed it.
    
    Change-Id: Ie9b658bef808f3b5959b85f731483a2df59a5ede
    bp: nova-request-response-id

 nova/api/openstack/wsgi.py                   |    6 ++++--
 nova/tests/api/openstack/compute/test_api.py |   11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

commit bedef20b4fdaa678017390afd616a4db41e6d949
Merge: a3febb1 c716c94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 16:50:12 2012 +0000

    Merge "Fix support for --flagfile argument"

commit a3febb16e571890911622deb12762bb46e8dfbee
Merge: de23221 6dbbd26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 16:33:10 2012 +0000

    Merge "Update migration to work when data already exists"

commit 6dbbd26cb193d659b517e440f19737bb899af917
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Feb 7 09:54:30 2012 -0600

    Update migration to work when data already exists
    
    Fixes LP928322
    
    Change-Id: I64213b863f019700f0555ab0db9fa0914145548a

 .../075_convert_bw_usage_to_store_network_id.py    |   36 ++++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

commit c716c94d1db26faa59332340e9eabe03b3d41d1b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Feb 7 15:49:13 2012 +0000

    Fix support for --flagfile argument
    
    Recent changes broke support for the --flagfile argument. It would attempt
    to find the argument and then pull off the filename portion, but it would
    only skip one letter, instead of the full argument name. The resulting
    error would be:
    
    Change-Id: Ic252b0c778774a7ea3e24a9ed8b182deb5987f65
    OSError: [Errno 2] No such file or directory: 'lagfile=../nova.conf'

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd9c3aff0da483e3e6e953c7638b4d5c41162092
Author: Mikyung Kang <mkkang@isi.edu>
Date:   Mon Nov 7 14:32:22 2011 -0500

    Implements blueprint heterogeneous-tilera-architecture-support
    
    Change-Id: Iad8f66af18eb396f4737cd4ea168edcc77481ee6

 Authors                                       |    2 +
 nova/tests/baremetal/test_proxy_bare_metal.py |  292 +++++++++
 nova/tests/baremetal/test_tilera.py           |   88 +++
 nova/virt/baremetal/__init__.py               |   15 +
 nova/virt/baremetal/dom.py                    |  268 +++++++++
 nova/virt/baremetal/fake.py                   |  157 +++++
 nova/virt/baremetal/nodes.py                  |   42 ++
 nova/virt/baremetal/proxy.py                  |  799 +++++++++++++++++++++++++
 nova/virt/baremetal/tilera.py                 |  368 ++++++++++++
 nova/virt/connection.py                       |    9 +
 10 files changed, 2040 insertions(+)

commit 5d5302a2939b0aaa1ae11089dc99d8ee9083aae7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 7 16:36:34 2012 +0100

    Add nova/tests/policy.json to tarball
    
    Tests do not run out of the tarball at the moment due to this.
    
    Change-Id: I9c36f3b645e04fd208fac3c18ad359b06eed55fa

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit dd4562e995155eb4903965e295b786a08ae36690
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Feb 6 20:58:31 2012 -0600

    Fix quantum client filters
    
    filter_ops were not being appened to the url.
    
    Change-Id: Ic8bfcfc3ca09c578d521463273a0a17950d704b0

 nova/network/quantum/client.py |   24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

commit de23221007cc687533c86f0de217c7d0b6fb523f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Feb 7 00:37:40 2012 -0600

    Store the correct tenant_id/project_id
    
    Melange stores the networks in the nova table so quantum manager
    can use it, this makes it store the correct value so deallocation
    will work.
    
    Change-Id: Icafacca559570c6de679fbb126700519a19b77ee

 nova/network/quantum/melange_ipam_lib.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 88eb8b772890915550638720f59eed991789dcdc
Merge: d52ea46 8faf71f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 00:45:17 2012 +0000

    Merge "Increased coverage of nova/auth/dbdriver.py to 100%. Fixes 828609."

commit 95771cf112128f5f22a6a5e2e1e0e2d251f29e53
Author: Nikhil Komawar <nikhil.komawar@rackspace.com>
Date:   Mon Feb 6 22:56:20 2012 +0000

    dont show blank endpoint headers
    
    fixes bug: 741972
    
    Change-Id: I4a661a13c5baaa79ee647a6c1cedcef29a2642f6

 Authors                                       |    1 +
 nova/api/openstack/auth.py                    |   12 +++++---
 nova/tests/api/openstack/compute/test_auth.py |   38 +++++++++++++++++--------
 3 files changed, 35 insertions(+), 16 deletions(-)

commit d52ea46f558ef5e8d2cda238d89b420e9a5d7932
Merge: 7249610 9b1b65a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 23:59:01 2012 +0000

    Merge "Fix _poll_bandwidth_usage if no network on vif"

commit 90ded87acd5db7d03e2a86e799cab5e79e196f19
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 6 23:42:03 2012 +0000

    Pass in project_id in ext. authorizer
    
    Fixes bug 927966
    
    Change-Id: I30004493c8a0269c3582e8fd88fd9ff38904cbe5

 nova/api/openstack/extensions.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 9b1b65a4395511b07e15a521de3a3a66c4bdcfaa
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Dec 12 16:41:40 2011 -0600

    Fix _poll_bandwidth_usage if no network on vif
    
    Bugfix for lp901819
    
    Move DB lookups out of the virt layer for bw usage.
    Migrate to storing the mac address in the table.
    Only lookup network label when sending usage events.
    Attempt to use info_cache for label lookup before
        punting to rpc call.
    
    Change-Id: Iffb4bc220804be7d5fe26d6416b90cd747b72753

 nova/compute/manager.py                            |   10 +-
 nova/compute/utils.py                              |   20 +++-
 nova/db/api.py                                     |    4 +-
 nova/db/sqlalchemy/api.py                          |    6 +-
 .../075_convert_bw_usage_to_store_network_id.py    |   90 +++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/network/api.py                                |    6 ++
 nova/network/manager.py                            |    5 +
 nova/tests/test_compute.py                         |  101 +++++++++++++++-----
 nova/tests/test_compute_utils.py                   |    9 ++
 nova/tests/test_notifier.py                        |    2 +
 nova/tests/test_quota.py                           |    3 +-
 nova/virt/xenapi_conn.py                           |   10 +-
 13 files changed, 224 insertions(+), 44 deletions(-)

commit 724961063323d811405c3933fb5d16fb5b83bb12
Merge: 47b65b7 0cbc395
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 22:57:09 2012 +0000

    Merge "Fix nova.virt.firewall debugging message to use UUID"

commit 47b65b718d931f6771722dfc78f73b48770e286f
Merge: ab857f5 59471a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 22:46:58 2012 +0000

    Merge "Fix debugging log message to print instance UUID"

commit 0cbc3950073d7add201864030d9295d0d14e560c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Feb 6 22:42:39 2012 +0000

    Fix nova.virt.firewall debugging message to use UUID
    
    Otherwise it prints the repr() of the instance, which isn't very useful:
    
    2012-02-06 21:34:23,163 DEBUG nova.virt.firewall [-] Filters added to the instance: <nova.db.sqlalchemy.models.Instance object at 0x5deb5d0> from (pid=11219) prepare_instance_filter /usr/lib/python2.6/dist-packages/nova/virt/firewall.py:138
    
    Change-Id: I22cd20dbed44527f0d2ece2a788c9465f7f77ee4

 nova/virt/firewall.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab857f574da8af727ace194792460f062c0cf365
Merge: b2a49de 91b3d68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 22:37:24 2012 +0000

    Merge "Adds flags for href prefixes"

commit b2a49decb6a333f9162b61ad38533137a05e49d0
Merge: 33e008a 25c6994
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 22:24:01 2012 +0000

    Merge "mkfs takes vfat, not fat32."

commit 59471a6cad52229fca6c50d9ed1a3032717c58c8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Feb 6 22:19:48 2012 +0000

    Fix debugging log message to print instance UUID
    
    It was printing the repr() of the instance, which is not very useful:
    
    2012-02-06 21:34:12,111 DEBUG nova [-] Starting snapshot for VM <nova.db.sqlalchemy.models.Instance object at 0x5fbb2d0> from (pid=11219) _create_snapshot /usr/lib/python2.6/dist-packages/nova/virt/xenapi/vmops.py:653
    
    Change-Id: I86f5e0803576fdad741e7df8d62c77bda8c95b31

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33e008a2da0d90a86a6f3bf909604e9f064dc080
Merge: f6d0925 3868266
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 22:12:40 2012 +0000

    Merge "bug 927507: fix quantum manager get_port_by_attachment"

commit 25c69947dabd9e08610f5f3503a052a1030d00fd
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 6 16:12:08 2012 -0600

    mkfs takes vfat, not fat32.
    
    Change-Id: I2619eea5371be430fe303db21a1958b84c5d0f0e

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f6d09254bbf67c38d64c3e622d914e1cea152668
Merge: a86f921 94d8553
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 17:29:45 2012 +0000

    Merge "Add initiator to initialize_connection"

commit a86f921d49b49d722fb7220b8fee8a1218d74959
Merge: b3572e2 65e2331
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 17:18:45 2012 +0000

    Merge "Allows nova to read files as root"

commit b3572e21a63b255f61b0a030c3c1463eb07bfa98
Merge: 659342f b5bd518
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 17:09:16 2012 +0000

    Merge "Pass partition into libvirt file injection"

commit b5bd5188b5928b21507d56075bec252a53190b12
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Feb 5 11:28:23 2012 -0800

    Pass partition into libvirt file injection
    
    Fixes bug 927289
    
    Change-Id: If290cea2fe509e7e972ff614bddf958edcc621f6

 nova/virt/libvirt/connection.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 659342feff6a127a852b10d883af9c9c20db6a31
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Tue Jan 31 15:20:27 2012 +0000

    bug 924266: connection_type and firewall_driver flags mismatch
    
    If connection_type is None, the default firewall driver should not
    be nova.virt.libvirt.firewall.IptablesFirewallDriver; it should
    either be None or the base one.
    
    If this fix gets through, devstack needs to be fixed accordingly.
    See review below for details.
    
    https://review.openstack.org/#change,3576
    
    Change-Id: I58dabc50be2d5cdcd509b2ac89a5bd0f78251bd0

 nova/flags.py                   |    2 +-
 nova/tests/test_virt_drivers.py |    3 ++-
 nova/virt/connection.py         |    1 +
 nova/virt/libvirt/connection.py |    6 ++++--
 nova/virt/libvirt/firewall.py   |    2 ++
 nova/virt/xenapi/firewall.py    |    4 ++++
 nova/virt/xenapi/vmops.py       |    6 +++++-
 7 files changed, 19 insertions(+), 5 deletions(-)

commit 24b934f7f04903f3faba1785ae6deb6f2ada7dbd
Merge: 97c10ef 1a32aad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 14:47:03 2012 +0000

    Merge "Don't write a dns directive if there are no dns records in /etc/network/interfaces"

commit 97c10efe75288b933d75f7a2e8d3241598d05c32
Merge: 18f0040 f7e5328
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 14:31:06 2012 +0000

    Merge "Rename inst in _create_image, and pass instance to log msgs."

commit 18f00405dcd24e6a0f49a2ad971b5ea917333e66
Merge: cb78efa e01d5a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 6 14:21:33 2012 +0000

    Merge "Fix broken flag in test_imagecache"

commit 38682667c53199e5860c35101ad33c0cdc21e692
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Feb 6 01:32:12 2012 -0800

    bug 927507: fix quantum manager get_port_by_attachment
    
    - makes query efficient by using Quantum API filters (new in API v1.1)
    - fixes correctness issue where we did not handle case where network
    did not exist in quantum (note: this was masked by a quantum bug that
    will be fixed once this change is into nova).
    
    Also included a few other minor things in this patchset:
    1) make get_instance_nw_info use network label from DB, which is already
    available, rather than calling out to quantum just to get the name.
    2) quantum manager was not properly cleaning up VIFs in the nova db.  This fixes that.
    3) set 'bridge' in nw_info dictionary to the empty string, to clearly indicate that this value is ignored by Quantum Manager.
    
    Change-Id: Ia1cbb5232f8ce373b605979902f88d7528d3e456

 nova/network/quantum/client.py             |   28 +++++++++++++++++++++-------
 nova/network/quantum/manager.py            |   13 +++----------
 nova/network/quantum/quantum_connection.py |   27 +++++++++++++++------------
 3 files changed, 39 insertions(+), 29 deletions(-)

commit e01d5a2a23b6030bc38cc809014e62c506303c89
Author: Michael Still <mikal@stillhq.com>
Date:   Mon Feb 6 15:32:43 2012 +1100

    Fix broken flag in test_imagecache
    
    Removing the duplicate instances_path flag in
    nova/virt/libvirt in https://review.openstack.org/#change,3759
    broke the imagecache unit tests.
    
    Change-Id: I8fed15bd22d88a7796e1f98981c3ad87358a244a

 nova/tests/test_imagecache.py   |    2 ++
 nova/virt/libvirt/imagecache.py |    1 +
 2 files changed, 3 insertions(+)

commit 1a32aad3a61deaadff7972689319c78fd16deb86
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Feb 5 19:51:17 2012 -0800

    Don't write a dns directive if there are no dns records in /etc/network/interfaces
    
    Change-Id: I26e22f37f91bf242aa573c91b26b2304fdd25751

 nova/virt/interfaces.template |    2 ++
 1 file changed, 2 insertions(+)

commit cb78efa52ca112f0021f8fbb4c6a184d0968dbf6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 5 23:01:18 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I6031c17fd161f4ac39dfa11f27d45846208df5f9

 po/pt_BR.po |  510 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 254 insertions(+), 256 deletions(-)

commit 567c0e78a3078cb5a3f200321a6d99173d8afc5f
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Sat Feb 4 17:47:56 2012 +0900

    Backslash continuations (nova.db)
    
    Fixes bug #925284
    
    Didn't remove backslash continuations related to sqlalchemy queries.
    
    Change-Id: Id2248a6ade18050607db42fda42e8b276d72b845

 nova/db/base.py                                    |    7 +++----
 nova/db/sqlalchemy/api.py                          |   22 +++++++++-----------
 .../034_change_instance_id_in_migrations.py        |    4 ++--
 .../versions/059_split_rxtx_quota_into_network.py  |   15 +++++++------
 .../066_preload_instance_info_cache_table.py       |   19 ++++++++---------
 5 files changed, 31 insertions(+), 36 deletions(-)

commit 94d8553201e50e3e9e25992bfe4735addae4ffda
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 28 01:17:00 2012 -0800

    Add initiator to initialize_connection
    
    Some volumes need to know the name of the initiator that will be
    connecting to the iscsi volume.  This adds a call down to the hypervisor
    driver to get the ip and the initiator name for the vm before calling
    initialize connection. This connection is passed down to the volume
    driver so that it can be used to authenticate when the hypervisor
    tries to connect to the volume.
    
     * Adds initiator initialize_connection
     * Makes a call to driver to get initiator name and ip address
     * Gets initiator from openiscsi for libvirt
     * Gets initiator from config for xenapi
     * Add tests for the driver calls
     * Fixes bug 924461
    
    Change-Id: I5b6a2dd84560c7f7b447571e0abf0993e5512ca0

 nova/compute/manager.py          |   19 +++++++++-------
 nova/rootwrap/compute.py         |    3 +++
 nova/tests/fake_libvirt_utils.py |    4 ++++
 nova/tests/test_libvirt.py       |   46 ++++++++++++++++++++++++++++++--------
 nova/tests/test_virt_drivers.py  |    6 +++++
 nova/virt/driver.py              |   14 ++++++++++++
 nova/virt/fake.py                |    3 +++
 nova/virt/libvirt/connection.py  |   16 +++++++++++--
 nova/virt/libvirt/utils.py       |   10 +++++++++
 nova/virt/vmwareapi_conn.py      |    9 ++++++++
 nova/virt/xenapi_conn.py         |   15 +++++++++++++
 nova/volume/api.py               |    8 +++----
 nova/volume/driver.py            |   28 +++++++++++------------
 nova/volume/manager.py           |   40 ++++++++++++++++++++++++---------
 nova/volume/xensm.py             |    4 ++--
 15 files changed, 176 insertions(+), 49 deletions(-)

commit 65e233133e801439caaa8265b0de68c70a04ccd2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 3 15:29:00 2012 -0800

    Allows nova to read files as root
    
     * Adds a rootwrap filter to limit readable files
     * Adds a utils method to read a file as root
     * adds tests to verify the additions work
    
    Change-Id: Ic1ffb6f72f9b73795d5f39fac719842e6bdf16dd

 nova/rootwrap/filters.py         |   17 +++++++++++++++++
 nova/tests/test_nova_rootwrap.py |    9 +++++++++
 nova/tests/test_utils.py         |   12 ++++++++++++
 nova/utils.py                    |    9 +++++++++
 4 files changed, 47 insertions(+)

commit e9fd01e58b6a83b400ce9825f2543cb6ef476f00
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 4 00:02:41 2012 +0100

    Re-run nova-manage under sudo if unable to read conffile
    
    Having to manually sudo to the nova user to make things work is
    tedious. Make it so that if we can't read the conffile, we just
    re-exec under sudo.
    
    Fixes bug 805695
    
    Change-Id: I322cece80ca757c69147fb3f8474ad137d9bff82

 bin/nova-manage |   11 ++++++++++-
 nova/utils.py   |    3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 61c434baa77fa2744cac81f64957da319078614e
Merge: f0a1148 8efe152
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 23:09:13 2012 +0000

    Merge "Provides flag override for vlan interface"

commit f7deddb89ce63c2ccc7a207461188aeb7a41af32
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Feb 2 16:28:55 2012 -0800

    Fix status transition when reverting resize
    
    Present the instance being reverted with a 'REVERT_RESIZE' status instead
    of 'ACTIVE' after a revertResize action is triggered. Fixes bug 924371
    
    Change-Id: I12e98733fd00c0794fb9a4acb0cc6752ca02e855

 nova/api/openstack/common.py                     |    1 +
 nova/compute/api.py                              |    4 ++--
 nova/compute/manager.py                          |    4 +++-
 nova/tests/api/openstack/compute/test_servers.py |    5 +++++
 nova/tests/test_compute.py                       |    9 +++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)

commit 91b3d687d77887c59f4e31fdd457ff6b22168dc7
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Thu Feb 2 16:22:16 2012 -0500

    Adds flags for href prefixes
    
    bug #924090
    
    Change-Id: I66358b3f526a5d356e11281ee32ce80e7b74d474

 nova/api/openstack/common.py                     |   18 ++++++-
 nova/api/openstack/compute/views/images.py       |    6 +++
 nova/flags.py                                    |    8 +++
 nova/tests/api/openstack/compute/test_flavors.py |   32 ++++++++++++
 nova/tests/api/openstack/compute/test_images.py  |   58 ++++++++++++++++++++++
 5 files changed, 120 insertions(+), 2 deletions(-)

commit f0a11485894f56aba337f65af5f92bede12ef17f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Feb 3 17:31:35 2012 -0500

    X_USER is deprecated in favor of X_USER_ID
    
    Addressed bug 926372
    
    Eventually, we should stop supporting X_USER because it is *supposed* to
    be the user's login name rather than their id. But this change preserves
    the old behavior for stability.
    
    For more info checkout keystone/middleware/auth_token.py in the keystone
    project.
    
    Change-Id: Ie837e73f9a592a903af71a426e202f8b6a9ac581

 nova/api/auth.py            |    8 +++---
 nova/tests/api/test_auth.py |   60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

commit cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486
Merge: 30c363b 9871c5f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 19:50:45 2012 +0000

    Merge "Move cfg to nova.openstack.common"

commit 30c363beebc9c17897997c5622802e884d0afda6
Merge: 6b53209 9dadca1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 19:38:00 2012 +0000

    Merge "Remove duplicate instances_path option"

commit 9871c5f963b6d98240635a9a447d14d46133c910
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 00:50:58 2012 +0000

    Move cfg to nova.openstack.common
    
    Move it here so that it can be kept in sync with openstack-common using
    the new update.py script for code in openstack-common's incubation area.
    
    See here for more details:
    
      http://wiki.openstack.org/CommonLibrary#Incubation
    
    Note: this commit just moves the existing code in Nova with no other
    changes. A subsequent commit will sync it with latest openstack-common
    so that it is easier see the new changes.
    
    Change-Id: If88d678b1b9bad3d37117de7f7159d7fea8ab4c8

 bin/clear_rabbit_queues                    |    2 +-
 bin/nova-ajax-console-proxy                |    2 +-
 bin/nova-direct-api                        |    2 +-
 nova/api/auth.py                           |    2 +-
 nova/api/ec2/__init__.py                   |    2 +-
 nova/api/openstack/compute/__init__.py     |    2 +-
 nova/auth/ldapdriver.py                    |    2 +-
 nova/auth/manager.py                       |    2 +-
 nova/cloudpipe/pipelib.py                  |    2 +-
 nova/common/cfg.py                         | 1126 ----------------------------
 nova/compute/api.py                        |    2 +-
 nova/compute/manager.py                    |    2 +-
 nova/console/manager.py                    |    2 +-
 nova/console/vmrc.py                       |    2 +-
 nova/console/vmrc_manager.py               |    2 +-
 nova/console/xvp.py                        |    2 +-
 nova/consoleauth/__init__.py               |    2 +-
 nova/consoleauth/manager.py                |    2 +-
 nova/crypto.py                             |    2 +-
 nova/db/api.py                             |    2 +-
 nova/db/base.py                            |    2 +-
 nova/flags.py                              |    2 +-
 nova/image/s3.py                           |    2 +-
 nova/ipv6/api.py                           |    2 +-
 nova/log.py                                |    2 +-
 nova/network/ldapdns.py                    |    2 +-
 nova/network/linux_net.py                  |    2 +-
 nova/network/manager.py                    |    2 +-
 nova/network/quantum/manager.py            |    2 +-
 nova/network/quantum/melange_connection.py |    2 +-
 nova/network/quantum/quantum_connection.py |    2 +-
 nova/notifier/api.py                       |    2 +-
 nova/notifier/list_notifier.py             |    2 +-
 nova/notifier/rabbit_notifier.py           |    2 +-
 nova/objectstore/s3server.py               |    2 +-
 nova/openstack/__init__.py                 |   15 +
 nova/openstack/common/__init__.py          |   15 +
 nova/openstack/common/cfg.py               | 1126 ++++++++++++++++++++++++++++
 nova/policy.py                             |    2 +-
 nova/quota.py                              |    2 +-
 nova/rpc/__init__.py                       |    6 +-
 nova/rpc/common.py                         |    2 +-
 nova/rpc/impl_qpid.py                      |    2 +-
 nova/scheduler/api.py                      |    2 +-
 nova/scheduler/driver.py                   |    2 +-
 nova/scheduler/filters/core_filter.py      |    2 +-
 nova/scheduler/filters/ram_filter.py       |    2 +-
 nova/scheduler/host_manager.py             |    2 +-
 nova/scheduler/least_cost.py               |    2 +-
 nova/scheduler/manager.py                  |    2 +-
 nova/scheduler/multi.py                    |    2 +-
 nova/scheduler/scheduler_options.py        |    2 +-
 nova/scheduler/simple.py                   |    2 +-
 nova/scheduler/vsa.py                      |    2 +-
 nova/scheduler/zone_manager.py             |    2 +-
 nova/service.py                            |    2 +-
 nova/test.py                               |    2 +-
 nova/tests/declare_flags.py                |    2 +-
 nova/tests/runtime_flags.py                |    2 +-
 nova/tests/test_cfg.py                     |  789 -------------------
 nova/tests/test_flags.py                   |    2 +-
 nova/tests/test_service.py                 |    2 +-
 nova/utils.py                              |    2 +-
 nova/virt/disk/api.py                      |    2 +-
 nova/virt/disk/nbd.py                      |    2 +-
 nova/virt/firewall.py                      |    2 +-
 nova/virt/libvirt/connection.py            |    2 +-
 nova/virt/libvirt/imagecache.py            |    2 +-
 nova/virt/libvirt/utils.py                 |    2 +-
 nova/virt/libvirt/vif.py                   |    2 +-
 nova/virt/vmwareapi/vim.py                 |    2 +-
 nova/virt/vmwareapi/vmops.py               |    2 +-
 nova/virt/vmwareapi_conn.py                |    2 +-
 nova/virt/xenapi/vif.py                    |    2 +-
 nova/virt/xenapi/vm_utils.py               |    2 +-
 nova/virt/xenapi/vmops.py                  |    2 +-
 nova/virt/xenapi_conn.py                   |    2 +-
 nova/vnc/__init__.py                       |    2 +-
 nova/vnc/xvp_proxy.py                      |    2 +-
 nova/volume/driver.py                      |    2 +-
 nova/volume/iscsi.py                       |    2 +-
 nova/volume/manager.py                     |    2 +-
 nova/volume/san.py                         |    3 +-
 nova/vsa/api.py                            |    2 +-
 nova/vsa/manager.py                        |    2 +-
 85 files changed, 1238 insertions(+), 1998 deletions(-)

commit 6b532096f6c72627dccb32fa49e8045d6afbdc6d
Author: Ziad Sawalha <github@highbridgellc.com>
Date:   Tue Jan 24 13:03:32 2012 -0600

    Use Keystone Extension Syntax for EC2 Creds
    
    - Syntax is OS-KSEC2:ec2Credentials (not ec2Credentials)
    - adds to fix for bug 917408
    - Syntax also requires a call to /tokens instead of /ec2tokens
    - Changes are compatible (old syntax supported)
    - Warning will be issued to log if URL syntax is old
    
    Change-Id: I5ff9d1643122de2f383517e60f15852720c54490

 Authors                  |    1 +
 nova/api/ec2/__init__.py |   29 +++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

commit 9dadca1f3a8fda00d93f429846dce6bd8ae534a2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 3 19:14:09 2012 +0000

    Remove duplicate instances_path option
    
    Change-Id: Ic5b4fd0fd5360ca6f9d029e8eb4d751a3ea36262

 nova/virt/libvirt/imagecache.py |    3 ---
 1 file changed, 3 deletions(-)

commit fd7d07536bef5ed0412ecb42ab164b1808628b83
Merge: 75d6a84 8f50396
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 18:51:28 2012 +0000

    Merge "Delete swap VDI if not used"

commit 75d6a844a23aba3316e426793ee09ae8870f3b83
Merge: 8ac1b20 07d74aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 18:37:28 2012 +0000

    Merge "Raise ApiError in response to InstanceTypeNotFound"

commit 8f5039615826539dca4e5532185d6c03e386dd87
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Feb 3 18:03:39 2012 +0000

    Delete swap VDI if not used
    
    Fixes bug 889196
    
    Change-Id: I08f4484310c5a35e62ca761193790a464ad15ac9

 nova/virt/xenapi/vmops.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 8ac1b20fef00f58bbbe45ac7bdb37a0c1f4bd47d
Merge: 10e18bc 55a9930
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 17:15:36 2012 +0000

    Merge "Fix bug #924093"

commit 10e18bce63cdad1c94361e9097642f4d957c7926
Merge: 54d7fdc e79e36a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 16:54:23 2012 +0000

    Merge "Make sure tenant_id is populated"

commit 07d74aa916ee2798f717ae5d298f8ca51e883770
Author: Maru Newby <mnewby@internap.com>
Date:   Thu Feb 2 12:52:10 2012 -0800

    Raise ApiError in response to InstanceTypeNotFound
    
     * Updates methods in nova.compute.instance_types to catch
       InstanceTypeNotFound exceptions and re-raise them as ApiError.
       - Previously, the methods in instance_types were raising ApiError in
         response to DBError, but the underlying db calls have since been
         updated to detect empty results and throw more specific exceptions.
     * Updates get_instance_type_by_flavor_id to not try to catch DBError,
       as the underlying db call only ever raises FlavorNotFound.
       get_instance_type_by_flavor_id should not raise ApiError, as callers
       expect the FlavorNotFound exception and know how to handle it.
     * Fixes bug 872618
    
    Change-Id: I8652f04889adb448017afd253ecdcc840fbb660f

 Authors                           |    1 +
 nova/compute/instance_types.py    |   23 +++++++++++------------
 nova/tests/test_instance_types.py |    8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

commit f7e5328e136f825343a4988411a1b14a2d2adb98
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Feb 2 14:51:26 2012 +1100

    Rename inst in _create_image, and pass instance to log msgs.
    
    This renames inst in _create_image to the more consistant name
    "instance". It also passes the instance through log messages in this
    method, and removes the instance name from the translatable text
    for the corresponding log messages.
    
    Change-Id: I9a085198d3bea5d073f4297cc57c84dc7fcb0349

 .mailmap                        |    1 +
 nova/virt/libvirt/connection.py |   85 +++++++++++++++++++--------------------
 2 files changed, 43 insertions(+), 43 deletions(-)

commit 54d7fdc0c8448765d14b4c3bec23f91e0d0aade7
Merge: d9b6338 3141ca7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 3 06:10:30 2012 +0000

    Merge "blueprint nova-image-cache-management phase1"

commit 55a9930c7a67cbb890825435418ab1cc42f0926b
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Tue Jan 31 11:04:18 2012 +0900

    Fix bug #924093
    
    Change-Id: If014165a630c3722eae26bf2aa1e5d137f145815

 nova/api/openstack/compute/contrib/hosts.py        |   75 +++++++++++---------
 .../api/openstack/compute/contrib/test_hosts.py    |   55 ++++----------
 2 files changed, 56 insertions(+), 74 deletions(-)

commit e79e36a3e787bb165168a6300170014a85179d16
Author: Brad Hall <brad@nicira.com>
Date:   Thu Feb 2 17:10:24 2012 -0800

    Make sure tenant_id is populated
    
    Change-Id: Ic2dfa06d3a3bef2f63e011629a870903b5990363

 nova/network/quantum/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit d9b6338f1c62e17d29057e3e568f0fb3a524a0f3
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Fri Feb 3 00:01:29 2012 +0000

    Fix for bug 883310
    
    Don't throw exception when flavor has vcpus=0 or memory_mb=0
    
    Change-Id: I6f12cf06a569b491f537880afe37f2cf516be2d2

 nova/quota.py            |   10 +++++++---
 nova/tests/test_quota.py |   12 +++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

commit 03adfdbc1c08fc9a7eccd9741859230396fc2ad1
Merge: bcdce94 b863fb3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 23:40:58 2012 +0000

    Merge "Make crypto use absolute imports"

commit 8faf71fdabec1c18af4de3291adb2eb5bfd8a1e7
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Thu Feb 2 17:32:29 2012 -0600

    Increased coverage of nova/auth/dbdriver.py to 100%.
    Fixes 828609.
    
    Change-Id: Iefa36ced27328ad79b9d58f04d915178b9b63bcc

 .mailmap                |    1 +
 nova/auth/dbdriver.py   |   12 +----------
 nova/tests/test_auth.py |   52 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 11 deletions(-)

commit bcdce942def44cfe19398e386a049c38c874cb93
Merge: 1a88c64 dc6c739
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 23:31:15 2012 +0000

    Merge "Remove duplicate logging_debug_format option"

commit b863fb3744170e5aa44083fd53fa92b3b9c3fb04
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 15:24:34 2012 -0800

    Make crypto use absolute imports
    
     * Fixes bug 925792
     * Cleans up some extra imports as well
    
    Change-Id: Ibea2411f552747e074c8d2e96468e3b09bf9c9c9

 nova/crypto.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 1a88c64535bbf88ccbf1b94fbd01d5bd158885ea
Merge: 38399a7 3db5b1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 23:14:31 2012 +0000

    Merge "fix stale libvirt images on download failure. Bug 801412"

commit dc6c739845c4e532f077754284d52bbdd44a0874
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Feb 2 23:08:48 2012 +0000

    Remove duplicate logging_debug_format option
    
    Looks like it was accidentally added by commit 605c22b18.
    
    Change-Id: Ibfd16e47cea3fa549f3a6064076361098ba76dd6

 nova/log.py |    4 ----
 1 file changed, 4 deletions(-)

commit 38399a7333206bfc4385291b1903ae76c9a124f8
Merge: 4982ea1 76e7979
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 23:06:19 2012 +0000

    Merge "Add comments to injected keys and network config"

commit 4982ea11d881e0a0bc45bc1ccfbf1035e4060dd9
Merge: 07ae687 a8104eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 22:58:23 2012 +0000

    Merge "remove auto fsck feature from file injection. Bug 826794"

commit 3141ca776267d11a71c0144a0d92651ac8d8ba9e
Author: Michael Still <mikal@stillhq.com>
Date:   Mon Jan 9 18:21:57 2012 +1100

    blueprint nova-image-cache-management phase1
    
    Phase 1 of the image-cache-management blueprint. Implement
    checksumming and verification of base images, as well as
    removal of base images which are not in use. Removal is
    enabled with a flag.
    
    Change-Id: Ib04a02075a103c2fef6716fd0ac87c41a3535d37

 nova/compute/manager.py         |   21 +++
 nova/tests/test_imagecache.py   |  241 ++++++++++++++++++++++++++
 nova/tests/test_utils.py        |    9 +
 nova/utils.py                   |    8 +
 nova/virt/driver.py             |   11 ++
 nova/virt/libvirt/connection.py |   18 +-
 nova/virt/libvirt/imagecache.py |  366 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 673 insertions(+), 1 deletion(-)

commit 07ae687a13d456ab1aa9064c62dd98c94cfabd33
Merge: 6990b93 cc4e125
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 22:50:40 2012 +0000

    Merge "Set rescue instance hostnames appropriately."

commit 6990b93ee6d8e0b239d1338242c111bbc3d7563d
Merge: 72d2411 999db21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 22:38:25 2012 +0000

    Merge "Throw an user error on creating duplicate keypairs Fixes bug 902162"

commit 72d2411aa0932d20c11ed2fff4422d28b4681151
Merge: 723cbc7 18a9a59
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 22:31:05 2012 +0000

    Merge "Remove hard coded m1.tiny behavior."

commit cc4e125491168b7f92edc1153437798e5cf64a78
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 2 15:19:36 2012 -0600

    Set rescue instance hostnames appropriately.
    
    Fixes bug 920605.
    
    Change-Id: Iedba7d727fb88d169cc5ca6387ef13345d227c48

 nova/virt/xenapi/vmops.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 999db21e1a5a0944535e0fb0fd2478ab1647d85b
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Thu Feb 2 14:19:57 2012 -0600

    Throw an user error on creating duplicate keypairs
    Fixes bug 902162
    
    Change-Id: I1b73943aab338bde90b4d47bc015964e9981af5d

 .mailmap                                           |    3 ++-
 Authors                                            |    2 +-
 nova/api/openstack/compute/contrib/keypairs.py     |    3 ++-
 .../api/openstack/compute/contrib/test_keypairs.py |   14 ++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

commit 723cbc762a5e1d8d53e7e30223ee701dd65bd61c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 13:04:29 2012 -0800

    Fixes uuid lookup in virtual interfaces extension
    
     * Makes virtual interfaces get the instance and pass it to network.api
     * Sends the id from the instance when looking up vifs
     * Repairs the tests
     * Fixes bug 925682
    
    Change-Id: If25514246f30bfc983f26f7a8f1c35f33f8b9cc4

 .../compute/contrib/virtual_interfaces.py          |    5 ++++-
 nova/network/api.py                                |    6 ++++--
 .../compute/contrib/test_virtual_interfaces.py     |   12 +++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

commit 76e79792b4b94c9edac0ebf3cdf3eb49c7999398
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Feb 2 12:06:38 2012 -0800

    Add comments to injected keys and network config
    
    Fixes bug 754950
    
    Change-Id: Ib773479c3b34b9ddd322abd02b297acf5359a847

 nova/virt/disk/api.py         |    9 ++++++++-
 nova/virt/interfaces.template |    2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 18a9a5921c1d74e1b0b78b29000c11aa9790f3a7
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Thu Feb 2 18:46:50 2012 +0000

    Remove hard coded m1.tiny behavior.
    
    It makes more sense to only care about local_gb.
    
    Fixes bug # 851301
    
    Change-Id: I13236020975be8643b227fc2700f2ecefffa5eb7

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ed516883faca1976acd6e5a9476d447d39e11ab9
Merge: 2494b2d 3b741ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 20:09:03 2012 +0000

    Merge "Capture bandwidth usage data before resize."

commit 2494b2d925a8fd161999b4d59b6831498c7ae62f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Feb 2 19:24:03 2012 +0000

    Fix disassociation of fixed IPs when using FlatManager
    
    Fixes bug 925664
    
    The model was disassociated from instance, but the code wasn't updated to
    use instance_id instead
    
    Change-Id: I532bd1f0f1d89353b6353215e80b74e9a14d989d

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0180c5b129ef47f67f3a66a3624805791ad71e31
Merge: def8544 dab791f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 19:05:48 2012 +0000

    Merge "DRYing up Volume/Compute APIRouters"

commit 8efe15209aaee6b15c8edb21362c08137294a7de
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 2 10:59:43 2012 -0800

    Provides flag override for vlan interface
    
    This means you can have your vlan_interface be different on
    different hosts machines by setting vlan_interface differently
    on each host.
    
     * Allow non-homogenous vlan networks
     * Fixes bug 833426
     * Includes failing test for linux_net
    
    Change-Id: I2f0d43c1366f88a8832a779c4065b37dd1a5bdf8

 nova/network/linux_net.py    |    3 ++-
 nova/tests/test_linux_net.py |   25 +++++++++++++++++++++++++
 nova/virt/libvirt/vif.py     |    3 ++-
 nova/virt/xenapi/vif.py      |    2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

commit a8104ebf127587cc9939a1990016d10f3bfcb146
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Thu Feb 2 18:16:02 2012 +0000

    remove auto fsck feature from file injection. Bug 826794
    
    This is at least independent of file injection,
    and as noted in the bug report is questionable
    to do anyway.
    
    Change-Id: Iddd33c446bad2232ea2d47cc30778228d1d222b0

 nova/virt/disk/api.py           |   16 +++++-----------
 nova/virt/disk/mount.py         |   14 +-------------
 nova/virt/libvirt/connection.py |    5 +----
 3 files changed, 7 insertions(+), 28 deletions(-)

commit def8544e804d4af22b89350b2d54c2c042833169
Merge: 44bd902 e0c59af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 18:58:22 2012 +0000

    Merge "Don't block forever for rpc.(multi)call response."

commit 44bd90224c83750b4d78241a10891ae427477a5f
Merge: 3759bcf 25c4f0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 18:40:38 2012 +0000

    Merge "Get rid of DeprecationWarning during db migration"

commit dab791f973dbf2f86ccc3fe323d2934eb56b6d8c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 1 21:20:45 2012 +0000

    DRYing up Volume/Compute APIRouters
    
    Fixes bug 925102
    
    Change-Id: I4ad3f95bec606ef1767d120b94e5fd03f16a7d3e

 nova/api/openstack/__init__.py                     |   69 ++++++++++++++++++++
 nova/api/openstack/compute/__init__.py             |   65 +-----------------
 nova/api/openstack/volume/__init__.py              |   65 +-----------------
 .../openstack/compute/contrib/test_cloudpipe.py    |    2 +-
 nova/tests/api/openstack/compute/test_api.py       |    2 +-
 5 files changed, 76 insertions(+), 127 deletions(-)

commit 3759bcf3fc58d3f9186b8759e1f0926419c4a594
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jan 31 20:50:48 2012 -0800

    Excise M2Crypto!
    
    This required rewriting our Diffie-Hellman-Merkle implementation for
    set_admin_password in xen. Fixes bug 917851.
    
    Change-Id: Ic4cdcc06221f003aec2dcd5ba05a1a9ad19d39c9

 doc/source/devref/development.environment.rst |   12 +--
 nova/crypto.py                                |  105 +++----------------------
 nova/scheduler/distributed_scheduler.py       |   30 +++----
 nova/tests/api/ec2/test_cloud.py              |   24 +++---
 nova/tests/test_crypto.py                     |   37 +++------
 nova/virt/xenapi/vmops.py                     |   62 ++++++---------
 tools/install_venv.py                         |   28 -------
 tools/pip-requires                            |    1 +
 8 files changed, 76 insertions(+), 223 deletions(-)

commit 2be2d0778cc9ec53da800d85a98430886772aec8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Feb 2 12:46:37 2012 -0500

    Add missing dev. Fixes LP: #925607
    
    Change-Id: I051bb489c2eb82fbf2d16147cb68774917a3eef5
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 3b741bad7a961ad8f2ec9e52614d49fdf961bdb6
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Feb 1 00:02:03 2012 +0000

    Capture bandwidth usage data before resize.
    
    Since resize is really a migrate, we need to capture usage data before resizing.
    This fixes bug 925587
    
    Change-Id: I999cb0e7c6b17beff542dddb4be09235e83313f0

 nova/compute/manager.py    |    1 +
 nova/tests/test_compute.py |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit af1a92f973ad3ddd6f7adafd325e6c80d5fd4dbf
Merge: 4503d90 df4c59e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 17:31:16 2012 +0000

    Merge "Optionally disable file locking."

commit 25c4f0ec43617874562ede0faf87f0028c86fd1f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Feb 2 18:13:34 2012 +0100

    Get rid of DeprecationWarning during db migration
    
    Use proper syntax to rename column, which avoids printing
    silly warnings and future deprecation issues.
    Fixes bug 854163.
    
    Change-Id: I7897b6bd15043ff1c3a5688b9ee775b33a0b0c22

 .../migrate_repo/versions/035_secondary_dns.py     |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e0c59afc6dca4c6cf737e6e5d24da3415c258090
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Feb 1 11:32:35 2012 -0500

    Don't block forever for rpc.(multi)call response.
    
    Fix bug 843200.
    
    This patch adds a timeout for waiting for a response from rpc.call or
    rpc.multicall instead of blocking for forever.
    
    Change-Id: I5675597c7e9f3d55170837859ec516cb1c806ca3

 nova/rpc/__init__.py          |   18 +++++++---
 nova/rpc/amqp.py              |   13 +++----
 nova/rpc/common.py            |   12 +++++++
 nova/rpc/impl_carrot.py       |    7 ++--
 nova/rpc/impl_fake.py         |   79 +++++++++++++++++++++++++++--------------
 nova/rpc/impl_kombu.py        |   26 ++++++++------
 nova/rpc/impl_qpid.py         |   25 ++++++++-----
 nova/tests/rpc/common.py      |   35 ++++++++++++++++--
 nova/tests/rpc/test_carrot.py |    2 +-
 nova/tests/rpc/test_qpid.py   |   12 ++++---
 10 files changed, 163 insertions(+), 66 deletions(-)

commit 4503d90f3809c2e000b08c32d8ac0b84c05e05ca
Merge: e58e492 94ac2c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 16:47:02 2012 +0000

    Merge "Avoid weird test error when mox is missing"

commit df4c59e22b1a8a67b418d36e7c0404b110bfd3f8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Feb 2 11:38:25 2012 -0500

    Optionally disable file locking.
    
    File locks in nova have a bad habit of lingering if the process that
    created them is killed, and there isn't a good automated way to fix this
    behavior. This option allows a deployer to avoid the problem if they
    know they are only running a single nova process on a machine.
    
    Change-Id: I1ae20cc54a4614b200093ffd581d3ab21d7c241b

 nova/utils.py |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

commit e58e492020f2bbd1cf54226b630b9f1e9571df69
Merge: 3298d23 9445744
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 16:32:42 2012 +0000

    Merge "cleanup test case to use integers not strings"

commit 94ac2c4747ae5e87db32a5ed4de82b0a0a1f5f0f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Feb 2 17:26:30 2012 +0100

    Avoid weird test error when mox is missing
    
    Fail early if you can't import mox, rather than return
    a cryptic and undecipherable error. Fixes bug 810424.
    
    Change-Id: Ie56d3e7447bbba841fdc882cb1f8f70e234812ef

 nova/tests/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit 3298d23d03de46966e5584688d689576b974b35d
Merge: 638ea66 233f5a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 15:24:12 2012 +0000

    Merge "Fix admin password skip check."

commit 3db5b1e7099e1c10d557577350dc28e323c70af4
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Thu Feb 2 14:56:54 2012 +0000

    fix stale libvirt images on download failure. Bug 801412
    
    If we've just truncated/created the file to receive
    the download, but the download fails, then delete the file.
    Otherwise subsequent downloads would not be attempted.
    
    Change-Id: Ibe9ba199b2f424d570ce7aedfb768ce283816a3b

 nova/virt/images.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 944574420c26fbbf2ef4a6d5198f403f6474147e
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Thu Feb 2 12:00:01 2012 +0000

    cleanup test case to use integers not strings
    
    These fields are integers, so to avoid confusion
    while grepping the source for example, make them
    consistently integers
    
    Change-Id: Iea4496532de89a8d67e141fe4ec1ac65f5d0676d

 nova/tests/test_compute.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 638ea669694f3083145e2300b362ded6749d74a1
Merge: 60223a5 a8c7c93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 07:57:54 2012 +0000

    Merge "Respect availability_zone parameter in nova api"

commit 60223a5681558c4d578e4148394741e71da25447
Merge: 5db0142 eb3e174
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 07:11:07 2012 +0000

    Merge "Support file injection on boot w/ Libvirt"

commit a8c7c93b428b2142bcbca7ebb068187f2c825c31
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Sat Jan 14 21:33:51 2012 +0800

    Respect availability_zone parameter in nova api
    
    Fix bug #890209
    
    Include patch from Vladimir@launchpad with little modification.
    
    Accept availability_zone parameter during volume creation in both ec2 and os api.
    
    Add availability_zone test cases for both ec2 and os api.
    
    Move volume test stubs in fakes module for os api test cases.
    
    Use ec2 api's way to handle instance lazy load problem in os api.
    
    Change-Id: I32c3be91906e03ef6c50a028a7b00057678c7609

 nova/api/ec2/cloud.py                              |    5 +-
 nova/api/openstack/compute/contrib/volumes.py      |   19 ++--
 nova/api/openstack/volume/volumes.py               |   16 +--
 nova/tests/api/ec2/test_cloud.py                   |   20 ++++
 .../api/openstack/compute/contrib/test_volumes.py  |  114 ++++++++++++++++++-
 .../api/openstack/compute/contrib/test_vsa.py      |   79 ++-----------
 nova/tests/api/openstack/fakes.py                  |   62 +++++++++++
 nova/tests/api/openstack/volume/test_volumes.py    |  117 ++++++++++++++------
 nova/tests/integrated/test_volumes.py              |   19 +++-
 9 files changed, 330 insertions(+), 121 deletions(-)

commit 233f5a738f39bae9b815383cb0ba2f3c207ae813
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Feb 1 20:50:51 2012 -0500

    Fix admin password skip check.
    
    Skip admin password configuration only if the agent 'version' is
    empty. Previously both the 'version' and 'agent_build' were
    required to be set.
    
    As the 'agent_build' table is primarily used for upgrades
    there should be no requirement that a record exist in order
    to configure admin passwords.
    
    Fixes LP Bug #925237.
    
    Change-Id: Ie4530a30ed02f3d49a07037e9d1cc52ef0af1dd4

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5db0142d2f96e8e2d152aea59e7fc53d1e5ca012
Merge: 6a78134 9728ae5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 00:50:14 2012 +0000

    Merge "Add support for pluggable l3 backends"

commit 6a781345a8621258de39af30414b8ddead1c84b6
Merge: b13c567 66a1bb3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 00:42:31 2012 +0000

    Merge "Make parsing of usage stats from XS more robust."

commit b13c567ba74a0b7abc8b48d7e21b759c6ff43fbe
Merge: 11f2625 f79713d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 00:30:47 2012 +0000

    Merge "Support custom routes for extensions."

commit 11f26257407a68cd73ff4474ed10fb45b480836a
Merge: 7e078d9 6e35b57
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 2 00:01:58 2012 +0000

    Merge "Add 'all_tenants' filter to GET /servers."

commit 7e078d915c85236550d5a787f5406432a913c99e
Merge: 03a028e 04ca11b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 23:55:51 2012 +0000

    Merge "Fixing a rebuild race condition bug."

commit 03a028e62157a3f5160d60c146ba52cd0ca79dbc
Merge: b295eef 605c22b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 23:54:36 2012 +0000

    Merge "Optionally pass a instance uuid to log methods."

commit b295eef98a81430079440fcaaf03c07939306d9d
Merge: 6ee7c13 9f9b651
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 23:47:11 2012 +0000

    Merge "Remove Hyper-V support"

commit 9728ae541fc211e66260410b5dcb3bb3a92361ec
Author: Brad Hall <brad@nicira.com>
Date:   Fri Jan 20 17:25:08 2012 -0800

    Add support for pluggable l3 backends
    
    This will allow us to support backends other than linux_net (i.e.
    quantum L3 when it is available) for defining L3 connectivity.
    
    Change-Id: I0b2ece2278bd68166741107a88cedd106d1ab651

 nova/network/l3.py              |  149 +++++++++++++++++++++++++++++++++++++++
 nova/network/manager.py         |   61 ++++++----------
 nova/network/quantum/manager.py |   28 ++++----
 nova/tests/test_quantum.py      |    4 +-
 nova/utils.py                   |    9 +++
 5 files changed, 193 insertions(+), 58 deletions(-)

commit 6ee7c132d768e44193a6aa0ee0cc66815e7dced0
Merge: 2566207 67a419d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 23:35:44 2012 +0000

    Merge "Improve dom0 and template VM avoidance."

commit 256620786fd8c8171412dd0543e66a5d4ad71882
Merge: a2c31fe 84cf57f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 22:59:51 2012 +0000

    Merge "Fix logging to log correct filename and line numbers"

commit a2c31feceaceef686f8c82ee1fc97df4a3635cff
Merge: a7004de ea2c8c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 22:45:32 2012 +0000

    Merge "Fix multinode libvirt volume attachment lp #922232"

commit a7004dee703908eaa51bb0c3765a0d877afdd2a1
Merge: 6ce75fb 437ad5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 22:01:08 2012 +0000

    Merge "Bug #923865: (xenapi driver)instance creation fails if no guest agent is avaiable for admin password configuration"

commit 6ce75fbfc94193691b256b2f3abb3f74734f0d06
Merge: 98a012f 014f67a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 21:49:49 2012 +0000

    Merge "Fix VPN ping packet length."

commit 67a419de2d16b83a4ab53431b1ed3fb83abd9eac
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 1 21:41:38 2012 +0000

    Improve dom0 and template VM avoidance.
    
    Fixes bug 920588
    
    Change-Id: Ia19f6e99faceba75af509699a5601f87218671ed

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f9b651aec7835832845e1a76a6e17b65d214f17
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 1 18:10:39 2012 +0100

    Remove Hyper-V support
    
    HyperV has been unmaintained for several releases now. The unit tests
    are superficial, we have no way to test it, noone has stepped forward
    to maintain it, and for a very long time, we've not had any reports that
    it works. Furthermore, many improvements have been made across other
    hypervisor drivers that have not been done in the HyperV driver, so even
    if it worked, it would only expose a subset of the functionality that
    the other drivers do.
    
    Implements blueprint hypervsectomy.
    
    Change-Id: I3160915816a305d7d6bc34790f9deac459b562a9

 nova/tests/hyperv_unittest.py |   65 -----
 nova/virt/connection.py       |    3 -
 nova/virt/hyperv.py           |  525 -----------------------------------------
 3 files changed, 593 deletions(-)

commit 98a012fbb14d1b6463b9c8d13fcb1de742bae1d0
Merge: 260c964 c56d677
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 21:25:18 2012 +0000

    Merge "bug 921087: i18n-key and local-storage hard-coded in xenapi"

commit 260c96431f2dc5a5842aef5c105091bd8d64c552
Merge: eed008e 1849c27
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 21:13:50 2012 +0000

    Merge "Empty connection pool after test_kombu."

commit eed008ea770adb952a1ec0b6af7f2afb177285ca
Merge: a5e8f13 755f660
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 21:12:40 2012 +0000

    Merge "Use name filter in GlanceImageService show_by_name"

commit 84cf57fde657eb4146442047a565fd7087bce345
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Feb 1 20:35:50 2012 +0000

    Fix logging to log correct filename and line numbers
    
    Fixes bug 920809.
    
    Change-Id: I192159efbb8d678d1e1071b18233d19ebcd7198b

 nova/log.py |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

commit a5e8f131c0b6b0e9d13d45503f6897cdf9dddae5
Merge: cbe943c bd32abf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 21:00:54 2012 +0000

    Merge "Clear out RPC connection pool before exit."

commit f79713d208a0a474581363b90ef2b87ff72ff80f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 27 05:16:47 2012 +0000

    Support custom routes for extensions.
    
    Fixes bug 923983
    
    Change-Id: Id4673a2ff58d2d94627e5878fed68bcecd9be7a4

 nova/api/openstack/compute/__init__.py |    3 +++
 nova/api/openstack/extensions.py       |    4 +++-
 nova/api/openstack/volume/__init__.py  |    3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

commit 66a1bb3816abfa154982c6d80d88b851cefd9800
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jan 31 21:22:22 2012 +0000

    Make parsing of usage stats from XS more robust.
    
    Better handle odd values in parsing of usage data from xenserver.
    Fixes bug 918490
    
    Change-Id: Ie634ba6a740d0ea098d7fc4e13b4b46b5203ce79

 nova/virt/xenapi/vm_utils.py |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit cbe943c349187477de1ec5a213f4f05c6825d319
Merge: 1f04570 947e4af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 20:42:33 2012 +0000

    Merge "lockfile.FileLock already appends .lock"

commit 1f04570c35497a76eb05865614506e224da95ea9
Merge: ecbc332 73fd7ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 20:16:03 2012 +0000

    Merge "Ties quantum, melange, and nova network model"

commit 947e4af4fe15bd964e0bca9cd9f3262f35fe8b1d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 1 19:20:38 2012 +0000

    lockfile.FileLock already appends .lock
    
    Otherwise you end up with files like nova-iptables.lock.lock
    
    Change-Id: Ia7dd82c3721f89d438c1266e7ec3535a0d89334e

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ecbc3322082a0c054a61cb2bcaa5969aa1e3e974
Merge: c6251e8 48c275d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 19:54:19 2012 +0000

    Merge "Instances to be created with a bookmark link"

commit c6251e8811de82357dee58ffc14c4c1789061876
Merge: fced0f5 d20b48b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 19:43:11 2012 +0000

    Merge "optimize libvirt raw image handling. Bug 924970"

commit 73fd7abacd3bc5492b0335b3bb71c16b4a9d30e2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jan 9 11:52:53 2012 -0600

    Ties quantum, melange, and nova network model
    
    get_instance_nw_info() now returns network model, and keeps the network
    info cache up to date.
    virt shim and translation in place for virts to get at the old stuff
    
    Change-Id: I070ea7d8564af6c644059d1c209542d250d19ddb

 nova/api/ec2/ec2utils.py                           |   44 +--
 nova/api/openstack/common.py                       |   55 +---
 nova/api/openstack/compute/ips.py                  |    1 -
 nova/compute/api.py                                |   41 +--
 nova/compute/manager.py                            |   91 ++++--
 nova/compute/utils.py                              |  118 +++++++
 nova/db/sqlalchemy/api.py                          |    9 +-
 nova/network/api.py                                |   16 +-
 nova/network/manager.py                            |  337 +++++++++-----------
 nova/network/model.py                              |   11 +
 nova/network/quantum/manager.py                    |  199 ++++++------
 nova/network/quantum/melange_connection.py         |   20 +-
 nova/network/quantum/melange_ipam_lib.py           |   32 +-
 nova/network/quantum/nova_ipam_lib.py              |   35 +-
 nova/tests/api/ec2/test_cloud.py                   |   20 +-
 .../openstack/compute/contrib/test_floating_ips.py |   28 +-
 nova/tests/api/openstack/compute/test_servers.py   |  246 +++++---------
 nova/tests/api/openstack/fakes.py                  |   19 +-
 nova/tests/fake_network.py                         |   89 +++++-
 nova/tests/fake_network_cache_model.py             |   11 +-
 nova/tests/integrated/integrated_helpers.py        |    1 -
 nova/tests/integrated/test_servers.py              |    5 +-
 nova/tests/test_compute.py                         |   49 ++-
 nova/tests/test_metadata.py                        |   10 +-
 nova/tests/test_network_info.py                    |   32 +-
 nova/tests/test_quantum.py                         |  105 +++---
 nova/utils.py                                      |    7 +-
 nova/virt/driver.py                                |    7 +
 nova/virt/xenapi/vif.py                            |    3 +-
 29 files changed, 873 insertions(+), 768 deletions(-)

commit fced0f58bcbaef6fff76c6719e27e7d100aa721b
Merge: b3b3194 62d5fae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 19:08:03 2012 +0000

    Merge "remove unsupported ec2 extensions"

commit b3b3194d76e22cb9617750c7b13c3a1d4429a636
Merge: 28a5bfe 093e4d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 18:56:46 2012 +0000

    Merge "Make sure multiple calls to _get_session() aren't nested"

commit 28a5bfef8d4315fdbce8ceb0c18eee81565161b7
Merge: a48781a ba21072
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 18:45:40 2012 +0000

    Merge "Correct checking existence of security group rule"

commit a48781aa8f4d5c89cf52ad23079be9e723cb4cd1
Merge: 8908d8b e8182e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 18:35:01 2012 +0000

    Merge "Add mkswap to rootwrap"

commit 093e4d38d511c7bb8d48fceebbfd8e350b533075
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Feb 1 17:07:16 2012 +0000

    Make sure multiple calls to _get_session() aren't nested
    
    Fixes bug 924918
    
    async_call_plugin() acquires a xenapi session as does the nested call to
    get_xenapi_host(). This can cause a deadlock if multiple greenthreads
    all block waiting for the outer sessions to be freed to allocate the
    inner session. This change moves the call to get_xenapi_host() to outside
    the with statement to ensure calls to _get_session() aren't nested.
    
    Change-Id: I8f5490f40a9ccaf74a276187f66519a5d5f52b2e

 nova/virt/xenapi_conn.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c56d677a7313b8b29406eaebdd27e59b2c1ee927
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Jan 25 00:35:34 2012 +0000

    bug 921087: i18n-key and local-storage hard-coded in xenapi
    
    This fix introduces a new flag 'sr_matching_filter', whose default value is
    'other-config:i18n-key=local-storage'. This filter is used for finding the
    SR on which to install guest instances. The default value is the Local
    Storage in default XenServer/XCP installations, and it is what was hard-coded
    so far.
    
    To select an SR with a different matching criteria, this flag can be set
    to 'other-config:my_favorite_sr=true'. On the other hand, to fall back on
    the Default SR, as displayed by XenCenter and as returned by
    xenapi.pool.get_default_SR, this flag can be set to to 'default-sr:true'.
    
    This changeset also makes a small code simplification along the way.
    
    Change-Id: Ia5ee438389c59a5ef0b858e8548643d57ef16c77

 nova/tests/test_xenapi.py    |   69 ++++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/fake.py     |   62 ++++++++++++++++++-------------------
 nova/virt/xenapi/vm_utils.py |   44 ++++++++++++++++++++++-----
 3 files changed, 135 insertions(+), 40 deletions(-)

commit 8908d8ba499220c7495871eebcdd259d6dcdfb9d
Merge: 8b02c68 d8b6b65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 17:56:37 2012 +0000

    Merge "Fix broken devref docs."

commit 8b02c68845d6cdfe234b436d0ab309dc05fe0528
Merge: 08cfd07 553982f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 17:22:42 2012 +0000

    Merge "fixed bug 920856"

commit 08cfd07138804afaff160411a86a728a426a7ddd
Merge: b2cd906 a2d9645
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 17:18:00 2012 +0000

    Merge "Expand policies for admin_actions extension"

commit d20b48bd9662a31918631ad1de2e25a6084046c7
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Tue Jan 31 23:46:42 2012 +0000

    optimize libvirt raw image handling. Bug 924970
    
    Tests were seen to time-out on libvirt when raw images were
    used, which was due to large disk images being copied around
    inefficiently.  A system with standard disks was seen to take
    an extra 60s/10G which was a problem with large root and
    ephemeral disks.  The changes below attempt to minimize the
    I/O in dealing with cached raw images.  These changes should
    also help to minimize the disk space used for such images,
    by avoiding the naïve copy which undoes the sparseness.
    
    * nova/virt/libvirt/connection.py (_cache_image): Do the
    resize here, rather than in _fetch_image(), so that we
    can control when the resizing is done, to minimize the
    amount of data that needs to be copied.  Also if we're
    generating rather than fetching the image, then just
    generate in the instance dir too, as this should be faster.
    * nova/tests/fake_libvirt_utils.py: Remove the resize
    functionality since it's no longer used.
    * nova/tests/test_libvirt.py: Likewise.
    * nova/virt/libvirt/utils.py (fetch_image): Likewise.
    (copy_image): Shell out to cp since it deals better
    with sparse files.  Note the above changes avoid sparse
    copies, so this is just an ancillary improvement in the area.
    
    Change-Id: I678d125c61aab56c62c668559eb2220d56702952

 nova/tests/fake_libvirt_utils.py |    3 +--
 nova/tests/test_libvirt.py       |   24 +++++++++++++++---------
 nova/virt/libvirt/connection.py  |   36 ++++++++++++++++++++++++++++--------
 nova/virt/libvirt/utils.py       |   13 +++++++------
 4 files changed, 51 insertions(+), 25 deletions(-)

commit b2cd9068af20257d1191f423a357261c7ffd68d6
Merge: 7de8281 25325f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 1 16:42:02 2012 +0000

    Merge "Use "display_name" in "nova-manage vm list"."

commit 7de828108ac33a80a6055ac2aa11e73fefc88046
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 1 10:51:55 2012 -0500

    Boto 2.2.x failes. Capping pip-requires at 2.1.1
    
    Fixes bug 924933
    
    Change-Id: I808daedf9a860a8ef153785693cbc49a0a25f49c

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 553982fb8b7e2f8a90b7e873010452fe3b174018
Author: Thorsten Tarrach <thorsten@atomia.com>
Date:   Mon Jan 30 11:38:06 2012 +0100

    fixed bug 920856
    
    Changed the responses to match that of Amazon EC2
    Changed test to expect that response
    
    Change-Id: Ia03a0ea663614944067c0a0193058ba91e149ad2

 Authors                          |    1 +
 nova/api/ec2/cloud.py            |    6 +++---
 nova/tests/api/ec2/test_cloud.py |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

commit a2d9645703e54623df3593a3e5629fb3ad60765e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jan 31 22:56:37 2012 -0800

    Expand policies for admin_actions extension
    
    Fixes bug 924417
    
    Change-Id: Ibf62e8e824753dff43e0e86cb9d320086c2c753b

 etc/nova/policy.json                               |   11 +++++++
 .../api/openstack/compute/contrib/admin_actions.py |   32 ++++++++++----------
 .../compute/contrib/test_admin_actions.py          |   17 -----------
 nova/tests/policy.json                             |   12 +++++++-
 4 files changed, 38 insertions(+), 34 deletions(-)

commit ba21072a43183388e53f47bcdac074cb6246ed83
Author: MotoKen <motokentsai@gmail.com>
Date:   Tue Jan 31 15:35:02 2012 +0800

    Correct checking existence of security group rule
    
    Fixes bug #900031
    
    Change-Id: I4194610ce53d1c74bd99b6878339da6e0b6a3a73

 nova/api/ec2/cloud.py                              |   19 +++++-------
 .../openstack/compute/contrib/security_groups.py   |   19 +++++-------
 .../compute/contrib/test_security_groups.py        |   32 ++++++++++++++++++--
 3 files changed, 45 insertions(+), 25 deletions(-)

commit 605c22b1804f0a34d400eb57e1954c3fc3a20c88
Author: Michael Still <mikal@stillhq.com>
Date:   Wed Feb 1 11:41:22 2012 +1100

    Optionally pass a instance uuid to log methods.
    
    This change is intended to make log messages including instance
    uuids consistent. This eases operational support, as when a
    customer asks for the history of there instance it is a simple
    grep operation, instead of the current situation. I have included
    a sample use, but will work through adding this to relevant log
    messages over time.
    
    Change-Id: I1f61c04f32dbb960471950ac7231313d9d9ced12

 Authors                         |    1 +
 nova/log.py                     |   31 +++++++++++++++++++++++++++----
 nova/virt/libvirt/connection.py |    7 ++++---
 3 files changed, 32 insertions(+), 7 deletions(-)

commit 62d5fae8d11b6403f9a63a709270ffafebb7ef09
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Jan 31 16:29:28 2012 -0600

    remove unsupported ec2 extensions
    
    implements blueprint remove-ec2-extensions
    
    * remove deprecated unofficial ec2 admin api
    * remove admin api from wsgi/paste
    * remove unofficial ec2 call for ajaxterm / update calls
    * remove displayName/displayDescription from volumes/instances
    
    Change-Id: If5a5ae26ebb9456a3c7376ff4ff0aa9589be1f5b

 bin/nova-manage                  |    8 +-
 doc/source/devref/api.rst        |    9 -
 etc/nova/api-paste.ini           |   12 -
 nova/api/ec2/admin.py            |  418 -------------------------------
 nova/api/ec2/apirequest.py       |    9 -
 nova/api/ec2/cloud.py            |   72 +-----
 nova/flags.py                    |    3 -
 nova/tests/api/ec2/test_admin.py |  503 --------------------------------------
 nova/tests/api/ec2/test_cloud.py |  110 ---------
 nova/tests/test_adminapi.py      |   92 -------
 10 files changed, 10 insertions(+), 1226 deletions(-)

commit 014f67a2769720f4833bba74343cedf0e894151c
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 17:42:23 2012 -0500

    Fix VPN ping packet length.
    
    Fix bug 906346.
    
    This patch addresses the typo pointed out in bug 906346.  The ping being
    sent was 15 bytes long when it should have been 14.  Removing a pad byte
    from the format string resolves this issue.  I verified that the format
    described in the code comments (and now the code) was correct using an
    OpenVPN connection setup packet capture.
    
    Change-Id: Idbc5e48ede4a8d2836dd1b102a9a0e172540776c

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79746bbe5281f950ffd46310867c90423ee286b3
Merge: e1b3010 0f0b224
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 31 23:54:46 2012 +0000

    Merge "Allow for auditing of API calls."

commit e1b3010dd91df2d8dda69d2322c98e1575fb3fd7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jan 31 14:02:30 2012 -0800

    Use single call in ExtendedStatus extension
    
    Fixes bug 917400
    
    Change-Id: I8bc78f5e5f03c1ea30e7ff23236774af48a2c059

 .../openstack/compute/contrib/extended_status.py   |   36 +++++++-------
 .../compute/contrib/test_extendedstatus.py         |   49 +++++++++++++++-----
 2 files changed, 57 insertions(+), 28 deletions(-)

commit e8182e8944570d57046afed29e674cf08fa77bb4
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Jan 31 17:01:54 2012 -0500

    Add mkswap to rootwrap
    
    Change-Id: Ia70a3acf9f8ca6b8c552f208767a92f321b912a5

 nova/rootwrap/compute.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 25325f47675d0fe89bd13fb813ea78b122c3e744
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 16:55:00 2012 -0500

    Use "display_name" in "nova-manage vm list".
    
    Fixes bug 894807.
    
    This patch changes the output of "nova-manage vm list" to use the
    display_name for an instance instead of the hostname in the output.
    This makes the output consistent with what you get with "nova list".
    
    Change-Id: I3131c5aad8770481bac7731c06110a98b4cc2966

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2757b81116d5d6c508a83616e1341e03115240f2
Merge: d22b021 541f747
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 31 21:43:36 2012 +0000

    Merge "Use os.path.basename() instead of string splitting."

commit d8b6b65f3234c276c15f284e191aba8caceb0cc7
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 16:16:24 2012 -0500

    Fix broken devref docs.
    
    Fix bug 888102.
    
    This patch fixes the documentation generated here:
    	http://nova.openstack.org/devref/index.html
    
    There was a typo in a script that resulted in the module names being
    invalid and no docs being generated.  This one character patch fixes it
    up and makes the docs happy.
    
    Change-Id: I1986e8b468334a1a33264aaec740c4f535a7c30b

 doc/find_autodoc_modules.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f0b224f6d14a2679d5c0f298b01dead82be7bde
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jan 31 14:40:26 2012 -0600

    Allow for auditing of API calls.
    
    Splits Resource.__call__() into two parts to allow for easy auditing
    of the API stack--checking execution times, etc.  No behavior change
    or execution time impact should be expected.
    
    Change-Id: If9629e8b85f490c66499c42d6f6977a09d641c22

 nova/api/openstack/wsgi.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 541f747f055d4a794e8dc50ea78ee6d10913ff26
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 15:25:33 2012 -0500

    Use os.path.basename() instead of string splitting.
    
    Fixes bug 886268.
    
    Change-Id: I16e05f4ead55c75f29217072d106421fdc7de201

 nova/virt/disk/mount.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d22b0210b0c4ef80b64531e6826985341e9af838
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 14:48:12 2012 -0500

    Remove utils.runthis().
    
    Fixes bug 884825.  The bug was pointing out some unused variables
    noticed by pylint.
    
    utils.runthis() was only used in one place and doesn't really provide
    much value over utils.execute(), so just remove it.
    
    Change-Id: I3dcc34bd840a128418b58a8a66acb62adf3fc9cc

 nova/crypto.py |    2 +-
 nova/utils.py  |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

commit fe56d3c6ba27048a4d72dca7a9830061a551906c
Merge: 83320e3 d4d0eed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 31 18:56:08 2012 +0000

    Merge "Be more explicit about emptying connection pool."

commit 83320e321a515555edf5eaf9506aec366abca62b
Merge: 9dad01c e089124
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 31 18:28:35 2012 +0000

    Merge "bug 923798: On XenServer the DomU firewall driver fails with NotImplementedError"

commit 9dad01cffb21564e9966e2cd19c0df3d7289aab2
Merge: 59c0a72 f18733d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 31 18:17:04 2012 +0000

    Merge "fixes melange ipam lib"

commit 1849c274eef7316ea9bdcd2e2ca4788ba2d699ec
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 12:58:22 2012 -0500

    Empty connection pool after test_kombu.
    
    Empty the connection pool after the tests in test_kombu have run.  This
    ensures that there is nothing leftover that will affect tests of other
    implementations that use nova.rpc.amqp (impl_qpid right now).
    
    Change-Id: Ib023722f97a21821869369d0024cf61272267ea3

 nova/tests/rpc/test_kombu.py |    1 +
 1 file changed, 1 insertion(+)

commit bd32abf9bc9d628f6fed510c223689de9aa8b76d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Jan 30 18:29:04 2012 -0500

    Clear out RPC connection pool before exit.
    
    Fixes bug 767984.
    
    This patch ensures that pooled connections to a messaging system get
    cleaned up before a process that has used the RPC API exits.
    
    Change-Id: I56eca54334075378534a7a5d3434c420319672b4

 bin/nova-dhcpbridge     |    3 +++
 bin/nova-manage         |    1 +
 nova/rpc/__init__.py    |   13 +++++++++++++
 nova/rpc/amqp.py        |    9 +++++++++
 nova/rpc/impl_carrot.py |    4 ++++
 nova/rpc/impl_fake.py   |    4 ++++
 nova/rpc/impl_kombu.py  |    4 ++++
 nova/rpc/impl_qpid.py   |    4 ++++
 nova/service.py         |    1 +
 9 files changed, 43 insertions(+)

commit d4d0eedeb43cd0bcb9fd446d0ef9bbcc3b28c68a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jan 31 12:52:16 2012 -0500

    Be more explicit about emptying connection pool.
    
    This patch makes some code in test_qpid be more explicit about emptying
    the connection pool.  It now ensures that it removes exactly how many
    connections are in the pool.
    
    The previous code made a couple of assumptions.  First, it assumed that
    only one connection was in the pool (which is true, but it's still nice
    not to make the assumption here in the cleanup code).  Second, it
    assumed that free() returned the number of connections that have been
    placed in the pool.  This is not correct.  The result also includes the
    number of connections that could be created based on the max size of the
    pool. Use the free_items attribute instead, which gives the exact number
    of connections that have been put() in the pool.
    
    Change-Id: I97378919c2d3e68f224862f07a75529575647163

 nova/tests/rpc/test_qpid.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f18733d27c228c4d861fa1aa1b9045b434855402
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jan 30 17:44:07 2012 -0600

    fixes melange ipam lib
    
    Melange can have multiple ip_blocks assigned to a network. However
    the ipam lib assumes that each block is its own L2 network and assigns
    ips from each ip_block for every instance.
    
    From internal bug.
    
    Change-Id: I72699f178cfeb214b2911200a7e9ed9b255252f1

 nova/network/quantum/melange_ipam_lib.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e08912439e00909c791f6787cce51329b0836901
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Tue Jan 31 15:35:44 2012 +0000

    bug 923798: On XenServer the DomU firewall driver fails with NotImplementedError
    
    Move _provider_rules in the base class. This should be enough to deal with most
    distros on which a domU is based on.
    
    Change-Id: I738116c5f330c2493c62d8f1f3da39abb3c3ad11

 nova/virt/firewall.py         |   53 +++++++++++++++++++++++++++++++++++++----
 nova/virt/libvirt/firewall.py |   50 --------------------------------------
 nova/virt/xenapi/firewall.py  |    2 +-
 3 files changed, 50 insertions(+), 55 deletions(-)

commit 59c0a723cc6d9e0c298d581952bde6853c2288c7
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Tue Jan 31 21:20:04 2012 +0800

    Return instancesSet in TerminateInstances ec2 api
    
    Fixe bug #862680
    
    Return instancesSet to follow ec2 TerminateInstances api specification:
        'http://docs.amazonwebservices.com/AmazonEC2/dg/2007-01-03/ApiReference-SOAP-TerminateInstances.html'
    
    Remove dead test_terminate_instances code in test_cloud.py
    
    Change-Id: Iabc0ccdbd80946b60af63bdc49bc7820c65ca006

 nova/api/ec2/cloud.py            |   25 ++++++-
 nova/tests/api/ec2/test_cloud.py |  135 ++++++++++++++++++++++++++++++++------
 2 files changed, 140 insertions(+), 20 deletions(-)

commit ea2c8c8b363dceb3c73be8f02f078d7b78b2c712
Author: Adam Gandelman <adamg@canonical.com>
Date:   Thu Jan 26 12:36:55 2012 -0800

    Fix multinode libvirt volume attachment lp #922232
    
    iscsiadm returns 0 if local db contains no target records.  As a result,
    no exception is caught and no entry gets created (--op new) before continuing
    to login.  Devstack/single-node users avoided this because, apparently, records
    are created in initiator db on target creations.
    
    Update: Address smokestack failures if err == None
    
    fixes bug #922232
    
    Change-Id: I39c3574b8d75ca32eba3716efc3b488e596fbaf6

 nova/virt/libvirt/volume.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 437ad5af25f88788c8678d7dbd0c8826a145c884
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Mon Jan 30 18:21:30 2012 +0000

    Bug #923865: (xenapi driver)instance creation fails if no guest agent is avaiable for admin password configuration
    
    Ensure that if the guest agent is not installed, the admin password configuration is
    skipped. The fact that either one of 'version' or 'agent_build' is None (or both)
    should be an accurate indication of such a condition.
    
    Change-Id: I90213ce28a900a05d7357b8fa647ffbb0928571a

 nova/virt/xenapi/vmops.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit c9ac6e1671df689c3ba4a4d55f8740bd8f2e8f0e
Author: john-griffith <john.griffith@solidfire.com>
Date:   Mon Jan 30 11:16:42 2012 -0700

    Implementation of new Nova Volume driver for SolidFire ISCSI SAN
    
    * Adds new SolidFire driver that subclasses nova.volume.san.SanISCSIDriver
    * Adds unit tests for new driver
    * Adds new exception subclasses in nova.exception
    * Adds John Griffith to Authors
    Implements solidfire-san-iscsidriver
    Change-Id: I4dc7508ba08f5333cde74d4cfeaae3939c5d2b02

 Authors                                    |    1 +
 nova/exception.py                          |   12 ++
 nova/tests/test_SolidFireSanISCSIDriver.py |  180 +++++++++++++++++++
 nova/volume/san.py                         |  266 +++++++++++++++++++++++++++-
 4 files changed, 456 insertions(+), 3 deletions(-)

commit c10443704226341086d3d1cd8850508d28201fc3
Merge: e372ec0 271acd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 30 17:14:56 2012 +0000

    Merge "Handle kepair delete when not found"

commit e372ec0b98269aeef99f73b98319b6876c33b7b1
Merge: 3146044 43fd6fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 30 17:03:44 2012 +0000

    Merge "Remove fetching of networks that weren't created via nova-manage"

commit 271acd8a0434a1e23d29df26cb1a211d1c28d8cf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jan 28 19:26:29 2012 -0800

    Handle kepair delete when not found
    
    Fixes bug 900924
    
    Change-Id: Icd0a1f69c0fb7c15110bbf0c416e38cdc1147f4d

 nova/api/openstack/compute/contrib/keypairs.py     |   10 +++++-----
 .../api/openstack/compute/contrib/test_keypairs.py |   19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

commit 3146044b772b3c431e63fc898a86aabca2e52878
Merge: b6f2136 1ff23b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 30 16:38:35 2012 +0000

    Merge "Remove session arguments from db.api"

commit b6f2136912855fa17e6d4f1fafe92d622d2c2f0a
Merge: 378ba50 82049af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 30 16:27:15 2012 +0000

    Merge "Refactor away the flags.DEFINE_* helpers"

commit 378ba501f082c772b2e8f90921fc38289730dfa1
Merge: 6a239cb 9fa7db5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 30 16:15:55 2012 +0000

    Merge "Raise 400 if bad kepair data is provided"

commit 6e35b5785d12513dc0076145f4de5e1f98034250
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Jan 28 22:52:29 2012 -0500

    Add 'all_tenants' filter to GET /servers.
    
    Update the OpenStack API's GET /servers method so that it only returns
    servers from a single tenant when an admin account is used.
    
    Adds an 'all_tenants' filter option that can be used to obtain servers
    from all tenants (legacy behavior).
    
    Fixes LP Bug # 923218.
    
    Change-Id: I2fd3bd3e2c374ff1aed9c11006585c3f93449c6e

 nova/api/openstack/compute/servers.py            |   11 ++++++
 nova/tests/api/openstack/compute/test_servers.py |   44 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

commit 755f660b7ca129f869da07db0cc4433106f47ff9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jan 28 21:47:06 2012 -0800

    Use name filter in GlanceImageService show_by_name
    
    Fixes bug 883289
    
    Change-Id: Ie2e62aea55e6541dc4ad1a725130fbf0259362fb

 nova/image/glance.py            |   12 +++++-------
 nova/tests/image/test_glance.py |    4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)

commit 6a239cb7a2ea05a9382ed71469ca770afbb12212
Merge: 02b8726 a043978
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 29 04:06:20 2012 +0000

    Merge "Add authorization checks to flavormanage extension"

commit 9fa7db58c22b3a4ba238d3cb9d39233968439cb1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jan 28 19:43:45 2012 -0800

    Raise 400 if bad kepair data is provided
    
    Fixes bug 902395
    
    Change-Id: If04a0bf432ad4828ac1fc68f6d33dff5f9f57e24

 nova/api/openstack/compute/contrib/keypairs.py     |    7 ++++++-
 nova/crypto.py                                     |    2 ++
 nova/exception.py                                  |    4 ++++
 .../api/openstack/compute/contrib/test_keypairs.py |   15 +++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

commit eb3e1749074a82a612c5fb84960f6fe9b6aaf8d2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jan 28 13:14:33 2012 -0800

    Support file injection on boot w/ Libvirt
    
    Implementes bp libvirt-file-injection
    
    Change-Id: I25a5cc1b2261726e9603349df323e29cd1ed31e8

 nova/virt/disk/api.py           |   23 +++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    9 +++++++++
 2 files changed, 32 insertions(+)

commit 82049af90e86380043c59741fa4e1cd2cf24aaa7
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jan 23 11:51:14 2012 +0000

    Refactor away the flags.DEFINE_* helpers
    
    The next obvious step in porting to cfg is to define all options using
    cfg schemas directly rather than using the flags.DEFINE_* helpers.
    
    This is a large change, but it is almost entirely pure refactoring and
    does not result in any functional changes.
    
    The only change to note is that the default values for glance_host,
    glance_api_servers and default_publisher_id options are now using opt
    value interpolation i.e.
    
     -glance_host=_get_my_ip()
     +glance_host='$my_ip'
    
     -glance_api_servers=['%s:%d' % (FLAGS.glance_host, FLAGS.glance_port)]
     +glance_api_servers=['$glance_host:$glance_port']
    
     -default_publisher_id=FLAGS.host
     +default_publisher_id='$host'
    
    Also note that the lower_bound check on the {report,periodic}_interval
    options are no more, but this has been true since cfg was first added.
    
    Change-Id: Ia58c8f0aaf61628bb55b1b8485118a2a9852ed17

 bin/clear_rabbit_queues                    |    8 +-
 bin/nova-ajax-console-proxy                |   10 +-
 bin/nova-direct-api                        |   13 +-
 nova/api/auth.py                           |   11 +-
 nova/api/ec2/__init__.py                   |   31 +-
 nova/api/openstack/compute/__init__.py     |   11 +-
 nova/auth/ldapdriver.py                    |   88 ++--
 nova/auth/manager.py                       |   87 ++--
 nova/cloudpipe/pipelib.py                  |   23 +-
 nova/compute/api.py                        |    8 +-
 nova/compute/manager.py                    |   80 ++--
 nova/console/manager.py                    |   22 +-
 nova/console/vmrc.py                       |   17 +-
 nova/console/vmrc_manager.py               |   14 +-
 nova/console/xvp.py                        |   35 +-
 nova/consoleauth/__init__.py               |    9 +-
 nova/consoleauth/manager.py                |   17 +-
 nova/crypto.py                             |   54 ++-
 nova/db/api.py                             |   35 +-
 nova/db/base.py                            |    9 +-
 nova/flags.py                              |  618 ++++++++++++++++------------
 nova/image/s3.py                           |   21 +-
 nova/ipv6/api.py                           |   10 +-
 nova/log.py                                |   68 +--
 nova/network/ldapdns.py                    |   73 ++--
 nova/network/linux_net.py                  |   80 ++--
 nova/network/manager.py                    |  128 +++---
 nova/network/quantum/manager.py            |   39 +-
 nova/network/quantum/melange_connection.py |   19 +-
 nova/network/quantum/quantum_connection.py |   25 +-
 nova/notifier/api.py                       |   18 +-
 nova/notifier/list_notifier.py             |   10 +-
 nova/notifier/rabbit_notifier.py           |   10 +-
 nova/objectstore/s3server.py               |    9 +-
 nova/policy.py                             |   16 +-
 nova/quota.py                              |   55 ++-
 nova/rpc/__init__.py                       |   12 +-
 nova/rpc/common.py                         |   15 +-
 nova/rpc/impl_qpid.py                      |   69 ++--
 nova/scheduler/api.py                      |   11 +-
 nova/scheduler/driver.py                   |   21 +-
 nova/scheduler/filters/core_filter.py      |    9 +-
 nova/scheduler/filters/ram_filter.py       |    9 +-
 nova/scheduler/host_manager.py             |   31 +-
 nova/scheduler/least_cost.py               |   26 +-
 nova/scheduler/manager.py                  |   12 +-
 nova/scheduler/multi.py                    |   19 +-
 nova/scheduler/scheduler_options.py        |   10 +-
 nova/scheduler/simple.py                   |   26 +-
 nova/scheduler/vsa.py                      |   21 +-
 nova/scheduler/zone_manager.py             |   16 +-
 nova/service.py                            |   66 +--
 nova/test.py                               |   15 +-
 nova/tests/api/ec2/test_cloud.py           |   10 +-
 nova/tests/declare_flags.py                |    4 +-
 nova/tests/runtime_flags.py                |    4 +-
 nova/tests/test_flags.py                   |   57 +--
 nova/tests/test_service.py                 |   21 +-
 nova/virt/disk/api.py                      |   59 +--
 nova/virt/disk/nbd.py                      |   16 +-
 nova/virt/firewall.py                      |   12 +-
 nova/virt/libvirt/connection.py            |  135 +++---
 nova/virt/libvirt/utils.py                 |   11 +-
 nova/virt/libvirt/vif.py                   |   10 +-
 nova/virt/vmwareapi/vim.py                 |   16 +-
 nova/virt/vmwareapi/vmops.py               |   11 +-
 nova/virt/vmwareapi_conn.py                |   53 +--
 nova/virt/xenapi/vif.py                    |   10 +-
 nova/virt/xenapi/vm_utils.py               |   19 +-
 nova/virt/xenapi/vmops.py                  |   34 +-
 nova/virt/xenapi_conn.py                   |  128 +++---
 nova/vnc/__init__.py                       |   44 +-
 nova/vnc/xvp_proxy.py                      |   16 +-
 nova/volume/driver.py                      |   47 ++-
 nova/volume/iscsi.py                       |    9 +-
 nova/volume/manager.py                     |   27 +-
 nova/volume/san.py                         |   54 ++-
 nova/vsa/api.py                            |   25 +-
 nova/vsa/manager.py                        |    9 +-
 79 files changed, 1853 insertions(+), 1157 deletions(-)

commit 02b872625b94c3c63674d8c64b23f80215b04a15
Merge: 1c19d33 e7862ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 27 23:31:27 2012 +0000

    Merge "Remove session arg from sm_backend_conf_update"

commit 1c19d33d9bffddd5aabfd743884be2cf2efa68b4
Merge: aefed53 ed6e3ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 27 23:20:01 2012 +0000

    Merge "fix `nova-manage image convert` exception"

commit 48c275da1271f47b43e1270a3bdd99c7e20dd122
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jan 23 21:30:20 2012 +0000

    Instances to be created with a bookmark link
    
    Fixes bug 913545
    
    Change-Id: I6401a631211d76a8942d3435fb7dd463630cac7a

 nova/api/openstack/compute/servers.py            |    7 ++--
 nova/tests/api/openstack/compute/test_servers.py |   40 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

commit aefed532691f92c2e4b418afbef54479ac18ae57
Merge: 58e6528 845c5a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 27 21:06:46 2012 +0000

    Merge "Added validation of name when creating a new keypair"

commit ed6e3efcf67e5fc194aa9f0cb7776ed77af38837
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Fri Jan 27 17:58:17 2012 +0000

    fix `nova-manage image convert` exception
    
    * bin/nova-manage (_convert_images): Don't convert
    the image id to a number as it's now a uuid.
    
    Change-Id: I4dfe5693d8f394fb9ee3f2c18c7e0b3f2524e931

 bin/nova-manage |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 845c5a621d8b9a1f5946894343aa1029806c4d52
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Thu Jan 26 12:32:58 2012 -0500

    Added validation of name when creating a new keypair
    
    fixes bug 900925
    fixes bug 900927
    
    Change-Id: Icef75af7dca299c566c366f41a71cdc49fa1af65

 nova/api/openstack/compute/contrib/keypairs.py     |    3 +++
 .../api/openstack/compute/contrib/test_keypairs.py |   26 ++++++++++++++++++++
 2 files changed, 29 insertions(+)

commit 58e652845e0762e62e3b7a8ec02e742c6a78ba11
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jan 27 11:05:29 2012 -0500

    Ignore case in policy role checks.
    
    Update the default policy brain so that role checks ignore case.
    Fixes an issue where roles in keystone didn't exactly match the
    case of the role as specified in policy.json.
    
    Fixes LP Bug #922660.
    
    Change-Id: I05792755c9293e4dd80d642cb8eef6b0adda2ed4

 nova/common/policy.py     |    2 +-
 nova/tests/test_policy.py |   18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

commit e7862ea2e437639fa521d534164ef4cc6c20c213
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jan 27 09:38:46 2012 -0800

    Remove session arg from sm_backend_conf_update
    
    Fixes bug 915108
    
    Change-Id: Ic22bf5aa3d68ea59692ebe05d1b0b79757c70b52

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1ff23b66defee0f010442a68ec47904cc4ee890c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Jan 27 00:22:04 2012 -0500

    Remove session arguments from db.api
    
    Possibly through copy-paste errors, some sqlalchemy session keyword args
    made it into the db api. Some aren't even passed in to the IMPL's
    equivalent function, and a db.api client has no sensible way of creating
    such a session to pass in. Therefore this patch removes them.
    
    Change-Id: I75237b542bdf4f75c1a07ae38bf485e0ff080339

 nova/db/api.py |   30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

commit cefc979a001d82cca6ddfa1fd1abea698be458b7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jan 26 23:23:04 2012 +0000

    Add a note explaining why unhandled exceptions shouldn't be returned
    to users.
    
    For future developers so they don't re-introduce a bug by accident.
    
    Change-Id: I24f03adcc795db6252be988c076043bb74026733

 nova/api/openstack/__init__.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 43fd6fe7385285ebd85972f96298bf1990b78e04
Author: Brad Hall <brad@nicira.com>
Date:   Thu Jan 26 13:45:34 2012 -0800

    Remove fetching of networks that weren't created via nova-manage
    
    For bug 922319: we want to make sure we only return networks created by
    nova-manage and not any arbitrary network that Quantum could have for a given
    tenant.
    
    Change-Id: Icd4a9c00d0ed4faf5e404060e8b7a658d9b83257

 nova/network/quantum/manager.py |    9 ---------
 1 file changed, 9 deletions(-)

commit 7b5e9079415bcdb7c3514822e1d5cb7c67c267ce
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Jan 26 09:25:17 2012 +0100

    uses the instance uuid in libvirt by introducing a new variable 'uuid' for the used template instead of using a random uuid in libvirt
    
    fixes bug 917736
    
    Change-Id: I1f8ba92878fb01cb25a7007839649e1ef7c4fcdc

 nova/tests/test_libvirt.py      |   16 ++++++++++++++++
 nova/virt/libvirt.xml.template  |    1 +
 nova/virt/libvirt/connection.py |    1 +
 3 files changed, 18 insertions(+)

commit e1802d8447a0299816a0f1ffa6fbaa6111591070
Merge: 2a84685 a27dd1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 20:50:59 2012 +0000

    Merge "Fixing rebuilds on libvirt, seriously."

commit 04ca11bd4cf43b4332c02a15edd506868031168a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Jan 24 19:12:32 2012 +0000

    Fixing a rebuild race condition bug.
    
    A race condition caused servers to be undeletable and stay in rebuild state.
    This patch handles exceptions on compute.manager side and sets the state
    of the instances appropriately.
    
    bug: 918958
    Change-Id: I7369a63174284c5b9ed257cc129f611163d5841d

 nova/compute/manager.py |   29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

commit 2a846859f4e1959660a6895bfbb6b8d5f87e14c3
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Jan 26 19:57:32 2012 +0000

    Fixes bug 914418
    
    This turns out not to actually be a case of using the wrong exchange, rather
    it is that the exchange's 'durable' flag does not match the queue if FLAGS.durable is set to 'False'.
    
    Change-Id: I69ac7e84ac02a72dd204fa3aa27e73637594f509

 nova/rpc/amqp.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ca86546a2120db49e4122bc7a6b274e67a4de11
Merge: 0de2ae9 f84a085
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 19:02:25 2012 +0000

    Merge changes If0c92dca,I75d8b616
    
    * changes:
      blueprint host-aggregates: OSAPI extensions
      blueprint host-aggregates: OSAPI/virt integration, via nova.compute.api

commit 0de2ae996573ccd4417535e8a9d48fffb02dfcfb
Merge: ff71345 65b480c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 18:41:10 2012 +0000

    Merge "Remove LazySerializationMiddleware."

commit ff71345aed95628c4c8dc41370f65777a98f1dce
Merge: 09ccc2f a5d5368
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 18:30:08 2012 +0000

    Merge "Bug #921730: plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore no longer in use"

commit 65b480c3ca9708baea0779f3f91d533499d7463d
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jan 26 10:49:06 2012 -0500

    Remove LazySerializationMiddleware.
    
    Removes LazySerializationMiddleware and ExtensionMiddleware. They
    are no longer in use.
    
    Fixes LP Bug# 922152.
    
    Change-Id: Icd0b54d474d807125f522965de0d89741b14cf2f

 nova/api/openstack/compute/extensions.py           |   11 -----------
 nova/api/openstack/extensions.py                   |   12 ------------
 nova/api/openstack/volume/extensions.py            |   11 -----------
 nova/api/openstack/wsgi.py                         |   12 ------------
 .../compute/contrib/test_admin_actions.py          |    6 +-----
 .../compute/contrib/test_scheduler_hints.py        |    7 +------
 6 files changed, 2 insertions(+), 57 deletions(-)

commit a5d5368a4605fcb14c42dd9df5de07b0808a55d1
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Thu Jan 26 14:09:26 2012 +0000

    Bug #921730: plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore no longer in use
    
    remove the plugin and update resources accordingly.
    
    Change-Id: Ib4184c9b81b40e6892886c71fd8de09ba55322af

 plugins/xenserver/xenapi/README                    |   18 +-
 .../rpmbuild/SPECS/openstack-xen-plugins.spec      |    1 -
 .../xenapi/etc/xapi.d/plugins/objectstore          |  256 --------------------
 3 files changed, 14 insertions(+), 261 deletions(-)

commit 09ccc2f9315eb0441d5f7793326614cc25814089
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Thu Jan 26 04:38:41 2012 -0800

    Adding live migration server actions
    
    Change-Id: I5e1f5dddaf45d1c6eae8666647425bff748b639e

 .../api/openstack/compute/contrib/admin_actions.py |   37 ++++++
 nova/api/openstack/compute/contrib/hosts.py        |   76 ++++++++++++
 nova/compute/manager.py                            |   20 +--
 nova/scheduler/api.py                              |   12 ++
 nova/scheduler/driver.py                           |    5 -
 nova/scheduler/manager.py                          |    4 -
 .../compute/contrib/test_admin_actions.py          |   56 +++++++++
 .../api/openstack/compute/contrib/test_hosts.py    |  128 ++++++++++++++++++++
 nova/tests/scheduler/test_scheduler.py             |    8 --
 nova/tests/test_compute.py                         |    1 +
 nova/virt/fake.py                                  |   31 +----
 nova/virt/libvirt/connection.py                    |    4 +-
 12 files changed, 323 insertions(+), 59 deletions(-)

commit 6142230ccf2555650dbb902a5c342a342e9b2582
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jan 25 21:36:22 2012 -0800

    bug 921931: fix Quantum Manager VM launch race condition
    
    Change-Id: I1f3a0f001477caa5f595c93c49f6c9e03a50149a

 nova/network/quantum/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit ca22fc9d3114ebb9d8b1e07f951941ac2028a1c1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 24 17:05:20 2012 -0800

    Fix authorization checks for simple_usage.show
    
     * Normal users shouls be allowed to query their own usage info
     * Fixes bug 921327
     * Address bcwaldon's comment about using a default {} in authorize
     * Remove is_admin references
     * Rebase and change expected auth failure response from 401 to 403
     * Remove policy-related tests
     * Add back test_verify_show_cant_view_other_tenant, implemented with test policy
    
    Change-Id: Ib0ce46419b7aedad34de957bfe2e60b10c5af11c

 etc/nova/policy.json                               |    3 +-
 .../compute/contrib/simple_tenant_usage.py         |   16 ++++-------
 nova/api/openstack/extensions.py                   |    6 ++--
 .../compute/contrib/test_simple_tenant_usage.py    |   29 ++++++++++----------
 nova/tests/policy.json                             |    3 +-
 5 files changed, 28 insertions(+), 29 deletions(-)

commit 13dafc977d5ac79e3cbf2e324bb0250ed343d7a2
Merge: 18f50f5 78910be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 01:42:31 2012 +0000

    Merge "Don't pass filter_properites to managers"

commit 18f50f538a8375968154af237cd0d47a6f82efc5
Merge: b452303 ae11143
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 26 01:11:49 2012 +0000

    Merge "Simplify somewhat complicated reduce() into sum()"

commit ae111433ca8d07fe7de5af6116ae2bad4d63e700
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jan 25 23:45:02 2012 +0000

    Simplify somewhat complicated reduce() into sum()
    
    Change-Id: Ib9c742e391061de033f24b385b047b4a4316ead9

 nova/scheduler/driver.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit b4523032029604df34e045d6f6777a695328cff4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jan 25 15:20:38 2012 -0800

    Ignore connection_type when no instances exist
    
    In migration 74, we had required that the connection_type flag
    be set. That's annoying for new deployments, so bypass this check
    if there are no instances in the databse. Fixes bug 921294
    
    Change-Id: I9b829e80ad7fa7ded3c7a471cb68c9b342d973bb

 .../versions/074_change_flavor_local_gb.py         |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit e6c8051a23b6ed570656d7a209472a7d6489978f
Merge: 9e9d271 9a08e00
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 23:25:38 2012 +0000

    Merge "Add HACKING compliance testing to run_test.sh"

commit 9e9d271fe876b0231e947a14d8c2cee8ecc706da
Merge: 07eebdf 093c147
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 23:01:37 2012 +0000

    Merge "Fix uptime calculation in simple_usage"

commit 07eebdfdef069945d04cf6ca1bb45a68ea32766b
Merge: 5c51ee0 fa10e7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 22:51:23 2012 +0000

    Merge "Do not output admin_password in debug logs"

commit 5c51ee01e2657cd2af1edf8ce8a3b52ba5d95374
Merge: 01a9d86 78c68b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 22:24:20 2012 +0000

    Merge "rootwrap: Fix KillFilter matching"

commit 01a9d86e872c9ef1805b9b56590418d75c4ab440
Merge: 69fb8d5 4cdcf1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 22:10:29 2012 +0000

    Merge "Fixes bug 921265 - i'nova-manage flavor create|list'"

commit a043978419c600ee1e93baa0b83879e2c45c13f8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jan 24 15:01:21 2012 -0800

    Add authorization checks to flavormanage extension
    
    Relates to bp separate-nova-adminapi
    
    Change-Id: I69a851893b96ccbc2653716584bb3c3c0b0f3afa

 etc/nova/policy.json                               |    1 +
 nova/api/openstack/compute/contrib/flavormanage.py |   17 +++++---------
 .../compute/contrib/test_flavor_manage.py          |   24 +++-----------------
 nova/tests/policy.json                             |    1 +
 4 files changed, 11 insertions(+), 32 deletions(-)

commit 78c68b84dfc22eec233a607a6b596602487799d7
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jan 25 12:27:05 2012 -0800

    rootwrap: Fix KillFilter matching
    
    The match() method in the KillFilter is a bit buggy. Since most/many
    run through this logic in their way to being matched, it creates subtle
    issues elsewhere, specifically during linux_net bridge creation.  This
    fixes two issues.
    
    1. userargs gets elements directly popped off of it.  If the KillFilter
    does not match the command its checking, the later filter that does is missing
    one argument.
    2. Type error on pid when checking /proc, this was causing issues on instance
    tear down / kill -HUP'ing dnsmasq.
    
    Fixes bug 921784
    
    Change-Id: I058ff2276e3154e8c1f6cc7077fa485db60e5827

 nova/rootwrap/filters.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 093c147a14059c60e6b787589398ee7d8f9792d9
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Jan 25 12:30:09 2012 -0800

    Fix uptime calculation in simple_usage
    
     * Fixes bug 921807
    
    Change-Id: Ie6460adb95ef3b9cb0473023816c255aac707e99

 .../compute/contrib/simple_tenant_usage.py         |    2 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 69fb8d51cd4c53e1c7c908542be0052b658c448a
Merge: d7a8dc6 f63a548
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 20:23:32 2012 +0000

    Merge "Fix bug 921715 - 'nova x509-create-cert' fails"

commit a27dd1b24ca67de28cced3d8d2eec98f86cbb958
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jan 25 20:15:28 2012 +0000

    Fixing rebuilds on libvirt, seriously.
    
    bug: 867627
    Change-Id: I497b18a56997e347995ad8869855127bd31cb974

 nova/compute/manager.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit d7a8dc68fe10b914bf9a54693df81f2786aebbd9
Merge: 55a70f3 dd29f42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 20:12:31 2012 +0000

    Merge "Remove unused flags.Help*Flag"

commit 55a70f32c1a9bbcf4534b314edbebe82542ed4e1
Merge: f7346b6 4a04d29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 20:01:41 2012 +0000

    Merge "Return 403 instead of 401 when policies reject"

commit 78910be08b9d55b7638ec9bdd582ae5e818850e7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jan 25 11:55:04 2012 -0800

    Don't pass filter_properites to managers
    
    Fixes bug 921789
    
    distributed_scheduler is trying to pass filter_properties to compute
    manager but it's not serializable.. and we shouldn't pass it anyway.
    
    Change-Id: I17ce04b71dfa3cef77a6883ce3cd6fede95a538a

 nova/scheduler/distributed_scheduler.py            |    8 ++++++++
 nova/tests/scheduler/test_distributed_scheduler.py |    5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

commit f7346b6ce8a945499d9f2f3eb0d531f9da0705dc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jan 25 18:48:58 2012 +0000

    Fixing rebuilds on libvirt.
    
    bug: 867627
    Change-Id: I663fd4004a2198c15d576de33b5aa35188a6e74a

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f63a54841f668cb92cd32bed27e20c9726b49f58
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Wed Jan 25 12:19:45 2012 -0600

    Fix bug 921715 - 'nova x509-create-cert' fails
    
    The 'CN' value passed to openssl was too long, shorten it.
    
    Change-Id: I9da6510bf23a8ad33b08f3373f09e0c5287fe051

 nova/crypto.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4a04d297bdd276b7bd9fbd1565c9c7dcfc87ee95
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jan 25 10:37:33 2012 -0800

    Return 403 instead of 401 when policies reject
    
    Fixes bug 921744
    
    Change-Id: Ib4b6405dffa3ee2e8ef2b8a7710124f97f0fdf43

 nova/api/openstack/wsgi.py            |    2 +-
 nova/tests/api/openstack/test_wsgi.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f84a08528a5a604dbbff7e4ae0bdcd0e4e3fc19d
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Tue Jan 17 18:45:53 2012 +0000

    blueprint host-aggregates: OSAPI extensions
    
    This commit introduces the OSAPI admin extensions for host aggregates.
    This is part of a series of commits that have started with change:
    
    https://review.openstack.org/#change,3035
    
    Change-Id: If0c92dca7d6f5d794f84bdb2adc172c55dec6e74

 etc/nova/policy.json                               |    1 +
 nova/api/openstack/compute/contrib/aggregates.py   |  223 ++++++++++++
 nova/compute/api.py                                |   12 +-
 .../openstack/compute/contrib/test_aggregates.py   |  372 ++++++++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/policy.json                             |    1 +
 nova/tests/test_compute.py                         |   13 +
 7 files changed, 619 insertions(+), 4 deletions(-)

commit 0a617713b881780bed67902833e1b971c9179042
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Jan 18 19:47:36 2012 +0000

    blueprint host-aggregates: OSAPI/virt integration, via nova.compute.api
    
    This commit introduces the first cut of integration between the OSAPI
    Admin extensions for host aggregates and the virt layer.
    
    This is part of a series of commits that have started with change:
    
    https://review.openstack.org/#change,3035
    
    Change-Id: I75d8b616e3b8f8cef75d40d937e0dce9f29b16db

 nova/compute/__init__.py         |    1 +
 nova/compute/aggregate_states.py |   26 ++++-
 nova/compute/api.py              |  126 ++++++++++++++++++++++-
 nova/compute/manager.py          |    8 ++
 nova/db/sqlalchemy/api.py        |   13 ++-
 nova/exception.py                |    5 +
 nova/tests/test_compute.py       |  211 ++++++++++++++++++++++++++++++++++++++
 nova/tests/test_db_api.py        |   13 ++-
 8 files changed, 393 insertions(+), 10 deletions(-)

commit fcf73f90c37c53fc7743134f6088b3efca52485e
Merge: f4c0fba 50f3198
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 16:46:44 2012 +0000

    Merge "Convert vmwareapi code to UNIX style line endings"

commit 4cdcf1dbffe20ce406e8d4b93a972480e9cb02a0
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Tue Jan 24 20:04:56 2012 -0600

    Fixes bug 921265 - i'nova-manage flavor create|list'
    
    These problems were introduced in https://review.openstack.org/2918
    * nova-manage needs the change from local_gb to root_gb/ephemeral_gb.
    * fixes 'nova-manage flavor ...'
    * fixes 'nova-manage service describe_resource ...'
    
    Change-Id: I63040359a425aac3ef7a0a84e6834b1dfe3a8790

 bin/nova-manage           |   61 ++++++++++++++++-----------------------------
 nova/db/sqlalchemy/api.py |    3 ++-
 2 files changed, 24 insertions(+), 40 deletions(-)

commit f4c0fbafc178a800e1ab88515606a3b600a98a10
Merge: 30ac47b fe1c97f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 15:56:29 2012 +0000

    Merge "Blueprint xenapi-provider-firewall and Bug #915403."

commit 30ac47bcbd8af06ed6a3ccdca552747c00381829
Merge: 99daaea 2cf8b77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 15:20:08 2012 +0000

    Merge "blueprint host-aggregates: maintenance operations to host OSAPI exts"

commit dd29f420ab9be8e5d05e46185af8505d67faf54f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Jan 25 13:14:42 2012 +0000

    Remove unused flags.Help*Flag
    
    These don't do anything anymore since we just rely on optparse's
    --help behaviour.
    
    Change-Id: I7c74456a06fe924503dcfbcfa4da9fc5c26b8ab0

 bin/nova-ajax-console-proxy |    3 ---
 bin/nova-direct-api         |    3 ---
 bin/nova-manage             |    3 ---
 nova/flags.py               |   16 ----------------
 nova/service.py             |    6 ------
 5 files changed, 31 deletions(-)

commit 50f3198477253d730d11d42215efe7e527a230d0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Jan 25 11:57:25 2012 +0000

    Convert vmwareapi code to UNIX style line endings
    
    It's the only code in the codebase using evil CRLF line endings.
    
    Change-Id: I8b1a2b12a5707fbd4d32588c081599beaa34aca5

 nova/tests/vmwareapi/__init__.py       |   42 +-
 nova/tests/vmwareapi/db_fakes.py       |  218 ++---
 nova/tests/vmwareapi/stubs.py          |  102 +-
 nova/virt/vmwareapi/error_util.py      |  192 ++--
 nova/virt/vmwareapi/fake.py            | 1438 ++++++++++++++--------------
 nova/virt/vmwareapi/io_util.py         |  338 +++----
 nova/virt/vmwareapi/network_utils.py   |  340 +++----
 nova/virt/vmwareapi/read_write_util.py |  358 +++----
 nova/virt/vmwareapi/vim.py             |  362 +++----
 nova/virt/vmwareapi/vim_util.py        |  446 ++++-----
 nova/virt/vmwareapi/vm_util.py         |  650 ++++++-------
 nova/virt/vmwareapi/vmops.py           | 1648 ++++++++++++++++----------------
 nova/virt/vmwareapi/vmware_images.py   |  290 +++---
 13 files changed, 3212 insertions(+), 3212 deletions(-)

commit 99daaea663ade3839142f538427faa85d0e64c8f
Merge: 2594e48 4fb1e8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 06:56:48 2012 +0000

    Merge "Adds extension for retrieving certificates"

commit fe1c97ff4c36d1cc2642d9a485f82874e4b3bda2
Author: Deepak Garg <deepak.garg@citrix.com>
Date:   Fri Jan 13 16:03:45 2012 +0530

    Blueprint xenapi-provider-firewall and Bug #915403.
    
      1. Provides dom0 IPtables driver to implement the Provider firewall rules.
      2. Existing libvirt code has been refactored to reduce the amount of duplicated code to a minimum
      3. The three provider apis in ec2/admin.py file are now fixed the following way:
        a.    remove_external_address_block returned 'OK' on removing blocks which didn't exist. This is now fixed.
        b.    block_external_addresses raised exception earlier on duplicate network blocks. Now the exception is logged and failed status message is returned.
        c.  all the three provider apis now logs for invalid and improper inputs and return uniform (a dictionary ) and proper status messages for all cases.
      4. appropriate unit tests added to cover the same
    
    Change-Id: I27d83186f850423a6268947aed0c9a349d8f8d65

 Authors                          |    1 +
 nova/api/ec2/admin.py            |   41 ++++++++++++++++++++------
 nova/compute/api.py              |    2 +-
 nova/compute/manager.py          |    4 +--
 nova/network/linux_net.py        |    9 +++---
 nova/tests/api/ec2/test_admin.py |   59 ++++++++++++++++++++++++++++++-------
 nova/tests/test_xenapi.py        |   60 ++++++++++++++++++++++++++++++++++++++
 nova/tests/xenapi/stubs.py       |    1 -
 nova/utils.py                    |    4 +--
 nova/virt/driver.py              |    4 +--
 nova/virt/firewall.py            |   47 ++++++++++++++++++++++++++++-
 nova/virt/libvirt/firewall.py    |   45 +---------------------------
 nova/virt/xenapi/firewall.py     |   56 +++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py        |    3 ++
 nova/virt/xenapi_conn.py         |    3 ++
 15 files changed, 263 insertions(+), 76 deletions(-)

commit 4fb1e8d34feafafe423e012c7031835024d85dcd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 19 14:58:27 2012 -0800

    Adds extension for retrieving certificates
    
     * Makes euca-upload/euca-register work again
     * Provides means for novarc to be generated
     * Fixes bug 903345
     * Implements blueprint x509-cert-crud
    
    Change-Id: I0b2a42fe5436243da6925ba199936b49458d6f8c

 etc/nova/policy.json                               |    1 +
 nova/api/openstack/compute/contrib/certificates.py |  112 ++++++++++++++++++++
 .../openstack/compute/contrib/test_certificates.py |   77 ++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/policy.json                             |    1 +
 5 files changed, 192 insertions(+)

commit 2594e480b2d90490a92865afbeecda35b29320d6
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Tue Jan 24 18:14:47 2012 +0900

    Add os-start/os-stop server actions to OSAPI
    
    Implements blueprint start-stop-methods-support-in-os-servers-xapi
    
    Change-Id: I7aa241ffdd2ec3a7c9800411268f4adc47960be8

 Authors                                            |    1 +
 .../openstack/compute/contrib/server_start_stop.py |   76 ++++++++++++++++++++
 .../compute/contrib/test_server_start_stop.py      |   74 +++++++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 4 files changed, 152 insertions(+)

commit a99f429591b5efcbcc21a618190e4bef7d9fba38
Merge: 5156c0e 0c5273c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 00:00:35 2012 +0000

    Merge "Create nova cert worker for x509 support"

commit 5156c0e757859b0823ebd35e77e660e9f5726811
Merge: 30a40db dc0f299
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 23:18:16 2012 +0000

    Merge "bug 917397"

commit 0c5273c85ea72d60e5907acb22398584ded0a077
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 18 21:04:47 2012 -0800

    Create nova cert worker for x509 support
    
     * Adds new worker for cert management
     * Makes decrypt use an rpc to the worker
     * Moves CA filesystem creation out of cloud.setup
     * Moves test for X509 into crypto
     * Adds test for encrypting and decrypting using cert
     * Cleans up extra code in cloudpipe
     * Fixes bug 918563
     * Prepares for a future patch that will fix bug 903345
    
    Change-Id: I4693c50c8f432706f97395af39e736f49d60e719

 bin/nova-all                                    |    2 +-
 bin/nova-cert                                   |   47 ++++++++++++++++
 nova/api/ec2/cloud.py                           |   25 ---------
 nova/api/openstack/compute/contrib/cloudpipe.py |   23 +-------
 nova/cert/__init__.py                           |   15 +++++
 nova/cert/manager.py                            |   67 +++++++++++++++++++++++
 nova/crypto.py                                  |   44 +++++++++++++++
 nova/exception.py                               |    4 ++
 nova/flags.py                                   |    3 +
 nova/image/s3.py                                |   67 +++++++++++------------
 nova/tests/test_auth.py                         |   23 --------
 nova/tests/test_crypto.py                       |   63 ++++++++++++++++++---
 setup.py                                        |    1 +
 13 files changed, 271 insertions(+), 113 deletions(-)

commit 30a40db708b84b767314a9f455e68f8175f89bb2
Merge: 57cf831 d498aea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 23:08:09 2012 +0000

    Merge "Remove unused nova/api/mapper.py"

commit 57cf8312b88852f2e1de883c4bda28f873fcde47
Merge: 06ba4a2 4110add
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 22:48:00 2012 +0000

    Merge "usage: Fix time filtering"

commit 06ba4a2c2c37b464fb14a963dd97364cf71f1456
Merge: bf5f01c 4cbf098
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 22:36:19 2012 +0000

    Merge "Bug #916312: nova-manage network modify --network flag is inconsistent."

commit bf5f01ce637ad80c46c2d30bd563829f1e5bf18f
Merge: b328b04 8279240
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 22:24:57 2012 +0000

    Merge "Handle error in associate floating IP (bug 845507)"

commit b328b0422035212c844ff5bbcc03f648fb7a2779
Merge: b463f0a 248aa0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 22:13:21 2012 +0000

    Merge "Change the logic for deleting a record dns_domains."

commit b463f0a87a0db872232d26fba915b29712faf7cd
Merge: 611a282 a3046e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 22:05:44 2012 +0000

    Merge "Add nova.exception.InvalidRPCConnectionReuse."

commit 611a2827762033f27e6f5d41c325810d92bc8635
Merge: 39d8311 be96c43
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 21:55:06 2012 +0000

    Merge "Add support for Qpid to nova.rpc."

commit 4cbf0984f9e07cf0395d87492406bf61a82c967f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 13 17:28:27 2012 -0800

    Bug #916312: nova-manage network modify --network flag is inconsistent.
    
    Change nova-manage network modify --network to --fixed_range, to match
    nova-manage network delete.
    
    Also document both.
    
    Change-Id: I3c03a33e9e3576393252d771eb4ce3353a7f2eaa

 bin/nova-manage                          |    2 +-
 doc/source/runnova/managing.networks.rst |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

commit 39d8311e6532e8da32bb85ebe027a3b6c9c817ee
Merge: 10acb1d a8d4185
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 21:24:27 2012 +0000

    Merge "Explicitly encode string to utf8 before passing to ldap."

commit d498aeaf61e505f2027e39406d4c60b2a50b810c
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jan 24 21:05:30 2012 +0000

    Remove unused nova/api/mapper.py
    
    Introduced recently by 60ff2e, but seems totally unused.
    
    Change-Id: Iefe0168b6bc189ec83efbd69f0be22946696d408

 nova/api/mapper.py |   73 ----------------------------------------------------
 1 file changed, 73 deletions(-)

commit a3046e007f53b9b31528a2b35b2f000ae0441750
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Jan 23 16:53:44 2012 -0500

    Add nova.exception.InvalidRPCConnectionReuse.
    
    nova.rpc.common.ConnectionContext makes use of an exception that was not
    defined.  This patch adds it.
    
    Change-Id: Ibfbd2fc56dbcc36c8f271d5bc8c6e1db04ce8c93

 nova/exception.py |    4 ++++
 1 file changed, 4 insertions(+)

commit be96c433902da7782df1f1e471fc1c0e48bc609d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Jan 11 16:09:47 2012 -0500

    Add support for Qpid to nova.rpc.
    
    Implements blueprint apache-qpid-rpc.
    
    This patch adds a new implementation of the nova.rpc API that uses Qpid
    as the messaging backend.  We first considered trying to add Qpid
    support to kombu, but the kombu API did not map very well to Qpid, which
    is based on a newer version of AMQP.  It was easier to just map the nova
    rpc API to Qpid.
    
    For more information about how to use Qpid with Nova, see this wiki
    page:
    
        http://wiki.openstack.org/QpidSupport
    
    The structure of impl_qpid is largely based on impl_kombu, but adapted
    to use the Qpid APIs as necessary.  This patch also factors out some of
    the code shared with impl_kombu into nova.rpc.common to try to cut down
    on duplicated code.
    
    The unit tests were written from scratch instead of taking advantage
    of the common rpc unit tests.  The common unit tests only work if qpidd
    is running, but they do pass if enabled.  The unit tests for impl_qpid
    instead use mox to mock out the Qpid objects and ensure the right
    operations happen on them when the rpc API is exercised.
    
    This patch was a joint effort between myself and William Henry, which is
    why he was added to the Authors file in this patch.
    
    Change-Id: Ibacaa956e016ef96f014443074e2a4622e31f090

 Authors                     |    1 +
 nova/rpc/amqp.py            |  355 +++++++++++++++++++++++++++++++
 nova/rpc/common.py          |    1 +
 nova/rpc/impl_kombu.py      |  307 ++-------------------------
 nova/rpc/impl_qpid.py       |  485 +++++++++++++++++++++++++++++++++++++++++++
 nova/tests/rpc/test_qpid.py |  293 ++++++++++++++++++++++++++
 6 files changed, 1147 insertions(+), 295 deletions(-)

commit 10acb1d4feb9ed0accc4ca5a1802123e9d5ee20f
Merge: ef50dd4 68c140d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jan 24 21:03:35 2012 +0000

    Merge "Imported Translations from Launchpad"

commit ef50dd412b3e0ab569c85abc1b3637ff0f3f819d
Merge: 8dfd968 35b3c08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 20:52:57 2012 +0000

    Merge "Add an API extension for creating+deleting flavors"

commit 8dfd968e83cbcdc0796caa44289144d38a6a5ce8
Merge: c88771d 9cb5f54
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 19:32:49 2012 +0000

    Merge "Remove admin_only ext attr in favor of authz"

commit c88771d8202f9c1c3f7a7260dea200d902b3c3aa
Merge: 1963e6b fefb888
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 19:22:54 2012 +0000

    Merge "extensions: Allow registering actions for create + delete"

commit 9a08e00548d1414f4a4ed3901ed4b4dc817c3f1a
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Jan 20 00:50:56 2012 -0800

    Add HACKING compliance testing to run_test.sh
    
    Tests so far:
    N101 TODO format
    N201 Except format
    N301 One import per line
    N302 import only modules
    N303 Invalid Import
    N304 Relative Import
    
    Change-Id: I33c021b842e7199b1f5f1f699ea17f7fa5f8ca49

 run_tests.sh     |   24 +++++++
 tools/hacking.py |  183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

commit 1963e6bfd9bd2d4bbecf1edb4e8021e15f4086cc
Merge: adf82fc 0d5c8aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 18:51:48 2012 +0000

    Merge "Abstract out _exact_match_filter()"

commit 9cb5f547dc6f3242edf393928dbc14b7cbfbbdd4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 19 15:30:55 2012 -0800

    Remove admin_only ext attr in favor of authz
    
    Working on blueprint separate-nova-adminapi. This removes the
    admin_only extension attribute and the allow_admin_api flag. The
    approach we're going for now is to load all extensions, but
    to set an admin-only rule in our policy file for those extensions
    that should be limited to just admin users. Now that all of our
    admin api code has been moved to extensions, in order to
    prevent admin api code from being loaded, simply remove it from
    the extension list.
    
    Change-Id: Ic574e06af44922ba764013b769077fc5099fd1a2

 doc/source/devref/distributed_scheduler.rst        |    2 -
 doc/source/devref/zone.rst                         |    2 -
 etc/nova/policy.json                               |   32 ++++++++++
 nova/api/mapper.py                                 |    3 -
 nova/api/openstack/compute/__init__.py             |    3 -
 nova/api/openstack/compute/contrib/accounts.py     |   17 ++---
 .../api/openstack/compute/contrib/admin_actions.py |   12 +++-
 nova/api/openstack/compute/contrib/cloudpipe.py    |    6 +-
 .../openstack/compute/contrib/console_output.py    |    4 +-
 nova/api/openstack/compute/contrib/consoles.py     |    2 +
 .../openstack/compute/contrib/createserverext.py   |    7 +-
 .../openstack/compute/contrib/deferred_delete.py   |    5 +-
 nova/api/openstack/compute/contrib/disk_config.py  |   57 ++++++++++-------
 .../openstack/compute/contrib/extended_status.py   |   48 +++++++-------
 .../openstack/compute/contrib/flavorextraspecs.py  |   12 +++-
 .../openstack/compute/contrib/floating_ip_dns.py   |    8 +++
 .../openstack/compute/contrib/floating_ip_pools.py |    2 +
 nova/api/openstack/compute/contrib/floating_ips.py |    7 ++
 nova/api/openstack/compute/contrib/hosts.py        |    5 +-
 nova/api/openstack/compute/contrib/keypairs.py     |    6 ++
 nova/api/openstack/compute/contrib/multinic.py     |    7 +-
 nova/api/openstack/compute/contrib/networks.py     |    6 +-
 nova/api/openstack/compute/contrib/quotas.py       |    6 ++
 nova/api/openstack/compute/contrib/rescue.py       |    3 +
 .../openstack/compute/contrib/security_groups.py   |    9 +++
 .../compute/contrib/server_action_list.py          |    3 +-
 .../compute/contrib/server_diagnostics.py          |    3 +-
 .../compute/contrib/simple_tenant_usage.py         |    4 +-
 nova/api/openstack/compute/contrib/users.py        |   16 ++---
 .../compute/contrib/virtual_interfaces.py          |    2 +
 .../compute/contrib/virtual_storage_arrays.py      |   15 ++++-
 nova/api/openstack/compute/contrib/volumes.py      |   15 ++++-
 nova/api/openstack/compute/contrib/volumetypes.py  |   16 ++++-
 nova/api/openstack/compute/contrib/zones.py        |   15 +++--
 nova/api/openstack/compute/servers.py              |    2 +-
 nova/api/openstack/extensions.py                   |   33 ++++++----
 .../api/openstack/compute/contrib/test_accounts.py |    8 +--
 .../compute/contrib/test_admin_actions.py          |    6 +-
 .../openstack/compute/contrib/test_cloudpipe.py    |    1 -
 .../compute/contrib/test_deferred_delete.py        |    3 +-
 .../compute/contrib/test_extendedstatus.py         |    1 -
 .../api/openstack/compute/contrib/test_hosts.py    |    3 -
 .../api/openstack/compute/contrib/test_networks.py |    1 -
 .../compute/contrib/test_server_action_list.py     |    1 -
 .../compute/contrib/test_server_diagnostics.py     |    1 -
 .../compute/contrib/test_simple_tenant_usage.py    |    1 -
 .../api/openstack/compute/contrib/test_users.py    |    8 +--
 .../api/openstack/compute/contrib/test_zones.py    |    1 -
 .../tests/api/openstack/compute/test_extensions.py |   30 ---------
 nova/tests/api/openstack/compute/test_servers.py   |   67 +++-----------------
 nova/tests/policy.json                             |   32 ++++++++++
 51 files changed, 326 insertions(+), 233 deletions(-)

commit 4110addd4d450954aa32aa9045b99de8205543d0
Author: Cole Robinson <crobinso@redhat.com>
Date:   Sun Jan 22 19:29:10 2012 -0500

    usage: Fix time filtering
    
    Querying for resource usage within a given time range seems to have a
    logic flaw: it will only report instances that have run the entire
    length of the specified range.
    
    AIUI What we really want is any instance that spent any time consuming
    resources at any point in the specified range. Fix the logic to
    implement this.
    
    v2:
        Update function comments as well
    
    Change-Id: I4fa567982457e5f447ec33cf3d96457f50d71d86

 nova/db/sqlalchemy/api.py |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit 35b3c08a463dd35a41f3c44f3fa8273b915cb378
Author: Cole Robinson <crobinso@redhat.com>
Date:   Thu Jan 19 18:39:11 2012 -0500

    Add an API extension for creating+deleting flavors
    
    This extension is a step towards deprecating openstackx for horizon.
    Most of the extension code is based on the equivalent in openstackx.
    
    v2:
        s/lifecycle/manage/ for all bits
        Address Pádraig style issues
        Drop purge API option
        Adjust now inaccurate comment in DB api
        Make extension admin_only
        Extend existing /flavors namespace rather than os-flavor-lifecycle
        Only allow API access from admin user
    
    v3:
        Some pep8 fixes
    
    v4:
        Adjust to root_gb, ephemeral_gb changes
        Drop admin_only (it's on the way out AIUI)
    
    Change-Id: I3fdfccdd8e7337e1759f5875c3b15fa9954371ef

 nova/api/openstack/compute/contrib/flavormanage.py |   95 ++++++++++++++
 nova/compute/instance_types.py                     |   10 +-
 nova/db/sqlalchemy/api.py                          |    8 +-
 .../compute/contrib/test_flavor_manage.py          |  130 ++++++++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/test_instance_types_extra_specs.py      |    2 +-
 6 files changed, 239 insertions(+), 7 deletions(-)

commit fefb88877c6d6f00626df747eb0172484c16f0ec
Author: Cole Robinson <crobinso@redhat.com>
Date:   Mon Jan 23 11:29:24 2012 -0500

    extensions: Allow registering actions for create + delete
    
    This allows an extension to add new actions for create and delete
    operations to an existing collection.
    
    Currently when extending an existing collection (API namespace), an
    extension can register brand new 'actions', and extend any preexisting API
    functionality, but unfortunately create and delete are special cases that
    don't fall under the 'actions' classification, meaning the infrastructure
    can't handle them unless extending an existing impl.
    
    Stubbing out the create/delete methods in the original resource with
    the equiv of a NotImplementedError doesn't work, since 'extend'ing
    requires the original implementation to exit correctly.
    
    Whitelist 'create' and 'delete' and handle them appropriately.
    
    v2:
        Add myself to Authors
        Update wsgi.action docs
        Add a test case
    
    v3:
        Actually update Authors
    
    Change-Id: I550ae93c5e200f18644042ac81656bc76dbe8955

 Authors                               |    1 +
 nova/api/openstack/wsgi.py            |   15 +++++++++++----
 nova/tests/api/openstack/test_wsgi.py |   29 +++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

commit a8d418573e742d4593c24bbca343694162007210
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Fri Jan 20 23:49:29 2012 +0000

    Explicitly encode string to utf8 before passing to ldap.
    
    Python-ldap sometimes behaves poorly when receiving unicode strings.
    
    For blueprint public-and-private-dns.
    
    Change-Id: If61c3b5bb9198e3870fb48974fa4a8fc072bb1bb

 nova/network/ldapdns.py |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

commit adf82fc42e3b04d9a9cf9624b2a53983b569ef19
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Tue Jan 24 17:53:01 2012 +0000

    Make a bunch of dcs into single-entry lists.
    
    I was seeing dcs where ['e','v','e','r','y'] character was
    a list item, so clearly ldap is going to interpret this field
    as a list whether it is one or not.
    
    For blueprint public-and-private-dns.
    
    Change-Id: I9f383b322e85d99783f9ce93bdfc4e0d3d94e2ed

 nova/network/ldapdns.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3ad3292efd7fcba7b58bc9c8b1cb84e8b00a10fa
Merge: e360b88 682809e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 18:09:47 2012 +0000

    Merge "Tweak api-paste.ini to prepare for a devstack change"

commit 0d5c8aa0472c75dc521c0dc82b5d5ce6ddaf8a16
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jan 24 12:01:48 2012 -0600

    Abstract out _exact_match_filter()
    
    In the interests of improving DRY in the sqlalchemy db backend API,
    abstract out _exact_match_filter().
    
    Change-Id: Ic381a071005dced6989e9e9696930fd85b6d5d46

 nova/db/sqlalchemy/api.py |   88 ++++++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 40 deletions(-)

commit e360b881c7b1425bf73be3af9167d485d7f74a25
Merge: 1a5be71 f6039ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 17:51:05 2012 +0000

    Merge "Adds a bandwidth filter DB call."

commit 1a5be710241eb14840b202c797b7616a22f805bc
Merge: 0343585 a4223f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 17:17:34 2012 +0000

    Merge "KVM and XEN Disk Management Parity"

commit f6039add96207e07f6b0a30420d130075e5ce196
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 24 11:09:44 2012 -0600

    Adds a bandwidth filter DB call.
    
    Change-Id: I7721bae1af900c215552f547e125c2b1e60b271e

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

commit 0343585f790939bf9d611feb65ed8557b3173d75
Merge: 91bc67d 6efb006
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 16:57:13 2012 +0000

    Merge "Remove deprecated serialization code."

commit a4223f1d89ea7033cbae35790a0411ec439cdb6d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jan 6 12:57:37 2012 -0800

    KVM and XEN Disk Management Parity
    
    Implements blueprint disk-configuration-parity
    
    This change splits local_gb into root_gb and ephemeral_gb. libvirt
    interpreted local_gb as what ephemeral_gb is now, whereas XenAPI
    interpreted local_gb as what root_gb is now.
    
    Change-Id: I496600991bac1e990326d4ded1607fee08209d68

 nova/api/ec2/admin.py                              |    2 +-
 nova/api/metadata/handler.py                       |    7 +-
 .../compute/contrib/simple_tenant_usage.py         |    2 +-
 nova/api/openstack/compute/flavors.py              |    2 +-
 nova/api/openstack/compute/views/flavors.py        |    2 +-
 nova/compute/api.py                                |   11 +-
 nova/compute/instance_types.py                     |    5 +-
 nova/compute/manager.py                            |   16 +-
 nova/db/sqlalchemy/api.py                          |    4 +-
 .../versions/074_change_flavor_local_gb.py         |  130 ++++++++
 .../migrate_repo/versions/074_sqlite_upgrade.sql   |  313 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    8 +-
 nova/flags.py                                      |    6 +-
 nova/scheduler/host_manager.py                     |    2 +-
 nova/scheduler/manager.py                          |   22 +-
 nova/tests/api/ec2/test_admin.py                   |    2 +-
 .../compute/contrib/test_simple_tenant_usage.py    |    8 +-
 nova/tests/api/openstack/compute/test_consoles.py  |    2 +-
 nova/tests/api/openstack/compute/test_flavors.py   |    6 +-
 .../api/openstack/compute/test_server_actions.py   |    2 +-
 nova/tests/api/openstack/fakes.py                  |    3 +-
 nova/tests/db/fakes.py                             |   17 +-
 nova/tests/fake_network.py                         |    2 +-
 nova/tests/scheduler/fakes.py                      |   18 +-
 nova/tests/scheduler/test_distributed_scheduler.py |   12 +-
 nova/tests/scheduler/test_host_filters.py          |   15 +-
 nova/tests/scheduler/test_scheduler.py             |   24 +-
 nova/tests/test_compute.py                         |   23 +-
 nova/tests/test_compute_utils.py                   |    2 +
 nova/tests/test_instance_types.py                  |   46 +--
 nova/tests/test_instance_types_extra_specs.py      |    3 +-
 nova/tests/test_libvirt.py                         |    6 +-
 nova/tests/test_quota.py                           |   10 +-
 nova/tests/test_xenapi.py                          |  103 ++++++-
 nova/tests/utils.py                                |    4 +-
 nova/tests/vmwareapi/db_fakes.py                   |   12 +-
 nova/tests/xenapi/stubs.py                         |   10 +
 nova/utils.py                                      |    2 +-
 nova/virt/disk/api.py                              |    2 -
 nova/virt/libvirt.xml.template                     |    4 +-
 nova/virt/libvirt/connection.py                    |   45 ++-
 nova/virt/xenapi/vm_utils.py                       |   65 ++--
 nova/virt/xenapi/vmops.py                          |   19 +-
 43 files changed, 807 insertions(+), 192 deletions(-)

commit 682809e2c9bac2c4c1fa759e8e9f8598df424423
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Tue Jan 24 10:32:54 2012 -0600

    Tweak api-paste.ini to prepare for a devstack change
    
    This is a follow-on to https://review.openstack.org/3135 that changes
    the Keystone middleware.  Devstack's https://review.openstack.org/3333
    requires this change to work properly.
    
    Change-Id: If439cd5c27be2026b9c1db1747acb01b893a60b4

 etc/nova/api-paste.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6efb006beb657af93832753833a8820c411e8f88
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jan 24 10:41:16 2012 -0600

    Remove deprecated serialization code.
    
    Last piece of blueprint extension-refactor.  Removes deprecated
    compatibility code for setting serializers and deserializers on
    Resource objects.
    
    Change-Id: I3864cc80e3edda4fe4071ae31afadede2c78e95d

 nova/api/openstack/compute/__init__.py |    4 +---
 nova/api/openstack/extensions.py       |    5 +----
 nova/api/openstack/volume/__init__.py  |    4 +---
 nova/api/openstack/wsgi.py             |   23 ++++-------------------
 4 files changed, 7 insertions(+), 29 deletions(-)

commit 91bc67d81a9711fbf5a0f0c46bbf1d87232391f8
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Jan 23 18:25:34 2012 -0800

    Add affinity filters
    updated to use scheduler_hints and have non-douchey names
    
    Change-Id: I4fa22980a28e4a051176f1426a571f37fb5f118e

 nova/scheduler/filters/__init__.py        |    5 +-
 nova/scheduler/filters/affinity_filter.py |   81 ++++++++++++++++++++++++++++
 nova/tests/scheduler/fakes.py             |   29 ++++++++++
 nova/tests/scheduler/test_host_filters.py |   84 +++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 1 deletion(-)

commit fa10e7ad5b3f6ab5de5b7b187da7a8bf05a263d5
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Jan 24 14:25:26 2012 +0100

    Do not output admin_password in debug logs
    
    Sanitize run_instance's admin_password argument from
    nova.rpc 'received' debug logging. Fixes bug 915025.
    
    Change-Id: I9004dee422a9e5411b8e440ab80030849d137dab

 nova/rpc/common.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0fc18408d93aa30a2cb2650951dc1171b4ef6bcd
Merge: 7d9d2ec 2a43fbd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 07:22:06 2012 +0000

    Merge "Add floating IP support to Quantum Manager"

commit 7d9d2ec38747e6683ec97cd7c1af2e98eb82ea56
Merge: b8f7857 48f4e14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 07:11:26 2012 +0000

    Merge "Fixed limiting for flavors"

commit b8f78573138ef74ebff0d28f480f5f84e3d7a7d3
Merge: b160d73 23990a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 06:57:52 2012 +0000

    Merge "API version check cleanups"

commit 8279240ee30d55d127e4d964a9861b721ac7cc74
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Fri Jan 20 16:39:41 2012 -0600

    Handle error in associate floating IP (bug 845507)
    
    * Raise NoFloatingIpInterface when associate floating IP has an
      interface that doesn't exist.
    * Return 500 Internal server Error, indicate only that associate
      action failed
    
    Change-Id: I6b032f7554795de64bce8e669d20269210c62e33

 nova/api/openstack/compute/contrib/floating_ips.py |    3 +++
 nova/exception.py                                  |    4 +++
 nova/network/api.py                                |    2 +-
 nova/network/manager.py                            |   27 +++++++++++++++-----
 nova/tests/test_network.py                         |   17 ++++++++++++
 5 files changed, 46 insertions(+), 7 deletions(-)

commit b160d731b5dff65ba887578ad8fe4d7403426613
Merge: f496316 a47b527
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 01:12:36 2012 +0000

    Merge "Brings back keystone middleware"

commit f4963167bedc92e4c33f9de116215f1baec0d670
Merge: aaa7f7e 151632e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 00:44:09 2012 +0000

    Merge "Fixes nova-manage fixed list."

commit a47b5276244dba9c0a9058e6868522cf3fb3cada
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 11 10:42:00 2012 -0800

    Brings back keystone middleware
    
     * Adds ec2 auth middleware
     * Adds keystonecontext middleware
     * Notes alternative configurations in paste config
     * Fixes nova portion of bug 917408
    
    Change-Id: I9909d6d235445b1413d1cc0fb61e99e1ab819438

 etc/nova/api-paste.ini   |   36 +++++++++++++++++++++++++--
 nova/api/auth.py         |   41 ++++++++++++++++++++++++++++++
 nova/api/ec2/__init__.py |   62 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 2 deletions(-)

commit aaa7f7ed456cb9103b07ae629492f3a343ace9d8
Merge: c9c6e96 ccbc940
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 23:41:28 2012 +0000

    Merge "Remove sensitive info from rpc logging."

commit ccbc940211c348940ca9766ef60328302a080f9a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 23 23:08:04 2012 +0000

    Remove sensitive info from rpc logging.
    
    Fixes bug 920687
    
    Change-Id: Ic83145adcfe73c29a85e7916f2fda48d1bb5ccea

 nova/rpc/common.py      |   17 +++++++++++++++++
 nova/rpc/impl_carrot.py |    2 +-
 nova/rpc/impl_kombu.py  |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

commit c9c6e967b9d09bb9d1212bd3880fe140a7cad84f
Merge: 9019b09 c13078b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 22:44:12 2012 +0000

    Merge "Error out instance on set password failure."

commit 9019b096e3c2eef33c08402b7775dc333521ce82
Merge: 61758c4 ed1e6d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 22:13:36 2012 +0000

    Merge "Remove deprecated extension code."

commit c13078bc0f1935817d978ddbc2439571a85372b0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 23 22:10:49 2012 +0000

    Error out instance on set password failure.
    
    Fixes bug 920643
    
    Change-Id: Ieb4724d44f50c217ce5f25d809c40ca6c6cdeed8

 nova/virt/xenapi/vmops.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 48f4e140ec929d8abec6145088df9db758ecda9a
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Mon Jan 23 15:03:00 2012 -0500

    Fixed limiting for flavors
    
    Fixes bug #912922
    Change-Id: Iea5a070b83e35fe19480e1bd4ee96f2a67a7c0d3

 nova/api/openstack/common.py                     |    7 +-
 nova/api/openstack/compute/flavors.py            |    7 +-
 nova/api/openstack/compute/views/flavors.py      |   23 +++---
 nova/tests/api/openstack/compute/test_flavors.py |   82 ++++++++++++++++++++++
 4 files changed, 106 insertions(+), 13 deletions(-)

commit 61758c4acb132ceb9f25c08db531e0360f44ff6a
Merge: 2027fac 3172868
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 21:39:36 2012 +0000

    Merge "ComputeNode Capacity support"

commit 2027fac86b61554e3d7d58f6e39f1b6c27bfe426
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 20 15:49:46 2012 -0800

    Adds availability zone filter
    
    Change-Id: Ic6cb2ddfb6ab6ffa787364d7960738a3eb226fad

 nova/scheduler/filters/__init__.py                 |    1 +
 nova/scheduler/filters/availability_zone_filter.py |   30 ++++++++++++++++++++
 nova/scheduler/host_manager.py                     |    6 +++-
 nova/tests/scheduler/test_host_filters.py          |   27 ++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)

commit 1bb45d07a2ce0747e338350a286e788d11447e21
Merge: 152da40 972fc7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 20:12:59 2012 +0000

    Merge "Adds isolated hosts filter"

commit 151632ed3a8dfd8da1812e738aca16187dec1175
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jan 23 14:51:24 2012 -0500

    Fixes nova-manage fixed list.
    
    Updates the nova-manage to use db.instance_get_all for instance
    information instead of relying on Sqlalchemy model relationships
    (which no longer exist due to network refactorings).
    
    This commit fixes 'nova-manage fixed list' so that it correctly
    displays hostname, and host. I dropped the MAC address column
    which would have required an extra VIF's table lookup and
    wasn't used as much.
    
    Fixes LP Bug #920159.
    
    Change-Id: I3cec690c5e40631e0f10b2a914f46863601a1734

 bin/nova-manage |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit 152da40a0651bfbdeb748c249e771c10e716c79c
Merge: ba5a60b a6cae3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 19:33:11 2012 +0000

    Merge "Add context and request spec to filter_properties"

commit ba5a60bdaf6697ac52d80b40b763da6c75b6efc7
Merge: a51b664 af47d85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 19:03:56 2012 +0000

    Merge "Support filter based on CPU core (over)allocation"

commit a51b664c43999fc15d25433221a50098ea1a8e15
Merge: 28b7107 c48fbe9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 18:36:31 2012 +0000

    Merge "Add a specific filter for kill commands"

commit 28b7107c681f1883794c34a26e69f357ae8fd7a5
Merge: 84e1750 bfdb9b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 18:26:16 2012 +0000

    Merge "Fix environment passing in DnsmasqFilter"

commit 84e175097358bc162816a80be8eb1f7497b2bb30
Merge: b3a41b7 e3451ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 18:14:48 2012 +0000

    Merge "Cleanups for rootwrap module"

commit 23990a3f397b508cb2fd049ae23b1d019a692335
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Mon Jan 23 16:10:09 2012 +0000

    API version check cleanups
    
    nova/api/openstack/auth.py: Remove the redundant version check.
    nova/openstack/common.py: Fixup the comments to match the code
    
    Change-Id: I2514da854afb55d67d24adf76b227ef5a70814b9

 nova/api/openstack/auth.py   |    8 +++-----
 nova/api/openstack/common.py |    4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

commit 317286832f1e27c6cce49e056f101db967201e3d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 13 15:27:41 2011 -0800

    ComputeNode Capacity support
    
    The table represents the current state of compute nodes and will be
    used by the scheduler when selecting a host.
    
    Re: https://blueprints.launchpad.net/nova/+spec/scaling-zones
    
    This is just the db & notification portion of the branch. The scheduler
    portion is being deferring until comstuds branch gets merged since it
    conflicts heavily.
    
    NOTE: Compute notifications are now two-part.
    There is a compute.instance.XXX.start event and a compute.instance.XXX.end
    message instead of the previous compute.instance.XXX event (which is
    the same as the .end message)
    
    Change-Id: Ia8e68680cb0924c59df84f2eec858febf4926d65

 nova/compute/manager.py                            |   79 +++++-----
 nova/db/api.py                                     |   23 ++-
 nova/db/sqlalchemy/api.py                          |  160 +++++++++++++++++++-
 .../migrate_repo/versions/073_add_capacity.py      |   45 ++++++
 nova/db/sqlalchemy/models.py                       |   10 ++
 nova/notifier/capacity_notifier.py                 |   81 ++++++++++
 nova/tests/notifier/test_capacity_notifier.py      |   59 ++++++++
 nova/tests/test_compute.py                         |   25 ++-
 nova/tests/test_db_api.py                          |   99 +++++++++++-
 nova/tests/test_utils.py                           |    4 +-
 nova/utils.py                                      |    2 +
 nova/virt/fake.py                                  |    9 +-
 nova/virt/libvirt/connection.py                    |    2 +-
 nova/virt/xenapi_conn.py                           |    2 +-
 14 files changed, 542 insertions(+), 58 deletions(-)

commit 2cf8b77c6933a5294c6f75591544651bee36c9a0
Author: John Garbutt <john.garbutt@citrix.com>
Date:   Thu Jan 19 17:04:36 2012 +0000

    blueprint host-aggregates: maintenance operations to host OSAPI exts
    
    This commit introduces sub for a host maintenance_mode option into
    the osapi. It is required for the host aggregates work.
    
    This is part of a series of commits that have started with change:
    https://review.openstack.org/#change,3035
    
    Change-Id: Ib462ef9ad6b641bf1083cc176dfba6645020ccec

 Authors                                            |    1 +
 nova/api/openstack/compute/contrib/hosts.py        |    8 +++-
 .../api/openstack/compute/contrib/test_hosts.py    |   43 +++++++++++++++++++-
 3 files changed, 49 insertions(+), 3 deletions(-)

commit c48fbe9843ea1f119e8183a761eea676c94d0992
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jan 23 14:02:23 2012 +0100

    Add a specific filter for kill commands
    
    Use a specific KillFilter to restrict kill commands run as root.
    This implementation checks the signals and the executables
    actually affected, using procfs. Fixes bug 918226.
    
    Change-Id: I6f220d741423c4b8e0e792b647760b3ef521b9b2

 nova/rootwrap/compute.py         |    5 ++++-
 nova/rootwrap/filters.py         |   34 ++++++++++++++++++++++++++++++++++
 nova/rootwrap/network.py         |    5 ++++-
 nova/tests/test_nova_rootwrap.py |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 2 deletions(-)

commit bfdb9b1f5e197a0d2f76f7d32835c521e5b30d6f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jan 23 11:17:34 2012 +0100

    Fix environment passing in DnsmasqFilter
    
    Fix environment passing in DnsmasqFilter so that dnsmasq can
    be run as root through nova-rootwrap. Fixes bug 919275.
    
    Change-Id: I2e78d92b9af4ddea9c0f1c5ddbe2d55fb672310e

 bin/nova-rootwrap                |    3 ++-
 nova/rootwrap/filters.py         |   12 +++++++++++-
 nova/tests/test_nova_rootwrap.py |    8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

commit e3451ac3098adf64480d07d4c29ecf7412afb88c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jan 23 11:09:41 2012 +0100

    Cleanups for rootwrap module
    
    Imports cleanup (to follow HACKING conventions) and rename
    of a test function for naming consistency.
    
    Change-Id: I57742ecb35e078cf72e4edb42dfe79ea40348997

 nova/rootwrap/compute.py         |   72 +++++++++++++++++++-------------------
 nova/rootwrap/network.py         |   32 ++++++++---------
 nova/rootwrap/volume.py          |   20 +++++------
 nova/rootwrap/wrapper.py         |    2 +-
 nova/tests/test_nova_rootwrap.py |   26 +++++++-------
 5 files changed, 76 insertions(+), 76 deletions(-)

commit b3a41b7229ae785af8f35910d0decede03f2ff2b
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Jan 22 15:44:12 2012 -0500

    Fix 'nova-manage config list'
    
    Fixes nova-manage config list to work with the latest flags
    implementation in nova Essex. Fixes LP bug #920157.
    
    Change-Id: I3321dc68e4a571354d62836b39f887b0fc2e9877

 bin/nova-manage |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c233b8eaafe01cdaabb02a181d73c85a7d37ce17
Merge: ec1b11f ccc2471
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 20:42:23 2012 +0000

    Merge "Fixes bug #919390 - Block Migration fails when keystone is un use."

commit a6cae3ce38e763d190e0f9d9680d44c1ecd11711
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 20 15:46:33 2012 -0800

    Add context and request spec to filter_properties
    
    Change-Id: Iebece7fac9c980ef32e37a8b01b505340e5d12b0

 nova/scheduler/distributed_scheduler.py            |   21 ++++++++++----------
 nova/tests/scheduler/fakes.py                      |   12 ++++++-----
 nova/tests/scheduler/test_distributed_scheduler.py |   19 ++++++++++--------
 3 files changed, 28 insertions(+), 24 deletions(-)

commit ec1b11fe619a1d0f44121fc127094108da592173
Merge: 4fa5866 7b94f66
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 19:12:24 2012 +0000

    Merge "Pull out ram_filter into a separate filter"

commit 4fa5866df4b79d3e38da8dd3ee76483c1ee7d1a5
Merge: e788bb2 26b7c43
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 15:29:13 2012 +0000

    Merge "Make start_instance cast directly to compute host"

commit e788bb259d527f6b40785922a3e002e8e102ad22
Merge: bb4c575 703e1d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 15:19:56 2012 +0000

    Merge "ERROR out instance if unrescue fails."

commit bb4c5757ef843529ef17ba8f99fa822eb2c2b112
Merge: 727b3b7 d70793b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 14:50:39 2012 +0000

    Merge "Refactor compute api messaging calls to compute manager"

commit 727b3b7f86d8cb4d7a75dc6a0820b6f47387ff88
Merge: 255ce80 ab25280
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 22 14:41:08 2012 +0000

    Merge "Fix xenapi rescue without swap."

commit 255ce807236e9cdfd61357208fbb12b3453b109d
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Jan 21 17:31:24 2012 -0500

    Allow compute manager prep_resize to accept kwargs
    
    Fixes issues when trying to resize instances. Fixes LP bug #919642.
    
    Change-Id: I411d29404902c377088750e1ae4560b8a419d4f2

 nova/compute/manager.py    |    2 +-
 nova/tests/test_compute.py |   21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

commit ae13abc51818792dcf0fc895eaad442dd41f54d2
Merge: dad0953 8333a15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 21 19:47:29 2012 +0000

    Merge "Fix nova-manage floating list (fixes bug 918804)"

commit 972fc7d80fae386cf4c72b7891f6601d6f7fb00b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 20 23:15:33 2012 -0800

    Adds isolated hosts filter
    
     * Also removes a couple of duplicate tests
    
    Part of a series of commits that are moving all of the filtering
    done in simple scheduler into hosts filters so we can default to
    the distributed scheduler.
    
    Change-Id: I63b05d0c6476ff0ab9cc17e3e6c39f81bec37d77

 nova/flags.py                                   |    2 +
 nova/scheduler/filters/__init__.py              |    1 +
 nova/scheduler/filters/isolated_hosts_filter.py |   33 +++++++++++
 nova/scheduler/simple.py                        |    2 -
 nova/tests/scheduler/test_host_filters.py       |   68 +++++++++++++++--------
 5 files changed, 80 insertions(+), 26 deletions(-)

commit 26b7c43ca1fe94f937d6a6d89b3114ce9931c74d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Jan 21 08:04:19 2012 +0000

    Make start_instance cast directly to compute host
    
    Fixes bug 918615
    
    start_instance doesn't need to go through scheduler because it still has
    instance['host'] set and resources are still accounted for in the
    scheduler, which means there's still room to restart it on its assigned
    host (even though it is deleted from the virt layer)
    
    Change-Id: I3cdd73b7ad2297b57f7e36be84819ff233ac8f08

 nova/compute/api.py                          |    6 +----
 nova/scheduler/manager.py                    |   32 ++++++++++++--------------
 nova/scheduler/multi.py                      |    1 -
 nova/scheduler/simple.py                     |    7 ------
 nova/tests/scheduler/test_multi_scheduler.py |    7 ++++--
 nova/tests/scheduler/test_scheduler.py       |   28 ----------------------
 6 files changed, 21 insertions(+), 60 deletions(-)

commit d70793b5bb86b91ab6ad2a3e03832f1f6171c081
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Jan 21 07:40:24 2012 +0000

    Refactor compute api messaging calls to compute manager
    
    API's calls to compute manager all use instance_uuid now.  That allows
    us to refactor _cast_compute_message and make everything use it.
    
    This removes an extra DB call in a lot of cases where we already had the
    instance object, but then passed an instance_uuid into _cast_compute_message
    with no host, where it would look the object up again.
    
    Change-Id: Ia0739efcab0ca362c5bb89cd45c920bf762098f3

 nova/compute/api.py                                |  212 +++++++++-----------
 .../api/openstack/compute/test_server_actions.py   |    2 +-
 nova/tests/api/openstack/compute/test_servers.py   |    5 -
 nova/tests/test_compute.py                         |    5 +
 4 files changed, 99 insertions(+), 125 deletions(-)

commit dad0953ff5675831d84f9c28c7d5a93e42204233
Merge: ee75f9e 7487bae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 21 05:40:00 2012 +0000

    Merge changes I964abb76,If67416e3
    
    * changes:
      Refactor test_scheduler into unit tests
      Forgot to update chance scheduler for ignore_hosts change

commit ee75f9efb4d69bca400ad4b5a2c901540963ebb4
Merge: c7646aa d7448fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 21 05:18:26 2012 +0000

    Merge "Handle FlavorNotFound on server list w/ filter"

commit 7487bae4bc7937dc6f744c893fcc7a0340f70a6b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jan 20 20:19:15 2012 -0800

    Refactor test_scheduler into unit tests
    
    Also adds a service_is_up test for utils/service_is_up, which used to be
    in the scheduler.
    
    Minor bug spotted when doing tests, also, with live migration.  Was
    checking 'launched_on' host when should be checking current host.
    
    Change-Id: I964abb767d619afbd90da549b267d8a9d7c31fc1

 nova/scheduler/driver.py                      |    5 +-
 nova/tests/scheduler/fakes.py                 |    5 +
 nova/tests/scheduler/test_chance_scheduler.py |  146 +-
 nova/tests/scheduler/test_multi_scheduler.py  |  107 ++
 nova/tests/scheduler/test_scheduler.py        | 2534 ++++++++++---------------
 nova/tests/scheduler/test_vsa_scheduler.py    |  135 +-
 nova/tests/test_utils.py                      |   34 +
 7 files changed, 1387 insertions(+), 1579 deletions(-)

commit 15af999fbd7b3532b92f4cba54bdd25e89677eb6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jan 20 19:49:04 2012 -0800

    Forgot to update chance scheduler for ignore_hosts change
    
    Change-Id: If67416e30b8cfe12de6fdc5c151899fd0a56225c

 nova/scheduler/chance.py                      |   15 +++++----------
 nova/tests/scheduler/test_chance_scheduler.py |   16 +++++++++-------
 2 files changed, 14 insertions(+), 17 deletions(-)

commit c7646aa88d564694b99a569c3cdd2c7ffbbb745d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jan 20 15:12:01 2012 -0800

    Add SchedulerHints compute extension
    
    This allows arbitrary key/values to be passed in on a compute create
    request or rebuild/resize action. That data will be made available to the
    compute api as a filter_properties dictionary.
    
    Change-Id: Ie2ec57dcbc0d1d178e06606cb41027f9e46719a2

 .../openstack/compute/contrib/scheduler_hints.py   |   65 ++++++++++++
 nova/api/openstack/compute/servers.py              |    4 +-
 nova/compute/api.py                                |    9 +-
 .../compute/contrib/test_scheduler_hints.py        |  103 ++++++++++++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 5 files changed, 178 insertions(+), 4 deletions(-)

commit 2a43fbd0e5017b281d9986312775b4ea6aa2f294
Author: Brad Hall <brad@nicira.com>
Date:   Fri Jan 20 17:39:34 2012 -0800

    Add floating IP support to Quantum Manager
    
    Change-Id: Iaddaed338b30612bf664e19b5235f99640e53889
    blueprint: nova-parity-floating

 nova/network/quantum/manager.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit af47d85f020c3455eb8f4efd824b8da14289dd9b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jan 19 21:56:58 2012 -0800

    Support filter based on CPU core (over)allocation
    
    Change-Id: Ieb15c71e7a335fc642687fe59a3cc2f9929ade26

 nova/scheduler/filters/__init__.py                 |    1 +
 nova/scheduler/filters/core_filter.py              |   46 ++++++++++++++++++++
 nova/scheduler/host_manager.py                     |    6 +++
 nova/tests/scheduler/fakes.py                      |   22 +++++-----
 nova/tests/scheduler/test_distributed_scheduler.py |    5 ++-
 nova/tests/scheduler/test_host_filters.py          |   22 ++++++++++
 6 files changed, 89 insertions(+), 13 deletions(-)

commit dc0f299337cf8cdd4f5ddcfbb4b99feebc12986e
Author: Dave Lapsley <dlapsley@nicira.com>
Date:   Fri Jan 20 17:44:08 2012 -0500

    bug 917397
    
    Add configuration sanity to QuantumManager. Logs error message
    if a parameter not used by QuantumManager's create_networks()
    method is passed into it.
    
    Change-Id: I1d6daa7f77590a61b542122ada33ed1c188df19f

 Authors                         |    1 +
 nova/network/quantum/manager.py |   46 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

commit 16ea348a1623f055809d0d9b7fe9f046515b5dd1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 20 15:28:39 2012 -0800

    Add option to force hosts to scheduler
    
    Change-Id: I7364115e247ebeb441fa838ac66db5ef5f608b55

 nova/compute/api.py                       |   22 ++++++++++++++++++----
 nova/flags.py                             |    2 ++
 nova/scheduler/host_manager.py            |    3 +++
 nova/scheduler/simple.py                  |    2 --
 nova/tests/scheduler/test_host_manager.py |   20 ++++++++++++++++++--
 5 files changed, 41 insertions(+), 8 deletions(-)

commit 248aa0cdc3b324fab1f7da5dc665f7852b8aa7d2
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Sat Jan 21 01:05:22 2012 +0000

    Change the logic for deleting a record dns_domains.
    
    Since keys are just the domain name, we need to be able
    to reuse them.  That means we have to do a real record
    deletion to free up namespace rather than just mark the
    records as deleted.
    
    For blueprint public-and-private-dns.
    
    Change-Id: If47e961cf2cb977d297b506bd397f1a438499f18

 nova/db/sqlalchemy/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d7448fc86a929226a34e92ef77684441f451edaf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jan 20 17:02:19 2012 -0800

    Handle FlavorNotFound on server list w/ filter
    
    Fix bug 919426
    
    Change-Id: I1f450fd7ed28837b664aa81f4dd833e3433cd126

 nova/compute/api.py        |   16 +++++++++++++---
 nova/tests/test_compute.py |    6 +++---
 2 files changed, 16 insertions(+), 6 deletions(-)

commit 703e1d580f1571730717b6d34f6207ae07b5d5fc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 20 23:40:26 2012 +0000

    ERROR out instance if unrescue fails.
    
    Fixes bug 919444
    
    Change-Id: I8545e9c4f9fb3e7dbe95dddb01ada30d3f1402fa

 nova/compute/manager.py |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit ab252806c97c2983921ed045bc790b5db984da68
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 20 23:24:02 2012 +0000

    Fix xenapi rescue without swap.
    
    Fixes bug 851307
    
    Change-Id: I525fbac359f6f74cd17a9c40a9a52120d068a800

 nova/virt/xenapi/vmops.py |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 7b94f660f41b03d175ae5e89b6dffc69550443d2
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Jan 19 22:18:09 2012 -0800

    Pull out ram_filter into a separate filter
    
    Change-Id: Id38bbd0e8dbcd00fee836d555005b954973ae90c

 nova/scheduler/filters/__init__.py        |    1 +
 nova/scheduler/filters/compute_filter.py  |    8 -------
 nova/scheduler/filters/ram_filter.py      |   36 +++++++++++++++++++++++++++++
 nova/scheduler/host_manager.py            |    2 +-
 nova/tests/scheduler/test_host_filters.py |    4 ++--
 5 files changed, 40 insertions(+), 11 deletions(-)

commit 1bf066c59bbfe40a30e498f2b24fdddd82fb2508
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jan 20 10:36:00 2012 -0800

    pass filter_properties into scheduling requests for run_instance
    
    Cleans up the resize stuff for avoiding a host
    Allows for user-specified or compute-specified filters.
    
    Change-Id: I0c6066240f602788eff1e0b5856ac52c03a4ebf0

 nova/compute/api.py                                |   24 +++++++------
 nova/scheduler/distributed_scheduler.py            |   15 +++-----
 nova/tests/scheduler/test_distributed_scheduler.py |   38 +++-----------------
 nova/tests/test_compute.py                         |    6 ++--
 4 files changed, 28 insertions(+), 55 deletions(-)

commit ccc2471f3e8fd4f5fc0572b4f29c579022f984a7
Author: Kiall Mac Innes <kiall@managedit.ie>
Date:   Fri Jan 20 20:55:44 2012 +0000

    Fixes bug #919390 - Block Migration fails when keystone is un use.
    
    I've Updated the calls to nova.virt.libvirt.utils.fetch_image() to match the rest of the class.
    
    Additionally, nova.virt.images.fetch() currently makes no use of the user/project id supplied.
    
    Change-Id: I2db4b8c1b6542909fcc2b452fc961e22fe2557bf

 Authors                         |    1 +
 nova/virt/libvirt/connection.py |   11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

commit 8333a1533c201a7aead2b9e422dea13a0c9e7a97
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Tue Jan 17 12:30:59 2012 -0600

    Fix nova-manage floating list (fixes bug 918804)
    
    https://review.openstack.org/2922 broke nova-manage floating list
    * Restore db.floating_ip_get_all
    * Update instance display in nova-manage
    
    Change-Id: I526237401371a21eafbd9b571f9b4a17a534c1c6

 bin/nova-manage           |   10 ++++++----
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    8 ++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

commit fd1aa4613b9a644ad2d702ac2d15cf12cef589c5
Merge: 2f14816 e9a5dfe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 20 19:17:49 2012 +0000

    Merge "nova/network: pass network_uuid to linuxnet_interface_driver and vif driver"

commit 2f14816aa2a55d686f043d18299500190adf98c6
Merge: e79a88e 41dcab9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 20 19:08:16 2012 +0000

    Merge "Allow Quantum Manager to run in "Flat" mode."

commit e79a88e9ff00ee3ca54620210bea8050820fa1ab
Merge: 91e019f 78f6d9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 20 18:57:44 2012 +0000

    Merge "Fix missing imports and bad call caught by pyflakes"

commit 91e019f76746206e109b15957b2bdf59fbf15bcf
Merge: 889a521 35df99c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 20 18:47:09 2012 +0000

    Merge "Drop FK constraint if it exists in migration 064"

commit 889a5215842839342fdbe5b2cb2c7d9053ac36b5
Merge: c56630c 942f040
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 20 18:37:20 2012 +0000

    Merge "Validating image id for rebuild."

commit 68c140d05a5d16b8409e4d7aaf84796accdaf2a3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jan 20 12:33:36 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I6cc540e666abcb319acb5a0d653a7ef35ed401b1

 po/bs.po    |  441 +++++++++++++++++----------------
 po/pt_BR.po |  795 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 627 insertions(+), 609 deletions(-)

commit c56630c421867df61875a83adfd99ec931896fe7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jan 19 21:36:42 2012 -0800

    scheduler host_manager needs service for filters
    
    distributed scheduler isn't checking service_is_up or
    services['disabled'] due to filters not having access to service.
    
    Fixed both.  Since ec2 API also uses service_down_time, I moved
    service_is_up() into utils and made ec2 use it.
    
    Change-Id: I0321844a47031b2de4d8738e032a4634edd1e945

 nova/api/ec2/cloud.py                      |    4 +-
 nova/flags.py                              |    3 +
 nova/scheduler/driver.py                   |   18 +---
 nova/scheduler/filters/compute_filter.py   |    6 +-
 nova/scheduler/filters/json_filter.py      |    7 +-
 nova/scheduler/host_manager.py             |    8 +-
 nova/scheduler/simple.py                   |    9 +-
 nova/scheduler/vsa.py                      |    2 +-
 nova/tests/scheduler/fakes.py              |   12 ++-
 nova/tests/scheduler/test_host_filters.py  |  124 +++++++++++++++++++++++-----
 nova/tests/scheduler/test_host_manager.py  |    6 ++
 nova/tests/scheduler/test_vsa_scheduler.py |    8 +-
 nova/utils.py                              |    8 ++
 13 files changed, 158 insertions(+), 57 deletions(-)

commit 41dcab9cac2dbad330fb255babdd21925fc9b744
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jan 19 17:44:28 2012 -0600

    Allow Quantum Manager to run in "Flat" mode.
    
    Fixes LP918976
    
    Change-Id: I587a48e26e8edc3f813dcd1db8f0357894718b3b

 nova/network/quantum/manager.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 64341eedf993c0738dcd42fb41fd193c184f3464
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Dec 21 20:52:13 2011 -0500

    aws/ec2 api validation
    
    Adds middleware to validate user-input to the aws/ec2 api.
    This patch is a port to gerrit of this launchpad merge request:
        https://code.launchpad.net/~u-matt-h/nova/aws-api-validation/+merge/71962
    
    blueprint aws-api-validation
    bug 813685
    
    Code started by Matthew Hooker, fixes by Joe Gordon
    
    Change-Id: I9346ecd5e5051cb0126c13f7c771173bc23959b9

 etc/nova/api-paste.ini           |    7 +-
 nova/api/ec2/__init__.py         |   45 +++++++++++-
 nova/api/validator.py            |  144 ++++++++++++++++++++++++++++++++++++++
 nova/tests/api/test_validator.py |  114 ++++++++++++++++++++++++++++++
 4 files changed, 306 insertions(+), 4 deletions(-)

commit 7265a71d998d5a6a4fc2a7f060178e365c882ca5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jan 19 18:02:13 2012 -0500

    Fix for bug 918502
    
    The previous fix for this did not take, this change has a test and
    should once and for all solve this issue.
    
    Change-Id: Ieb4def28dce4f1f993a2af87425bd280185456ab

 nova/compute/manager.py    |    2 +-
 nova/tests/test_compute.py |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

commit ed1e6d792c5b37576640acd3e174c8a733c96b61
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jan 19 16:20:04 2012 -0600

    Remove deprecated extension code.
    
    The recent extensions refactoring (blueprint extension-refactor)
    deprecated ActionExtension and RequestExtension, replacing them with
    ControllerExtension.  This patch completes the deprecation by
    removing those classes and all related support infrastructure,
    including ExtensionMiddleware and LazySerializationMiddleware.  (The
    classes remain, as deprecated do-nothing stubs, for compatibility
    with existing api-paste.ini files.)
    
    Change-Id: I8272ac3cf432813d749db67b2e1ad1a72abbb784

 etc/nova/api-paste.ini                             |   15 +-
 nova/api/openstack/common.py                       |   26 --
 .../openstack/compute/contrib/floating_ip_pools.py |   37 +--
 nova/api/openstack/compute/contrib/keypairs.py     |    8 -
 nova/api/openstack/compute/contrib/zones.py        |   14 -
 nova/api/openstack/compute/extensions.py           |   25 +-
 nova/api/openstack/extensions.py                   |  274 +-------------------
 nova/api/openstack/volume/__init__.py              |    2 -
 nova/api/openstack/volume/extensions.py            |   24 +-
 nova/api/openstack/volume/snapshots.py             |   74 +++---
 nova/api/openstack/volume/types.py                 |   51 ++--
 nova/api/openstack/volume/volumes.py               |  133 ++++------
 nova/api/openstack/wsgi.py                         |  217 +---------------
 nova/api/openstack/xmlutil.py                      |   42 ---
 .../compute/contrib/test_admin_actions.py          |    4 +-
 .../openstack/compute/contrib/test_disk_config.py  |    5 +-
 .../compute/contrib/test_floating_ip_pools.py      |    4 +-
 .../compute/contrib/test_server_action_list.py     |    4 +-
 .../compute/contrib/test_server_diagnostics.py     |    4 +-
 .../api/openstack/compute/extensions/foxinsocks.py |   91 +++----
 .../tests/api/openstack/compute/test_extensions.py |   94 +++----
 nova/tests/api/openstack/compute/test_limits.py    |    3 +-
 nova/tests/api/openstack/fakes.py                  |   19 +-
 nova/tests/api/openstack/test_common.py            |   37 ++-
 nova/tests/api/openstack/test_wsgi.py              |  243 -----------------
 nova/tests/api/openstack/test_xmlutil.py           |   72 -----
 nova/tests/api/openstack/volume/test_snapshots.py  |    8 +-
 nova/tests/api/openstack/volume/test_types.py      |   12 +-
 nova/tests/api/openstack/volume/test_volumes.py    |   47 +---
 nova/tests/integrated/test_extensions.py           |    2 -
 30 files changed, 274 insertions(+), 1317 deletions(-)

commit 4f204a6d75f2d48608aeeafae20ab3bf8cbadf73
Merge: 4672ec7 c7d2f02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 19:51:11 2012 +0000

    Merge "Allow instances in 'BUILD' state to be deleted."

commit 942f0404a3d7052830cdc52c17c85de7cd3bc0da
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jan 18 19:31:01 2012 +0000

    Validating image id for rebuild.
    
    bug: 886701
    
    Change-Id: I20ad03edca390af9203569e02ae0c1af5bb7beaf

 nova/api/openstack/compute/servers.py              |    3 ++
 nova/compute/api.py                                |    8 +++++
 .../api/openstack/compute/test_server_actions.py   |   33 ++++++++++++++------
 3 files changed, 34 insertions(+), 10 deletions(-)

commit 4672ec7c95845ddd1df29ffa88848c22df512a42
Merge: 1d3651b 88090f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 19:30:17 2012 +0000

    Merge "More cleanup of Imports to match HACKING"

commit 1d3651b06a59d91549aff621991770db66206aaa
Merge: 4479189 811a6f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 18:30:25 2012 +0000

    Merge "Clarify error messages for admin passwords."

commit 44791896f4de5670d529db6ab45c9908eae58e75
Merge: 02502f5 c51c68c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 18:20:51 2012 +0000

    Merge "Log uuid when instances fail to spawn."

commit 88090f212aee5d1ef0d8ffe8efb7d88e1d295d84
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Jan 18 19:38:31 2012 -0800

    More cleanup of Imports to match HACKING
    
    Found using https://github.com/cloudscaling/nova-HACKING
    
    Change-Id: Iaf95d7c65d4c6ff1fa4b045d83a4266cc8f27efe

 bin/instance-usage-audit               |    6 ++----
 nova/api/ec2/apirequest.py             |    6 +++---
 nova/api/openstack/compute/limits.py   |    6 +++---
 nova/api/openstack/compute/versions.py |    4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

commit 02502f577481b77435f5cd15b253336205c90ba4
Merge: 4b2035f 12470a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 16:52:50 2012 +0000

    Merge "Removed references to FLAGS.floating_ip_dns_domains."

commit 4b2035fa61b57052ca17e325e3783099a482f6ae
Merge: f2027a6 65f3ebe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 16:25:54 2012 +0000

    Merge "Removed some vestigial default args from DNS drivers."

commit f2027a63a1f8aae1cb2105b3e10ae66318beef1d
Merge: 3a9018e 1eba47c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 16:08:58 2012 +0000

    Merge "Clean up crypto.py"

commit 3a9018e5221a189b7843a1ea99933724f4b4b67d
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Thu Jan 19 05:28:32 2012 -0500

    chmod nova-logspool
    
    Fixes bug #918612
    
    chmod 775 nova-logspool
    
    Change-Id: I7b773b2058c7180229d2d7b893d3c6aa3b02e4bb

 0 files changed

commit e9a5dfed06bd78f22eaf2edccb4856a5b48cce6a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jan 19 13:02:05 2012 +0900

    nova/network: pass network_uuid to linuxnet_interface_driver and vif driver
    
    This is preparation for Quantum ovs ryu driver which is proposed by
    https://blueprints.launchpad.net/quantum/+spec/ovs-driver-extension
    The ryu is available at https://github.com/osrg/ryu
    
    When ovs port is created, the related network information
    (including network uuid) is told to ryu.
    
    Change-Id: I88ca1ab9dda4c40d3f5cae4935fcc6f78cf68f28

 nova/network/manager.py         |    1 +
 nova/network/quantum/manager.py |    1 +
 2 files changed, 2 insertions(+)

commit 62cf8872a7c223debc4e73045460ee5c671a1cad
Merge: 1fd74af 52d58ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 07:18:28 2012 +0000

    Merge "Fix bug #917615"

commit 1fd74af1489d54e693c3a1869b97d72b78cecadc
Merge: a444e8f d69b64e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 19 06:48:29 2012 +0000

    Merge "Rename 'zone' to 'domain.'"

commit 1eba47cff9cce4e040203b2af8ad70776bf79d12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 18 21:51:30 2012 -0800

    Clean up crypto.py
    
     * Remove chained certs since we don't use them
     * Make get_vpn use the existing generate call instead of shell script
     * (Bonus: we can revoke vpn certs now)
    
    Change-Id: I8e118c5bd3dee6ba7c6a2a1390874b69008c436b

 nova/CA/genvpn.sh       |   36 -----------------------------------
 nova/crypto.py          |   48 +++++++++++++----------------------------------
 nova/tests/test_auth.py |    6 +-----
 3 files changed, 14 insertions(+), 76 deletions(-)

commit 78f6d9f15aa062ec9221410d65f6a08526b1d7a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 18 21:06:00 2012 -0800

    Fix missing imports and bad call caught by pyflakes
    
    Change-Id: Ib2735fff18d76152baa7f9c61af7ddf4594c722b

 nova/vnc/xvp_proxy.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 811a6f3f44acca3da53207a77f2e0ba6a6d59f16
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jan 18 22:18:55 2012 -0500

    Clarify error messages for admin passwords.
    
    Logs the instance uuid and a more clear error message when errors
    occur while setting admin passwords. Fixes LP bug #918502.
    
    Change-Id: I7d698ee87ac147cb5137cb77d0c0297a47507798

 nova/compute/manager.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c51c68c0163af9ae3e5795435a240589597c9648
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jan 18 22:01:24 2012 -0500

    Log uuid when instances fail to spawn.
    
    Update xenapi/vmops.py so it logs the UUID instead of the instance ID
    when instances fail to spawn. Fixes LP bug #918497.
    
    Change-Id: Id7f41ccb79d22df5d10a5d6d9822ff65dd459056

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 12470a324f70e8cb11b45e1f239f26b326b57f9c
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Wed Jan 18 18:13:47 2012 -0600

    Removed references to FLAGS.floating_ip_dns_domains.
    
    Now the availabable floating_ip_dns zones can be modified
    dynamically, and determined from the DNS driver and nova database.
    
    Change-Id: I0e02858e95085c868e8891f8f21d204472c46d33

 nova/flags.py              |    3 ---
 nova/network/ldapdns.py    |   13 ++++++++++++-
 nova/tests/test_network.py |    6 ++----
 3 files changed, 14 insertions(+), 8 deletions(-)

commit 65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Wed Jan 18 16:52:45 2012 -0600

    Removed some vestigial default args from DNS drivers.
    
    In an early design, the domain was optional for several
    DNS driver methods.  That would add some needless complexity
    to the drivers, and I never really implemented it anyway.
    
    For blueprint public-and-private-dns.
    
    Change-Id: Ia7b4c9ff7eaa9b6d8c1091a92bb7439941ac0a9f

 nova/network/dns_driver.py |    4 ++--
 nova/network/manager.py    |    6 ++++--
 nova/network/minidns.py    |    4 ++--
 nova/tests/test_network.py |    7 +++++--
 4 files changed, 13 insertions(+), 8 deletions(-)

commit a444e8ff39e11fb615127318b3f16d6275af9273
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Jan 18 14:54:22 2012 -0800

    Allow config of vncserver_proxyclient_address.
    
     * Improves deployment flexibility by allowing deployers to choose which address proxies like nova-xvpvncserver should use to to connect to instance proxies.  For xenserver, this will generally be the management ip of dom0.  For libvirt, this will be the management ip of the host.
     * Fixes bug 918451
     * Renames vncserver_host to vncserver_listen for slightly better usage clarity
     * Updates docs
    
    Change-Id: I85c9850c57ffac3dfecaec4510eb808a6a2af79c

 doc/source/runnova/vncconsole.rst |   12 +++++++++++-
 nova/virt/libvirt.xml.template    |    4 ++--
 nova/virt/libvirt/connection.py   |    5 +++--
 nova/virt/xenapi/vmops.py         |    6 ++----
 nova/vnc/__init__.py              |    8 ++++++--
 5 files changed, 24 insertions(+), 11 deletions(-)

commit d69b64e27c63439a1880fc951066045e623c696f
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Wed Jan 18 14:38:12 2012 -0600

    Rename 'zone' to 'domain.'
    
    This code was getting confusing because of the ambiguity
    between dns zones and openstack availability zones.  'Domain'
    seems a bit clearer than 'zone' in this context.
    
    For blueprint public-and-private-dns.
    
    Change-Id: I1d420be2e6f2054ee4392ce762775ece20a823b3

 doc/source/api_ext/ext_floating_ip_dns.rst         |   30 ++---
 etc/nova/policy.json                               |    2 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |  130 +++++++++---------
 nova/exception.py                                  |    2 +-
 nova/flags.py                                      |    2 +-
 nova/network/api.py                                |   46 +++----
 nova/network/dns_driver.py                         |   12 +-
 nova/network/ldapdns.py                            |   51 +++----
 nova/network/manager.py                            |   93 ++++++-------
 nova/network/minidns.py                            |   40 +++---
 .../compute/contrib/test_floating_ip_dns.py        |  141 ++++++++++----------
 nova/tests/policy.json                             |    2 +-
 nova/tests/test_network.py                         |   58 ++++----
 13 files changed, 307 insertions(+), 302 deletions(-)

commit 2ff3e0eca25a28f248e9cdc8149869003b818651
Merge: b2a5efc 709ee50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 23:32:05 2012 +0000

    Merge "Added an LDAP/PowerDNS driver"

commit b2a5efcd050c98ef5c09db02fa06e75481d8e20e
Merge: dc39e19 2cd3b86
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 23:20:45 2012 +0000

    Merge "disk_config extension now uses OS prefix."

commit 2cd3b86742c6f9c2452e4c1ac7dbd45fb92dd5b0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 18 16:20:28 2012 -0600

    disk_config extension now uses OS prefix.
    
    Fixes bug 918433
    
    Change-Id: Ia3177b53cd51396a29363eb595e5ca5ac47a5605

 nova/api/openstack/compute/contrib/disk_config.py  |    4 ++--
 .../openstack/compute/contrib/test_disk_config.py  |   18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

commit dc39e196373c90eacf48a236a6836c793f896312
Merge: 0ed09a3 236190c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 22:26:42 2012 +0000

    Merge "Cleanup Imports to match HACKING guidelines"

commit 0ed09a3f4e34f8039e471242517dca14b278bcdb
Merge: ec244a1 53abee1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 22:06:19 2012 +0000

    Merge "Automatically clean up DNS when a floating IP is deallocated."

commit ec244a1d940d0dbe56527b290f4b5052fba96739
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Jan 12 14:29:06 2012 -0800

    Do not write passwords to verbose logs. bug 916167
    
    Look for _key and _password in flag names
    
    Change-Id: Ic0c43ad70db0b9f819219e8ca4966908e48b50c9

 nova/service.py    |    8 +++++++-
 nova/volume/san.py |   14 +++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

commit 53abee197dfc5dd7a77b746141d8321c20722092
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Wed Jan 11 12:52:07 2012 -0600

    Automatically clean up DNS when a floating IP is deallocated.
    
    For blueprint public-and-private-dns.
    
    Change-Id: Ifd8827a8454296c5a2615df66805fbdcb65130e8

 nova/network/manager.py    |   13 +++++++++++++
 nova/tests/test_network.py |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

commit 6bb8944112f07c3328186f4d2c53c3661d165f9d
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 18 14:27:09 2012 -0500

    Fix disassociating of auto assigned floating ips.
    
    Also makes adds passing True to the disassociate/deallocate functions
    use a kwarg so the meaning is more apparent.
    
    Fixes bug #918358.
    
    Change-Id: Ie88d19456ffe0fa5f7c7bba79b572672db96c766

 nova/network/manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 236190c4526effb138db104998e947e0d7496f84
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Jan 17 18:21:12 2012 -0800

    Cleanup Imports to match HACKING guidelines
    
    found using https://github.com/cloudscaling/nova-HACKING
    
    Change-Id: Ic010f0407e7a139f0f6436af2e72e817c140a4c3

 bin/nova-manage                      |    4 ++--
 nova/api/openstack/compute/limits.py |    4 ++--
 tools/euca-get-ajax-console          |   13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

commit 7f3ddead0483a36c60a3c8034e0082779e17adc9
Merge: 1e318af 22470eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 19:26:55 2012 +0000

    Merge "fixes bug lp914962"

commit 709ee50e09f341037cfbfdcfcff7eb064c2ef2b5
Author: Andrew Bogott <ABogott@WikiMedia.org>
Date:   Thu Jan 12 00:44:13 2012 +0000

    Added an LDAP/PowerDNS driver
    
    This driver is largely for internal WikiMedia use.  It will probably
    need a fair bit of tinkering for any other deployment.
    
    Related to blueprint public-and-private-dns.
    
    Change-Id: I8636296192aecffedf363bd10a4ae761f7f6e6c3

 nova/network/ldapdns.py    |  352 ++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_network.py |   76 ++++++++++
 2 files changed, 428 insertions(+)

commit 1e318af4d51b453558f3d37b3572c1565353f19f
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Fri Jan 13 17:52:58 2012 -0600

    Add dns domain manipulation to nova.
    
    Adding this functionality required the existing DNS api
    to be rearranged considerably.
    
    Nova needs to track some information about domains that is
    outside the scope of the DNS driver, specifically the availability
    zone of a private domain and the project of a public domain.
    In order to track those attributes, this patch adds a new table
    to the Nova database, dns_domains.
    
    This patch perpetuates some naming ambiguities (e.g. zone vs. domain).
    A future renaming patch will sort all this out.
    
    For blueprint public-and-private-dns.
    
    Change-Id: I80865207d34ab7c6e2afc5638863a299b3913f8e

 doc/source/api_ext/ext_floating_ip_dns.rst         |   90 ++++----
 etc/nova/policy.json                               |    8 +-
 .../openstack/compute/contrib/floating_ip_dns.py   |  218 +++++++++++++-------
 nova/db/api.py                                     |   26 +++
 nova/db/sqlalchemy/api.py                          |   71 +++++++
 .../migrate_repo/versions/072_add_dns_table.py     |   66 ++++++
 nova/db/sqlalchemy/models.py                       |   13 ++
 nova/network/api.py                                |   21 ++
 nova/network/dns_driver.py                         |    6 +
 nova/network/manager.py                            |  101 ++++++++-
 nova/network/minidns.py                            |   40 +++-
 .../compute/contrib/test_floating_ip_dns.py        |  209 +++++++++++++------
 nova/tests/policy.json                             |    7 +-
 nova/tests/test_db_api.py                          |   24 +++
 nova/tests/test_network.py                         |  101 ++++++++-
 15 files changed, 803 insertions(+), 198 deletions(-)

commit 22470ebea059a5ccbb4b00599ac23ba9d04f9ac0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jan 18 11:43:20 2012 -0600

    fixes bug lp914962
    
    Change-Id: I0f432b790ebee3a017f2124619a9ab78421b0eac

 nova/network/quantum/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 885b9aa70da338307c37d8eba84b3bc1533058bb
Merge: 0c2eb24 d328ddc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 16:42:39 2012 +0000

    Merge "Separate scheduler host management"

commit 0c2eb242580caff24dc95a9e2b3092cf0b04e958
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Mon Jan 16 17:12:35 2012 +0100

    Fixed bug 912701
    
    Add an check to the list_instances method so that the domains whose ID
    is 0 are not listed, since this is reserved in libvirt for hypervisors.
    
    Refers to https://lists.launchpad.net/openstack/msg06699.html
    
    Change-Id: I55f6f370cbaf8bd2254e08afad8b36d833726817

 nova/tests/fakelibvirt.py       |    2 +-
 nova/tests/test_libvirt.py      |   14 ++++++++++++++
 nova/virt/libvirt/connection.py |    3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

commit 52d58ad583350f2448b3971eeb3f1df541cfbfe5
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Wed Jan 18 19:29:31 2012 +0900

    Fix bug #917615
    
    Change-Id: I773b3f026fd7ebcb2aefcd2ef348cca0c5477238

 nova/compute/manager.py         |    2 +-
 nova/virt/libvirt/connection.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit d49d4b98f950b896ee9cfb9890b863d008f09a01
Merge: ad88437 301bc0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 07:54:33 2012 +0000

    Merge "Set instance_ref property when creating snapshots."

commit d328ddcadb24d1b1961bd05a7676bc8f54b6776f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Jan 15 21:46:21 2012 -0800

    Separate scheduler host management
    
    This is a bit of a scheduler refactoring to support future scaling work
    as a part of blueprint scaling-zones.
    
    Also fixes bug 891971 (remove unused set_network_host in scheduler)
    
    With or without that blueprint work, this cleans a number of things up
    and paves the way for combining a lot of the schedulers by using this
    new 'HostManager' for filtering and weighing (future work :)
    
    On to the goodies:
    
    Introduces new HostManager, splitting code out from ZoneManager.
    Zone communication and management is handlded in the ZoneManager.
    Host filtering and weighing is handled in the HostManager.
    ZoneManager is removed from the SchedulerManager and direct calls to it
      from the SchedulerManager now occur via the scheduler driver.  This
      simplifies a number of things.
    ZoneManager and HostManager classes to use are now flags.  This allows
      one to extend the current classes and use them.
    HostManager uses a HostState class to keep info about hosts.  This class
      needs to be extendable.  Since it's very much tied to the HostManager,
      the HostState class to use is not a flag.  It is, instead, a class
      variable in HostManager.
    Filtering functions now accept a single host to filter.  This improves
      performance by not having to build a new array of hosts within every
      filter function.
    Filtering functions now accept a more generic 'filter_properties'
      dictionary which we can fill with information available for filtering.
      Adding additional data to this 'filter_properties' can be done by
      subclassing.
    Weighing functions now accept this 'filter_properties', also, although
      it's poorly named ATM.  Will be cleaned up in a future branch when I
      move some weighing functions into the host manager.
    Filtering tests are true unit tests now.
    test_zones was moved from top level to under scheduler as zone_manager
      tests and refactored to be true unit tests.
    Host tests are true unit tests now.
    Other minor cleanups
    
    Change-Id: I0ef2acef6639b4500c400c18cf2c673cb80f0150

 nova/api/openstack/compute/contrib/zones.py        |   16 +-
 nova/scheduler/api.py                              |   15 +-
 nova/scheduler/chance.py                           |    5 +-
 nova/scheduler/distributed_scheduler.py            |  134 +++----
 nova/scheduler/driver.py                           |   60 +++-
 nova/scheduler/filters/__init__.py                 |    2 +-
 nova/scheduler/filters/abstract_filter.py          |    8 +-
 nova/scheduler/filters/all_hosts_filter.py         |   14 +-
 nova/scheduler/filters/compute_filter.py           |   59 +++
 nova/scheduler/filters/instance_type_filter.py     |   70 ----
 nova/scheduler/filters/json_filter.py              |   66 ++--
 nova/scheduler/host_manager.py                     |  310 ++++++++++++++++
 nova/scheduler/least_cost.py                       |   36 +-
 nova/scheduler/manager.py                          |   31 +-
 nova/scheduler/simple.py                           |   17 -
 nova/scheduler/vsa.py                              |    2 +-
 nova/scheduler/zone_manager.py                     |  312 +++-------------
 nova/tests/scheduler/fake_zone_manager.py          |   72 ----
 nova/tests/scheduler/fakes.py                      |   98 +++++
 nova/tests/scheduler/test_distributed_scheduler.py |  185 +++++-----
 nova/tests/scheduler/test_host_filter.py           |  252 -------------
 nova/tests/scheduler/test_host_filters.py          |  333 +++++++++++++++++
 nova/tests/scheduler/test_host_manager.py          |  360 +++++++++++++++++++
 nova/tests/scheduler/test_least_cost.py            |   42 ++-
 nova/tests/scheduler/test_zone_manager.py          |  189 ++++++++++
 nova/tests/test_zones.py                           |  377 --------------------
 26 files changed, 1706 insertions(+), 1359 deletions(-)

commit ad8843740154ebfa1e1be90413b9c5e973af9849
Merge: 7bb9f34 ae808ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 18 04:57:51 2012 +0000

    Merge "Stop allowing blank image names on snapshot/backup"

commit 301bc0ca1a847f921c330dced1d4b1c82946ec55
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jan 17 16:00:20 2012 -0500

    Set instance_ref property when creating snapshots.
    
    Fixes LP bug #917810.
    
    Change-Id: I17c1e467a13075f3952dc6a1b475bc71a8b1d9bc

 .../api/openstack/compute/contrib/admin_actions.py |    5 +----
 nova/api/openstack/compute/views/images.py         |    8 +++++---
 .../compute/contrib/test_admin_actions.py          |    3 ---
 nova/tests/api/openstack/compute/test_images.py    |   16 ++++++++--------
 nova/tests/api/openstack/fakes.py                  |    2 +-
 5 files changed, 15 insertions(+), 19 deletions(-)

commit 7bb9f3413a2bc6ef56ab3c384d0624f193e58e34
Merge: 8d010ca 7397d8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 23:31:14 2012 +0000

    Merge "Only update if there are networks to update"

commit 8d010cacb520786fa12794801bc31eddd23b2af7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 22 21:39:21 2011 +0000

    Implements blueprint vnc-console-cleanup
    
     * Creates a unified way to access vnc consoles for xenserver and libvirt
     * Now supports both java and websocket clients
     * Removes nova-vncproxy - a replacement version of this (nova-novncproxy) can be found as described in vncconsole.rst
     * Adds nova-xvpvncproxy, which supports a java vnc client
     * Adds api extension to access java and novnc access_urls
     * Fixes proxy server to close/shutdown sockets more cleanly
     * Address style feedback
     * Use new-style extension format
     * Fix setup.py
     * utils.gen_uuid must be wrapped like str(utils.gen_uuid()) or it can't be serialized
    
    Change-Id: I5e42e2f160e8e3476269bd64b0e8aa77e66c918c

 bin/nova-all                                       |    8 +-
 bin/nova-consoleauth                               |   48 ++++++
 bin/nova-vncproxy                                  |   49 ------
 bin/nova-xvpvncproxy                               |   48 ++++++
 doc/source/runnova/vncconsole.rst                  |  135 ++++++++++-----
 nova/api/ec2/cloud.py                              |    9 -
 nova/api/openstack/compute/contrib/consoles.py     |   79 +++++++++
 nova/compute/api.py                                |   36 ++--
 nova/compute/manager.py                            |   23 ++-
 nova/consoleauth/__init__.py                       |   26 +++
 nova/consoleauth/manager.py                        |   74 ++++++++
 nova/exception.py                                  |    4 +
 .../api/openstack/compute/contrib/test_consoles.py |   97 +++++++++++
 .../tests/api/openstack/compute/test_extensions.py |    1 +
 nova/tests/test_compute.py                         |   39 ++++-
 nova/tests/test_consoleauth.py                     |   59 +++++++
 nova/tests/test_virt_drivers.py                    |    2 +-
 nova/virt/driver.py                                |    4 +
 nova/virt/fake.py                                  |    2 +-
 nova/virt/libvirt/connection.py                    |    3 +-
 nova/virt/xenapi/vmops.py                          |   14 ++
 nova/virt/xenapi_conn.py                           |    9 +
 nova/vnc/__init__.py                               |   14 +-
 nova/vnc/auth.py                                   |  135 ---------------
 nova/vnc/proxy.py                                  |  130 --------------
 nova/vnc/server.py                                 |  100 -----------
 nova/vnc/xvp_proxy.py                              |  181 ++++++++++++++++++++
 nova/wsgi.py                                       |    5 +-
 setup.py                                           |    3 +-
 29 files changed, 827 insertions(+), 510 deletions(-)

commit 5987ed97ffb90e52acb7a7d9e0a915d072aadaed
Merge: fb75e2f b76cc2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 21:33:52 2012 +0000

    Merge "blueprint host-aggregates"

commit fb75e2fd314330c3e6f371c228a4c5cf7a545028
Merge: 1357cae e96176a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 21:26:53 2012 +0000

    Merge "Fix an error that prevents message from getting substituted."

commit 1357caea7955a558e309acbfff304eea73b16893
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 17 08:18:36 2012 +0000

    Rebuild/Resize support for disk-config.
    
    Fixes bug 917306
    
    Change-Id: I27848a4503a5027b0e5f9cad3f110ea67c462327

 nova/api/openstack/compute/contrib/disk_config.py |  250 ++++++++++-----------
 nova/api/openstack/compute/servers.py             |   26 ++-
 nova/compute/api.py                               |    5 +-
 3 files changed, 141 insertions(+), 140 deletions(-)

commit c7d2f020f0fdf04b24bd21668e7a02796f1f5538
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jan 17 14:33:16 2012 -0500

    Allow instances in 'BUILD' state to be deleted.
    
    Fixes LP Bug #907808.
    
    Change-Id: I4332e9e822db507951af07bd654a27b3e2ce3973

 nova/compute/api.py                              |    4 ++--
 nova/tests/api/openstack/compute/test_servers.py |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

commit ae808ad735c39c0bff3e051dbd37ea2a60072649
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jan 17 20:28:13 2012 +0000

    Stop allowing blank image names on snapshot/backup
    
    Fixes bug 917327
    
    Change-Id: I0b77b088c9fe99354bcec3706fbdc05f3c39ae90

 nova/api/openstack/compute/servers.py              |    9 ++-------
 .../api/openstack/compute/test_server_actions.py   |   11 +++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

commit 7397d8fc1dab0fed2a069af670f37f3002ae1d1d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jan 17 19:28:34 2012 +0000

    Only update if there are networks to update
    
    Fixes bug 917812
    
    Change-Id: Ibb59e2ae634590fe57e777b720a84580c6ed64cc

 .../066_preload_instance_info_cache_table.py       |  110 +++++++++++---------
 1 file changed, 58 insertions(+), 52 deletions(-)

commit 35df99cf1dca5d9b0ca1cb09039845aa8bd3a49b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jan 17 14:24:09 2012 -0500

    Drop FK constraint if it exists in migration 064
    
    Fixes LP bug 916992
    
    A workaround was originally applied to fix a FK constraint problem in migration
    064.  The original bug only affected MySQL+InnoDB databases and was masked by
    using MySQL+MyISAM.  Commit d503d6b1079f9eafe0430754214fc5b6d4e32c09 attempted
    to improve the workaround, though it caused issues on databases not using
    InnoDB, so it was reverted enitrely and we are back with the original bug.
    
    This change will attempt to drop the FK constraint only if it exists.  This
    should now support MySQL installations that are configured both
    default_storage_engine=MyISAM (oneiric) and default_storage_engine=InnoDB
    (precise)
    
    Change-Id: Ie2cfa32d8f52b163f513679649da52a73fc501df
    Signed-off-by: Adam Gandleman <adam.gandleman@canonical.com>
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 ...ange_instance_id_to_uuid_in_instance_actions.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 8c1e0022028a454f536ff211aa200cab9b0111aa
Merge: 61b0c08 006fea1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 19:08:11 2012 +0000

    Merge "Clean up generate fingerprint."

commit e96176ac634587f912839ac56f2590eedc6e612c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jan 17 12:59:42 2012 -0600

    Fix an error that prevents message from getting substituted.
    
    The problem: self.__dict__ contains message.  This overrides the
    default of None for the NovaException constructor.  Since a
    message is provided, it's used directly instead of trying to
    substitute the keyword arguments.  The solution is to limit the
    keyword arguments we pass to the NovaException constructor, so
    they don't contain message.  Fixes bug 917768.
    
    Change-Id: I5986fa7b552c84ba7f902e78b32498ab294beb7b

 nova/rpc/common.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b76cc2f4426aef4422c5a4a6ad0a412a2cc4cbc3
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Jan 13 16:46:37 2012 +0000

    blueprint host-aggregates
    
    This is the first of a series of commits that add the host-aggregates capability,
    as described on the blueprint page.
    
    This commit, more precisely, introduces changes to the Nova model: model classes
    related to aggregates have been added, as well as DB API methods to interact with
    the model; a sqlalchemy migration script plus a bunch of tests are also part of
    this changeset.
    
    Commits that will follow are going to add:
    
    - Extensions to OSAPI Admin, and related python_novaclient mappings
    - Implementation of the XenAPI virt layer
    - Integration of OSAPI and virt layer, via the compute_api
    - smoketests
    - openstack-manuals documentation
    
    These commits will be pushed for review not necessarily in this exact order.
    
    Change-Id: Iceb27609dc53bf4305c02d7cbc436fba4c4a7256

 nova/compute/aggregate_states.py                   |   28 +++
 nova/db/api.py                                     |   59 +++++
 nova/db/sqlalchemy/api.py                          |  228 +++++++++++++++++
 .../versions/071_add_host_aggregate_tables.py      |   97 +++++++
 nova/db/sqlalchemy/models.py                       |   36 +++
 nova/exception.py                                  |   25 ++
 nova/tests/test_db_api.py                          |  264 ++++++++++++++++++++
 7 files changed, 737 insertions(+)

commit 61b0c08b7cfe68ca3d567e05dd0bc333658cdc77
Merge: 820c460 d72109e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 18:45:14 2012 +0000

    Merge "Add missing scripts to setup.py (lp#917676)"

commit 820c46021d62a922da753a1bdee2df8b25ed23bc
Merge: 70bf86e 480875d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 17:13:51 2012 +0000

    Merge "Add policy checking to nova.network.api.API"

commit 70bf86e13fbdaf5a2deec24993744f8c0e41b4e3
Merge: fb05cff e40ee23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 17:02:29 2012 +0000

    Merge "Updates linux_net to ignore some shell errors"

commit fb05cff5e43486b951d64920feb754e133468fb5
Merge: 2012f1d 06112dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 16:51:26 2012 +0000

    Merge "Fixes bug 917128"

commit d72109e7114724de668de24800829b07e0d3fe7e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jan 17 15:07:58 2012 +0000

    Add missing scripts to setup.py (lp#917676)
    
    If distutils-extra is installed, all scripts are automatically included
    in the tarball. We should explicitly include them in setup.py to avoid
    confusion.
    
    As an example, the 2011.3 tarballs appear to have been generated with
    distutils-extra but the 2011.3.1/2012.1 tarballs are now being
    generated in a venv. So, these newer tarballs are missing scripts which
    were included in 2011.3.
    
    Change-Id: I2a85418b84b93e041f6c7d31833b09acdcb29daa

 setup.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 2012f1df0859be082f67ee982d5d0d4b6cf2c3d9
Merge: 7913b0b 144c4f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 14:27:05 2012 +0000

    Merge "improve handling of the img_handlers config list"

commit 7913b0b789c5034493630b4f31fd3ad050dca4f5
Merge: 12e8a89 85518a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 14:16:04 2012 +0000

    Merge "Add default policy rule"

commit 12e8a8927ed33731231632fe71773f0fe068c099
Merge: 59bc075 4714c70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 13:55:35 2012 +0000

    Merge "Fix some cfg test case naming conflicts"

commit 06112dc34865ec6b54042bf0e55b23c59675744d
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Mon Jan 16 17:23:51 2012 +0100

    Fixes bug 917128
    
    Change-Id: I01c384666ae2366638fe77ffbe2f85e9e2692303

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 59bc07526ee7eac1ee87923b0f62b042bd6e1caf
Merge: 2dd5251 72f96b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 08:23:51 2012 +0000

    Merge "Prefixing the request id with 'req-' to decrease confusion when looking at logs."

commit 2dd52511cf8b7b9e5c7c7cd8564b0fec8acd03cb
Merge: 3972390 918d999
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 08:15:48 2012 +0000

    Merge "Add ipv4 and ipv6 validation"

commit 006fea117307460544492a3548203a9ef31f34ba
Author: MotoKen <motokentsai@gmail.com>
Date:   Tue Jan 17 13:20:32 2012 +0800

    Clean up generate fingerprint.
    
    Change-Id: I5e29c2af495d5b8e58d7101545f43ba40c5a97a4

 nova/api/ec2/cloud.py                          |   17 +----------------
 nova/api/openstack/compute/contrib/keypairs.py |    7 +------
 nova/crypto.py                                 |   17 ++++++++++++++---
 3 files changed, 16 insertions(+), 25 deletions(-)

commit 3972390d286ba487a53a27fa59a6cc1b0e2573ba
Merge: f2fc7dd c1cf917
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 00:51:37 2012 +0000

    Merge "Add tests for volume list and detail through new volume api, and fix error that the tests caught"

commit 480875d49c722a2310b52c3bd4b2241598df86c8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 15:52:11 2012 -0800

    Add policy checking to nova.network.api.API
    
    Partially implements bp interim-nova-authz-service
    
    Change-Id: Ib93d854ee1a7f22f4e7f313a9d50300df8b8596b

 etc/nova/policy.json       |   37 ++++++++++++++++++++++++++-
 nova/exception.py          |    2 +-
 nova/network/manager.py    |   59 ++++++++++++++++++++++++++++++++++++++++++--
 nova/tests/fake_network.py |    9 +++----
 nova/tests/policy.json     |   36 ++++++++++++++++++++++++++-
 nova/tests/test_network.py |   45 +++++++++++++++++++++++++++++----
 6 files changed, 173 insertions(+), 15 deletions(-)

commit 85518a93ef01ae997ecfc0687d89ba87f7607f54
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jan 16 15:28:49 2012 -0800

    Add default policy rule
    
    If a specific rule is not found, we will check the rule defined in FLAGS.policy_default_action.
    
    Change-Id: Ib1b1aa4bbeec74bdb1562d0fc649d33838076f01

 etc/nova/policy.json      |   86 +++------------------------------------------
 nova/common/policy.py     |   13 ++++---
 nova/policy.py            |   12 ++++---
 nova/tests/test_policy.py |   38 ++++++++++++++++++++
 nova/volume/api.py        |    7 ++--
 5 files changed, 63 insertions(+), 93 deletions(-)

commit f2fc7dd9b2dbf9259c232f9561804dc6c0cff0bd
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jan 16 23:37:12 2012 +0000

    Super is not so super.
    
    Fixing bug where calling super causes TypeError. For explanation, see:
    http://stackoverflow.com/questions/489269/python-super-raises-typeerror-why
    
    bug: 917398
    Change-Id: Ib2bd69496b4e1e93f63b17b9ba751ae27126f736

 nova/log.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 1fd26203b29d6432325ae1365e3dcbecc9d97864
Merge: 7afc12b 8be8962
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 23:15:18 2012 +0000

    Merge "Update some extensions (1)"

commit 7afc12b9a21abc1c99a70fd61b24d10746ed1bd2
Author: Philip Knouff <philip.knouff@mailtrust.com>
Date:   Mon Jan 16 17:04:13 2012 -0500

    Fixed the log line
    
    Fixed bug #877417
    
    Change-Id: Iddb9a6d4eb798b0f41f0ef1ab01cb02d16d16dbe

 Authors                  |    1 +
 nova/api/ec2/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 4979baf61a92afccc2946a2713468988fd4d4ddd
Merge: f673db9 6f8e167
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 21:54:29 2012 +0000

    Merge "Modify the fake ldap driver to fix compatibility."

commit c1cf917bceeabdddf6f14bc0e51663e1df382677
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 16 13:41:48 2012 -0800

    Add tests for volume list and detail through new volume api, and fix error that the tests caught
    
    Change-Id: I6c706e4681cf079caab614b0870315b275339028

 nova/api/openstack/volume/volumes.py            |   28 ++++++++
 nova/tests/api/openstack/volume/test_volumes.py |   83 ++++++++++++++++++++++-
 2 files changed, 110 insertions(+), 1 deletion(-)

commit f673db9b2c21d4709db467a633f1279796b6d085
Merge: f100f36 067eb74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 21:44:51 2012 +0000

    Merge "Typofix for impl_kombu."

commit f100f36b096e5f8622d08072f12d0cfd3d3dbf98
Merge: fa3fa39 035b43b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 21:34:52 2012 +0000

    Merge "Refactoring logging _log function."

commit 067eb74733d00d2d9eda46b313c612746b1bba2e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 16 21:12:46 2012 +0000

    Typofix for impl_kombu.
    
    Fixes bug 917377
    
    Change-Id: I375f70bc35fe96813f8706f1691d1619f46b8f84

 nova/rpc/impl_kombu.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fa3fa39187f2663dca36cb8d27b3815691a18a27
Merge: c897e40 d2ff77a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 21:06:11 2012 +0000

    Merge "Take the availability zone from the instance if available"

commit c897e40d6b3bb077c990aed481b99ec06a2286e2
Merge: b32f460 dc2c464
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 20:47:37 2012 +0000

    Merge "Add support for port security to QuantumManager"

commit 035b43b1fd320008234e066e30629fb0e359b424
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jan 12 18:38:21 2012 +0000

    Refactoring logging _log function.
    
    We should not be overriding private functions of core python modules.
    Fixes bug: 915597
    
    Change-Id: I1d1f6dc142cd822030a671f7f2f477a44acafe46

 nova/log.py |   59 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 12 deletions(-)

commit b32f460c6023a852cc6fa34c73bec1585ede3d36
Merge: 95e69b3 e022ea9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 20:18:20 2012 +0000

    Merge "Update some extensions (2)"

commit 8be89626681388c3a0e8f3c94830aff7c2a4c37e
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jan 12 17:37:18 2012 -0600

    Update some extensions (1)
    
    Updates the following extensions to conform to new interfaces:
    
        * admin_actions (AdminActions)
        * console_output (Console_output)
        * deferred_delete (DeferredDelete)
        * floating_ips (Floating_ips)
        * multinic (NMN)
        * rescue (Rescue)
        * security_groups (SecurityGroups)
    
    Related to blueprint extension-refactor.
    
    Change-Id: Ica7b44db22835971703cc72d831410d7e7660f1d

 .../api/openstack/compute/contrib/admin_actions.py |   93 +++++++++-----------
 .../openstack/compute/contrib/console_output.py    |   40 +++++----
 .../openstack/compute/contrib/deferred_delete.py   |   47 +++++-----
 nova/api/openstack/compute/contrib/floating_ips.py |   58 +++++-------
 nova/api/openstack/compute/contrib/multinic.py     |   69 ++++++---------
 nova/api/openstack/compute/contrib/rescue.py       |   47 +++++-----
 .../openstack/compute/contrib/security_groups.py   |   49 +++++------
 nova/api/openstack/extensions.py                   |    4 +-
 .../compute/contrib/test_deferred_delete.py        |   32 ++-----
 .../openstack/compute/contrib/test_floating_ips.py |   23 ++---
 .../compute/contrib/test_security_groups.py        |   45 +++++-----
 11 files changed, 226 insertions(+), 281 deletions(-)

commit 95e69b307b7dd1296055a24cdba8c72525950146
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jan 16 11:33:34 2012 -0800

    DECLARE osapi_compute_listen_port for auth manager
    
    Fixes bug 916267
    
    Change-Id: I3bce5c8825b5245d9c58d93a25ac0daaedb6d47c

 nova/auth/manager.py |    3 +++
 1 file changed, 3 insertions(+)

commit a5e73ffe190f6b42cee592d2d7eceae368c7be1d
Merge: c50546d 6e7e387
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 18:42:00 2012 +0000

    Merge "Increase robustness of image filtering by server"

commit c50546df8cbf159af13335813d9cb06098645b2c
Merge: 7e00cc1 1611c23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 18:31:24 2012 +0000

    Merge "greenlet version inconsistency"

commit 7e00cc1c1d5e490bedc1c64ee11a1983e5fa80d6
Merge: 1e9e1f6 433274d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 17:56:12 2012 +0000

    Merge "Remove unused extension decorator require_admin"

commit 6e7e3870a4ca047185ba5e3320d63afaa08357b8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 22:50:32 2012 -0800

    Increase robustness of image filtering by server
    
    * fix bug 912837
    * fix bug 912927
    * filter images based on instance_uuid rather than instance_ref
    * stop adding instance_ref to snapshot properties
    
    Change-Id: I5eed1611b1e885553d0c91380e414e9476dc251c

 nova/api/openstack/compute/images.py               |   11 ++++++++++-
 nova/api/openstack/compute/servers.py              |    5 +----
 nova/tests/api/openstack/compute/test_images.py    |   19 ++++++++++++++++---
 .../api/openstack/compute/test_server_actions.py   |    5 +----
 nova/tests/api/openstack/fakes.py                  |   10 +++-------
 5 files changed, 31 insertions(+), 19 deletions(-)

commit 1e9e1f6df643b8d910af3592aa3c541c3f62df45
Merge: 312caea ebc06cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 17:45:08 2012 +0000

    Merge "Add policy checks to Volume.API"

commit e022ea9bb44cd49b45e6d4b82dd168000988dc20
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jan 16 11:31:56 2012 -0600

    Update some extensions (2)
    
    Updates the extended_status (ExtendedStatus) extension to conform to
    the new extension interface.  Related to blueprint extension-refactor.
    
    Change-Id: Ie00968c4cdcd67a2cf659a2b8c2ca2b31e8dcc9d

 .../openstack/compute/contrib/extended_status.py   |  142 ++++++++++----------
 nova/api/openstack/wsgi.py                         |   45 +++++--
 nova/tests/api/openstack/test_wsgi.py              |    6 +-
 3 files changed, 113 insertions(+), 80 deletions(-)

commit 312caea8ab278882552cf9006653de97ced88ef8
Merge: 4bb32ab bb867ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 17:17:36 2012 +0000

    Merge "Implement BP untie-nova-network-models"

commit 4bb32ab55f18f38c55c512986a0081129166c272
Merge: 46f90f7 a3b7a31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 17:02:04 2012 +0000

    Merge "Remove compute.api.API.add_network_to_project"

commit bb867ce3948ddc23cf928ca3dda100a1a977896a
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jan 4 11:10:10 2012 -0600

    Implement BP untie-nova-network-models
    
    Fixes LP853979
    Remove the FK references for network data.
    Remove unused db functions that used the FK's
    Update db functions to not joinload
    Update notification to optionally take network_info if compute has it
    Update EC2 Api to use the network cache, falling back to rpc.call
    Remove test_instance_get_project_vpn_joins which tests calls not used
    
    Change-Id: I1a01ccc5ebcf7efeafe014af62be893325bb0825

 nova/api/ec2/cloud.py                              |   17 +-
 nova/api/ec2/ec2utils.py                           |   84 +++++--
 nova/api/openstack/common.py                       |  105 ++++++---
 nova/api/openstack/compute/contrib/floating_ips.py |   37 ++-
 nova/api/openstack/compute/views/addresses.py      |    2 +-
 nova/compute/manager.py                            |   34 ++-
 nova/db/api.py                                     |   24 +-
 nova/db/sqlalchemy/api.py                          |  154 ++++--------
 .../migrate_repo/versions/070_sqlite_downgrade.sql |  103 ++++++++
 .../migrate_repo/versions/070_sqlite_upgrade.sql   |   99 ++++++++
 .../versions/070_untie_nova_network_models.py      |   98 ++++++++
 nova/db/sqlalchemy/models.py                       |   24 +-
 nova/network/api.py                                |    6 +
 nova/network/linux_net.py                          |   65 +++--
 nova/network/manager.py                            |   72 ++++--
 nova/tests/api/ec2/test_cloud.py                   |   53 +++--
 .../openstack/compute/contrib/test_floating_ips.py |   45 ++--
 nova/tests/api/openstack/compute/test_servers.py   |  248 +++++++++++++-------
 nova/tests/api/openstack/fakes.py                  |   50 ++--
 nova/tests/db/fakes.py                             |    8 -
 nova/tests/fake_network.py                         |   67 ++++--
 nova/tests/test_compute_utils.py                   |    2 +-
 nova/tests/test_db_api.py                          |   13 -
 nova/tests/test_libvirt.py                         |   11 +-
 nova/tests/test_linux_net.py                       |   99 +++++---
 nova/tests/test_metadata.py                        |    4 -
 nova/tests/test_network.py                         |   61 +++--
 nova/tests/test_xenapi.py                          |    9 +-
 nova/tests/vmwareapi/db_fakes.py                   |    6 -
 nova/utils.py                                      |   14 +-
 nova/virt/firewall.py                              |   17 +-
 31 files changed, 1075 insertions(+), 556 deletions(-)

commit 918d9998e1855879e35b039430b71277e3200814
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jan 16 15:35:08 2012 +0000

    Add ipv4 and ipv6 validation
    
    Fixes bug 891264
    
    Change-Id: Ie5975a6ee8129392b308d405ab5cb9303bdd0a89

 nova/api/openstack/compute/servers.py            |   35 ++++-
 nova/tests/api/openstack/compute/test_servers.py |  164 ++++++++++++++++++++++
 2 files changed, 197 insertions(+), 2 deletions(-)

commit 1611c23928afbccf55e8cefc687d65dccb2e9ae7
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Sun Jan 15 20:45:26 2012 -0500

    greenlet version inconsistency
    
    Fixes Bug #917003
    
    The latest version of greenlet is installed in install_venv.py while
    the version required is set to 0.3.1 in pip-requires.
    
    Change-Id: I145deb46a8edc41e87634dc5ca839baf5acd8065

 Authors            |    2 +-
 tools/pip-requires |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit ebc06cf9de086ff6a2001d20fc10f05360a0aa7c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 13:00:45 2012 -0800

    Add policy checks to Volume.API
    
    Change-Id: If4b37c1041a10c3c0697724281aadb9a17b51373

 etc/nova/policy.json      |   24 +++++++++++++++++++++++-
 nova/tests/policy.json    |   24 +++++++++++++++++++++++-
 nova/tests/test_volume.py |   45 +++++++++++++++++++++++++++++++++++++++++++++
 nova/volume/api.py        |   45 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 136 insertions(+), 2 deletions(-)

commit 433274d3a12f2e8c85acb8fe2caf380dacd92521
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Jan 15 15:45:45 2012 -0800

    Remove unused extension decorator require_admin
    
    Change-Id: I93bb5c8fb7fe95365d0062d20581a87f324837d5

 nova/api/openstack/extensions.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 46f90f7cb79a01104376919c56e70a6324fe89af
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Sat Jan 14 00:53:37 2012 -0600

    Fix volume api typo
    
    Introduced in https://review.openstack.org/3041
    
    Change-Id: I9fc66b9c6ffff4b9dde7a10942158c86df548d43

 nova/api/openstack/compute/contrib/volumes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb10721ffc14abb86ab4d58b2b30fc676e88d394
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jan 13 11:22:50 2012 -0800

    Convert nova.volume.api.API to use volume objects
    
    Change-Id: If6b78f7de814116bc93b273ec300dba02e63593d

 nova/api/ec2/cloud.py                              |   51 ++++++------
 .../compute/contrib/virtual_storage_arrays.py      |    7 +-
 nova/api/openstack/compute/contrib/volumes.py      |   12 ++-
 nova/api/openstack/volume/snapshots.py             |   12 +--
 nova/api/openstack/volume/volumes.py               |   37 ++++----
 nova/compute/api.py                                |   14 ++--
 nova/compute/manager.py                            |   83 ++++++++++--------
 nova/tests/api/ec2/test_cloud.py                   |    1 +
 .../api/openstack/compute/contrib/test_vsa.py      |   13 +--
 nova/tests/test_compute.py                         |   40 +--------
 nova/tests/test_quota.py                           |   12 +--
 nova/tests/test_volume.py                          |   81 +++++++++---------
 nova/tests/test_vsa.py                             |    2 -
 nova/tests/test_vsa_volumes.py                     |   13 +--
 nova/volume/api.py                                 |   88 ++++++++++----------
 nova/vsa/api.py                                    |    4 +-
 nova/vsa/manager.py                                |    2 +-
 17 files changed, 232 insertions(+), 240 deletions(-)

commit a51c93ab3c646642330c4eeba3ede0772a8ab734
Merge: 20b4d89 04986f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 22:51:53 2012 +0000

    Merge "Create an instance DNS record based on instance UUID."

commit 20b4d895124cee887568ca8723ce0d3ffdc3a05a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 13 13:54:32 2012 -0800

    Remove a whole bunch of unused imports
    
    Change-Id: I6759e5b6250c48cc0deb4b198b44c948c64c47d1

 contrib/boto_v6/ec2/instance.py                    |    1 -
 doc/ext/nova_todo.py                               |    9 ++++-----
 nova/api/ec2/cloud.py                              |    1 -
 nova/api/openstack/__init__.py                     |    1 -
 nova/api/openstack/compute/__init__.py             |    1 -
 .../openstack/compute/contrib/createserverext.py   |    1 -
 .../openstack/compute/contrib/deferred_delete.py   |    1 -
 nova/api/openstack/compute/contrib/keypairs.py     |    1 -
 .../compute/contrib/virtual_storage_arrays.py      |    2 --
 nova/api/openstack/volume/__init__.py              |    1 -
 nova/api/openstack/volume/snapshots.py             |    4 ----
 nova/api/openstack/volume/types.py                 |    2 --
 nova/api/openstack/volume/versions.py              |    4 ----
 nova/api/openstack/volume/views/versions.py        |    1 -
 nova/api/openstack/volume/volumes.py               |    1 -
 nova/auth/dbdriver.py                              |    2 --
 nova/console/api.py                                |    1 -
 nova/console/fake.py                               |    2 --
 nova/console/manager.py                            |    1 -
 nova/console/vmrc.py                               |    1 -
 nova/console/xvp.py                                |    1 -
 .../versions/020_add_snapshot_id_to_volumes.py     |    2 --
 .../migrate_repo/versions/021_rename_image_ids.py  |    2 +-
 .../versions/022_set_engine_mysql_innodb.py        |    2 +-
 .../versions/023_add_vm_mode_to_instances.py       |    2 +-
 .../migrate_repo/versions/030_multi_nic.py         |    2 --
 .../031_fk_fixed_ips_virtual_interface_id.py       |    3 ---
 .../migrate_repo/versions/035_secondary_dns.py     |    2 +-
 .../versions/041_add_config_drive_to_instances.py  |    2 --
 .../versions/042_add_volume_types_and_extradata.py |    2 +-
 .../migrate_repo/versions/043_add_vsa_data.py      |    2 +-
 .../versions/044_update_instance_states.py         |    1 -
 .../versions/045_add_network_priority.py           |    1 -
 .../versions/047_remove_instances_fk_from_vif.py   |    2 +-
 .../versions/052_kill_export_devices.py            |    2 +-
 .../versions/058_rename_managed_disk.py            |    2 +-
 .../versions/060_remove_network_fk_from_vif.py     |    2 +-
 .../versions/062_add_instance_info_cache_table.py  |    2 --
 ...ange_instance_id_to_uuid_in_instance_actions.py |    1 -
 .../066_preload_instance_info_cache_table.py       |    1 -
 .../versions/068_add_instance_attribute.py         |    2 +-
 .../migrate_repo/versions/069_block_migration.py   |    3 +--
 nova/network/quantum/manager.py                    |    1 -
 nova/network/quantum/nova_ipam_lib.py              |    2 --
 nova/network/quantum/quantum_connection.py         |    1 -
 nova/notifier/test_notifier.py                     |    3 ---
 nova/scheduler/distributed_scheduler.py            |    3 ---
 nova/scheduler/filters/abstract_filter.py          |    3 ---
 nova/scheduler/filters/all_hosts_filter.py         |    1 -
 nova/scheduler/filters/instance_type_filter.py     |    1 -
 nova/scheduler/filters/json_filter.py              |    1 -
 nova/scheduler/least_cost.py                       |    1 -
 nova/scheduler/zone_manager.py                     |    1 -
 .../openstack/compute/contrib/test_cloudpipe.py    |    3 ---
 .../compute/contrib/test_deferred_delete.py        |    1 -
 .../compute/contrib/test_floating_ip_dns.py        |    6 ------
 .../compute/contrib/test_security_groups.py        |    1 -
 nova/tests/api/openstack/compute/test_api.py       |    1 -
 nova/tests/api/openstack/compute/test_consoles.py  |    2 --
 nova/tests/api/openstack/compute/test_servers.py   |    1 -
 nova/tests/api/openstack/volume/test_volumes.py    |    5 -----
 nova/tests/api/test_wsgi.py                        |    2 --
 nova/tests/db/fakes.py                             |    4 ----
 nova/tests/integrated/test_extensions.py           |    2 --
 nova/tests/notifier/test_list_notifier.py          |    8 ++------
 nova/tests/rpc/test_carrot.py                      |    1 -
 nova/tests/rpc/test_kombu.py                       |    1 -
 nova/tests/scheduler/test_distributed_scheduler.py |    2 --
 nova/tests/scheduler/test_host_filter.py           |    1 -
 nova/tests/scheduler/test_least_cost.py            |    1 -
 nova/tests/scheduler/test_scheduler.py             |    2 --
 nova/tests/scheduler/test_vsa_scheduler.py         |    3 ---
 nova/tests/test_adminapi.py                        |    2 --
 nova/tests/test_api.py                             |    1 -
 nova/tests/test_cfg.py                             |    1 -
 nova/tests/test_flags.py                           |    1 -
 nova/tests/test_instance_types.py                  |    1 -
 nova/tests/test_instance_types_extra_specs.py      |    2 --
 nova/tests/test_iptables_network.py                |    2 --
 nova/tests/test_ipv6.py                            |    2 --
 nova/tests/test_libvirt.py                         |    1 -
 nova/tests/test_localization.py                    |    3 ---
 nova/tests/test_network_info.py                    |    2 --
 nova/tests/test_notifier.py                        |    6 ------
 nova/tests/test_nova_manage.py                     |    2 --
 nova/tests/test_quantum.py                         |    5 -----
 nova/tests/test_service.py                         |    2 --
 nova/tests/test_versions.py                        |    2 --
 nova/tests/test_volume_types.py                    |    2 --
 nova/tests/test_volume_types_extra_specs.py        |    2 --
 nova/tests/test_vsa.py                             |    2 --
 nova/tests/test_vsa_volumes.py                     |    4 ----
 nova/tests/test_zones.py                           |    4 ----
 nova/tests/xenapi/stubs.py                         |    1 -
 nova/virt/xenapi/firewall.py                       |    3 ---
 nova/vnc/proxy.py                                  |    1 -
 nova/volume/manager.py                             |    2 --
 nova/volume/xensm.py                               |    4 ----
 nova/vsa/api.py                                    |    1 -
 .../networking/etc/xensource/scripts/vif_rules.py  |    1 -
 setup.py                                           |    3 ---
 101 files changed, 18 insertions(+), 191 deletions(-)

commit e08eeea94f0bc27d5bff5ae428e36fb32aaef58c
Merge: f9e53c4 9c1f5d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 21:55:10 2012 +0000

    Merge "have all quota errors return an http 413"

commit f9e53c4031150173691f5474b3e495ee4f918fda
Merge: c9f80f5 1d4e35b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 21:42:23 2012 +0000

    Merge "Refactor request and action extensions."

commit 9c1f5d49d7d2783054d1e01361298cddafeeec78
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jan 13 21:27:21 2012 +0000

    have all quota errors return an http 413
    
    Fixes bug 885986
    
    Change-Id: I13a5f600c643c4ce80d638cac98c1c9b999630b2

 nova/api/openstack/compute/servers.py            |    3 ++-
 nova/tests/api/openstack/compute/test_servers.py |   26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

commit c9f80f5bfbde7aaf8ffa1a4a9fac7d29951d0ada
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Fri Jan 13 15:03:12 2012 -0600

    This import is not used.
    
    Change-Id: Id09a29d2148f4b1e7e3744c8aa1cb3b571e87608

 nova/tests/test_network.py |    1 -
 1 file changed, 1 deletion(-)

commit 1d4e35be694884a0ea8e586ffb2d06ecd6c48685
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jan 13 14:13:59 2012 -0600

    Refactor request and action extensions.
    
    The goal of this refactoring is to eventually eliminate
    ExtensionMiddleware and LazySerializationMiddleware completely, by
    executing extensions directly within the processing done by
    Resource.__call__().  This patch implements the infrastructure
    required to perform this extension processing.
    
    Implements blueprint extension-refactor.
    
    Change-Id: I23398fc906a9a105de354a8133337ecfc69a3ad3

 nova/api/openstack/compute/__init__.py             |   56 +++-
 nova/api/openstack/compute/servers.py              |  101 +++---
 nova/api/openstack/extensions.py                   |   35 ++
 nova/api/openstack/volume/__init__.py              |   43 ++-
 nova/api/openstack/wsgi.py                         |  311 ++++++++++++++++--
 .../tests/api/openstack/compute/test_extensions.py |  135 +++++++-
 .../api/openstack/compute/test_server_actions.py   |  115 ++++---
 nova/tests/api/openstack/test_wsgi.py              |  347 +++++++++++++++++++-
 8 files changed, 998 insertions(+), 145 deletions(-)

commit 72f96b0d37ce870f52a9b6b05fb698fcac062f43
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jan 12 17:22:11 2012 +0000

    Prefixing the request id with 'req-' to decrease confusion when looking
    at logs.
    
    Change-Id: Ic29b9c6b83c4572d17c0b48fb509063d279d3a78

 nova/context.py                       |    2 +-
 nova/tests/api/openstack/test_wsgi.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

commit 0b08cab1d52ee0149fec03baa9b6086b52847b74
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jan 13 19:38:51 2012 +0000

    Fixing a bug that was causing the logging to display the context info
    for the wrong user.
    bug: 915608
    
    Change-Id: I5addd27c3c864333a98e454ecb5bc44836912e8a

 nova/rpc/impl_carrot.py |   10 ++++++++--
 nova/rpc/impl_kombu.py  |   10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit 6c898e6abf44caa176790e9cd4505aeed145397c
Merge: 485328e 60ff2e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 19:19:46 2012 +0000

    Merge "Implements blueprint separate-nova-volumeapi"

commit 6f8e167fcaf81d3e4c221cd1d4c1bc84ceb61a9d
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Fri Jan 13 01:40:10 2012 +0000

    Modify the fake ldap driver to fix compatibility.
    
    The fake implementation was raising an exception during a failed
    search_s where the normal python ldap module does not.  So, removed
    that raise.
    
    Also added a modrdn_s implementation because I need it for a network test.
    
    (Indirectly) for blueprint public-and-private-dns.
    
    Change-Id: Ia86a776afe19ffce72b285bb4c96ce3ed0ae7c4a

 nova/auth/fakeldap.py |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

commit 485328e48fc7dff1ce2ebfd262c442d8f993688b
Merge: 572c85d 59e8ae1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 18:50:10 2012 +0000

    Merge "Implement more complete kombu reconnecting"

commit 572c85da9843b549f3ac26ee7d4107a3ab0b0809
Merge: f3cae72 841d473
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 18:40:52 2012 +0000

    Merge "Remove 'status' from default snapshot properties"

commit 04986f2f0c4a570c1cb786aa69a5608620108e50
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Thu Jan 12 20:01:15 2012 +0000

    Create an instance DNS record based on instance UUID.
    
    Previously we created one based on instance name only.  Since
    name is not guaranteed to be unique, best to have one based
    on uuid as well.  Both point to the same address, of course.
    
    For blueprint public-and-private-dns.
    
    Change-Id: Ibb17f2a49f00b4522205d6b4508f432f6f5b0c5d

 nova/network/manager.py    |    5 ++++-
 nova/network/minidns.py    |    4 ++++
 nova/tests/test_network.py |   30 ++++++++++++++++++++++--------
 3 files changed, 30 insertions(+), 9 deletions(-)

commit f3cae729b71cdd5f0abf00a81d76539127bb0f48
Merge: 26de342 ffdabac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 18:31:37 2012 +0000

    Merge "Clean up disk_format mapping in xenapi.vm_utils"

commit 60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 9 14:02:02 2012 -0800

    Implements blueprint separate-nova-volumeapi
    
     * Moves openstack/v2 directory to compute and fixes tests accordingly
     * Moves some code from api/openstack/compute to shared location, for use by volume api
     * Implements basic volume functionality for types, volumes, and snapshots
     * Changes service name from osapi to osapi_compute (and adds osapi_volume)
     * Renames nova-api-os to nova-api-os-compute, adds nove-api-os-volume
     * Separate extension mechanism for compute and volume
     ** Removes flag osapi_extension and replaces with osapi_compute_extension and osapi_volume_extension
     * Updates the paste config
     * Fixes setup.py to include nova-os-api-compute and nova-os-api-volume
     * Fix bug in volume version code that occurred as result of trunk merge
     * Update integrated/test_volumes.py to use new endpoint
    
    Change-Id: I4c2e57c3cafd4e1a9e2ff3ce201c8cf28326afcd

 bin/nova-api-os                                    |   47 -
 bin/nova-api-os-compute                            |   47 +
 bin/nova-api-os-volume                             |   47 +
 etc/nova/api-paste.ini                             |   62 +-
 nova/api/mapper.py                                 |   76 +
 nova/api/openstack/__init__.py                     |   69 +
 nova/api/openstack/auth.py                         |  257 ++
 nova/api/openstack/compute/__init__.py             |  146 +
 nova/api/openstack/compute/consoles.py             |  131 +
 nova/api/openstack/compute/contrib/__init__.py     |   32 +
 nova/api/openstack/compute/contrib/accounts.py     |  107 +
 .../api/openstack/compute/contrib/admin_actions.py |  291 ++
 nova/api/openstack/compute/contrib/cloudpipe.py    |  172 +
 .../openstack/compute/contrib/console_output.py    |   73 +
 .../openstack/compute/contrib/createserverext.py   |   60 +
 .../openstack/compute/contrib/deferred_delete.py   |   77 +
 nova/api/openstack/compute/contrib/disk_config.py  |  200 +
 .../openstack/compute/contrib/extended_status.py   |  116 +
 .../openstack/compute/contrib/flavorextradata.py   |   37 +
 .../openstack/compute/contrib/flavorextraspecs.py  |  127 +
 .../openstack/compute/contrib/floating_ip_dns.py   |  227 ++
 .../openstack/compute/contrib/floating_ip_pools.py |  104 +
 nova/api/openstack/compute/contrib/floating_ips.py |  237 ++
 nova/api/openstack/compute/contrib/hosts.py        |  187 +
 nova/api/openstack/compute/contrib/keypairs.py     |  163 +
 nova/api/openstack/compute/contrib/multinic.py     |  106 +
 nova/api/openstack/compute/contrib/networks.py     |  117 +
 nova/api/openstack/compute/contrib/quotas.py       |  102 +
 nova/api/openstack/compute/contrib/rescue.py       |   80 +
 .../openstack/compute/contrib/security_groups.py   |  592 +++
 .../compute/contrib/server_action_list.py          |   77 +
 .../compute/contrib/server_diagnostics.py          |   69 +
 .../compute/contrib/simple_tenant_usage.py         |  265 ++
 nova/api/openstack/compute/contrib/users.py        |  145 +
 .../compute/contrib/virtual_interfaces.py          |   93 +
 .../compute/contrib/virtual_storage_arrays.py      |  687 ++++
 nova/api/openstack/compute/contrib/volumes.py      |  550 +++
 nova/api/openstack/compute/contrib/volumetypes.py  |  237 ++
 nova/api/openstack/compute/contrib/zones.py        |  239 ++
 nova/api/openstack/compute/extensions.py           |   45 +
 nova/api/openstack/compute/flavors.py              |  112 +
 nova/api/openstack/compute/image_metadata.py       |  118 +
 nova/api/openstack/compute/images.py               |  195 +
 nova/api/openstack/compute/ips.py                  |  105 +
 nova/api/openstack/compute/limits.py               |  477 +++
 .../api/openstack/compute/ratelimiting/__init__.py |  222 ++
 nova/api/openstack/compute/schemas/atom-link.rng   |  141 +
 nova/api/openstack/compute/schemas/atom.rng        |  597 +++
 .../openstack/compute/schemas/v1.1/addresses.rng   |   14 +
 .../openstack/compute/schemas/v1.1/extension.rng   |   11 +
 .../openstack/compute/schemas/v1.1/extensions.rng  |    6 +
 nova/api/openstack/compute/schemas/v1.1/flavor.rng |   13 +
 .../api/openstack/compute/schemas/v1.1/flavors.rng |    6 +
 .../compute/schemas/v1.1/flavors_index.rng         |   12 +
 nova/api/openstack/compute/schemas/v1.1/image.rng  |   36 +
 nova/api/openstack/compute/schemas/v1.1/images.rng |    6 +
 .../compute/schemas/v1.1/images_index.rng          |   15 +
 nova/api/openstack/compute/schemas/v1.1/limits.rng |   28 +
 .../openstack/compute/schemas/v1.1/metadata.rng    |    9 +
 nova/api/openstack/compute/schemas/v1.1/server.rng |   59 +
 .../api/openstack/compute/schemas/v1.1/servers.rng |    6 +
 .../compute/schemas/v1.1/servers_index.rng         |   15 +
 .../api/openstack/compute/schemas/v1.1/version.rng |   17 +
 .../openstack/compute/schemas/v1.1/versions.rng    |   11 +
 nova/api/openstack/compute/server_metadata.py      |  175 +
 nova/api/openstack/compute/servers.py              | 1123 ++++++
 nova/api/openstack/compute/versions.py             |  236 ++
 nova/api/openstack/compute/views/addresses.py      |   52 +
 nova/api/openstack/compute/views/flavors.py        |   62 +
 nova/api/openstack/compute/views/images.py         |  139 +
 nova/api/openstack/compute/views/limits.py         |   96 +
 nova/api/openstack/compute/views/servers.py        |  193 +
 nova/api/openstack/compute/views/versions.py       |   94 +
 nova/api/openstack/extensions.py                   |  623 ++++
 nova/api/openstack/urlmap.py                       |  297 ++
 nova/api/openstack/v2/__init__.py                  |  182 -
 nova/api/openstack/v2/auth.py                      |  257 --
 nova/api/openstack/v2/consoles.py                  |  131 -
 nova/api/openstack/v2/contrib/__init__.py          |   90 -
 nova/api/openstack/v2/contrib/accounts.py          |  107 -
 nova/api/openstack/v2/contrib/admin_actions.py     |  291 --
 nova/api/openstack/v2/contrib/cloudpipe.py         |  172 -
 nova/api/openstack/v2/contrib/console_output.py    |   73 -
 nova/api/openstack/v2/contrib/createserverext.py   |   60 -
 nova/api/openstack/v2/contrib/deferred_delete.py   |   77 -
 nova/api/openstack/v2/contrib/disk_config.py       |  200 -
 nova/api/openstack/v2/contrib/extended_status.py   |  116 -
 nova/api/openstack/v2/contrib/flavorextradata.py   |   37 -
 nova/api/openstack/v2/contrib/flavorextraspecs.py  |  127 -
 nova/api/openstack/v2/contrib/floating_ip_dns.py   |  227 --
 nova/api/openstack/v2/contrib/floating_ip_pools.py |  104 -
 nova/api/openstack/v2/contrib/floating_ips.py      |  237 --
 nova/api/openstack/v2/contrib/hosts.py             |  187 -
 nova/api/openstack/v2/contrib/keypairs.py          |  163 -
 nova/api/openstack/v2/contrib/multinic.py          |  106 -
 nova/api/openstack/v2/contrib/networks.py          |  117 -
 nova/api/openstack/v2/contrib/quotas.py            |  102 -
 nova/api/openstack/v2/contrib/rescue.py            |   80 -
 nova/api/openstack/v2/contrib/security_groups.py   |  592 ---
 .../api/openstack/v2/contrib/server_action_list.py |   77 -
 .../api/openstack/v2/contrib/server_diagnostics.py |   69 -
 .../openstack/v2/contrib/simple_tenant_usage.py    |  265 --
 nova/api/openstack/v2/contrib/users.py             |  145 -
 .../api/openstack/v2/contrib/virtual_interfaces.py |   92 -
 .../openstack/v2/contrib/virtual_storage_arrays.py |  687 ----
 nova/api/openstack/v2/contrib/volumes.py           |  550 ---
 nova/api/openstack/v2/contrib/volumetypes.py       |  237 --
 nova/api/openstack/v2/contrib/zones.py             |  239 --
 nova/api/openstack/v2/extensions.py                |  575 ---
 nova/api/openstack/v2/flavors.py                   |  112 -
 nova/api/openstack/v2/image_metadata.py            |  118 -
 nova/api/openstack/v2/images.py                    |  195 -
 nova/api/openstack/v2/ips.py                       |  105 -
 nova/api/openstack/v2/limits.py                    |  477 ---
 nova/api/openstack/v2/ratelimiting/__init__.py     |  222 --
 nova/api/openstack/v2/schemas/atom-link.rng        |  141 -
 nova/api/openstack/v2/schemas/atom.rng             |  597 ---
 nova/api/openstack/v2/schemas/v1.1/addresses.rng   |   14 -
 nova/api/openstack/v2/schemas/v1.1/extension.rng   |   11 -
 nova/api/openstack/v2/schemas/v1.1/extensions.rng  |    6 -
 nova/api/openstack/v2/schemas/v1.1/flavor.rng      |   13 -
 nova/api/openstack/v2/schemas/v1.1/flavors.rng     |    6 -
 .../openstack/v2/schemas/v1.1/flavors_index.rng    |   12 -
 nova/api/openstack/v2/schemas/v1.1/image.rng       |   36 -
 nova/api/openstack/v2/schemas/v1.1/images.rng      |    6 -
 .../api/openstack/v2/schemas/v1.1/images_index.rng |   15 -
 nova/api/openstack/v2/schemas/v1.1/limits.rng      |   28 -
 nova/api/openstack/v2/schemas/v1.1/metadata.rng    |    9 -
 nova/api/openstack/v2/schemas/v1.1/server.rng      |   59 -
 nova/api/openstack/v2/schemas/v1.1/servers.rng     |    6 -
 .../openstack/v2/schemas/v1.1/servers_index.rng    |   15 -
 nova/api/openstack/v2/schemas/v1.1/version.rng     |   17 -
 nova/api/openstack/v2/schemas/v1.1/versions.rng    |   11 -
 nova/api/openstack/v2/server_metadata.py           |  175 -
 nova/api/openstack/v2/servers.py                   | 1123 ------
 nova/api/openstack/v2/urlmap.py                    |  297 --
 nova/api/openstack/v2/versions.py                  |  236 --
 nova/api/openstack/v2/views/addresses.py           |   52 -
 nova/api/openstack/v2/views/flavors.py             |   62 -
 nova/api/openstack/v2/views/images.py              |  139 -
 nova/api/openstack/v2/views/limits.py              |   96 -
 nova/api/openstack/v2/views/servers.py             |  193 -
 nova/api/openstack/v2/views/versions.py            |   94 -
 nova/api/openstack/volume/__init__.py              |   99 +
 nova/api/openstack/volume/contrib/__init__.py      |   32 +
 nova/api/openstack/volume/extensions.py            |   44 +
 nova/api/openstack/volume/snapshots.py             |  183 +
 nova/api/openstack/volume/types.py                 |   89 +
 nova/api/openstack/volume/versions.py              |   83 +
 nova/api/openstack/volume/views/__init__.py        |   16 +
 nova/api/openstack/volume/views/versions.py        |   37 +
 nova/api/openstack/volume/volumes.py               |  254 ++
 nova/api/openstack/xmlutil.py                      |    4 +-
 nova/auth/manager.py                               |    2 +-
 nova/common/cfg.py                                 |    8 +-
 nova/flags.py                                      |   14 +-
 nova/service.py                                    |    9 +-
 nova/tests/api/openstack/compute/__init__.py       |   16 +
 .../api/openstack/compute/contrib/__init__.py      |   15 +
 .../api/openstack/compute/contrib/test_accounts.py |  162 +
 .../compute/contrib/test_admin_actions.py          |  250 ++
 .../openstack/compute/contrib/test_cloudpipe.py    |  234 ++
 .../compute/contrib/test_console_output.py         |   97 +
 .../compute/contrib/test_createserverext.py        |  430 +++
 .../compute/contrib/test_deferred_delete.py        |  120 +
 .../openstack/compute/contrib/test_disk_config.py  |  252 ++
 .../compute/contrib/test_extendedstatus.py         |   76 +
 .../compute/contrib/test_flavors_extra_specs.py    |  184 +
 .../compute/contrib/test_floating_ip_dns.py        |  260 ++
 .../compute/contrib/test_floating_ip_pools.py      |   73 +
 .../openstack/compute/contrib/test_floating_ips.py |  329 ++
 .../api/openstack/compute/contrib/test_hosts.py    |  174 +
 .../api/openstack/compute/contrib/test_keypairs.py |  175 +
 .../openstack/compute/contrib/test_multinic_xs.py  |  113 +
 .../api/openstack/compute/contrib/test_networks.py |  137 +
 .../api/openstack/compute/contrib/test_quotas.py   |  193 +
 .../api/openstack/compute/contrib/test_rescue.py   |   79 +
 .../compute/contrib/test_security_groups.py        | 1013 +++++
 .../compute/contrib/test_server_action_list.py     |  103 +
 .../compute/contrib/test_server_diagnostics.py     |   86 +
 .../compute/contrib/test_simple_tenant_usage.py    |  339 ++
 .../openstack/compute/contrib/test_snapshots.py    |  299 ++
 .../api/openstack/compute/contrib/test_users.py    |  154 +
 .../compute/contrib/test_virtual_interfaces.py     |   93 +
 .../openstack/compute/contrib/test_volume_types.py |  209 ++
 .../contrib/test_volume_types_extra_specs.py       |  198 +
 .../api/openstack/compute/contrib/test_volumes.py  |  239 ++
 .../api/openstack/compute/contrib/test_vsa.py      |  715 ++++
 .../api/openstack/compute/contrib/test_zones.py    |  284 ++
 .../api/openstack/compute/extensions/__init__.py   |   15 +
 .../api/openstack/compute/extensions/foxinsocks.py |   93 +
 nova/tests/api/openstack/compute/test_api.py       |  122 +
 nova/tests/api/openstack/compute/test_auth.py      |  319 ++
 nova/tests/api/openstack/compute/test_consoles.py  |  297 ++
 .../tests/api/openstack/compute/test_extensions.py |  562 +++
 nova/tests/api/openstack/compute/test_flavors.py   |  652 ++++
 .../api/openstack/compute/test_image_metadata.py   |  200 +
 nova/tests/api/openstack/compute/test_images.py    | 1646 +++++++++
 nova/tests/api/openstack/compute/test_limits.py    |  939 +++++
 .../api/openstack/compute/test_server_actions.py   |  834 +++++
 .../api/openstack/compute/test_server_metadata.py  |  361 ++
 nova/tests/api/openstack/compute/test_servers.py   | 3850 ++++++++++++++++++++
 nova/tests/api/openstack/compute/test_urlmap.py    |  115 +
 nova/tests/api/openstack/compute/test_versions.py  |  668 ++++
 nova/tests/api/openstack/fakes.py                  |   32 +-
 nova/tests/api/openstack/v2/__init__.py            |   16 -
 nova/tests/api/openstack/v2/contrib/__init__.py    |   15 -
 .../api/openstack/v2/contrib/test_accounts.py      |  162 -
 .../api/openstack/v2/contrib/test_admin_actions.py |  250 --
 .../api/openstack/v2/contrib/test_cloudpipe.py     |  234 --
 .../openstack/v2/contrib/test_console_output.py    |   97 -
 .../openstack/v2/contrib/test_createserverext.py   |  430 ---
 .../openstack/v2/contrib/test_deferred_delete.py   |  120 -
 .../api/openstack/v2/contrib/test_disk_config.py   |  252 --
 .../openstack/v2/contrib/test_extendedstatus.py    |   76 -
 .../v2/contrib/test_flavors_extra_specs.py         |  184 -
 .../openstack/v2/contrib/test_floating_ip_dns.py   |  260 --
 .../openstack/v2/contrib/test_floating_ip_pools.py |   73 -
 .../api/openstack/v2/contrib/test_floating_ips.py  |  329 --
 nova/tests/api/openstack/v2/contrib/test_hosts.py  |  174 -
 .../api/openstack/v2/contrib/test_keypairs.py      |  175 -
 .../api/openstack/v2/contrib/test_multinic_xs.py   |  113 -
 .../api/openstack/v2/contrib/test_networks.py      |  137 -
 nova/tests/api/openstack/v2/contrib/test_quotas.py |  193 -
 nova/tests/api/openstack/v2/contrib/test_rescue.py |   79 -
 .../openstack/v2/contrib/test_security_groups.py   | 1013 -----
 .../v2/contrib/test_server_action_list.py          |  103 -
 .../v2/contrib/test_server_diagnostics.py          |   86 -
 .../v2/contrib/test_simple_tenant_usage.py         |  339 --
 .../api/openstack/v2/contrib/test_snapshots.py     |  299 --
 nova/tests/api/openstack/v2/contrib/test_users.py  |  154 -
 .../v2/contrib/test_virtual_interfaces.py          |   93 -
 .../api/openstack/v2/contrib/test_volume_types.py  |  209 --
 .../v2/contrib/test_volume_types_extra_specs.py    |  198 -
 .../tests/api/openstack/v2/contrib/test_volumes.py |  239 --
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |  714 ----
 nova/tests/api/openstack/v2/contrib/test_zones.py  |  284 --
 nova/tests/api/openstack/v2/extensions/__init__.py |   15 -
 .../api/openstack/v2/extensions/foxinsocks.py      |   93 -
 nova/tests/api/openstack/v2/test_api.py            |  121 -
 nova/tests/api/openstack/v2/test_auth.py           |  314 --
 nova/tests/api/openstack/v2/test_consoles.py       |  297 --
 nova/tests/api/openstack/v2/test_extensions.py     |  557 ---
 nova/tests/api/openstack/v2/test_flavors.py        |  652 ----
 nova/tests/api/openstack/v2/test_image_metadata.py |  200 -
 nova/tests/api/openstack/v2/test_images.py         | 1646 ---------
 nova/tests/api/openstack/v2/test_limits.py         |  939 -----
 nova/tests/api/openstack/v2/test_server_actions.py |  834 -----
 .../tests/api/openstack/v2/test_server_metadata.py |  361 --
 nova/tests/api/openstack/v2/test_servers.py        | 3849 -------------------
 nova/tests/api/openstack/v2/test_urlmap.py         |  115 -
 nova/tests/api/openstack/v2/test_versions.py       |  668 ----
 nova/tests/api/openstack/volume/__init__.py        |   16 +
 nova/tests/api/openstack/volume/test_snapshots.py  |  299 ++
 nova/tests/api/openstack/volume/test_types.py      |  166 +
 nova/tests/api/openstack/volume/test_volumes.py    |  179 +
 nova/tests/integrated/api/client.py                |    8 +-
 nova/tests/integrated/integrated_helpers.py        |   10 +-
 nova/tests/integrated/test_extensions.py           |    9 +-
 nova/tests/integrated/test_volumes.py              |  158 +-
 setup.py                                           |    3 +-
 261 files changed, 31083 insertions(+), 29492 deletions(-)

commit 26de3426d471c447cef1bd8a1129027821136241
Merge: 74f9bfe 8e57055
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 08:05:32 2012 +0000

    Merge "First implementation of bp/live-migration-resource-calc"

commit 74f9bfeb0d0bbb7a7af570c80ee478c7433762d7
Merge: 6d80851 a0ab483
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jan 13 07:53:58 2012 +0000

    Merge "Imported Translations from Launchpad"

commit 59e8ae1362f33ab30b2dc900dcbde30efc5a57c8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jan 11 12:35:42 2012 -0800

    Implement more complete kombu reconnecting
    
    Fixes bug 888621
    
    We were missing some wrapping around when consumers are declared and
    a case where we had an exception we weren't trapping.  In the latter
    case, it's not easy to trap it because you'd have to bypass the kombu
    interface and import amqplib and try to trap one of its exceptions.
    What I've implemented here looks for 'timeout' in any exception, even
    though I really don't like it. :)
    
    Fixes HACKING violations while I'm at it.
    
    Change-Id: I0132fbc4377e221b0a366d0340652147ddb33c87

 nova/rpc/impl_kombu.py       |  203 ++++++++++++++++++++++++++++--------------
 nova/tests/rpc/test_kombu.py |  114 ++++++++++++++++++++++++
 2 files changed, 250 insertions(+), 67 deletions(-)

commit 8e57055cecef909b4d210baeedb5dad2d155a0a2
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 6 23:54:54 2012 +0900

    First implementation of bp/live-migration-resource-calc
    
    Fix based on revewer's comment
    
    upgraded the migration version
    nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py
    
    rebase on master
    
    Change-Id: Ia762f8dec761c3d595bc6fcd39f127f6d92306d2

 Authors                                            |    2 +
 bin/nova-manage                                    |  107 +++++++++++--------
 nova/compute/manager.py                            |   22 +++-
 .../migrate_repo/versions/069_block_migration.py   |   50 +++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/exception.py                                  |    4 +
 nova/scheduler/driver.py                           |  111 ++++++++++++++------
 nova/scheduler/manager.py                          |    3 +
 nova/scheduler/multi.py                            |    2 +-
 nova/tests/fake_libvirt_utils.py                   |    2 +-
 nova/tests/scheduler/test_scheduler.py             |   54 ++++++++--
 nova/tests/test_compute.py                         |    4 +
 nova/tests/test_instance_types.py                  |    2 +-
 nova/tests/test_libvirt.py                         |   94 +++++------------
 nova/tests/test_virt_drivers.py                    |    5 -
 nova/virt/fake.py                                  |    6 +-
 nova/virt/libvirt/connection.py                    |   77 ++++++++++----
 17 files changed, 357 insertions(+), 189 deletions(-)

commit 841d473b78454a25506b2ffabe00ba85dee7343a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 22:08:04 2012 -0800

    Remove 'status' from default snapshot properties
    
    * status is only used by our ec2 api
    * clean up the _create_image code
    
    Change-Id: I2ed43b3b42bb74bb4ccea795f77d66c425ab9e64

 nova/compute/api.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit ffdabac84c3a8dc528a6b64280cddf82f79463d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 21:28:49 2012 -0800

    Clean up disk_format mapping in xenapi.vm_utils
    
    Change-Id: I0ffd375c7655d66d807b10ebdb16f17024309749

 nova/tests/test_xenapi.py    |   50 +++++++++++-------------------------------
 nova/virt/xenapi/vm_utils.py |   47 +++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 64 deletions(-)

commit 6d80851279052a30b98e465106f158cb2afdb6a5
Merge: 90903a0 021b4d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 05:20:26 2012 +0000

    Merge "Remove skipping of 2 tests"

commit 90903a0ca8b85afcbb35a1c194a56753990888dc
Merge: fd3cad6 ccaf97a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 13 05:00:44 2012 +0000

    Merge "Ensure nova is compatible with WebOb 1.2+"

commit 021b4d576c834c120c8e54df4691a49880261f14
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jan 12 19:11:53 2012 -0800

    Remove skipping of 2 tests
    
    This fixes bug 892005.  Vish put in the real fix, which is to check for
    Mock objects in to_primitive.  This patch re-enables 2 skipped tests that
    work now.
    
    Change-Id: I0b193cf2df987a10ea16f41ae9f39e96426c496a

 nova/tests/test_compute.py |    2 --
 1 file changed, 2 deletions(-)

commit fd3cad62732afddec6708f330b1ce967349125b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 12 14:27:50 2012 -0800

    Make authz failures use proper response code
    
     * Improvement for blueprint interim-nova-authz-service
     * Added tests to verify raise
    
    Change-Id: Ibf6bc3327abab1f3ae752aa350f1628c67b03260

 nova/api/openstack/wsgi.py            |    3 +++
 nova/tests/api/openstack/fakes.py     |    9 +++++++++
 nova/tests/api/openstack/test_wsgi.py |   22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)

commit 6f2bf0994aabb110325491b8e6d6e929fb83c37f
Merge: a0d6956 c3c10e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 23:26:52 2012 +0000

    Merge "Adds test for local.py"

commit a3b7a31f1f21acbd8ae3604634310e7b832fc7ae
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 15:17:16 2012 -0800

    Remove compute.api.API.add_network_to_project
    
    This method doesn't appear to be used. Call network api directly
    if you need similar functionality.
    
    Change-Id: Ie0f397b6de244e8442b3f9f2e05633e4ca106697

 nova/compute/api.py |   10 ----------
 1 file changed, 10 deletions(-)

commit a0d6956ca911001d58fff44beaf1336ae1a9a84b
Merge: 0815320 08a7239
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 22:43:31 2012 +0000

    Merge "Remove network_api from Servers Controller"

commit c3c10e16f8cd86b7ea6abf775024f74efe24e26f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jan 12 22:14:15 2012 +0000

    Adds test for local.py
    
    Change-Id: Ia25cd85bb9f9f8c79d18525ebabd9717b81ca3a3

 nova/tests/test_local.py |   53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit 0815320b5b1df711bed25704fd7542a4841c0a04
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 14:00:59 2012 -0800

    Fix policy import in nova.compute.api
    
    Change-Id: Id9c7cb3563e34c27ea9f956ce18d2aed403a0f82

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 08a7239a20eb5e40619b360c13fda41c11708553
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jan 12 13:44:56 2012 -0800

    Remove network_api from Servers Controller
    
    Change-Id: I7f2379286c6a6ccb758f14d5ec642b02173435a2

 nova/api/openstack/v2/servers.py |    2 --
 1 file changed, 2 deletions(-)

commit dd63106bdc36a13b857ba8743b018e98df5739b6
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Jan 12 13:37:58 2012 -0800

    minor fix in comment
    
    Change-Id: I2bdb78e8dfaa504f5b9969606871c832e7936bd7

 nova/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e40ee23abab92f863f53f6ba4041e3e04cf2a89f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 12 11:13:42 2012 -0800

    Updates linux_net to ignore some shell errors
    
     * Allows exit 254 from ip add and ip del
     * Allows exit 7 from route add and route del
     * These exit codes means the ip/route already existed or was
       already removed
     * Fixes bug 915556
    
    Change-Id: Ib71da2351372f3c7e3558cf5b3e9f55e10681875

 nova/network/linux_net.py |   29 +++++++++++++++--------------
 nova/network/manager.py   |    3 +--
 2 files changed, 16 insertions(+), 16 deletions(-)

commit ace0252d75fa169df3eb1c7171c122e8733649a7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Dec 30 13:11:56 2011 -0800

    Add policy checks to Compute.API
    
     * Second step of blueprint interim-nova-authz-service
     * Adds policy.json to define policy
     * Add nova.policy.wrap_enforce decorator
     * wrap majority of compute api functions with wrap_enforce
    
    Change-Id: If6702873db3249921f931a42e889ee7d0338e4b8

 etc/nova/policy.json       |   73 ++++++++++++++++++++++++++
 nova/common/policy.py      |    6 +--
 nova/compute/api.py        |   98 +++++++++++++++++++++++++++++++----
 nova/exception.py          |    2 +-
 nova/policy.py             |   10 ++--
 nova/tests/policy.json     |   77 +++++++++++++++++++++++----
 nova/tests/test_compute.py |  123 ++++++++++++++++++++++++++++++++++++++++++--
 nova/tests/test_policy.py  |   12 ++---
 8 files changed, 363 insertions(+), 38 deletions(-)

commit ccaf97a5544ca0660cb46d9743ffa06470e5c37a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jan 4 18:54:45 2012 -0500

    Ensure nova is compatible with WebOb 1.2+
    
    Fixes bug 888371
    
    Change-Id: I965c15f9f18b835b666c60b2ab1e6089c0fb4121

 nova/api/openstack/v2/contrib/floating_ip_dns.py |    4 ++--
 nova/api/openstack/v2/extensions.py              |    1 +
 nova/api/openstack/v2/images.py                  |    4 ++--
 nova/objectstore/s3server.py                     |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

commit e0680250c052fd3eaccd821eaf584b7a15c4c656
Merge: 395f2b6 932f3aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 18:09:56 2012 +0000

    Merge "Unbreak start instance and fixes bug 905270"

commit 395f2b6796d2d256aa5d5cbe58e392a808e86e61
Merge: 475691a a7c0632
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 17:53:54 2012 +0000

    Merge "Add 'os-networks' extension"

commit 144c4f954ee874982c369da60a9a794e2dca7df9
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Thu Jan 12 16:40:12 2012 +0000

    improve handling of the img_handlers config list
    
    Allow a 'loop' entry to be optional.
    Also improve the diagnostic with an empty
    or non capable list.
    
    Change-Id: Iec395497e43d1e84adbfc5f29a7bce82d4f91587

 nova/virt/disk/api.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 932f3aafd1c735a8ec9e158a94ebb983d6baeb0e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Dec 14 16:15:52 2011 +0900

    Unbreak start instance and fixes bug 905270
    
    This patch fixes the bug 905270
    https://bugs.launchpad.net/nova/+bug/905270
    
    According to EC2 documentation, EBS-instances that initiated shutdown
     result in stopped state.  And then it can be started again.  (On the
     other hand non-EBS instance result in terminted when instance
     initiated shutdown)
    
    However, the current nova case, the shutdowned instance always results
     in terminated status.  As related issues are
     - describe-instance-attribute instance_initiated_shutdown_behavior doesn't
       work correctly
     - instance attribute disable_api_termination isn't supported
     - stop instance was broken by the change set of the following.
       It needs unbreak.
    
      > commit eb03d47fecd3bfc24243da29ee01679b334a08fe
      >  Author: Vishvananda Ishaya <vishvananda@gmail.com>
      >  Date: Fri Sep 23 09:22:32 2011 -0700
      >
      >    Remove AoE, Clean up volume code
      >
      >     * Removes Ata Over Ethernet
      >     * Adds drivers to libvirt for volumes
      >     * Adds initialize_connection and terminate_connection to volume api
      >     * Passes connection info back through volume api
      >
      >  Change-Id: I1b1626f40bebe8466ab410fb174683293c7c474f
    
    This patch
    - unbreak start instance
    - implement instance_initiated_shutdown_behavior and make it EC2 compatible
    - implement disable_api_termination
    
    ---
    Changes 5 -> 6:
    - fixes to catch up 26b7b9457a5899ecca93fd67d3879efcad4e4968
    
    Changes 4 -> 5:
    - HACKING compilance
    
    Changes 3 -> 4:
    - rebased to 4c5586a28fd7a085369c49f6039876ffdc86b526
      sqlalchemy migrate version
    
    Changes 2 -> 3:
    - rename long name to shorter one
      s/instance_initiated_shutdown_behavior/shutdown_terminate/g
      s/disable_api_termination/disable_terminate/g
      as suggested Kevin L. Mitchell
    - improved nova.api.ec2.cloud._state_description
    - pep8
    - broken out patches are available for easy review at
      git://github.com/yamahata/nova.git lp905270-2
    
    Changes 1 -> 2:
    - fixed an unit test failure pointed out by Mark.
      (I think ebtabls failure strongly suggests installation problem)
    - introduce vm_states.SHUTOFF and put instance state which is in
      power_state.{NOSTATE, SHUTOFF} into vm_states.SHUTOFF.
    - simplified logic a bit by vm_states.SHUTOFF as suggested by Vish.
    - instance_initiated_shutdown_behavior:String(255)
       =>
      instance_initiated_shutdown_terminate:Boolean()
      as suggested by Vish.
    - Added Johannes Erdfelt to reviews as they written the vm_states state
      machine checker.
      I'd have liked to add David Subiros either, but he doesn't seem to be a
      registered user of the gerrit.
    
    Change-Id: Ibeb94f65137feadad2c343913b39195e3f96a35e

 nova/api/ec2/cloud.py                              |   65 +++++++-----
 nova/api/ec2/inst_state.py                         |   60 +++++++++++
 nova/api/openstack/common.py                       |    3 +
 nova/compute/api.py                                |   70 ++++++++----
 nova/compute/manager.py                            |   25 +++--
 nova/compute/vm_states.py                          |    1 +
 .../versions/068_add_instance_attribute.py         |   38 +++++++
 nova/db/sqlalchemy/models.py                       |    8 ++
 nova/tests/api/ec2/test_cloud.py                   |  112 +++++++++++++++++++-
 nova/tests/api/openstack/fakes.py                  |    4 +-
 nova/tests/test_compute.py                         |   76 +++++++++++--
 nova/virt/driver.py                                |    4 +-
 nova/virt/fake.py                                  |    3 +-
 nova/virt/hyperv.py                                |    3 +-
 nova/virt/libvirt/connection.py                    |   10 +-
 nova/virt/vmwareapi_conn.py                        |    3 +-
 nova/virt/xenapi_conn.py                           |    3 +-
 17 files changed, 401 insertions(+), 87 deletions(-)

commit 475691a4bd5795feb50b5c9ccfe98e6487390e58
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jan 11 20:25:23 2012 -0800

    catch InstanceInvalidState in more places
    
    Further fixes to bug 911879
    
    500s or 400s are returned in the OS API when actions are denied due
    to being in an invalid state.  409 should be returned, instead.  A
    previous review (2846) fixed the delete case and this fixes more.
    
    When writing tests, I found a number of exceptions that are not raised
    anymore, and they were being incorrectly used in tests still.  I fixed
    those up.
    
    Change-Id: I0d5b1ed52e0cc9766be8e2a7de84c8601f4bdf26

 nova/api/openstack/common.py                       |   15 +++
 nova/api/openstack/v2/contrib/admin_actions.py     |   27 ++++-
 nova/api/openstack/v2/contrib/deferred_delete.py   |   14 ++-
 nova/api/openstack/v2/servers.py                   |   30 +++--
 nova/api/openstack/wsgi.py                         |    2 +-
 nova/exception.py                                  |   16 ---
 nova/tests/api/openstack/test_common.py            |   33 +++++-
 .../api/openstack/v2/contrib/test_admin_actions.py |   52 ++++++++-
 .../openstack/v2/contrib/test_deferred_delete.py   |  120 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_server_actions.py |   59 +++++++++-
 10 files changed, 324 insertions(+), 44 deletions(-)

commit 4714c705d9735f27181d3fa754f6a1b4816a3051
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Jan 12 06:38:23 2012 +0000

    Fix some cfg test case naming conflicts
    
    As pointed out by Vish, there are duplicates of:
    
      OverridesTestCase::test_default_override
      OverridesTestCase::test_override
      SadPathTestCase::test_conf_file_not_found
    
    Also, rename the ConfigFileOptsTestCase so it is obvious they
    don't clash with the tests by the same name in CliOptsTestCase.
    
    Change-Id: I5cda3c4796b98eaf0e99589579d0b3bceaf9cd8b

 nova/tests/test_cfg.py |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit 6ece432be0cfb7356636806ab3c046eff17d494b
Merge: 5a3901a eac7888
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 04:43:28 2012 +0000

    Merge "Blueprint xenapi-security-groups"

commit 5a3901a97669453122092c49a2355fea08d7b3a4
Merge: 22d1029 09fffd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 01:26:49 2012 +0000

    Merge "Fix metadata mapping in s3._s3_parse_manifest."

commit 22d10296c0371dc0f5990d335e3239d80978a773
Merge: 31ae0cf 26b7b94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 00:02:34 2012 +0000

    Merge "Call to instance_info_cache_delete to use uuid"

commit 31ae0cf22ab7692039e17e3a534cf5db1fbfa4c7
Merge: b7f80d0 e988f43
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 22:45:35 2012 +0000

    Merge "Fix libguestfs operation with specified partitions"

commit b7f80d017035b1b821a0f2deca9a6e2046882a2a
Merge: 52a64df 3d0311d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 22:35:15 2012 +0000

    Merge "Don't overwrite local context on elevated"

commit 52a64dfd0b9f9fc169e50c79f557eb2da022d537
Merge: 4d01531 3e015b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 22:05:41 2012 +0000

    Merge "Remove 'location' from GlanceImageService"

commit 3e015b869789c7aeeb90e160ede3b3a7b7921f30
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jan 11 13:27:29 2012 -0800

    Remove 'location' from GlanceImageService
    
    Glance no longer returns location through its public API, so we
    should not attempt to display it. Addresses bug 911599.
    
    Change-Id: I3400006eb6ab94095c0c2d2b5dc90cb9b7775a84

 .mailmap                        |    1 +
 nova/image/glance.py            |    2 +-
 nova/tests/image/test_glance.py |    6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)

commit 4d01531f91e4b20db2cb6ff738ee9af724ed2bf1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 11 13:22:36 2012 -0800

    Makes common/cfg.py raise AttributeError
    
     * fixes bug 915039
     * includes test
    
    Change-Id: I67b886be3b5af3763f52fffe54085975d61d61eb

 nova/common/cfg.py     |    2 +-
 nova/tests/test_cfg.py |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 0bbf67cf396dedfe05b1d9ae2d8fb0cefb5b2a8e
Merge: 98e385e 26e646f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 20:41:05 2012 +0000

    Merge "fix reboot_instance typo"

commit 26b7b9457a5899ecca93fd67d3879efcad4e4968
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jan 11 19:43:26 2012 +0000

    Call to instance_info_cache_delete to use uuid
    
    Fixes bug 903497
    Also updated incorrect calls to instance_destroy that were using uuids.
    
    Change-Id: I25eead020ceb7ebf7234c268543ad77d8ecf1185

 nova/db/api.py               |   18 ++++----
 nova/db/sqlalchemy/api.py    |   24 +++++-----
 nova/db/sqlalchemy/models.py |    1 -
 nova/tests/test_compute.py   |  100 +++++++++++++++++++++---------------------
 nova/tests/test_db_api.py    |    2 +-
 5 files changed, 73 insertions(+), 72 deletions(-)

commit 98e385e0b0b00ccdfba62ccd4f5fc64d6bfa3328
Merge: 568577b 8e2d6ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 19:04:59 2012 +0000

    Merge "Add @utils.deprecated()."

commit 568577bc009a1803cca77b4bb02ccb4dbcd2f35c
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Wed Jan 11 18:11:48 2012 +0000

    Bug #914907: register_models in db/sqlalchemy/models.py references non-existent ExportDevice
    
    Remove ExportDevice from register_models as this no longer exists.
    
    Change-Id: I68555eb33e035fa3669e4ac4b77cb2c0598cf52c

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fb4a138bc5791d23e6f302b78da13ea99a511f26
Merge: 259b436 691da4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 16:50:50 2012 +0000

    Merge "Update logging in compute manager to use uuids"

commit 259b4367a7c38f27d80113cb4bea2d00f4842285
Merge: c9c09bd 9e21a22
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 16:31:07 2012 +0000

    Merge "nova-manage floating ip fixes"

commit 691da4d6e8ac1fd12256a9fe3d1a1ebb425e5bbc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jan 11 15:46:24 2012 +0000

    Update logging in compute manager to use uuids
    
    Fixes bug 914814
    
    Change-Id: I8f6c5335f6e9e26e9e8304a54ca31d967227dfc3

 nova/compute/manager.py |   81 +++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

commit c9c09bd60e7a0e0258d218a31d7878755bea1395
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jan 11 13:48:29 2012 +0100

    Do not overwrite project_id from request params
    
    Prevent project_id overwriting from OSAPI request parameters.
    The patch is actually very simple (nova/api/openstack/wsgi.py) but
    needs significant test adjustments (nova/tests/*) to pass.
    
    Fixes bug 904072. Patch from Vish Ishaya and Mark McLoughlin.
    
    Change-Id: I66ea0f178ce6271ec1020e9f1a73bd4e8c83ddab

 nova/api/openstack/wsgi.py                         |    6 +-
 .../api/openstack/v2/contrib/test_cloudpipe.py     |   13 +-
 .../openstack/v2/contrib/test_console_output.py    |    8 +-
 .../openstack/v2/contrib/test_createserverext.py   |    8 +-
 .../openstack/v2/contrib/test_extendedstatus.py    |    2 +-
 .../v2/contrib/test_flavors_extra_specs.py         |   22 ++--
 .../api/openstack/v2/contrib/test_floating_ips.py  |   22 ++--
 .../api/openstack/v2/contrib/test_keypairs.py      |    8 +-
 .../api/openstack/v2/contrib/test_multinic_xs.py   |    8 +-
 nova/tests/api/openstack/v2/contrib/test_quotas.py |    8 +-
 nova/tests/api/openstack/v2/contrib/test_rescue.py |    6 +-
 .../openstack/v2/contrib/test_security_groups.py   |  134 ++++++++++----------
 .../v2/contrib/test_simple_tenant_usage.py         |    9 +-
 .../api/openstack/v2/contrib/test_snapshots.py     |   14 +-
 .../v2/contrib/test_virtual_interfaces.py          |    2 +-
 .../api/openstack/v2/contrib/test_volume_types.py  |   16 +--
 .../v2/contrib/test_volume_types_extra_specs.py    |    2 +-
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |   38 +++---
 nova/tests/api/openstack/v2/test_extensions.py     |   34 ++---
 nova/tests/api/openstack/v2/test_image_metadata.py |    2 +-
 nova/tests/api/openstack/v2/test_servers.py        |   36 +++---
 nova/tests/api/openstack/v2/test_urlmap.py         |    4 +-
 22 files changed, 202 insertions(+), 200 deletions(-)

commit bd035a5a6d2d36102986da491c996f1c17fcda40
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Jan 11 07:19:59 2012 +0000

    Add optional revision field to version number
    
    Add a revision field to the version number to account for releases from
    the stable branch, e.g. 2011.3.1.
    
    See http://wiki.openstack.org/StableBranchRelease
    
    Change-Id: I34238a5639d34c9cf44655775a6be80fdd446233

 nova/version.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a0ab483a730432437a8196bc8b0dd0c80ab5f5a9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jan 11 01:34:37 2012 +0000

    Imported Translations from Launchpad
    
    Change-Id: I19a14a2ecda40a511d0f90f1e32d29e2a2e44151

 po/bs.po | 2801 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/es.po |  332 ++++----
 2 files changed, 2966 insertions(+), 167 deletions(-)

commit 9e21a2228c191896223daae2379fcf1352cc736c
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Tue Jan 10 15:18:07 2012 -0600

    nova-manage floating ip fixes
    
    * Add pool, interface to 'floating list' output
      These columns were added to the floating_ips table in
      https://review.openstack.org/2892 and are not visible elsewhere
    * Fix 'floating delete' to skip network/broadcast addresses
      Makes the delete command match the create command behaviour
      introduced in https://review.openstack.org/2663
    * Address changes listed in bug 817281
      Change host column in output to project ID, change hostname
      column to uuid
    
    Change-Id: Ibbfbe9ed5543927a6b2a1e676f5617901a32f897

 bin/nova-manage |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 4c5586a28fd7a085369c49f6039876ffdc86b526
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Mon Jan 2 17:31:36 2012 -0600

    Add a modify function to the floating ip dns api.
    
    Removed the dns driver function rename_entry().  Since 'name'
    is the unique identifier for an entry, trying to rename things
    causes various confusions.  Better to leave the user to
    delete and recreate.
    
    For blueprint public-and-private-dns.
    
    Change-Id: I766af01299b7b28ad8d9f6c072a8f3e049bd286b

 doc/source/api_ext/ext_floating_ip_dns.rst         |   19 +++++++++++++++++
 nova/api/openstack/v2/contrib/floating_ip_dns.py   |   22 ++++++++++++++++++++
 nova/network/api.py                                |    9 ++++++++
 nova/network/dns_driver.py                         |    3 ---
 nova/network/manager.py                            |    4 ++++
 nova/network/minidns.py                            |   18 ++++------------
 .../openstack/v2/contrib/test_floating_ip_dns.py   |   18 ++++++++++++++++
 nova/tests/test_network.py                         |   21 ++++++++++---------
 8 files changed, 87 insertions(+), 27 deletions(-)

commit 5165320257b18ca1917727c1ae1d3cdde366d85d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jan 9 21:51:09 2012 +0000

    Adding the request id to response headers.
    
    bp:nova-request-response-id
    
    Change-Id: Ie2d49337010f6e7a540018f9c8d542b6c8ebbce2

 nova/api/openstack/wsgi.py            |    5 ++++-
 nova/tests/api/openstack/test_wsgi.py |   21 +++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

commit 52cd737df4e220291185d1145e4c124d93c39664
Merge: 927fd8b 421e5cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 20:18:36 2012 +0000

    Merge "Bug #894683: nova.service does not handle attribute specific exceptions and client hangs"

commit 927fd8b0e1e7c323fcb65a7bb1d2566828a10e6b
Merge: 2d8bf10 77269f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 20:08:21 2012 +0000

    Merge "libvirt: implements boot from ISO images"

commit 2d8bf10a223b2c316d7e6f98b8680b037f3680fc
Merge: 5acc4af e231a05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 19:06:53 2012 +0000

    Merge "Isolate certain images on certain hosts."

commit 5acc4af6dc17c3124644f69717730015d9e7cdf1
Merge: 799801f b99a5b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 17:39:26 2012 +0000

    Merge "Fix call to compute_api.resize from _migrate"

commit 8e2d6abc28cf749baed1ce545b09a1c5520b93eb
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jan 10 11:22:33 2012 -0600

    Add @utils.deprecated().
    
    This will allow us to mark deprecated classes and functions/methods as
    such.  A warning is issued each time a deprecated function/method is
    called, or when a deprecated class is instantiated, or when any class
    or static method on a deprecated class is called.
    
    Change-Id: I4b5858492bc14768ac2e12c542bc343962761e34

 nova/tests/test_utils.py |  110 +++++++++++++++++++++++++++++
 nova/utils.py            |  171 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 280 insertions(+), 1 deletion(-)

commit eac7888e722759b7c9a0d7841dfe8b26dfd77897
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Nov 7 12:01:11 2011 +0000

    Blueprint xenapi-security-groups
    
    Provides two drivers for implementing security groups in xenapi:
    1) domU driver that enforces security groups on the Openstack virtual appliance (use advised with FlatDHCP in HA mode)
    2) dom0 driver that enforces security groups where VIFs are attached
    
    Both drivers translate security groups into iptables rules.
    Existing libvirt code has been refactored to reduce the amount of duplicated code to a minimum
    
    Now Addressing reviewers's comments on style. Fixing issue spotted with snapshots
    Change-Id: Ifa16a8f2508a709be03241bac0f942fe1a51d1e8

 nova/compute/manager.py                            |    1 -
 nova/flags.py                                      |    5 +-
 nova/tests/test_xenapi.py                          |  292 ++++++++++++++++-
 nova/tests/xenapi/stubs.py                         |   89 +++++-
 nova/virt/firewall.py                              |  336 ++++++++++++++++++++
 nova/virt/libvirt/connection.py                    |    6 -
 nova/virt/libvirt/firewall.py                      |  265 +--------------
 nova/virt/libvirt/netutils.py                      |   44 ---
 nova/virt/libvirt/vif.py                           |    3 +-
 nova/virt/netutils.py                              |   44 +++
 nova/virt/xenapi/fake.py                           |    4 +-
 nova/virt/xenapi/firewall.py                       |   70 ++++
 nova/virt/xenapi/vm_utils.py                       |    8 +
 nova/virt/xenapi/vmops.py                          |   42 ++-
 nova/virt/xenapi_conn.py                           |   22 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   58 +++-
 16 files changed, 959 insertions(+), 330 deletions(-)

commit 799801f856a0f3e7788e89ecdca02828fd64e6ad
Merge: fa43949 162ab4f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 16:04:34 2012 +0000

    Merge "Use instance_properties in resize."

commit b99a5b65f75cfd899ee6c4024f7af6242887c093
Author: François Charlier <francois.charlier@enovance.com>
Date:   Tue Jan 10 16:58:47 2012 +0100

    Fix call to compute_api.resize from _migrate
    
    _migrate called compute_api.resize with an instance id,
    compute_api.resize expects an instance object.
    
    Change-Id: I0ab9ac48f8d7b4d5d92e0212969cc8febc5cf82b

 nova/api/openstack/v2/contrib/admin_actions.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 09fffd6928f5fa371ec66857eef394852b6c25e0
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Tue Jan 10 23:08:13 2012 +0800

    Fix metadata mapping in s3._s3_parse_manifest.
    
    Fixes bug #827617
    
    Fixes incorrect output of the following euca2ools commands:
        'euca-describe-images'
        'euca-describe-instances'
    Which occours when user published 'ami' image with 'ari&aki' or 'aki'
    image(s).
    
    Fixes minor typo:
        'manifext' -> 'manifest'
    
    Change-Id: If32357e3ea6685476df9dbb6e74af710153457b9

 nova/image/s3.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e988f431d86660318b46729dea6e772083f2248d
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Tue Jan 10 10:54:21 2012 +0000

    Fix libguestfs operation with specified partitions
    
    * nova/virt/disk/guestfs.py (mnt_dev): Convert the partition
    parameter to int, so we now support a "1" string passed from
    nova/virt/libvirt/connection.py.  Also diagnose any
    unconvertible strings.
    
    Change-Id: I744bd1fc3ea065891b5ce112dbe27f73086f302e

 nova/virt/disk/guestfs.py |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 26e646f16d0d850c53284dfb09198550ee079f5b
Author: lzyeval <lzyeval@gmail.com>
Date:   Tue Jan 10 20:37:41 2012 +0800

    fix reboot_instance typo
    
    Fixed bug #909745
    
    Change-Id: I67fa47ae339f03290f21414e1eaae4c4e477424d

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa43949c05ff4e5165baa2f0a0f1555e94bcf212
Merge: ef6058a 26b24b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 12:31:48 2012 +0000

    Merge "Adds support for floating ip pools"

commit ef6058a44649715d5215958475c444ad811fe491
Merge: c33bd50 66ce7da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 03:22:58 2012 +0000

    Merge "fix bug 914049: private key in log"

commit c33bd50a79571e64267bd8d5762bd94f7ef5ca81
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Mon Jan 9 17:03:15 2012 +0800

    Fix bad test cases in smoketest.
    
    Fixes bug #912650.
    
    Fixes the following test cases in
    smoketests/test_netadmin.py:SecurityGroupTests:
        'test_004_can_access_metadata_over_public_ip'
        'test_005_validate_metadata'
        'test_999_tearDown'
    
    Change-Id: Iefa8034a364e13243d06200e8af1840df896baf3

 smoketests/test_netadmin.py |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit 66ce7da18603a1cb0b4f500b6abb83ca264b0ccf
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Jan 9 17:42:03 2012 -0800

    fix bug 914049: private key in log
    
    Change-Id: Id004257ae425291bb18427c5d9b03602a62da043

 nova/api/ec2/apirequest.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 6fdbf6ce7fb4c5ac4282f20a68da2e8795f19817
Merge: 51c0d54 01e6f75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 10 02:03:25 2012 +0000

    Merge "Adds simple policy engine support"

commit 3d0311df9e3fccf96bde34e72f8011843941ac98
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 9 16:07:43 2012 -0800

    Don't overwrite local context on elevated
    
     * Adds an 'overwrite' parameter to context.__init__
     * Overwrite is set to false for elevated and get_admin_context
     * Fixes bug 899302
    
    Change-Id: Ic9464e5813d6db38c48239c7ea8f15aa1bff5562

 nova/context.py |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 51c0d545253b9f5618d1923aea3f7061da6cd60b
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Fri Jan 6 00:22:52 2012 -0600

    Bug 885267: Fix GET /servers during instance delete
    
    There is a period during an instance delete when GET /servers
    will fail occasionally.  The race condition is during GET /servers
    between the initial get_all() and when the extended_status extension
    re-retrieves individual servers via compute.api.routing_get().
    We log a warning and remove the offending server from the list
    as it no longer exists.
    
    Change-Id: Id75723a21c0d6dc20f446560847e5b8522ec3262

 nova/api/openstack/v2/contrib/extended_status.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 26b24b7e2305d9aa179a9d257b715e6d67b75573
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 4 12:47:40 2012 -0800

    Adds support for floating ip pools
    
     * Implements blueprint multiple-floating-ip-ranges
     * Adds pool and interface fields to floating ip tables
     * Adds extension to get a list of available pools
     * Optionally allows a pool to be specified when allocating
     * Changes nova-manage command to allow pool and interface
     * Ip binding uses the interface from table instead of flag
     * Adds default pool flag to use when pool is not specified
     * updates test to work with new fields
     * adds tests for extension
    
    Change-Id: Ieb4cbbf07b211697d08178b1cf2252caf75049a2

 bin/nova-manage                                    |   20 +++-
 nova/api/openstack/v2/contrib/floating_ip_pools.py |  104 ++++++++++++++++++++
 nova/api/openstack/v2/contrib/floating_ips.py      |   19 +++-
 nova/db/api.py                                     |   12 ++-
 nova/db/sqlalchemy/api.py                          |   13 ++-
 .../067_add_pool_and_interface_to_floating_ip.py   |   46 +++++++++
 nova/db/sqlalchemy/models.py                       |    3 +
 nova/network/api.py                                |   13 ++-
 nova/network/linux_net.py                          |   11 ++-
 nova/network/manager.py                            |   46 ++++++---
 nova/tests/api/ec2/test_cloud.py                   |   11 ++-
 .../openstack/v2/contrib/test_floating_ip_pools.py |   73 ++++++++++++++
 .../api/openstack/v2/contrib/test_floating_ips.py  |   17 +++-
 nova/tests/api/openstack/v2/test_extensions.py     |    2 +
 nova/tests/db/fakes.py                             |    7 +-
 nova/tests/test_network.py                         |   19 ++++
 16 files changed, 371 insertions(+), 45 deletions(-)

commit 01e6f7575a3c75bd73e297f3d9d003292e0a0e1e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 4 18:42:21 2012 -0800

    Adds simple policy engine support
    
     * First step of blueprint interim-nova-authz-service
     * Common policy engine that can be used by other projects
     * Nova specific policy engine that uses common policy
     * Policy file can be generated by external tool (dashboard)
     * Ultimately, policies will be requested from a service
    
    Change-Id: Icaf934037e790bde6ce2346746ce38b11134423b

 nova/common/policy.py     |  202 +++++++++++++++++++++++++++++++++++++++++++++
 nova/exception.py         |    4 +
 nova/policy.py            |   78 +++++++++++++++++
 nova/tests/fake_flags.py  |    2 +
 nova/tests/policy.json    |   11 +++
 nova/tests/test_policy.py |  139 +++++++++++++++++++++++++++++++
 6 files changed, 436 insertions(+)

commit c27e1ccd3f1a9cda6fff70d87aece6e50eba887d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 4 18:40:46 2012 -0800

    Refactors utils.load_cached_file
    
     * adds a boolean return representing whether file was reloaded
     * ensures file is actually closed by using a context manager
    
    Change-Id: I4d998c34caa6dde65aaf780c188778477b7f6753

 nova/tests/test_utils.py |   20 ++++++++++++++++----
 nova/utils.py            |   26 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 14 deletions(-)

commit 5b866f3ad18d497d39a35248c2b0fdb62fcfaa81
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jan 9 13:13:08 2012 -0600

    Serialization, deserialization, and response code decorators.
    
    Sets up decorators for linking serializers, deserializers, and response
    codes directly to implementation methods, rather than using parallel
    object methods.  In addition, methods are now able to return an instance
    of a ResponseObject class, binding alternative serializers; this is
    particularly useful for actions, as it enables the action processing
    method to return different objects for different actual actions.
    
    Change-Id: I8815590f29a935216dc766ce720ded638ebca0d0

 nova/api/openstack/common.py                       |   15 +
 nova/api/openstack/v2/__init__.py                  |    4 -
 nova/api/openstack/v2/consoles.py                  |   84 +-
 nova/api/openstack/v2/contrib/accounts.py          |   37 +-
 nova/api/openstack/v2/contrib/cloudpipe.py         |   45 +-
 nova/api/openstack/v2/contrib/createserverext.py   |   17 +-
 nova/api/openstack/v2/contrib/flavorextraspecs.py  |   26 +-
 nova/api/openstack/v2/contrib/floating_ip_dns.py   |   99 +-
 nova/api/openstack/v2/contrib/floating_ips.py      |   58 +-
 nova/api/openstack/v2/contrib/hosts.py             |  122 +-
 nova/api/openstack/v2/contrib/keypairs.py          |   40 +-
 nova/api/openstack/v2/contrib/quotas.py            |   38 +-
 nova/api/openstack/v2/contrib/security_groups.py   |  317 ++--
 .../api/openstack/v2/contrib/server_action_list.py |   17 +-
 .../api/openstack/v2/contrib/server_diagnostics.py |   15 +
 .../openstack/v2/contrib/simple_tenant_usage.py    |   84 +-
 nova/api/openstack/v2/contrib/users.py             |   65 +-
 .../api/openstack/v2/contrib/virtual_interfaces.py |   39 +-
 .../openstack/v2/contrib/virtual_storage_arrays.py |  256 ++-
 nova/api/openstack/v2/contrib/volumes.py           |  245 ++-
 nova/api/openstack/v2/contrib/volumetypes.py       |  111 +-
 nova/api/openstack/v2/contrib/zones.py             |  113 +-
 nova/api/openstack/v2/extensions.py                |   80 +-
 nova/api/openstack/v2/flavors.py                   |   94 +-
 nova/api/openstack/v2/image_metadata.py            |   23 +-
 nova/api/openstack/v2/images.py                    |  114 +-
 nova/api/openstack/v2/ips.py                       |   70 +-
 nova/api/openstack/v2/limits.py                    |   46 +-
 nova/api/openstack/v2/server_metadata.py           |   23 +-
 nova/api/openstack/v2/servers.py                   | 1708 ++++++++++----------
 nova/api/openstack/v2/versions.py                  |  169 +-
 nova/api/openstack/wsgi.py                         |  340 +++-
 nova/api/openstack/xmlutil.py                      |    4 +
 nova/tests/api/openstack/test_wsgi.py              |  248 ++-
 nova/tests/api/openstack/test_xmlutil.py           |    3 +-
 .../api/openstack/v2/contrib/test_cloudpipe.py     |   20 +-
 .../v2/contrib/test_flavors_extra_specs.py         |    2 +-
 .../openstack/v2/contrib/test_floating_ip_dns.py   |   10 +-
 .../api/openstack/v2/contrib/test_floating_ips.py  |    6 +-
 nova/tests/api/openstack/v2/contrib/test_hosts.py  |   12 +-
 .../api/openstack/v2/contrib/test_keypairs.py      |    7 +-
 nova/tests/api/openstack/v2/contrib/test_quotas.py |    2 +-
 .../openstack/v2/contrib/test_security_groups.py   |   20 +-
 .../v2/contrib/test_server_action_list.py          |   42 +-
 .../v2/contrib/test_server_diagnostics.py          |   31 +
 .../v2/contrib/test_simple_tenant_usage.py         |   10 +-
 .../api/openstack/v2/contrib/test_snapshots.py     |    8 +-
 nova/tests/api/openstack/v2/contrib/test_users.py  |    8 +-
 .../v2/contrib/test_virtual_interfaces.py          |    2 +-
 .../api/openstack/v2/contrib/test_volume_types.py  |   12 +-
 .../v2/contrib/test_volume_types_extra_specs.py    |   13 +-
 .../tests/api/openstack/v2/contrib/test_volumes.py |   17 +-
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |   32 +-
 nova/tests/api/openstack/v2/contrib/test_zones.py  |   14 +-
 nova/tests/api/openstack/v2/test_consoles.py       |    7 +-
 nova/tests/api/openstack/v2/test_flavors.py        |   24 +-
 nova/tests/api/openstack/v2/test_images.py         |   44 +-
 nova/tests/api/openstack/v2/test_limits.py         |   12 +-
 nova/tests/api/openstack/v2/test_server_actions.py |   13 +-
 nova/tests/api/openstack/v2/test_servers.py        |  174 +-
 nova/tests/api/openstack/v2/test_versions.py       |   14 +-
 61 files changed, 2811 insertions(+), 2514 deletions(-)

commit e231a055c2a73f82597b0b2a690f2fb28472a99f
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jan 8 12:51:35 2012 -0500

    Isolate certain images on certain hosts.
    
    This implements a [hosts] <=> [images] mapping in the simple scheduler
    that partitions your host resources into the part that services a
    particular image set, and the general cloud.  This is useful, for
    example, if you want to specify a set of hosts to run utility VMs
    (cloudpipe, bastion, etc) that you don't want consuming resources from
    your generally available pool.
    
    When specifying a host with --isolated_hosts flags (comma-separated
    list) those hosts will only run the images specified in
    --isolated_images, and will not run any other images.  The isolated
    images will not run on any other hosts.
    
    You can specify --skip_isolated_core_check to allow overcommitting of
    the isolated hosts.  This allows utility vms that are not cpu bound to
    avoid the resource cheks the scheduler usually performs (based off of
    --max_cores).
    
    Change-Id: Ib2db5a605cb7560a169af9ff2a6dadb649da9c1d

 nova/scheduler/simple.py               |   15 ++++-
 nova/tests/scheduler/test_scheduler.py |  105 +++++++++++++++++++++++++++++++-
 2 files changed, 118 insertions(+), 2 deletions(-)

commit 410d8e8b3191021513648e98ed11980dfe968ab9
Merge: b27e14d f2eb165
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 6 22:07:36 2012 +0000

    Merge "preload cache table and keep it up to date"

commit b27e14dc96014fb99427593b7f6c406ef29006e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 6 19:04:16 2012 +0000

    Workaround bug 852095 without importing mox
    
     * Fixes bug 912828
    
    Change-Id: Iade4b0aca1d1f28ce46ed25d0b97c08d152554bd

 nova/utils.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 421e5cb2b4a3f1b5a8db58543b9cd96df62e9599
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Jan 6 18:40:49 2012 +0000

    Bug #894683: nova.service does not handle attribute specific exceptions and client hangs
    
    As Sateesh points out nova.service.Service.__getattr__ throws an AttributeError exception when the upcall method is not available.
    
    However nova.rpc should catch all exceptions. This does not happen in this specific case because the following statement was outside the try-catch-all:
    
    node_func = getattr(self.proxy, str(method))
    
    Change-Id: I437c88783bca037e4054078d2687ef41c8fc2b83

 nova/rpc/impl_kombu.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit de4fb9302aab979ac3dbb8b2e62c9f9255f8f16f
Author: Armando Migliaccio <armando.migliaccio@eu.citrix.com>
Date:   Fri Jan 6 17:49:57 2012 +0000

    Bug #912858: test_authors_up_to_date does not deal with capitalized names properly
    
    ensure we are not fooled by capitalized names, by turning emails and names into lower cases before the matching.
    
    Change-Id: Idbb8535174c0f1451ad6fd0628f35508f0f1e466

 nova/tests/test_misc.py |    5 +++--
 nova/utils.py           |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 613d1dbc87d9af5d07dc277f0264d6fe1e2e073b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 6 02:18:22 2012 +0000

    Adds workaround check for mox in to_primitive
    
     * Works around bug 852095
     * Can be removed if a consistent mox 5.4 is released
    
    Change-Id: I3e57b60886a94c5e7a337b73716759c9a6838e04

 nova/utils.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit f2eb16564e12e40b8c3622bbe6fa0d26825482f0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 5 18:02:26 2011 -0600

    preload cache table and keep it up to date
    
    Change-Id: Ic27c45f209610a5d369cfb9f09bcabd4264cd2b9

 nova/db/api.py                                     |    6 +-
 nova/db/sqlalchemy/api.py                          |   21 +-
 .../066_preload_instance_info_cache_table.py       |  239 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/network/api.py                                |    2 +
 nova/network/manager.py                            |  152 ++++++++++++-
 nova/tests/api/ec2/test_cloud.py                   |    1 +
 nova/tests/fake_network.py                         |   53 +++--
 nova/tests/test_compute.py                         |    2 +
 nova/tests/test_xenapi.py                          |   11 +-
 10 files changed, 447 insertions(+), 42 deletions(-)

commit 162ab4f48e573662824872da56aecbef05ba94f0
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Jan 5 18:15:29 2012 -0500

    Use instance_properties in resize.
    
    This just makes resize behave a bit more like create, which is useful
    for custom filtering.
    
    Change-Id: I10ba726712d8f601f5ee97e0bb033bd7339a7a88

 nova/compute/api.py                                |    2 +-
 nova/scheduler/chance.py                           |   10 ++++++----
 nova/scheduler/distributed_scheduler.py            |   10 ++++++----
 nova/tests/scheduler/test_chance_scheduler.py      |    4 ++--
 nova/tests/scheduler/test_distributed_scheduler.py |    4 ++--
 nova/tests/test_compute.py                         |    6 ++++--
 6 files changed, 21 insertions(+), 15 deletions(-)

commit dcf5fe4d9307c0d477fb8c48df74a812244d8b97
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jan 5 14:31:43 2012 -0500

    Ensure tests are python 2.6 compatible.
    
    Change-Id: I1c6b7a0847586a694b5af21ed6c4a942f3aab209

 nova/tests/api/openstack/v2/test_servers.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit d41ea536ba55e8285e2db88415f09c80a799acfa
Merge: d788741 18f72f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 5 17:03:22 2012 +0000

    Merge "Return 409s instead of 500s when deleting certain instances."

commit d7887419f4e28cd948e3bdd8644f5e329a81695c
Merge: 1aa34d4 7edbac2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 5 16:53:56 2012 +0000

    Merge "Remove small unneeded code from impl_kombu"

commit 18f72f29a92733e56d8641e48b2099df1b8b30f4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jan 4 18:54:45 2012 -0500

    Return 409s instead of 500s when deleting certain instances.
    
    Fixes bug 911879
    
    Change-Id: Ib2ae875ec2d1eeea21d15a756b96c27047b12bee

 nova/api/openstack/v2/servers.py            |    4 ++++
 nova/tests/api/openstack/v2/test_servers.py |   34 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

commit 1aa34d4538f071386813d646d707364eb6c788bc
Merge: d97b64b 35e98d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 5 16:44:30 2012 +0000

    Merge "Update HACKING.rst."

commit 35e98d55db2a82e23e9610e3638eb43be78b9d53
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jan 5 10:21:57 2012 -0600

    Update HACKING.rst.
    
    Removes the requirement for a trailing blank line in multiline
    docstrings, just before the closing '"""'.  This blank line is not
    needed anymore, as the editors it was recommended for no longer
    have the problem that this blank line was working around.
    
    Change-Id: I4e532231f1d99e9f5048cbfcc791a4328fb1e8f5

 HACKING.rst |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit d97b64b6e69e7ac428e578ec148d93e4687a7ffe
Author: Daniel P. Berrange <berrange@redhat.com>
Date:   Thu Jan 5 13:15:15 2012 +0000

    Tell users what is about to be installed via sudo
    
    Rather than just giving users the sudo password prompt immediately,
    actually tell them what is about to be installed, so they know
    whether it is reasonable to be entering their password.
    
    Change-Id: Ic0c1de812be119384753895531a008075b13494e
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

 Authors               |    1 +
 tools/install_venv.py |    2 ++
 2 files changed, 3 insertions(+)

commit 8b79dae67ca2686780d3e3b5863d0578264e92a5
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jan 4 20:16:27 2012 -0600

    Fix LP912092
    
    self.address is reserved in nose. It should not be overridden with a string.
    
    Change-Id: I02f79781baebac339ec9f15c7ce7e318b5aaa50f

 .../api/openstack/v2/contrib/test_floating_ips.py  |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 7edbac2015c5de129aa87f72ff0dad91342655ba
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jan 4 16:17:33 2012 -0800

    Remove small unneeded code from impl_kombu
    
    If a publish fails, we reconnect to rabbit.  In this case, we try to
    declare the publisher exchange... and loop around and do the same thing
    again after grabbing a new class instance.  This removes the extra code.
    
    Change-Id: I99089ccfb93bb860d5221c267f35a16c1faf3707

 nova/rpc/impl_kombu.py |    3 ---
 1 file changed, 3 deletions(-)

commit 988743216a688fc8db6c17e80df05ef0674ed7f1
Merge: d33b477 96d8cbe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 23:42:26 2012 +0000

    Merge "Set VLAN MTU size when creating the vlan interface."

commit d33b4776097f892e63e792dae6df73e2a9fbaa24
Merge: efc350c 10372e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 23:27:13 2012 +0000

    Merge "Remove install_requires processing."

commit efc350cbf1658779f4619af72b7acc7858cb8b06
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jan 4 22:41:55 2012 +0000

    Add missing space between XML attributes
    
    Change-Id: I57be65a6d858acfea64ca4de74bfc0375ef00d1d

 nova/virt/libvirt/vif.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c510592fe94e81ff0332ae9d209a893d8057ad4a
Merge: 339580b cf4505a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 22:29:23 2012 +0000

    Merge "Fix except format to match HACKING"

commit 339580bba5274788170275a844c5917c8f1dd9e6
Merge: 7e9db61 6273bab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 22:18:12 2012 +0000

    Merge "Fix typo in nova/rootwrap/compute.py. Fixes LP: #911880"

commit cf4505a7b34858efe51a76434617d47e8f9d4ea9
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Jan 4 14:16:40 2012 -0800

    Fix except format to match HACKING
    
    Change-Id: Iecfcde15db9f1d4fa2f6bb6f1c40253440b9e758

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e9db618f41fd7afcc2479bd472643a87e9bd949
Merge: 7fb11ad 5ff9619
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 21:59:31 2012 +0000

    Merge "Add instance_name field to console detail command which will give the caller the necessary information to actually connect."

commit 7fb11ad981b2e0d123a1f615770792f8c2bcee20
Merge: 976cc22 1a8a276
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 21:49:56 2012 +0000

    Merge "Fix spelling of variable"

commit 96d8cbe8442cf25afecf47086d6ec6907008cb85
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Dec 23 14:15:40 2011 -0500

    Set VLAN MTU size when creating the vlan interface.
    
    When empty (the default) nova will not set any MTU parameters.  You can
    specify a number as in --network_device_mtu=9000 to enable jumbo frames,
    for example.
    
    Updates:
        * change flag name
        * set mtu in ovs driver
        * empty string means don't fiddle with the interface mtu
        * Use None instead of '' for flag default
    
    Change-Id: Ib4bccf7f96a836af18b4ea7e164b26f3c9104482

 nova/network/linux_net.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 976cc2295e276c3097f6c1e67eb8e0fc0635a534
Merge: 27293b7 1f364d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 21:15:05 2012 +0000

    Merge "Support local target for Solaris, use 'safe' command-line processing"

commit 5ff9619f3989d7baec00eb397d265439d6e87d9c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 4 13:05:36 2012 -0800

    Add instance_name field to console detail command
    which will give the caller the necessary information to actually
    connect.
    
    Change-Id: Id4774afb28e4d8595ea118867b97c61e5e73b9a5

 nova/api/openstack/v2/consoles.py            |    1 +
 nova/tests/api/openstack/v2/test_consoles.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 27293b7f4044cdca4da3f7752dd9399fb182b895
Merge: 1541692 28a345e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 21:05:40 2012 +0000

    Merge "Call mkfs with the correct order of arguments"

commit 1a8a27668fc26f93e24ea137e11e939d793e06c6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jan 4 20:37:57 2012 +0000

    Fix spelling of variable
    
    It appears the intent was disk_requirement_gb instead of _bg
    
    Change-Id: Ibea2afd9f7489e9fefe02ecd1cdb735a1221e222

 nova/scheduler/distributed_scheduler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 15416928d47a0d3afbdf2b03964410ff968b74d2
Merge: 4df633d 19f833c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 20:56:05 2012 +0000

    Merge "Send event notifications for suspend and resume."

commit 10372e7e9a1f5c04a446c1136b57c2320d2eca58
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jan 4 12:39:28 2012 -0800

    Remove install_requires processing.
    
    Loading install_requires with the contents of pip-requires
    isn't getting us any real beneift and is causing issues.
    
    a) It can conflict with installing nova into an environment
       where deps have been installed from packages (devstack)
    b) It breaks the ability to use -e git urls in pip-requires
       which we want to start using for python-novaclient and
       python-keystoneclient
    c) It causes spurious network traffic when we're trying to
       test things.
    
    At the same time, since we are not expecting anyone to
    install nova from setup.py for production, the normal benefit
    of the feature is not needed.
    
    Change-Id: I402f975c652dc1c2b54b0c362b8abbb6886f8844

 setup.py |    8 --------
 1 file changed, 8 deletions(-)

commit 4df633d42072906aad3dfcaf60801dcb04d1e540
Merge: 5a80b9d de8cf3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 20:36:47 2012 +0000

    Merge "Make quantum_use_dhcp falsifiable"

commit 5a80b9d44d3155e1229c15a97b9bfe9d99a83117
Merge: 52de7e6 be244ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 4 20:30:21 2012 +0000

    Merge "Fixing name not defined"

commit 19f833c25c79b823bef3a45d760fcb99925526f6
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 4 14:14:26 2012 -0600

    Send event notifications for suspend and resume.
    
    Change-Id: I27b009f33d6d276ba2d30b6c7ca5da9fe5552d54

 nova/compute/manager.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 28a345ec819cace007bd43483fce4a90017e46d7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jan 4 18:40:42 2012 +0000

    Call mkfs with the correct order of arguments
    
    nova.virt.libvirt.utils:mkfs() takes fstype and partition arguments,
    but _create_swap() calls it with the order reversed
    
    Change-Id: Ib963425d71ce84889760f919d3b435a3d7d17eb0

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 52de7e6aba5d0c7dac17f2ff5f1fc534eef7492e
Author: François Charlier <francois.charlier@enovance.com>
Date:   Wed Jan 4 19:37:32 2012 +0100

    Fix bug 901899
    
    If project_id is given when a network is created, it has to be saved in
    the database.
    
    Change-Id: I59a05f55202484cfe7910e159d80cd4b5f51dffa

 nova/network/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 6273bab5c1d495f16f6a21614e4590142a7dfbf5
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jan 4 12:13:46 2012 -0500

    Fix typo in nova/rootwrap/compute.py. Fixes LP: #911880
    
    Change-Id: I675c768a0d6ad3d289a888b44e52a8f9789f4a7e
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/rootwrap/compute.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit de8cf3a8492b7d9e75da8b54973e7d97fe3384bd
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Tue Jan 3 14:24:51 2012 -0600

    Make quantum_use_dhcp falsifiable
    
    Change-Id: I2832cb7c9c8b245c674a1807e0e5a17f68cdb0d5

 nova/network/quantum/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be244cefcb51c8094aff6fd0bca699cea65d048c
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Jan 4 10:20:14 2012 -0600

    Fixing name not defined
    
    Change-Id: I1ee587c9f239ef0d627bc22ab3846b0c5c46b0d1

 nova/network/quantum/melange_ipam_lib.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 88ccade9d5700db881f2ffc53e4a48a76e92c2db
Author: lzyeval <lzyeval@gmail.com>
Date:   Sat Dec 31 12:23:56 2011 +0800

    PEP8 type comparison cleanup
    
    Fixes bug #910295
    
    The None, True, and False values are singletons.
    
    All variable *comparisons* to singletons should use 'is' or 'is not'.
    All variable *evaluations* to boolean should use 'if' or 'if not'.
    
    "== None", "== True", "== False", and "!= None" comparisons in sqlalchemy's
    where(), or_(), filter(), and_(), and select() functions should not be changed.
    
    Incorrect comparisons or evaluations in comments were not changed.
    
    Change-Id: I087f0883bf115b5fe714ccfda86a794b9b2a87f7

 bin/nova-manage                                    |    8 ++++----
 nova/api/ec2/apirequest.py                         |    2 +-
 nova/api/ec2/cloud.py                              |    6 +++---
 nova/api/openstack/v2/contrib/flavorextraspecs.py  |    2 +-
 nova/api/openstack/v2/contrib/volumetypes.py       |    2 +-
 nova/common/cfg.py                                 |    2 +-
 nova/network/manager.py                            |    2 +-
 nova/network/quantum/client.py                     |    2 +-
 nova/network/quantum/manager.py                    |    2 +-
 nova/scheduler/vsa.py                              |    3 +--
 nova/tests/db/fakes.py                             |    4 ++--
 nova/tests/scheduler/test_distributed_scheduler.py |   12 ++++++------
 nova/utils.py                                      |    2 +-
 nova/virt/images.py                                |    2 +-
 nova/virt/xenapi/volumeops.py                      |   10 +++++-----
 nova/volume/api.py                                 |    2 +-
 nova/volume/manager.py                             |    2 +-
 nova/volume/xensm.py                               |    2 +-
 nova/vsa/api.py                                    |    8 ++++----
 19 files changed, 37 insertions(+), 38 deletions(-)

commit 6f0ef4240fc42f3bf4e7b59cd83997edddb3c985
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Dec 19 13:03:37 2011 -0500

    Add cloudpipe/vpn api to openstack api contrib.
    
    blueprint cloudpipe-extension
    
    Updates:
        2011-12-19 #1: * Remove unused imports
                       * return uuid as the instance_id
                       * change state with bad config to "invalid"
                       * whitespace cleanup
                       * change top-level key on index to "cloudpipes"
        2011-12-22 #1: * add serializer
                       * change post body to be cloudpipe/project_id
                       * change admin api method
        2011-12-23 #1: * Change extension namespace
        2011-12-23 #2: * Fix failing extension test
        2011-12-23 #3: * Add xtoddx@gmail.com to .mailmap
        2011-12-27 #1: * pep-8
        2012-01-02 #1: * fix test stubs to not cause later test failures
        2012-01-03 #1: * fix test self.app to not traverse middlewares
                       * don't use not in for a single item list
    
    Change-Id: I5710f8cea710fa09e5405c30d565144a7c10e112

 nova/api/openstack/v2/contrib/cloudpipe.py         |  183 +++++++++++++++
 .../api/openstack/v2/contrib/test_cloudpipe.py     |  237 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 3 files changed, 421 insertions(+)

commit 02f1b50fb21e6f314d69bc7888bee1c7dabaf9af
Merge: 8e21720 8582a31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 19:11:43 2012 +0000

    Merge "Every string does not need to be internationalized"

commit 8e217208e0ccc90ab2eb876d1662817f9346f9a2
Merge: 3feee8a e695b84
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 19:00:14 2012 +0000

    Merge "Adds running_deleted_instance_reaper task."

commit 8582a3168a309df737a345ae8895734760ed8d57
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jan 3 18:57:03 2012 +0000

    Every string does not need to be internationalized
    
    Change-Id: I56ed4ec4e932ad705b554913fd6318bc16176653

 .../versions/059_split_rxtx_quota_into_network.py  |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 3feee8a5184370f3e0d835d5d11a6ae62f722c24
Merge: dc3d6ee a8fd6bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 18:02:18 2012 +0000

    Merge "use name gateway_v6 instead of gateway6"

commit dc3d6ee43e9848d907465329d1d690c30a83276c
Merge: fb38eba ae1654b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 17:53:05 2012 +0000

    Merge "PEP8 remove direct type comparisons"

commit e695b8498c486d5b664d8e551e7182a102826cd2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 21 22:40:23 2011 +0000

    Adds running_deleted_instance_reaper task.
    
    This adds a periodic task to cleanup erroneously running instances. The
    impetus of the patch was a XenServer specific issue bug #911366, where deleted
    instances would remain running on the host machine.
    
    The patch however is hypervisor agnostic and is generally useful as a
    housekeeping task to make sure these 'zombied' instances are detected.
    
    Change-Id: Iddc6a88920a537a3a115f8b9bc0039ec0e24a194

 nova/compute/manager.py |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py           |   28 ++++++++++++++++++
 2 files changed, 101 insertions(+)

commit fb38ebaab81e66de5e4b71d216ece438f31a81b9
Merge: 522e35b f9ec385
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 17:43:46 2012 +0000

    Merge "Install a good version of pip in the venv."

commit 522e35bee576ff2aee606917acb0b8bf027a6aaa
Merge: 0450e38 1c21d5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 3 17:34:33 2012 +0000

    Merge "Unused db.api cleanup"

commit 77269f1720e71f916407ddafdd31f2fcfe49569d
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Wed Dec 14 18:10:24 2011 +0100

    libvirt: implements boot from ISO images
    
    This allows to boot correctly ISO images. We just set the device type in the
    XML template to 'cdrom' if the image is in ISO format, and the bus type to
    IDE so it has maximum compatibility.
    
    This implements the blueprint support-kvm-boot-from-iso.
    
    Change-Id: I4d1ea52a17f6f24e944b10020d54aaec9e86c95c
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/tests/test_libvirt.py      |   29 +++++++++++++++++++++++++----
 nova/virt/libvirt.xml.template  |   30 ++++++++++++++++++------------
 nova/virt/libvirt/connection.py |   18 ++++++++++++------
 3 files changed, 55 insertions(+), 22 deletions(-)

commit 1c21d5e382a11dcb2328067c02964ee6ae0b94f1
Author: lzyeval <lzyeval@gmail.com>
Date:   Sun Jan 1 20:41:22 2012 +0800

    Unused db.api cleanup
    
    Fixes bug #884837
    
    not used:
    virtual_interface_get_by_fixed_ip
    instance_get_by_fixed_ip
    instance_get_by_fixed_ipv6
    volume_metadata_delete_all
    instance_metadata_delete_all
    
    internal functions:
    volume_metadata_get_item
        (used by used by volume_metadata_update() -> not removed)
    instance_metadata_get_item
        (used by instance_metadata_update() -> not removed)
    instance_type_extra_specs_get_item
        (used by instance_type_extra_specs_update_or_create()
         -> not removed)
    
    Change-Id: I1f8ad627d0305112a9d5d7b3b3b7257e98851122

 nova/db/api.py            |   15 ---------------
 nova/db/sqlalchemy/api.py |   30 ------------------------------
 2 files changed, 45 deletions(-)

commit a8fd6bf24b8046fe900ded24ad54c1644d3494fd
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Tue Jan 3 11:07:42 2012 +0800

    use name gateway_v6 instead of gateway6
    
    fixes bug #890099
    
    Change-Id: I2b516c4b41d387846f8edb9a7b82f3016f0e0eac

 Authors                         |    1 +
 nova/network/manager.py         |    2 +-
 nova/network/quantum/manager.py |    2 +-
 nova/tests/test_network.py      |    2 +-
 nova/tests/test_vmwareapi.py    |    2 +-
 nova/tests/test_xenapi.py       |   14 +++++++-------
 nova/tests/utils.py             |    2 +-
 nova/virt/libvirt/connection.py |    4 ++--
 nova/virt/libvirt/firewall.py   |    4 ++--
 nova/virt/libvirt/vif.py        |    6 +++---
 nova/virt/xenapi/vm_utils.py    |    2 +-
 11 files changed, 21 insertions(+), 20 deletions(-)

commit ae1654bc5910dba5f02f49bc57a49442b9a5f8d6
Author: lzyeval <lzyeval@gmail.com>
Date:   Mon Jan 2 17:31:36 2012 +0800

    PEP8 remove direct type comparisons
    
    Fixes bug #910763
    
    According to PEP8,
    - Object type comparisons should always use isinstance() instead
          of comparing types directly.
    
            Yes: if isinstance(obj, int):
    
            No: if type(obj) is type(1):
    
          When checking if an object is a string, keep in mind that it might be a
          unicode string too! In Python 2.3, str and unicode have a common base
          class, basestring, so you can do:
    
            if isinstance(obj, basestring):
    
    Change-Id: I7c0fdecf99872f5b8f72b2c2ed4f5c539c33def1

 bin/nova-manage                         |    2 +-
 nova/api/direct.py                      |    2 +-
 nova/api/ec2/cloud.py                   |    2 +-
 nova/api/openstack/wsgi.py              |    6 +++---
 nova/api/openstack/xmlutil.py           |    2 +-
 nova/auth/ldapdriver.py                 |    2 +-
 nova/common/cfg.py                      |    4 ++--
 nova/network/model.py                   |    3 +--
 nova/network/quantum/client.py          |    4 ++--
 nova/rpc/impl_carrot.py                 |    4 ++--
 nova/rpc/impl_fake.py                   |    4 ++--
 nova/rpc/impl_kombu.py                  |    4 ++--
 nova/scheduler/distributed_scheduler.py |    3 +--
 nova/scheduler/zone_manager.py          |    2 +-
 nova/tests/fake_utils.py                |    1 -
 nova/utils.py                           |   17 ++++++++---------
 nova/virt/vmwareapi/vim.py              |    2 +-
 tools/ajaxterm/qweb.py                  |    2 +-
 18 files changed, 31 insertions(+), 35 deletions(-)

commit f9ec38578b52f807a8d40deee5c37b84f9506dae
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Jan 2 13:35:57 2012 -0800

    Install a good version of pip in the venv.
    
    Change-Id: I1059824aae8c5bf1a65de6cfaef96fef0f68d8a3

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0450e385c9c30a03fcca73ad16e699025223e6e5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Dec 30 02:17:53 2011 -0800

    Bug #910045: UnboundLocalError when failing to get metrics from XenAPI hosts
    
    Bail early if we fail to get bandwidth metrics -- don't fall through to
    try and parse them when we don't have them.
    
    Change-Id: Icb8919861245d4e04e76f1b6bad6d79cb4372151

 nova/tests/test_xenapi.py |   28 +++++++++++++++++++++++++++-
 nova/virt/xenapi/vmops.py |    1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

commit ea21fe69655ae441eb9660e0579046355f6db4c1
Merge: 9920dbd 5bdc35b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 30 19:50:52 2011 +0000

    Merge "Adds EC2 ImportKeyPair API support."

commit 9920dbd49609c0dec1fab69808df7ef57f1cb5cc
Merge: 6247c94 3290b24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 30 19:41:33 2011 +0000

    Merge "use dhcp_lease_time for dnsmasq. Fix bug 894218"

commit 6247c949f5253737998405f698654644a364a9b7
Author: lzyeval <lzyeval@gmail.com>
Date:   Fri Dec 30 17:11:03 2011 +0900

    re-raising exceptions fix
    
    Fixes bug #910008
    
    Change-Id: I7914fe1eaffeb0be5feb414f3ea0ad563a36c21f

 Authors                 |    1 +
 nova/compute/manager.py |   27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

commit d014a0a1549715f8fd80c04d0ec4efc43a107271
Merge: d73a004 52b96e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 30 14:54:42 2011 +0000

    Merge "Ensure generated passwords meet minimum complexity"

commit 3290b24a0d992e258d38e290ba36cbf2f547fa3c
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Dec 29 14:33:59 2011 -0800

    use dhcp_lease_time for dnsmasq. Fix bug 894218
    
    Change-Id: Ib5e1a847e2b422ca03a6a08cf5cc2699c2b4b8cd

 nova/network/linux_net.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit d73a0046440b1c22cfb296fb0370905575739ab2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 29 10:55:42 2011 -0500

    Clean up pylint errors in top-level files
    
    Change-Id: Ida7cf1ff0cbf94ad82c7a75708c79ad7bb27f7fd

 nova/exception.py |    8 ++++----
 nova/manager.py   |    2 +-
 nova/quota.py     |    1 -
 nova/test.py      |    4 +---
 nova/utils.py     |    3 +--
 nova/wsgi.py      |    6 +-----
 6 files changed, 8 insertions(+), 16 deletions(-)

commit 52b96e7b45bd3528bcf66e18b4f1491655597775
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Dec 29 17:23:27 2011 +0000

    Ensure generated passwords meet minimum complexity
    
    Windows has a complexity requirement of at least three of these
    criteria:
    - one or more upper case characters
    - one or more lower case characters
    - one or more numbers
    - one or more special characters
    
    In some cases, the passwords generated didn't meet three of these four
    critera. This change enforces that three of these criteria will be
    met in the generated passwords.
    
    Change-Id: Ibe0055b8830b426aee1c9b722cc2fae2f5db4c5c

 nova/tests/test_utils.py |    8 ++++++++
 nova/utils.py            |   35 +++++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)

commit 783ac027f934b25e225619f9cf2cf26814fd7da6
Merge: 2654a3a 651b7d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 29 19:03:23 2011 +0000

    Merge "Adding index to instances project_id column"

commit 2654a3aa2d70f28c8bce4b49d270ca9c7ba97caf
Merge: b9500ff 28ac41e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 29 18:53:32 2011 +0000

    Merge "Ensure queue is declared durable so messages aren't dropped"

commit b9500ff068d699ad6c846e0be05bf604900d723e
Merge: fee0b1e c9393f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 29 18:44:19 2011 +0000

    Merge "Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant method VpnCommands._vpn_for - fixed"

commit fee0b1e53dee6da5ceaee7d920e5bd538715371e
Merge: e135f93 135fd91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 29 18:16:42 2011 +0000

    Merge "Bug 751229: Floating address range fixed"

commit e135f939a40617ef5b5c9847454c2db066eb72cb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 29 10:57:38 2011 -0500

    Fixing novaclient_converter NameError
    
    bug 909772
    
    Change-Id: Iac7b45648cd1c85fdc3c8febbd0ef69b63a70c92

 nova/api/openstack/v2/servers.py |    8 --------
 nova/exception.py                |    9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

commit c9393f76a3da9cb4a564dab45ddde4f206953dca
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Thu Nov 24 14:54:30 2011 +0200

    Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant method VpnCommands._vpn_for - fixed
    
    Change-Id: I86c509d98fac685a5d658f397d0672f71b4bc175

 Authors         |    1 +
 bin/nova-manage |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 135fd9191677f35c43aaff4f01af7e88cd57acb1
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Dec 28 23:30:35 2011 +0200

    Bug 751229: Floating address range fixed
    
    Change-Id: I4c7ab8512fe3a00dd555d3a183b2c2348cef9e21

 Authors         |    1 +
 bin/nova-manage |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 4ea63c4021b09b74997bf252aa656b7144dc54e4
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Dec 28 18:11:59 2011 -0800

    Brings some more files up to HACKING standards
    
    Change-Id: I738fb70d49dade90d31e8c848fa841497083e9b4

 bin/nova-logspool    |    4 ++--
 bin/nova-manage      |    8 ++++----
 bin/nova-spoolsentry |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

commit 28ac41efda3869656d007db21e9dfb832d4c770e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Dec 28 22:34:08 2011 +0000

    Ensure queue is declared durable so messages aren't dropped
    
    Fixes bug lp901375
    
    Ensure that a queue is declared durable so messages aren't dropped before
    consumers are started
    
    Change-Id: I9f8dfd6eaf3996be58fecff6ad91508bdcef23f3

 nova/rpc/impl_kombu.py |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

commit 599760a1f8da32f4d689249550d23b3ffc119d0b
Merge: 388e260 73c6d16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 28 21:47:27 2011 +0000

    Merge "Add an API for associating floating IPs with DNS entries."

commit 388e2605358937211070d96cc6353097e465a270
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Dec 28 19:19:24 2011 +0000

    Create notification queues as durable
    
    Fixes bug lp901375
    
    The notification system in Nova is built on top of nova.rpc. It uses a
    set of defaults for queues that isn't ideal for notification queues.
    This change makes the notification queue durable across restarts.
    
    Change-Id: I14c4d5da8d8af027b7d11631f3ac7707f2611a20

 nova/notifier/rabbit_notifier.py |    2 +-
 nova/rpc/__init__.py             |   13 +++++++++++++
 nova/rpc/impl_carrot.py          |   16 ++++++++++++++--
 nova/rpc/impl_fake.py            |    4 ++++
 nova/rpc/impl_kombu.py           |   16 ++++++++++++----
 nova/tests/test_notifier.py      |   36 +++++++++++-------------------------
 6 files changed, 55 insertions(+), 32 deletions(-)

commit 6eefbac14e207e97f1ab1d10d6c882a94365648b
Merge: e92bfac 93359c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 28 19:11:58 2011 +0000

    Merge "Update glance Xen plugin w/ purge props header."

commit 651b7d65a007c200ea54ab13172b74c4b7d78dd8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Dec 27 14:19:40 2011 -0500

    Adding index to instances project_id column
    
    Change-Id: I7f23064f7179e53bc44958b4a93adf6c0e950726

 .../065_add_index_to_instance_project_id.py        |   31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit 73c6d161855cf6e0b7f7cb6081891ca475efebb4
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Sun Dec 11 04:15:26 2011 -0600

    Add an API for associating floating IPs with DNS entries.
    
    For blueprint public-and-private-dns
    
    Change-Id: Ia6c3f046db4dd4978aa5ef950fd472d3455fe301

 doc/source/api_ext/ext_floating_ip_dns.rst         |  160 +++++++++++++
 nova/api/openstack/v2/contrib/floating_ip_dns.py   |  220 ++++++++++++++++++
 nova/exception.py                                  |    4 +
 nova/flags.py                                      |    6 +
 nova/network/api.py                                |   39 ++++
 nova/network/manager.py                            |   20 ++
 nova/network/minidns.py                            |   12 +-
 .../openstack/v2/contrib/test_floating_ip_dns.py   |  242 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 nova/tests/test_network.py                         |   71 ++++++
 10 files changed, 774 insertions(+), 1 deletion(-)

commit e92bfac838e7419c75e51a25fa2f433bf7ebee3e
Merge: 1b372a7 51e7bcf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 27 21:24:41 2011 +0000

    Merge "'except:' to 'except Exception:' as per HACKING"

commit 51e7bcf5f49037effa25496233678a917d6a1de3
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Dec 27 12:07:06 2011 -0800

    'except:' to 'except Exception:' as per HACKING
    
    Change-Id: I6e372152946dc7b51a4d84d6f4b893774e7d1a1d

 .../openstack/v2/contrib/simple_tenant_usage.py    |    4 ++--
 nova/compute/manager.py                            |   10 +++++-----
 nova/testing/runner.py                             |    2 +-
 nova/utils.py                                      |    2 +-
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 nova/volume/driver.py                              |    2 +-
 nova/vsa/api.py                                    |    2 +-
 setup.py                                           |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

commit 5bdc35b11574439057cfbdee17cf83c40da2cea2
Author: MotoKen <motokentsai@gmail.com>
Date:   Tue Dec 27 14:44:11 2011 +0800

    Adds EC2 ImportKeyPair API support.
    
    Implements import_key_pair instead of import_public_key.
    
    Change-Id: I256b76aeb4ff94030a58692bfd12b2d7c53ae461

 Authors                          |    1 +
 nova/api/ec2/__init__.py         |    2 +-
 nova/api/ec2/cloud.py            |   39 +++++++++++++++++++++++++-------------
 nova/tests/api/ec2/test_cloud.py |   27 +++++++++-----------------
 4 files changed, 37 insertions(+), 32 deletions(-)

commit d2ff77aa21ad71c5f161ddcf39980880e67ae0ac
Author: Brad Hall <brad@nicira.com>
Date:   Wed Dec 21 15:25:50 2011 -0800

    Take the availability zone from the instance if available
    
    Change-Id: I80041ee384751b5bd4f08fc38192f414a27ec07a

 nova/network/quantum/manager.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 93359c8476471b6e000afff1b991e05969e46ee6
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Dec 26 17:40:51 2011 -0500

    Update glance Xen plugin w/ purge props header.
    
    Update glance XenServer plugin to use X-Glance-Registry-Purge-Props.
    Fixes LP Bug #908922.
    
    Change-Id: I4d16fc8fb34e24195f3bc589d42bdbfadaf77398

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   35 ++++----------------
 1 file changed, 7 insertions(+), 28 deletions(-)

commit 1b372a7bddb3095b0672e2de750c43922783b440
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Dec 26 11:14:47 2011 -0500

    Converting zones into true extension
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: I733b05e7de0036f3dce31c95efef150186e302ee

 nova/api/openstack/v2/__init__.py                 |   10 -
 nova/api/openstack/v2/contrib/zones.py            |  207 ++++++++++++++-
 nova/api/openstack/v2/zones.py                    |  215 ----------------
 nova/tests/api/openstack/v2/contrib/test_zones.py |  280 +++++++++++++++++++++
 nova/tests/api/openstack/v2/test_zones.py         |  280 ---------------------
 5 files changed, 484 insertions(+), 508 deletions(-)

commit cff2ddcbd532ed54d60dbfbdbb7720f4634487b9
Merge: db74142 5682d2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 26 22:53:26 2011 +0000

    Merge "Convering /users to admin extension"

commit db7414235e14545cacf3701b85bf4b5cbb8b925a
Merge: 686ec45 6ce042c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 26 22:44:20 2011 +0000

    Merge "Add a DECLARE for dhcp_doamin flag to metadata handler."

commit 5682d2a27b252c1aca294eb8a0749ff3fbb13b26
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Dec 23 10:20:37 2011 -0500

    Convering /users to admin extension
    
    Relates to blueprint separate-nova-adminapi
    
    Change-Id: I0ef13569586be022ba533c4e850793b37b098fea

 nova/api/openstack/v2/__init__.py                 |    5 -
 nova/api/openstack/v2/contrib/users.py            |  154 +++++++++++++++++++++
 nova/api/openstack/v2/users.py                    |  139 -------------------
 nova/tests/api/openstack/v2/contrib/test_users.py |  154 +++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py    |    1 +
 nova/tests/api/openstack/v2/test_users.py         |  154 ---------------------
 6 files changed, 309 insertions(+), 298 deletions(-)

commit 686ec45dfd9dc7b1a830ec32accd3b68ab7adbbe
Merge: e60dfc1 98851c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 26 22:33:26 2011 +0000

    Merge "Converting accounts resource to admin extension"

commit 6ce042cafbf410a213c5d7937b93784e8f0a1655
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Dec 26 13:36:12 2011 -0500

    Add a DECLARE for dhcp_doamin flag to metadata handler.
    
    Fixes bug 908846
    
    Change-Id: I3d04ebee94cd23666d803987bd691276984d292d

 .mailmap                     |    1 +
 nova/api/metadata/handler.py |    1 +
 nova/tests/test_metadata.py  |    1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

commit 1f364d38adfbce6ab462dc39484d376ff832aac2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Dec 18 19:34:06 2011 -0800

    Support local target for Solaris, use 'safe' command-line processing
    
    Solaris volumes were created over SSH; we could also be running the volume
    service locally, in which case we don't want to use SSH, but should call
    utils.execute instead.  Split commands appropriately.
    
    Change-Id: I79dd0bdf527baf73a167ff210285a0ab65d0de4b

 nova/volume/san.py |  147 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 99 insertions(+), 48 deletions(-)

commit a7c0632600cc874b72c7e60efb7e16d6c8a2e733
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Oct 6 13:26:48 2011 +0400

    Add 'os-networks' extension
    
    Admin-only extension that supports simple network-related actions.
    This functionality is needed to deprecate openstackx
    
    Change-Id: Id930d823913fb9c9f6f1e476817cc12d1a64c418

 nova/api/openstack/v2/contrib/networks.py          |  117 +++++++++++++++++
 nova/api/openstack/v2/extensions.py                |   11 ++
 nova/network/api.py                                |   26 +++-
 nova/network/manager.py                            |   17 +++
 .../api/openstack/v2/contrib/test_networks.py      |  137 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 nova/tests/fake_network.py                         |    6 +
 nova/tests/test_network.py                         |   61 +++++++++
 8 files changed, 374 insertions(+), 2 deletions(-)

commit e60dfc1850fdbe6285c938a0637755eaffda250c
Merge: f78d266 4eaa167
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 26 07:46:07 2011 +0000

    Merge "Add exit_code, stdout, stderr etc to ProcessExecutionException"

commit 98851c82fd9fab193e034e8fe3b13e249f3b53bd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Dec 23 09:22:38 2011 -0500

    Converting accounts resource to admin extension
    
    Relates to blueprint separate-nova-adminapi
    
    Change-Id: I672c14df30eea4807930a0975916237542fe9d68

 nova/api/openstack/v2/__init__.py                  |    5 -
 nova/api/openstack/v2/accounts.py                  |  103 -------------
 nova/api/openstack/v2/contrib/accounts.py          |  116 ++++++++++++++
 .../api/openstack/v2/contrib/test_accounts.py      |  162 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_accounts.py       |  162 --------------------
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 6 files changed, 279 insertions(+), 270 deletions(-)

commit f78d266598d6cfd7015b1ba9adffd909beb03b22
Merge: 7db38e4 5cf93a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 23 14:07:32 2011 +0000

    Merge "Fixes LP bug #907898."

commit 7db38e4d40bf406f23e7ca2717824e230897cc41
Merge: 787f76e f276437
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 23 10:19:53 2011 +0000

    Merge "Help clarify rpc API with docs and a bit of code."

commit 4eaa167ca992fbc7ac90e43c218be7b2bdf177da
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Dec 22 23:16:05 2011 -0800

    Add exit_code, stdout, stderr etc to ProcessExecutionException
    
    This means that we can now catch ProcessExecutionException and inspect the result, in order to handle "acceptable" exceptions e.g. file does not exist on a remove
    
    Change-Id: I4f5dfe1f1d4601dafc50abc4c61f4b616f13c5ff

 nova/exception.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 5cf93a39dc59f1040a5118bdc74a00cb3eb3163a
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Dec 22 19:54:03 2011 -0500

    Fixes LP bug #907898.
    
    Update DB api so that fixed_ip_disassociate_all_by_timeout uses two
    separate commands (a query then an update). Fixes LP bug #907898.
    
    Change-Id: I60d7e7ba6bb3d3542ccf5b595d0c0de944e499a3

 nova/db/sqlalchemy/api.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 787f76eb8ae3949cceed950c8cc9513d46b8277b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Dec 22 22:22:48 2011 +0000

    Switch extension namespace
    
    Bug 849486
    
    Effectively (with some manual wrapping):
    sed s@docs.openstack.org/ext@docs.openstack.org/compute/ext@
    
    Change-Id: I01bca8a5784cfd0473c04c21661c3a7d46cc5ed2

 nova/api/openstack/v2/contrib/admin_actions.py     |    2 +-
 nova/api/openstack/v2/contrib/console_output.py    |    3 ++-
 nova/api/openstack/v2/contrib/createserverext.py   |    3 ++-
 nova/api/openstack/v2/contrib/deferred_delete.py   |    3 ++-
 nova/api/openstack/v2/contrib/extended_status.py   |    3 ++-
 nova/api/openstack/v2/contrib/flavorextradata.py   |    3 ++-
 nova/api/openstack/v2/contrib/flavorextraspecs.py  |    3 ++-
 nova/api/openstack/v2/contrib/floating_ips.py      |    2 +-
 nova/api/openstack/v2/contrib/hosts.py             |    2 +-
 nova/api/openstack/v2/contrib/keypairs.py          |    2 +-
 nova/api/openstack/v2/contrib/multinic.py          |    2 +-
 nova/api/openstack/v2/contrib/quotas.py            |    2 +-
 nova/api/openstack/v2/contrib/rescue.py            |    2 +-
 nova/api/openstack/v2/contrib/security_groups.py   |    2 +-
 .../api/openstack/v2/contrib/server_action_list.py |    3 ++-
 .../api/openstack/v2/contrib/server_diagnostics.py |    3 ++-
 .../openstack/v2/contrib/simple_tenant_usage.py    |    3 ++-
 .../api/openstack/v2/contrib/virtual_interfaces.py |    3 ++-
 .../openstack/v2/contrib/virtual_storage_arrays.py |    2 +-
 nova/api/openstack/v2/contrib/volumes.py           |    2 +-
 nova/api/openstack/v2/contrib/volumetypes.py       |    2 +-
 nova/api/openstack/v2/contrib/zones.py             |    2 +-
 22 files changed, 32 insertions(+), 22 deletions(-)

commit ccfc7df82d934e894c604e6cc48eb12867a7c7a7
Merge: 0214475 2fcbe7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 21:16:27 2011 +0000

    Merge "Remove code in migration 064 to drop an fkey that does not exist. Fixes LP bug #907878."

commit 0214475d47b3aab3631d89bf035ec4b7b3cb3457
Merge: 640e632 06e5909
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 21:07:10 2011 +0000

    Merge "Refactor Xen Vif drivers. Fixes LP907850"

commit 06e5909d05321a257afe6fa3b9b440e29cea88e7
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Dec 22 14:26:51 2011 -0600

    Refactor Xen Vif drivers. Fixes LP907850
    
    * Allows Vif subclasses to have an __init__ for setting up state
    * Allows Vif subclasses to pass arbitrary kwargs to plug/unplug should
      they require more than what the interface specifies
    
    Change-Id: I816aa1537d21005d4332af3477d9fd12f177f326

 nova/virt/vif.py          |    8 +++--
 nova/virt/xenapi/vif.py   |   73 +++++++++++++++++++++++++++------------------
 nova/virt/xenapi/vmops.py |   11 +++----
 3 files changed, 56 insertions(+), 36 deletions(-)

commit 2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Dec 22 14:50:36 2011 -0500

    Remove code in migration 064 to drop an fkey that does not exist.
    Fixes LP bug #907878.
    
    Change-Id: I2e33fe3a58a34c9606b24eafc319afa9fd9a5d86

 ...ange_instance_id_to_uuid_in_instance_actions.py |   12 ------------
 1 file changed, 12 deletions(-)

commit 640e632988c33511a2ac7043500ace60aac2eaea
Merge: 36c4616 dd56fd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 19:32:25 2011 +0000

    Merge "Bug#898257 support handling images with libguestfs"

commit 36c46167115f50cc10b0c37d17e18e786efb1bc8
Merge: 460dee9 5335b4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 19:23:21 2011 +0000

    Merge "Bug#898257 abstract out disk image access methods"

commit 460dee919eb1be42de147e9cd8279d7fa61394ba
Merge: c83a672 74390d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 18:53:59 2011 +0000

    Merge "Move 'actions' subresource into extension"

commit c83a672d691ec72b3ce832d57e37864f86d0e627
Merge: 01ab8af 1e44079
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 18:11:03 2011 +0000

    Merge "Remove unneeded broken test case."

commit f2764375c37c005710943d25bd494558577f892c
Author: Russell Bryant <rbryant@redhat.com>
Date:   Thu Dec 22 10:59:24 2011 -0500

    Help clarify rpc API with docs and a bit of code.
    
    The intent of this change is to help make the rpc API a bit easier to
    understand both for users of the API, and for implementors of the rpc
    abstraction.
    
    1) Add a Connection class in nova.rpc.common which defines the public
    interface of the connection returned by nova.rpc.create_connection().
    Update the existing implementations to inherit from this class.
    
    2) Add documentation for the public methods in nova.rpc.
    
    3) Rename get_impl() to __get_impl() in nova.rpc.  This function is a
    private implemenation detail and should not be used outside of this
    module.  Also move it to the bottom of the file so that all of the
    important public API stuff comes first.
    
    Change-Id: Id78acb59474995b7c13b2b6e7c8cd5057ec8cb0f

 nova/rpc/__init__.py    |  102 +++++++++++++++++++++++++++++++++++++++++------
 nova/rpc/common.py      |   74 ++++++++++++++++++++++++++++++++++
 nova/rpc/impl_carrot.py |    5 ++-
 nova/rpc/impl_kombu.py  |    9 ++++-
 4 files changed, 174 insertions(+), 16 deletions(-)

commit 01ab8af8f835181b28b1371e0b98dd6d33df0cfa
Merge: 2903c0d 95416a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 17:11:50 2011 +0000

    Merge "Move createBackup server action into extension"

commit 2903c0d2d6f3cf9649e36dc2fcec2dacb2a87652
Merge: d503d6b 9cffb70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 17:02:41 2011 +0000

    Merge "Make os-server-diagnostics extension admin-only"

commit d503d6b1079f9eafe0430754214fc5b6d4e32c09
Author: Cor Cornelisse <cor@hyves.nl>
Date:   Wed Dec 21 12:46:58 2011 +0100

    Use SQLAlchemy to drop foreign key in DB migrate
    
    A foreign key constraint needs to be removed in order to succeed in the
    DB migration. An earlier submitted fix for this uses a mysql drop
    statement. I think it's cleaner to use sqlalchemy to do this, as it's
    done this way in other version migrations as well. Fix for bug 907254.
    
    Update: IBM from 1928 called, they want their 80 CPL limit
    back. - on a more serious note, fixed jenkins PEP8 failure
    Update2: Replaced tab by a spaces
    Update3: Don't do Foreign Key stuff if the engine is sqlite
    Update4: Add myself to the Authors file
    Update5: With the correct mail address
    
    Change-Id: Ib021e0ddb2c80ee63888435a9e3761c053534160

 Authors                                            |    1 +
 ...ange_instance_id_to_uuid_in_instance_actions.py |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

commit 95416a9389fe6dbb0f7b0f32e26f82361e248253
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 22 02:00:06 2011 -0500

    Move createBackup server action into extension
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: Ie962202cd1e7f6c648e397ea311e4ec59b56df1b

 nova/api/openstack/v2/contrib/admin_actions.py     |   81 ++++++++++++-
 nova/api/openstack/v2/servers.py                   |   73 ------------
 .../api/openstack/v2/contrib/test_admin_actions.py |  123 +++++++++++++++++++
 nova/tests/api/openstack/v2/test_server_actions.py |  126 --------------------
 4 files changed, 202 insertions(+), 201 deletions(-)

commit 5bcaecdc7d42b8a4aa2f16e96c064869438d6a12
Merge: b2f3687 adcfd49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 22 12:59:00 2011 +0000

    Merge "Allow accessIPv4 and accessIPv6 on rebuild action"

commit dd56fd39d558c4052c307e617325a8631016ec70
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Nov 30 17:00:17 2011 +0000

    Bug#898257 support handling images with libguestfs
    
    http://libguestfs.org/ provides both utilities and libraries
    to manipulate image files containing various operating systems.
    It supports various image file formats and so will expand
    the formats and guest types supported by openstack.
    It does have extra overhead in that it starts a VM to
    access the image. This has both advantages and disadvantages.
    Also qemu-nbd is not supported on some systems like RHEL 6.
    
    * nova/virt/disk/api.py (img_handlers): Add guestfs to the default
    list of access methods to try, to act as a fallback.
    * nova/virt/disk/guestfs.py: A new plugin class to provide support
    for libguestfs mounting.
    Note we use the guestmount utility, as a non root user,
    so the user will need the ability to use fusermount, which
    is often provided by being a member of the 'fuser' group.
    In future we might use the guestfs python module to give
    greater granularity of control over the image.
    
    Change-Id: I2e22c9d149fff7a73cd8cebaa280d68d3fb9096c

 nova/rootwrap/compute.py  |    8 +++++
 nova/virt/disk/api.py     |    5 +--
 nova/virt/disk/guestfs.py |   88 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)

commit 5335b4ab0ef1f91203905764de6fcc7e53cb2934
Author: Pádraig Brady <pbrady@redhat.com>
Date:   Wed Nov 30 17:00:17 2011 +0000

    Bug#898257 abstract out disk image access methods
    
    Rather than providing two mutually exlusive image
    access methods (loop and qemu-nbd), try each in turn.
    This is to prepare for a follow up patch which will
    add libguestfs as a method to try.
    
    * nova/virt/mount.py: A new Mount class to abstract the
    devce allocation, partition mapping and file sys mounting,
    for each access type.
    * nova/virt/disk/loop.py: A specialization of the base Mount class
    to provide loop back mounting support.
    * nova/virt/disk/nbd.py: A specialization of the base Mount class
    to provide qemu-nbd mounting support.
    * nova/virt/disk/api.py: A new file containing the nova.virt.disk
    module interface.
    (img_handlers): A new list of access methods to try,
    with the order being honored.
    (_DiskImage): An internal helper class that uses the plugin classes
    above, to provide the operations available on a disk image file.
    When mounting, iterate over each access method until one succeeds.
    If a hint is provided about a CoW format image, the list of
    methods to try will be reduced accordingly.
    Note expected errors are no longer raised as exceptions during mounting.
    Instead, on failure to mount an image, errors are collated and raised.
    Interveining errors are logged in debug mode for successful mounts.
    * nova/virt/libvirt/connection.py: Adjust the function parameter
    names to be more general, rather than referencing specific
    implementations like 'nbd' and 'tune2fs'.
    Simplify the destroy_container() by storing and passing
    back a reference to the _DiskImage object, which has the
    necessary state to unmount.
    * nova/utils.py (trycmd): A helper function to both deal with,
    commands that issue ignorable warnings to stderr,
    and commands that EXIT_SUCCESS while issuing errors to stderr.
    nova/virt/xenapi/vm_utils.py: Adjust for the moved virt.disk package
    
    Change-Id: If3a4b1c8f4e2f2e7300a21071340dcc839cb36d7

 Authors                         |    1 +
 nova/rootwrap/compute.py        |   39 +++--
 nova/tests/test_libvirt.py      |    2 +-
 nova/utils.py                   |   30 ++++
 nova/virt/disk.py               |  299 ---------------------------------------
 nova/virt/disk/__init__.py      |   21 +++
 nova/virt/disk/api.py           |  285 +++++++++++++++++++++++++++++++++++++
 nova/virt/disk/loop.py          |   41 ++++++
 nova/virt/disk/mount.py         |  142 +++++++++++++++++++
 nova/virt/disk/nbd.py           |   95 +++++++++++++
 nova/virt/libvirt/connection.py |   19 +--
 nova/virt/libvirt/utils.py      |    2 +-
 nova/virt/xenapi/vm_utils.py    |    2 +-
 13 files changed, 646 insertions(+), 332 deletions(-)

commit 74390d4920e692e7c85462232a6256774c6eabae
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 22 00:46:09 2011 -0500

    Move 'actions' subresource into extension
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: I6929c5c467f339bc91ac8185d6217a55a5369a58

 nova/api/openstack/v2/__init__.py                  |    7 +--
 .../api/openstack/v2/contrib/server_action_list.py |   61 ++++++++++++++++++
 nova/api/openstack/v2/servers.py                   |   15 -----
 .../v2/contrib/test_server_action_list.py          |   65 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 nova/tests/api/openstack/v2/test_servers.py        |   36 -----------
 6 files changed, 128 insertions(+), 57 deletions(-)

commit 9cffb7010396e23233861f6aa119e1760eafa516
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 22 01:03:53 2011 -0500

    Make os-server-diagnostics extension admin-only
    
    Related to blueprint separate-nova-adminapi. This was overlooked in
    the initial commit that added this extension
    
    Change-Id: I4ed1cdb3b40eb54ab224d3b167e7ffcb31983f5b

 .../api/openstack/v2/contrib/server_diagnostics.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1e4407920496d5d4b1e99eb4b95e84a133c60047
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Dec 21 23:02:25 2011 -0500

    Remove unneeded broken test case.
    
    This test case appears to be broken and unneeded. It is trying to test
    nova.tests.rpc.fake which does not exist. It appears to me that what
    this is supposed to be doing is already being covered by
    nova/tests/rpc/test_fake.py.
    
    Change-Id: I49259841e988b50784f637dac016477f246674f5

 nova/tests/rpc/test_rpc.py |   37 -------------------------------------
 1 file changed, 37 deletions(-)

commit b2f36879b0d5f264ae2a9dd49fb893c6fbe25068
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Dec 21 14:51:39 2011 -0800

    Fix spelling typos in comments
    
    Change-Id: I7d8011f2c44ee597f323c8e1de090d33bf63577b

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit adcfd491308a98107e82b9f0595e0bf2f37b5a54
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 21 11:30:19 2011 -0500

    Allow accessIPv4 and accessIPv6 on rebuild action
    
    Fixes bug 893243
    
    Change-Id: If320ead6f25613725faf6c01c4a87b496ef88961

 nova/api/openstack/v2/servers.py                   |   66 +++++++++-----
 nova/compute/api.py                                |   17 ++--
 nova/tests/api/openstack/v2/test_server_actions.py |   53 ++++++++---
 nova/tests/integrated/test_servers.py              |   92 +++++---------------
 4 files changed, 113 insertions(+), 115 deletions(-)

commit 500da76ab281adc227eb0431ba8e286ca9d2d590
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 21 15:37:27 2011 -0500

    Move 'diagnostics' subresource to admin extension
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: Ibbb2e4d638c16e3209ca4b3d71892a5d7e874ca4

 nova/api/openstack/v2/__init__.py                  |    1 -
 .../api/openstack/v2/contrib/server_diagnostics.py |   53 +++++++++++++++++++
 nova/api/openstack/v2/servers.py                   |    8 ---
 .../v2/contrib/test_server_diagnostics.py          |   55 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 nova/tests/api/openstack/v2/test_servers.py        |    1 -
 6 files changed, 109 insertions(+), 10 deletions(-)

commit d0c77ebc0ea122030e681ba1400d0325e396cfb5
Merge: 30fd2e5 473768c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 19:58:01 2011 +0000

    Merge "Cleaning up imports in compute and virt"

commit 30fd2e52575599af9027eb16a4e116d1f0f5d7b1
Merge: d90694c f0b54c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 19:45:15 2011 +0000

    Merge "Make reroute_compute use functools.wraps. Fixes LP bug #906945."

commit 473768cd7673cb8332b30ac4d3051461cd4ab447
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 21 13:48:11 2011 -0500

    Cleaning up imports in compute and virt
    
    Change-Id: Ib3ea4014a37b852e713f8a683238a7c158272229

 nova/compute/api.py                    |   14 +++++++-------
 nova/compute/utils.py                  |    3 +--
 nova/virt/connection.py                |    2 +-
 nova/virt/disk.py                      |    2 --
 nova/virt/fake.py                      |    2 +-
 nova/virt/hyperv.py                    |    2 +-
 nova/virt/images.py                    |    1 -
 nova/virt/libvirt/connection.py        |   16 +++++-----------
 nova/virt/libvirt/vif.py               |    4 ++--
 nova/virt/vmwareapi/fake.py            |    1 -
 nova/virt/vmwareapi/io_util.py         |    2 --
 nova/virt/vmwareapi/read_write_util.py |    3 ---
 nova/virt/vmwareapi/vmops.py           |    3 +--
 nova/virt/vmwareapi/vmware_images.py   |    1 -
 nova/virt/xenapi/vm_utils.py           |    3 ---
 nova/virt/xenapi/vmops.py              |    3 ---
 16 files changed, 19 insertions(+), 43 deletions(-)

commit d90694c6a128f7cb26c27135e7ae4f493090971b
Merge: 8753dde 5605b93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 19:05:56 2011 +0000

    Merge "Cleaning up imports in nova.api"

commit 8753ddee7fc4b1de569d82d4a3f1ed90afa754ee
Merge: ab2b1e1 397933a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 18:53:55 2011 +0000

    Merge "Removing extra code from servers controller"

commit 5605b93a09f065fa7d985e0680105cdb82bd12cb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 21 13:21:36 2011 -0500

    Cleaning up imports in nova.api
    
    Change-Id: I2779c1fbff7344370ce17c6562086e29329b6e65

 nova/api/auth.py                        |    1 -
 nova/api/direct.py                      |    3 +--
 nova/api/ec2/__init__.py                |    8 ++++----
 nova/api/ec2/admin.py                   |    9 +++++----
 nova/api/ec2/apirequest.py              |    6 +++---
 nova/api/ec2/cloud.py                   |    9 ++++-----
 nova/api/ec2/ec2utils.py                |    2 +-
 nova/api/ec2/faults.py                  |    2 +-
 nova/api/metadata/handler.py            |    2 +-
 nova/api/openstack/v2/flavors.py        |    2 --
 nova/api/openstack/v2/image_metadata.py |    1 -
 nova/api/openstack/v2/images.py         |    3 ---
 nova/api/openstack/v2/ips.py            |    1 -
 nova/api/openstack/v2/limits.py         |    3 ---
 nova/api/openstack/v2/views/flavors.py  |    2 --
 nova/api/openstack/v2/views/limits.py   |    1 -
 nova/api/openstack/v2/zones.py          |    2 --
 nova/api/openstack/wsgi.py              |    5 +++--
 nova/api/openstack/xmlutil.py           |    2 +-
 19 files changed, 24 insertions(+), 40 deletions(-)

commit f0b54c7b343a752f3577dafc80e3eb5a9ae0754d
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Dec 21 13:42:40 2011 -0500

    Make reroute_compute use functools.wraps. Fixes LP bug #906945.
    
    Change-Id: I043b6543e79f9cc6c7a32c9952113ee009b31377

 nova/scheduler/api.py |    1 +
 1 file changed, 1 insertion(+)

commit ab2b1e15b60f37e7b785052a53d8526309809c59
Merge: f3ab002 b53a9f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 18:44:40 2011 +0000

    Merge "Generate instance faults when instance errors"

commit 397933a5464c47c40edde39010e58076045e5545
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 21 12:59:07 2011 -0500

    Removing extra code from servers controller
    
    Change-Id: Ifbc494be980cc6ef1df83b8a27bd45f62388e4b4

 nova/api/openstack/v2/servers.py |   39 ++++++++------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

commit f3ab0023b0b44d5be12f08588010aa76ae79c57f
Merge: 0cf2935 fb6850a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 21 16:31:36 2011 +0000

    Merge "Makes disassociate by timeout work with multi-host"

commit b53a9f36234e4ff887a20ca5045710497d7491a5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Dec 15 13:35:02 2011 -0500

    Generate instance faults when instance errors
    
    Currently adds all exceptions having to do with a specific instance that are
    generated in compute manager to the instance faults table.
    
    Change-Id: Idf92348c6896b0bf0f26d3a0dbd4a48a4c1d4329

 nova/compute/manager.py    |   83 ++++++++++++++++++++------
 nova/tests/test_compute.py |  139 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 185 insertions(+), 37 deletions(-)

commit 0cf2935688b84bb850f73b5974a0fd15b8f2015f
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Dec 20 16:09:53 2011 -0800

    Clarify NoValidHost messages
    
    "All hosts have too many cores" isn't that clear
    
    Change-Id: I11102fb5c86966f2b7888d9cba29aed040dd8f4e

 nova/scheduler/simple.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b1bd80bb087c37846edfd598d20eee5151788ddd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Dec 20 17:24:13 2011 -0500

    Fix one last bug in os-console-output extension
    
    Actually fixes bug 907083
    
    Change-Id: Ia57d316db0c79d7e78ef3225e77cd95589ac68de

 nova/api/openstack/v2/contrib/console_output.py    |    8 +++++---
 .../openstack/v2/contrib/test_console_output.py    |    6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

commit 47c4c49baaa08c83c29f695ed85e626b381b0a7e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Dec 20 17:24:13 2011 -0500

    Fix os-console-output extension integration
    
    Fixes bug 907083
    
    Change-Id: Ia57d316db0c79d7e78ef3225e77cd95589ac68df

 nova/api/openstack/v2/contrib/console_output.py    |   14 ++++++-
 .../openstack/v2/contrib/test_console_output.py    |   44 +++++++++++++++-----
 2 files changed, 46 insertions(+), 12 deletions(-)

commit 733433efbf0dee847096fb9e671c02ef07b21b94
Merge: 81559a8 711adf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 21:52:35 2011 +0000

    Merge "Improve the minidns tests to handle zone matching."

commit 81559a88884fdde14d6ca6bd788c0e37ca3d56cf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Dec 20 20:34:15 2011 +0000

    Set Location header in server create and rebuild actions
    
    The API documentation states that the Location header should be filled
    with the URL of the server. This change implemnts this for both the
    create and rebuild actions.
    
    Change-Id: Ic0372aeaea58c9288065e2cfc222ca9257d35c87

 nova/api/openstack/v2/servers.py            |   12 +++++++++
 nova/tests/api/openstack/v2/test_servers.py |   39 +++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

commit 5895a74c8b90f9b5436d0961d3b2b319f64bc826
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Dec 20 18:49:47 2011 +0000

    Consistently use REBUILDING vm_state
    
    There is both a vm_state and task_state called REBUILDING, which was
    used inconsistently. This resulted in a rebuild action returning
    "ACTIVE" for the status instead of "REBUILD" like the API
    documentation states.
    
    This change drops the task_state in favor of making all of the code
    use vm_state
    
    Change-Id: I56b4b6fd4d02b75c6270fc91cdec1902e7794cf1

 nova/compute/api.py         |    4 ++--
 nova/compute/task_states.py |    2 --
 nova/tests/test_compute.py  |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

commit 536c6133a3facb56e58b2fe5b5417385d4954ae5
Merge: 58e2d4b a360e7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 19:34:11 2011 +0000

    Merge "Make UUID format checking more correct."

commit 58e2d4b8b5a075eac881b33a18a47b28719a6e99
Merge: b53a233 5c8be02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 19:25:21 2011 +0000

    Merge "Set min_ram and min_disk on snapshot"

commit 711adf2d6d6a0cabfb606db31ca0995aabe856d1
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Thu Dec 15 20:37:51 2011 -0600

    Improve the minidns tests to handle zone matching.
    
    For blueprint public-and-private-dns.
    
    Change-Id: I88e906e2ce031b6cf60ff0d16a20aadfdd515723

 nova/network/minidns.py    |    8 +++++---
 nova/tests/test_network.py |   29 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 14 deletions(-)

commit b53a233c89c83072c167492d74e16043bb730d6c
Merge: 0eed0ed a135c8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 18:13:45 2011 +0000

    Merge "Properly passes arg to run_iscsiadm to fix logout"

commit 0eed0edcd08e1cd19e4ec2949d99baa37145fe26
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Tue Dec 20 18:32:28 2011 +0100

    Remove unused FLAGS.block_size
    
    Change-Id: I41ba92f7443dba94e9e749c916833325f46fb750
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/virt/disk.py |    2 --
 1 file changed, 2 deletions(-)

commit 3828b89182a77a25cf42658d91c49e787dfea05c
Merge: e662da0 c6ea206
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 17:10:55 2011 +0000

    Merge "Creating mechanism that loads Admin API extensions"

commit a360e7f4c9fe1634a2939f20778e4421d612d721
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Dec 19 14:51:31 2011 -0500

    Make UUID format checking more correct.
    
    This patch uses the same logic from glance to verify if a UUID is
    properly formed.  It just tries to build a uuid.UUID from the string.
    A test case has been added which previously would have failed, but now
    passes.
    
    A second test case has been added that verifies that the result of the
    gen_uuid() function is considered valid, as well.
    
    Change-Id: I33fe37b23ef03eda0f0e9d69afb601ca260aabde

 nova/tests/test_utils.py |    7 +++++++
 nova/utils.py            |    6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 5c8be0211ca96cd7562fc930f6013c28f1729dd5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Dec 19 10:37:43 2011 -0500

    Set min_ram and min_disk on snapshot
    
    Fixes bug 884269
    
    Change-Id: Id92727ea09bf73ab8d6201f0aece8018de4b674b

 nova/compute/api.py        |   30 +++++++++++
 nova/tests/test_compute.py |  126 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 155 insertions(+), 1 deletion(-)

commit dc2c46430158496878255dd2e4d6416804d7c622
Author: Brad Hall <brad@nicira.com>
Date:   Mon Dec 19 19:02:47 2011 -0800

    Add support for port security to QuantumManager
    
    If enabled, QuantumManager will now pass in the allowed_address_pairs that
    some quantum plugins understand in order to enforce port security on a
    given port.  Any plugins that don't understand the extra fields will just
    ignore them.
    
    Change-Id: I640658036789b319ecefbb5e7dcdcf6b4f4ab34e

 nova/network/quantum/manager.py |   17 +++++++---
 nova/tests/test_quantum.py      |   71 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

commit e662da0c634c89ef65150540b9ebbde353d3450e
Merge: 9da3436 2033aef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 20 00:53:41 2011 +0000

    Merge "Add a console output action to servers"

commit 9da343637a042ebfd53384ee84f086fdbeef8483
Merge: 90668f8 dc6de5d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 19 22:07:13 2011 +0000

    Merge "Imported Translations from Launchpad"

commit 2033aef54f3c43ba73847e34e1fdc6490fd6f851
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Oct 24 23:56:05 2011 +0000

    Add a console output action to servers
    
    Relates to blueprint osapi-console-log and bug 876809. Adds equivalent
    of euca-get-console-output to openstack api as an extension.
    
    Change-Id: Ia71361ebbec820616a3007e216b0b9ff98d43541

 nova/api/openstack/v2/contrib/console_output.py    |   60 +++++++++++++++++
 nova/compute/api.py                                |    5 +-
 nova/compute/manager.py                            |   17 ++++-
 nova/tests/api/ec2/test_cloud.py                   |    3 +-
 .../openstack/v2/contrib/test_console_output.py    |   69 ++++++++++++++++++++
 nova/tests/api/openstack/v2/test_extensions.py     |    1 +
 nova/tests/test_compute.py                         |   15 ++++-
 nova/virt/fake.py                                  |    2 +-
 8 files changed, 164 insertions(+), 8 deletions(-)

commit c6ea206bf81830ce949f33bde928226435c99f4b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Dec 15 00:55:00 2011 -0500

    Creating mechanism that loads Admin API extensions
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: I2491267e370f053b5ae4e844aba1d82c3b0f0d86

 nova/api/openstack/v2/contrib/admin_actions.py     |   13 +-
 nova/api/openstack/v2/contrib/extended_status.py   |   15 +-
 nova/api/openstack/v2/contrib/hosts.py             |    7 +-
 .../openstack/v2/contrib/simple_tenant_usage.py    |    8 +-
 nova/api/openstack/v2/extensions.py                |   33 ++--
 .../api/openstack/v2/contrib/test_admin_actions.py |   20 +--
 .../openstack/v2/contrib/test_extendedstatus.py    |   16 +-
 nova/tests/api/openstack/v2/contrib/test_hosts.py  |  172 ++++++++++++++++++++
 .../api/openstack/v2/extensions/foxinsocks.py      |    2 +-
 nova/tests/api/openstack/v2/test_extensions.py     |   32 ++++
 nova/tests/test_hosts.py                           |  172 --------------------
 11 files changed, 241 insertions(+), 249 deletions(-)

commit 90668f8564e65f95a681baee847a384e484c46d8
Merge: 30731e7 fcdfdb1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 19 20:22:00 2011 +0000

    Merge "Renamed the instance_dns_driver to dns_driver for more general use."

commit 30731e7d60077b3411e1953b46a1a39ce4ca16b8
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Dec 16 09:19:39 2011 -0500

    Document return type from utils.execute().
    
    Change-Id: Id0bc0dff09a809fe3999c4ec5014ac40ccfd8d6d

 Authors       |    1 +
 nova/utils.py |    3 +++
 2 files changed, 4 insertions(+)

commit fcdfdb16543559f06d2fc5653795edf15bd015e4
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Thu Dec 15 16:09:25 2011 -0600

    Renamed the instance_dns_driver to dns_driver for more general use.
    
    For blueprint public-and-private-dns
    
    Change-Id: Ie3c86327839e9b855f5758a76d6484e5df598aa3

 nova/flags.py                       |    2 +-
 nova/network/dns_driver.py          |   41 +++++++++++++++++++++++++++++++++++
 nova/network/instance_dns_driver.py |   41 -----------------------------------
 3 files changed, 42 insertions(+), 42 deletions(-)

commit 229625574c2c6f3126656f8976b8938b96378e15
Merge: 1314ee0 de62e90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 19 05:45:23 2011 +0000

    Merge "Specify -t rsa when calling ssh-keygen."

commit de62e9087d55a9c89c9beb132408bf8ff1e57dcd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Dec 18 19:50:34 2011 -0800

    Specify -t rsa when calling ssh-keygen.
    
    Some operating systems (e.g. Illumos) don't default to RSA.  Probably safer to specify it anyway, even on Linux where it defaults.
    
    Change-Id: I6f1364e6ff79a9c9a38007611b8df3af1b2dc645

 nova/crypto.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1314ee08a68e929d87ab5fdbf4cb8c4882bd5bb0
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Dec 18 19:26:37 2011 -0800

    create_export and ensure_export should pass up the return value, to update the database
    
    Change-Id: I7ddc662dd31266d3724c76f65008071b3006215a

 nova/volume/san.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b60fcb547c228b989e20ea1d97b1192af96df3ee
Merge: f4368e5 d6881c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 19 02:41:22 2011 +0000

    Merge "IPAM drivers aren't homogenous bug 903230"

commit dc6de5d7dc6f5d923a0fba8a88c2a1a7bbc5599b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Dec 18 23:03:27 2011 +0000

    Imported Translations from Launchpad
    
    Change-Id: I7a7c0172429f310ead1bc1333f9876e18955b436

 po/ko.po |  361 ++++----
 po/tr.po | 2803 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 2983 insertions(+), 181 deletions(-)

commit f4368e5cdf286d065742e0da1977a3e48c091123
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Dec 13 16:48:05 2011 -0500

    avoid error and trace on dom.vcpus() in lxc
    
    This fixes bug 903943.  If you used lxc, you'd eventually
    see stack traces in nova-compute due to use of dom.vcpus().
    
    Change-Id: I8ff4e973d33eef3df116feb237b2febc8e6a59b5

 nova/virt/libvirt/connection.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit a135c8ecd16bb6a97743e4be1b060daff874879e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 16 13:40:38 2011 -0800

    Properly passes arg to run_iscsiadm to fix logout
    
     * fixes 905471
     * includes test to verify expected calls
     * elevates context as expected for volume_api.detach
    
    Change-Id: I0c2a5822d45df6f82f103f49ce8fcfe4a38a0049

 nova/compute/manager.py     |    2 +-
 nova/tests/test_libvirt.py  |   41 ++++++++++++++++++++++++++++++-----------
 nova/virt/libvirt/volume.py |    2 +-
 3 files changed, 32 insertions(+), 13 deletions(-)

commit fb6850a5b9d7d61a4bb96af8d1cd516fd139c1f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 16 16:02:54 2011 -0800

    Makes disassociate by timeout work with multi-host
    
     * fixes bug 898485
     * updates timeout query to key off of instance host as well
     * removes unused status=1 in related query
    
    Change-Id: Ia11b3d4d3db930eb31ccc2f74635971ba6edc32c

 nova/db/sqlalchemy/api.py |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit 106ea5eda8458b44846207a3df69cf1837789828
Merge: effb5a3 59193f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 22:46:48 2011 +0000

    Merge "Call get_instance_nw_info with elevated context, as documented in nova/network/manager.py"

commit effb5a38333598877e7f54a8ac1b110fffadae4c
Merge: 2ea74ba 2f76cd5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 21:51:27 2011 +0000

    Merge "Adds missing joinedload for vif loading."

commit 59193f110875026453b69ba0fc51f10692268875
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Dec 16 19:07:30 2011 +0000

    Call get_instance_nw_info with elevated context, as documented in nova/network/manager.py
    
    * Fixes Bug 904976
    * Add coverage for this in associate_floating_ip unit test
    
    Change-Id: I5bc35632ca382d011eb42e738140ba54d9cdc93f

 nova/compute/api.py        |    2 +-
 nova/tests/test_compute.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 2ea74bab8425338e33e8455f95d9ed208b1166de
Merge: 9b9b6d3 605dfa9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 21:10:59 2011 +0000

    Merge "Fix nova-manage flags declaration"

commit 2f76cd502fcc434b33af8963ac01c2ff6b8c723e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 16 13:08:56 2011 -0800

    Adds missing joinedload for vif loading.
    
     * fixes bug 905398
    
    Change-Id: I76ffea1437459942f5156d199592931afed4ae1b

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b9b6d3076a13f762e0152b8399875e7fbad30db
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Dec 16 12:01:59 2011 -0800

    missing comments about extensions to ec2
    
    Change-Id: I0b5a74aaf76cbc52e6d24217d22bd4bec2c98fbe

 nova/api/ec2/cloud.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit ee34849f091658dbb9adb73b7a31ad3ca85b4a01
Merge: 6bfd2c7 baf0556
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 20:04:57 2011 +0000

    Merge "Pull resource extensions into APIRouter"

commit 6bfd2c7990650475cf10d0903ae79cf8fb67dfff
Merge: e57e408 bfd5819
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 19:11:12 2011 +0000

    Merge "use env to find 'false'. Fix for OS X"

commit e57e4086ae399762ca4a9486afd76b0dc758d027
Merge: 47dccc4 e2875bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 18:20:45 2011 +0000

    Merge "Remove useless input_chain flags."

commit 47dccc4b485a948d5b4b95f9c1b1326230cf0e34
Merge: 874a201 f68abf9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 17:51:20 2011 +0000

    Merge "Fixes bug 723235"

commit baf05561c4a43a3c361e6e0e9f68767150165244
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Dec 16 11:46:15 2011 -0600

    Pull resource extensions into APIRouter
    
    First step in refactoring extensions to do away with the extensions
    middleware, which is needed to get rid of the lazy serialization
    middleware.  Converts ExtensionManager into a singleton to inhibit
    double-loading of extensions.
    
    Change-Id: Ia561d601df1a8c72c734c9426270268c1be13c3e

 nova/api/openstack/v2/__init__.py              |   26 +++++++++++++++
 nova/api/openstack/v2/extensions.py            |   40 +++++++++---------------
 nova/tests/api/openstack/v2/test_extensions.py |   11 ++++---
 nova/tests/integrated/test_extensions.py       |    3 ++
 4 files changed, 50 insertions(+), 30 deletions(-)

commit 874a20131856ec4e96664f0a4980d5b8ae6f9f5e
Merge: 5bec325 baf7e02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 17:35:10 2011 +0000

    Merge "Fix scheduler error handler"

commit 5bec325dca4601c878ffeed70e72bd4611fd3f02
Merge: 3f7353d 2fabb67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 16 16:23:05 2011 +0000

    Merge "Bugfix for lp904932"

commit d6881c25bdea4ac63c4be1b6f13d77dd159d8910
Author: Édouard Thuleau <edouard1.thuleau@orange.com>
Date:   Mon Dec 12 16:01:56 2011 +0100

    IPAM drivers aren't homogenous
    bug 903230
    
    Change-Id: I351d576f22858ad28f2e68fb5c30a96ddc3fe427

 nova/network/quantum/melange_ipam_lib.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit bfd5819ab41bbb240a62fdc702077d053d505b75
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Dec 15 17:19:17 2011 -0800

    use env to find 'false'. Fix for OS X
    
    Change-Id: I0d899d5600c29b81d54358f950b24e2062ca0712

 nova/tests/test_utils.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit baf7e02f29600e79eacb6c0f747075afeb74fdd5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Dec 15 14:16:42 2011 -0800

    Fix scheduler error handler
    
    Fixes bug 904971
    
    Scheduler error handler was looking for instance_id when it may or may
    not exist.  Added the proper code for it to determine whether the
    instance was actually created in the DB or not and how to find its ID.
    
    Note: there's some pretty nasty stuff in here, but unavoidable without
    larger changes.  I'd like to hold off on these larger changes, because
    the problem should be solved with some of the scalability work coming.
    
    Tests included.
    
    Change-Id: Ief5fde8128437c9dc257af9c4d0c2950d0962ce5

 nova/compute/api.py                     |    2 +-
 nova/scheduler/chance.py                |    5 ++++-
 nova/scheduler/distributed_scheduler.py |    7 ++++++-
 nova/scheduler/driver.py                |    8 ++++++--
 nova/scheduler/manager.py               |   29 ++++++++++++++++++++---------
 nova/scheduler/simple.py                |    4 ++++
 nova/tests/scheduler/test_scheduler.py  |   31 +++++++++++++++++++++++++++++--
 7 files changed, 70 insertions(+), 16 deletions(-)

commit 3f7353d14183a93099c99dc2fc72614265f1c72c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 15 22:55:59 2011 +0000

    Starting work on exposing service functionality.
    
    Change-Id: Ic9412bc0dae8559e356c51ace063504c4cac5def

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    8 ++++++++
 nova/manager.py           |   10 ++++++++++
 3 files changed, 23 insertions(+)

commit 2fabb67e3c3569a06692c131dec735133a7bb08e
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Dec 15 15:41:32 2011 -0600

    Bugfix for lp904932
    
    Allow stubbing of "open" via a helper function
    
    Change-Id: I1bf32c00ba3e565b2c895d8b7e11cbda87cd3597

 nova/network/linux_net.py    |   33 +-
 nova/tests/test_linux_net.py |  957 ++++++++++++++++++++++--------------------
 2 files changed, 514 insertions(+), 476 deletions(-)

commit 8b52505df5d6f62e3a31a3457832288fd9e450d0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Dec 15 21:54:07 2011 +0100

    Ensure fkey is dropped before removing instance_id
    
    This fixes Bug #904888
    
    On MySQL databases that use InnoDB by default (ie, at the point when
    database is being first migrated), extra care needs to be taken to
    ensure FKs are dropped before columns because they are not automatically.
    
    Patch from Adam Gandelman and Scott Moser.
    
    Change-Id: I32919a46bb76f524e064098738ad98248b2f1c0e

 ...ange_instance_id_to_uuid_in_instance_actions.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 78f4a185bf48cc3366cc4c618ba865a1ae14b9ca
Merge: cce41ac 274fd49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 19:33:46 2011 +0000

    Merge "nova.virt.libvirt.firewall: set static methods"

commit cce41ac10df9aa978e1202f5947d698cd30d9d62
Merge: 8eeb132 0d71f29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 19:07:35 2011 +0000

    Merge "Expose Asynchronous Fault entity in the OSAPI"

commit 8eeb132f80acdf3f05edd5594bce54dde5fb789c
Merge: 22040a5 6090313
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 18:05:56 2011 +0000

    Merge "Updates OVS rules applied to IPv4 VIFs"

commit 22040a57b0d5f004025f7b61343c3177a94a7ff7
Merge: ab2f372 a72a66c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 17:22:11 2011 +0000

    Merge "Switch disk_config extension to use one DB query"

commit ab2f3729360c14ea68cb57181ab5f83a2de53b26
Merge: 3679187 d58c2d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 17:13:16 2011 +0000

    Merge "Make XenAPI agent configuration synchronous"

commit f68abf9b0e3e2ba206c560c19db321c6f88670f1
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Fri Dec 2 14:18:38 2011 +0100

    Fixes bug 723235
    
    The XML templates have been converted into properties, thus we can
    compare the mtime of the XML templates (libvirt and cpuinfo) each
    time they are needed, checking if they have been modified and
    reloading them. Added a function to read cached files.
    
    Change-Id: I6cf0229c6435300e73f9d9a6b10b0bf9bf144a55

 nova/tests/test_utils.py        |   29 +++++++++++++++++++++++++++++
 nova/utils.py                   |   14 ++++++++++++++
 nova/virt/libvirt/connection.py |   18 ++++++++++++++++--
 3 files changed, 59 insertions(+), 2 deletions(-)

commit 274fd4945546b60be94acb5c7836b362623bd244
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Dec 15 12:59:23 2011 +0100

    nova.virt.libvirt.firewall: set static methods
    
    Change-Id: I7fd2e4341252502a63dc9af07910ac14c0df4f60
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/virt/libvirt/firewall.py |   39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

commit 0d71f29583c68c2488d5917f3fdaa7b7011186a1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Dec 13 15:57:37 2011 -0500

    Expose Asynchronous Fault entity in the OSAPI
    
    Show latest instance fault in server update, show and detailed list
    
    Change-Id: I9719d696aa3aac6e9cbca4c9a102bcd5a33bf0b1

 nova/api/openstack/v2/schemas/v1.1/server.rng |   34 +++--
 nova/api/openstack/v2/servers.py              |   40 ++++--
 nova/api/openstack/v2/views/servers.py        |   26 +++-
 nova/compute/api.py                           |    5 +
 nova/db/api.py                                |    6 +-
 nova/db/sqlalchemy/api.py                     |   27 ++--
 nova/tests/api/openstack/v2/test_servers.py   |  167 +++++++++++++++++++++++++
 nova/tests/test_compute.py                    |   27 ++++
 nova/tests/test_db_api.py                     |   56 +++++----
 9 files changed, 326 insertions(+), 62 deletions(-)

commit 605dfa9dee912eabfb81536031770ad93c0d4389
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Dec 15 17:22:17 2011 +0100

    Fix nova-manage flags declaration
    
    Some flags seem not used anymore, whereas some are not correctly declared
    and would fail.
    
    Change-Id: I8fd0ad949fd9a4b932e8e31d28e6e9dc5426bb28
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 bin/nova-manage |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 36791875b599da16d90578b1b53759f82f8e04bb
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Dec 15 17:04:27 2011 +0100

    Remove useless flags declaration
    
    Change-Id: I326d0b7a8690dd392d089b792085c38825a55861
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 bin/nova-dhcpbridge |    4 ----
 1 file changed, 4 deletions(-)

commit e2875bfadfe78dc2c54be549a0472eefc95b96e4
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Dec 15 16:27:59 2011 +0100

    Remove useless input_chain flags.
    
    Change-Id: I606b6c7274c2c2f8be7837e40d4cdf85fd528bd0
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/network/linux_net.py |    2 --
 1 file changed, 2 deletions(-)

commit d58c2d2bae97c9193e54056405a8f851051fdada
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Dec 12 18:01:54 2011 +0000

    Make XenAPI agent configuration synchronous
    
    Fixes bug 897887
    
    Much of the XenAPI agent configuration happens asynchronously from the
    spawn process. This allows the instance to go ACTIVE state earlier and
    leaves the possibility of a race with delete open. This makes the
    steps synchronous, ensuring the process only goes to ACTIVE after the
    configuration is done.
    
    Change-Id: I294b595128979e153c797d9e610b66bc76f47666

 nova/tests/test_xenapi.py |    5 +-
 nova/virt/xenapi/vmops.py |  137 +++++++++++++++++++++------------------------
 2 files changed, 66 insertions(+), 76 deletions(-)

commit a72a66c206cd80aa4b392eb42c29e4a1cd4463f9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Dec 15 15:21:11 2011 +0000

    Switch disk_config extension to use one DB query
    
    A response through this extension can have many servers and making one
    query per server can slow down response time dramatically. This change
    switches the extension to use one DB query instead of many queries.
    It also avoids queries when the key is already populated, such as when
    the results include responses from a remote zone.
    
    This change reduces a 'nova list' of 21 servers from 14 seconds to 1
    second on my (relatively slow) development system.
    
    Change-Id: I8476dbca0f87ff2a3d69bd7b8f51c296e41e3388

 nova/api/openstack/v2/contrib/disk_config.py       |   17 ++++++++++++++---
 .../api/openstack/v2/contrib/test_disk_config.py   |   18 +++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

commit c421328c5697698adfaacdf053efe715646d069a
Merge: 6447e76 596d433
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 15:03:39 2011 +0000

    Merge "Rename libvirt_uri to uri"

commit 6447e767c7f4bdd95a81b7a3ca276551d89dd163
Merge: de815b7 ed3b282
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 14:54:49 2011 +0000

    Merge "Make libvirt_uri a property"

commit de815b7f4426134c93ce5910b3401bf036df211d
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Dec 14 22:16:25 2011 -0500

    Update utils.execute so that check_exit_code handles booleans.
    Fixes LP bug #904560.
    
    Change-Id: I5d09b65dade166763981dc6b248034d86ba217f1

 nova/tests/test_utils.py |    6 ++++++
 nova/utils.py            |   13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

commit 596d433ffa952d79d558c35f32020b5affc72ade
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Dec 15 12:35:25 2011 +0100

    Rename libvirt_uri to uri
    
    Change-Id: I7c7849aec05bcfe979643dcfac78ab98dd35f010
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/tests/test_libvirt.py      |    6 +++---
 nova/virt/libvirt/connection.py |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

commit ed3b282793ca1675820ff344720cee0c5c8c19ab
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Wed Dec 14 11:38:42 2011 +0100

    Make libvirt_uri a property
    
    Change-Id: Ib7694780fb979476b46776656f58526d0c04ec59
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/tests/test_libvirt.py      |    9 +++------
 nova/virt/libvirt/connection.py |    4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

commit 076317047802d3ed393c5467223abd6f613291ba
Merge: 548ae0b 31a7924
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 06:16:18 2011 +0000

    Merge "Refactors handling of detach volume"

commit 548ae0bdbf70e425dd4aca65f98038c2ae65d1f4
Merge: 8d4208c 8480d74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 04:07:19 2011 +0000

    Merge "Making pep8 output less verbose."

commit 8d4208c9a171d2a26a8b1eaf9695d986f7ce7a1c
Merge: 6b962d1 9ba6bed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 03:11:41 2011 +0000

    Merge "floating-ip: return UUID of instance rather than ID"

commit 6b962d16144afa14e2b9fe6cc3f7dc522548a027
Merge: ed1b801 a04a5fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 15 03:02:51 2011 +0000

    Merge "Make various methods static"

commit 8480d74fa17370fec740fe710f07b1ebc64e2ec2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 14 20:31:16 2011 -0600

    Making pep8 output less verbose.
    
    Fixes bug #904559
    
    Change-Id: I078b060483890bf8bfc9b78d3174370dea4d6bbc

 run_tests.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 31a7924ecfae0b9c9fea0edc344f0e3ca2fe78a5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 14 14:03:04 2011 -0800

    Refactors handling of detach volume
    
     * removes unnecessary flags in detach_volume call
     * stops double detach reported in bug 887402
     * moves volume.API() into init
    
    Change-Id: I65332cabedf2edb88acb48b3293cba291d440238

 nova/compute/manager.py |  142 ++++++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 70 deletions(-)

commit ed1b801a2cc3691cdab6ca2ae95f7299a964d00f
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Tue Dec 13 19:05:21 2011 -0600

    Fixes bug 887402
    
    Change utils.execute to accept a list or a single integer in
    check_exit_code.
    
    In libvirt.disconnect_volume() return codes 0 and 255 are both valid
    for logout/delete, where 255 is returned if the volume is already
    disconnected.
    
    Change-Id: Icffeb0fe8269a02d95ac6ed180ba0bb9f458a6ed

 nova/utils.py               |   12 +++++++-----
 nova/virt/libvirt/volume.py |   12 ++++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

commit 369050f3a3f82460825edd23079f8f35334bdf14
Author: jakedahn <jake@ansolabs.com>
Date:   Wed Dec 14 16:04:46 2011 -0800

    Bug 902626
    
    Fixing typo which breaks floating_ip_get_all_by_project.
    
    Change-Id: Ic586455b202ece5a9fb61e78d243502069d39242

 nova/db/sqlalchemy/api.py |    1 -
 1 file changed, 1 deletion(-)

commit 7e7abf832316168a01b0f0f10eda9a2ae79074ce
Merge: c178043 736583f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 20:44:50 2011 +0000

    Merge "Make sure the rxtx_cap is used to set qos info"

commit c178043d3021548111a7d7ae4a53210fd96cc1bf
Merge: af54e79 5815efb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 20:08:24 2011 +0000

    Merge "Pass additional information from nova to Quantum"

commit a04a5fa0cc0f87193502da2e68efe5102aef55b3
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Wed Dec 14 14:41:03 2011 +0100

    Make various methods static
    
    A lot of stuff in nova.virt contain methods that are
    actually static. Marking them this way makes the code clearer.
    
    Change-Id: I287058d3b2315562f2980999239fcd3240d2b1ec
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/virt/fake.py               |    3 ++-
 nova/virt/libvirt/connection.py |   33 ++++++++++++++++++++++-----------
 nova/virt/xenapi_conn.py        |    3 ++-
 3 files changed, 26 insertions(+), 13 deletions(-)

commit af54e79b7815c233c6e800bc79e428fe23f92eb7
Merge: 4419bad bfefe63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 09:15:10 2011 +0000

    Merge "Added support for creating nova volume snapshots using OS API."

commit 4419badf187acfc100dff1ba05bb1543eab60ba7
Merge: 5e6ae08 15cc877
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 08:42:22 2011 +0000

    Merge "Fix tgtadm off by one error. Fixes bug #871278"

commit 5e6ae0822097f379ee2ee623c4e6213f1d930bf8
Merge: 0514bc9 bfee166
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 00:54:47 2011 +0000

    Merge "Follow-on to I665f402f to convert rxtx_quota to rxtx_factor in nova-manage and a couple of tests."

commit 5815efb158d8dc7f9f435ce96ab4f4caa599a640
Author: Brad Hall <brad@nicira.com>
Date:   Sun Dec 11 19:56:39 2011 +0000

    Pass additional information from nova to Quantum
    
    Some of the Quantum plugins will require this information
    
    Change-Id: I957b5546b8c16d44d587bd73da975a1bb4a0b630

 nova/network/quantum/manager.py            |   23 ++++++++++++++++++++---
 nova/network/quantum/quantum_connection.py |    9 +++++++--
 nova/tests/test_quantum.py                 |    5 +++--
 3 files changed, 30 insertions(+), 7 deletions(-)

commit 0514bc9d5e92ed0eb6671349e8ff37d7f58aab85
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Dec 13 23:34:18 2011 +0000

    Refactor vm_state and task_state checking
    
    This branch refactors the recently merged code for checking vm_state and
    task_state. The list of allowed states is merged to the method being
    checked, more methods are being checked and cleans up the general usage
    of them to be easier to read.
    
    Change-Id: If6130dbab947f7bd037e37af9827b6a7c9a193d4

 nova/compute/api.py                         |  156 ++++++++++++++-------------
 nova/compute/state_checker.py               |  137 -----------------------
 nova/compute/task_states.py                 |   11 --
 nova/compute/vm_states.py                   |    6 --
 nova/exception.py                           |    2 +-
 nova/tests/api/ec2/test_cloud.py            |    3 +
 nova/tests/api/openstack/v2/test_servers.py |    8 +-
 nova/tests/integrated/test_servers.py       |   16 ++-
 nova/tests/test_compute.py                  |  115 ++------------------
 9 files changed, 106 insertions(+), 348 deletions(-)

commit 6090313757d3fb08cbfad878870537ce56b8def9
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Dec 13 16:34:06 2011 -0600

    Updates OVS rules applied to IPv4 VIFs
    
    Change-Id: I90cf18a6f60a792c184097f5eeea4282b58f85c5

 .../xensource/scripts/ovs_configure_vif_flows.py   |   76 +++++++++++++++++---
 1 file changed, 65 insertions(+), 11 deletions(-)

commit 67490c6b50174a89bce6719dd1b89fee8faa8ab2
Merge: fd9e0e9 c032f45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 22:08:47 2011 +0000

    Merge "Fix error when subnet doesn't have a cidr set"

commit fd9e0e92af785d1e48ce42ce7eb4501595aabe3c
Merge: 9737f40 88b1d77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 21:58:30 2011 +0000

    Merge "Renaming instance_actions.instance_id column to instance_uuid. blueprint: internal-uuids"

commit 9737f407e338ce7154a2acd493405426a7e33076
Merge: ceb575d 073f629
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 21:41:23 2011 +0000

    Merge "Fix some errors found by pychecker"

commit ceb575d70d9e9acd414d29bb7cc9b93523fabd79
Merge: f597dc5 6b66335
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 21:32:18 2011 +0000

    Merge "bug 899767: fix vif-plugging with live migration"

commit bfee1661f6e3d2ef842a8bd347726a09ba25f9df
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Mon Dec 12 19:40:55 2011 -0600

    Follow-on to I665f402f to convert rxtx_quota to rxtx_factor in
    nova-manage and a couple of tests.
    
    Change-Id: I1c72dbef6173e4c08006e36fa90565a724528b7c

 bin/nova-manage            |   15 ++++++---------
 nova/tests/test_compute.py |    3 +--
 nova/tests/test_libvirt.py |    3 +--
 3 files changed, 8 insertions(+), 13 deletions(-)

commit 736583fd9f5d166f0c7b0ed9d8556d332cf2bd5b
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Tue Dec 13 14:43:51 2011 -0600

    Make sure the rxtx_cap is used to set qos info
    
    Change-Id: Id06d12a24756ce865e3b7e1b79185dddbdb71582

 nova/network/quantum/manager.py |    1 +
 nova/tests/test_xenapi.py       |    3 ++-
 nova/virt/xenapi/vif.py         |   11 +++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

commit 073f629d7878078f6294de3771f23b85d72d0286
Author: Brad Hall <brad@nicira.com>
Date:   Sun Dec 11 20:14:16 2011 +0000

    Fix some errors found by pychecker
    
    Change-Id: I6ae8776fcfd7fbae1d6555d2e33ae807a9daccb2

 nova/network/quantum/client.py             |    4 +++-
 nova/network/quantum/melange_ipam_lib.py   |    4 ++--
 nova/network/quantum/nova_ipam_lib.py      |    2 +-
 nova/network/quantum/quantum_connection.py |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

commit 15cc877cc2af71135b896974f17cb4a63291a08c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Dec 13 13:45:43 2011 -0500

    Fix tgtadm off by one error. Fixes bug #871278
    
    Change-Id: Ia359045465ada9753b86d1a08cc947966b3ac899
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 nova/virt/libvirt/volume.py |   11 ++++++++---
 nova/volume/driver.py       |   11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

commit f597dc5548d66530e68ff5809ac2c56b7edbc6d8
Merge: c979656 724e5e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 18:05:39 2011 +0000

    Merge "Fix for bug 902175"

commit c9796562a2a25917bc91f7b3cb63c01b2034127b
Merge: ad32419 b822159
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 17:48:12 2011 +0000

    Merge "Fix network forwarding rule initialization in QuantumManager"

commit ad3241929ea00569c74505ed002208ce360c667e
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Dec 1 17:54:16 2011 +0100

    Sanitize EC2 manifests and image tarballs
    
    Prevent potential directory traversal with malicious EC2 image tarballs,
    by making sure the tarfile is safe before unpacking it. Fixes bug 894755
    
    Prevent potential directory traversal with malicious file names in
    EC2 image manifests. Fixes bug 885167
    
    Change-Id: If6109047307bd6e654ee9d1254f0d7f31cf741c1

 MANIFEST.in                 |    1 +
 nova/image/s3.py            |   13 ++++++++++++-
 nova/tests/image/abs.tar.gz |  Bin 0 -> 153 bytes
 nova/tests/image/rel.tar.gz |  Bin 0 -> 165 bytes
 nova/tests/image/test_s3.py |   10 ++++++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

commit 9ba6beda437faac138cfea4e0ae21656c08ea394
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Mon Dec 12 16:02:36 2011 +0100

    floating-ip: return UUID of instance rather than ID
    
    Returning the database ID seems useless now that instances are identified by
    UUID. So it seems more reasonable to return UUID here too.
    
    Change-Id: I36fa6ded284158facb891dd081aa3d3f45c7c5ee
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 nova/api/openstack/v2/contrib/floating_ips.py      |    2 +-
 .../api/openstack/v2/contrib/test_floating_ips.py  |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

commit 88b1d7739b5d0fabc613f85f64741321f67bf719
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Dec 6 16:56:12 2011 -0500

    Renaming instance_actions.instance_id column to instance_uuid.
    blueprint: internal-uuids
    
    Change-Id: I204c3fd49278c509a9bc32353445ede086cfadb2

 nova/compute/api.py                                |    2 +-
 nova/db/api.py                                     |    6 +-
 nova/db/sqlalchemy/api.py                          |   11 +--
 ...ange_instance_id_to_uuid_in_instance_actions.py |   71 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    3 +-
 nova/tests/vmwareapi/db_fakes.py                   |    1 +
 nova/tests/xenapi/stubs.py                         |    5 +-
 nova/virt/vmwareapi/vmops.py                       |   28 ++++----
 nova/virt/vmwareapi_conn.py                        |    8 +--
 nova/virt/xenapi/vm_utils.py                       |   27 ++++----
 nova/virt/xenapi/vmops.py                          |   26 +++----
 nova/virt/xenapi_conn.py                           |   11 +--
 12 files changed, 133 insertions(+), 66 deletions(-)

commit 724e5e7a5bc065be239b3ededf0609de386c1d6f
Author: Brad Hall <brad@nicira.com>
Date:   Mon Dec 12 18:24:26 2011 +0000

    Fix for bug 902175
    
    Remove the gateway port when deleting the network (if it's the only one left),
    and kill dnsmasq if the network is deleted.
    
    Change-Id: If6b4798ddb4d21fe6c32ac20e6237494b799ecbd

 nova/network/quantum/manager.py            |   29 ++++++++++++++++++++++------
 nova/network/quantum/quantum_connection.py |   14 ++++++++++++++
 nova/tests/test_quantum.py                 |    9 +++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)

commit 1c0859283f4e497cc9abea06039f5595406208ef
Author: Yun Mao <yunmao@gmail.com>
Date:   Mon Dec 12 17:46:36 2011 -0500

    fixed typos. removed an unused import
    
    Change-Id: I3cc1d2b2e89f5f4bd82dd8a259363d4e88708531

 Authors         |    1 +
 nova/manager.py |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

commit ff753cd608973f5d72a80aef0f9fb8a646fccc3f
Author: David Subiros <david.perez5@hp.com>
Date:   Wed Nov 16 17:31:29 2011 +0000

    Vm state management and error states
    
    this implements the blueprint nova-vm-state-management
    It implements the following functionalities:
    - Filter compute api calls according to state of the VM
    (defined in compute/state_checker).
    - Sets error state if the scheduler cannot allocate the VM in any host
    - Handles the create/delete concurrency in the compute manager
    
    Change-Id: Ie6d016b7d4781f70bb5967f204fa88a6412bd727

 nova/compute/api.py                         |  118 +++++++--------
 nova/compute/manager.py                     |   35 ++++-
 nova/compute/state_checker.py               |  137 ++++++++++++++++++
 nova/compute/task_states.py                 |   11 ++
 nova/compute/vm_states.py                   |    6 +
 nova/exception.py                           |    5 +
 nova/scheduler/manager.py                   |   30 ++--
 nova/tests/api/ec2/test_cloud.py            |   21 +--
 nova/tests/api/openstack/v2/test_servers.py |    5 +
 nova/tests/scheduler/test_scheduler.py      |   57 +++++---
 nova/tests/test_compute.py                  |  208 ++++++++++++++++++++++++++-
 11 files changed, 533 insertions(+), 100 deletions(-)

commit bfefe6317fde87f8ca7a4d28bed11d99f7029186
Author: Gaurav Gupta <gaurav@denali-systems.com>
Date:   Sat Oct 29 17:20:08 2011 -0700

    Added support for creating nova volume snapshots using OS API.
    
    Fixes bug 883676
    blueprint nova-volume-snapshot-backup-api
    
    Change-Id: Id3e1ad39ef791b93dd014cada87c2d295454701f

 Authors                                            |    1 +
 nova/api/openstack/v2/contrib/volumes.py           |  155 +++++++++-
 .../api/openstack/v2/contrib/test_snapshots.py     |  299 ++++++++++++++++++++
 .../tests/api/openstack/v2/contrib/test_volumes.py |    6 +-
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |    4 +-
 5 files changed, 460 insertions(+), 5 deletions(-)

commit d3b75b75aa937380f04b5320b70c8673821af203
Merge: b4a2d19 b69e89f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 12 23:09:06 2011 +0000

    Merge "Fixing snapshot failure task_state"

commit c032f4588f30d04b6868456fb557daab7986142a
Author: Brad Hall <brad@nicira.com>
Date:   Mon Dec 12 21:23:47 2011 +0000

    Fix error when subnet doesn't have a cidr set
    
    If it isn't set in the subnet just take it from the network_ref.
    
    Change-Id: Id9b4a25b369884f4f4d5527b44d1215d3c244d70

 nova/network/quantum/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b4a2d19aeab547cf1e917beef49ca24019389243
Merge: b43fa8b 5abbbd8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Dec 12 20:44:54 2011 +0000

    Merge "Imported Translations from Launchpad"

commit 6b6633521c57422dfcdd1c0fbd8004c01bbe99cc
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Dec 12 10:34:33 2011 -0800

    bug 899767: fix vif-plugging with live migration
    
    Expose vif_unplug method in virt layer, as the compute manager has to
    explicitly call it on during live migration, so that network devices are
    torn down even if the disk image is not.
    
    Change-Id: Iae88c72f4fd2c7c097c23ef9e5f8fd392052f73e

 nova/compute/manager.py         |    6 ++++++
 nova/tests/test_compute.py      |    2 ++
 nova/virt/driver.py             |    6 +++++-
 nova/virt/fake.py               |    6 +++++-
 nova/virt/hyperv.py             |    8 ++++++++
 nova/virt/libvirt/connection.py |   11 ++++++++---
 nova/virt/vmwareapi_conn.py     |    6 +++++-
 nova/virt/xenapi/vmops.py       |    9 ++++++---
 nova/virt/xenapi_conn.py        |    5 +++++
 9 files changed, 50 insertions(+), 9 deletions(-)

commit b43fa8b590850fd50a85f36da8c3046c3a1c19a0
Merge: 1b4a0f8 1e35236
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 12 16:39:34 2011 +0000

    Merge "fixed_ips by vif does not raise"

commit b69e89f60c635f1e0fb5e25696e3b5ad26416b56
Author: David Subiros <david.perez5@hp.com>
Date:   Wed Nov 30 09:45:23 2011 +0000

    Fixing snapshot failure task_state
    
    fixes bug 898162
    If a snapshot fails now the instance task_state is set back to None.
    
    Change-Id: I5ed8850a35aea901adf253f3f4adc590efd3a075

 nova/compute/manager.py    |    6 ++++--
 nova/tests/test_compute.py |   28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

commit 1b4a0f859e76de4c6e5cb7b51a12e9bf2fb3e295
Merge: a4e2ed8 cfe6fe3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 12 00:54:38 2011 +0000

    Merge "Add preparation for asynchronous instance faults"

commit a4e2ed8cb9ba71e96dfadb96f8171054a0d30914
Merge: ce2d62f a33b4d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 12 00:45:28 2011 +0000

    Merge "Add templates for selected resource extensions."

commit 5abbbd8726f03cccd280d7eb66f5c56eda228acb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Dec 11 23:02:45 2011 +0000

    Imported Translations from Launchpad
    
    Change-Id: I3c05064b43f71f0d38bceee7e7e25ced567deea9

 po/es.po    |  774 +++++++++++++++++++++++++++++-----------------------------
 po/ko.po    |  784 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_CN.po |  776 +++++++++++++++++++++++++++++-----------------------------
 3 files changed, 1188 insertions(+), 1146 deletions(-)

commit ce2d62f95cd9b62858c9b4ef37b418881ceaef07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Dec 10 14:01:17 2011 -0800

    Moves find config to utils because it is useful
    
    This is to prepare for a future patch will will use find
    config to load other config files.
    
    Change-Id: Ic9bd9027baf518734c3f51f516651b80d1e752f2

 nova/exception.py       |    4 ++--
 nova/tests/test_wsgi.py |    2 +-
 nova/utils.py           |   23 +++++++++++++++++++++++
 nova/wsgi.py            |   24 +-----------------------
 4 files changed, 27 insertions(+), 26 deletions(-)

commit 1e35236519239ef2b4acbb78249502b7bd8ce9b8
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Fri Dec 9 17:53:15 2011 -0600

    fixed_ips by vif does not raise
    
    It makes more sense if this method returns an
    empty array instead of raising when it finds no
    ips. This lets the iteration over that array
    handle the 0 case, and we can use a conditional on
    the len(of the ips) if really needed. I'm not sure
    that log is needed to say "No fixed IPs
    deallocated" or if that is an artifact of needing
    something to put in the exception handler.
    
    Change-Id: Ib9f66affb5360fb11a3ab5f415a0e57602cec886

 nova/db/api.py                        |    4 ++--
 nova/db/sqlalchemy/api.py             |    5 +----
 nova/exception.py                     |    4 ----
 nova/network/quantum/nova_ipam_lib.py |   21 ++++++++++-----------
 4 files changed, 13 insertions(+), 21 deletions(-)

commit a33b4d616d8bb877f295383e8649df14c1e19b3c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Dec 9 15:53:58 2011 -0600

    Add templates for selected resource extensions.
    
    Related to bug 852141; adds XML serialization and deserialization for
    the following extensions:
    
    * VSAs (zadr-vsa)
    
    Change-Id: Id9e9888758d02085a603fccfba1987a624da55c9

 .../openstack/v2/contrib/virtual_storage_arrays.py |  228 +++++++++++++----
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |  265 ++++++++++++++++++++
 2 files changed, 444 insertions(+), 49 deletions(-)

commit b822159de88e3ec30f85aa4e981dfcd93a582dc9
Author: Brad Hall <brad@nicira.com>
Date:   Thu Dec 8 04:57:38 2011 +0000

    Fix network forwarding rule initialization in QuantumManager
    
    This moves the network init code from init to init_host() and breaks
    the snat rule cmd out of driver.init_host().  The network_create call
    can now just call the add_snat_rule function to set up the rule for
    the network when it is created.
    
    Change-Id: Id36dc42edd8b49938f85e16f16fce0416039fd50

 nova/network/linux_net.py       |   14 ++++++++++----
 nova/network/quantum/manager.py |   11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

commit 0c6c7700299e225aee2c86fbe725c8e146b9f0d4
Merge: de6a37a 525ff43
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 19:55:12 2011 +0000

    Merge "_check_image_size returns are consistent"

commit de6a37a7966aff79ec7b0e6f3c9b12235811e122
Merge: 02b06b6 51ff598
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 19:13:45 2011 +0000

    Merge "Port nova.flags to cfg"

commit 525ff432f8c6584015d0e7255d7b1083e0778e33
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Fri Dec 9 13:06:31 2011 -0600

    _check_image_size returns are consistent
    
    fixes lp902288
    
    Change-Id: I5be64b97428c19dcc8fb687cebfbcbd66c7cddb4

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 02b06b6ee535fd6dbb9b959cf26bf820802ea3c6
Merge: 9c34c82 6a3d814
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 19:05:37 2011 +0000

    Merge "Fixed the perms on the linux test case file so that nose will run it."

commit 9c34c82cf0e4f3e40b37b7cab37b2d1c88432d5f
Merge: 2aadaba 88a0f06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 18:57:06 2011 +0000

    Merge "Handle the 'instance' half of blueprint public-and-private-dns"

commit 6a3d814d46db9f1eff7b0971cce783653e5bf93d
Author: Duncan McGreggor <duncan@dreamhost.com>
Date:   Fri Dec 9 10:42:30 2011 -0800

    Fixed the perms on the linux test case file so that nose will run it.
    
    Fixes bug 902282
    
    Change-Id: Ic35292f36adc059064b1600dd4b300fb8c6db7f6

 0 files changed

commit 2aadaba580f0253d64a69a5cf4127e50346a34fb
Merge: 8920181 f7df18f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 17:31:34 2011 +0000

    Merge "Add templates for selected resource extensions."

commit cfe6fe374fa04b9c6150256c9a760b6b340ce697
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Dec 8 14:00:45 2011 -0500

    Add preparation for asynchronous instance faults
    
    Add InstanceFault model
    Migration for new instance_faults table
    Functions to add and get instance faults
    A single example of how faults should be added
    
    Change-Id: I439e2419240de24a728045046153451eb8a0d267

 nova/compute/manager.py                            |   29 +++++++-
 nova/db/api.py                                     |   13 ++++
 nova/db/sqlalchemy/api.py                          |   19 ++++++
 .../versions/063_add_instance_faults_table.py      |   62 +++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   14 +++-
 nova/tests/test_compute.py                         |   55 +++++++++++++++
 nova/tests/test_db_api.py                          |   72 ++++++++++++++++++++
 7 files changed, 262 insertions(+), 2 deletions(-)

commit f7df18f22715e958510805db42df818ac0f0d243
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Dec 9 10:45:27 2011 -0600

    Add templates for selected resource extensions.
    
    Related to bug 852141; adds XML serialization and deserialization for
    the following extensions:
    
    * SecurityGroups (security_groups)
    * SimpleTenantUsage (os-simple-tenant-usage)
    * VirtualInterfaces (virtual_interfaces)
    * Volumes (os-volumes)
    * VolumeTypes (os-volume-types)
    
    Change-Id: Ia3aef79c1912d3df14ab72bbdda3768ae131a19e

 nova/api/openstack/v2/contrib/security_groups.py   |  100 ++++++++++--
 .../openstack/v2/contrib/simple_tenant_usage.py    |   51 +++++-
 .../api/openstack/v2/contrib/virtual_interfaces.py |   31 ++--
 nova/api/openstack/v2/contrib/volumes.py           |  130 ++++++++++++---
 nova/api/openstack/v2/contrib/volumetypes.py       |   81 +++++++++-
 .../openstack/v2/contrib/test_security_groups.py   |  166 +++++++++++++++++++
 .../v2/contrib/test_simple_tenant_usage.py         |  168 ++++++++++++++++++++
 .../v2/contrib/test_virtual_interfaces.py          |   43 ++++-
 .../api/openstack/v2/contrib/test_volume_types.py  |   45 ++++++
 .../v2/contrib/test_volume_types_extra_specs.py    |   36 +++++
 .../tests/api/openstack/v2/contrib/test_volumes.py |  149 ++++++++++++++++-
 11 files changed, 946 insertions(+), 54 deletions(-)

commit 8920181a0d8cfb4f78af0fa0b868e864d8971744
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Dec 9 11:16:04 2011 -0500

    Use more informative message when violating quota
    
    Fixes bug 902218
    
    Change-Id: I185ee726358876c074725f5297da5cedc761ec55

 nova/api/openstack/v2/servers.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit fb479f31c8aa284e6cb739dfb50affed0e0ad564
Merge: 79def33 d8e8493
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 16:16:06 2011 +0000

    Merge "Adds network model and network info cache."

commit 79def336d980a808cdfba5721761cc1b36ce54f9
Merge: 44a34a2 2562e29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 15:51:25 2011 +0000

    Merge "Log it when we get a lock"

commit 44a34a288d0ee3c0593c9f2a830c8cc1cba4ae4a
Merge: aa7ca15 c64c769
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 15:36:32 2011 +0000

    Merge "removing TODO as we support Windows+XenServer and have no plans to support quiesce or VSS at the moment"

commit 2562e29d0116661bd5921460b971693ce0cbe863
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Dec 9 14:43:38 2011 +0100

    Log it when we get a lock
    
    Currently, we log it when we attempt to acquire a log, but we don't
    mention it when we succesfully do acquire it. This makes people think
    it's stuck.
    
    This patch logs the succesful acquiry of locks.
    
    Change-Id: I3b49ff331641ceafa46c93d8f5233c85fe45e5e2

 nova/utils.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit aa7ca15fc1a7ca28de93ee194870fe6d5e77631b
Merge: 435d6d8 bca56dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 06:15:48 2011 +0000

    Merge "Make QuantumManager no longer depend on the projects table"

commit c64c7691127702131959e57f830c1cd977954e24
Author: Paul Voccio <paul@openstack.org>
Date:   Thu Dec 8 17:51:22 2011 -0600

    removing TODO as we support Windows+XenServer and have no plans to support quiesce or VSS at the moment
    
    Change-Id: Idf65e73db1f33e4f5c7d60282f79f86a9b1ddd5e

 .mailmap                     |    1 +
 nova/virt/xenapi/vm_utils.py |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 435d6d8bb5d156eda65a502a610743e569f86173
Merge: 9550ca8 5235106
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 00:53:27 2011 +0000

    Merge "Rename .nova-venv to .venv."

commit 9550ca832c02a72d7877af5c9e60b0e1e8837cf1
Merge: 0c9a9be 6916c0a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 9 00:35:05 2011 +0000

    Merge "Make cfg work on python 2.6"

commit d8e84937c19169e3de73e7ad6b7382d954d753ac
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 1 16:54:40 2011 -0600

    Adds network model and network info cache.
    
    The next merge will prepopulate the cache, and use the model to keep the
    cache up to date.
    I realize "cache" is a bit of a stretch for what this is doing.
    
    blueprint network-info-model
    blueprint compute-network-info
    
    Change-Id: I0f0f4ba3de1310e1ff89239dab6ea8e24c85f2c8

 nova/db/api.py                                     |   42 +++
 nova/db/sqlalchemy/api.py                          |   71 +++++
 .../versions/062_add_instance_info_cache_table.py  |   62 ++++
 nova/db/sqlalchemy/models.py                       |   21 ++
 nova/exception.py                                  |    4 +
 nova/network/model.py                              |  255 +++++++++++++++
 nova/tests/fake_network_cache_model.py             |   72 +++++
 nova/tests/test_network_info.py                    |  328 ++++++++++++++++++++
 8 files changed, 855 insertions(+)

commit 5235106e95681a2942a083aff7c00d385bd10489
Author: James E. Blair <jeblair@hp.com>
Date:   Thu Dec 8 15:14:48 2011 -0800

    Rename .nova-venv to .venv.
    
    This simplifies a number of Jenkins jobs which currently, other
    than directory names, could be the same for all OpenStack
    projects. By renaming the virtualenv directory, the redundant
    Jenkins virtualenv build and copy jobs can be eliminated.
    
    Change-Id: Ieaf1dac3207ecb34b911c7edcd2086809abdf49e

 .gitignore                                    |    1 +
 .mailmap                                      |    2 ++
 Authors                                       |    2 +-
 doc/source/devref/development.environment.rst |    4 ++--
 run_tests.sh                                  |    2 +-
 tools/install_venv.py                         |    4 ++--
 tools/with_venv.sh                            |    2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

commit 0c9a9be3c0297f82990e572fc68c0f1734d79514
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 8 15:12:58 2011 -0800

    revert using git for novaclient
    
    Change-Id: I55184b0f3d6cdccfe1dc64d5e928b4b707ef5f84

 tools/pip-requires |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 10c829ff39500d68f1e3493f5fa1a4e2f5bc26d6
Merge: 20c8d89 c40ee5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 23:01:27 2011 +0000

    Merge "Add ability to see deleted and active records."

commit 51ff598cc8621855e1dbf106d1d68e40ffb865c7
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Nov 28 14:38:35 2011 +0000

    Port nova.flags to cfg
    
    This modifies nova.flags to emulate gflags using the new cfg module
    instead of optparse.
    
    One side effect of this is that nova now has a --config-file argument
    which allows a .ini style config file to be used instead of a gflags
    style file.
    
    Downstream packagers may choose to switch to using this new config
    file by default, or stick with the gflags style file for now. We may,
    in time, choose to deprecate --flagfile.
    
    Obviously, this change is just a stepping stone towards having Nova use
    the cfg API throughout the codebase. Next steps might include:
    
      - Adding a DEFINE_opt() function and starting to convert all the
        option definitions to the cfg.Opt schema types
    
      - Passing a ConfigOpts instance around rather than referring to the
        global flags.FLAGS variable
    
      - Adding a default .ini style config file with the default values
        commented out and an explanation of each option. This could
        potentially be autogenerated from the option schemas in the code.
    
      - Making use of option groups to organize options
    
      - In time, deprecating --flagfile
    
      - In time, also deprecating most of the options as CLI options and
        only allowing them to be set via config files
    
    There are two hacks in the current code where we directly access the
    OptionParser instance which is technically just a private implementation
    detail of the ConfigOpts class:
    
      - We need to use optparse's disable_interspersed_args(). I think it's
        needed for nova-manage
    
      - We still need the gross hack for handling unknown CLI args. We
        should either make sure they are registered at startup, or just wait
        until we make them unavailable via the CLI before removing the hack.
        This would also allow us to remove the gross hack to allow CLI opts
        to be registered after the CLI args have been parsed.
    
    One final note - the cfg module doesn't have support yet for multistr
    opts where values are spread across the command line and config files.
    This isn't a regression as it still works fine with the CLI and
    --flagfile, and it should be straightforward to support later.
    
    Change-Id: I173b99ffd645b8ac5babd68e5c2ed521b98ec2ca

 nova/flags.py              |  114 ++++++++++++++++----------------------------
 nova/tests/test_service.py |    4 ++
 2 files changed, 45 insertions(+), 73 deletions(-)

commit 6916c0aed933d200fa8bda02f04d26ef61db1410
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Dec 8 22:43:41 2011 +0000

    Make cfg work on python 2.6
    
    Issues spotted by eagle-eyed Kevin L. Mitchell.
    
    Change-Id: I5c2ae56dba645914e421411d4150165ce5bf5de6

 nova/common/cfg.py     |    2 +-
 nova/tests/test_cfg.py |   87 ++++++++++++++++++++++--------------------------
 2 files changed, 40 insertions(+), 49 deletions(-)

commit 20c8d89dbac24b1edadb25becb5065ec735b8643
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 8 13:56:09 2011 -0800

    Relax novaclient and remove redis dependency
    
    Change-Id: I80fad5d2ee09111cc82f5b8c81f0c5e26f07b6ff

 tools/pip-requires |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d06da5d652ececcefcd0ff1c1dd3fe4cb0cf712b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 8 11:14:39 2011 -0800

    Relax dependency on boto 1.9b and nova-adminclient
    
     * change boto=1.9b to boto
     * fix the tests
     * remove nova-adminclient dependency
     * remove the useless smoketests for nova-adminclient
    
    Change-Id: Ie191453941e64774496a912cb64d1417f3f1bea3

 nova/tests/test_api.py   |    2 +
 smoketests/test_admin.py |   91 ----------------------------------------------
 tools/pip-requires       |    3 +-
 3 files changed, 3 insertions(+), 93 deletions(-)

commit bca56ddb3dc931880fa32e23cff35debf7ab365c
Author: Brad Hall <brad@nicira.com>
Date:   Thu Dec 8 04:30:45 2011 +0000

    Make QuantumManager no longer depend on the projects table
    
    Vish said that creating projects in a test is a no-no and that the
    QuantumManager shouldn't be relying on the projects table anyways (since
    they're now in keystone)..
    
    Change-Id: I4d5c28746d0d2b4a9aaf7feb0a38792473d16847

 nova/network/quantum/manager.py          |   15 +--------------
 nova/network/quantum/melange_ipam_lib.py |    9 +++++++--
 nova/network/quantum/nova_ipam_lib.py    |   11 ++++++++---
 nova/tests/test_quantum.py               |   11 -----------
 4 files changed, 16 insertions(+), 30 deletions(-)

commit 5a84fd66db675d6ce99254f7c242d02a059a9024
Merge: 50a195b 771286e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Dec 8 17:09:08 2011 +0000

    Merge "Imported Translations from Launchpad"

commit 50a195bcca4ecf9313f28fbcd78ad5360d64c711
Merge: b855336 ac0ac44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 15:34:52 2011 +0000

    Merge "Updated the test runner module with a sys.path insert so that tests run in and outside a virtual environment."

commit b855336b1351dcffc1bc9690f86563de8c33e656
Merge: 4bdee9e fabebb3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 15:26:51 2011 +0000

    Merge "Add new cfg module"

commit 4bdee9eb9627093c3f4d42431ed997a30af6a56c
Merge: 35782f2 3c87de7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 14:51:29 2011 +0000

    Merge "A more secure root-wrapper alternative"

commit 771286efccd11809cf04c3592a1db675c31c6a37
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Dec 8 01:13:58 2011 +0000

    Imported Translations from Launchpad
    
    Change-Id: I9ef8ca3bbc93e436512de82ab6f5aeaf47bbb560

 po/ast.po   |    4 +-
 po/cs.po    |    4 +-
 po/da.po    |    4 +-
 po/de.po    |    4 +-
 po/en_AU.po | 1101 ++++++++++++-----------
 po/en_GB.po |    4 +-
 po/es.po    |   14 +-
 po/fr.po    |    4 +-
 po/it.po    |   34 +-
 po/ja.po    |    4 +-
 po/ko.po    | 2794 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/oc.po    | 2794 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pt_BR.po |   42 +-
 po/ru.po    |    4 +-
 po/tl.po    |    4 +-
 po/uk.po    |    4 +-
 po/zh_CN.po |   80 +-
 po/zh_TW.po |   31 +-
 18 files changed, 6299 insertions(+), 631 deletions(-)

commit 35782f24fa50b5b96072f9b81128f352098d50af
Author: Brad Hall <brad@nicira.com>
Date:   Wed Dec 7 23:31:50 2011 +0000

    Fix for bug 901459
    
    Fix cut and paste error: change project_id to p['id'] as project_id
    doesn't exist in this scope.
    
    Also added project creation to the unit test which would have caught
    this.
    
    Change-Id: I1bd53265e3d622a59969eb286c3fbde471374c73

 nova/network/quantum/manager.py |    2 +-
 nova/tests/test_quantum.py      |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

commit ac0ac446aaa0af517a2b726e48d3b37eeffd46e5
Author: Duncan McGreggor <duncan@dreamhost.com>
Date:   Wed Dec 7 15:20:55 2011 -0800

    Updated the test runner module with a sys.path insert so that tests run in and
    outside a virtual environment.
    
    This addresses bug 901387
    
    Change-Id: I12a2b1eeaf0ce46796af6e42fd6537bccd6a4d8f

 nova/testing/runner.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 9985d1f9517f47fb514e5a8997e06a85af631f62
Merge: fb27cc6 2706ec2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 22:20:27 2011 +0000

    Merge "Set instance['host'] to the original host value on revert resize."

commit c40ee5cfe75e8b1209dc53fc7eb2097812efa54e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 7 16:06:31 2011 -0600

    Add ability to see deleted and active records.
    
    Fixes bug #900564
    
    Changes `Context`.`read_deleted` from a bool to an enum string with values
    "yes" (can read deleted records), "no" (cannot read deleted records), and
    "only" (can only see deleted records, for backwards compatibility).
    
    Change-Id: Ic81db3664c33f23f751b73973782efb06fce90d9

 bin/nova-manage                        |    2 +-
 nova/context.py                        |   37 +-
 nova/db/sqlalchemy/api.py              | 1624 ++++++++++++++------------------
 nova/tests/api/ec2/test_cloud.py       |   10 +-
 nova/tests/scheduler/test_scheduler.py |    2 +-
 nova/tests/test_adminapi.py            |    2 +-
 nova/tests/test_compute.py             |    9 +-
 nova/tests/test_quota.py               |    2 +-
 nova/tests/test_vmwareapi.py           |    2 +-
 tools/xenserver/vm_vdi_cleaner.py      |    3 +-
 10 files changed, 720 insertions(+), 973 deletions(-)

commit 2706ec20f61a4edc560bd0b9100216301fde36dd
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Dec 7 16:36:30 2011 -0500

    Set instance['host'] to the original host value on revert resize.
    
    Fixes bug #901445
    
    Change-Id: I8c112d92d6a54715073ef1119372d782c3be37c9

 nova/compute/manager.py    |    1 +
 nova/tests/test_compute.py |    1 +
 2 files changed, 2 insertions(+)

commit fb27cc6979dcc8b4c0ac6595dae0c6e3e413e00f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Dec 7 18:20:03 2011 +0000

    Fix race condition in XenAPI when using <object>.get_all
    
    Fixes bug 887708
    
    There are a handful of places where <object>.get_all is followed by a
    <object>.get_record calls that are potentially racey. This patch fixes
    all of these cases to use common code that is tolerant of HANDLE_INVALID
    errors that would be indicative of a race between get_all and delete
    
    Change-Id: Ib94adb6d21b6b55e7b26fc1da52ed46d9dba8275

 nova/tests/test_xenapi.py        |    6 +-
 nova/virt/xenapi/__init__.py     |   25 ++++++
 nova/virt/xenapi/vm_utils.py     |  159 ++++++++++++++++++--------------------
 nova/virt/xenapi/volume_utils.py |    4 +-
 nova/virt/xenapi_conn.py         |    2 +-
 5 files changed, 108 insertions(+), 88 deletions(-)

commit c3b7cce8101548428b64abb23ab88482bc79c36e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Dec 7 11:59:14 2011 -0500

    Clean up snapshot metadata
    
    - Removed image_state from compute api snapshot (only needed by ec2/s3)
    - Only set backup_type when image_type is 'backup'
    - Add testing to verify snapshots/backups get the correct metadata
    
    Change-Id: Ib5461f9aa790d7ed5629c591bbe1510443dbc2aa

 nova/compute/api.py        |   14 +++++++++-----
 nova/tests/test_compute.py |   23 +++++++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

commit 88a0f06ac7f104220b2d92f66599089a9e1d4c92
Author: Andrew Bogott <abogott@wikimedia.org>
Date:   Fri Dec 2 13:29:13 2011 -0600

    Handle the 'instance' half of blueprint public-and-private-dns
    
    Added a minimalist flat-file DNS example driver, MiniDNS.
    
    Added tests for MiniDNS and a test that uses MiniDNS
    to validate instance DNS creation.
    
    Change-Id: I512018b7ed90ac2f388277443ee69b872ed60ef2

 Authors                             |    1 +
 nova/flags.py                       |    5 ++
 nova/network/instance_dns_driver.py |   41 +++++++++++
 nova/network/manager.py             |   11 +++
 nova/network/minidns.py             |  134 +++++++++++++++++++++++++++++++++++
 nova/tests/test_network.py          |   62 ++++++++++++++++
 6 files changed, 254 insertions(+)

commit 8a8dd22aea07dcbbfa80ea5519dcb7bfb92b0217
Merge: 42b5711 2b42968
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 18:29:57 2011 +0000

    Merge "Refactors periodic tasks to use a decorator."

commit 42b571181b5f2793e03a4958071ef4c8067578e5
Merge: 0b28e57 3d9f0ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 18:22:00 2011 +0000

    Merge "Update associate_floating_ip to use instance objs"

commit 0b28e574afa8563524e21d31d95972c8ba126de2
Merge: 0c78c2e f845891
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 18:13:48 2011 +0000

    Merge "First steps towards consolidating testing infrastructure"

commit 2b42968a53c70f2fd759a22e8e5aeadc18ae65f6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 7 07:25:18 2011 +0000

    Refactors periodic tasks to use a decorator.
    
    Additional work:
    
        1. Added support for tasks being scheduled at differing rates via the
           `ticks_between_runs` argument.
    
        2. Fixed `reclaim_queued_deletes` so that it doesn't run if
           `FLAGS.reclaim_instance_interval` is 0.
    
    Change-Id: I18c01baf07bd06301a6fe26a7b29dc2452a4fa96

 nova/compute/manager.py        |  118 +++++++++++++++-------------------------
 nova/manager.py                |   91 +++++++++++++++++++++++++++++--
 nova/network/manager.py        |    5 +-
 nova/scheduler/manager.py      |    3 +-
 nova/scheduler/zone_manager.py |    2 +-
 nova/service.py                |    5 +-
 nova/tests/test_compute.py     |    4 +-
 nova/virt/xenapi/vm_utils.py   |   12 ++++
 nova/virt/xenapi/vmops.py      |   32 +++++------
 nova/volume/manager.py         |   18 +-----
 10 files changed, 169 insertions(+), 121 deletions(-)

commit fabebb356eec47607aae05ea174b0aeef4fef5b1
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Nov 28 14:38:34 2011 +0000

    Add new cfg module
    
    As discussed on the mailing list and described here:
    
      http://wiki.openstack.org/CommonConfigModule
    
    The module implements an API for defining configuration options and
    reading values for those options that a user may have set in a config
    file or on the command line.
    
    The module will be part of openstack-common and glance will consume
    it from there once openstack-common makes a release with an API
    compatibility commitment.
    
    Change-Id: Ib604c3de75d9066cd913c2de3007024b1f5ec9f8

 nova/common/__init__.py |   15 +
 nova/common/cfg.py      | 1126 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_cfg.py  |  794 +++++++++++++++++++++++++++++++++
 3 files changed, 1935 insertions(+)

commit 0c78c2ed61c84ff967c2e6894f5dcff0987c2dec
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Nov 28 14:38:34 2011 +0000

    Remove extra_context support in Flags
    
    This doesn't seem to be used at all any more.
    
    Change-Id: I3a4a1eb271f547ad1723676dc47f1d8c8bad88ea

 nova/flags.py |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

commit 3c87de7c12c30d380e12b19dc0473d1e3bcfd233
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Nov 21 16:28:02 2011 +0100

    A more secure root-wrapper alternative
    
    Alternative to using a sudoers file to limit which commands can be run as
    root in Nova. This one makes use of command filters defined in Nova code
    itself, which can be customized to deeply inspect command arguments before
    allowing a command to be executed.
    
    This change puts the infrastructure in place, together with command filters
    that replicate the level of filtering provided by a sudoers file (no deep
    argument inspection yet). An example of an advanced filter (RegExpFilter) is
    also provided. This new root wrapper is not active by default (root_helper
    still defaults to "sudo"). Implements blueprint nova-rootwrap.
    
    Change-Id: I7ad723b55e9446758876f21b4fbb09374a910425

 bin/nova-rootwrap                |   72 +++++++++++++++++
 nova/rootwrap/__init__.py        |   16 ++++
 nova/rootwrap/compute.py         |  159 ++++++++++++++++++++++++++++++++++++++
 nova/rootwrap/filters.py         |   80 +++++++++++++++++++
 nova/rootwrap/network.py         |   83 ++++++++++++++++++++
 nova/rootwrap/volume.py          |   48 ++++++++++++
 nova/rootwrap/wrapper.py         |   59 ++++++++++++++
 nova/tests/test_nova_rootwrap.py |   65 ++++++++++++++++
 setup.py                         |    1 +
 9 files changed, 583 insertions(+)

commit 45e31ab90d22cbb84a33c051ee43f273b7a4c38b
Merge: 3e3e378 dca73f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 04:11:26 2011 +0000

    Merge "Change cloudServersFault to computeFault"

commit 3e3e378f8350ecd6f4cad7b6bfeee47a88e98e33
Merge: d39d06e 8eb5af2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 7 02:39:42 2011 +0000

    Merge "vm_state:=error on driver exceptions during resize"

commit d39d06e2761be3a82a3539e03f492b3ddcd2d60c
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Dec 6 15:48:08 2011 -0800

    Remove bzr related code in tests/test_misc
    
    Change-Id: If15b337d2150706162958e8fdf89e3bdae16a699

 nova/tests/test_misc.py |   21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

commit dca73f7c8c6f65e449a4b7500b679fb51418a138
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Dec 6 17:11:45 2011 -0500

    Change cloudServersFault to computeFault
    
    Fixes bug 862649.
    
    Change-Id: Ic7b24fcd706d18563d4addd0373a863697747d75

 nova/api/openstack/wsgi.py              |    2 +-
 nova/tests/api/openstack/v2/test_api.py |   41 ++++++++++++++-----------------
 2 files changed, 19 insertions(+), 24 deletions(-)

commit b71afdb54a49eb15d0317899e12cf5ef5ee16127
Merge: 154cd05 0bbb0e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 21:35:40 2011 +0000

    Merge "Remove some remnants of ChangeLog and vcsversion.py generation"

commit 154cd05c846f4e6eb03613c949e53ce1aaab1c6c
Merge: 2b4ece6 dbbd6cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 21:27:47 2011 +0000

    Merge "Use system M2Crypto package on Oneiric, bug 892271"

commit 2b4ece610e79f3f1c0e480004d2a52cbced6f45c
Merge: 882b1e4 3de787b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 20:47:08 2011 +0000

    Merge "Remove remnants of babel i18n infrastructure"

commit 3d9f0ed000ebe119cb7e15f957ee85b668086fea
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Dec 6 15:32:33 2011 -0500

    Update associate_floating_ip to use instance objs
    
    Related to blueprint internal-uuids.
    Also cleans up some unused variables
    
    Change-Id: I8adeceac8f4ab2894c48c1e1c7e1c7eab52e42d0

 nova/api/ec2/cloud.py                              |    3 +-
 nova/api/openstack/v2/contrib/floating_ips.py      |    3 +-
 nova/compute/api.py                                |   13 ++---
 .../api/openstack/v2/contrib/test_floating_ips.py  |    3 +-
 nova/tests/test_compute.py                         |   51 ++++++++++++++++++++
 5 files changed, 60 insertions(+), 13 deletions(-)

commit 8eb5af2d4086438a678abb22d720dbd3ebb9a02d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Dec 6 14:44:43 2011 -0500

    vm_state:=error on driver exceptions during resize
    
    Set vm_state to error if a driver raises an exception (of any type)
    during resize_instance and finish_resize.
    
    I want to highlight that there is a slight behavioral change here.
    Before, on a MigrationError the exception was not reraised in the
    resize_instance function. However, based on my understanding it is not
    a big deal to make this change. The worst case is log duplication in
    a fairly rare error state.
    
    Change-Id: Ifd1ea66cf3f2e59ee06714f666e357a99936b4e3

 nova/compute/manager.py    |   27 ++++++++++++++++++---------
 nova/tests/test_compute.py |   34 +++++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 14 deletions(-)

commit dbbd6cf1079ef46de3e9ec11db0eb824a3875099
Author: Adrian Smith <adrian_f_smith@dell.com>
Date:   Mon Nov 28 21:24:47 2011 +0000

    Use system M2Crypto package on Oneiric, bug 892271
    
    Ubuntu Oneiric has a problem with the pip installed version of m2crypto.
    This fix installs python-m2crypto via apt-get on Oneiric.
    
    Change-Id: I8290a74b614eb0d0b8d620dbad19d2cc6843de8b

 tools/install_venv.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 882b1e475de1ef71d7d3f0b50a58f91569905a75
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Dec 6 13:49:51 2011 -0500

    Update compute manager so that finish_revert_resize runs on the source
    compute host. Fixes bug #900849.
    
    Change-Id: I838604a5c623a3970ce36cdb3d12279812eb8401

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f845891184b17e2c31a2b02dbc9217978abd3242
Author: Duncan McGreggor <duncan@dreamhost.com>
Date:   Mon Nov 21 19:59:50 2011 -0800

    First steps towards consolidating testing infrastructure
    
    This commit begins to implement blueprint consolidate-testing-infrastructure by
    adding a 'testing' subpackage and moving some modules into it.
    
    Change-Id: I04bf860bc386bd2016e7dbc5a6f6ef7379a855bb

 HACKING                             |  165 ----------------
 HACKING.rst                         |  184 +++++++++++++++++
 doc/source/code.rst                 |    2 +-
 doc/source/devref/fakes.rst         |    4 +-
 nova/api/ec2/__init__.py            |    2 +-
 nova/auth/ldapdriver.py             |    2 +-
 nova/auth/manager.py                |    2 +-
 nova/fakememcache.py                |   59 ------
 nova/fakerabbit.py                  |  153 ---------------
 nova/rpc/impl_carrot.py             |    4 +-
 nova/test.py                        |    4 +-
 nova/testing/README.rst             |   44 +++++
 nova/testing/fake/__init__.py       |    2 +
 nova/testing/fake/memcache.py       |   59 ++++++
 nova/testing/fake/rabbit.py         |  153 +++++++++++++++
 nova/testing/runner.py              |  370 +++++++++++++++++++++++++++++++++++
 nova/tests/test_iptables_network.py |   10 +-
 run_tests.py                        |  365 ----------------------------------
 run_tests.sh                        |    2 +-
 19 files changed, 828 insertions(+), 758 deletions(-)

commit 82d80e529916788c6f9354146e8842d2adb9bd29
Merge: c63685f fb0f038
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 16:31:34 2011 +0000

    Merge "Pass '-r' option to 'collie cluster status'."

commit c63685fcf4165e41aa4c206c0dcce10a864d74c0
Merge: 31eac6d e6dc250
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 16:21:33 2011 +0000

    Merge "Remove autogenerated pot file"

commit 31eac6d9c02e84e3d97800cd4bbd07324b9fa482
Merge: 48755d7 6f99449
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 12:25:59 2011 +0000

    Merge "Add NAT/gateway support to QuantumManager"

commit 0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Dec 6 12:03:48 2011 +0000

    Remove some remnants of ChangeLog and vcsversion.py generation
    
    Since moving to bzr, we no longer generate ChangeLog and vcsversion.py
    and since commit deb31cb55 we no longer even have the bzr specific code
    for generating them. So, let's just remove any references to them.
    
    Change-Id: I4f96b9be48e289f9129ae8e3ad4cbc1b22db07d2

 MANIFEST.in     |    2 +-
 nova/version.py |   10 +---------
 run_tests.sh    |    2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

commit 48755d74c6c40e5027460d0fbf32f9c8e292e06f
Merge: 0b0d573 89e9231
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 12:07:34 2011 +0000

    Merge changes Ia6debb64,I31786a20
    
    * changes:
      Adding an install_requires to the setup call. Now you can pip install nova on a naked machine.
      Removing obsolete bzr-related clauses in setup.py

commit fb0f0388dee8c7cd612beaa065be8afd06fb2540
Author: François Charlier <francois.charlier@enovance.com>
Date:   Fri Dec 2 16:55:21 2011 +0100

    Pass '-r' option to 'collie cluster status'.
    
    The  'collie  cluster  status'  default output  is  more  verbose  since
    sheepdog 0.24.  The '-r' (raw)  option has  been added for  less verbose
    output but won't be used to ensure compatibility with pre-0.24 sheepdog.
    
    Change-Id: Ie31bdded928772250515e439016fc5c5beb00d83

 nova/volume/driver.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0b0d573fd31257fbbea5944da327989668cd7d3d
Merge: d92d083 d9f9f42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 11:57:48 2011 +0000

    Merge "remove duplicate netaddr in nova/utils"

commit d92d083253669e20a6409cd2e3ae5815cc99b4b9
Merge: 35df6a4 f0e6bea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 11:49:58 2011 +0000

    Merge "Make admin_password keyword in compute manager run_instance method match what we send in the compute API. Fixes bug #900591."

commit 3de787b58c512e176f7a2a7873326eeb42b306c1
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Dec 6 11:31:02 2011 +0000

    Remove remnants of babel i18n infrastructure
    
    We use distutils-extra now instead of babel.
    
    Change-Id: I10625cc4ef2ac8eefd46ee09e36f8cfaef85061f

 setup.cfg |   15 ---------------
 setup.py  |   10 ----------
 2 files changed, 25 deletions(-)

commit 35df6a4714996c0e40f0f32822d0568660bdf206
Author: François Charlier <francois.charlier@enovance.com>
Date:   Mon Dec 5 17:26:44 2011 +0100

    Fixes a typo preventing attaching RBD volumes.
    
    A typo in spelling 'rbd' as 'rdb' prevents attaching RBD volumes
    to instances.
    
    Fixes bug 900359.
    
    Change-Id: I872369a21b5935c37c4299f3f748d2d133a78bb3

 Authors                         |    1 +
 nova/virt/libvirt/connection.py |    2 +-
 nova/volume/manager.py          |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

commit e6dc250296dde4fc72b8c686f358ad7bc5f2a296
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Wed Nov 30 15:26:27 2011 +0100

    Remove autogenerated pot file
    
    Change-Id: I25c33e2a91458d2eaa41232eb54b2c1e4e273854
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 .gitignore  |    1 +
 po/nova.pot | 2788 -----------------------------------------------------------
 2 files changed, 1 insertion(+), 2788 deletions(-)

commit f0e6bea08acd313d7d9acb0401a14befe1a31e43
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Dec 5 22:46:47 2011 -0500

    Make admin_password keyword in compute manager run_instance method match
    what we send in the compute API. Fixes bug #900591.
    
    Change-Id: I857b7787189d454e8ed17a43654d6bf944da003e

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d9f9f42b849ec0e2bb6b2317467cbde9255331d7
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Dec 5 17:10:08 2011 -0800

    remove duplicate netaddr in nova/utils
    
    Change-Id: Ib9b7ddc619ce62010b5661579fe32cc55b68f7e6

 nova/utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 803f6f6af79c5424f46f3640f3bc8d4fcf6e78bd
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Mon Dec 5 15:40:41 2011 -0800

    cleanup: remove .bzrignore
    
    Change-Id: I87ba2a419322c4746c61be114997b5bc86a3bab2

 .bzrignore |   19 -------------------
 1 file changed, 19 deletions(-)

commit 2f0f27dfd6cc9e664fc2d1fc138aa4319a02db05
Merge: 63593ff 0655d2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 21:32:36 2011 +0000

    Merge "Document nova-tarball Jenkins job."

commit 63593ff80b182c1123ea2980f5ed14d2cbf70ca5
Merge: e3ecd38 85f9d92
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 21:24:44 2011 +0000

    Merge "Add availabity_zone to the refresh list"

commit e3ecd38debf3258660e703b065db0799cbbafcfb
Merge: b3c9a01 c25f7e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 21:16:40 2011 +0000

    Merge "Implement resize down for XenAPI"

commit b3c9a019dca8fc54116999939915298b30c3fbb9
Merge: d02c7d4 43214c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 19:42:22 2011 +0000

    Merge "Bug #896997: nova-vncproxy's flash socket policy port is not configurable"

commit d02c7d47172b1fcf926ab4608a0d81b624b0f4b7
Merge: 8e3ceba 91cfa62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 19:02:34 2011 +0000

    Merge "EC2 rescue/unrescue is broken, bug 899225"

commit 8e3ceba1bfddb8f49def3bd434ab34f12dd40794
Merge: 5f72723 2e000f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 18:49:56 2011 +0000

    Merge "add index to instance_uuid column in instances"

commit 2e000f35023dfe096e94e95b0673e209d93acef9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 2 17:53:34 2011 -0600

    add index to instance_uuid column in instances
    
    Change-Id: I4d5313cfbd97eba7bd755567a0bed9b65adb14dc

 .mailmap                                           |    3 +-
 .../versions/061_add_index_to_instance_uuid.py     |   29 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

commit 5f72723b4137ec59b4c6b376ddf6e7cb42df26b5
Author: Duncan McGreggor <duncan@dreamhost.com>
Date:   Fri Dec 2 09:48:15 2011 -0800

    Add missing documentation for shared folder issue with unit tests and Python
    lock file.
    
    Addresses documentation need raised in bug 897155
    
    Change-Id: Idc95c12f939948bbbefd84a79b3785e3c2fd752c

 Authors                          |    1 +
 doc/source/devref/unit_tests.rst |   16 ++++++++++++++++
 2 files changed, 17 insertions(+)

commit 3d46b46a3a57b07f8d260083f548664b7472c612
Merge: 2c438f5 032a077
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 16:36:26 2011 +0000

    Merge "Adds extension documentation for some but not all extensions"

commit 2c438f55beb717247495da2c2b5ff066537b1468
Author: Ghe Rivero <ghe@debian.org>
Date:   Fri Dec 2 19:02:58 2011 +0100

    Updated nova-manage to work with uuid images
    Fixes bug 899299
    
    Change-Id: Ib0be692503b8761a5600902a1e0d7a4dc371a680

 .mailmap        |    1 +
 Authors         |    1 +
 bin/nova-manage |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

commit ae697c4f36f324375b06ee3b6f915006f89a25ec
Merge: 022295e f6c74d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 5 14:37:30 2011 +0000

    Merge "Bug #898290: iSCSI volume backend treats FLAGS.host as a hostname"

commit 85f9d927f5becfca94e90941a3f01f96c6dbf439
Author: Joseph W. Breu <breu@breu.org>
Date:   Thu Dec 1 11:23:08 2011 -0600

    Add availabity_zone to the refresh list
    
    The availability_zone column for a service record is not updated if the
    availability_zone is changed after the record was created.  This patch
    adds availability_zone to the update list in report_state if the
    availability_zone stored in the database does not match the local flag
    
    Change-Id: I869384af113517adfba3a675f757e51687b3c15e

 nova/service.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 0655d2bb15eb95d78ab1a8f6b01c4fcb09fe4de9
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Dec 2 15:43:54 2011 -0500

    Document nova-tarball Jenkins job.
    
    Change-Id: I1034cceaa4fa3aa66e54fd082a078f802bc27baf

 doc/source/devref/jenkins.rst |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 022295ecc2a936eab98b8a1900690ac0cd87b134
Merge: 2903bf1 4f52cd9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 19:43:09 2011 +0000

    Merge "Better exception handling during run_instance"

commit 032a07785d4957daec152471c00468f73a331ecb
Author: annegentle <anne@openstack.org>
Date:   Fri Dec 2 13:02:06 2011 -0600

    Adds extension documentation for some but not all extensions
    
    Change-Id: I187483ccacd9c29c1c414fbf8481ead23f9c457a

 doc/source/api_ext/ext_config_drive.rst       |  207 +++++++++++++++++++++++++
 doc/source/api_ext/ext_floating_ips.rst       |  162 +++++++++++++++++++
 doc/source/api_ext/ext_keypairs.rst           |   94 +++++++++++
 doc/source/api_ext/ext_multinic.rst           |  109 +++++++++++++
 doc/source/api_ext/ext_quotas.rst             |   95 ++++++++++++
 doc/source/api_ext/ext_rescue.rst             |  109 +++++++++++++
 doc/source/api_ext/ext_security_group.rst     |  113 ++++++++++++++
 doc/source/api_ext/ext_virtual_interfaces.rst |  102 ++++++++++++
 doc/source/api_ext/ext_volumes.rst            |  100 ++++++++++++
 doc/source/api_ext/index.rst                  |   54 +++++++
 doc/source/api_ext/rst_extension_template.rst |   98 ++++++++++++
 doc/source/index.rst                          |    8 +
 12 files changed, 1251 insertions(+)

commit 2903bf1e4b0833a34e18711bf89c8da6240cc2b6
Merge: f1a22ee 1598696
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 18:32:44 2011 +0000

    Merge "Add templates for selected resource extensions."

commit f1a22ee83a75d966fd2112c3de79369321cea97f
Merge: 23f89c9 88acbe8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 18:24:37 2011 +0000

    Merge "Fix for EC2 API part of bug 897164"

commit 1598696554bd89ed1a51d7851bde48e03608a845
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Dec 2 11:27:29 2011 -0600

    Add templates for selected resource extensions.
    
    Related to bug 852141; adds XML serialization and deserialization for
    the following extensions:
    
    * FlavorExtraSpecs (os-flavor-extra-specs)
    * Floating_ips (os-floating-ips)
    * Hosts (os-hosts)
    * Keypairs (os-keypairs)
    * Quotas (os-quota-sets)
    
    Change-Id: I96ace8252f8f77612ab8c866e03eff8faee2c12b

 nova/api/openstack/v2/contrib/flavorextraspecs.py  |   20 ++++++
 nova/api/openstack/v2/contrib/floating_ips.py      |   51 ++++++++++---
 nova/api/openstack/v2/contrib/hosts.py             |   76 +++++++++++++++++++-
 nova/api/openstack/v2/contrib/keypairs.py          |   33 ++++++++-
 nova/api/openstack/v2/contrib/quotas.py            |   55 +++++++++-----
 nova/api/openstack/v2/extensions.py                |   20 +++++-
 nova/api/openstack/xmlutil.py                      |   58 +++++++++++++--
 nova/tests/api/openstack/test_xmlutil.py           |   30 ++++++++
 .../v2/contrib/test_flavors_extra_specs.py         |   19 +++++
 .../api/openstack/v2/contrib/test_floating_ips.py  |   49 +++++++++++++
 .../api/openstack/v2/contrib/test_keypairs.py      |   65 ++++++++++++++++-
 nova/tests/api/openstack/v2/contrib/test_quotas.py |   67 ++++++++++++++++-
 nova/tests/test_hosts.py                           |   50 +++++++++++++
 13 files changed, 554 insertions(+), 39 deletions(-)

commit 23f89c94ece474e130f53efbaaf8c1b9b3e9ef34
Merge: 7fc79c4 93cf1f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 17:08:22 2011 +0000

    Merge "Remove some unused imports from db"

commit 91cfa62b4a09cafa8af0772c68d36de9216dc440
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Dec 2 11:36:38 2011 -0500

    EC2 rescue/unrescue is broken, bug 899225
    
    Change-Id: I5a0b9c08a43e8c606d1c885cf7f47382fa4664a8

 nova/api/ec2/cloud.py            |   18 ++++++++----------
 nova/tests/api/ec2/test_cloud.py |   29 +++++++++++++++++++++++++++++
 nova/tests/test_virt_drivers.py  |    4 ++--
 nova/virt/driver.py              |    2 +-
 nova/virt/fake.py                |    2 +-
 nova/virt/libvirt/connection.py  |    2 +-
 6 files changed, 42 insertions(+), 15 deletions(-)

commit 4f52cd9e24b8816c3079814394479ecc7608e753
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Dec 2 11:22:05 2011 -0500

    Better exception handling during run_instance
    
    Change-Id: I46700315022ef83a7f5f8fca517b126b95c16060

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7fc79c41e9759310faf5a88f28981f0efb53d431
Merge: ab215c4 3b29258
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 16:21:49 2011 +0000

    Merge "Updates simple scheduler to allow strict availability_zone scheduling"

commit c25f7e7e832472ea2b5801d041cbf126333b1aaa
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Nov 17 16:17:50 2011 +0000

    Implement resize down for XenAPI
    
    This patch implements resizing an instance to a smaller disk. It implements
    this by copying the VDI and running e2resize, before transferring to the
    new host.
    
    Change-Id: Ic901a59cb6cdb79605c70528cf85064d8335ee2f

 nova/api/openstack/v2/servers.py                   |    3 -
 nova/compute/api.py                                |    2 -
 nova/compute/manager.py                            |    5 +-
 nova/exception.py                                  |    4 -
 nova/tests/test_compute.py                         |   17 --
 nova/tests/test_virt_drivers.py                    |    3 +-
 nova/tests/test_xenapi.py                          |   36 ++--
 nova/tests/utils.py                                |   15 ++
 nova/virt/driver.py                                |    3 +-
 nova/virt/fake.py                                  |    3 +-
 nova/virt/xenapi/fake.py                           |    3 +
 nova/virt/xenapi/vm_utils.py                       |  174 ++++++++++++------
 nova/virt/xenapi/vmops.py                          |  194 +++++++++++++-------
 nova/virt/xenapi_conn.py                           |    6 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   63 ++++---
 15 files changed, 334 insertions(+), 197 deletions(-)

commit ab215c42a2a31c8b4a6aa455911535183ab931af
Merge: 9c3502e 9dbcd8b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 15:15:49 2011 +0000

    Merge "Replacing instance id's in in xenapi.vmops and the xen plugin with instance uuids. The only references to instance id's left are calls to the wait_for_task() method. I will address that in another branch. blueprint: internal-uuids"

commit 88acbe869a22075306999b095ba87a4069a3beac
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Mon Nov 28 12:33:58 2011 +0100

    Fix for EC2 API part of bug 897164
    
    Change-Id: I96344eaccd2f42b70223b3c155a4793ab00d09d5

 nova/api/ec2/cloud.py                   |    2 +-
 nova/tests/api/ec2/test_cloud.py        |    7 +++++--
 smoketests/public_network_smoketests.py |    4 ++--
 smoketests/test_netadmin.py             |    4 ++--
 smoketests/test_sysadmin.py             |   18 +++++++++---------
 5 files changed, 19 insertions(+), 16 deletions(-)

commit 93cf1f24bfbc3c51cde477ccfe3e508c7953699e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Dec 2 09:26:46 2011 +0000

    Remove some unused imports from db
    
    ipv6 unused since commit 82804eb4 (Remove VIF<->Network FK dependancy)
    
    auth unused since commit 3b9af8a6 (pull out auth manager from db)
    
    Change-Id: I5aca9d9c6dbcf0263000341b9a2566430af1674e

 nova/db/sqlalchemy/models.py |    2 --
 1 file changed, 2 deletions(-)

commit 9c3502e13a007825dd87da3912ecf2e24c4033bb
Merge: 8c29803 eea1dea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 06:21:31 2011 +0000

    Merge "Fix to correctly report memory on Linux 3.X."

commit 9dbcd8bbc742ab14d40aef60c9cacb25e6909988
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Nov 30 12:29:37 2011 -0500

    Replacing instance id's in in xenapi.vmops and the xen plugin with
    instance uuids. The only references to instance id's left are calls to
    the wait_for_task() method. I will address that in another branch.
    blueprint: internal-uuids
    
    Change-Id: I268706f2429e47195a97054187ff7da8c55e3719

 nova/virt/xenapi/vmops.py                          |   55 +++++++++++---------
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   10 ++--
 2 files changed, 34 insertions(+), 31 deletions(-)

commit 8c29803bb9756ad1a9d2fc6a43ca078588a3c9aa
Merge: c77571e 6d40314
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 2 01:14:28 2011 +0000

    Merge "Convert get_lock in compute to use uuids"

commit 6d40314ea5f0bfdcc80a7cfe17353cbba07e0bab
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Dec 1 17:20:29 2011 -0500

    Convert get_lock in compute to use uuids
    
    Related to blueprint internal-uuids.
    
    Change-Id: I547e4c5c06d761c2d7c6c7635fd365834b3c5347

 nova/compute/api.py        |    4 +-
 nova/compute/manager.py    |  139 ++++++++++++++++++--------------------------
 nova/tests/test_compute.py |    9 ++-
 3 files changed, 66 insertions(+), 86 deletions(-)

commit eea1deae5dab23fba0be0039f491ff9fc2cd9ff2
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Mon Nov 21 23:54:36 2011 +0000

    Fix to correctly report memory on Linux 3.X.
    
    If sys is compiled on a Linux 3.X system, it returns LINUX3 instead of
    LINUX2 for sys.platform.upper().
    
    Change-Id: I78dae37d4facbaf6513c0eab651b1a06b93949b2

 nova/virt/libvirt/connection.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c77571e9199c756825d6805e5cb916973c010b64
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Dec 1 12:30:29 2011 -0500

    Replace more cases of instance ids with uuids
    
    Related to blueprint internal-uuids.
    
    Remove instance_id references in tests
    change tests in test_compute to use _create_fake_instance instead of
    _create_instance in order to save a db lookup and not depend on id
    Make tests in test_compute more readable
    
    Change-Id: Icbfa12c5e29468a06176a9958f80ba3ce414ac7b

 nova/compute/api.py        |   19 +-
 nova/tests/test_compute.py |  586 +++++++++++++++++++++-----------------------
 2 files changed, 288 insertions(+), 317 deletions(-)

commit b44dc5cb34806157ab1e3e3389ddc79594a90e75
Merge: 0d54770 82804eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 18:29:50 2011 +0000

    Merge "Remove VIF<->Network FK dependancy"

commit 0d54770ee109bc7d598539b9238affdd1880997b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Nov 29 16:24:05 2011 -0500

    Make run_instance only support instance uuids.
    
    Related to blueprint internal-uuids.
    
    This patchset also attempts a major overhaul of run_instance so that the
    code is cleaner and easier to understand (no more global-style
    variables!)
    
    Change-Id: I2289f3c253c6246ea51395b2dcfccee2256a2813

 nova/compute/manager.py                 |  311 +++++++++++++++----------------
 nova/rpc/impl_fake.py                   |    2 +-
 nova/scheduler/chance.py                |    2 +-
 nova/scheduler/distributed_scheduler.py |    2 +-
 nova/scheduler/driver.py                |    6 +-
 nova/scheduler/simple.py                |    2 +-
 nova/tests/scheduler/test_scheduler.py  |  130 ++++++-------
 nova/tests/test_compute.py              |  197 +++++++++++---------
 8 files changed, 332 insertions(+), 320 deletions(-)

commit 22df7020b1d7105586404cf7ec920e6d623cc325
Merge: fcef1e9 adf912b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 15:31:12 2011 +0000

    Merge "Fixing get_info method implementations in virt drivers to accept instance_name instead of instance_id. The abstract class virt.ComputeDriver defines get_info as:     def get_info(self, instance_name). blueprint: internal-uuids"

commit 3b29258ed305993789070f2d1cc987d76a432f6b
Author: Joseph W. Breu <breu@breu.org>
Date:   Wed Nov 30 13:54:21 2011 -0600

    Updates simple scheduler to allow strict availability_zone scheduling
    
    This update adds strict availability_zone scheduling of new instances when
    an availabity_zone option is not present in the creation call.  This patch
    does not change the expected default behavior.
    
    Previous behavior was to default the zone to None and only update the zone
    in the scheduler if an availability_zone was supplied.  This incorrectly
    allowed the scheduler to place new instances created without an
    availability_zone onto compute nodes where the availability_zone had been
    changed to something other than the default of 'nova'.
    
    Setting default_schedule_zone to 'nova' will prevent new instance scheduling
    into availability_zones other than the default 'nova' zone.  This change
    defaults the zone to None but allows the user to override this with the
    default_schedule_flag.
    
    In practice, if you have 2 availability_zones (nova, megazone) you can
    configure default_schedule_zone on the API node to 'nova' and any instances
    created will be created into the 'nova' availability_zone if one was not
    supplied.  Instances created with an availability_zone will be created as
    normal into the availability_zone supplied.
    
    Change-Id: Id23bac8448ea7ce6a1e1227d046c921328dbfe33

 Authors                  |    2 ++
 nova/scheduler/simple.py |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit fcef1e944d8253b48c473165ec237f95346dd8cf
Merge: b1b7eed 01afc61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 13:08:04 2011 +0000

    Merge "Remove unused ec2.action_args"

commit b1b7eede2226142615b32b437a4e153324daf83a
Merge: 63d323c d830174
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 06:17:21 2011 +0000

    Merge "Remove boot-from-volume unreachable code path (#894172)"

commit 63d323c271e815281167355e8cc4e7c9f0690068
Merge: 48882c6 7c11490
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 06:08:52 2011 +0000

    Merge "Fixes bug 767947"

commit 82804eb46542b2fdaef8b6db8696b50dbf5b7210
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Nov 14 13:14:58 2011 -0600

    Remove VIF<->Network FK dependancy
    
    Related to blueprint untie-nova-network-models.
    
    Depends-On: I665f402fe0ab1b301ab6761e80b11b101656065e
    Change-Id: I9bfb957effe0a2420c312add1cca5d7af509579d

 nova/db/sqlalchemy/api.py                          |    8 ---
 .../versions/060_remove_network_fk_from_vif.py     |   60 ++++++++++++++++++++
 .../migrate_repo/versions/060_sqlite_downgrade.sql |   46 +++++++++++++++
 .../migrate_repo/versions/060_sqlite_upgrade.sql   |   44 ++++++++++++++
 nova/db/sqlalchemy/models.py                       |   16 +-----
 nova/network/manager.py                            |   10 +++-
 nova/tests/fake_network.py                         |   21 ++++++-
 nova/tests/test_network.py                         |   55 ++++++++++--------
 8 files changed, 209 insertions(+), 51 deletions(-)

commit 48882c6aa30b768b86abc86c46648366483bc10a
Merge: 15350be 3b75915
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 1 00:20:07 2011 +0000

    Merge "Fix QuantumManager update_dhcp calls"

commit 15350bef95a1d34bf302c3516c9616d6dc314d56
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Nov 30 16:21:12 2011 -0600

    Adds missing image_meta to rescue's spawn() calls.
    
    Change-Id: Id769c217611011d77abafa529c306f780475aaf4

 nova/compute/manager.py    |    3 ++-
 nova/tests/test_compute.py |    2 +-
 nova/tests/test_xenapi.py  |    2 +-
 nova/tests/xenapi/stubs.py |    2 +-
 nova/virt/xenapi/vmops.py  |    8 ++++----
 nova/virt/xenapi_conn.py   |    4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

commit f6c74d6563e48df6a8a7ff09a27d812840f23d02
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Nov 30 10:34:42 2011 -0800

    Bug #898290: iSCSI volume backend treats FLAGS.host as a hostname
    
    Change ISCSIDriver to set volume.provider_location during create_export.
    This records the location of the LUN, so that nova-compute does not need
    to run the iSCSI discovery code itself.
    
    As part of this, include the IP address of the target (--iscsi_ip_address) in
    the provider_location.  This means that we don't use volume's host identifier
    (which could be an opaque ID) when trying to connect to the iSCSI target --
    we use the admin-specified IP address instead.
    
    The string-join to set provider_location is shared with ZadaraBEDriver,
    which was doing something similar.  I've brought that into a helper function.
    
    The docstring for the --host flag has been clarified.
    
    Change-Id: I8402da86345e786a46a4d222ad4d8a4449d2bd3f

 nova/flags.py         |    3 ++-
 nova/volume/driver.py |   17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

commit 851f082ce8841073155885ab5c8cca27563cce0e
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Nov 16 13:41:42 2011 -0600

    split rxtx_factor into network and instance_type
    
    This includes a migration and a change to the
    flavors extension.
    
    update1: removing tabs from the sql files & a
             quick refactoring
    update2: Fixing whitespace problem in the
             sqlite upgrayedd
    
    Change-Id: I665f402fe0ab1b301ab6761e80b11b101656065e

 nova/api/openstack/v2/flavors.py                   |    2 +-
 nova/api/openstack/v2/schemas/v1.1/flavor.rng      |    3 +-
 nova/api/openstack/v2/views/flavors.py             |    3 +-
 nova/compute/instance_types.py                     |    5 +-
 nova/db/sqlalchemy/api.py                          |    3 +-
 .../versions/059_split_rxtx_quota_into_network.py  |   67 ++++++++++
 .../migrate_repo/versions/059_sqlite_downgrade.sql |  134 ++++++++++++++++++++
 .../migrate_repo/versions/059_sqlite_upgrade.sql   |   87 +++++++++++++
 nova/db/sqlalchemy/models.py                       |    5 +-
 nova/network/manager.py                            |   11 +-
 nova/tests/api/openstack/v2/test_flavors.py        |   45 +++----
 nova/tests/fake_network.py                         |    6 +-
 nova/tests/test_instance_types.py                  |   11 +-
 nova/tests/test_network.py                         |    1 +
 14 files changed, 331 insertions(+), 52 deletions(-)

commit 486e6fb517a407d63bd1459518df92eb282fb733
Merge: b19b986 df67499
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 30 20:51:02 2011 +0000

    Merge "Fix typo: priviledges -> privileges."

commit adf912b98c527f5f92686543963c1665dee8c119
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Nov 29 15:43:04 2011 -0500

    Fixing get_info method implementations in virt drivers to accept
    instance_name instead of instance_id.
    The abstract class virt.ComputeDriver defines get_info as:
        def get_info(self, instance_name).
    blueprint: internal-uuids
    
    Change-Id: Ibe5e19f038e66f12711654eab48ba620aae4ace6

 nova/virt/hyperv.py         |   10 +++++-----
 nova/virt/vmwareapi_conn.py |    4 ++--
 nova/virt/xenapi_conn.py    |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

commit 7c11490677bc49086271ee377e6a8076eebe15f6
Author: Alvaro Lopez Garcia <aloga@ifca.unican.es>
Date:   Wed Nov 30 12:25:00 2011 +0100

    Fixes bug 767947
    
    If libvirt was restarted, a libvirt.libvirtError was raised with error
    domain libvirt.VIR_FROM_RPC when trying to use the existing connection.
    
    Change-Id: Ib3d4ff23aadf5a0c93dde0c37c5686bf404ce9de

 nova/tests/test_libvirt.py      |   25 +++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

commit 01afc61e6201ea22926f27e82280f0b3c6f2362f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Nov 30 08:27:33 2011 +0000

    Remove unused ec2.action_args
    
    These args are now just part of APIRequest since commit 2491c2484.
    
    Change-Id: I5983681d993735bd8891dc3a6a3a3530d41a6790

 nova/api/ec2/__init__.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit df674999324597a80963059dade4308a9b5d737f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Nov 29 20:00:41 2011 -0800

    Fix typo: priviledges -> privileges.
    
    Change-Id: I6953844bc05fb967ec8c8f792a68b97b649f1513

 doc/source/runnova/index.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 43214c6e99bb010b781e17b9c3acbe2c12f29672
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Nov 27 14:48:37 2011 -0800

    Bug #896997: nova-vncproxy's flash socket policy port is not configurable
    
    Add flags called vncproxy_flash_socket_policy_port and
    vncproxy_flash_socket_policy_host, to allow the admin to configure
    the Flash socket policy listener.
    
    Change-Id: If42839ccd86f1c8723221049d7c76b6f5ad0aa2d

 doc/source/runnova/index.rst      |    1 +
 doc/source/runnova/vncconsole.rst |   20 +++++++++++++-------
 nova/vnc/server.py                |    8 ++++++--
 3 files changed, 20 insertions(+), 9 deletions(-)

commit b19b986a980304aa4cf9d916d81e0a2fff5007b3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Nov 28 15:57:11 2011 -0500

    Convert compute manager delete methods to objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I781995b95fd3fb794ad5d775e1e5822a82db9fb1

 nova/compute/api.py                    |    6 +-
 nova/compute/manager.py                |   33 +++-----
 nova/tests/scheduler/test_scheduler.py |  111 ++++++++++++------------
 nova/tests/test_compute.py             |  146 ++++++++++++++++----------------
 nova/tests/test_compute_utils.py       |    2 +-
 5 files changed, 147 insertions(+), 151 deletions(-)

commit a83e83ac187141e106206232dc1f0f6fcb88947e
Merge: a668c6c 539d632
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 21:14:48 2011 +0000

    Merge "Removing line dos line endings in vmwareapi_conn.py"

commit a668c6c7fdd50758a109d7eddeb24bf17575b010
Merge: 80d832b a57bc7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 21:05:56 2011 +0000

    Merge "Use uuids for file injection."

commit 80d832b39b937e41685b6ae3f6c4e06238b80d6d
Merge: f1deb8d 41d674e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 20:57:13 2011 +0000

    Merge "reboot & rebuild to use uuids in compute manager"

commit f1deb8dbd48f936c2e1c2b1c0b5feb63e7da4be2
Merge: 24ec8bb 97dada8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 20:48:32 2011 +0000

    Merge "Use uuids for compute manager agent update."

commit 24ec8bb0245c1af40d86db7bb9b906a2ae044317
Merge: 01f55fd 9f643c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 20:27:04 2011 +0000

    Merge "Fix for bug 887712"

commit 01f55fdd674f453d16d6e20629ab35c3161d5809
Merge: 8efd022 84693b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 20:16:10 2011 +0000

    Merge "Fix RPC responses to allow None response correctly."

commit 8efd022956dfe1e925710d8ec7d011607257e116
Merge: da003c1 8230533
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 20:07:35 2011 +0000

    Merge "removed logic of throwing exception if no floating ip"

commit 539d632fdea1696dc74fd2fb05921466f804e19e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Nov 29 14:06:31 2011 -0500

    Removing line dos line endings in vmwareapi_conn.py
    
    Change-Id: Ib5e68ef07f83298a53083a4b7856244afcdbca4a

 nova/virt/vmwareapi_conn.py |  784 +++++++++++++++++++++----------------------
 1 file changed, 392 insertions(+), 392 deletions(-)

commit 41d674e9c562e82bf7e5f23ab09de43e2c565ef7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Nov 29 14:03:34 2011 -0500

    reboot & rebuild to use uuids in compute manager
    
    Related to blueprint internal-uuids.
    
    Change-Id: I24aedb283493fd9128f3aa67ecb47c3b52a35844

 nova/compute/api.py        |    8 +++--
 nova/compute/manager.py    |   77 ++++++++++++++++++++++----------------------
 nova/tests/test_compute.py |   39 ++++++++++++++++------
 3 files changed, 74 insertions(+), 50 deletions(-)

commit 9f643c80c6357805f591c822a2042367728c5780
Author: Adrian Smith <adrian_f_smith@dell.com>
Date:   Wed Nov 16 09:21:35 2011 +0000

    Fix for bug 887712
    
    Check weather the instance_id passed into instance_update() is a model id
    or a UUID.
    
    Change-Id: Ic361299cdbfa5c3786815753c47a8e4f3ba6d494

 Authors                   |    1 +
 nova/db/sqlalchemy/api.py |   17 ++++++++++-------
 nova/tests/test_db_api.py |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)

commit 6f99449b078a1e7befc3223e5244ae6ec0e4d8cb
Author: Brad Hall <brad@nicira.com>
Date:   Tue Nov 29 07:01:44 2011 +0000

    Add NAT/gateway support to QuantumManager
    
    blueprint quantum-nat-parity
    
    This also sets up the rest of the forwarding rules (metadata, etc)
    
    Change-Id: I73b8eb99803d7cb05147e71f3b09375a420ec926

 nova/network/linux_net.py                |   20 +++++++++++++++----
 nova/network/quantum/manager.py          |   32 +++++++++++++++++++++++-------
 nova/network/quantum/melange_ipam_lib.py |   28 +++++++++++++++++++-------
 nova/network/quantum/nova_ipam_lib.py    |   10 ++++++++--
 4 files changed, 70 insertions(+), 20 deletions(-)

commit 3b75915bb399547b73a54b8377ff8a3d4a1695d6
Author: Brad Hall <brad@nicira.com>
Date:   Tue Nov 29 06:33:19 2011 +0000

    Fix QuantumManager update_dhcp calls
    
    The syntax recently changed to add another parameter (context)
    
    Change-Id: I984294064f26bd49facd75ca4bf4634c9ff61bc8

 nova/network/quantum/manager.py |    4 ++--
 nova/tests/test_quantum.py      |   10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

commit 84693b4a16413830be61f465f602de9d13b45161
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Nov 29 09:01:16 2011 -0800

    Fix RPC responses to allow None response correctly.
    
    Fixes bug 897155
    
    Also adds a new fake rpc implementation that tests use by default.
    This speeds up the test run by ~10% on my system.  We can decide to
    ditch fake_rabbit at some point later..
    
    Change-Id: I8877fad3d41ae055c15b1adff99e535c34e9ce92

 nova/rpc/impl_carrot.py          |   86 ++++++++--------
 nova/rpc/impl_fake.py            |  146 +++++++++++++++++++++++++++
 nova/rpc/impl_kombu.py           |   23 +++--
 nova/test.py                     |    1 -
 nova/tests/api/ec2/test_cloud.py |    1 -
 nova/tests/fake_flags.py         |    1 +
 nova/tests/rpc/__init__.py       |   19 ++++
 nova/tests/rpc/common.py         |  207 ++++++++++++++++++++++++++++++++++++++
 nova/tests/rpc/test_carrot.py    |   45 +++++++++
 nova/tests/rpc/test_fake.py      |   36 +++++++
 nova/tests/rpc/test_kombu.py     |  110 ++++++++++++++++++++
 nova/tests/rpc/test_rpc.py       |   37 +++++++
 nova/tests/test_adminapi.py      |   11 +-
 nova/tests/test_rpc.py           |   37 -------
 nova/tests/test_rpc_carrot.py    |   45 ---------
 nova/tests/test_rpc_common.py    |  189 ----------------------------------
 nova/tests/test_rpc_kombu.py     |  110 --------------------
 nova/tests/xenapi/stubs.py       |   10 --
 run_tests.py                     |    2 +
 19 files changed, 668 insertions(+), 448 deletions(-)

commit 97dada8d604def2ac836465c6548a2c1260e87f5
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Nov 29 11:18:15 2011 -0500

    Use uuids for compute manager agent update.
    
    Related to blueprint internal-uuids.
    
    Change-Id: Ib4406f7fd4e5d91852d63785f596014cc3979fd2

 nova/compute/manager.py    |    9 ++++-----
 nova/tests/test_compute.py |   21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

commit da003c175a8211d6070fa9b171e67c4cf012e9cc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Nov 23 11:43:30 2011 -0500

    power_on/power_off in compute manager to use uuids
    
    Related to blueprint internal-uuids. Changes power_on and power_off of instances
    to use uuids. Also, fixes a test for get_actions to be more accurate. Later a
    migration will need to be written for instance_get_actions to use uuids instead
    of ids.
    
    Change-Id: Id0896f4bf3f0c64a77ac9c421bad702073f2fc50

 nova/compute/api.py        |    6 ++---
 nova/compute/manager.py    |   16 ++++++------
 nova/tests/test_compute.py |   58 +++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 65 insertions(+), 15 deletions(-)

commit e2a5955e7e979ccd039fb77df8b6e7814cdc1aa1
Merge: db903a6 fde2bc5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 15:32:28 2011 +0000

    Merge "Templatize extension handling."

commit a57bc7e99499f39e4eb31265983d75a9b09e1932
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Nov 28 16:26:36 2011 -0500

    Use uuids for file injection.
    
    Related to blueprint internal-uuids.
    
    Change-Id: I35f2a4c5cafde7ed8831a01cb7a2816ccbc39808

 nova/compute/api.py        |    3 +--
 nova/compute/manager.py    |    9 ++++-----
 nova/tests/test_compute.py |   19 +++++++++++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

commit 8230533824fd170498e51b43dd2f20e6af410c53
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Nov 28 17:00:47 2011 -0800

    removed logic of throwing exception if no floating ip
    
    fixes 897089
    
    Change-Id: Iaa03c7b75abf67c78b4605c29ef1770c96c6a199

 nova/api/openstack/v2/contrib/floating_ips.py |    7 ++-----
 nova/db/sqlalchemy/api.py                     |   15 ++++++---------
 nova/exception.py                             |    4 ----
 3 files changed, 8 insertions(+), 18 deletions(-)

commit db903a682012a9570ddbfe4ee453bbe582090b6e
Merge: cabdc3b d4a3962
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 29 00:42:08 2011 +0000

    Merge "Fix deprecation warnings"

commit 89e9231b98b3670ff3d1e3023cab6df5005eac46
Author: Ben McGraw <ben@pistoncloud.com>
Date:   Mon Nov 28 23:25:33 2011 +0000

    Adding an install_requires to the setup call. Now you can pip install nova on a naked machine.
    
    Change-Id: Ia6debb6422be2769efbc6628e760f23dbf5099dc

 setup.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit deb31cb55804299c5bb7d4a5160e3a1b0a703fd2
Author: Ben McGraw <ben@pistoncloud.com>
Date:   Mon Nov 28 23:30:20 2011 +0000

    Removing obsolete bzr-related clauses in setup.py
    
    Change-Id: I31786a20c85ad65f340627320f6f5bf3c4e08d79

 setup.py |   27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

commit cabdc3b1f64b7f022a1c62a4cebce54a2deba807
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 28 14:42:38 2011 -0800

    Makes rpc_allocate_fixed_ip return properly
    
     * Fixes bug 855030
     * Includes test
    
    Change-Id: If5b874fb0e4abd567445e67141d61942866cc5ec

 nova/network/manager.py    |    2 +-
 nova/tests/test_network.py |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 9c2e69b4966895fe04edb16158f0199956fda657
Merge: 53b84fb dd44abb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 22:56:59 2011 +0000

    Merge "Updating {add,remove}_fixed_ip_from_instance in compute.api and compute.manager to use instance uuid instead of instance id. blueprint internal-uuids"

commit 53b84fb28b1a7c9b3f6f24cbe0865495cfd1cb93
Merge: eb6d89c fc8d133
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 21:54:20 2011 +0000

    Merge "start/stop in compute manager to use uuids"

commit eb6d89c460e74b89140f748422b5cc515d942178
Merge: bc1f16b a2fe46e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 21:44:50 2011 +0000

    Merge "Updating {add,remove}_security_group in compute.api to use instance uuids instead of instance ids. blueprint internal-uuids"

commit fde2bc5fdf585fc44d142b48d4ff5fca317bbc84
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Nov 28 15:11:04 2011 -0600

    Templatize extension handling.
    
    Related to bug 852141: Converts extensions.py to using XML templates
    instead of the classic XML serializer.
    
    Change-Id: I41c9db8eb984f06222e7b42d5040afdf1e1101e8

 nova/api/openstack/v2/extensions.py |   74 +++++++++++++++++------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

commit fc8d1339eef1a51269a099cc69ba059976b1f85e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Nov 22 17:24:30 2011 -0500

    start/stop in compute manager to use uuids
    
    Related to blueprint internal-uuids. Changes stop_instance and start_instance in
    compute manager to expect uuids.
    
    Change-Id: Ic7bdd694a4ecfb64abf5cc40a290a2a2a42465f0

 nova/compute/api.py        |    6 ++---
 nova/compute/manager.py    |   60 +++++++++++++++++++++++++++-----------------
 nova/tests/test_compute.py |   14 +++++++----
 3 files changed, 48 insertions(+), 32 deletions(-)

commit bc1f16b4f3384ddae13098a466a2a1d921bd0b79
Merge: 48244d5 ee3a4df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 20:30:21 2011 +0000

    Merge "reset/inject network info in compute to use uuid"

commit 48244d5122d9d8415377c619bff09f81445fa306
Merge: bdb1ff7 6b1df26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 20:21:45 2011 +0000

    Merge "Fix Bug #891718"

commit bdb1ff73d2f24ba43102143c1ac670fdc0739528
Merge: 5b17af3 2f70137
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 19:28:45 2011 +0000

    Merge "Bug #897054: stack crashes with AttributeError on e.reason if the server returns an error"

commit 5b17af3a4d76064034d8d4a6e9c5cd06c3ceb1ad
Merge: c873d2a 4a76167
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 19:20:09 2011 +0000

    Merge "Bug #897091: "nova actions" fails with HTTP 400 / TypeError if a server action has been performed"

commit dd44abb728e592fbd020af7fa362886b1436b968
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Nov 22 16:50:29 2011 -0500

    Updating {add,remove}_fixed_ip_from_instance in compute.api and compute.manager
    to use instance uuid instead of instance id.
    blueprint internal-uuids
    
    Change-Id: I0db18fcbfce24d0cf1b8b9e7c8d10f657ceded0f

 nova/compute/api.py        |   12 ++++--------
 nova/compute/manager.py    |   14 ++++++++------
 nova/tests/test_compute.py |   16 +++++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

commit c873d2a27891ab9863e7fd64bbc8a6fe7e31bfdf
Merge: 3e8e1e7 40f3955
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 18:15:12 2011 +0000

    Merge "New docs: unit tests, Launchpad, Gerrit, Jenkins"

commit 3e8e1e7178cfb78f1ded3bebc988d649bd982caf
Merge: e0ef89f 88196c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 17:48:31 2011 +0000

    Merge "Use instance uuids for consoles and diagnostics."

commit 88196c3a4fa9cbf549594fe4d6128fcfab76ff66
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Nov 28 09:33:01 2011 -0500

    Use instance uuids for consoles and diagnostics.
    
    Related to blueprint internal-uuids.
    
    Change-Id: I84735c177592b669591d4409ce35138bf7a3c796

 nova/compute/api.py        |   21 +++++++--------------
 nova/compute/manager.py    |   24 ++++++++++++------------
 nova/tests/test_compute.py |   35 ++++++++++++++++++++++-------------
 nova/virt/fake.py          |    2 +-
 4 files changed, 42 insertions(+), 40 deletions(-)

commit e0ef89f091a77a25fa9bcfd466159e101cb42c56
Author: Ollie Leahy <oliver.leahy@hp.com>
Date:   Thu Nov 24 15:56:08 2011 +0000

    Fixes bug 888649
    
    Change exception.VolumeIsBusy to derive from NovaException instead of
    Error, so that an 'unexpected keyword' exception is not thrown when
    the exception is raised with keyword parameters.
    
    Add unit test to confirm that the 'unexpected keyword' exception is not
    thrown when the exception is raised by nova.volume.driver.VolumeDriver
    
    Responded to reviewer observations, fix pep8 errors in tset_volume.py,
    added email address to Authors file.
    
    Change-Id: I15464cb0cf72a2c71f430e4c8c5c2b27cd4e2ef9

 Authors                   |    1 +
 nova/exception.py         |    2 +-
 nova/tests/test_volume.py |   28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

commit 43bb342296936887a33deba4fb4666eadc747244
Merge: 356ec71 a0baa5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 13:28:58 2011 +0000

    Merge "Refactor a few things inside the xenapi unit tests."

commit 6b1df267d0a9b7d62e06e1c3d0b5483c6a64598e
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Mon Nov 21 10:31:25 2011 +0530

    Fix Bug #891718
    
    Change-Id: I0f458b4dd8996e1fe9fc22f48edd36493515980e

 Authors     |    1 +
 nova/log.py |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 4a76167e354eed4aa98232fbf6c845f86ce4cf22
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Nov 27 23:26:49 2011 -0800

    Bug #897091: "nova actions" fails with HTTP 400 / TypeError if a server action has been performed
    
    Fix code in Controller.action that was overwriting the definition of the
    actions method with a dictionary.  This meant that 'nova actions' would fail
    if 'nova reboot' had previously been called.
    
    Added two tests, one for the actions call in general, and one for this
    failure mode specifically.
    
    Change-Id: I695bb5c4dcfba96a5aba54125a8f3163e1a6a193

 nova/api/openstack/v2/servers.py            |    8 +++----
 nova/tests/api/openstack/v2/test_servers.py |   33 ++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

commit 2f70137a1b4951be56ebeb25a186e53551306faa
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Nov 27 20:12:42 2011 -0800

    Bug #897054: stack crashes with AttributeError on e.reason if the server returns an error
    
    Swap the URLError and HTTPError exception handlers.  HTTPError is a subclass
    of URLError, so the HTTPError handler wasn't being reached.
    
    Change-Id: Iec86d2b345dbd37858af888bbd54a74884025eda

 bin/stack |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 356ec713068b82af3cf449815ae76d82b4f86242
Merge: 411cdcb 25efaa8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 03:22:31 2011 +0000

    Merge "rescue/unrescue in compute manager to use uuids"

commit 411cdcb33c99d2bfebf6817fd5abc728c2f1061e
Merge: efc639f 94ed3e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 28 03:08:08 2011 +0000

    Merge "Fix for bug 894431"

commit a0baa5c125c0a7ef5bbc8684184ebf2c130bb466
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Nov 26 11:40:31 2011 -0800

    Refactor a few things inside the xenapi unit tests.
    
    There were a couple of places where basically the same code was being
    used to create a simulated VDI record -- these have been brought together
    into _make_fake_vdi.
    
    fake_fetch_image was stubbing out parse_xmlrpc_value, which looks like it
    was a workaround for the fact that the task result wasn't being populated
    properly.  I've fixed the latter, and removed the former.  This moved the
    JSON handling into xenapi.fake.
    
    There were a couple of implementations of host_call_plugin, which contained
    a lot of duplicated code.  In particular, they both made a simulated VDI
    record, even when the plugin function being called didn't require that.
    I have brought the two implementations together into fake.SessionBase, with
    overrides in the subclasses for those things that are specific to a given
    test.  I have also made the baseclass strict about flagging unsimulated
    plugin calls, and added explicit handling for agent.version, and a couple
    of methods from glance and migration.
    
    Change-Id: Idc3a872870ae15165747a04ecd1b48e889bd90fd

 nova/tests/xenapi/stubs.py |   57 ++++++++++++++++----------------------------
 nova/virt/xenapi/fake.py   |   38 ++++++++++++++++++++++++++---
 2 files changed, 55 insertions(+), 40 deletions(-)

commit 40f39557b3cedd21828b548e6f7cf57c8e6b8f76
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat Nov 26 08:43:16 2011 -0500

    New docs: unit tests, Launchpad, Gerrit, Jenkins
    
    Documented how to run unit tests
    
    Added docs about what's on Launchpad
    
    Added docs on Gerrit with pointers to wiki.
    
    Added docs on Jenkins: how to access, what it does
    
    Clarified that running unit tests doesn't mean you can fully run OpenStack.
    
    Change-Id: I33fa9d2f271631a1a9aceaa5d4fd465198bf51d4

 doc/source/community.rst                      |   17 +--
 doc/source/devref/development.environment.rst |   16 ++-
 doc/source/devref/gerrit.rst                  |   16 +++
 doc/source/devref/index.rst                   |   11 +-
 doc/source/devref/jenkins.rst                 |   36 +++++++
 doc/source/devref/launchpad.rst               |   54 ++++++++++
 doc/source/devref/unit_tests.rst              |  143 +++++++++++++++++++++++++
 7 files changed, 282 insertions(+), 11 deletions(-)

commit efc639ff4e0846535e1689a04537021d34c4c77d
Merge: 45c0062 643f9d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 25 20:37:50 2011 +0000

    Merge "Updating set_admin_password in compute.api and compute.manager to use instance uuids instead of instance ids. Blueprint internal-uuids"

commit 45c00626903f8247387c90cb2a035dd9f0b063b0
Merge: 96250d8 d0d7e0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 25 20:29:21 2011 +0000

    Merge "Updated development environment docs."

commit 96250d8aaef3d1404294a948f7dc2f09fa77e671
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Nov 24 14:07:27 2011 -0800

    Fix trivial fourth quote in docstring.
    
    Change-Id: Id0b3c69ab15aed094410730fbbe1f01df7db97aa

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4a3962a2d9310bcb035ccf72282187e66780bf1
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Nov 24 10:54:21 2011 -0500

    Fix deprecation warnings
    
    Fixed some warnings like this:
    
    DeprecationWarning: docutils.nodes.Element.set_class deprecated; append to
    Element['classes'] list attribute directly
      lists[i].set_class('todo_list')
    
    Change-Id: I94e564f561f95a66e6e98767ccfaa78769b5c0f1

 doc/ext/nova_todo.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 94ed3e71ac5ea79fc4746d5d1b0c758744316cc6
Author: Brad Hall <brad@nicira.com>
Date:   Thu Nov 24 07:44:02 2011 -0800

    Fix for bug 894431
    
    Make sure we set the correct interface id
    
    Change-Id: I427284182cc0a5a456b43b777faba0a74f3816e7

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8301748152e10ba64b4cebb79d4dad139988cea
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Nov 24 07:08:52 2011 +0000

    Remove boot-from-volume unreachable code path (#894172)
    
    In http://review.openstack.org/1834 it was discovered that a
    bool-from-volume code path in nova/compute/manager.py can never be
    reached.
    
    The code is basically:
    
      if ((bdm['snapshot_id'] is not None) and
          (bdm['volume_id'] is None)):
          vol = volume_api.create(context, ...)
          ...
          bdm['volume_id'] = vol['id']
    
      if ((bdm['snapshot_id'] is not None) and
          (bdm['volume_id'] is None)):
          ...
          raise exception.ApiError(...)
    
    (after applying De Morgan's laws to the expression in the second if
    statement, that is)
    
    It's obvious that the code path can only be reached if the volume
    API's create() method can return a volume with id=None, but it can't
    ever do this.
    
    From:
    
      https://code.launchpad.net/~yamahata/nova/boot-from-volume-0/+merge/62419
    
    it looks like the author originally had this check as an assertion,
    which makes more sense, but changed it to the current code following a
    review comment.
    
    Change-Id: I9f85028675f5dac8ab23bd150869eca421fc2fd0

 nova/compute/manager.py |   11 -----------
 1 file changed, 11 deletions(-)

commit ee3a4dfd50dc5a69e5d23387fd57dbddfb21173b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Nov 23 15:56:46 2011 -0500

    reset/inject network info in compute to use uuid
    
    Related to blueprint internal-uuids.
    
    Change-Id: I88a3eadf0fb07b0a827039db757d00498dd1cd9c

 nova/compute/api.py        |    7 +++----
 nova/compute/manager.py    |   28 +++++++++++++-------------
 nova/tests/test_compute.py |   48 ++++++++++++++++++++++++++++++++++++++------
 3 files changed, 59 insertions(+), 24 deletions(-)

commit 643f9d22b5b1b7c0ad9c2f45a78d40d5dafe7f34
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Nov 23 14:30:47 2011 -0500

    Updating set_admin_password in compute.api and compute.manager to use instance
    uuids instead of instance ids.
    Blueprint internal-uuids
    
    Change-Id: I4c06df9a7148f5223b2925272201c1bc67e4811d

 nova/compute/api.py        |    8 +++++---
 nova/compute/manager.py    |    6 +++---
 nova/tests/test_compute.py |    6 ++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

commit 25efaa8f8ae6954b10fb9317d09d3b65481b8053
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Nov 23 14:40:46 2011 -0500

    rescue/unrescue in compute manager to use uuids
    
    Related to blueprint internal-uuids.
    
    Change-Id: I9e2861a463cdf42c8abcc7a408699fdcfdc62ea2

 nova/compute/api.py        |   10 ++++----
 nova/compute/manager.py    |   20 ++++++++--------
 nova/tests/test_compute.py |   55 +++++++++++++++++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 28 deletions(-)

commit 1670bccfa42c48e964c691e94c76359d56a73e59
Merge: 272b276 bbbd489
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 23 17:15:16 2011 +0000

    Merge "Call df with -k instead of -B1"

commit 272b276b4bf5324d8b3f688b1425d60babf1fbc4
Merge: b300964 b66bbe0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 23 17:06:48 2011 +0000

    Merge "Clean up compute api"

commit d0d7e0bf4fe01b65e9ceb0a81224a4d993ab6e50
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat Nov 19 17:30:40 2011 -0500

    Updated development environment docs.
    
    General editing of the page on how to set up a development
    environment, including:
    
    - Documented which packages you need to install on Fedora-based
    systems in order to run a development environment.
    - Documented prereqs for setting up on Mac OS X
    - Reorganized some sections
    - Word wrapped text to 78 columns
    - Removed steps to install pep8/pylint, this is now done automatically.
    - MacOSX -> Mac OS X
    
    Also, some minor edits:
    
    Change-Id: I6f6181b3f3332fec93bc55897c7b9bdc50926908

 doc/source/devref/development.environment.rst |  132 ++++++++++++++++---------
 1 file changed, 86 insertions(+), 46 deletions(-)

commit bbbd489590e20d5a476fd3f68359f32d549752ca
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Nov 22 20:45:58 2011 -0500

    Call df with -k instead of -B1
    
    Fix bug 893840
    
    Change-Id: Ibdb5fe364f3ce086ee198d90f3593f3852fe2c97

 nova/tests/test_libvirt.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit b30096473c9927c22ca3d89b70aad17cd0def361
Merge: b6ae26b b74dee5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 22 23:12:03 2011 +0000

    Merge "Use XMLDictSerializer for resource extensions."

commit b6ae26ba279246d1b9e32b8665316a47847147ce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 22 22:53:22 2011 +0100

    Make fakelibvirt python2.6 compatible
    
    Fix bug #893757. In Python 2.6 xml.etree.ElementTree.fromstring
    raises xml.parsers.expat.ExpatError instead of
    xml.etree.ElementTree.ParseError when faced with invalid xml.
    Adjust accordingly.
    
    Change-Id: I1e4ae532e001618bded2b60e554915e5d6f7e038

 nova/tests/fakelibvirt.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit b66bbe0bf3f08130d5af287e557b4f57fc19d0d9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Nov 22 14:00:20 2011 -0500

    Clean up compute api
    
    Minor cleanup with unused variables and instance integer id's poisoning logging.
    Relates to blueprint internal-uuids
    
    Change-Id: Idd95997d0bb34ab2f5f21917bf7db2178b468079

 nova/compute/api.py |   47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

commit 6b0fff1e6d771309847d2fc0928a3c1635dc1be6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Nov 18 15:26:12 2011 -0500

    Updating attach/detach in compute.api and compute.manager to use
    instance uuid instead of instance id.
    blueprint internal-uuids
    
    Change-Id: I34c21f601c84dac5b76253395ed58fec0df73229

 nova/compute/api.py        |    4 +-
 nova/compute/manager.py    |   95 +++++++++++++++++++++++++++-----------------
 nova/tests/test_compute.py |    7 +++-
 3 files changed, 65 insertions(+), 41 deletions(-)

commit a35c17e8338d4cab4fc1fd1f2db38a4b05c9ebc5
Merge: bb622e6 f2777f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 22 20:52:00 2011 +0000

    Merge "Change compute API.update() to take object+params"

commit f2777f1670c3e549171bceac08b0a81d5776e739
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Nov 22 13:47:33 2011 -0500

    Change compute API.update() to take object+params
    
    Update the nova.compute:API.update() takes an object id. Now it
    takes an instance object to help increase flexibility in the future.
    
    blueprint internal-uuids
    
    Change-Id: Icc37720af1656d03ea5265544815c340f4e6aff9

 nova/api/ec2/cloud.py            |    4 ++--
 nova/api/openstack/v2/servers.py |    7 ++++--
 nova/compute/api.py              |   46 ++++++++++++++++++--------------------
 3 files changed, 29 insertions(+), 28 deletions(-)

commit b74dee50e72fa8e22b8731db6468513473db9253
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Nov 22 12:25:21 2011 -0600

    Use XMLDictSerializer for resource extensions.
    
    Patches around bug 852141 by using the XMLDictSerializer instead of
    the ExtensionsXMLSerializer for XML serialization of resource
    extensions.  This will allow XML to be emitted, but does not correct
    the underlying problem: many existing resource extensions do not
    have defined XML serializers.  (Additionally, existing serializers,
    including ExtensionsXMLSerializer, should be converted to
    templates.)
    
    Change-Id: If0fb0603920d04834368ed654f2a71d3e5300f7f

 nova/api/openstack/v2/extensions.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit a2fe46e2368c17c98844e33d0eb2f186834bde76
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Nov 18 18:18:38 2011 -0500

    Updating {add,remove}_security_group in compute.api to use instance
    uuids instead of instance ids.
    blueprint internal-uuids
    
    Change-Id: I7ba998c67a6b42961657876a8eaa797aa8c29896

 nova/compute/api.py                                |   30 +++++++++++---------
 nova/db/sqlalchemy/api.py                          |   12 ++++----
 .../openstack/v2/contrib/test_security_groups.py   |    6 ++--
 nova/tests/test_libvirt.py                         |   10 ++++---
 4 files changed, 33 insertions(+), 25 deletions(-)

commit bb622e6d7c921894fd0e7697a0003630989d4f35
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 26 16:15:18 2011 +0200

    Extend test_virt_driver to also test libvirt driver.
    
    To support this, I've added a fake libvirt implementation. It's supposed
    to expose an API and behaviour identical to that of libvirt itself
    except without actually running any VM's or setting up any firewall or
    anything, but still responding correctly when asked for a domain's XML,
    a list of defined domains, running domains, etc.
    
    I've also split out everything from libvirt.connection that is
    potentially destructive or otherwise undesirable to run during testing,
    and moved it to a new nova.virt.libvirt.utils. I added tests for those
    things separately as well as stub version of it for testing. I hope
    eventually to make it similar to fakelibvirt in style (e.g. keep track
    of files created and deleted and attempts to open a file that it doesn't
    know about, you'll get proper exceptions with proper errnos set and
    whatnot).
    
    Change-Id: Id90b260933e3443b4ffb3b29e4bc0cbc82c19ba6

 nova/tests/fake_libvirt_utils.py |  104 +++++
 nova/tests/fakelibvirt.py        |  779 ++++++++++++++++++++++++++++++++++++++
 nova/tests/test_fakelibvirt.py   |  403 ++++++++++++++++++++
 nova/tests/test_libvirt.py       |  283 ++++++++++----
 nova/tests/test_virt_drivers.py  |  199 ++++------
 nova/tests/utils.py              |   11 +-
 nova/virt/libvirt/connection.py  |  149 +++-----
 nova/virt/libvirt/utils.py       |  257 +++++++++++++
 nova/virt/libvirt/volume.py      |   14 +
 9 files changed, 1912 insertions(+), 287 deletions(-)

commit e35ed7ce06a7ac0280d6a36c881e75e307230f76
Merge: b07d3cd a3ea70c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 22 14:35:48 2011 +0000

    Merge "Revert "Fixes bug 757033""

commit b07d3cd8ef1eb805e550edfa9ad14fcbe004c131
Merge: 2a45e76 2622cff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 22 14:05:41 2011 +0000

    Merge "poll_rebooting_instances passes an instance now."

commit 2a45e769b0185a43daa933e9eddd4de30b07ec0a
Merge: d015221 10f93f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 22 07:00:16 2011 +0000

    Merge "Fixes bug 886263."

commit 2622cffb2f935a0626b8de75360ce5d15f01758c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Nov 22 00:05:37 2011 -0600

    poll_rebooting_instances passes an instance now.
    
    Fixes bug #893456
    
    Change-Id: Ifd54cfd42420e0717e57a36f85a55e92ef3abee8

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3ea70c0809f62a0a7b09199bd31fbed704ebf9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 21 16:39:02 2011 -0800

    Revert "Fixes bug 757033"
    
    This reverts commit 8a0370e4cf4b2004df63588c7a2daf5e676df43e.
    
    Change-Id: I8522eb0e84b7e811020dedc083f8e3c8478e0f8c

 nova/crypto.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit d0152210600e00a3ff87b83c1af666a2fb7a2abf
Merge: 9b4d3a2 21e0871
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 21 21:38:05 2011 +0000

    Merge "Put instances in ERROR state when scheduler fails."

commit 21e08712d9ac5577c27e7ea4c9271372bc0bd3ed
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Nov 21 14:39:22 2011 -0600

    Put instances in ERROR state when scheduler fails.
    
    When the scheduler's selected driver method raises an exception, such
    as NoValidHost, any affected instance must be placed into the ERROR
    state.  This is done by catching exceptions raised in _schedule() and,
    if 'instance_id' is present in kwargs, moving the identified instance
    to the ERROR state.  This fixes bug 886289.
    
    Change-Id: I5c73549e073493701b86658569823b9bc161291d

 nova/scheduler/manager.py              |   15 ++++++++++++++-
 nova/tests/scheduler/test_scheduler.py |   18 ++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

commit 9b4d3a2aac177ba47f3b0f0323b7b05ff5601d59
Merge: f53f2c8 265d77e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 21 18:33:52 2011 +0000

    Merge "snapshot/backup in compute manager to use uuids"

commit f53f2c8f2e4144d729349240b608f74deba0e18b
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sun Nov 20 18:54:08 2011 -0500

    Converted README to RST format.
    
    Converted the README to reStructuredText so that it will be automatically
    formatted when viewed on github.
    
    Removed reference to nova-pep8 Jenkins job since it doesn't seem to exist
    anymore.
    
    Change-Id: Id56ae53753e43852dcb9126bb989f9c0a8f223da

 README     |   24 ------------------------
 README.rst |   22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 24 deletions(-)

commit e3ebb8978a954718f052a0c4c1099d85a2e49a05
Merge: 32f969a a46e2a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 23:12:12 2011 +0000

    Merge "Workaround xenstore race conditions"

commit 32f969ad59c70f308c7d2c8cfc54a1b6ffd572b1
Merge: 55ebe48 8a0370e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 22:42:18 2011 +0000

    Merge "Fixes bug 757033"

commit a46e2a6e00ab96a70b6cc4c429200f304606cbed
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Nov 18 17:18:41 2011 -0500

    Workaround xenstore race conditions
    
    Change-Id: I17791a78c2008e1bdc41f4f658200808ee72629c

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

commit 55ebe48ab8026d3806c3f0521fb4643634c1162b
Merge: 4f9ae96 6749f31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 22:33:55 2011 +0000

    Merge "Converting tests to use v2"

commit 4f9ae968f7ad8b56aa3481fa4cb467364d824f30
Merge: 288d2e0 72fa94f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 21:54:24 2011 +0000

    Merge "Implement schedule_prep_resize()"

commit 288d2e07bfda50dc59ccf7851e993f0d23deca67
Merge: e27a079 a594f4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 21:23:17 2011 +0000

    Merge "Fix a minor memory leak"

commit a594f4d34418c27197fe7f82eab150bc7cb70478
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Nov 18 14:49:41 2011 -0600

    Fix a minor memory leak
    
    Fixes a minor memory leak caused by a self-referential data structure
    with a __del__() method by explicitly breaking the cycle.
    
    Change-Id: Ic2c896d3067f8a2205abc8a43ec290fdbd92ef09

 nova/rpc/impl_kombu.py |    2 ++
 1 file changed, 2 insertions(+)

commit e27a0798a82b2a40cf95cdbab46ae491aafbec69
Merge: 8449c6f 658d0bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 19:53:44 2011 +0000

    Merge "Add a "libvirt_disk_prefix" flag to libvirt driver"

commit 8449c6f9b1e2ea2ac713ae67dcb205654bf8523c
Merge: e63df26 aab3e3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 19:39:40 2011 +0000

    Merge "lock/unlock in compute manager to use uuids"

commit e63df26a884092373fa0814ed275256ee912e9cd
Merge: 15937a4 a312956
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 19:31:41 2011 +0000

    Merge "suspend/resume in compute manager to use uuids"

commit 72fa94f72b361a6c097eaf071fe7f26b2ba4e924
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Nov 17 13:47:56 2011 -0600

    Implement schedule_prep_resize()
    
    Implement schedule_prep_resize() in the distributed scheduler.  Adds
    a request_spec argument to enable the current host of an instance
    to be excluded for resizes.  Corrects bug 888236.
    
    Change-Id: Ia52415e79639275a06bef59f1e13ca64bf7243ee

 nova/compute/api.py                                |   12 ++-
 nova/scheduler/chance.py                           |   28 ++++++-
 nova/scheduler/distributed_scheduler.py            |   47 +++++++++--
 nova/scheduler/multi.py                            |    1 +
 nova/tests/scheduler/test_chance_scheduler.py      |   50 ++++++++++++
 nova/tests/scheduler/test_distributed_scheduler.py |   85 ++++++++++++++++++--
 nova/tests/test_compute.py                         |   37 +++++++++
 7 files changed, 242 insertions(+), 18 deletions(-)

commit 10f93f567f4a164091d811765d1fdc39cdb36478
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Nov 10 10:35:57 2011 +0900

    Fixes bug 886263.
    
    IndexError: pop index out of range on replace_uuid_with_id
    
    Change-Id: I2f89bcc1675315c800e0d34bc09a268293a23caf

 nova/scheduler/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 265d77e16774f37775c6befbf34837d165ca844e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 17 16:08:10 2011 -0500

    snapshot/backup in compute manager to use uuids
    
    Related to blueprint internal-uuids. Changes shapshot in the computer manager to
    expect uuids instead of ids. Also updates some compute api fakes.
    
    Change-Id: I525754ea065c7df9dfe1d093e4c94c02bebf4c02

 nova/compute/api.py               |   20 +++++++++++++-------
 nova/compute/manager.py           |   15 +++++++--------
 nova/exception.py                 |    4 ++--
 nova/tests/api/openstack/fakes.py |   13 ++++++-------
 nova/tests/test_compute.py        |   22 ++++++++++++----------
 5 files changed, 40 insertions(+), 34 deletions(-)

commit 8a0370e4cf4b2004df63588c7a2daf5e676df43e
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Nov 17 23:28:00 2011 -0800

    Fixes bug 757033
    
    different CA path definitions
    
    Change-Id: I55bb9df1b4b4a0095c4d62215847b730976028ee

 nova/crypto.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 15937a41609a0216020aa23a8debbd10c1f74de6
Merge: 82f0986 78de001
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 01:20:13 2011 +0000

    Merge "Reference Ron Pedde's cleanup script for DevStack."

commit 82f0986011e82a36eb4dd3b358ee7cbf576d387a
Merge: 15f32f2 e3dca3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 01:02:34 2011 +0000

    Merge "Defining volumes table to allow FK constraint."

commit 6749f31604d9787d48b2bc1a02b5b5e5f23eefa8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 17 15:59:24 2011 -0800

    Converting tests to use v2
    
    - Convert all OpenStack API tests to use v1.1 instead of v2
    - Keeps v1.1 as an alternate endpoint, but it is functionally equivalent to v2
    
    Change-Id: I9b6796dc4507c3d5c1432266daa5b5f1dcf540c3

 nova/api/openstack/common.py                       |   24 +-
 nova/api/openstack/v2/auth.py                      |    8 +-
 nova/api/openstack/v2/versions.py                  |   18 +-
 nova/api/openstack/v2/views/versions.py            |    8 +-
 nova/tests/api/openstack/fakes.py                  |    6 +-
 nova/tests/api/openstack/test_common.py            |    8 +-
 .../api/openstack/v2/contrib/test_admin_actions.py |    5 +-
 .../openstack/v2/contrib/test_createserverext.py   |    9 +-
 .../openstack/v2/contrib/test_extendedstatus.py    |    2 +-
 .../v2/contrib/test_flavors_extra_specs.py         |   27 +-
 .../api/openstack/v2/contrib/test_floating_ips.py  |   28 +-
 .../api/openstack/v2/contrib/test_keypairs.py      |    8 +-
 .../api/openstack/v2/contrib/test_multinic_xs.py   |    9 +-
 nova/tests/api/openstack/v2/contrib/test_quotas.py |   11 +-
 nova/tests/api/openstack/v2/contrib/test_rescue.py |    6 +-
 .../openstack/v2/contrib/test_security_groups.py   |  138 +++++-----
 .../v2/contrib/test_simple_tenant_usage.py         |   10 +-
 .../v2/contrib/test_virtual_interfaces.py          |    2 +-
 .../api/openstack/v2/contrib/test_volume_types.py  |   21 +-
 .../v2/contrib/test_volume_types_extra_specs.py    |    7 +-
 .../tests/api/openstack/v2/contrib/test_volumes.py |    2 +-
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |   40 ++-
 .../api/openstack/v2/extensions/foxinsocks.py      |    5 +-
 nova/tests/api/openstack/v2/test_accounts.py       |   14 +-
 nova/tests/api/openstack/v2/test_auth.py           |   47 ++--
 nova/tests/api/openstack/v2/test_consoles.py       |    4 +-
 nova/tests/api/openstack/v2/test_extensions.py     |   14 +-
 nova/tests/api/openstack/v2/test_flavors.py        |   61 ++--
 nova/tests/api/openstack/v2/test_image_metadata.py |   36 +--
 nova/tests/api/openstack/v2/test_images.py         |  120 ++++----
 nova/tests/api/openstack/v2/test_limits.py         |    1 -
 nova/tests/api/openstack/v2/test_server_actions.py |   12 +-
 nova/tests/api/openstack/v2/test_servers.py        |  291 +++++++++-----------
 nova/tests/api/openstack/v2/test_urlmap.py         |   47 +++-
 nova/tests/api/openstack/v2/test_users.py          |   15 +-
 nova/tests/api/openstack/v2/test_versions.py       |  137 +++++----
 nova/tests/api/openstack/v2/test_zones.py          |   19 +-
 nova/tests/integrated/integrated_helpers.py        |    2 +-
 38 files changed, 594 insertions(+), 628 deletions(-)

commit aab3e3c7709024e8904ef0ed3f69e3b03842b952
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 17 16:49:26 2011 -0500

    lock/unlock in compute manager to use uuids
    
    Related to blueprint internal-uuids. lock and unlock already solely use uuids so
    I updated the variable names and tests to illustrate this.
    
    Change-Id: I2bfe37ee23f9b0c488aaf735eb4eb56db31f2e5b

 nova/compute/manager.py    |   12 ++++++------
 nova/tests/test_compute.py |   19 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

commit a312956a3c7a2877305b8ce5d80f0828ff7be785
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 17 13:50:19 2011 -0500

    suspend/resume in compute manager to use uuids
    
    Related to blueprint internal-uuids. Changes suspend_instance and resume_instance
    to expect and handle instance uuids instead of instance ids.
    
    Change-Id: Ib61806bef3a95275109c68aefe775f332e13d35a

 nova/compute/api.py        |    6 ++++--
 nova/compute/manager.py    |   16 ++++++++--------
 nova/tests/test_compute.py |   35 +++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 26 deletions(-)

commit 15f32f22215ffe0c8939dc05aaeb2eb9d3f52e74
Merge: 1a209e6 0d466ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 17 20:55:31 2011 +0000

    Merge "pause/unpause in compute manager to use uuids"

commit 1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Nov 5 15:51:43 2011 -0700

    Refactor metadata code out of ec2/cloud.py
    
    part 2 of blueprint separate-nova-metadata
    
    Change-Id: Id41e48434ff3a38e524a1c64757a21bd461c06b8

 nova/api/ec2/cloud.py            |  244 +++-----------------------------------
 nova/api/ec2/ec2utils.py         |   71 +++++++++++
 nova/api/metadata/handler.py     |  158 +++++++++++++++++++++++-
 nova/block_device.py             |    3 +
 nova/cloudpipe/pipelib.py        |    3 +-
 nova/tests/api/ec2/test_cloud.py |   29 -----
 nova/tests/test_metadata.py      |   47 +++++++-
 7 files changed, 295 insertions(+), 260 deletions(-)

commit 0d466ff8829171c563e6a99c604c30f051ffce26
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 17 12:53:42 2011 -0500

    pause/unpause in compute manager to use uuids
    
    Related to blueprint internal-uuids. Changes pause_instance and unpause_instance
    to expect and handle instance uuids instead of instance ids.
    
    Change-Id: I4f601f686dcaa6d6268d1dd01557a0362a0a89fa

 nova/compute/api.py        |    6 ++++--
 nova/compute/manager.py    |   16 +++++++--------
 nova/tests/test_compute.py |   47 +++++++++++++++++++++++++-------------------
 3 files changed, 39 insertions(+), 30 deletions(-)

commit de635fc882caebd5d5c9701e755a7174e37a05c5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Nov 11 13:26:13 2011 -0500

    Creating new v2 namespace in nova.api.openstack
    
    Related to blueprint separate-nova-adminapi
    
    Change-Id: Ida35372b7263c4a4efdafd35faa1325c4436459b

 etc/nova/api-paste.ini                             |   27 +-
 nova/api/openstack/__init__.py                     |  187 -
 nova/api/openstack/accounts.py                     |  105 -
 nova/api/openstack/auth.py                         |  257 --
 nova/api/openstack/consoles.py                     |  140 -
 nova/api/openstack/contrib/__init__.py             |   90 -
 nova/api/openstack/contrib/admin_actions.py        |  206 --
 nova/api/openstack/contrib/createserverext.py      |   74 -
 nova/api/openstack/contrib/deferred_delete.py      |   66 -
 nova/api/openstack/contrib/disk_config.py          |  189 -
 nova/api/openstack/contrib/extended_status.py      |  110 -
 nova/api/openstack/contrib/flavorextradata.py      |   36 -
 nova/api/openstack/contrib/flavorextraspecs.py     |  115 -
 nova/api/openstack/contrib/floating_ips.py         |  200 --
 nova/api/openstack/contrib/hosts.py                |  133 -
 nova/api/openstack/contrib/keypairs.py             |  136 -
 nova/api/openstack/contrib/multinic.py             |  106 -
 nova/api/openstack/contrib/quotas.py               |   91 -
 nova/api/openstack/contrib/rescue.py               |   81 -
 nova/api/openstack/contrib/security_groups.py      |  553 ---
 nova/api/openstack/contrib/simple_tenant_usage.py  |  228 --
 nova/api/openstack/contrib/virtual_interfaces.py   |   89 -
 .../openstack/contrib/virtual_storage_arrays.py    |  597 ----
 nova/api/openstack/contrib/volumes.py              |  370 --
 nova/api/openstack/contrib/volumetypes.py          |  185 -
 nova/api/openstack/contrib/zones.py                |   43 -
 nova/api/openstack/extensions.py                   |  551 ---
 nova/api/openstack/faults.py                       |  116 -
 nova/api/openstack/flavors.py                      |  124 -
 nova/api/openstack/image_metadata.py               |  122 -
 nova/api/openstack/images.py                       |  210 --
 nova/api/openstack/ips.py                          |  115 -
 nova/api/openstack/limits.py                       |  488 ---
 nova/api/openstack/ratelimiting/__init__.py        |  221 --
 nova/api/openstack/schemas/atom-link.rng           |  141 -
 nova/api/openstack/schemas/atom.rng                |  597 ----
 nova/api/openstack/schemas/v1.1/addresses.rng      |   14 -
 nova/api/openstack/schemas/v1.1/extension.rng      |   11 -
 nova/api/openstack/schemas/v1.1/extensions.rng     |    6 -
 nova/api/openstack/schemas/v1.1/flavor.rng         |   14 -
 nova/api/openstack/schemas/v1.1/flavors.rng        |    6 -
 nova/api/openstack/schemas/v1.1/flavors_index.rng  |   12 -
 nova/api/openstack/schemas/v1.1/image.rng          |   36 -
 nova/api/openstack/schemas/v1.1/images.rng         |    6 -
 nova/api/openstack/schemas/v1.1/images_index.rng   |   15 -
 nova/api/openstack/schemas/v1.1/limits.rng         |   28 -
 nova/api/openstack/schemas/v1.1/metadata.rng       |    9 -
 nova/api/openstack/schemas/v1.1/server.rng         |   51 -
 nova/api/openstack/schemas/v1.1/servers.rng        |    6 -
 nova/api/openstack/schemas/v1.1/servers_index.rng  |   15 -
 nova/api/openstack/schemas/v1.1/version.rng        |   17 -
 nova/api/openstack/schemas/v1.1/versions.rng       |   11 -
 nova/api/openstack/server_metadata.py              |  178 -
 nova/api/openstack/servers.py                      | 1178 -------
 nova/api/openstack/urlmap.py                       |  297 --
 nova/api/openstack/users.py                        |  139 -
 nova/api/openstack/v2/__init__.py                  |  186 +
 nova/api/openstack/v2/accounts.py                  |  103 +
 nova/api/openstack/v2/auth.py                      |  257 ++
 nova/api/openstack/v2/consoles.py                  |  140 +
 nova/api/openstack/v2/contrib/__init__.py          |   90 +
 nova/api/openstack/v2/contrib/admin_actions.py     |  206 ++
 nova/api/openstack/v2/contrib/createserverext.py   |   74 +
 nova/api/openstack/v2/contrib/deferred_delete.py   |   66 +
 nova/api/openstack/v2/contrib/disk_config.py       |  189 +
 nova/api/openstack/v2/contrib/extended_status.py   |  109 +
 nova/api/openstack/v2/contrib/flavorextradata.py   |   36 +
 nova/api/openstack/v2/contrib/flavorextraspecs.py  |  114 +
 nova/api/openstack/v2/contrib/floating_ips.py      |  201 ++
 nova/api/openstack/v2/contrib/hosts.py             |  132 +
 nova/api/openstack/v2/contrib/keypairs.py          |  136 +
 nova/api/openstack/v2/contrib/multinic.py          |  106 +
 nova/api/openstack/v2/contrib/quotas.py            |   91 +
 nova/api/openstack/v2/contrib/rescue.py            |   80 +
 nova/api/openstack/v2/contrib/security_groups.py   |  551 +++
 .../openstack/v2/contrib/simple_tenant_usage.py    |  229 ++
 .../api/openstack/v2/contrib/virtual_interfaces.py |   89 +
 .../openstack/v2/contrib/virtual_storage_arrays.py |  597 ++++
 nova/api/openstack/v2/contrib/volumes.py           |  370 ++
 nova/api/openstack/v2/contrib/volumetypes.py       |  185 +
 nova/api/openstack/v2/contrib/zones.py             |   43 +
 nova/api/openstack/v2/extensions.py                |  551 +++
 nova/api/openstack/v2/flavors.py                   |  124 +
 nova/api/openstack/v2/image_metadata.py            |  122 +
 nova/api/openstack/v2/images.py                    |  208 ++
 nova/api/openstack/v2/ips.py                       |  114 +
 nova/api/openstack/v2/limits.py                    |  486 +++
 nova/api/openstack/v2/ratelimiting/__init__.py     |  222 ++
 nova/api/openstack/v2/schemas/atom-link.rng        |  141 +
 nova/api/openstack/v2/schemas/atom.rng             |  597 ++++
 nova/api/openstack/v2/schemas/v1.1/addresses.rng   |   14 +
 nova/api/openstack/v2/schemas/v1.1/extension.rng   |   11 +
 nova/api/openstack/v2/schemas/v1.1/extensions.rng  |    6 +
 nova/api/openstack/v2/schemas/v1.1/flavor.rng      |   14 +
 nova/api/openstack/v2/schemas/v1.1/flavors.rng     |    6 +
 .../openstack/v2/schemas/v1.1/flavors_index.rng    |   12 +
 nova/api/openstack/v2/schemas/v1.1/image.rng       |   36 +
 nova/api/openstack/v2/schemas/v1.1/images.rng      |    6 +
 .../api/openstack/v2/schemas/v1.1/images_index.rng |   15 +
 nova/api/openstack/v2/schemas/v1.1/limits.rng      |   28 +
 nova/api/openstack/v2/schemas/v1.1/metadata.rng    |    9 +
 nova/api/openstack/v2/schemas/v1.1/server.rng      |   51 +
 nova/api/openstack/v2/schemas/v1.1/servers.rng     |    6 +
 .../openstack/v2/schemas/v1.1/servers_index.rng    |   15 +
 nova/api/openstack/v2/schemas/v1.1/version.rng     |   17 +
 nova/api/openstack/v2/schemas/v1.1/versions.rng    |   11 +
 nova/api/openstack/v2/server_metadata.py           |  178 +
 nova/api/openstack/v2/servers.py                   | 1177 +++++++
 nova/api/openstack/v2/urlmap.py                    |  297 ++
 nova/api/openstack/v2/users.py                     |  139 +
 nova/api/openstack/v2/versions.py                  |  261 ++
 nova/api/openstack/v2/views/addresses.py           |   52 +
 nova/api/openstack/v2/views/flavors.py             |   65 +
 nova/api/openstack/v2/views/images.py              |  139 +
 nova/api/openstack/v2/views/limits.py              |   97 +
 nova/api/openstack/v2/views/servers.py             |  175 +
 nova/api/openstack/v2/views/versions.py            |   94 +
 nova/api/openstack/v2/zones.py                     |  217 ++
 nova/api/openstack/versions.py                     |  260 --
 nova/api/openstack/views/addresses.py              |   52 -
 nova/api/openstack/views/flavors.py                |   66 -
 nova/api/openstack/views/images.py                 |  139 -
 nova/api/openstack/views/limits.py                 |   97 -
 nova/api/openstack/views/servers.py                |  178 -
 nova/api/openstack/views/versions.py               |   94 -
 nova/api/openstack/wsgi.py                         |  107 +-
 nova/api/openstack/xmlutil.py                      |    4 +-
 nova/api/openstack/zones.py                        |  219 --
 nova/flags.py                                      |    2 +-
 nova/tests/api/openstack/__init__.py               |   16 -
 nova/tests/api/openstack/contrib/__init__.py       |   15 -
 .../api/openstack/contrib/test_admin_actions.py    |   86 -
 .../api/openstack/contrib/test_createserverext.py  |  431 ---
 .../api/openstack/contrib/test_disk_config.py      |  248 --
 .../api/openstack/contrib/test_extendedstatus.py   |   87 -
 .../openstack/contrib/test_flavors_extra_specs.py  |  171 -
 .../api/openstack/contrib/test_floating_ips.py     |  270 --
 nova/tests/api/openstack/contrib/test_keypairs.py  |  112 -
 .../api/openstack/contrib/test_multinic_xs.py      |  113 -
 nova/tests/api/openstack/contrib/test_quotas.py    |  134 -
 nova/tests/api/openstack/contrib/test_rescue.py    |   78 -
 .../api/openstack/contrib/test_security_groups.py  |  848 -----
 .../openstack/contrib/test_simple_tenant_usage.py  |  172 -
 .../openstack/contrib/test_virtual_interfaces.py   |   55 -
 .../api/openstack/contrib/test_volume_types.py     |  165 -
 .../contrib/test_volume_types_extra_specs.py       |  169 -
 nova/tests/api/openstack/contrib/test_volumes.py   |   88 -
 nova/tests/api/openstack/contrib/test_vsa.py       |  450 ---
 nova/tests/api/openstack/extensions/__init__.py    |   15 -
 nova/tests/api/openstack/extensions/foxinsocks.py  |   94 -
 nova/tests/api/openstack/fakes.py                  |   53 +-
 nova/tests/api/openstack/test_accounts.py          |  162 -
 nova/tests/api/openstack/test_api.py               |  127 -
 nova/tests/api/openstack/test_auth.py              |  315 --
 nova/tests/api/openstack/test_consoles.py          |  299 --
 nova/tests/api/openstack/test_extensions.py        |  515 ---
 nova/tests/api/openstack/test_faults.py            |   11 +-
 nova/tests/api/openstack/test_flavors.py           |  670 ----
 nova/tests/api/openstack/test_image_metadata.py    |  201 --
 nova/tests/api/openstack/test_images.py            | 1645 ---------
 nova/tests/api/openstack/test_limits.py            |  939 -----
 nova/tests/api/openstack/test_server_actions.py    |  866 -----
 nova/tests/api/openstack/test_server_metadata.py   |  361 --
 nova/tests/api/openstack/test_servers.py           | 3638 --------------------
 nova/tests/api/openstack/test_urlmap.py            |   84 -
 nova/tests/api/openstack/test_users.py             |  157 -
 nova/tests/api/openstack/test_versions.py          |  671 ----
 nova/tests/api/openstack/test_zones.py             |  283 --
 nova/tests/api/openstack/v2/__init__.py            |   16 +
 nova/tests/api/openstack/v2/contrib/__init__.py    |   15 +
 .../api/openstack/v2/contrib/test_admin_actions.py |   86 +
 .../openstack/v2/contrib/test_createserverext.py   |  431 +++
 .../api/openstack/v2/contrib/test_disk_config.py   |  248 ++
 .../openstack/v2/contrib/test_extendedstatus.py    |   88 +
 .../v2/contrib/test_flavors_extra_specs.py         |  170 +
 .../api/openstack/v2/contrib/test_floating_ips.py  |  269 ++
 .../api/openstack/v2/contrib/test_keypairs.py      |  113 +
 .../api/openstack/v2/contrib/test_multinic_xs.py   |  114 +
 nova/tests/api/openstack/v2/contrib/test_quotas.py |  133 +
 nova/tests/api/openstack/v2/contrib/test_rescue.py |   79 +
 .../openstack/v2/contrib/test_security_groups.py   |  849 +++++
 .../v2/contrib/test_simple_tenant_usage.py         |  172 +
 .../v2/contrib/test_virtual_interfaces.py          |   56 +
 .../api/openstack/v2/contrib/test_volume_types.py  |  167 +
 .../v2/contrib/test_volume_types_extra_specs.py    |  168 +
 .../tests/api/openstack/v2/contrib/test_volumes.py |   89 +
 nova/tests/api/openstack/v2/contrib/test_vsa.py    |  449 +++
 nova/tests/api/openstack/v2/extensions/__init__.py |   15 +
 .../api/openstack/v2/extensions/foxinsocks.py      |   94 +
 nova/tests/api/openstack/v2/test_accounts.py       |  162 +
 nova/tests/api/openstack/v2/test_api.py            |  126 +
 nova/tests/api/openstack/v2/test_auth.py           |  315 ++
 nova/tests/api/openstack/v2/test_consoles.py       |  299 ++
 nova/tests/api/openstack/v2/test_extensions.py     |  516 +++
 nova/tests/api/openstack/v2/test_flavors.py        |  670 ++++
 nova/tests/api/openstack/v2/test_image_metadata.py |  200 ++
 nova/tests/api/openstack/v2/test_images.py         | 1646 +++++++++
 nova/tests/api/openstack/v2/test_limits.py         |  940 +++++
 nova/tests/api/openstack/v2/test_server_actions.py |  881 +++++
 .../tests/api/openstack/v2/test_server_metadata.py |  361 ++
 nova/tests/api/openstack/v2/test_servers.py        | 3631 +++++++++++++++++++
 nova/tests/api/openstack/v2/test_urlmap.py         |   84 +
 nova/tests/api/openstack/v2/test_users.py          |  157 +
 nova/tests/api/openstack/v2/test_versions.py       |  671 ++++
 nova/tests/api/openstack/v2/test_zones.py          |  283 ++
 nova/tests/integrated/test_extensions.py           |    2 +-
 nova/tests/test_hosts.py                           |    3 +-
 207 files changed, 25006 insertions(+), 25035 deletions(-)

commit f14ec8a9e2ef9d7869e9834bd054e9c0e271ec31
Merge: dea1057 809a718
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 17 17:04:39 2011 +0000

    Merge "Added RST docs on how to use gettext."

commit dea1057191d97465682d908a47c28b82224c7983
Merge: 90cc4f1 8fc251c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 17 16:56:43 2011 +0000

    Merge "Adding downgrade for migration 57 plus test"

commit 658d0bc153c15c931bee6418c2c51f48f1f46411
Author: Alvaro Lopez <aloga@ifca.unican.es>
Date:   Fri Nov 11 14:02:31 2011 +0100

    Add a "libvirt_disk_prefix" flag to libvirt driver
    
    This change makes possible to override the default the prefix
    that should be used in a particular installation (refers to
    lp question 176978).
    
    Change-Id: I06b9e7251dc4a02ef6ac40393dce9c5755b00614

 nova/tests/test_libvirt.py      |   38 ++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |   29 ++++++++++++++++-------------
 2 files changed, 54 insertions(+), 13 deletions(-)

commit 809a71822cd4f77c329c32cbc64b35e222da4cfc
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Nov 15 22:28:31 2011 -0500

    Added RST docs on how to use gettext.
    
    Added a page to the RST documentation about gettext usage
    for internationalization.
    
    Change-Id: I2b3b25ad3ab5f3d41b5298f6bad18b216644eeed

 doc/source/devref/il8n.rst  |   34 ++++++++++++++++++++++++++++++++++
 doc/source/devref/index.rst |    1 +
 2 files changed, 35 insertions(+)

commit 90cc4f15956f9595fc30bf4a23f5995c97d173ac
Merge: 36dcc2d e7aa402
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 23:46:16 2011 +0000

    Merge "Refactoring/cleanup of some view builders."

commit 36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf
Merge: 381e5e5 e607353
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 23:35:08 2011 +0000

    Merge "Separate metadata api into its own service"

commit 381e5e5b0dbbb6fefdc8194fa103176f18760060
Merge: 217af7d 41af372
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 23:24:03 2011 +0000

    Merge "Makes sure gateways forward properly"

commit e7aa4022374fb35d2131a7c633212c5d6302db3d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Oct 26 13:57:35 2011 -0500

    Refactoring/cleanup of some view builders.
    
    I have re-worked the "addresses", "flavors", "images", and "servers" view
    builders to share logic which was previously duplicated across many ViewBuilder
    classes. Also, I have re-worked the ViewBuilder class in general to persist
    longer.
    
    Overall we had good test coverage so not many tests had to be updated during
    the refactor.
    
    (Patch Set 2) Updated _set_request and _get_request to be a request property
                  and a set_request method which can be overridden.
    (Patch Set 3) Fixed tests that I broke with the last update.
    (Patch Set 4) Changed "id in network.keys()" to "id in network"
    (Patch Set 5) Feedback changes from bcwaldon
    (Patch Set 6) Updated based on feedback from Waldon.
    (Patch Set 7) Feedback from s1rp (Rick Harris)
    
    Change-Id: I034404892018e99987f80789d7f7e406ff31658c

 nova/api/openstack/common.py                  |   54 +++++
 nova/api/openstack/contrib/createserverext.py |   36 +--
 nova/api/openstack/flavors.py                 |   49 ++--
 nova/api/openstack/images.py                  |   21 +-
 nova/api/openstack/ips.py                     |   27 ++-
 nova/api/openstack/servers.py                 |   60 ++---
 nova/api/openstack/views/addresses.py         |   58 +++--
 nova/api/openstack/views/flavors.py           |   93 +++-----
 nova/api/openstack/views/images.py            |  271 +++++++++-------------
 nova/api/openstack/views/servers.py           |  296 ++++++++++++-------------
 nova/api/openstack/wsgi.py                    |   10 +
 nova/tests/api/openstack/test_images.py       |    7 +-
 nova/tests/api/openstack/test_servers.py      |  140 ++++++------
 13 files changed, 516 insertions(+), 606 deletions(-)

commit 217af7df5980ee7a258d2e8b24aea4444c083201
Merge: 7c34941 1dba0cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 21:33:48 2011 +0000

    Merge "Convert remaining calls to use instance objects"

commit 7c34941b89437e69037be4ea392885c914c227ce
Merge: e14b064 c51104a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 21:19:31 2011 +0000

    Merge "Add logging, error handling to the xenstore lib."

commit e14b0644fbd8c9fb7048d495639ee19eed66f8e0
Merge: 3278f4d b6644ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 21:04:47 2011 +0000

    Merge "Make run instances respect availability zone"

commit 1dba0cdc332e54162dc1d880e80deca968dbff4e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 23:36:17 2011 -0500

    Convert remaining calls to use instance objects
    
    Related to blueprint internal-uuids. This touches get_diagnostics,
    get_actions, and restore.
    
    Change-Id: Ic4b3d9476fb53cb97b4ea75ad2e846374b2b4a41

 nova/api/openstack/contrib/deferred_delete.py |    3 ++-
 nova/api/openstack/servers.py                 |    6 +++--
 nova/compute/api.py                           |   14 +++++------
 nova/tests/test_compute.py                    |   33 ++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 11 deletions(-)

commit 3278f4d72f369403395b745987d7e80330817e6a
Merge: c987f78 84ac4d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 20:56:29 2011 +0000

    Merge "Replacing disk config extension to match spec."

commit c987f78853618e24adb642cd8d76ba6be36ce075
Merge: 57ad4de 53e14f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 20:40:12 2011 +0000

    Merge "Convert security_group calls to use instance objs"

commit b6644ffe4360a9d55e138e20e0d453e8ffb2c718
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Nov 11 11:37:03 2011 -0800

    Make run instances respect availability zone
    
     * includes test
     * fixes bug 888918
    
    Change-Id: I40985e9dcc153fae53675f3da5e2d5b5763cfca3

 nova/api/ec2/cloud.py            |    2 +-
 nova/tests/api/ec2/test_cloud.py |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

commit 84ac4d84ab518a6a03b169b54326b6fec234cc87
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Nov 16 12:49:02 2011 -0600

    Replacing disk config extension to match spec.
    
    Related to instance-disk-management blueprint.
    
    Change-Id: I84689583562f23356064a502577b2924bcbbc460

 nova/api/openstack/contrib/disk_config.py          |  189 +++++++++++++++
 nova/api/openstack/contrib/diskconfig.py           |  135 -----------
 nova/api/openstack/extensions.py                   |   24 +-
 nova/api/openstack/servers.py                      |   16 +-
 nova/compute/api.py                                |   22 +-
 .../versions/058_rename_managed_disk.py            |   40 ++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/image/fake.py                                 |   34 +++
 .../api/openstack/contrib/test_disk_config.py      |  248 ++++++++++++++++++++
 .../tests/api/openstack/contrib/test_diskconfig.py |  161 -------------
 .../api/openstack/contrib/test_extendedstatus.py   |   88 +++----
 nova/tests/api/openstack/fakes.py                  |  116 +++++++++
 nova/tests/api/openstack/test_servers.py           |  212 +++--------------
 nova/tests/test_xenapi.py                          |   22 +-
 nova/virt/xenapi/vm_utils.py                       |   29 +--
 nova/virt/xenapi/vmops.py                          |   19 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   17 +-
 17 files changed, 787 insertions(+), 587 deletions(-)

commit 41af372219793556e6ba335d765761fa277107df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 16 10:17:23 2011 -0800

    Makes sure gateways forward properly
    
     * Fixes bug 890195
     * Fixes missing context in dhcp call
     * Adds test to verify call is correct
    
    Change-Id: Ic099082a18d9fd8f48c338e092cd4a2d227b927b

 nova/network/linux_net.py    |   16 +++++++++-------
 nova/tests/test_linux_net.py |   24 ++++++++++++++++++++----
 2 files changed, 29 insertions(+), 11 deletions(-)

commit 57ad4de6487f625a9e39b17ba612b6f1b43e937c
Merge: 21f0f30 be3f24d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 17:04:47 2011 +0000

    Merge "Bind engine to metadata in migration 054."

commit 21f0f30d7c2ca662c9c90c38a2ab9ff06b864308
Merge: bc74440 aa7dd96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 16 16:56:41 2011 +0000

    Merge "Fixes bug 890206"

commit 53e14f578e066c5e9d715e6085d25e47d19ad3f7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 23:01:53 2011 -0500

    Convert security_group calls to use instance objs
    
    Related to blueprint internal-uuids
    
    Change-Id: I7abe1506de3ce1dd1cec20885229149cd21fbeb5

 nova/api/openstack/contrib/security_groups.py      |    7 ++--
 nova/compute/api.py                                |   36 +++++++++-----------
 .../api/openstack/contrib/test_security_groups.py  |   13 ++++---
 nova/tests/test_compute.py                         |   12 +++++++
 4 files changed, 40 insertions(+), 28 deletions(-)

commit bc74440a177322bd425816058bfff901d4d84d12
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Nov 16 09:33:50 2011 -0500

    Remove hostname update() logic in compute.API
    
    I recently added update logic which had a severely faulty
    assumption. That assumption was that an instnace object was
    always going to be passed to update(). Since that is not the
    case we'll have to revisit this logic.
    
    Change-Id: Ib2303d8719d2f3f8b5c123168864c97d64881544

 nova/compute/api.py                      |   11 -----------
 nova/tests/api/openstack/test_servers.py |    1 -
 nova/tests/test_compute.py               |   14 --------------
 3 files changed, 26 deletions(-)

commit aa7dd96f1c23b29bd2cabd57d579f2c3b0fe678a
Author: Alvaro Lopez <aloga@ifca.unican.es>
Date:   Mon Nov 14 16:58:05 2011 +0100

    Fixes bug 890206
    
    Add a check when creating the volume definition for the libvirt manager
    to use the apporpiate driver for the disk, according to [1].
    
    [1] http://libvirt.org/formatdomain.html#elementsDisks
    
    Change-Id: I89cf3bb308cff28194de0beb36d69f0e32224cbe

 nova/compute/api.py         |    2 +-
 nova/tests/test_compute.py  |   41 +++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_libvirt.py  |   14 +++++++++++---
 nova/virt/libvirt/volume.py |   14 ++++++++++----
 4 files changed, 63 insertions(+), 8 deletions(-)

commit 7ece1e7e607849f0d9a0eb5551899b3cc973545e
Merge: 9f3f056 b0ad728
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 23:36:05 2011 +0000

    Merge "install_venv: apply eventlet patch correctly with python 2.7 (#890461)"

commit 9f3f056bd5ceda5d41508533244f5b509ddcfb0e
Merge: a3090f2 bcfff3d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 23:28:13 2011 +0000

    Merge "Follow hostname RFCs"

commit a3090f2a3a8a83e25a4a4ded24785a8bb862fe87
Merge: 6ae372f 81c8c3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 23:18:43 2011 +0000

    Merge "Fixing image create in S3ImageService"

commit 6ae372fc784005572f03d1d9ff43952b428f656a
Merge: dd5c3f7 01150b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 22:51:52 2011 +0000

    Merge "Bug #886353: Faults raised by OpenStack API Resource handlers fail to be reported properly"

commit bcfff3dd530994d3ae22f945f429df3afc954cb0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Nov 9 18:16:24 2011 -0500

    Follow hostname RFCs
    
    Updated hostname sanitization method to more closely follow RFC-952
    and RFC-1123. Also moved it to nova.utils, where it seems to fit
    better.
    
    Fixes bug 885374
    
    (Patch Set 1) Updated hostname sanitization with more efficient and
                  [opinion] more readable implementation.
    
    Change-Id: I60d7ee89867c05950bec1fd53b072a1c6247ebea

 nova/compute/api.py                      |   62 +++++++++++++-----------------
 nova/tests/api/openstack/test_servers.py |    5 ++-
 nova/tests/test_compute.py               |   24 ++++++++++++
 nova/tests/test_utils.py                 |   24 ++++++++++++
 nova/utils.py                            |   13 +++++++
 5 files changed, 91 insertions(+), 37 deletions(-)

commit dd5c3f7badf24e21eb1b311639bcbc55512bc117
Merge: dfcb237 f11f6f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 22:27:07 2011 +0000

    Merge "Bug #888719: openvswitch-nova runs after firstboot scripts"

commit 78de0014c675c8a7732eeea3b9afad5f11870d72
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Nov 15 16:31:28 2011 -0500

    Reference Ron Pedde's cleanup script for DevStack.
    
    Docs now have a link to Ron Pedde's cleanup script for DevStack.
    
    Change-Id: I2a36fbfae2ebec437091a50d17d57fef0858be74

 doc/source/quickstart.rst |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit dfcb237904157b37cf3bdea95370b35a3613924f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Nov 15 12:23:26 2011 -0500

    Remove contrib/nova.sh and other stale docs.
    
    Removed contrib/nova.sh and any references to it in the RST docs.
    
    removed refernece to old livecd that has nova circa 2010 on it.
    
    .gitignore'ing some additional autogenerated doc files.
    
    Change-Id: I7a07a58a9a6f1112fc7e486367a06f6916207784

 contrib/nova.sh                        |  234 --------------------------------
 doc/.gitignore                         |    2 +
 doc/source/livecd.rst                  |   65 ---------
 doc/source/quickstart.rst              |  148 +-------------------
 doc/source/runnova/getting.started.rst |  167 -----------------------
 doc/source/runnova/index.rst           |    2 +-
 6 files changed, 8 insertions(+), 610 deletions(-)

commit e6073532e5020203a8ec2247ca7ddd481c6ec517
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Nov 5 14:10:17 2011 -0700

    Separate metadata api into its own service
    
    part 1 of blueprint separate-nova-metadata
    
     * adds api/metadata/ and moves code from ec2
     * moves metadata into separate binary
     * changes metadata forward to use metadata host and port
     * moves the metadata accept rule to the metadata api
     * adds nova-api-* to setup.py
    
    Change-Id: I7f5d8e6cafc55b5c383cd88991f29c6059fb8d82

 bin/nova-api-metadata                       |   47 ++++++++
 etc/nova/api-paste.ini                      |   50 +++++----
 nova/__init__.py                            |    2 +-
 nova/api/ec2/__init__.py                    |   23 ----
 nova/api/ec2/metadatarequesthandler.py      |   93 ----------------
 nova/api/manager.py                         |    8 +-
 nova/api/metadata/__init__.py               |   25 +++++
 nova/api/metadata/handler.py                |  112 +++++++++++++++++++
 nova/auth/__init__.py                       |    2 +-
 nova/cloudpipe/__init__.py                  |    2 +-
 nova/flags.py                               |    5 +-
 nova/network/linux_net.py                   |    7 +-
 nova/objectstore/__init__.py                |    2 +-
 nova/service.py                             |   10 +-
 nova/tests/__init__.py                      |    2 +-
 nova/tests/integrated/integrated_helpers.py |    1 +
 nova/tests/test_metadata.py                 |    4 +-
 setup.py                                    |    3 +
 tools/setup_iptables.sh                     |  158 ---------------------------
 19 files changed, 240 insertions(+), 316 deletions(-)

commit 097d122609b70526423449f3f0259adaf6a32460
Merge: 80ffed4 6183586
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 21:27:39 2011 +0000

    Merge "Fixes Bug #861293 nova.auth.signer.Signer now honors the SignatureMethod parameter for SHA1 when creating signatures"

commit c51104ab01f2d848eadc10bd50f35b6662886d97
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Nov 14 16:41:14 2011 -0500

    Add logging, error handling to the xenstore lib.
    
    Change-Id: If007ba117105d63b1eecfee5b8941d98032d2c9a

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |   57 +++++++++++++-------
 1 file changed, 39 insertions(+), 18 deletions(-)

commit 80ffed4f0a8cacdf98d83198c8503d6c2a745d61
Merge: 4dd21a3 d2db979
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 20:34:06 2011 +0000

    Merge "Converting lock/unlock to use instance objects"

commit 4dd21a3501d975b08fc650a033d84ef5c2e5eeef
Merge: f2fc092 e105c53
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 17:50:32 2011 +0000

    Merge "Log the URL to an image_ref and not just the ID."

commit d2db9790dd1c2f7a955236e01e37b579a2c87321
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 23:20:52 2011 -0500

    Converting lock/unlock to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I5a7842953da64cd2a060e5e384d06cdf535c7a1f

 nova/api/openstack/contrib/admin_actions.py |   10 ++++++++--
 nova/compute/api.py                         |   15 ++++++++-------
 nova/tests/test_compute.py                  |   19 +++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

commit f2fc0929d29c5722aa479911706f2294d6876b91
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Nov 14 23:36:48 2011 +0000

    Deepcopy optparse defaults to avoid re-appending multistrings (#890489)
    
    This is actually a bug in optparse itself, but luckily we can work
    around it. I'll file it upstream when bugs.python.org's account
    registration isn't broken.
    
    Change-Id: I87c3271562caa4336c11fe445475650a9f16950c

 nova/flags.py            |   10 ++++++++++
 nova/tests/test_flags.py |   12 ++++++++++++
 2 files changed, 22 insertions(+)

commit b0ad7284aa6e00559efa6e291b69eef1a2a1de33
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Nov 15 08:43:46 2011 +0000

    install_venv: apply eventlet patch correctly with python 2.7 (#890461)
    
    Looks like the fix for #884915 only works with RHEL6. Make it work
    correctly on Fedora 16.
    
    Change-Id: I8c996f20d49db688fd8e692bcd836dee693d362a

 tools/install_venv.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 065a7ea03d97943cd669948ebaabd5271bf2afef
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Nov 15 07:01:43 2011 +0000

    Fix multistring flags default handling (#890489)
    
    With its 'append' action, optparse appends values to the supplied
    default value. This leaves the user with no way of overriding the
    default value. If you want to support overriding, you need to manually
    handle setting the default value after parsing.
    
    gflags supports overriding the default value so we must do the same.
    
    Change-Id: I5810e16806e74876c7a310edbb6f8f27f0a3313b

 nova/flags.py            |   17 ++++++++++++++++-
 nova/tests/test_flags.py |    6 +++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

commit 06c8064af50a76dd276d472316f78780a170d6dc
Merge: 4201b01 9c012d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 15 00:44:48 2011 +0000

    Merge "Handle null ramdisk/kernel in euca-describe-images"

commit 81c8c3ab19d838e14c528753854340a8a4b4f66a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Nov 14 16:19:48 2011 -0800

    Fixing image create in S3ImageService
    
    Fixes bug 890486
    
    Change-Id: I80b7fc1952acf8d6bc0eaa4fc5fffe8d097a043c

 nova/image/s3.py            |   13 +++++++------
 nova/tests/image/test_s3.py |    2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

commit e3dca3c96230ed9be33b311f1eb10e03e41363d7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Nov 14 23:29:24 2011 +0000

    Defining volumes table to allow FK constraint.
    
    Fixes bug #890477
    
    Change-Id: Ie5ef3d0d0c6195cd0b7c2e8a1039fdcbb18eb6da

 .../versions/052_kill_export_devices.py            |    4 ++++
 1 file changed, 4 insertions(+)

commit 4201b019312aeae237d3a1175f501cbc0c235e3c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 22:21:00 2011 -0500

    Converting network methods to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I04f8f855411658674441a8d0cb7b589dee8b36fa

 nova/api/openstack/contrib/admin_actions.py        |    8 ++++++--
 nova/compute/api.py                                |    6 ++++--
 .../api/openstack/contrib/test_admin_actions.py    |    7 +++----
 nova/tests/test_compute.py                         |   13 +++++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

commit 9c012d5153419909f674e6c69548f55a98de65de
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Nov 14 15:21:30 2011 -0800

    Handle null ramdisk/kernel in euca-describe-images
    
    Fixes bug 890426
    
    Change-Id: I8b5dd4aa4df233a6fb04a6f62a71129c799e9f2c

 nova/image/fake.py          |   12 +++++++-----
 nova/image/s3.py            |    4 +++-
 nova/tests/image/test_s3.py |    5 ++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

commit be3f24d7f3d62a8fbbccf78a9e4ffc8a3fba0fa4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Nov 14 23:20:24 2011 +0000

    Bind engine to metadata in migration 054.
    
    Fixes bug #890474
    
    Change-Id: I5094a98295a478c0cfb5e1a251014706d3ede3c7

 .../versions/054_add_bw_usage_data_cache.py        |    1 +
 1 file changed, 1 insertion(+)

commit 8fc251c13f361b6ebc3115064536466576e34777
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Nov 14 22:34:14 2011 +0000

    Adding downgrade for migration 57 plus test
    
    Fixes bug #890427
    
    Change-Id: Ifdca8c13437c818c8407d8e9131e699bdfd6e76d

 .../versions/057_add_sm_driver_tables.py           |    9 ++++
 nova/tests/test_misc.py                            |   46 ++++++++++++++++++++
 2 files changed, 55 insertions(+)

commit e105c53e67febefc0ae7e78baf53020d2b29c298
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 14 15:30:14 2011 -0600

    Log the URL to an image_ref and not just the ID.
    
    Change-Id: Iaae6b969d9ef3cd0f50dd3297d4b0bb51f61f5c9

 nova/tests/test_compute.py       |    9 ++++++---
 nova/tests/test_compute_utils.py |    3 ++-
 nova/utils.py                    |    5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

commit d9dd8f2fd395ad02e536d8054b0615520771b93e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 21:28:24 2011 -0500

    Converting attach_volume to use instance object
    
    Related to blueprint internal-uuids
    
    Change-Id: I84d6e76d58de29f49d30ad3f8ac051becac626bd

 nova/api/ec2/cloud.py                 |    6 ++----
 nova/api/openstack/contrib/volumes.py |    8 +++----
 nova/compute/api.py                   |    3 +--
 nova/tests/api/ec2/test_cloud.py      |    3 ++-
 nova/tests/test_compute.py            |   37 ++++++++++++++++++++++-----------
 5 files changed, 33 insertions(+), 24 deletions(-)

commit 1851662edb870534a73e86cc3aa475b305ee8ebc
Merge: 165cbc3 1ecd70f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 12 17:53:58 2011 +0000

    Merge "Bug #887805 Error during report_driver_status(): 'LibvirtConnection' object has no attribute '_host_state'"

commit 165cbc3942c5fac4d969e8a094dc4b5e555f6110
Merge: 31b5f88 1a12349
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 12 17:45:33 2011 +0000

    Merge "Verify security group parameters"

commit 31b5f88a187a4a724cf2f5dc8985f37f081aac12
Merge: f0a19e3 6fa7fa4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 12 17:30:16 2011 +0000

    Merge "Stop nova-ajax-console-proxy configuring its own logging."

commit f0a19e337f59baa96a45bd53d498ea01b4c6e86e
Merge: fb95f93 e5319df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 12 17:22:41 2011 +0000

    Merge "Removed some old cruft."

commit fb95f93bbdf27e0cecece6810c833b611793b123
Merge: 4efb01f 43fb688
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 12 17:15:00 2011 +0000

    Merge "Convert pause/unpause, sus/res to use instance obj"

commit 4efb01f4cbcf29150bdaa608242605a6dfef4140
Merge: 45af0a0 5741660
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 22:03:42 2011 +0000

    Merge "Converting rescue/unrescue to use instance objects"

commit 45af0a0ac8ed37be9e62fd5a92dbe96517da0517
Merge: bf7b89d 0a2d839
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 21:53:35 2011 +0000

    Merge "Converting consoles calls to use instance objects"

commit 574166045c6d4b7d8f5e2afeaa6d13aabf03bdb0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 17:15:28 2011 -0500

    Converting rescue/unrescue to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: If256d9a1251e780ff044bd87e0805c9f511c05e9

 nova/api/openstack/contrib/rescue.py            |   20 +++++++++++++-----
 nova/compute/api.py                             |    6 ++++--
 nova/tests/api/openstack/contrib/test_rescue.py |   10 +++++++--
 nova/tests/test_compute.py                      |   25 +++++++++++++++++++++++
 4 files changed, 52 insertions(+), 9 deletions(-)

commit bf7b89d577a9fbe8d25c3db2deae926d852d8bcc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 16:55:32 2011 -0500

    Converting inject_file to use instance objects
    
    Related to blueprint internal-uuids. This function also appeared to be
    incomplete. It should actually work now.
    
    Change-Id: I77ccd29c7ac5e0cbe60d52a4ff5a64ecdff6fa1a

 nova/compute/api.py        |    8 ++++++--
 nova/tests/test_compute.py |    8 ++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

commit 615c4df3201fce7ae95c1b50bcec7f212cfc2aa6
Merge: f492fce 6bd44cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 21:27:27 2011 +0000

    Merge "Converting fixed ip calls to use instance objects"

commit f11f6f789e2af83bfc9c25e7485625e81aa90633
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Nov 9 23:24:25 2011 -0800

    Bug #888719: openvswitch-nova runs after firstboot scripts
    
    Move openvswitch-nova to 23 in the boot order.
    
    The openvswitch-nova init.d script used on XenServer has been set to run
    at 96 in the boot order (i.e. very late).  This is inconvenient, because it
    means that it runs after the firstboot scripts, so if you want to do an
    automated install of a compute VM, say, you can't rely on the Open vSwitch
    rules being ready.
    
    23 places it after the networking start up (9 through 14) and before the
    firstboot scripts (24).
    
    Change-Id: I5c4f2f02c78bd7b8ccc6cac4d6549209a6dcbdb0

 .../networking/etc/init.d/openvswitch-nova         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f492fced12078733c8a84e69d222ec52c2fce609
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Nov 10 12:28:35 2011 -0800

    Bug #888730: vmwareapi suds debug logging very verbose
    
    Set suds log level to INFO by default, using
    default_log_levels.
    
    Change-Id: I4a1b09470aeba006112734fae9feef3d228eaced

 doc/source/vmwareapi_readme.rst |    8 ++++++++
 nova/log.py                     |    1 +
 2 files changed, 9 insertions(+)

commit b9086d3ad2da90f31001c082d371c8b972ca767b
Merge: 314539c 255a363
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 19:21:28 2011 +0000

    Merge "Converting metadata calls to use instance objects"

commit 314539cce77846a7fe9ff7dc52d6291fcc34814e
Merge: ed3635f d29f9e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 19:06:18 2011 +0000

    Merge "Converting snapshot/backup to use instance objects"

commit ed3635f40fa31b896bb700610b93fe288a90e692
Merge: fb6a2d1 231f40a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 18:42:39 2011 +0000

    Merge "Converting set password to use instance objects"

commit 0a2d839f1b8b1bc67c3fd3bf5ecc0c4c5ab36b0e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 21:06:05 2011 -0500

    Converting consoles calls to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I39da4d98ff64e8db22eecb1966f6506e8f14361e

 nova/api/ec2/cloud.py      |   12 ++++++------
 nova/compute/api.py        |   12 ++++++------
 nova/tests/test_compute.py |   29 +++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 12 deletions(-)

commit 6bd44ccb3a4bf8536f6bca9b81517d2b24c31f14
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 20:45:55 2011 -0500

    Converting fixed ip calls to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: Ifad7a6ac39b0455f77602d9744f64425ebb3f49c

 nova/api/openstack/contrib/multinic.py             |   25 +++++++++++++------
 nova/compute/api.py                                |   19 ++++++++++----
 .../api/openstack/contrib/test_multinic_xs.py      |   26 ++++++++++++--------
 nova/tests/test_compute.py                         |    7 ++++++
 4 files changed, 54 insertions(+), 23 deletions(-)

commit fb6a2d15be16f664b2159526fa339019ed4c204a
Merge: 1778c61 fa846dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 17:50:32 2011 +0000

    Merge "Refactor of QuotaError"

commit 1778c615553f362ec3093502d30a32b84d54d1dc
Merge: 41159b6 17ae2d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 16:54:45 2011 +0000

    Merge "fix rebuild sha1 not string error"

commit 41159b6ad54c817be6d4cb37a3b043b4c2f921ca
Merge: 59dfaf9 57e73d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 11 16:25:35 2011 +0000

    Merge "Fix a notification bug when creating instances"

commit 43fb6880d90197735b0b9bf4587fcece825c1ed0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 10 15:52:04 2011 -0500

    Convert pause/unpause, sus/res to use instance obj
    
    Related to blueprint internal-uuids
    
    Change-Id: I02bd212b4878ed0fcb971c223518ecf7126bd597

 nova/api/openstack/contrib/admin_actions.py        |   12 ++--
 nova/compute/api.py                                |   12 ++--
 .../api/openstack/contrib/test_admin_actions.py    |   23 ++++++++
 nova/tests/test_compute.py                         |   60 ++++++++++++++++++++
 4 files changed, 99 insertions(+), 8 deletions(-)

commit 17ae2d2662ca9af6eee0cf96fe48d3951593dc6b
Author: David Subiros <david.perez5@hp.com>
Date:   Tue Oct 4 13:12:40 2011 +0100

    fix rebuild sha1 not string error
    
    fixes bug #889164
    The sha1() parameter is converted to a string
    before calling the funcion.
    
    Change-Id: I9cb6ff43c106c214e027d3bdacb795b4b0269f94

 nova/tests/test_libvirt.py      |    8 +++++++-
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 1a12349c056b52b488591abb1671ad94a6db6526
Author: Ahmad Hassan <ahmad.hassan@hp.com>
Date:   Fri Sep 30 15:10:33 2011 +0100

    Verify security group parameters
    
    Introduced various sanity checks before adding security group rule
    into the database. The checks have been implemented both in EC2 and
    openstack extension code.
    Implemented the suggestions made in first patch by Brian
    Fixed the unit tests in security groups
    Fixed pep8 issues in security group unit tests
    
    Fixes bug 869979.
    
    Change-Id: I2ac28666e90e7bdeacb7b1c2676c0719cfb9e441

 nova/api/ec2/cloud.py                              |   44 +++++++++++++++---
 nova/api/openstack/contrib/security_groups.py      |   42 +++++++++++++----
 nova/exception.py                                  |    2 +-
 .../api/openstack/contrib/test_security_groups.py  |   41 +++++++++++++++++
 nova/tests/test_api.py                             |   48 +++++++++++++++++++-
 nova/utils.py                                      |   21 +++++++++
 6 files changed, 181 insertions(+), 17 deletions(-)

commit 231f40af80c69f80aec4922f1261f4fdf5365a3c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 16:34:50 2011 -0500

    Converting set password to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: Ifd229c7b9a9b69040a04289d4a98385fc946c734

 nova/api/openstack/servers.py                   |    3 ++-
 nova/compute/api.py                             |    5 ++++-
 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 nova/tests/test_compute.py                      |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

commit d29f9e34555c2af2d996cd96e084af4be513a33b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 21:54:14 2011 -0500

    Converting snapshot/backup to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I8d9768524d36f7066cc1550bba01326dc5167a8d

 nova/api/openstack/servers.py |    8 ++++++--
 nova/compute/api.py           |   18 +++++++++---------
 nova/tests/test_compute.py    |   24 ++++++++++++++++++++----
 3 files changed, 35 insertions(+), 15 deletions(-)

commit fa846dd3430786fe7bc4ed951bb2105f49e50f69
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Nov 10 16:00:08 2011 -0800

    Refactor of QuotaError
    
    moved QuotaError from quota.py to exception.py
    
    Change-Id: Ic03301492a2df323074d73e8481e0e3aee89f74c

 nova/api/openstack/contrib/flavorextraspecs.py |    6 +++---
 nova/api/openstack/contrib/volumetypes.py      |    7 +++----
 nova/api/openstack/server_metadata.py          |    3 +--
 nova/api/openstack/servers.py                  |    3 +--
 nova/compute/api.py                            |   13 +++++++------
 nova/exception.py                              |    5 +++++
 nova/network/manager.py                        |    2 +-
 nova/quota.py                                  |    5 -----
 nova/tests/test_network.py                     |    3 +--
 nova/tests/test_quota.py                       |   19 ++++++++++---------
 nova/volume/api.py                             |    2 +-
 11 files changed, 33 insertions(+), 35 deletions(-)

commit 57e73d374843cade854f07a228192c4f496507ff
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Nov 10 17:35:44 2011 -0600

    Fix a notification bug when creating instances
    
    Fixes a notifier bug that caused 'launched_at' to be empty and
    state to be reported as 'building', due to failure to refresh
    instance data prior to generating the notification.  Fixes
    bug 834867.
    
    Change-Id: I70fbf3c67407c67b69040ee481ca6d51212cc55d

 nova/compute/manager.py    |   12 ++++++------
 nova/tests/test_compute.py |    2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

commit 59dfaf9e02ff0064a6844c9c986737267317776f
Merge: cd822c3 6811182
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 23:32:18 2011 +0000

    Merge "Capture exceptions happening in API layer"

commit cd822c3bd75350096bcf4822ddc9074e3192a966
Merge: f2b9f3f d7e5a79
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 23:12:53 2011 +0000

    Merge "nova-manage: exit with status 1 if an image registration fails"

commit 255a363f78ffd193a4915169d44b85dfeb2c9579
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 10 15:58:17 2011 -0500

    Converting metadata calls to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: Ic21bffbdb538fb8c1bdd1d729982e2da0a56bdf8

 nova/api/openstack/server_metadata.py |    9 ++++++---
 nova/compute/api.py                   |   29 ++++++++++-------------------
 nova/tests/test_compute.py            |   26 ++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 22 deletions(-)

commit d7e5a791503b67c53bd497b9cdebb19083630b14
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Nov 9 23:24:25 2011 -0800

    nova-manage: exit with status 1 if an image registration fails
    
    This indicates the failure to the user through the exit status.
    
    Original author: Renuka Apte <renuka.apte@citrix.com>
    
    Change-Id: I73fc2cc35530e7ee7f113f5aaec7b577663e4dc1

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit f2b9f3fa6c8e8e50b23919bad079c86b14b08dee
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 10 14:21:57 2011 -0500

    Converting start and stop to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: Ie94bef94e50620419a306eeedcdca756f83f1af6

 nova/api/ec2/cloud.py            |   10 ++++++++--
 nova/compute/api.py              |   17 +++++++++--------
 nova/tests/api/ec2/test_cloud.py |   29 +++++++++++++++++++++++++++++
 nova/tests/test_compute.py       |   30 ++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 10 deletions(-)

commit 1a5418b7cbc6f19000ee2847067c681685dd416e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Nov 10 13:24:17 2011 -0500

    Converting delete to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I8875d9785dd0d8f55120673c758edb4c011a4657

 nova/api/ec2/cloud.py                         |    5 ++-
 nova/api/openstack/contrib/deferred_delete.py |    3 +-
 nova/api/openstack/servers.py                 |    5 +--
 nova/compute/api.py                           |   37 ++++++++++----------
 nova/tests/api/ec2/test_cloud.py              |   12 +++++++
 nova/tests/test_compute.py                    |   46 +++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 23 deletions(-)

commit 871e680c9c58dba9f29a89b26e561f1ac4a2a111
Merge: 9334893 89f2fb0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 18:26:43 2011 +0000

    Merge "Add more error handling to glance xenapi plugin"

commit 68111826afed69076d8b09363bb1191ecebe3b53
Author: Ahmad Hassan <ahmad.hassan@hp.com>
Date:   Thu Oct 6 11:16:32 2011 +0100

    Capture exceptions happening in API layer
    
    Added the faulwrapper around EC2 api so that it captures any unseen
    exceptions and return a graceful error back. Also changed the openstack
    exception message. The actual exception message will be printed in the
    logs and would not return back the user.
    Removed openstack wsgi dependency from
    EC2 fault wrapper. Added unit tests for
    EC2 fault wrapper
    Fixes bug 869132.
    
    Change-Id: I03d18f321f141ae96f1add99ea0b70e736253c89

 etc/nova/api-paste.ini            |   15 +++++----
 nova/api/ec2/__init__.py          |   14 ++++++++
 nova/api/ec2/faults.py            |   64 +++++++++++++++++++++++++++++++++++++
 nova/tests/api/ec2/test_faults.py |   34 ++++++++++++++++++++
 4 files changed, 121 insertions(+), 6 deletions(-)

commit 9334893c836712a2abb75cbcbdfd67b0809e9fbb
Merge: 41b4af1 6e7b038
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 17:11:15 2011 +0000

    Merge "Fixes bug 871877"

commit e5319dfbd2b2ef51e79c55ff29e4d23881d1120e
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Nov 10 12:00:06 2011 -0500

    Removed some old cruft.
    
    Removed the builddeb.sh script, which is not used by debian packaging.
    Removed bzrplugins for novalog, since we no longer use bzr.
    
    Change-Id: Icaae040e31b73af1bad97320cd7893ae17ac1d85

 MANIFEST.in                    |    3 +-
 builddeb.sh                    |   20 --------------
 bzrplugins/novalog/__init__.py |   60 ----------------------------------------
 3 files changed, 1 insertion(+), 82 deletions(-)

commit 89f2fb00b9e84c7815683632e8c6415433945e84
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Nov 9 15:11:22 2011 -0500

    Add more error handling to glance xenapi plugin
    
    Also add some extra logging to help track down problems that occur
    when getting images from glance.
    
    Change-Id: I2246d06364211ae377c7a89f93a76f339a201a8d

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |  125 +++++++++++++-------
 1 file changed, 80 insertions(+), 45 deletions(-)

commit 6e7b0387e417e4ef36b8ce1e0b7a7db32732838d
Author: Alvaro Lopez <aloga@ifca.unican.es>
Date:   Wed Nov 9 16:18:39 2011 +0100

    Fixes bug 871877
    
    Added an aditional testunit to the VlanNetworkTestCase to check
    if the FixedIpNotFoundForNetwork exception is raised properly.
    
    Change-Id: I92a0ca22aadcfa9a7fd434375e239be8ccf4f387

 Authors                    |    1 +
 nova/network/manager.py    |    1 +
 nova/tests/test_network.py |   14 ++++++++++++++
 3 files changed, 16 insertions(+)

commit 41b4af111d4f80f51e79aeebc643ace60dee54f8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Nov 10 10:58:08 2011 +0100

    Replace libvirt driver's use of libxml2 with ElementTree
    
    libxml2 has been rather awkward as a dependency, and ElementTree
    is in the standard library, so this replaces all use of libxml2 with
    ElementTree instead.
    
    Change-Id: Ib99983d5b04cc9f899584bfd4335fa9f7ece3c40

 nova/tests/test_libvirt.py      |    9 +--
 nova/virt/libvirt/connection.py |  132 +++++++++++++++------------------------
 2 files changed, 50 insertions(+), 91 deletions(-)

commit 6c0fd03fc3e4f30ca6d1e7d55e83d7a325fae447
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Nov 10 10:41:37 2011 +0100

    Extend fake image service to let it hold image data
    
    Make the fake image service able to store image data in memory. This is
    handy for unit testing, but probably not very useful otherwise (images
    are pretty big, so holding them in memory is not a very good idea).
    
    Change-Id: I2d07baf24cab544e19521b9486feee3272d0407e

 nova/image/fake.py       |    8 ++++++++
 nova/tests/test_image.py |   11 +++++++++++
 2 files changed, 19 insertions(+)

commit 1ecd70f23ae211c5c4ea5613adc24c0e1557790d
Author: Édouard Thuleau <edouard1.thuleau@orange.com>
Date:   Wed Nov 9 17:37:54 2011 +0100

    Bug #887805 Error during report_driver_status(): 'LibvirtConnection' object has no attribute '_host_state'
    
    Fixes the host status reports from LibvirtConnection driver.
    This fix initializes in class 'LibvirtConnection', the local variable
    '_host_state' and replaces the variable 'session' by the local
    variable 'read_only'.
    
    Change-Id: Ia3ba29dc287c793c79a2bbde0d5ec69eb6ada480

 .mailmap                        |    1 +
 Authors                         |    2 +-
 nova/virt/libvirt/connection.py |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

commit 26d2bad187ba8fab4f5e4b2f76b86f3e8762caa8
Merge: 8e3da64 bee61b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 06:51:11 2011 +0000

    Merge "Fixes LP878319"

commit 8e3da64784a6a412a8806d666398236cbb83be81
Merge: 3639fbb ad710f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 06:10:59 2011 +0000

    Merge "Fix exception reraising in volume manager."

commit 3639fbb09ec47c318a1e2c166aeb4267842c2cee
Merge: 110a64a d7b9ee3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 04:26:07 2011 +0000

    Merge "More spelling fixes inside of nova"

commit 110a64a10d7332afaee3d5b02e4272ce5bffaecc
Merge: 2605683 1bcec83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 04:18:32 2011 +0000

    Merge "Replace socat with netcat."

commit 260568339c3666fc37abbe63aaaa76abc3d900b3
Merge: 6fa3534 ad7fcf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 04:11:12 2011 +0000

    Merge "Undefine libvirt saved instances"

commit 6fa35344f98aff915051242b9daff7ad38e47756
Merge: bcb590c 2ab6132
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 10 04:03:51 2011 +0000

    Merge "Get MAC addresses from Melange."

commit d7b9ee35569482be69918ba8ed448688568a7def
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Nov 9 13:01:35 2011 -0800

    More spelling fixes inside of nova
    
    Change-Id: I79daf7519c99cc363ac7175c85912298f273da8a

 nova/auth/fakeldap.py          |    4 ++--
 nova/auth/manager.py           |    4 ++--
 nova/compute/api.py            |    5 +++--
 nova/compute/manager.py        |    2 +-
 nova/crypto.py                 |    2 +-
 nova/db/sqlalchemy/api.py      |   16 ++++++++--------
 nova/fakerabbit.py             |    2 +-
 nova/log.py                    |    4 ++--
 nova/network/linux_net.py      |   16 ++++++++--------
 nova/network/manager.py        |    6 +++---
 nova/notifier/list_notifier.py |    2 +-
 nova/rpc/common.py             |    4 ++--
 nova/rpc/impl_carrot.py        |    2 +-
 nova/rpc/impl_kombu.py         |    4 ++--
 nova/scheduler/api.py          |    2 +-
 nova/scheduler/driver.py       |    4 ++--
 nova/scheduler/manager.py      |    2 +-
 nova/test.py                   |    4 ++--
 nova/utils.py                  |    4 ++--
 nova/virt/driver.py            |    6 +++---
 20 files changed, 48 insertions(+), 47 deletions(-)

commit bee61b32420a2b8ce982406cd6c9647098bdf70b
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Nov 4 16:37:09 2011 -0500

    Fixes LP878319
    
    * Adds lookup of host version in XenAPI session
    * Add call to determine function name of resize
    
    Change-Id: I797ff2ea34a3b3fde1091efba803a4572aaf1ede

 nova/tests/test_xenapi.py  |   17 +++++++++++++++++
 nova/tests/xenapi/stubs.py |    8 ++++++--
 nova/virt/xenapi/fake.py   |    2 ++
 nova/virt/xenapi/vmops.py  |    9 +++++++--
 nova/virt/xenapi_conn.py   |   11 ++++++++++-
 5 files changed, 42 insertions(+), 5 deletions(-)

commit ad710f2743f4671927fd72387e10527ac1778362
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Oct 27 13:57:59 2011 +0400

    Fix exception reraising in volume manager.
    
    Change-Id: Id75bdd6531acf492df4c8d96723b8303406bffe0

 nova/volume/manager.py |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit bcb590cba55d3d7318f2870cddc1cf507652e2a2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Nov 9 16:56:33 2011 -0600

    Adding Chuck Short to .mailmap
    
    Lets https://review.openstack.org/#change,729  merge.
    
    Change-Id: I4e46d9e9c7569aaeff73b1769ec55a22954ede36

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit ad7fcf225e126d2a719c04019c4daa1616d2159e
Author: Derek Higgins <derekh@redhat.com>
Date:   Fri Nov 4 00:25:34 2011 +0000

    Undefine libvirt saved instances
    
    Fixes bug 814561
    
    Adding a call to managedSaveRemove if the instance has a
    saved instance, so they are now undefined in addition to running
    instances during destroy
    With test case
    
    Also added myself to Authors
    
    Change-Id: If93e8ac6972116152f38e187bd1a61c652855814

 Authors                         |    1 +
 nova/tests/test_libvirt.py      |   19 +++++++++++++++++++
 nova/virt/libvirt/connection.py |   11 +++++++++++
 3 files changed, 31 insertions(+)

commit 7a2e8a1d6798a1ff669cd245f35922c45b733b12
Merge: 5914d50 f7566bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 22:11:08 2011 +0000

    Merge "Split compute api/manager tests within module"

commit 5914d5097299cf24a52dba5d0c9cfd0c098992ee
Merge: cc3fe3f 9175822
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 22:03:54 2011 +0000

    Merge changes I6dbf755a,Ifab330a7
    
    * changes:
      Workaround for eventlet bug with unit tests in RHEL6.1.
      Apply M2Crypto fix for all Fedora-based distributions.

commit f7566bd14bdff44b2afeff6866fd0ecc4807eb76
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Nov 9 15:31:56 2011 -0500

    Split compute api/manager tests within module
    
    Change-Id: Ica552c1538169c8b5b71534eefab46af32897bc3

 nova/tests/test_compute.py |  711 ++++++++++++++++++++++----------------------
 1 file changed, 356 insertions(+), 355 deletions(-)

commit cc3fe3f71da4f97d672e7acfb270913bf0940303
Merge: 814cb1a af2acab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 20:22:22 2011 +0000

    Merge "Converting rebuild to use instance objects."

commit 814cb1acc3237e7a31b85b43015e46c87231ead7
Merge: 34f9452 2939835
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 20:14:46 2011 +0000

    Merge "Converting resize to use instance objects"

commit 34f94528f047b9af3b428a65308305211924b57a
Merge: 2bf0dad d8df063
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 20:07:23 2011 +0000

    Merge "Spelling fixes in nova/api comments"

commit 2bf0dad68bac912e94854810e3ea3968be7c0e70
Merge: 9088c89 98d3042
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 19:59:47 2011 +0000

    Merge "Refactor logging_error into utils"

commit 9175822ffeb89268afc6db7900f8b45d738e108c
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Nov 9 14:00:55 2011 -0500

    Workaround for eventlet bug with unit tests in RHEL6.1.
    
    This adds a patch to fix the broken eventlet code that's installed in the
    virtualenv.
    
    Fixes bug 884915
    
    Change-Id: I6dbf755abbc5a52208de3dd892257ce39686d396

 contrib/redhat-eventlet.patch |   16 ++++++++++++++++
 tools/install_venv.py         |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

commit e42fe8565cc44eee77df8cba5634ec1760ccc27e
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Nov 1 15:46:24 2011 -0400

    Apply M2Crypto fix for all Fedora-based distributions.
    
    Broaden Fedora check to include RHEL and others.
    
    Fixes bug 884885
    
    Change-Id: Ifab330a7f866add91d01c8cf2470e5a12fb4cd4d

 tools/install_venv.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 9088c89a54222d187978dd1576651c5959fa98a9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Nov 9 14:39:47 2011 -0500

    Fix failing libvirt test (bug 888250)
    
    Change-Id: Id131674f81b9f2016c45841f37d0688b5a189cd7

 nova/tests/test_libvirt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8df06342ca5c2336976ec3b50f39706ae409023
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Wed Nov 9 11:02:48 2011 -0800

    Spelling fixes in nova/api comments
    
    Change-Id: Iaaf2f6b191110ff76f00f4d2ac1bcd9fa33110af

 nova/api/direct.py            |    8 ++++----
 nova/api/ec2/__init__.py      |    2 +-
 nova/api/ec2/ec2utils.py      |    4 ++--
 nova/api/manager.py           |    2 +-
 nova/api/openstack/common.py  |    2 +-
 nova/api/openstack/limits.py  |    2 +-
 nova/api/openstack/servers.py |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

commit 2ab61322583767f02cd87d7f60bb71d6ce035bea
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Nov 2 14:11:00 2011 -0500

    Get MAC addresses from Melange.
    
    Add support for obtaining MAC addresses for VIFs from Melange.  Adds the
    --use_melange_mac_generation flag to enable this support.
    
    Change-Id: I00b3622531f244bf5f15910752a1e444b821e91a

 .mailmap                                   |    1 +
 nova/network/quantum/manager.py            |   38 ++++++++-
 nova/network/quantum/melange_connection.py |   11 +++
 nova/network/quantum/melange_ipam_lib.py   |    6 ++
 nova/tests/test_quantum.py                 |  116 ++++++++++++++++++++--------
 5 files changed, 138 insertions(+), 34 deletions(-)

commit 98d30423b31894265342693d618820425382add3
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Tue Nov 8 20:23:14 2011 -0600

    Refactor logging_error into utils
    
    update: pep8, and fixing log output.
    update2: more pep8, I'm looking at you vim
    update3: more formating
    update4: mailmap
    update5: more pep8
    
    Change-Id: I38617e14260e65ed5cb81b3554479d3720850aae

 .mailmap                |    1 +
 nova/compute/manager.py |   20 +++++++++-----------
 nova/utils.py           |   13 +++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)

commit af2acabe35f91d0bdd2b2c921f23d6828e480a20
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Nov 9 10:06:52 2011 -0500

    Converting rebuild to use instance objects.
    
    Related to blueprint internal-uuids
    
    Change-Id: If8a708a78ab017a4d807bf14542b3ab093d2e026

 nova/api/openstack/servers.py |    7 ++++---
 nova/compute/api.py           |    7 +++----
 nova/tests/test_compute.py    |   16 ++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

commit 29398355ede0d8fb08c58bbf2adf0441b48c6855
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Nov 9 12:24:00 2011 -0500

    Converting resize to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I94b4383b55ac72bccae1dd375d82f5e7c3f8cebf

 nova/api/openstack/servers.py |   11 +++++++---
 nova/compute/api.py           |   38 +++++++++++++++-------------------
 nova/tests/test_compute.py    |   45 +++++++++++++++++++++++++++++++++++++----
 3 files changed, 65 insertions(+), 29 deletions(-)

commit 00861098508fc675ba2d90a5c34fec152ddf5c3d
Merge: 96cf15c 8977826
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 17:18:21 2011 +0000

    Merge "Converting reboot to use instance objects"

commit 96cf15ce782c4362daea4b178f418738846bb074
Merge: 67c559a cb05f78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 16:21:26 2011 +0000

    Merge "Reducing the number of compute calls to Glance"

commit 67c559a3f5eb80ecbb37e95c1e8327017c7d1d28
Merge: 7a0487d 0f7f91c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 15:06:09 2011 +0000

    Merge "Bug #884018: "stack help" prints stacktrace if it cannot connect to the server"

commit 7a0487d0006bb5c8a903d3e2481ef06aebfc47ed
Merge: 93c0240 2463d9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 14:58:43 2011 +0000

    Merge "Remove nova dependency on vconfig on Linux."

commit 8977826c949fb6d3e1de6aa4965122d01436ae5c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Nov 8 14:32:44 2011 -0500

    Converting reboot to use instance objects
    
    Related to blueprint internal-uuids
    
    Change-Id: I50ebfdfd9c7193e732a3e2c2e1b1b3b32eb1bb57

 nova/api/ec2/cloud.py                           |    5 ++++-
 nova/api/openstack/servers.py                   |   14 ++++++++++++--
 nova/compute/api.py                             |    6 +++---
 nova/scheduler/api.py                           |    6 ++++++
 nova/tests/api/ec2/test_cloud.py                |   13 +++++++++++++
 nova/tests/api/openstack/test_server_actions.py |   21 +++++++++++++++++----
 nova/tests/test_compute.py                      |   12 ++++++------
 7 files changed, 61 insertions(+), 16 deletions(-)

commit cb05f783d0c26063b2ce069c7f2a8fd794f4fa0e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Nov 4 12:44:30 2011 -0400

    Reducing the number of compute calls to Glance
    
    Fixes bug 886224
    
    Change-Id: Ibd270d24eb68cc2503fee933a2154125995d352d

 nova/compute/manager.py         |   33 +++++++++++++++++++++------------
 nova/tests/glance/stubs.py      |    9 +++++++--
 nova/tests/test_vmwareapi.py    |    9 ++++++++-
 nova/tests/test_xenapi.py       |   25 +++++++++++++++++--------
 nova/virt/driver.py             |    9 +++++++--
 nova/virt/fake.py               |    2 +-
 nova/virt/hyperv.py             |    2 +-
 nova/virt/libvirt/connection.py |    2 +-
 nova/virt/vmwareapi/vmops.py    |    2 +-
 nova/virt/vmwareapi_conn.py     |    4 ++--
 nova/virt/xenapi/vm_utils.py    |   23 ++++++-----------------
 nova/virt/xenapi/vmops.py       |   19 ++++++++++---------
 nova/virt/xenapi_conn.py        |    8 ++++----
 13 files changed, 86 insertions(+), 61 deletions(-)

commit 93c02408754e7cec274c6d2580bc04f5e333eade
Merge: 867a400 19a1911
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 05:13:37 2011 +0000

    Merge "Define faults.Fault.__str__."

commit 867a400f3759e0954433b5137b8d35ad9e29a88a
Merge: 247a790 923c3c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 05:06:21 2011 +0000

    Merge "Added some documentation to db.api module docstring."

commit 247a79012201a774c27e8a531a1eb2411a790790
Merge: d59be49 b7b6e20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 01:09:08 2011 +0000

    Merge "Move tests for extensions to contrib directory"

commit d59be49f2488e69696dbfdd276862b051526b3db
Merge: ffb9f2e 6a2c707
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 01:01:34 2011 +0000

    Merge "Remove duplicate method"

commit ffb9f2ed3b3fabf30146b4894a05083a089b834a
Merge: a0c8669 8498872
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 00:54:42 2011 +0000

    Merge "Remove debugging print"

commit a0c86692030a322114f999a703d0f610d3bf847c
Merge: b5602a2 608110f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 00:47:09 2011 +0000

    Merge "Remove duplicate method (2)"

commit b5602a2ab6e4856bf6358889fc24eb102fc64ab4
Merge: 238cf1c 273a0af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 23:42:23 2011 +0000

    Merge "Skip libvirt tests when libvirt not present."

commit 238cf1c6d91d2f72f7abd1f10e0b1041b0b837f3
Merge: 150a5c1 c3c53ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 23:35:29 2011 +0000

    Merge "Correcting libvirt tests that were failing"

commit 608110f996032375f1521dba7f5453d26f2fd977
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 8 23:00:45 2011 +0000

    Remove duplicate method (2)
    
    This method is duplicated directly beneath it. Mismerge?
    
    Change-Id: Ic6b8e06005f78d8009c8d1f897f253c4084a758d

 nova/api/openstack/servers.py |    6 ------
 1 file changed, 6 deletions(-)

commit b7b6e20c249422a03e0d880eceddb81c86bf9a23
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 8 22:57:18 2011 +0000

    Move tests for extensions to contrib directory
    
    Change-Id: Id4cf8f04d69c24913e71c1150547deb426512a10

 .../openstack/contrib/test_flavors_extra_specs.py  |  171 ++++++++++++++++++++
 .../api/openstack/contrib/test_volume_types.py     |  165 +++++++++++++++++++
 .../contrib/test_volume_types_extra_specs.py       |  169 +++++++++++++++++++
 .../api/openstack/test_flavors_extra_specs.py      |  171 --------------------
 nova/tests/api/openstack/test_volume_types.py      |  165 -------------------
 .../api/openstack/test_volume_types_extra_specs.py |  169 -------------------
 6 files changed, 505 insertions(+), 505 deletions(-)

commit 150a5c16d689b4db4632a0bc6e0220cdf51b3db4
Merge: 192b8fd c04b431
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:54:11 2011 +0000

    Merge "Move failed instances to error state"

commit 6a2c7072c6e2e022b6893a9c557faaa68b6cb08b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 8 22:50:30 2011 +0000

    Remove duplicate method
    
    The real implementation of _get_view_builder() is at the bottom of the
    class
    
    Change-Id: I7b1fb4acb51de00b542093ae54d42b1b73083063

 nova/api/openstack/flavors.py |    3 ---
 1 file changed, 3 deletions(-)

commit 8498872312f96496c0754bfe5060d288fd15721f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 8 22:46:13 2011 +0000

    Remove debugging print
    
    Change-Id: Idd036099c59d84cdc977dc0f8e76475df31174dd

 nova/api/openstack/views/flavors.py |    1 -
 1 file changed, 1 deletion(-)

commit 192b8fd3c9ea226a58f469a5896b75bf48c29d38
Merge: 4a7b5d4 38172d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:44:54 2011 +0000

    Merge "Add DHCP support to the QuantumManager and break apart dhcp/gateway"

commit 4a7b5d44b0d3a7264ca038e9a1271f0247049e9b
Merge: f89f27b eef2dfa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:36:13 2011 +0000

    Merge "Set task state to UPDATING_PASSWORD when needed"

commit f89f27b184eb950f4487002a821b2e9c0f8315c7
Merge: bc50195 c32258c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:29:04 2011 +0000

    Merge "Change network delete to delete by uuid or cidr"

commit bc50195e129a2070d98f66732ca6bd5dbf666b2c
Merge: 25ac04b 0d36d2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:20:41 2011 +0000

    Merge "Speed up tests a further 35 seconds"

commit 25ac04b9b8c3782212537758bdf9ac706bc166f7
Merge: d672e0a 0973f55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 22:06:08 2011 +0000

    Merge "Adds extended status information via the Admin API to the servers calls"

commit d672e0a7733140b59ff1f761fd1aa017eba03cfa
Merge: 15076d3 9b82062
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 21:43:13 2011 +0000

    Merge "changes logging reference in zone_manager.py"

commit 15076d36df0878205ec6b1a6de67d1660b054f09
Merge: f60ad21 9a32891
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 21:22:54 2011 +0000

    Merge "Switch glance XenAPI plugin to use urllib2."

commit 0973f558561173bdc84d7f4f8eb33da9fedafac2
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Tue Nov 8 14:12:46 2011 -0600

    Adds extended status information via the Admin API to the servers calls
    
    Change-Id: I294e64e878f1f6ebf33b83198abb2cdd8b6c5185

 nova/api/openstack/contrib/extended_status.py      |  110 ++++++++++++++++++++
 nova/api/openstack/wsgi.py                         |    2 +-
 .../api/openstack/contrib/test_extendedstatus.py   |  109 +++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py        |    1 +
 4 files changed, 221 insertions(+), 1 deletion(-)

commit f60ad21da95395eeca2697a588ca312fc961af18
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 8 13:17:53 2011 -0600

    Wait until the instance is booted before setting VCPU_params.
    
    Fixes bug 886189.
    
    Change-Id: Ief0af1ef60aef3debce0a1e4a1ad4819c927e048

 nova/virt/xenapi/vm_utils.py |    3 ---
 nova/virt/xenapi/vmops.py    |    9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

commit 9b82062c315b280e6cb7804a66c19b12f7b7a74c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Nov 8 12:05:41 2011 -0500

    changes logging reference in zone_manager.py
    
    Fixes Bug 886281
    
    Change-Id: Ib0312ecc2a0026a08d37a382144d37d745dea6ce

 nova/scheduler/zone_manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1c389d0bd8e9c9f21f760f9b8f5b79baffd38d39
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Nov 1 16:35:08 2011 -0700

    Exception cleanup in scheduler
    
    Fixes NoValidHost and willNotSchedule by moving them to exception.py
    Removed unneeded  imports
    Change-Id: Ib9bb4b36d5e4c00667bd0b2d73137ba9eac5b3b0

 nova/api/openstack/contrib/admin_actions.py        |    2 --
 nova/api/openstack/contrib/deferred_delete.py      |    4 ---
 nova/api/openstack/contrib/diskconfig.py           |    3 --
 nova/api/openstack/views/limits.py                 |    1 -
 nova/exception.py                                  |    8 ++++++
 nova/scheduler/chance.py                           |    6 ++--
 nova/scheduler/distributed_scheduler.py            |    4 +--
 nova/scheduler/driver.py                           |   12 +-------
 nova/scheduler/simple.py                           |   30 ++++++++++----------
 nova/scheduler/vsa.py                              |    5 ++--
 nova/tests/scheduler/test_distributed_scheduler.py |    5 ++--
 nova/tests/scheduler/test_scheduler.py             |   16 +++++------
 nova/tests/scheduler/test_vsa_scheduler.py         |   13 ++++-----
 nova/tests/test_compute_utils.py                   |    4 ---
 14 files changed, 48 insertions(+), 65 deletions(-)

commit 2826e862d73d1b2cbe80da3385075cd6c33f511d
Merge: 00d4a56 b08bd96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 16:59:19 2011 +0000

    Merge "Optional --no-site-packages in venv"

commit 00d4a56c0407459b7edea5e293c7e29cc296a6ae
Merge: 53ea6a8 91c39ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 16:51:28 2011 +0000

    Merge "Fixing create_vbd call per VolumeHelper refactoring"

commit 91c39baedcbcacc90ab87fad602adb7c20de2de0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Nov 7 23:10:12 2011 +0000

    Fixing create_vbd call per VolumeHelper refactoring
    
    Change-Id: I6a34984104b5c62e9b494beef521e447104ec408

 nova/tests/test_network.py   |    2 +-
 nova/virt/xenapi/vm_utils.py |   21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

commit 9a32891107dd8c8fb3ab0240a5f9d5f875953c62
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Nov 4 12:17:08 2011 -0400

    Switch glance XenAPI plugin to use urllib2.
    
    Currently the plugin uses httplib which does not handle redirects
    natively. XenAPI plugins require Python 2.4+ so using httplib2
    as far as I know is not a possibility.
    
    (Patch Set 2) Oops, forgot to PEP8 before putting up for review.
    (Patch Set 3) Updated logging to be more verbose as per Waldon
    
    Change-Id: I189093fe26dfee30b5b8b3c0f2c21a35fbfbc05e

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   48 +++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

commit 53ea6a8e09c20e520f8cabc9c686b2363efe45cc
Merge: ab633ec 77e1684
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 16:00:46 2011 +0000

    Merge "Removing duplicate kernel/ramdisk check in OSAPI"

commit ab633ec05494a8bde82a4a6d90ab057f1a4f9bbd
Merge: d6f9b26 2915d05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 15:53:18 2011 +0000

    Merge "Remove unnecessary image list in OSAPI"

commit d6f9b26ca3ff01ecef45e61e8fd473106dec3d86
Merge: d816540 d5d2df5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 15:30:25 2011 +0000

    Merge "Adding task_states.REBOOTING_HARD"

commit d8165400ac5ccb61142c12af1346cf41edc31cc4
Merge: 813794e 0cf3789
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 15:12:06 2011 +0000

    Merge "Added code to libvirt backend to report state info."

commit 813794ed46bf5901ab0afdcdd6122bfa04ac1701
Author: garyk <garyk@radware.com>
Date:   Thu Nov 3 10:59:51 2011 +0200

    Blueprint lasterror
    
    Add in a log report to nova-manage
    
    Usages:
    
    Get the last errors in the nova logs
        nova-manage logs errors
    
    Get the last x nova messages in the syslog. The default is 10
        nova-manage logs syslog <x>
    
    Change-Id: Id5d3a546051e25175b6523711f437618d07c3f19

 Authors         |    1 +
 bin/nova-manage |   44 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

commit 2d434e13897602d2f770f8bc17ae7cd14b8c3178
Merge: f98121e e6b8c4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 14:40:32 2011 +0000

    Merge "Add auto-reloading JSON config file support to scheduler."

commit f98121e1a1447e963a7afa883d5e9e8e13e6b0f2
Merge: c1b5b3f e4c7459
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 14:25:36 2011 +0000

    Merge "Fix for launchpad bug #882568"

commit c1b5b3f6ea28ee6dc332b2516682445212eff29a
Merge: 3f8fad9 e55f2e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 14:18:08 2011 +0000

    Merge "Removed autogenerated API .rst files."

commit 3f8fad9653b9e5530e8d87f7cab95ed844a2f26a
Merge: 89a200d affb582
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 14:10:35 2011 +0000

    Merge "Clean up docstrings for faults.Fault and it's usage"

commit 89a200d9f2828316572f6811f177df8f82cfbd6f
Merge: 233dd3c 8700a97
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 8 00:20:35 2011 +0000

    Merge "Change floating-snat to float-snat"

commit c04b431cd63f4d934f40dd1f62a9107ae6dfde90
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Nov 3 15:05:30 2011 -0500

    Move failed instances to error state
    
    On instance creation there is the possibility of
    an instance raising. This would not cause the
    instance to be moved to the error state. This
    patch fixes that. lp885323
    
    update 1: fixing exception handling
    update 2: preserving the individual messages
    update 3: rebase on master & fix spacing
    
    Change-Id: I7584b527e408c08014f1b6a8abda343f1e2aa3b8

 nova/compute/manager.py    |   42 ++++++++++++++++++++++++++---------------
 nova/tests/test_compute.py |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 15 deletions(-)

commit d5d2df5718fae936d8c3f852be2fdc81b7789870
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Nov 7 17:20:16 2011 -0500

    Adding task_states.REBOOTING_HARD
    
    Fixes bug 884906
    
    Change-Id: I546d0ddd7afee7596a4c47053dae3cb3ba18fdb2

 nova/api/openstack/common.py             |    1 +
 nova/compute/api.py                      |    4 ++-
 nova/compute/manager.py                  |    3 +-
 nova/compute/task_states.py              |    1 +
 nova/tests/api/openstack/test_servers.py |    5 +++
 nova/tests/test_compute.py               |   52 ++++++++++++++++++++++++++++--
 6 files changed, 61 insertions(+), 5 deletions(-)

commit eef2dfa580c1a675efc2af46830547befe89dd0f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Nov 7 15:47:09 2011 -0500

    Set task state to UPDATING_PASSWORD when needed
    
    Fixes bug 885389
    
    Change-Id: Ia4b91fc8ccc55cac4f484f64c73398e803480eac

 nova/compute/api.py        |    4 ++++
 nova/compute/manager.py    |   12 +++++++++++-
 nova/tests/test_compute.py |   29 +++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

commit affb5821342b91f4371fe79e82a6a28a54d97bc7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Nov 7 18:05:35 2011 +0000

    Clean up docstrings for faults.Fault and it's usage
    
    Many extensions wrapped exceptions manually with faults.Fault and ther
    continues to be some confusion if it's necessary. This patch clears up
    what faults.Fault does as well as documents that wsgi.Resource
    automatically wraps webob.exc.HTTPException
    
    Change-Id: Ieed63b8641499bc7449bae2684d5f63e5839d369

 nova/api/openstack/faults.py |    2 +-
 nova/api/openstack/wsgi.py   |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 233dd3c73d1d80c26bff2ae8e947aeb336b1e044
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Nov 7 16:41:20 2011 +0000

    Fix typo in docstring
    
    Change-Id: I0bc998d134f9c5fed23380f6b24650700f6cede5

 nova/api/openstack/extensions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d90aaaafbc11c8e951ccde27cac11f70ae65c9b2
Merge: 67a1c25 dcb8678
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 5 21:28:50 2011 +0000

    Merge "Fix to a documentation generation script."

commit 38172d55876e78ff3c4326368de9ea9ddb99e76b
Author: Brad Hall <brad@nicira.com>
Date:   Fri Nov 4 20:11:53 2011 -0700

    Add DHCP support to the QuantumManager and break apart dhcp/gateway
    
    This introduces a new flag "quantum_use_dhcp=<boolean>" which indicates whether
    or not to enable dhcp for all of the networks.  If it is set then we start
    dnsmasq (and provide it with the IP/MACs from Melange) similar to how this was
    done in linux_net before.
    
    Prior to this if you enabled dhcp then you would also get a gateway device..
    some people may not want that so we now require that you specify the gateway
    when creating the network in order to end up with a device that will act as a
    gateway.  If you're using Melange IPAM and you don't specify the gateway you
    still end up with one because it doesn't allow you to not have one.  This lays
    the groundwork for the option of not having one in the future, at least :)
    
    Also, fix quantum/melange ipam interaction
    
    We now query for the subnets by net_id/vif_id instead of searching through all
    the blocks to find the right one.  Both of the allocate and deallocate for
    instance calls are now using the vif_id -> network_id mapping instead of
    searching the quantum networks.  get_port_by_attachment was also changed to
    take a net_id so that we don't have to search through all of the quantum
    networks to find the corresponding port.
    
    Change-Id: I6a84da35237b6c5f5cdee91ada92642103439a97

 bin/nova-dhcpbridge                        |    3 +-
 bin/nova-manage                            |    9 +-
 nova/network/linux_net.py                  |   63 +++++--
 nova/network/manager.py                    |    9 +-
 nova/network/quantum/client.py             |    2 -
 nova/network/quantum/manager.py            |  255 ++++++++++++++++++++++++----
 nova/network/quantum/melange_connection.py |   18 +-
 nova/network/quantum/melange_ipam_lib.py   |   94 ++++++----
 nova/network/quantum/nova_ipam_lib.py      |   34 +++-
 nova/network/quantum/quantum_connection.py |   31 ++--
 nova/tests/__init__.py                     |    1 +
 nova/tests/test_network.py                 |   35 ++--
 nova/tests/test_nova_manage.py             |   17 +-
 nova/tests/test_quantum.py                 |   49 +++++-
 14 files changed, 482 insertions(+), 138 deletions(-)

commit c32258c77d365534ac7b70bccbadb60a6ea4be1e
Author: Brad Hall <brad@nicira.com>
Date:   Sun Oct 2 08:20:50 2011 -0700

    Change network delete to delete by uuid or cidr
    
    With melange it will be possible to have overlapping cidrs so it would be
    better to specify the uuid of the network to delete.
    
    Change-Id: I6781225d587952cbab3387cd40164d8ac77c58d6

 bin/nova-manage                       |   20 ++++++++++++++++----
 nova/network/manager.py               |   11 ++++++++---
 nova/network/quantum/manager.py       |   23 ++++++++++++++++++-----
 nova/network/quantum/nova_ipam_lib.py |    3 ++-
 nova/tests/test_nova_manage.py        |   13 +++++++++++++
 nova/tests/test_quantum.py            |    6 +++++-
 6 files changed, 62 insertions(+), 14 deletions(-)

commit 01150b5d0d482a83a1065c2a6d62f4963c9f838d
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Nov 4 14:00:37 2011 -0700

    Bug #886353: Faults raised by OpenStack API Resource handlers fail to be reported properly
    
    In Resource.__call__, catch any faults.Fault that are thrown by the request
    handler, and make those the action_result.  This means that the Fault doesn't
    fall into the exception handler below (faults.Fault is a subclass of
    webob.exc.HTTPException) and so we don't attempt to wrap a Fault in a Fault.
    
    Change-Id: Ica31723ddd621332ec4be75db0d675bc98905e43

 nova/api/openstack/wsgi.py |    3 +++
 1 file changed, 3 insertions(+)

commit 19a1911b2b1687025f774bedb49236c31a8e1874
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Nov 4 13:57:04 2011 -0700

    Define faults.Fault.__str__.
    
    Define faults.Fault.__str__ to pass through to the wrapped exception.
    This is useful for log messages.
    
    Change-Id: Ie566fb67fc6bd29c2ef3b3aefd263507d48e8cfc

 nova/api/openstack/faults.py |    3 +++
 1 file changed, 3 insertions(+)

commit 0d36d2bf9eba28123c172fd24780f0ebe95db10a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 1 14:47:51 2011 +0000

    Speed up tests a further 35 seconds
    
    This changes more OSAPI tests to using their Controller directly, bypassing
    the slow wsgi setup process.
    
    Change-Id: Ic014c32786cb10c541f7d367573adb7a069c1a88

 nova/api/openstack/contrib/quotas.py               |    4 +-
 .../api/openstack/contrib/test_floating_ips.py     |  103 ++++-----
 nova/tests/api/openstack/contrib/test_quotas.py    |   77 +++----
 nova/tests/api/openstack/test_consoles.py          |  171 +++++++--------
 .../api/openstack/test_flavors_extra_specs.py      |  116 +++++-----
 nova/tests/api/openstack/test_users.py             |  157 ++++----------
 nova/tests/api/openstack/test_volume_types.py      |   74 +++----
 .../api/openstack/test_volume_types_extra_specs.py |  110 +++++-----
 nova/tests/api/openstack/test_zones.py             |  227 +++++++-------------
 9 files changed, 407 insertions(+), 632 deletions(-)

commit 77e1684332cfc6e2cad1f1fc93ab5fa6caf231b9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Nov 4 11:33:00 2011 -0400

    Removing duplicate kernel/ramdisk check in OSAPI
    
    Fixes bug 886169
    
    Change-Id: Id68de3284367e789f1295b61fe6bf9c400470ba8

 nova/api/openstack/servers.py                      |   52 +---------------
 .../api/openstack/contrib/test_createserverext.py  |    5 --
 nova/tests/api/openstack/test_servers.py           |   62 --------------------
 3 files changed, 1 insertion(+), 118 deletions(-)

commit 2915d05d15f5b56f167abdb0577e74460046ba48
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Nov 4 10:25:07 2011 -0400

    Remove unnecessary image list in OSAPI
    
    Fixes bug 886139
    
    Change-Id: I152b0e29a5742b7fc0fb25fc64f5bfb25f351b56

 nova/api/openstack/servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 67a1c257f9e4be774da5acf2c1b703d196e0a2cf
Merge: c978bca a032825
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 4 14:31:14 2011 +0000

    Merge "Set nova-manage to executable Fixes LP885778"

commit c978bcab8481b3d0ec33a88c3199a58022d13a4b
Merge: 36f6da4 4615210
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 4 14:21:56 2011 +0000

    Merge "Log the exception when we get one."

commit e6b8c4d16ee58d2731ba1072ff56f4fff6787e84
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Nov 2 07:41:12 2011 -0700

    Add auto-reloading JSON config file support to scheduler.
    
    This branch adds the ability to define a local JSON file that will hold
    configuration information that the scheduler can use.
    
    This dict will be passed into the filter and weighing functions so that
    Operations can tweak the scheduler without having to bring down the scheduler
    service.
    
    Currently the polling time on the file is hardcoded at 5 minutes, but certainly
    this could be made into a flag.
    
    Next update will be to remove the host_filter and weighing_functions flags
    and fix the scheduler to get these values from the config file.
    
    Change-Id: Ia2487e933483761276058689fad84564d96a451e

 nova/scheduler/distributed_scheduler.py            |   70 ++++++++--
 nova/scheduler/filters/abstract_filter.py          |    2 +-
 nova/scheduler/filters/all_hosts_filter.py         |    2 +-
 nova/scheduler/filters/instance_type_filter.py     |    2 +-
 nova/scheduler/filters/json_filter.py              |    2 +-
 nova/scheduler/least_cost.py                       |   86 +-----------
 nova/scheduler/scheduler_options.py                |   98 ++++++++++++++
 nova/tests/scheduler/test_distributed_scheduler.py |   16 ++-
 nova/tests/scheduler/test_host_filter.py           |   36 ++---
 nova/tests/scheduler/test_least_cost.py            |   50 ++-----
 nova/tests/scheduler/test_scheduler_options.py     |  138 ++++++++++++++++++++
 11 files changed, 350 insertions(+), 152 deletions(-)

commit 8700a97b701136e13c7ef959f13c89a3b7462fdb
Author: Brad Hall <brad@nicira.com>
Date:   Sun Oct 2 07:13:53 2011 -0700

    Change floating-snat to float-snat
    
    With iptables v1.4.10 I'm running into an issue with the chain length of the
    "nova-dhcpbridge-floating-snat" table (iptables it complaining that the name
    is too long; 28 chars max).  This shortens the name of that table.
    
    Change-Id: I00b1003aaa0b3771c29d6459d07023a8caa47706

 nova/network/linux_net.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 36f6da47b08680de13fffa13015a4ae2902d2e63
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Nov 3 19:55:00 2011 -0700

    Allows non-admin users to use simple scheduler
    
    Fixes bug 885955
    
    Change-Id: I88be04cbc55e272162328a33656fc5d6e1831c32

 nova/scheduler/simple.py               |   16 +++++++++-------
 nova/tests/scheduler/test_scheduler.py |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

commit 273a0af342604a77f96c7d6c8a8011dbad33ecda
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Nov 3 22:27:27 2011 -0400

    Skip libvirt tests when libvirt not present.
    
    Currently the libvirt tests don't make use of the test.skip_if decorator.
    This should make it more obvious when the tests are not getting run.
    
    We recently ran into an issue where libvirt tests were 'passing' in Jenkins
    but they were actually not getting run, this should make things more clear.
    
    Change-Id: Ied18d2403fc9accd6c6f739b08c9fe7cc3624bb2

 nova/tests/test_libvirt.py |  100 +++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 70 deletions(-)

commit c3c53ba83abe3a23050eb3a2ffd665f6e24ab5aa
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 3 10:55:28 2011 -0400

    Correcting libvirt tests that were failing
    
    Fixes bug 885037. With this merge prop we need to get libvirt tests
    running in Jenkins.
    
    Change-Id: I48e69f8ef3b70036f5d161c85b6c423344a695a2

 nova/tests/test_libvirt.py |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 7c5fa147eaf2133485255b0558afd4cd6ce42bc3
Merge: 15b2e71 e45029c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 4 01:54:21 2011 +0000

    Merge "Don't update database before resize"

commit e4c74596bfaf1cee1a6f8cbb0d97aa067d9a4317
Author: Brad Hall <brad@nicira.com>
Date:   Thu Oct 27 17:45:23 2011 -0700

    Fix for launchpad bug #882568
    
    Use tunctl to create the tap device if we are on a system where the ip command
    is too old (and doesn't have support for tuntap).
    
    Change-Id: I9e22010e4c7dd2671267de6d0e7a7bc9ae76a854

 nova/virt/libvirt/vif.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 15b2e713d50d9c0ef1adbf769f598b030bb0c29a
Merge: 03b366d a6a7e93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 20:32:31 2011 +0000

    Merge "fix bug 816630"

commit 03b366d434eb23f15391801099e7e307b17e979f
Merge: fec3c19 ca6295e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 20:25:06 2011 +0000

    Merge "Gracefully handle Xen resize failure"

commit fec3c19c492ee16096fdcd369b0adee6ddf43fb8
Merge: 907f219 4cda8f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 19:55:18 2011 +0000

    Merge "Fixing immediate delete after boot on Libvirt"

commit ca6295e5dd238a88b731c3bf3e337007d12b6c1c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 3 13:40:56 2011 -0400

    Gracefully handle Xen resize failure
    
    Fixes bug 885723
    
    Change-Id: I8cd04a88f809f49141dc6aa5be7217811e0141e3

 nova/compute/manager.py    |   12 ++++++++++--
 nova/tests/test_compute.py |   24 ++++++++++++++++++++++++
 nova/tests/test_xenapi.py  |   13 +++++++++++++
 nova/virt/xenapi/vmops.py  |   12 +++++++++---
 4 files changed, 56 insertions(+), 5 deletions(-)

commit 907f219b6ad689707668aceb4081c461751b2bb5
Merge: 005db2d ecd4e3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 19:01:55 2011 +0000

    Merge "Adds documentation for Xen Storage Manager"

commit e45029ced19a3d80e006f917f0111c69f976cda1
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Thu Nov 3 18:44:51 2011 +0000

    Don't update database before resize
    
    Fixes bug lp885815 by ensuring the scheduler doesn't update the database with destination host.  Compute manager now updates upon completion of resize.
    
    Change-Id: I3f9ac664c8807e8523802e2485d316a731190764

 nova/compute/api.py     |    1 +
 nova/compute/manager.py |    1 +
 2 files changed, 2 insertions(+)

commit a6a7e936fe8fb55471dc1ecc41d8644398e45ef7
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Tue Nov 1 12:22:13 2011 -0700

    fix bug 816630
    
    Off by one error fixed
    With test case
    
    Change-Id: I5060c0a59949d69d6f859a01e7cf5fa8e0227d8a

 nova/network/manager.py    |    2 +-
 nova/tests/test_network.py |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

commit 005db2d7d494115c05b68875dcf222a68abc0957
Merge: 05370d0 e240373
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 17:28:43 2011 +0000

    Merge "Log original dropped exception when a new exception occurs"

commit 05370d0aa85d0ecb7d51098ca0c42d96777e3a20
Merge: ee515c5 028f9ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 17:13:57 2011 +0000

    Merge "exception.KeypairNotFound usage correction"

commit a032825eb4f04028eb7352d8d1ea3e7aeabb7251
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Nov 3 12:07:43 2011 -0500

    Set nova-manage to executable
    Fixes LP885778
    
    Change-Id: I0d78d91e4e93183848aa287007caa7027a751e65

 0 files changed

commit ee515c588ca36da1369ee31c305745ade2751598
Merge: 82460d4 826888d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 15:26:13 2011 +0000

    Merge "Bug #884534: nova-ajax-console-proxy crashes on shutdown"

commit 82460d4a794bbde75c22f08277e4c6af1f6eb001
Merge: bed85c1 c095b70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 14:45:11 2011 +0000

    Merge "Enable admin access to EC2 API server"

commit 4cda8f70686da409eaec962abc9138607686eed7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Nov 1 15:10:45 2011 -0400

    Fixing immediate delete after boot on Libvirt
    
    Addresses bug 884858
    
    Change-Id: Ice05193fce7963dd9742b072cdb4b11882032abe

 nova/tests/test_libvirt.py      |   12 ++++++++++++
 nova/virt/libvirt/connection.py |   24 ++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

commit 028f9ba81a857d0285bf68d789eae0a65772e39f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Nov 3 09:22:35 2011 -0400

    exception.KeypairNotFound usage correction
    
    Fixes bug 885462
    
    Change-Id: I9f0df87a37395853e052b8300af777607ecbc5de

 nova/exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bed85c136892ac0089393aa76c1f55d551cdb457
Merge: 286e39e fd3c414
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 04:09:48 2011 +0000

    Merge "Moves a-zone scheduling into simple scheduler"

commit 286e39ee0836dc5b0ea461446aa838ca878c0ca4
Merge: 4fb1eda 6932d6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 03:42:26 2011 +0000

    Merge "Speed up tests yet another 45 seconds"

commit 4fb1eda581606d804be8da9e8045d7641725e33c
Merge: e3ac202 a807c57
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 03:07:56 2011 +0000

    Merge "Bug 884863: nova logs everything to syslog twice"

commit e3ac202c8528a439cf95224d791600d7f64b5557
Merge: 7cca5a8 931a0e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 3 02:59:42 2011 +0000

    Merge "Xen Storage Manager Volume Driver"

commit 7cca5a8ff7f559da60c03405f69f78a42c763b61
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 21 11:18:11 2011 -0700

    Add local storage of context for logging
    
     * adds nova/local.py:store for storing greenthread local data
     * saves a weak reference to the last context object created
     * uses the last context object if it exists for logging
     * Fixes bug 879582
    
    Cc: stable-maintainers
    Change-Id: Ic373556ce197f2e8e7d23c807a65b12111db96eb

 nova/context.py |    3 +++
 nova/local.py   |   37 +++++++++++++++++++++++++++++++++++++
 nova/log.py     |    4 ++++
 3 files changed, 44 insertions(+)

commit 39c261e683dd8deff157462b7a320c329e3a22f5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Nov 2 14:16:58 2011 -0700

    Reserve memory/disk for dom0/host OS
    
    Only when scheduling with distributed scheduler for now.
    
    Adds flags:
    
    flags.DEFINE_integer('reserved_host_disk_mb', 0,
            'Amount of disk in MB to reserve for host/dom0')
    flags.DEFINE_integer('reserved_host_memory_mb', 512,
            'Amount of memory in MB to reserve for host/dom0')
    
    Change-Id: Ib9b8a4deca241db399a8541ab21697ab08e29dd6

 nova/scheduler/zone_manager.py           |   28 ++++++++++++++++++++--------
 nova/tests/scheduler/test_host_filter.py |   17 ++++++++++++++++-
 nova/tests/scheduler/test_least_cost.py  |    1 +
 3 files changed, 37 insertions(+), 9 deletions(-)

commit e1b4b282d0e41f97cf1beeee2f213e7cf39fc951
Merge: 93109e6 a506c89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 2 21:48:42 2011 +0000

    Merge "Use fat32 for Windows, linux-swap for Linux swap partitions."

commit 6932d6b94fb6c131c8cff76e28a7d8af342ab827
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 1 20:20:28 2011 +0000

    Speed up tests yet another 45 seconds
    
    This changes the security groups extension tests to use the Controllers
    directly, bypassing the slow wsgi setup process. This is part 2 of this
    patch and contains the majority of the changes. The code required more
    changes than the other test suite speedups because of how the previous
    code was written and as a result, the diff is kind of long. As a bonus,
    there is a net removal of almost 150 lines.
    
    Change-Id: I7893cf16092ce58860607fd4ab2df10550fe3270

 .../api/openstack/contrib/test_security_groups.py  | 1020 +++++++++-----------
 1 file changed, 436 insertions(+), 584 deletions(-)

commit 93109e6929dd8e9a4cb5b8d0674fb6d1c4a968c4
Merge: 040139e 743b36d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 2 19:44:58 2011 +0000

    Merge "Updated rst docs to include threading model."

commit 040139ec338ea34e2d3bd526d8072cb3a8335650
Merge: 54dc193 0571385
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 2 19:36:39 2011 +0000

    Merge "APIs should not wait on scheduler for builds in single zone deployment"

commit 54dc193e413a6c258e390bc3bcca714aa5015efe
Merge: 830760b e79b633
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 2 19:28:17 2011 +0000

    Merge changes Ib2849f64,I54e61637
    
    * changes:
      Drop extra XML tests and remove _json suffix from names
      Fix empty group_id to be considered invalid

commit 057138540df2b067bd3cd2857cceb97d1ecd86d0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Nov 2 10:58:45 2011 -0700

    APIs should not wait on scheduler for builds in single zone deployment
    
    Fixes bug 885349
    
    We can short circuit waiting on the scheduler if we're in a single zone
    deployment and only building 1 instance.  This patch checks for that
    case and creates the instance DB entry directly in the API (in
    compute/api) without the call to the scheduler.
    
    Change-Id: I98b27156167f057d11fbc56a9ff99d4e2ec423d3

 nova/api/ec2/cloud.py                    |    5 +----
 nova/api/openstack/servers.py            |    3 +--
 nova/compute/api.py                      |   35 +++++++++++++++++++++---------
 nova/scheduler/driver.py                 |    3 +++
 nova/tests/api/ec2/test_cloud.py         |    5 +++--
 nova/tests/api/openstack/test_servers.py |    8 ++++---
 nova/tests/test_compute.py               |   19 ----------------
 7 files changed, 38 insertions(+), 40 deletions(-)

commit 830760b4c79cf9cdc80c6e0047ea206abc21f2c6
Merge: d3e0cfc a225fa6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 2 15:44:31 2011 +0000

    Merge "Too much information is returned from POST /servers"

commit 923c3c520609b70e234731b401762bda2623e951
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Nov 2 11:34:28 2011 -0400

    Added some documentation to db.api module docstring.
    
    See https://lists.launchpad.net/openstack/msg05222.html for info about return values of db layer.
    
    Change-Id: Id7cc7c783d40a9f81ca0e592691635ee15563e0b

 nova/db/api.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 743b36dcac7e4dd8b914d78c0ab11764f415039c
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Nov 2 10:50:54 2011 -0400

    Updated rst docs to include threading model.
    
    Change-Id: Id12cd6584dfd22fe32097cfddf0247c0cc115ac0

 doc/source/devref/index.rst     |    1 +
 doc/source/devref/threading.rst |   17 +++++++++++++++++
 2 files changed, 18 insertions(+)

commit ecd4e3a69853bbf5dcfffc89c916a7fe1410a812
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed Oct 26 12:38:17 2011 -0700

    Adds documentation for Xen Storage Manager
    
    Fixes bug 882212.
    
    Change-Id: Ic57e2b13aad3a7e73017ee49fe32740eb579da50

 doc/source/devref/index.rst       |    1 +
 doc/source/devref/xensmvolume.rst |   88 +++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

commit 931a0e206801baef9a9890b288eafd78a1da98b9
Author: renukaapte <renuka.apte@citrix.com>
Date:   Tue Oct 11 16:22:37 2011 -0700

    Xen Storage Manager Volume Driver
    
    For details, please read the full specification here:
    http://wiki.openstack.org/xenapi-sm-volume-driver
    
    Change-Id: I17028a491d8ddee465bfa920907fe3bcaa911869

 bin/nova-manage                                    |  142 ++++++++++++
 nova/db/api.py                                     |   89 +++++++
 nova/db/sqlalchemy/api.py                          |  153 +++++++++++-
 .../versions/057_add_sm_driver_tables.py           |   98 ++++++++
 nova/db/sqlalchemy/models.py                       |   28 ++-
 nova/tests/test_xenapi.py                          |   19 +-
 nova/virt/xenapi/fake.py                           |   62 ++++-
 nova/virt/xenapi/vm_utils.py                       |   24 --
 nova/virt/xenapi/vmops.py                          |   14 +-
 nova/virt/xenapi/volume_utils.py                   |  236 ++++++++++++++++---
 nova/virt/xenapi/volumeops.py                      |  208 +++++++++++++----
 nova/volume/driver.py                              |    4 +
 nova/volume/manager.py                             |    5 +-
 nova/volume/xensm.py                               |  244 ++++++++++++++++++++
 14 files changed, 1188 insertions(+), 138 deletions(-)

commit d3e0cfcc7f7bc24b4bd551f5b5c0c952f2fd2f3f
Merge: 71bd023 af5ee68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 21:57:43 2011 +0000

    Merge "Fix KeyError when passed unknown format of time"

commit e79b633e9e6493c8e39b044bb90c74683d48c83b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 1 21:00:53 2011 +0000

    Drop extra XML tests and remove _json suffix from names
    
    This is the first step in moving this part of the test suite to using
    Controllers directly, bypassing wsgi. After these patches get merged,
    tests should end up getting sped up by about 45 seconds.
    
    This is the first in a set of smaller merges that should hopefully
    make the original 1200 line patch easier to review.
    
    Change-Id: Ib2849f64220bf2efa333cd739bafdd241348a4a4

 .../api/openstack/contrib/test_security_groups.py  |  150 +++++---------------
 1 file changed, 33 insertions(+), 117 deletions(-)

commit baf7916bf916af82ed264381192e9e70eb0817b4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 1 20:46:39 2011 +0000

    Fix empty group_id to be considered invalid
    
    And fix the test suite to actually try an empty group id correctly
    
    Change-Id: I54e61637b9b230d352e35b9b7964ab10c4eb9a25

 nova/api/openstack/contrib/security_groups.py      |    2 +-
 .../api/openstack/contrib/test_security_groups.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6fa7fa4025e29303a4defca7da1f816405c6784f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Nov 1 12:29:23 2011 -0700

    Stop nova-ajax-console-proxy configuring its own logging.
    
    nova-ajax-console-proxy is overriding the logging configuration carefully
    set up by nova.log.  There's no reason for it to do this, and it's the only
    script in nova/bin that does.  I've removed that code.
    
    Change-Id: I5b2d5026d529a20d26ba3bb721b15f235f6fdda8

 bin/nova-ajax-console-proxy |    2 --
 1 file changed, 2 deletions(-)

commit a807c57f5b61cb25a6f5c140a97ed744ab0a70dd
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Nov 1 11:54:59 2011 -0700

    Bug 884863: nova logs everything to syslog twice
    
    Fix double-registration of the syslog handler.
    NovaRootLogger.setup_from_flags is called twice from log.setup() -- once
    through NovaRootLogger.__init__ and once through reset().  setup_from_flags
    wasn't idempotent, so this resulted in the syslog handler being registered
    twice.
    
    Rather than fix the twisty-turny maze that is setup(), I've opted to make
    setup_from_flags idempotent in this regard, by always unregistering the
    syslog handler before doing anything else.
    
    Change-Id: I59ad61751e1a19d2cbb73dc1deea9c708d4c5032

 nova/log.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 46152102a0f5900e1a2cc0800ec850aa7191a3d6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Nov 1 11:33:44 2011 -0700

    Log the exception when we get one.
    
    Change-Id: Iee478c8f300b608dd153e3400bd17866f52543c5

 bin/nova-ajax-console-proxy |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 71bd02356b41f682c6a196f75e0ed1accc8f5fb6
Merge: 44f9f33 18e43e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 18:24:48 2011 +0000

    Merge changes I15dd5a5e,I0641f2c4
    
    * changes:
      Support server uuids with security groups
      Support using server uuids when accessing consoles.

commit a506c89c281e5081146b9280d378faef033c4452
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 1 12:00:56 2011 -0500

    Use fat32 for Windows, linux-swap for Linux swap partitions.
    
    Change-Id: I06d7c67290ffb5ba957306306c2838355c36946f

 nova/virt/xenapi/vm_utils.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 44f9f331fe75ee2facc2be995632cdf20f319380
Merge: 79ae282 d8e1b8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 17:09:59 2011 +0000

    Merge "flatten distributed scheduler"

commit af5ee6855b17acca3ec182650a26c3d2d33bcad9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Nov 1 15:31:30 2011 +0000

    Fix KeyError when passed unknown format of time
    
    Fixes bug 883253
    
    ISO_FORMATS should be iso_formats
    
    Change-Id: I3cd122176b72c84570d6b24315526540f8f860b9

 nova/image/glance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79ae282de89ec534807cb153960db4bccc75e06c
Merge: e9f1f3a 5d0918a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 16:15:47 2011 +0000

    Merge "Fix 'begining' typo in system usage data bug 884307"

commit e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f
Merge: d4b0c06 b04d71f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 15:06:08 2011 +0000

    Merge "Fixes lp883279"

commit d4b0c0615f3c5d83d425619ceb400793524e5949
Merge: 44d9647 bef4ae5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 1 14:51:14 2011 +0000

    Merge "Fix lp:861160 -- newly created network has no uuid"

commit d8e1b8f21043f435c7c4d6f5de5119c424956b06
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Oct 28 08:48:10 2011 -0700

    flatten distributed scheduler
    
    This branch removes AbstractScheduler, BaseScheduler and LeastCostScheduler
    and replaces it with DistributedScheduler. Now the points of extension are
    handled via the --default_host_filters and --least_cost_functions only.
    
    Also, greatly simplified the zone handling logic in DistibutedScheduler, mostly
    by removing the cryptic dicts with helper classes.
    
    Fixed up the Least Cost functions to better deal with multiple functions.
    (In a followup patch I will removed the normalization that occurs as this will
    be a problem).
    
    Tests were mostly rewritten to support this new world order.
    
    Debated removing JSONFilter since it's not accessible from the outside world,
    but decided to keep it as there are discussions afoot on making scheduler
    changes without having to redeploy code or restart services.
    
    HostFilters once again get the all the host service capabilities, but now
    via a HostInfo class that mostly contains read-only dicts of capabilities.
    
    Virtual resource consumption is done in the DistributedScheduler class now.
    The filters/weighing functions don't need to worry about this. Also, weighing
    functions only have to return a single host and not worry about the number of
    instances requested.
    
    Change-Id: I92600a4a9c58b1add775c328a18d8f48c305861e

 .mailmap                                           |    1 +
 nova/db/api.py                                     |    5 +
 nova/db/sqlalchemy/api.py                          |   10 +
 nova/scheduler/abstract_scheduler.py               |  315 -------------
 nova/scheduler/base_scheduler.py                   |   94 ----
 nova/scheduler/distributed_scheduler.py            |  363 +++++++++++++++
 nova/scheduler/filters/instance_type_filter.py     |   68 +--
 nova/scheduler/filters/json_filter.py              |   31 +-
 nova/scheduler/host_filter.py                      |   82 ----
 nova/scheduler/least_cost.py                       |  255 ++++++-----
 nova/scheduler/zone_manager.py                     |  113 +++++
 nova/tests/scheduler/fake_zone_manager.py          |   72 +++
 nova/tests/scheduler/test_abstract_scheduler.py    |  462 --------------------
 nova/tests/scheduler/test_distributed_scheduler.py |  262 +++++++++++
 nova/tests/scheduler/test_host_filter.py           |   97 ++--
 nova/tests/scheduler/test_least_cost.py            |  109 +++++
 nova/tests/scheduler/test_least_cost_scheduler.py  |  116 -----
 nova/virt/fake.py                                  |   33 +-
 nova/virt/xenapi_conn.py                           |   43 +-
 19 files changed, 1236 insertions(+), 1295 deletions(-)

commit 826888de038d5ba58c133c5fa1471ec9bfe0f52d
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 31 17:33:47 2011 -0700

    Bug #884534: nova-ajax-console-proxy crashes on shutdown
    
    Close the correct connection, when shutting down.  self is not defined in
    this context.
    
    Change-Id: I0dc84a1c7de468a381f5765ccba589acbc8173dd

 bin/nova-ajax-console-proxy |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 44d9647e7ff59c907bfe7e3eb3873159556809db
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 31 17:21:54 2011 -0700

    Bug 884527: ajax_console_proxy_port needs to be an integer
    
    Fix declaration of ajax_console_proxy_port flag.
    
    Change-Id: If949878a81339def2be5dba67ad1415180db4715

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a225fa6acf9ea8689f66b5e415c4680795bac465
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Oct 26 14:16:01 2011 -0500

    Too much information is returned from POST /servers
    
    Currently we're returning a lot of information in the POST /servers
    response. This isn't according to spec and is misleading to other
    projects that might try and implement the OpenStack API specification.
    
    The example on docs.openstack.com for the v1.1 API says:
    
    "Note that when creating a server only the server ID, its links, and
    the admin password are guaranteed to be returned in the request.
    Additional attributes may be retrieved by performing subsequent GETs
    on the server."
    
    We're returning too much right now and this patch addresses that.
    
    Further patches should be submitted to refactor the 'view builder'
    concept as using keyword arguments like this patch does is not ideal
    and I recognize that.
    
    (Patch Set 2) Merged with master + conflict fix
    (Patch Set 3) Reverted non-nova-standard superclass call
    
    Change-Id: If246e51dbf84f1db3d2905694235692ab027859d

 nova/api/openstack/contrib/createserverext.py    |   10 +++---
 nova/api/openstack/servers.py                    |    8 +++--
 nova/api/openstack/views/servers.py              |   10 +++++-
 nova/tests/api/openstack/contrib/test_volumes.py |    3 --
 nova/tests/api/openstack/test_servers.py         |   41 +---------------------
 nova/tests/integrated/test_servers.py            |    4 ---
 6 files changed, 21 insertions(+), 55 deletions(-)

commit e7ac69a6ed89567515742844d8f667becd5d69e7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Oct 26 17:00:21 2011 +0000

    Disable SQLite synchronous mode during tests
    
    SQLite uses synchronous mode by default, which will synchronously write
    data to disk. This will increase durability of data at the expense of
    performance. The test suite does not need data to be durably written
    to disk, so disabling synchronous mode results in a speeding up the
    full test suite by about 20 seconds.
    
    Change-Id: I5ca1ab1e8691e912d801fe1002dff752c82f3d5d

 nova/db/sqlalchemy/session.py |   10 ++++++++++
 nova/flags.py                 |    1 +
 nova/tests/fake_flags.py      |    1 +
 3 files changed, 12 insertions(+)

commit 24298bb882ce8f8572e90fb59718398a921e10ff
Merge: 99bbd37 c13e7f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 31 18:47:56 2011 +0000

    Merge "Creating uuid -> id mapping for S3 Image Service"

commit 99bbd37037a15a07a47a4dc482306bea7dcf4193
Merge: 5b8133a 606827f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 31 18:39:18 2011 +0000

    Merge "Make sure networks returned from get_instance_nw_info have a label"

commit c13e7f79e52325792a130a578a74a170c01dc747
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Oct 19 15:02:48 2011 -0400

    Creating uuid -> id mapping for S3 Image Service
    
    This creates a mapping of Glance uuids to preserve the
    EC2-specific image id format. This adds a lazily generated
    mapping layer that is stored in the database.
    
    This also fixes bug 882658
    
    Change-Id: I64bf6c7297b97f206b967781a28791aa3874ca81

 nova/api/ec2/cloud.py                              |   49 +++++---
 nova/api/ec2/ec2utils.py                           |    2 +-
 nova/compute/manager.py                            |    6 +-
 nova/db/api.py                                     |   18 +++
 nova/db/sqlalchemy/api.py                          |   40 ++++++-
 .../migrate_repo/versions/056_add_s3_images.py     |   57 +++++++++
 nova/db/sqlalchemy/models.py                       |    7 ++
 nova/flags.py                                      |    2 +-
 nova/image/__init__.py                             |   16 +--
 nova/image/fake.py                                 |   33 +++---
 nova/image/glance.py                               |   29 +++--
 nova/image/s3.py                                   |  114 ++++++++++++++----
 nova/tests/api/ec2/test_cloud.py                   |  122 ++++++++++++++------
 .../api/openstack/contrib/test_createserverext.py  |    9 +-
 nova/tests/api/openstack/contrib/test_volumes.py   |    7 +-
 nova/tests/api/openstack/test_servers.py           |   65 ++++++-----
 nova/tests/api/openstack/test_urlmap.py            |   12 +-
 nova/tests/image/test_glance.py                    |   11 +-
 nova/tests/image/test_s3.py                        |   19 ++-
 nova/tests/integrated/integrated_helpers.py        |   11 +-
 nova/tests/integrated/test_servers.py              |    9 +-
 nova/tests/scheduler/test_scheduler.py             |    2 +-
 nova/tests/test_quota.py                           |   19 ++-
 nova/virt/libvirt/connection.py                    |    6 +-
 24 files changed, 472 insertions(+), 193 deletions(-)

commit 5d0918a270564b14e0974d6f45378ffc79e8a654
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Oct 31 17:15:37 2011 +0000

    Fix 'begining' typo in system usage data
    bug 884307
    
    audit_period_begining should be audit_period_beginning.
    
    Change-Id: I7c29cef105454ade6fa13558ca5e3e4fbaf77149

 nova/compute/utils.py            |    2 +-
 nova/tests/test_compute_utils.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b04d71f5418b7717cc7c55b0780108c8cef7c253
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Oct 28 16:40:54 2011 -0500

    Fixes lp883279
    
    Nova sending instance_id in notifications instead of uuids
    
    Change-Id: I411ea1a9aee53af4ee8cb4b1118dc41549c80227

 nova/tests/test_compute.py       |    8 +++++---
 nova/tests/test_compute_utils.py |    2 +-
 nova/utils.py                    |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

commit e2403739d5e866e011ecc45a4d5b20d5e0192997
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Oct 31 15:11:36 2011 +0000

    Log original dropped exception when a new exception occurs
    
    If a exception is caught while processing a previous exception, make sure
    to log it so it doesn't silently get discarded
    
    Change-Id: Ic887db9c2592229970737daf5dd9732b2258877b

 nova/compute/manager.py      |    2 +-
 nova/exception.py            |    2 ++
 nova/utils.py                |   22 ++++++++++++++--------
 nova/virt/xenapi/vm_utils.py |    2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

commit bef4ae509256683fefe8785ce62ef2e423009653
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Wed Oct 19 14:44:01 2011 +0530

    Fix lp:861160 -- newly created network has no uuid
    
    Implemented code review changes.
    Fixed issue causing pep8 build failure.
    Change-Id: If2cc0e23be8d4e1558a10fa86e6ba4cdec61b7d1

 Authors                   |    1 +
 nova/db/sqlalchemy/api.py |    1 +
 nova/tests/test_db_api.py |    9 +++++++++
 3 files changed, 11 insertions(+)

commit 0f7f91c2e51586c659ab7e123ddee4d2a5d1f68a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Oct 30 15:58:31 2011 -0700

    Bug #884018: "stack help" prints stacktrace if it cannot connect to the server
    
    Add a handler for URLError, so that we print a nicer error message if stack
    cannot connect to the server.
    
    Change-Id: I24f977dcb12bee3bb21057fe9b19823d98581141

 bin/stack |    3 +++
 1 file changed, 3 insertions(+)

commit b08bd96ce5bf290ac6198079ad2dce71e675b481
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sun Oct 30 09:00:59 2011 -0400

    Optional --no-site-packages in venv
    
    Added a flag to run_tests.sh to allow user to optionally install venv with --no-site-packages.
    
    This fixes bug 880905
    
    Change-Id: Ic645e0ec56c90b72fef526ebc9f55975d446e2ae

 run_tests.sh          |   12 ++++++++++--
 tools/install_venv.py |   20 +++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

commit 5b8133a83939fd552b569c4b034cef43907ea1ce
Merge: 355712b fbe692f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 30 03:40:25 2011 +0000

    Merge "fixes bug 883233. Added to Authors fix typo in scheduler/driver.py assert_compute_node_has_enough_memory."

commit 355712b930720e484711bb810d83a638b5a9cf8b
Merge: 6ebc0ac 566f564
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 29 17:14:42 2011 +0000

    Merge "Updated NoAuth to account for requests ending in /"

commit fbe692f9d727ff1f96b960794f637f26a85a61cb
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Fri Oct 28 12:20:55 2011 -0700

    fixes bug 883233.
    Added to Authors
    fix typo in scheduler/driver.py assert_compute_node_has_enough_memory.
    
    Change-Id: I21a17c9f2d147febd0035c6f396b6956696627da

 Authors                  |    1 +
 nova/scheduler/driver.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 566f564a60fc5309441d6624fc70389ffc28773f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Oct 28 12:32:47 2011 -0400

    Updated NoAuth to account for requests ending in /
    
    Fixes bug 882742
    
    Change-Id: I19d527c5d16f73de2841e9d69872da6979f71886

 nova/api/openstack/auth.py            |    6 ++---
 nova/tests/api/openstack/fakes.py     |    8 +++++-
 nova/tests/api/openstack/test_auth.py |   44 +++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

commit 6ebc0ac3248b6ec7f1a221b4dae5f326406ab614
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Oct 27 11:46:54 2011 +0200

    Retry failed SQL connections (LP #876663)
    
    Change-Id: I972d8debb2e3230bccfcca68aee5b08021ba16c7

 nova/db/sqlalchemy/session.py |   30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit e55f2e54713b255c1a38433be954ea8bc5fec080
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Oct 27 23:56:52 2011 -0400

    Removed autogenerated API .rst files.
    
    Removed .rst files that are automatically generated using the nova_autodoc extension. It's not really worth keeping these in the repo since users can regenerate the files at will, and the content is also available at nova.openstack.org.
    
    Change-Id: I6c93f9aae1994961fdca690742398a0d540d541f

 doc/source/api/autoindex.rst                       |  141 --------------------
 doc/source/api/nova..adminclient.rst               |    6 -
 doc/source/api/nova..api.direct.rst                |    6 -
 doc/source/api/nova..api.ec2.admin.rst             |    6 -
 doc/source/api/nova..api.ec2.apirequest.rst        |    6 -
 doc/source/api/nova..api.ec2.cloud.rst             |    6 -
 .../api/nova..api.ec2.metadatarequesthandler.rst   |    6 -
 doc/source/api/nova..api.openstack.auth.rst        |    6 -
 .../api/nova..api.openstack.backup_schedules.rst   |    6 -
 doc/source/api/nova..api.openstack.common.rst      |    6 -
 doc/source/api/nova..api.openstack.consoles.rst    |    6 -
 doc/source/api/nova..api.openstack.faults.rst      |    6 -
 doc/source/api/nova..api.openstack.flavors.rst     |    6 -
 doc/source/api/nova..api.openstack.images.rst      |    6 -
 doc/source/api/nova..api.openstack.servers.rst     |    6 -
 .../api/nova..api.openstack.shared_ip_groups.rst   |    6 -
 doc/source/api/nova..api.openstack.zones.rst       |    6 -
 doc/source/api/nova..auth.dbdriver.rst             |    6 -
 doc/source/api/nova..auth.fakeldap.rst             |    6 -
 doc/source/api/nova..auth.ldapdriver.rst           |    6 -
 doc/source/api/nova..auth.manager.rst              |    6 -
 doc/source/api/nova..auth.signer.rst               |    6 -
 doc/source/api/nova..cloudpipe.pipelib.rst         |    6 -
 doc/source/api/nova..compute.api.rst               |    6 -
 doc/source/api/nova..compute.instance_types.rst    |    6 -
 doc/source/api/nova..compute.manager.rst           |    6 -
 doc/source/api/nova..compute.power_state.rst       |    6 -
 doc/source/api/nova..console.api.rst               |    6 -
 doc/source/api/nova..console.fake.rst              |    6 -
 doc/source/api/nova..console.manager.rst           |    6 -
 doc/source/api/nova..console.xvp.rst               |    6 -
 doc/source/api/nova..context.rst                   |    6 -
 doc/source/api/nova..crypto.rst                    |    6 -
 doc/source/api/nova..db.api.rst                    |    6 -
 doc/source/api/nova..db.base.rst                   |    6 -
 doc/source/api/nova..db.migration.rst              |    6 -
 doc/source/api/nova..db.sqlalchemy.api.rst         |    6 -
 .../nova..db.sqlalchemy.migrate_repo.manage.rst    |    6 -
 ...sqlalchemy.migrate_repo.versions.001_austin.rst |    6 -
 ....sqlalchemy.migrate_repo.versions.002_bexar.rst |    6 -
 ...ate_repo.versions.003_add_label_to_networks.rst |    6 -
 ...y.migrate_repo.versions.004_add_zone_tables.rst |    6 -
 ...ate_repo.versions.005_add_instance_metadata.rst |    6 -
 ...o.versions.006_add_provider_data_to_volumes.rst |    6 -
 ...igrate_repo.versions.007_add_instance_types.rst |    6 -
 doc/source/api/nova..db.sqlalchemy.migration.rst   |    6 -
 doc/source/api/nova..db.sqlalchemy.models.rst      |    6 -
 doc/source/api/nova..db.sqlalchemy.session.rst     |    6 -
 doc/source/api/nova..exception.rst                 |    6 -
 doc/source/api/nova..fakememcache.rst              |    6 -
 doc/source/api/nova..fakerabbit.rst                |    6 -
 doc/source/api/nova..flags.rst                     |    6 -
 doc/source/api/nova..image.glance.rst              |    6 -
 doc/source/api/nova..image.local.rst               |    6 -
 doc/source/api/nova..image.s3.rst                  |    6 -
 doc/source/api/nova..image.service.rst             |    6 -
 doc/source/api/nova..log.rst                       |    6 -
 doc/source/api/nova..manager.rst                   |    6 -
 doc/source/api/nova..network.api.rst               |    6 -
 doc/source/api/nova..network.linux_net.rst         |    6 -
 doc/source/api/nova..network.manager.rst           |    6 -
 doc/source/api/nova..objectstore.bucket.rst        |    6 -
 doc/source/api/nova..objectstore.handler.rst       |    6 -
 doc/source/api/nova..objectstore.image.rst         |    6 -
 doc/source/api/nova..objectstore.stored.rst        |    6 -
 doc/source/api/nova..quota.rst                     |    6 -
 doc/source/api/nova..rpc.rst                       |    6 -
 doc/source/api/nova..scheduler.chance.rst          |    6 -
 doc/source/api/nova..scheduler.driver.rst          |    6 -
 doc/source/api/nova..scheduler.manager.rst         |    6 -
 doc/source/api/nova..scheduler.simple.rst          |    6 -
 doc/source/api/nova..scheduler.zone.rst            |    6 -
 doc/source/api/nova..service.rst                   |    6 -
 doc/source/api/nova..test.rst                      |    6 -
 doc/source/api/nova..tests.api.openstack.fakes.rst |    6 -
 .../nova..tests.api.openstack.test_adminapi.rst    |    6 -
 .../api/nova..tests.api.openstack.test_api.rst     |    6 -
 .../api/nova..tests.api.openstack.test_auth.rst    |    6 -
 .../api/nova..tests.api.openstack.test_common.rst  |    6 -
 .../api/nova..tests.api.openstack.test_faults.rst  |    6 -
 .../api/nova..tests.api.openstack.test_flavors.rst |    6 -
 .../api/nova..tests.api.openstack.test_images.rst  |    6 -
 ...nova..tests.api.openstack.test_ratelimiting.rst |    6 -
 .../api/nova..tests.api.openstack.test_servers.rst |    6 -
 .....tests.api.openstack.test_shared_ip_groups.rst |    6 -
 .../api/nova..tests.api.openstack.test_zones.rst   |    6 -
 doc/source/api/nova..tests.api.test_wsgi.rst       |    6 -
 doc/source/api/nova..tests.db.fakes.rst            |    6 -
 doc/source/api/nova..tests.declare_flags.rst       |    6 -
 doc/source/api/nova..tests.fake_flags.rst          |    6 -
 doc/source/api/nova..tests.glance.stubs.rst        |    6 -
 doc/source/api/nova..tests.hyperv_unittest.rst     |    6 -
 .../api/nova..tests.objectstore_unittest.rst       |    6 -
 doc/source/api/nova..tests.real_flags.rst          |    6 -
 doc/source/api/nova..tests.runtime_flags.rst       |    6 -
 doc/source/api/nova..tests.test_access.rst         |    6 -
 doc/source/api/nova..tests.test_api.rst            |    6 -
 doc/source/api/nova..tests.test_auth.rst           |    6 -
 doc/source/api/nova..tests.test_cloud.rst          |    6 -
 doc/source/api/nova..tests.test_compute.rst        |    6 -
 doc/source/api/nova..tests.test_console.rst        |    6 -
 doc/source/api/nova..tests.test_direct.rst         |    6 -
 doc/source/api/nova..tests.test_flags.rst          |    6 -
 doc/source/api/nova..tests.test_instance_types.rst |    6 -
 doc/source/api/nova..tests.test_localization.rst   |    6 -
 doc/source/api/nova..tests.test_log.rst            |    6 -
 doc/source/api/nova..tests.test_middleware.rst     |    6 -
 doc/source/api/nova..tests.test_misc.rst           |    6 -
 doc/source/api/nova..tests.test_network.rst        |    6 -
 doc/source/api/nova..tests.test_quota.rst          |    6 -
 doc/source/api/nova..tests.test_rpc.rst            |    6 -
 doc/source/api/nova..tests.test_scheduler.rst      |    6 -
 doc/source/api/nova..tests.test_service.rst        |    6 -
 doc/source/api/nova..tests.test_test.rst           |    6 -
 doc/source/api/nova..tests.test_utils.rst          |    6 -
 doc/source/api/nova..tests.test_virt.rst           |    6 -
 doc/source/api/nova..tests.test_volume.rst         |    6 -
 doc/source/api/nova..tests.test_xenapi.rst         |    6 -
 doc/source/api/nova..tests.xenapi.stubs.rst        |    6 -
 doc/source/api/nova..utils.rst                     |    6 -
 doc/source/api/nova..version.rst                   |    6 -
 doc/source/api/nova..virt.connection.rst           |    6 -
 doc/source/api/nova..virt.disk.rst                 |    6 -
 doc/source/api/nova..virt.fake.rst                 |    6 -
 doc/source/api/nova..virt.hyperv.rst               |    6 -
 doc/source/api/nova..virt.images.rst               |    6 -
 doc/source/api/nova..virt.libvirt_conn.rst         |    6 -
 doc/source/api/nova..virt.xenapi.fake.rst          |    6 -
 doc/source/api/nova..virt.xenapi.network_utils.rst |    6 -
 doc/source/api/nova..virt.xenapi.vm_utils.rst      |    6 -
 doc/source/api/nova..virt.xenapi.vmops.rst         |    6 -
 doc/source/api/nova..virt.xenapi.volume_utils.rst  |    6 -
 doc/source/api/nova..virt.xenapi.volumeops.rst     |    6 -
 doc/source/api/nova..virt.xenapi_conn.rst          |    6 -
 doc/source/api/nova..volume.api.rst                |    6 -
 doc/source/api/nova..volume.driver.rst             |    6 -
 doc/source/api/nova..volume.manager.rst            |    6 -
 doc/source/api/nova..volume.san.rst                |    6 -
 doc/source/api/nova..wsgi.rst                      |    6 -
 139 files changed, 969 deletions(-)

commit dcb867871548be2d06b8957e059b387efde17aa9
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Oct 27 23:49:32 2011 -0400

    Fix to a documentation generation script.
    
    Filenames no longer have two dots in them
    source/api/nova..adminclient.rst -> source/api/nova.adminclient.rst
    
    Fixes bug 882889
    
    Change-Id: I71132962fb934e35efbe956b25e68982a5a34ad1

 doc/find_autodoc_modules.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a448fa066ceb21ee1ef9aa542198145e1ff0dff2
Merge: 3c3fbaf fcbb878
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 28 02:25:44 2011 +0000

    Merge "Adding bulk create fixed ips. The true issue here  is the creation of IPs in the DB that are not  currently used(we are building the entire block). This fix is just a bandaid, but it does cut ~25  seconds off of the quantum tests on my laptop."

commit 0cf3789014ccccacb435d3a5c3d74afd304c7b42
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Oct 27 20:35:48 2011 -0400

    Added code to libvirt backend to report state info.
    
    Also renamed property variable in Xen code to make it
    consistent with nova conventions.
    
    Implements blueprint kvm-report-capabilities
    
    Change-Id: I7953e857d9b8ce4b410c31b82cead7aaa3fb911f

 nova/tests/test_libvirt.py      |   62 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |   58 +++++++++++++++++++++++++++++++++---
 nova/virt/xenapi_conn.py        |    6 ++--
 3 files changed, 119 insertions(+), 7 deletions(-)

commit fcbb8780386b3ff48653da23a1ffb3f5aa0c8b13
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Oct 27 17:37:34 2011 -0500

    Adding bulk create fixed ips. The true issue here
    is the creation of IPs in the DB that are not
    currently used(we are building the entire block).
    This fix is just a bandaid, but it does cut ~25
    seconds off of the quantum tests on my laptop.
    
    (pre)$ ./run_tests.sh -N nova.tests.test_quantum:QuantumNovaIPAMTestCase
    QuantumNovaIPAMTestCase
        test_allocate_and_deallocate_instance_dynamic               OK  11.36
        test_allocate_and_deallocate_instance_static                OK  11.27
        test_create_and_delete_nets                                 OK  10.35
        test_validate_bad_network                                   OK  0.10
    
    (post)$ ./run_tests.sh -N nova.tests.test_quantum:QuantumNovaIPAMTestCase
    QuantumNovaIPAMTestCase
        test_allocate_and_deallocate_instance_dynamic               OK  2.94
        test_allocate_and_deallocate_instance_static                OK  3.12
        test_create_and_delete_nets                                 OK  1.86
        test_validate_bad_network                                   OK  0.11
    
    
    Change-Id: I46b629f9ca6e019c7c4c6aa8e869c551e5c13fb8

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   10 ++++++++++
 nova/network/manager.py   |    9 ++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

commit 3c3fbaf552948d07c80a5f22aada5f046c3be67b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Oct 27 13:53:18 2011 +0000

    Fix overzealous use of faults.Fault() wrapper
    
    wsgi.Resource will automatically wrap HTTP exceptions in faults.Fault()
    but many extensions will unnecessarily wrap HTTP exceptions manually.
    Also, let's raise exceptions instead of returning them to be consistent.
    
    Change-Id: I297a4decbd4a00fb12ec471a5e76aeea3dda6d34

 nova/api/openstack/contrib/diskconfig.py           |    7 +-
 nova/api/openstack/contrib/flavorextraspecs.py     |    3 +-
 nova/api/openstack/contrib/floating_ips.py         |    5 +-
 nova/api/openstack/contrib/keypairs.py             |    3 +-
 nova/api/openstack/contrib/multinic.py             |   45 +++++------
 nova/api/openstack/contrib/security_groups.py      |   32 ++++----
 .../openstack/contrib/virtual_storage_arrays.py    |   54 ++++++-------
 nova/api/openstack/contrib/volumes.py              |   25 +++---
 nova/api/openstack/contrib/volumetypes.py          |   15 ++--
 nova/api/openstack/extensions.py                   |   11 ++-
 nova/tests/api/openstack/extensions/foxinsocks.py  |    7 ++
 nova/tests/api/openstack/test_extensions.py        |   80 +++++++++++++++++++-
 12 files changed, 178 insertions(+), 109 deletions(-)

commit 16bacc3252b9a792159b247dcf9d2f3ebb6842ac
Merge: 3f319eb 61e5b8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 27 17:55:27 2011 +0000

    Merge "Revert how APIs get IP address info for instances"

commit 3f319ebe4a47843c83de2403e8fcbef3d499b657
Merge: 78025e8 adffdf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 27 16:09:21 2011 +0000

    Merge "Add .gitreview config file for gerrit."

commit 78025e8461ad20575b8f7021ab0042fbc145ddce
Merge: 6c03912 3dd04ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 27 15:47:43 2011 +0000

    Merge "Fix file injection for OSAPI rebuilds. Fixes 881649."

commit 6c039120f54e4d8fa99f9e09148879de4dc04bb2
Merge: 1b7fba6 636c70c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 27 14:51:34 2011 +0000

    Merge "Fix deletion of instances without fixed ips."

commit 61e5b8e7da3b36db9a09f80d62ebf2e276bbe88b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Oct 21 00:29:54 2011 -0700

    Revert how APIs get IP address info for instances
    
    Fixes bug 862839
    
    listing instances with IPs is extremely inefficient after changes were
    made to query the network manager for IP information for each instance.
    I tried adding a network manager call that said 'give me IP information
    for 'x' instances', but that was also too slow.
    
    We need a solution that caches IP info from the network manager before
    we can fully untie things.  So, this reverts APIs to use
    instance['fixed_ips'] which hasn't been untied in the DB yet.
    
    Change-Id: I37d21105d6306f0a812c5eb0f0717a5094cd17b9

 nova/api/ec2/cloud.py                              |   96 ++---
 nova/api/openstack/common.py                       |   62 +--
 nova/compute/api.py                                |   16 +-
 nova/db/sqlalchemy/api.py                          |   24 +-
 nova/tests/api/ec2/test_cloud.py                   |   71 ++--
 .../api/openstack/contrib/test_createserverext.py  |    3 +
 .../api/openstack/contrib/test_floating_ips.py     |    1 +
 nova/tests/api/openstack/contrib/test_volumes.py   |    3 +-
 nova/tests/api/openstack/test_server_actions.py    |   11 +-
 nova/tests/api/openstack/test_server_metadata.py   |    4 +-
 nova/tests/api/openstack/test_servers.py           |  448 +++++++-------------
 nova/tests/test_compute.py                         |   38 +-
 nova/tests/test_metadata.py                        |    1 +
 13 files changed, 338 insertions(+), 440 deletions(-)

commit 18e43e6b4dffba73dd35afb797dfa4e1d6cd00fe
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Oct 24 14:28:47 2011 -0400

    Support server uuids with security groups
    
    Change-Id: I15dd5a5e26b2d22fa3def75fa950f1155e6911ac

 nova/api/openstack/contrib/security_groups.py      |    8 --
 nova/compute/api.py                                |   12 ++-
 .../api/openstack/contrib/test_security_groups.py  |  105 ++++++++++----------
 3 files changed, 65 insertions(+), 60 deletions(-)

commit fa74f5c59da8e1641d97333d0b8ee6147fb17947
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Oct 20 14:31:24 2011 -0400

    Support using server uuids when accessing consoles.
    
    This adds support to the nova/console/api.py for instance_ids
    being uuids. Additionally, it updates the openstack console
    controller to get around some int() casts and modifies testing
    to exercise the server-uuid path.
    
    Change-Id: I0641f2c4857d0d1e07abc7d70880590741769b9a

 nova/api/openstack/consoles.py            |    8 ++--
 nova/console/api.py                       |   23 +++++++--
 nova/tests/api/openstack/test_consoles.py |   74 ++++++++++++++++++++---------
 3 files changed, 75 insertions(+), 30 deletions(-)

commit 1b7fba648aa3eb4cdda345237c9f77dc0b229329
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Oct 26 14:32:48 2011 -0400

    Adding support for retrying glance image downloads.
    
    Change-Id: Ifff40d90f7dc61a6d41ae2d6908d6e1e6f0aea7e

 nova/flags.py                                      |    2 ++
 nova/image/glance.py                               |   16 ++++++++---
 nova/tests/image/test_glance.py                    |   29 ++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py                       |    1 +
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   23 ++++++++++------
 5 files changed, 59 insertions(+), 12 deletions(-)

commit 636c70c3c990d0405c7e05a428d78908dc8b4317
Author: Asbjørn Sannes <asbjorn.sannes@interhost.no>
Date:   Wed Oct 19 22:36:03 2011 +0200

    Fix deletion of instances without fixed ips.
    
    Catch exception when there are no fixed ips for an instance when deallocating it.
    
    When trying to delete failed builds I got the following traces:
    
    (nova.rpc): TRACE: Traceback (most recent call last):
    (nova.rpc): TRACE:   File "/usr/lib64/python2.7/site-packages/nova/rpc/impl_kombu.py", line 620, in _process_data
    (nova.rpc): TRACE:     rval = node_func(context=ctxt, **node_args)
    (nova.rpc): TRACE:   File "/usr/lib64/python2.7/site-packages/nova/network/manager.py", line 252, in deallocate_for_instance
    (nova.rpc): TRACE:     fixed_ips = self.db.fixed_ip_get_by_instance(context, instance_id)
    (nova.rpc): TRACE:   File "/usr/lib64/python2.7/site-packages/nova/db/api.py", line 392, in fixed_ip_get_by_instance
    (nova.rpc): TRACE:     return IMPL.fixed_ip_get_by_instance(context, instance_id)
    (nova.rpc): TRACE:   File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 120, in wrapper
    (nova.rpc): TRACE:     return f(*args, **kwargs)
    (nova.rpc): TRACE:   File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 877, in fixed_ip_get_by_instance
    (nova.rpc): TRACE:     raise exception.FixedIpNotFoundForInstance(instance_id=instance_id)
    (nova.rpc): TRACE: FixedIpNotFoundForInstance: Instance 37 has zero fixed ips.
    
    Which this commit fixes.
    
    Added myself to Authors as requested.
    
    Change-Id: I87a1764c16328c6a4bfa5a0bfab1ea4800cbb355

 Authors                    |    1 +
 nova/network/manager.py    |    5 ++++-
 nova/tests/test_network.py |   27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

commit 5e9e3873e5ee3cf87b8aec801705ee24cedcd1aa
Merge: 5623c02 e8b0ff7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 26 16:35:45 2011 +0000

    Merge "Removed callback concept on VM driver methods:"

commit 5623c027dfcc95a8f48c09e37f6e4327b8901771
Merge: 46cf865 956d815
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 26 16:28:10 2011 +0000

    Merge "Replaces all references to nova.db.api with nova.db"

commit 46cf865831fdb50a1da0044ca83cc4f0de8876e4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Oct 26 14:04:42 2011 +0000

    Speed up test suite by 20 seconds
    
    Change openstack API server actions test to use controller directly,
    bypassing WSGI layer. This shaves up to half a second off each test and
    can speed up test suite by 20 seconds.
    
    Change-Id: Ideadbeef2232753eae628d0ffdd534055f1dbc40

 nova/api/openstack/servers.py                   |    4 +-
 nova/tests/api/openstack/test_server_actions.py |  429 ++++++++---------------
 2 files changed, 144 insertions(+), 289 deletions(-)

commit 7cd3d73bc8729c00b739166e92050b659dd4602e
Merge: ace2628 ad74424
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 26 01:01:00 2011 +0000

    Merge "Improve the liveness checking for services"

commit e8b0ff71faef4268669deb035f711de394fb0e78
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Oct 25 17:15:49 2011 -0500

    Removed callback concept on VM driver methods:
    
     * pause
     * unpause
     * suspend
     * resume
     * rescue
     * unrescue
    
    Worked off blueprint remove-virt-driver-callbacks
    
    Change-Id: Ie3ef4c8155320f72106d7a39e5817516e180ba52

 nova/compute/manager.py         |   14 ++++++--------
 nova/tests/test_virt_drivers.py |   26 ++++++++++++--------------
 nova/tests/test_vmwareapi.py    |   23 +++++++----------------
 nova/tests/test_xenapi.py       |    4 ++--
 nova/virt/driver.py             |   12 ++++++------
 nova/virt/fake.py               |   12 ++++++------
 nova/virt/libvirt/connection.py |   12 ++++++------
 nova/virt/vmwareapi/vmops.py    |   21 ++++++---------------
 nova/virt/vmwareapi_conn.py     |   16 ++++++++--------
 nova/virt/xenapi/vmops.py       |   32 ++++++++++++--------------------
 nova/virt/xenapi_conn.py        |   24 ++++++++++++------------
 11 files changed, 83 insertions(+), 113 deletions(-)

commit 3dd04ee508e626822a50858bb8dcc05c6cacfca1
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Oct 25 16:22:51 2011 -0400

    Fix file injection for OSAPI rebuilds. Fixes 881649.
    
    Change-Id: Ibeefcafe81aa200da065a1c8069e610a28cd6c05

 nova/api/openstack/servers.py |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

commit 956d81513a9624ac20442fe634ac7772628017bb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Oct 25 16:17:48 2011 -0400

    Replaces all references to nova.db.api with nova.db
    
    Fixes bug 881640
    
    Change-Id: Idaa9d175a82f42761e4fbfaf96571671cf44cbcd

 nova/api/openstack/contrib/flavorextraspecs.py     |    8 +--
 nova/api/openstack/contrib/volumetypes.py          |    8 +--
 nova/db/base.py                                    |    2 +-
 nova/db/migration.py                               |    2 +-
 nova/db/sqlalchemy/api.py                          |    4 +-
 nova/tests/api/ec2/test_cloud.py                   |    2 +-
 .../api/openstack/contrib/test_createserverext.py  |    8 +--
 .../api/openstack/contrib/test_floating_ips.py     |    2 +-
 .../api/openstack/contrib/test_security_groups.py  |   72 ++++++++++----------
 nova/tests/api/openstack/contrib/test_vsa.py       |    2 +-
 nova/tests/api/openstack/fakes.py                  |    6 +-
 nova/tests/api/openstack/test_consoles.py          |    2 +-
 .../api/openstack/test_flavors_extra_specs.py      |   22 +++---
 nova/tests/api/openstack/test_server_actions.py    |   14 ++--
 nova/tests/api/openstack/test_server_metadata.py   |   56 +++++++--------
 nova/tests/api/openstack/test_servers.py           |   64 +++++++++--------
 .../api/openstack/test_volume_types_extra_specs.py |   22 +++---
 nova/tests/test_instance_types.py                  |    2 +-
 nova/tests/test_instance_types_extra_specs.py      |   32 ++++-----
 nova/tests/test_quantum.py                         |    4 +-
 nova/tests/test_volume_types_extra_specs.py        |   32 ++++-----
 nova/tests/test_vsa.py                             |    2 +-
 nova/virt/driver.py                                |    2 +-
 23 files changed, 184 insertions(+), 186 deletions(-)

commit ace2628dfa6048a8e8b7757daefffc1987cfad3f
Merge: 8394536 97cfccc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 25 19:11:41 2011 +0000

    Merge "Fix concurrency of XenAPI sessions"

commit 83945367c2962723caf45d5b37a6b655162c97bc
Merge: c00cfc6 7a5b882
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 25 15:13:58 2011 +0000

    Merge "Fix undefined glance_host in get_glance_client"

commit c00cfc642ae60d9139b4f173670ea77bdc8e5805
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Oct 25 14:26:13 2011 +0100

    venv: update distribute as well as pip
    
    When you create a virtualenv, pip and setuptools/distribute is
    installed.
    
    When we later run install_venv.py to update the venv, we should
    be sure to grab the latest versions of pip and distribute otherwise
    issues like this one are masked:
    
      http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=131
    
    Change-Id: Id206be478ea6c5216dcee6f2f58dc91858c843f5

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f398289a30a6331830d7284e4aeb5402c0f5c779
Merge: 86b1011 cb37d89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 25 09:50:57 2011 +0000

    Merge "Improve access check on images"

commit 7a5b8822791dc9af0afe7166af34c6fb5277f81c
Author: Mike Lundy <mike@pistoncloud.com>
Date:   Mon Oct 24 20:05:19 2011 -0700

    Fix undefined glance_host in get_glance_client
    
    get_glance_client is stubbed in the tests, so they didn't catch it.
    Added tests to catch it.
    
    Also, add myself to Authors file.
    
    Change-Id: Ie7c1e90c3999f7f4b45af1cedd7c3570b48af43e

 Authors                         |    1 +
 nova/image/glance.py            |    3 ++-
 nova/tests/image/test_glance.py |   20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

commit 97cfccc2ce35b29fd98809b6c7ecdd86c56f76e3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Oct 24 21:55:12 2011 +0000

    Fix concurrency of XenAPI sessions
    
    Fixes bug 879044
    
    Nova currently does not serialize access to the XenAPI session which can
    result in multiple (green)threads trying to use the same HTTP connection.
    This will typically only affect Python 2.7 which has updated xmlrpclib to
    try to use one HTTP connection for multiple requests.
    
    Change-Id: I101d63b822c8bf8c28674a836e4b54aa8259e1a8

 nova/tests/test_xenapi.py        |    7 +++-
 nova/tests/xenapi/stubs.py       |    4 +-
 nova/virt/xenapi/vm_utils.py     |   80 +++++++++++++++++++-------------------
 nova/virt/xenapi/vmops.py        |   44 ++++++++++-----------
 nova/virt/xenapi/volume_utils.py |   20 +++++-----
 nova/virt/xenapi_conn.py         |   60 ++++++++++++++++++----------
 6 files changed, 118 insertions(+), 97 deletions(-)

commit 86b10119ca3649411c50ac3700a934efe40a09e5
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Oct 24 15:18:06 2011 -0400

    Server metadata must support server uuids.
    
    Change-Id: I933e8aebce94867e4d23c13d978032b0ae99b896

 nova/compute/api.py                              |   10 ++++++++++
 nova/tests/api/openstack/test_server_metadata.py |   12 ++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

commit adffdf2df98dadd884b1969ba45e9fdb0b4e9266
Author: James E. Blair <jeblair@hp.com>
Date:   Thu Oct 20 13:48:18 2011 -0400

    Add .gitreview config file for gerrit.
    
    The CI team is developing a new tool, git-review:
    
      https://github.com/openstack-ci/git-review
    
    which is intendend to replace rfc.sh.  This adds a .gitreview file
    so that it can automatically determine the canonical gerrit location
    for the repository when first run.  Later, rfc.sh will be updated to
    indicate it is deprecated, and then eventually removed.
    
    Change-Id: Ifc1d34143b1b90faa4324f7750bfc43f69a5f494

 .gitreview |    4 ++++
 1 file changed, 4 insertions(+)

commit 022afb9b0686f9d7af128f1a19927867cf08a180
Merge: 230b3af e1a743a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 24 16:44:10 2011 +0000

    Merge "Use UUIDs instead of IDs for OSAPI servers."

commit 230b3af8486a877bb33845423775522ff47f07ea
Merge: 1dde1d1 d04007e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 24 16:24:05 2011 +0000

    Merge "Refactoring nova.tests.api.openstack.test_flavors"

commit 1dde1d10f9e25d8e29619376a936f4973f8363ab
Merge: fa2c67d 3c6ce70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 24 16:16:02 2011 +0000

    Merge "Upgrade pip in the venv when we build it."

commit fa2c67d4a6a7eb89218a4bed04741f183b2d5948
Merge: f0dfa6d 0162a42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 24 15:45:02 2011 +0000

    Merge "Convert instancetype.flavorid to string"

commit 0162a42970b833c2d5d0802ff4c55f65fa253ee2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Oct 12 16:28:24 2011 -0400

    Convert instancetype.flavorid to string
    
    Fixes bug 861666. This also removes some direct database access
    in favor of using nova.compute.instance_types throughout the code.
    
    Change-Id: I572cc19454fa76f435f5672d3d6e7ed55c8817da

 nova/api/ec2/admin.py                              |    5 +-
 nova/api/openstack/flavors.py                      |   11 +-
 nova/compute/api.py                                |   10 +-
 nova/compute/instance_types.py                     |  110 ++++++------
 nova/compute/manager.py                            |   39 ++--
 nova/db/sqlalchemy/api.py                          |    9 +-
 .../versions/055_convert_flavor_id_to_str.py       |  117 ++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/network/manager.py                            |   11 +-
 nova/tests/api/openstack/test_flavors.py           |   32 ++--
 nova/tests/api/openstack/test_servers.py           |    8 +-
 nova/tests/test_compute.py                         |    6 +-
 nova/tests/test_instance_types.py                  |  186 +++++++++++++-------
 nova/virt/xenapi/vm_utils.py                       |    3 +-
 14 files changed, 368 insertions(+), 181 deletions(-)

commit 606827f92e74d8ff5ae13e3210abedd511fd4518
Author: Brad Hall <brad@nicira.com>
Date:   Mon Oct 3 12:07:50 2011 -0700

    Make sure networks returned from get_instance_nw_info have a label
    
    Change-Id: I3f1fd91cb05150bcbd5b32db1e8345b66d7fa348

 nova/network/quantum/manager.py            |    2 ++
 nova/network/quantum/quantum_connection.py |    4 ++++
 nova/tests/test_quantum.py                 |    3 +++
 3 files changed, 9 insertions(+)

commit e1a743a7eab1aaa8686873fc94249cefebd90e7c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Oct 19 14:12:23 2011 -0400

    Use UUIDs instead of IDs for OSAPI servers.
    
    Continues to support both UUIDs and IDs in the compute and db layers,
    but only exposes UUIDs in the ID fields of OSAPI responses. Technically,
    old ID-based URIs still work, but you likely can't find them any longer.
    This only affects servers--images and flavors still use integer IDs.
    
    Fixes bug 804093
    
    Change-Id: Iecf25c5402f355dd3f227b87a936fcc1b81371b6

 nova/api/openstack/common.py                       |   36 +-
 nova/api/openstack/contrib/volumes.py              |   11 +-
 nova/api/openstack/schemas/v1.1/server.rng         |    1 -
 nova/api/openstack/servers.py                      |   57 +--
 nova/api/openstack/views/servers.py                |    9 +-
 nova/compute/api.py                                |    2 +-
 .../api/openstack/contrib/test_admin_actions.py    |    4 +-
 .../tests/api/openstack/contrib/test_diskconfig.py |   17 +-
 .../openstack/contrib/test_virtual_interfaces.py   |    3 +-
 nova/tests/api/openstack/contrib/test_volumes.py   |    8 +-
 nova/tests/api/openstack/fakes.py                  |   23 +-
 nova/tests/api/openstack/test_common.py            |   16 +-
 nova/tests/api/openstack/test_extensions.py        |    4 +-
 nova/tests/api/openstack/test_images.py            |   85 +++--
 nova/tests/api/openstack/test_server_actions.py    |  123 +++---
 nova/tests/api/openstack/test_server_metadata.py   |   96 ++---
 nova/tests/api/openstack/test_servers.py           |  400 +++++++++++---------
 nova/tests/api/openstack/test_versions.py          |   19 +-
 nova/tests/integrated/test_volumes.py              |    1 -
 19 files changed, 476 insertions(+), 439 deletions(-)

commit f0dfa6d3dfb09417426ccad717492c9ae417f47e
Merge: 71f2b0d 3480cac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 21 21:07:56 2011 +0000

    Merge "Refactoring of extensions"

commit ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb
Author: David Subiros <david.perez5@hp.com>
Date:   Fri Aug 5 16:35:56 2011 +0100

    Improve the liveness checking for services
    
    With this modification both nova-manage and scheduler use the flag
    service_down_time and check positive and negative values in a
    correct way.
    Fixes bug: 867674.
    
    Change-Id: I15c48d80cafa2089cd228c09c61b0a1e513730e8

 bin/nova-manage          |    2 +-
 nova/scheduler/driver.py |    6 ++----
 nova/utils.py            |    9 +++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

commit 3480cac1893c697aa290e6c3f56b2b7d97007adc
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Oct 20 18:07:02 2011 -0500

    Refactoring of extensions
    
    This is a refactoring of API extensions.  Changes include better use
    of Python idioms and improved support for loading extensions.
    
    Change-Id: I9279c4e5781f049ab9e0e995f6aeda48f17c5831

 nova/api/openstack/contrib/__init__.py             |   68 +++++++++
 nova/api/openstack/contrib/admin_actions.py        |   30 ++--
 nova/api/openstack/contrib/createserverext.py      |   19 +--
 nova/api/openstack/contrib/deferred_delete.py      |   26 ++--
 nova/api/openstack/contrib/diskconfig.py           |   21 +--
 nova/api/openstack/contrib/flavorextradata.py      |   20 +--
 nova/api/openstack/contrib/flavorextraspecs.py     |   20 +--
 nova/api/openstack/contrib/floating_ips.py         |   26 ++--
 nova/api/openstack/contrib/hosts.py                |   18 +--
 nova/api/openstack/contrib/keypairs.py             |   20 +--
 nova/api/openstack/contrib/multinic.py             |   38 +----
 nova/api/openstack/contrib/quotas.py               |   19 +--
 nova/api/openstack/contrib/rescue.py               |   27 ++--
 nova/api/openstack/contrib/security_groups.py      |   25 +--
 nova/api/openstack/contrib/simple_tenant_usage.py  |   18 +--
 nova/api/openstack/contrib/virtual_interfaces.py   |   19 +--
 .../openstack/contrib/virtual_storage_arrays.py    |   19 +--
 nova/api/openstack/contrib/volumes.py              |   18 +--
 nova/api/openstack/contrib/volumetypes.py          |   20 +--
 nova/api/openstack/contrib/zones.py                |   25 ++-
 nova/api/openstack/extensions.py                   |  159 ++++++++------------
 nova/flags.py                                      |    5 +-
 nova/tests/api/openstack/extensions/foxinsocks.py  |   23 +--
 nova/tests/api/openstack/test_extensions.py        |   62 +++-----
 nova/tests/integrated/test_extensions.py           |    7 +-
 25 files changed, 291 insertions(+), 461 deletions(-)

commit fd3c41462d76c6cf1602d882812946ec1de9a397
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 20 15:21:42 2011 -0700

    Moves a-zone scheduling into simple scheduler
    
     * removes zone scheduler
     * adds logic to simple scheduler to handle availability zones
     * adds tests to verify availability zone is respected
    
    Change-Id: I69fd0d411d2e1b64914b073ae7a967a188f09d48

 nova/scheduler/simple.py               |   28 ++++--
 nova/scheduler/zone.py                 |   77 ----------------
 nova/tests/scheduler/test_scheduler.py |  152 ++++++++++++++++----------------
 3 files changed, 93 insertions(+), 164 deletions(-)

commit 71f2b0dfac30537054376d583323f9912078788c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Oct 20 14:44:11 2011 -0500

    Adds ext4 and reiserfs to _mount_filesystem().
    
    Fixes bug 870495.
    
    Change-Id: I6071b833040b8a1118f0764c44202ba3964e17a8

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 75a3fbb21eebd4de8775b63c327d9d57859d090c
Merge: a6ac0bc a8264c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 20 14:37:51 2011 +0000

    Merge "Fixes bug 872459."

commit 2463d9d185f13647d51b77f9e37a7b1e5754ddb7
Author: Asbjørn Sannes <asbjorn.sannes@interhost.no>
Date:   Thu Oct 20 11:27:23 2011 +0200

    Remove nova dependency on vconfig on Linux.
    
    iproute2 is already a dependency and is used everywhere and is more
    capable than vconfig. This commit just replaces all uses of vconfig.
    
    Change-Id: I5860a10f151a176bf9849feda6052d4c2b491e07

 nova/network/linux_net.py |    7 +++----
 tools/clean-vlans         |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

commit 3c6ce70a51890b1cff515d113b316bcabaa99dd2
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Oct 19 18:03:51 2011 -0400

    Upgrade pip in the venv when we build it.
    
    Change-Id: I924975170c9e3a1ef23b5195cb3a6eed675ec043

 tools/install_venv.py |    3 +++
 1 file changed, 3 insertions(+)

commit a6ac0bc245962d6c0d3fe30f187b1e1fcd25bc7e
Merge: b08d7f9 5ee3e31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 19 20:17:02 2011 +0000

    Merge "Start switching from gflags to optparse"

commit a8264c415facb9b43e800202173ac78821d1ab57
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Oct 19 14:22:20 2011 -0500

    Fixes bug 872459.
    
    Change-Id: I59953c59a462b7ebd54b49843cc954b383d6b470

 nova/network/linux_net.py |   11 -----------
 1 file changed, 11 deletions(-)

commit b08d7f916679946b711572568a6d615ab4b47bb2
Merge: 8b99931 bee2779
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 19 18:08:04 2011 +0000

    Merge "Repartition and resize disk when marked as managed."

commit 8b99931b2cdf9633f9f69819dd8906fe3f4c1c50
Merge: 9eefcd3 2d6b418
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 19 16:58:32 2011 +0000

    Merge "Remove dead DB API call."

commit bee277902b71650a9201651bcc916f3969bdc733
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Oct 17 16:01:46 2011 +0000

    Repartition and resize disk when marked as managed.
    
    Implements part of the instance-disk-management blueprint.
    
    Change-Id: I16d0f816cdf82ee1e19a323cb9976477924e4c5c

 nova/compute/api.py          |    7 +++-
 nova/tests/test_xenapi.py    |   90 ++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py                |    5 ++-
 nova/virt/xenapi/vm_utils.py |   74 ++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py    |   12 ++++++
 5 files changed, 186 insertions(+), 2 deletions(-)

commit 2d6b418bf6c643d4902d494f5e6b80d750a14178
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Oct 19 09:43:02 2011 -0700

    Remove dead DB API call.
    
    Removes instance_set_state() from db/api.py.  The sqlalchemy version was
    removed a while ago so this call is dead.
    
    Change-Id: Icf6f55481bc0c6a9394ca9b7a15fcdab2c1ad483

 nova/db/api.py |    5 -----
 1 file changed, 5 deletions(-)

commit 9eefcd3aa7cfad2e0c3753695ae63f6b384b1c00
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Oct 18 13:33:00 2011 -0500

    Only log instance actions once if instance action logging is enabled (now disabled by default).
    
    Fixes bug 874487.
    
    Change-Id: I25b4e82bd71ab8073953d5ddbcb013757619d548

 nova/virt/xenapi_conn.py |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

commit 08486b1bbf7c33459e55e0bd4685f9aae4c4d022
Merge: 2431b78 1d5fd3d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 19 14:41:01 2011 +0000

    Merge "Updated RST docs: bzr/launchpad -> git/github"

commit 5ee3e31eb189b7bc46bb009b99c12b8e58417a0d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Oct 14 12:25:30 2011 +0100

    Start switching from gflags to optparse
    
    Re-write the nova.flags module to use optparse instead of gflags.
    
    This provides an easier path to switching completely to optparse.
    Next steps are to:
    
      1) Gradually switch each of the individual flags to optparse
    
      2) Re-use config code from other projects via openstack-common
    
    optparse was chosen instead of argparse purely because that's what
    the other projects use and that's what makes most sense for
    openstack-common. Switching to argparse is something that can be
    done later in openstack-common.
    
    Change-Id: Ia49d42b4c7cc208fba140db6b8fd8f33c0f89e04

 nova/flags.py            |  337 ++++++++++++++++++++++++----------------------
 nova/tests/test_flags.py |   90 +++++++++++++
 2 files changed, 269 insertions(+), 158 deletions(-)

commit 2431b7848d633dc67ad684b4d1cc79468df24568
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Oct 18 22:08:49 2011 +0000

    Don't leak exceptions out to users
    
    Fixed bug 874472
    
    Exceptions can contain all kinds of sensitive information, including
    SQL queries (and arguments), configuration information and in some
    cases the correct password (bug 868360). The information isn't useful
    to users, so don't return potentially sensitive information. The
    exceptions still get logged for debugging and troubleshooting purposes.
    
    Change-Id: I97cc72aec4e83ce866169ed94146d911aa8f6a6a

 nova/api/openstack/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 926ec59983704f3e4c8527e5e479a0cb12acbf96
Merge: f0125d2 4eeb0b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 18 22:05:07 2011 +0000

    Merge "Chain up to superclass tearDown in ServerActionsTest"

commit f0125d26ef773a489e4b924bcaa1195610ef6026
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Oct 18 13:28:28 2011 -0700

    Fix EC2 test_cloud timing issues
    
    Fixes bug 877661
    
    Unfortunately, these tests are really integration tests.  Being that
    they are, rpc.cast is now stubbed to do an rpc.call to ensure the
    operations complete.  No need for sleeps anymore.
    
    This also uncovers some other issues with the tests..  And it uncovers a
    bug in the network API where a wrong argument is passed to destroy a
    floating IP.
    
    Change-Id: Ia7f40718533e450f00cd3e7d753ac65755c70588

 nova/network/api.py              |    2 +-
 nova/tests/api/ec2/test_cloud.py |  127 ++++++++++++--------------------------
 2 files changed, 42 insertions(+), 87 deletions(-)

commit e92494eeac688677f851028ae0dcb97031bea064
Merge: 0001744 7f37543
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 18 19:18:33 2011 +0000

    Merge "Refactoring image and server metadata api tests"

commit 000174461a96ca70c76c8f3a85d9bf25fe673a2d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Oct 14 10:02:57 2011 -0400

    Redirects requests from /v#.# to /v#.#/
    
    Added an APIMapper to catch routemaps when the url is '' because routes.Mapper returns an error if this is the case but we want a redirect
    Fixes bug 865585
    Related to Routes issue: https://bitbucket.org/bbangert/routes/issue/37/mapper-and-false-url
    
    Change-Id: I5bc7cbde25726b340e110a8e62499b47e25bc0cd

 nova/api/openstack/__init__.py            |   12 +++++++++++-
 nova/tests/api/openstack/test_versions.py |    8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 9f8e599022c868035a38ee2143788426a1e3a146
Merge: 821fae9 77c1040
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 18 14:20:57 2011 +0000

    Merge "Refactoring nova.tests.api.openstack.test_servers"

commit 4eeb0b96fcd37b6ec8a3e6c2db22e014b326b9c2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Oct 15 16:15:13 2011 +0100

    Chain up to superclass tearDown in ServerActionsTest
    
    I noticed that HostTestCase was failing if run on its own because
    allow_admin_api wasn't set - it worked fine when the full suite was
    run because the flag was being leaked from ServerActionsTest.
    
    Change-Id: I9072f84f017125536d1f261165c44413964f5708

 nova/tests/api/openstack/test_server_actions.py |    1 +
 nova/tests/test_hosts.py                        |    3 +++
 2 files changed, 4 insertions(+)

commit 1d5fd3d98cb4d13686120894eb1bb1f337b6f8ba
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Oct 17 16:01:28 2011 -0400

    Updated RST docs: bzr/launchpad -> git/github
    
    Change-Id: I3534cc380cb9170ff96f710250b470dc284e5680

 doc/source/community.rst                      |   13 +++++++++----
 doc/source/devref/development.environment.rst |   16 +++++-----------
 doc/source/nova.concepts.rst                  |    1 +
 doc/source/quickstart.rst                     |    9 ++++++---
 4 files changed, 21 insertions(+), 18 deletions(-)

commit d04007efd236f9cacf381b622b19cdad7e4529e8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Oct 17 14:49:28 2011 -0400

    Refactoring nova.tests.api.openstack.test_flavors
    
    Change-Id: I668e7b7fb379a99edee8a8f5ca948a32c0ba9896

 nova/api/openstack/flavors.py            |    2 +-
 nova/tests/api/openstack/test_flavors.py |   68 +++++++++++-------------------
 2 files changed, 26 insertions(+), 44 deletions(-)

commit 7f37543cb682403274d402f0630545cf2fb765be
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Oct 17 18:17:18 2011 -0400

    Refactoring image and server metadata api tests
    
    Change-Id: Ie8abd19af727d665f5b137d34b3d63126eb5d0aa

 nova/api/openstack/server_metadata.py            |    6 +-
 nova/tests/api/openstack/test_image_metadata.py  |  173 ++++++------
 nova/tests/api/openstack/test_server_metadata.py |  305 ++++++++--------------
 3 files changed, 202 insertions(+), 282 deletions(-)

commit 821fae95d6aa86ffd14a4e48254da8ee7392c042
Merge: ed0c573 9a15c0d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 17 22:17:19 2011 +0000

    Merge "Add XML templates."

commit ed0c5731b70771e08e1ae75db0a0a0cf6e72c9e9
Merge: 16582ce 4056cb7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 17 21:32:09 2011 +0000

    Merge "Refactoring nova.tests.api.openstack.test_images"

commit 77c10407b66a182dbd1392b249d18a4431b8b8c2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Oct 17 16:34:10 2011 -0400

    Refactoring nova.tests.api.openstack.test_servers
    
    Change-Id: Ia2e1a6f93ffe89e75422da0df0f6bf58d6076a3f

 nova/api/openstack/servers.py                   |    8 +-
 nova/tests/api/openstack/fakes.py               |   18 +-
 nova/tests/api/openstack/test_server_actions.py |   17 +
 nova/tests/api/openstack/test_servers.py        | 1607 ++++++++---------------
 4 files changed, 575 insertions(+), 1075 deletions(-)

commit 4056cb7feea77978afcb5232ae5aa5d5b1bd6148
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Oct 17 14:20:41 2011 -0400

    Refactoring nova.tests.api.openstack.test_images
    
    Change-Id: I3f3184647bb0dd2f10260a87d764122759d40e57

 nova/tests/api/openstack/fakes.py       |   19 ++-
 nova/tests/api/openstack/test_auth.py   |    8 +-
 nova/tests/api/openstack/test_images.py |  269 ++++++++++---------------------
 3 files changed, 107 insertions(+), 189 deletions(-)

commit 16582ce70c44b5d1eb88ede75f072ef6e684fb35
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Oct 17 14:17:52 2011 -0500

    Utility script that makes enforcing PEP8 within git's pre-commit hook as easy as possible.
    
    This should be mandatory for all developers, IMHO.
    
    Change-Id: I83e8a7ab0a82df0fd08a2bef80295344b3a00a86

 tools/enable-pre-commit-hook.sh |   42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

commit 6589c44418fefc6bdb962c33c9880006c06c69a4
Merge: b44299e b931d51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 17 19:38:32 2011 +0000

    Merge "Makes snapshots work for amis. Fixes bug 873156"

commit 9a15c0d070db086111cbe5eff4f19dcb419b32bc
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Oct 17 14:19:25 2011 -0500

    Add XML templates.
    
    Creates the concept of an XML template, which is a description of
    how to serialize an object into XML.  XML templates are split into
    master and slave templates, and slave templates can be attached to
    master templates to augment the serialization.  The expected use
    case is with extensions, allowing extensions to not only add data
    to the object, but to also ensure that the new data gets
    serialized into the output XML representation.
    
    Also includes lazy serialization, for use by extensions.
    
    Change-Id: Ifd8493be04c73bbb2a850080b687c5e799c48239

 etc/nova/api-paste.ini                            |    7 +-
 nova/api/openstack/accounts.py                    |   25 +-
 nova/api/openstack/common.py                      |   91 ++-
 nova/api/openstack/consoles.py                    |   49 +-
 nova/api/openstack/extensions.py                  |   14 +-
 nova/api/openstack/flavors.py                     |   92 +--
 nova/api/openstack/images.py                      |  133 ++--
 nova/api/openstack/ips.py                         |   65 +-
 nova/api/openstack/limits.py                      |   78 +-
 nova/api/openstack/servers.py                     |  220 +++---
 nova/api/openstack/users.py                       |   40 +-
 nova/api/openstack/wsgi.py                        |   49 +-
 nova/api/openstack/xmlutil.py                     |  855 +++++++++++++++++++++
 nova/api/openstack/zones.py                       |   71 +-
 nova/tests/api/openstack/extensions/foxinsocks.py |   12 +-
 nova/tests/api/openstack/fakes.py                 |   12 +-
 nova/tests/api/openstack/test_accounts.py         |   52 ++
 nova/tests/api/openstack/test_consoles.py         |   66 ++
 nova/tests/api/openstack/test_extensions.py       |   46 +-
 nova/tests/api/openstack/test_limits.py           |    4 +-
 nova/tests/api/openstack/test_users.py            |   76 ++
 nova/tests/api/openstack/test_wsgi.py             |   85 +-
 nova/tests/api/openstack/test_xmlutil.py          |  763 ++++++++++++++++++
 nova/tests/api/openstack/test_zones.py            |  140 +++-
 24 files changed, 2603 insertions(+), 442 deletions(-)

commit b44299e1f6b58f02d730eeb63baf9cab15f74578
Merge: edf3e39 384b284
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 17 18:38:39 2011 +0000

    Merge "Remove unused flag_overrides from TestCase"

commit edf3e39cd395150adfe36375b09253f2eef0bd2e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Oct 11 16:32:56 2011 -0400

    Remove OSAPI v1.0
    
    Change-Id: I92302c9c2b8f98d140c4844d4522adbcb45c8dd7

 MANIFEST.in                                        |    1 -
 etc/nova/api-paste.ini                             |   12 +-
 nova/api/openstack/__init__.py                     |   60 +-
 nova/api/openstack/backup_schedules.py             |   67 --
 nova/api/openstack/common.py                       |    1 -
 nova/api/openstack/contrib/createserverext.py      |    4 +-
 .../openstack/contrib/virtual_storage_arrays.py    |    2 +-
 nova/api/openstack/contrib/volumes.py              |    2 +-
 nova/api/openstack/faults.py                       |   14 +-
 nova/api/openstack/flavors.py                      |   31 +-
 nova/api/openstack/images.py                       |  102 +--
 nova/api/openstack/ips.py                          |   58 +-
 nova/api/openstack/limits.py                       |   47 +-
 nova/api/openstack/notes.txt                       |   20 -
 nova/api/openstack/servers.py                      |  244 +-----
 nova/api/openstack/shared_ip_groups.py             |   52 --
 nova/api/openstack/versions.py                     |   44 +-
 nova/api/openstack/views/addresses.py              |   25 -
 nova/api/openstack/views/flavors.py                |   28 +-
 nova/api/openstack/views/images.py                 |  105 +--
 nova/api/openstack/views/limits.py                 |   28 -
 nova/api/openstack/views/servers.py                |  101 +--
 nova/api/openstack/zones.py                        |    4 +-
 nova/tests/api/openstack/fakes.py                  |   14 +-
 nova/tests/api/openstack/test_accounts.py          |    8 +-
 nova/tests/api/openstack/test_adminapi.py          |   47 -
 nova/tests/api/openstack/test_auth.py              |   51 +-
 nova/tests/api/openstack/test_consoles.py          |   18 +-
 nova/tests/api/openstack/test_extensions.py        |   22 +-
 nova/tests/api/openstack/test_faults.py            |   59 +-
 nova/tests/api/openstack/test_flavors.py           |  100 +--
 nova/tests/api/openstack/test_images.py            |  305 +------
 nova/tests/api/openstack/test_limits.py            |  144 +---
 nova/tests/api/openstack/test_server_actions.py    |  527 ++++-------
 nova/tests/api/openstack/test_servers.py           |  911 ++------------------
 nova/tests/api/openstack/test_shared_ip_groups.py  |   51 --
 nova/tests/api/openstack/test_urlmap.py            |   31 -
 nova/tests/api/openstack/test_users.py             |   14 +-
 nova/tests/api/openstack/test_versions.py          |  286 +-----
 nova/tests/api/openstack/test_zones.py             |   16 +-
 nova/tests/integrated/test_servers.py              |    7 +-
 41 files changed, 483 insertions(+), 3180 deletions(-)

commit ddb49f7929bf29d2003ffdd3a14831d36d2f9d07
Merge: 1ebd98e 261b411
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 17 17:36:31 2011 +0000

    Merge "Explicit errors on confirm/revertResize failures"

commit 384b2842cf2c4fd841e7eebc390fcd8d9a236b75
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Oct 15 16:44:56 2011 +0100

    Remove unused flag_overrides from TestCase
    
    This was replaced by _original_flags in e0ae19c7a, but it wasn't
    actually removed.
    
    Change-Id: I89ed7de263ff040d86dea970aa8fcda640d19f79

 nova/test.py |    4 ----
 1 file changed, 4 deletions(-)

commit 1ebd98e3d20a35fc543800677cfe5e006a2f8cab
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Oct 14 16:15:25 2011 -0500

    Cancel any clean_reboot tasks before issuing the hard_reboot.
    
    Fixes bug 873099.
    
    Change-Id: Id296cf60c832b31dd5320e119c797975d7a86299

 nova/virt/xenapi/vmops.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 85fc484109d90ce8dcd714ef9d2df468bd54c7fe
Merge: 0afe4aa 8fcc23c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 14 19:30:09 2011 +0000

    Merge "Use latest version of SQLAlchemy"

commit 0afe4aaa50ad62f1faa5c482b6cc40c4b953e584
Merge: c9d2aa8 5b173ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 14 19:19:41 2011 +0000

    Merge "Ensure non-default FLAGS.logfile_mode is properly converted to an octet."

commit c9d2aa8a72c16bfdf76e9a8622143ef7cf500cca
Merge: 80105fb e50e9b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 14 19:04:13 2011 +0000

    Merge "Adds the ability to automatically issue a hard reboot to instances that have been stuck in a 'rebooting' state for longer than a specified window."

commit 80105fbc530b7fc842f1fa8f8318128cf067fb77
Merge: 52b5611 46d0483
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 14 18:54:09 2011 +0000

    Merge "Xenapi driver can now generate swap from instance_type"

commit 52b5611a863bd59102a492237f9cd7049c2908c2
Merge: d01f17f 6835f46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 14 17:41:17 2011 +0000

    Merge "Added vcpu_weight to models."

commit b931d51ce47203ee6a4433dc7577e0779ab94710
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 14 10:06:00 2011 -0700

    Makes snapshots work for amis. Fixes bug 873156
    
    Change-Id: I6ceb714f31afaf59c28c5ab3b2ab85409dbe89c6

 nova/image/fake.py              |   20 +++++++++----------
 nova/tests/test_image.py        |    3 ++-
 nova/tests/test_libvirt.py      |   41 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    9 ++++++++-
 4 files changed, 61 insertions(+), 12 deletions(-)

commit 46d04831f5c290a40c14da415169749e2ef41383
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Oct 10 17:58:56 2011 -0500

    Xenapi driver can now generate swap from instance_type
    
    Change-Id: I50268a85ccd62b019436a207c2b52b1901597564

 nova/compute/manager.py      |   10 +---
 nova/tests/db/fakes.py       |   15 ++++--
 nova/tests/test_xenapi.py    |   29 ++++++++--
 nova/utils.py                |   34 ++++++++++++
 nova/virt/xenapi/vm_utils.py |  122 ++++++++++++++++++++++++++++++------------
 nova/virt/xenapi/vmops.py    |   22 ++++++--
 6 files changed, 176 insertions(+), 56 deletions(-)

commit e50e9b44ab2b8b1184f93d24734af4b5862777bf
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Oct 13 13:14:57 2011 -0500

    Adds the ability to automatically issue a hard reboot to instances that have been stuck in a 'rebooting' state for longer than a specified window.
    
    Fixes bug 873099.
    
    Change-Id: Ife2c64326fdb3ec849242583d1bd1d96f9f4be0f

 nova/compute/manager.py         |   12 ++++++++++++
 nova/db/api.py                  |    6 ++++++
 nova/db/sqlalchemy/api.py       |   15 +++++++++++++++
 nova/tests/test_db_api.py       |   24 ++++++++++++++++++++++++
 nova/tests/test_virt_drivers.py |    4 ++++
 nova/virt/driver.py             |    5 +++++
 nova/virt/fake.py               |    3 +++
 nova/virt/hyperv.py             |    6 ++++++
 nova/virt/libvirt/connection.py |    4 ++++
 nova/virt/xenapi/vm_utils.py    |    2 +-
 nova/virt/xenapi/vmops.py       |   20 ++++++++++++++++++++
 nova/virt/xenapi_conn.py        |    4 ++++
 12 files changed, 104 insertions(+), 1 deletion(-)

commit d01f17f544a03887900f6c57b0fc29016d375e58
Merge: 5c2d2c1 59abf7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 21:06:13 2011 +0000

    Merge "Remove redundant, dead code."

commit 5c2d2c168b30fdf62b72dffd09fcf6fc9c878a33
Merge: ff1263a 5aa5229
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 20:56:29 2011 +0000

    Merge "Adds more usage data to Nova's usage notifications."

commit 59abf7ae5aa27a87700a1e2f2b379904e5774a9b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Oct 13 14:58:19 2011 -0500

    Remove redundant, dead code.
    
    Removes the module-level function get_vdi_for_vm_safely(), which was
    not used; everything used VMHelper.get_vdi_for_vm_safely().
    
    Change-Id: I8c9c5aa3150384da201c36f1842ae5a09b90f431

 nova/virt/xenapi/vm_utils.py |   16 ----------------
 1 file changed, 16 deletions(-)

commit 6835f46738d286591990819356b02670d7524257
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Oct 13 14:15:37 2011 -0500

    Added vcpu_weight to models.
    
    Fixes bug 873610.
    
    Change-Id: Iba4952b5ef29ade2795e78b55baf41f7063ca136

 .../051_add_vcpu_weight_to_instance_types.py       |    2 +-
 nova/db/sqlalchemy/models.py                       |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit ff1263aed3c886fc38e526f1176452171bf9545f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Oct 13 14:16:34 2011 -0400

    Updated links in the README that were out of date.
    
    Change-Id: I4ea604ceac1fa01b8e55be85dab86b46ca54e713

 README |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit bc16182f5cfd34738c3c70e151bcd4f4ea52779d
Merge: 4eb6fd9 51495a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 15:47:33 2011 +0000

    Merge "Remove RateLimitingMiddlewareTest"

commit 4eb6fd95f7dc989906d2632a673e7e4c8a47ee1c
Merge: cd250aa d503dd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 13:55:51 2011 +0000

    Merge "Add INPUT chain rule for EC2 metadata requests (lp:856385)"

commit cd250aa8483fbf8a98cdefc4281a08c36892f46c
Merge: 8010ab4 871141d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 08:45:58 2011 +0000

    Merge changes I1c0064e5,I86d491cf
    
    * changes:
      Allow the user to choose either ietadm or tgtadm (lp:819997)
      Remove VolumeDriver.sync_exec method (lp:819997)

commit d503dd6de4f45f149dfa295fd3137f4944ed7f66
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Sep 5 07:10:52 2011 +0100

    Add INPUT chain rule for EC2 metadata requests (lp:856385)
    
    On Fedora, the default policy for the INPUT chain in the filter table
    is DROP. This means that EC2 metadata requests from guests get dropped.
    
    Add this rule to let it through:
    
    $> sudo iptables -t filter -A nova-network-INPUT \
                     -s 0.0.0.0/0 -d $ec2_dmz_host \
                     -m tcp -p tcp --dport $ec2_port -j ACCEPT
    
    It makes no sense to have nova-network add an iptables rule for the EC2
    metadata service, since they may not actually be on the same host.
    
    Instead, nova-api should add it directly. In order to do that, we add a
    manager class for API services and allow the EC2 manager use the network
    driver to add the rule.
    
    Change-Id: I7c1f973c662a6d290e555b6a2ce8fc301f27b543

 nova/api/manager.py       |   42 ++++++++++++++++++++++++++++++++++++++++++
 nova/flags.py             |    3 +++
 nova/network/linux_net.py |   11 +++++++++++
 nova/network/manager.py   |    2 --
 nova/service.py           |   28 ++++++++++++++++++++++++++++
 5 files changed, 84 insertions(+), 2 deletions(-)

commit 871141d4d3cc0ac739de72ca010aef3e5c13fe1f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Aug 11 07:44:38 2011 -0400

    Allow the user to choose either ietadm or tgtadm (lp:819997)
    
    Also, refactor ietadm/tgtadm calls out into helper classes. Add a new
    TargetAdmin abstract base class and implement it using ietadm and
    tgtadm. This cleans up the code greatly and gets us some code reuse.
    
    (Based on a patch by Chuck Short <zulcss@ubuntu.com>)
    
    Change-Id: I1c0064e5d35483a6c4059cfc61a484f5f576b2da

 nova/tests/test_iscsi.py  |  116 +++++++++++++++++++++++++++++++++
 nova/tests/test_volume.py |   16 ++---
 nova/volume/driver.py     |   52 +++++++--------
 nova/volume/iscsi.py      |  156 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 301 insertions(+), 39 deletions(-)

commit 2522a4438b1bc6799845f733894bc1d64b2a755f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sun Sep 18 12:04:46 2011 +0100

    Remove VolumeDriver.sync_exec method (lp:819997)
    
    We always use the same functions for sync_exec and execute.
    
    The execute method is always synchronous, so the distinction doesn't
    appear to make sense.
    
    Finally, it looks like it would make sense for execute to ever be
    async, so the distinction isn't even serving a useful documentation
    purpose.
    
    Change-Id: I86d491cfbf8be73672df7cfdf22e465627a86034

 nova/tests/test_volume.py |    1 -
 nova/volume/driver.py     |   91 +++++++++++++++++++++------------------------
 2 files changed, 43 insertions(+), 49 deletions(-)

commit 8010ab4e31a1487375d4d01b18a0f56434fba15d
Merge: 1d0a030 5ae7fb0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 05:58:40 2011 +0000

    Merge "api.ec2.admin unit tests"

commit 1d0a030e676cb33733ca1bd6b384ca9a682aa5dc
Merge: f9aeb86 65d6b6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 05:29:29 2011 +0000

    Merge "Beef up nova/api/direct.py tests"

commit f9aeb869618fc7eafe8cfc2f28430f505bedb782
Merge: 7d34fb7 6c97436
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 04:49:38 2011 +0000

    Merge changes I94c7464b,Ibfeeb9c2
    
    * changes:
      install_venv: pip install M2Crypto doesn't work on Fedora
      install_venv: add support for distro specific code

commit 7d34fb75050b7579632de6f7f3bc6818ff6465cd
Merge: d83f45f 60b3d3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 04:39:08 2011 +0000

    Merge "Use new ip addr del syntax"

commit d83f45faf1ded92a0766548d6ebaef3d4c7e08e9
Merge: 01e68c3 80e1960
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 13 00:17:49 2011 +0000

    Merge "Restructure host filtering to be easier to use."

commit 01e68c3de5b3c1cb6630bea862807089b77926d0
Merge: d03daea 907ff41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 22:19:25 2011 +0000

    Merge "Updating HACKING to make split up imports into three blocks"

commit d03daea9e153912ade6d2fe6907e9578bf1cb0e5
Merge: c0cf874 48fc661
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 21:53:56 2011 +0000

    Merge "Fixes bug 862637 -- make instance_name_template more flexible"

commit 5aa522908264b5ef97387821e18c13ad9a9b95a1
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Sep 30 00:39:46 2011 +0000

    Adds more usage data to Nova's usage notifications.
    
    Adds in bandwidth, state and IP data on standard notifications,
    and new notifications on add/remove IP.
    
    These were missing before, and are needed to meet spec.
    This fixes bug 849117
    
    Change-Id: Ie586ff3a91a56e5f5eff8abc6905ba6a0b624451

 bin/instance-usage-audit                           |   64 +++---------
 nova/compute/manager.py                            |   43 +++++++++
 nova/compute/utils.py                              |   56 +++++++++++
 nova/db/api.py                                     |   24 +++++
 nova/db/sqlalchemy/api.py                          |   36 +++++++
 .../versions/054_add_bw_usage_data_cache.py        |   57 +++++++++++
 nova/db/sqlalchemy/models.py                       |   14 ++-
 nova/exception.py                                  |    4 +
 nova/flags.py                                      |    4 +
 nova/tests/test_compute.py                         |   55 ++++++++++-
 nova/tests/test_compute_utils.py                   |   99 +++++++++++++++++++
 nova/utils.py                                      |   47 ++++++++-
 nova/virt/driver.py                                |    5 +
 nova/virt/fake.py                                  |    6 ++
 nova/virt/xenapi/vm_utils.py                       |  102 ++++++++++++++++++++
 nova/virt/xenapi/vmops.py                          |   32 ++++++
 nova/virt/xenapi_conn.py                           |   20 ++++
 17 files changed, 609 insertions(+), 59 deletions(-)

commit c0cf874acb3a67371ebbd5abbd274f61ffa09396
Merge: c12d610 7a2be62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 17:14:18 2011 +0000

    Merge "Update EC2 get_metadata calls to search 'deleted': False. Fixes nova smoke_tests!!!"

commit 48fc6611d15aaedc68747df150480250816fc04e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 29 21:27:18 2011 +0000

    Fixes bug 862637 -- make instance_name_template more flexible
    
    Allow use of %(uuid)s in the template.. along with any other Instance
    attribute.
    
    Change-Id: I0c0ed8cf51d5cfc632c957c4559014eb1d7844d1

 nova/db/sqlalchemy/models.py |   16 +++++++++++++++-
 nova/tests/test_compute.py   |   28 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

commit c12d610878cf9dd974d5811af20ff76635f60063
Merge: e47ddfd 0a56ae6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 16:36:07 2011 +0000

    Merge "Allow tenant networks to be shared with domain 0."

commit 7a2be6264d70faf7f97d12a3f8a252335268359f
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Oct 12 11:17:49 2011 -0400

    Update EC2 get_metadata calls to search 'deleted': False. Fixes nova smoke_tests!!!
    
    Change-Id: Ibbca93dda82013a5df51ff77b0df806fbb612af6

 nova/api/ec2/cloud.py |    4 ++--
 nova/compute/api.py   |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

commit e47ddfd23efb9bd6c5b67b183df348252d4e8d04
Merge: 93378ee 16e3f2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 16:19:53 2011 +0000

    Merge "Use ovs-vsctl iface-to-br to look up the bridge associated with the given VIF. This avoids assuming that vifX.Y is attached to xenbrY, which is untrue in the general case."

commit 93378ee627a0155820a8dc28bc4cde647a910d67
Merge: c3defed a5fc312
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 15:52:47 2011 +0000

    Merge "install_venv: remove versioned M2Crypto dependency"

commit c3defedb3a956f4f701c5955e73f6177b512c749
Merge: 7ca47db 7eeee58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 15:40:33 2011 +0000

    Merge "install_venv: don't use --no-site-packages with virtualenv"

commit 7ca47db2c7b38078a1c9b8a8d820d1527edbef38
Merge: f0a2907 f373a0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 15:24:43 2011 +0000

    Merge "install_venv: pass the --upgrade argument to pip install"

commit f0a2907e58bdfacf92856817597d359e4a2b0678
Merge: f5f429b de5e6ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 15:15:12 2011 +0000

    Merge "install_venv: refactor out pip_install helper"

commit 60b3d3fbd12f62fd2077401c12112fc48c886246
Author: Stanislaw Pitucha <stanislaw.pitucha@hp.com>
Date:   Fri Sep 30 15:50:29 2011 +0100

    Use new ip addr del syntax
    
    Start appending the /32 suffix to the addresses when removing floating IPs.
    Fixes bug 865371.
    
    Change-Id: I77df5748ba5417b7474a90e641ecc8adc76921c2

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 907ff41ec1812fb189ee52145c197474b6e84b72
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Oct 11 23:52:41 2011 -0400

    Updating HACKING to make split up imports into three blocks
    
    Change-Id: I6426365aa03f579275da91380bd7f5716ff54e26

 HACKING |    5 +++++
 1 file changed, 5 insertions(+)

commit f5f429bac6446db084ca3f5d86c64127a1e539f2
Merge: e95e923 f3fb16a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 01:40:04 2011 +0000

    Merge "Adds the tenant id to the create images response Location header Fixes bug 862672"

commit 51495a46eced3182ed735487f0f018da12f6bc1c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Oct 11 21:29:29 2011 -0400

    Remove RateLimitingMiddlewareTest
    
    These tests duplicate those in nova.tests.api.openstack.test_limits and
    would always fail when specifically running the nova.tests.api.openstack
    test module.
    
    Change-Id: I38fcb9a786dadb8476fd5780a3040165f66350df

 nova/tests/api/openstack/__init__.py |   79 ----------------------------------
 1 file changed, 79 deletions(-)

commit e95e923f2bee1fa3e5005bb99ec0d41e4931cec8
Merge: 5ac67d8 b84d71c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 01:19:16 2011 +0000

    Merge "Updating image progress to be more granular. Before, the image progress had only 2 states, 0 and 100. Now it can be 0, 25, 50 or 100."

commit 5ac67d89eb0f3484f78c61f471e72a42972fe4ff
Merge: 82329b2 a870dfa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 01:09:43 2011 +0000

    Merge "Add nova-all to run all services"

commit 82329b2992d1842f61c707092605a102f9ccabb3
Merge: eb03d47 114ca0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 12 00:21:42 2011 +0000

    Merge "Fix the grantee group loading for source groups"

commit eb03d47fecd3bfc24243da29ee01679b334a08fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 23 09:22:32 2011 -0700

    Remove AoE, Clean up volume code
    
     * Removes Ata Over Ethernet
     * Adds drivers to libvirt for volumes
     * Adds initialize_connection and terminate_connection to volume api
     * Passes connection info back through volume api
    
    Change-Id: I1b1626f40bebe8466ab410fb174683293c7c474f

 Authors                                            |    1 +
 bin/nova-manage                                    |    5 +-
 doc/source/runnova/getting.started.rst             |    1 -
 nova/compute/api.py                                |    3 -
 nova/compute/manager.py                            |  228 +++++++++-----
 nova/compute/utils.py                              |   29 --
 nova/db/api.py                                     |   36 +--
 nova/db/sqlalchemy/api.py                          |   60 +---
 .../versions/052_kill_export_devices.py            |   51 +++
 ..._add_connection_info_to_block_device_mapping.py |   35 ++
 nova/db/sqlalchemy/models.py                       |   16 +-
 nova/exception.py                                  |    8 +-
 nova/rpc/common.py                                 |    9 +-
 nova/tests/api/ec2/test_cloud.py                   |   21 +-
 nova/tests/fake_flags.py                           |    4 -
 nova/tests/integrated/test_volumes.py              |   11 +-
 nova/tests/scheduler/test_scheduler.py             |    5 +-
 nova/tests/test_compute.py                         |  301 +++++-------------
 nova/tests/test_libvirt.py                         |  136 +++++++-
 nova/tests/test_virt_drivers.py                    |    8 +-
 nova/tests/test_volume.py                          |   82 +----
 nova/tests/test_xenapi.py                          |   24 +-
 nova/virt/driver.py                                |   16 +-
 nova/virt/fake.py                                  |   23 +-
 nova/virt/hyperv.py                                |    7 +-
 nova/virt/libvirt.xml.template                     |   22 +-
 nova/virt/libvirt/connection.py                    |  138 +++++---
 nova/virt/libvirt/volume.py                        |  149 +++++++++
 nova/virt/vmwareapi_conn.py                        |    7 +-
 nova/virt/xenapi/volume_utils.py                   |   15 +-
 nova/virt/xenapi/volumeops.py                      |   11 +-
 nova/virt/xenapi_conn.py                           |   17 +-
 nova/volume/api.py                                 |   44 ++-
 nova/volume/driver.py                              |  333 +++++++-------------
 nova/volume/manager.py                             |   73 +++--
 nova/volume/san.py                                 |    3 -
 36 files changed, 1018 insertions(+), 914 deletions(-)

commit e164f3f703026db30937dbbddc63818cef8bd939
Merge: d6b6cc5 a25f106
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 11 21:19:42 2011 +0000

    Merge "Handle pidfile exception for dnsmasq"

commit d6b6cc516232f8306df5c4527c7e12ac7b5fd785
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Oct 11 12:18:09 2011 -0500

    Adds vcpu_weight column to instance_types table and uses this value when building XenServer instances.
    
    Fixes bug 861776.
    
    Change-Id: I88b22b6959164e21a7150580d5f8da6920ed8610

 .../051_add_vcpu_weight_to_instance_types.py       |   32 ++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py                       |    6 +++-
 2 files changed, 37 insertions(+), 1 deletion(-)

commit 56be39aedb195576179e73c859db2271a9585496
Merge: 68282d9 cf5f055
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 10 21:38:22 2011 +0000

    Merge "Further changes to the cleaner."

commit 68282d915bd5a36a0d605c04dc39c9e1187de4d2
Merge: 9146f7b 6e5f2d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 10 21:28:43 2011 +0000

    Merge "Add support for header version parameter to specify API version."

commit cf5f055ebb8e7c1ba05e06e71d2a9b13008d21af
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Oct 10 15:19:25 2011 -0500

    Further changes to the cleaner.
    
    Change-Id: Ib11fe18a46e57df3498596a2909879d67e84fdda

 tools/xenserver/vm_vdi_cleaner.py |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit 9146f7b55997fdf8affb8e6475cd5739c0a8e948
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Oct 10 15:11:38 2011 -0500

    Remove duplicated functions.
    
    Fixes LP871984
    
    Change-Id: I9ddcea12691ecfb276606a06c6f8e7be886e836b

 nova/network/api.py     |    6 ------
 nova/network/manager.py |    6 ------
 2 files changed, 12 deletions(-)

commit 3a4eb1da2f1a159e693ea5d6503c7d50921d6a48
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Oct 10 12:54:56 2011 -0500

    Reference orphaned_instance instead of instance.
    
    Change-Id: I3170f7b67466645d4c410b1d58b3e4e15b9e3265

 tools/xenserver/vm_vdi_cleaner.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d5af7c6d8aaa885a2b81a214e21d527d4c12147d
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Oct 10 12:38:12 2011 -0500

    Continue to the next iteration of the loop if an instance is not found.
    
    Change-Id: I0342bfd9ec04c2bec25d03ce1200d38a57929bb9

 tools/xenserver/vm_vdi_cleaner.py |    1 +
 1 file changed, 1 insertion(+)

commit 6490ab456661b2eb7638f928a69ffacfe00934ad
Merge: 33e5892 15b2a3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 10 17:01:35 2011 +0000

    Merge "moved floating ip db access and sanity checking from network api into network manager added floating ip get by fixed address added fixed_ip_get moved floating ip testing from osapi into the network tests where they belong"

commit 261b4111d481562760321bfc83d64ba35e981b5b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 26 13:57:34 2011 -0400

    Explicit errors on confirm/revertResize failures
    
    Fixing bug 856527
    
    Change-Id: Ib9be618596ade2e9a899ecdc10ec9f61bf06958a

 nova/api/openstack/servers.py                   |    6 +++++
 nova/tests/api/openstack/test_server_actions.py |   28 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

commit 33e58925c75b66c6800d3ba6068ee1e4f0db6617
Author: Julien Danjou <julien.danjou@enovance.com>
Date:   Thu Oct 6 17:15:32 2011 +0200

    Include original exception in ClassNotFound exception
    
    By doing this, we allow the error messages to be more useful. When an import
    of a class fails because of a missing module dependency, it would have fail
    that way for example:
    
    $ nova-manage
    Traceback (most recent call last):
      File "./bin/nova-manage", line 84, in <module>
        from nova import image
      File "/home/jd/Work/src/nova/nova/image/__init__.py", line 22, in <module>
        from nova.image import glance
      File "/home/jd/Work/src/nova/nova/image/glance.py", line 42, in <module>
        GlanceClient = utils.import_class('glance.client.Client')
      File "/home/jd/Work/src/nova/nova/utils.py", line 66, in import_class
        raise exception.ClassNotFound(class_name=class_str)
    nova.exception.ClassNotFound: Class Client could not be found
    
    This does not help the user, since it indicates the class Client cannot be
    found, even if it is actually found but fail to import.
    
    With this commit, the error message is better:
    nova-manage
    Traceback (most recent call last):
      File "./bin/nova-manage", line 84, in <module>
        from nova import image
      File "/home/jd/Work/src/nova/nova/image/__init__.py", line 22, in <module>
        from nova.image import glance
      File "/home/jd/Work/src/nova/nova/image/glance.py", line 42, in <module>
        GlanceClient = utils.import_class('glance.client.Client')
      File "/home/jd/Work/src/nova/nova/utils.py", line 66, in import_class
        raise exception.ClassNotFound(class_name=class_str, exception=exc)
    nova.exception.ClassNotFound: Class Client could not be found: No module named kombu.connection
    
    This helps to know that in this kombu is missing.
    
    It would probably even better to rename ClassNotFound to
    ClassCannotBeImported or something like that too.
    
    Change-Id: I4100d931a0a825fa0729d5467d2f9268fdd2a261
    Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

 Authors           |    1 +
 nova/exception.py |    2 +-
 nova/utils.py     |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

commit c60291ff2bc7035c79a2e06bcbd7366fb84eaaee
Merge: e439217 e320fe5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 8 19:30:55 2011 +0000

    Merge "use git config's review.username for rfc.sh"

commit e439217357f3a11f759aefd854d688ad12a8b59b
Merge: 3092293 2915e6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 8 19:21:25 2011 +0000

    Merge "Make sure unknown extensions return 404"

commit 309229324be903f87e68aa72afb71d811a417262
Merge: 22859fc eed5460
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 7 20:27:30 2011 +0000

    Merge "Allow db schema downgrades"

commit c095b70179cfb926f6acf947f205e3584717b6e0
Author: Ahmad Hassan <ahmad.hassan@hp.com>
Date:   Mon Oct 3 10:35:56 2011 +0100

    Enable admin access to EC2 API server
    
    Add a flag which allows you to enable or disable EC2 admin api through
    nova flag. Is is similar to allow_admin_api for OS API.
    Fixes bug 869908.
    
    Change-Id: I0c786f7cd5f5c3470edc23f0b9b84e5dff1714e2

 nova/api/ec2/__init__.py   |    4 ++++
 nova/api/ec2/apirequest.py |   14 +++++++++++++-
 nova/exception.py          |    4 ++++
 nova/flags.py              |    2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

commit 22859fccb95502efcb73ecf2bd827c45c0886bd3
Merge: 72c45bd beee11e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 6 18:58:44 2011 +0000

    Merge "Stop returning correct password on api calls"

commit 2915e6ba054b1f4100f788603358ea5b2b8220d5
Author: Ahmad Hassan <ahmad.hassan@hp.com>
Date:   Wed Oct 5 17:02:45 2011 +0100

    Make sure unknown extensions return 404
    
    At the moment, if an extension doens't exist and we call a show method
    with wrong id then the exception is not captured. There is a need to
    return NOTFOUND exception.
    Fixes bug 869153.
    
    Change-Id: Ie0b2c2e87c5a61f6db74bb10a4740add2ab8ea27

 Authors                                     |    1 +
 nova/api/openstack/extensions.py            |    8 ++++++--
 nova/tests/api/openstack/test_extensions.py |    7 +++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

commit a25f106c2f824d7d03bf1161da72f66fe4be5a9c
Author: Yun Shen <Yun.Shen@hp.com>
Date:   Thu Sep 29 12:09:37 2011 +0100

    Handle pidfile exception for dnsmasq
    
    Capture the exception in dnsmasq_pid_for method. If the pidfile cannot be read
    for some reason, it should be treated as if it does not exist. This prevents
    issues where the filesystem write delay leaves the file created but empty.
    Fixes bug 865399.
    
    Change-Id: I3b0f1211762696f925ae32d785ffa6a35c5e1d6b

 Authors                   |    1 +
 nova/network/linux_net.py |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 72c45bd2ad930922be86c810b393187e4f5564bc
Merge: 981f527 eff0a63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 6 00:30:40 2011 +0000

    Merge "Fixes bug 862658 -- ec2 metadata issue getting IPs"

commit beee11edbfdd82cd81bc9c0fd75912c167892c2b
Author: Ahmad Hassan <ahmad.hassan@hp.com>
Date:   Mon Aug 1 17:16:49 2011 +0100

    Stop returning correct password on api calls
    
    Captured invalid signature exception in authentication step, so that
    the problem is not returning exception to user, revealing the real
    password.
    Fixes bug 868360.
    
    Change-Id: Idb31f076a7b14309f0fda698261de816924da354

 Authors                  |    1 +
 nova/api/ec2/__init__.py |    3 ++-
 nova/auth/manager.py     |   10 ++--------
 3 files changed, 5 insertions(+), 9 deletions(-)

commit 80e196069fa94edb8981415f9b8d432bbf92888f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 30 15:42:38 2011 +0000

    Restructure host filtering to be easier to use.
    
    The original design for host filtering in the scheduler required the
    entire filtering process be contained in a single class; contrast this
    with the design for weighting the hosts, which allowed you to specify
    a list of functions that would apply various weighting factors to the
    hosts.
    
    This commit modifies the filtering process to resemble the way that
    the weighting process is designed. Filters can now be small, focused
    classes, and you specify which filters to apply by setting the
    'FLAGS.default_host_filters' flag to a list of the filter classes
    that match your needs.
    
    This is a port of the code from Launchpad, where it was orphaned:
    
    https://code.launchpad.net/~ed-leafe/nova/scheduler-multifilter/+merge/72478
    
    Change-Id: I5f3eff6f21409a9f0eddda3392e9ff9d03039ebe

 nova/scheduler/abstract_scheduler.py               |    4 +-
 nova/scheduler/base_scheduler.py                   |   27 +++++--
 nova/scheduler/filters/abstract_filter.py          |    7 +-
 nova/scheduler/filters/all_hosts_filter.py         |   11 ++-
 nova/scheduler/filters/instance_type_filter.py     |   14 ++--
 nova/scheduler/filters/json_filter.py              |   20 +++---
 nova/scheduler/host_filter.py                      |   41 +++++++----
 nova/scheduler/least_cost.py                       |    9 ++-
 nova/tests/scheduler/test_abstract_scheduler.py    |    3 +-
 nova/tests/scheduler/test_host_filter.py           |   74 +++++++++++---------
 nova/tests/scheduler/test_least_cost_scheduler.py  |   40 ++---------
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    1 +
 12 files changed, 131 insertions(+), 120 deletions(-)

commit 6e5f2d88e630540b0ab121cd9949289d2fc0cd67
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Sep 25 22:51:55 2011 +0000

    Add support for header version parameter to specify API version.
    
    bug 844905
    
    The 1.1 API specifies that the API version can be determined by URL path
    (eg /v1.1/tenant/servers/detail), Content-Type header
    (eg application/json;version=1.1) or Accept header
    (eg application/json;q=0.8;version=1.1, application/xml;q=0.2;version=1.1).
    
    Change-Id: I01220cf1eebc0f759d66563ec67ef2f697c6d310

 etc/nova/api-paste.ini                    |    2 +-
 nova/api/openstack/urlmap.py              |  297 +++++++++++++++++++++++++++++
 nova/api/openstack/versions.py            |   33 +---
 nova/api/openstack/wsgi.py                |   44 ++---
 nova/tests/api/openstack/fakes.py         |    2 +-
 nova/tests/api/openstack/test_urlmap.py   |  111 +++++++++++
 nova/tests/api/openstack/test_versions.py |   98 ++++++++--
 tools/pip-requires                        |    2 +-
 8 files changed, 515 insertions(+), 74 deletions(-)

commit 981f52794ed41b6f25dfc4a25b4b736e8f030a0f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Sep 26 22:02:34 2011 -0400

    Set error state on spawn error + integration test.
    
    This branch should at least be considered a partial fix for bug 698336.
    
    (Update) Grammar fix.
    (Update) PEP8 fix.
    (Update) Merged with origin/master
    (Update) Fixed test (oops!) thanks comstud!
    
    Change-Id: I10d607fd40953e334670cc39040a9a00ff6919ac

 nova/compute/api.py                   |    6 +++---
 nova/compute/manager.py               |   11 ++++++-----
 nova/tests/integrated/test_servers.py |   22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)

commit eed546053ae89241d730ba84f8c3ce0c89a7d0aa
Author: Stanislaw Pitucha <stanislaw.pitucha@hp.com>
Date:   Wed Sep 21 14:10:39 2011 +0100

    Allow db schema downgrades
    
    When a destination version is specified, check the current version and allow
    downgrading the schema. Fixes bug 865357.
    
    Change-Id: I47104158884421de92f50322a72243c170a4f1ad

 Authors                         |    1 +
 nova/db/sqlalchemy/migration.py |   15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

commit 3837f09ee0b7b0da23e1caa185f58610d30bffe6
Merge: 04548b0 7a10619
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 1 17:49:03 2011 +0000

    Merge "Fixes bug 862633 -- OS api consoles create() broken"

commit 15b2a3b85b157e4a032d1fbb68bd3d7a509ed765
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 16 14:07:41 2011 -0500

    moved floating ip db access and sanity checking from network api into network manager
    added floating ip get by fixed address
    added fixed_ip_get
    moved floating ip testing from osapi into the network tests where they
    belong
    
    Change-Id: I3ee53971206e37405a2adc2491412f7896e1af87

 nova/api/openstack/contrib/floating_ips.py         |    9 +-
 nova/compute/api.py                                |    4 +-
 nova/db/api.py                                     |    5 +
 nova/db/sqlalchemy/api.py                          |   19 ++
 nova/exception.py                                  |    8 +-
 nova/network/api.py                                |  113 ++++-------
 nova/network/manager.py                            |  210 ++++++++++++++++----
 nova/test.py                                       |    1 +
 nova/tests/api/ec2/test_cloud.py                   |   18 --
 .../api/openstack/contrib/test_floating_ips.py     |  178 +++--------------
 nova/tests/test_network.py                         |  197 +++++++++++++++++-
 11 files changed, 454 insertions(+), 308 deletions(-)

commit 04548b067c7c79602332fe2bc2dc89ed77cee7ac
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 27 15:21:42 2011 -0500

    Adds a script that can automatically delete orphaned VDIs. Also had to move some flags around to avoid circular imports.
    
    Fixes bug 809614.
    
    Change-Id: I635f7eef9ede45bee1ee4a62a3882b55d4222ee3

 nova/compute/api.py               |    1 -
 nova/compute/manager.py           |    2 -
 nova/flags.py                     |    7 +
 tools/xenserver/vm_vdi_cleaner.py |  376 +++++++++++++++++++++++++++++++++++++
 4 files changed, 383 insertions(+), 3 deletions(-)

commit f40d94e59f000a2937cea68663053739e721b80e
Merge: 6af9420 f225ea4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 17:14:24 2011 +0000

    Merge "Deallocate ip if build fails."

commit 6af94206c7c172a80ea6699553cbb64f57c0d6c8
Merge: 96b99e4 5f7356b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 17:04:39 2011 +0000

    Merge "Moving admin actions to extension"

commit cb37d895a6b97e294aa838f85227d29892f4e11e
Author: Loganathan Parthipan <parthipan@hp.com>
Date:   Thu Sep 29 16:41:49 2011 +0100

    Improve access check on images
    
    Makes sure that users can delete only their own images, snapshots.
    Enable listing of all images, both private which are owned and the public
    ones. Only list the private images/snapshots for the owner and admin users.
    Fixes bug 863305
    
    Change-Id: I7326ec4a99158c8db5319f2397c99c5a89be2cb5

 Authors                         |    1 +
 nova/image/glance.py            |   23 +++++++++++++++++++-
 nova/tests/image/test_glance.py |   44 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

commit b84d71c6bcca04a47407ea8491911b8584e395bb
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 29 14:45:50 2011 -0400

    Updating image progress to be more granular.
    Before, the image progress had only 2 states, 0 and 100. Now it can be
    0, 25, 50 or 100.
    
    Change-Id: Ic5de9d4404c8903bc2a6027697905f92374f8af7

 nova/api/openstack/views/images.py      |   22 +++++++++++++++-------
 nova/tests/api/openstack/test_images.py |   12 ++++++------
 2 files changed, 21 insertions(+), 13 deletions(-)

commit 96b99e4d1f5f264e7f263ddbf50981abf5a3b04e
Merge: cb6250f b9aac11
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 15:40:04 2011 +0000

    Merge "Fixed bug lp850602. Adding backing file copy operation on kvm block migration."

commit f225ea4f2ffcf0343722aa370dd615ee0effe305
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Sep 27 21:05:31 2011 +0000

    Deallocate ip if build fails.
    
    Fixes LP837687
    
    Change-Id: I7c0ea900225024e69a0265c430724930ce7b892d

 nova/compute/manager.py |   74 ++++++++++++++++++++++++++++++++---------------
 run_tests.sh            |   17 ++++++++++-
 2 files changed, 66 insertions(+), 25 deletions(-)

commit cb6250fa77d7724ba7e5dd15e8a3c9973756c1f5
Merge: eb4bd86 0546616
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 15:09:03 2011 +0000

    Merge "bug 861310"

commit 5b173ef5dfb7c41dbc2a4bb5c9976811516eb00f
Author: Adam Gandelman <adamg@canonical.com>
Date:   Thu Sep 29 21:06:06 2011 -0700

    Ensure non-default FLAGS.logfile_mode is properly converted to an octet.
    
    Fixes bug 862969.
    
    Change-Id: I35ac84d5f5f547fef8e3eec1d3a31f94ea8ae96e

 nova/flags.py |    2 +-
 nova/log.py   |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 5f7356be106cbe1116708d2e5d30d5a2f4c479a4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 20 01:59:05 2011 -0400

    Moving admin actions to extension
    
    Begins to address LP bug 821145
    
    Change-Id: I2799a8d70a167dda6d56f8fab2fc121fa2365a8a

 nova/api/openstack/__init__.py                     |    9 -
 nova/api/openstack/contrib/admin_actions.py        |  204 ++++++++++++++++++++
 nova/api/openstack/contrib/admin_only.py           |   30 ---
 nova/api/openstack/contrib/hosts.py                |    5 +-
 nova/api/openstack/contrib/rescue.py               |   14 +-
 nova/api/openstack/extensions.py                   |   26 ++-
 nova/api/openstack/servers.py                      |  190 +-----------------
 nova/exception.py                                  |   15 ++
 .../api/openstack/contrib/test_admin_actions.py    |   64 ++++++
 nova/tests/api/openstack/test_extensions.py        |    1 +
 nova/tests/api/openstack/test_server_actions.py    |   17 --
 nova/tests/api/openstack/test_servers.py           |  113 -----------
 12 files changed, 321 insertions(+), 367 deletions(-)

commit 7a10619a4c1f5a1880ab613f782b4cbe1d57fad4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 29 20:54:19 2011 +0000

    Fixes bug 862633 -- OS api consoles create() broken
    
    Fixed and added tests for OS API consoles.py which didn't exist.
    
    Change-Id: I53da353da2957bbaede3c71f1e36ed2bc5e22892

 nova/api/openstack/consoles.py            |    2 +-
 nova/tests/api/openstack/test_consoles.py |  232 +++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+), 1 deletion(-)

commit f3fb16a7935e91f8c9034d1da84a2b17cbe186f8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Sep 29 15:58:43 2011 -0400

    Adds the tenant id to the create images response Location header
    Fixes bug 862672
    
    Change-Id: I85fc91c64146b02718dad77686762e26bdfce08c

 nova/api/openstack/servers.py                   |    5 ++++-
 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit eff0a63758ad59d62045bf913423cdd0c440fa28
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 29 12:54:48 2011 -0700

    Fixes bug 862658 -- ec2 metadata issue getting IPs
    
    Was looping through a tuple of (ipv4s, ipv6s) vs just ipv4s list.. to get floating IPs.
    
    Change-Id: Ie743012b7074ecb8b9bc6f018968e21e2f6d405d

 nova/api/ec2/cloud.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit eb4bd86f65a440b39804d16e477aeb77f31e11c1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 29 15:55:42 2011 -0400

    Added ==1.0.4 version specifier to kombu in pip-requires to ensure tests pass in a clean venv.
    
    Fixes bug 862629.
    
    Change-Id: Ie379aaf3a0753b022fa14e7c8f0a18f4c35b9c96

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 070e60d21776ea2b32ac557a0661d2025ef111d8
Merge: e7d1792 4584e55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 17:47:07 2011 +0000

    Merge "Fixes euca-describe-instances failing or not showing IPs"

commit e7d17921e99df3a8c2c00a6175e423ce369272f8
Merge: bf181c2 bb410b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:57:19 2011 +0000

    Merge "Change 'recurse_zones' to 'local_zone_only'."

commit bf181c2e322d78e7e3df71c9681555f1ab9f085f
Merge: a363fd9 2dd0445
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:47:57 2011 +0000

    Merge "bug lp845714"

commit a363fd981cc682c875bd4247810910327aae3da0
Merge: ef22c00 eb64323
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:18:17 2011 +0000

    Merge "Enforce snapshot cleanup."

commit 2dd0445dd60e5f0e845c49adbfb81acbebfc3ea8
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Sep 22 17:07:27 2011 -0500

    bug lp845714
    
    Kind of fixes it, this calls resize on the instance. The space will be
    available, but the partition won't be resized to use this space.
    Running fdisk -l will show the additional space(after a discussion here
    I was told this solution was best for the moment).
    
    Adding myself to Authors
    
    Change-Id: Ice9b12b64b266bd291e7c689114b1172e317e144

 nova/tests/test_xenapi.py  |    3 +++
 nova/tests/xenapi/stubs.py |    3 ---
 nova/virt/xenapi/fake.py   |    6 ++++++
 nova/virt/xenapi/vmops.py  |    5 +++++
 4 files changed, 14 insertions(+), 3 deletions(-)

commit 6c9743665629d7cf74de83202b4ba2909c43275e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:55 2011 +0100

    install_venv: pip install M2Crypto doesn't work on Fedora
    
    ... so use the system m2crypto library instead.
    
    M2Crypto won't build on Fedora because of some bizarre differences with
    Fedora's OpenSSL headers. I can get it to build by doing e.g.
    
     $> python ./tools/install_venv.py
     $> cd .nova-venv/build/M2Crypto
     $> for i in SWIG/_ec.i SWIG/_evp.i; do sed -i -e "s/opensslconf/opensslconf-x86_64/" $i ; done
     $> cd -
     $> SWIG_FEATURES=-cpperraswarn ./tools/with_venv.sh pip install M2Crypto
    
    but that's clearly no fun. It should be fine to just use the system
    version.
    
    Change-Id: I94c7464bf60ae586e16a2f38b7440cea8dc110e5

 tools/install_venv.py |   13 +++++++++++++
 tools/pip-requires    |    1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

commit 9f529afd477be981af26ab29f4bf961b34236b44
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:54 2011 +0100

    install_venv: add support for distro specific code
    
    ... and use it to install virtualenv with yum if it's not available.
    
    Change-Id: Ibfeeb9c23324724bc26895504e6229076d793c6d

 tools/install_venv.py |   71 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 19 deletions(-)

commit a5fc3128103104978d2e04bb05e71009c97ba435
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:54 2011 +0100

    install_venv: remove versioned M2Crypto dependency
    
    The latest, 0.21.1, seems to work fine.
    
    Change-Id: I15c4561db812b788d8e8a6c8102e5059929b2543

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7eeee584ad64b5a76c029641243a8fca2c875772
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:54 2011 +0100

    install_venv: don't use --no-site-packages with virtualenv
    
    libvirt isn't listed in pip-requires because (a) it's not in PyPi and
    (b) you always want to use libvirt's python bindings that matches the
    version of libvirt installed on the system.
    
    Currently, running nova-compute in virtualenv fails because libvirt
    can't be imported. The --no-site-packages flag is what prevents this.
    Everything seems to work fine without it. To verify, try deleting the
    no-global-site-packages.txt from your .nova-venv.
    
    Change-Id: I1df5e8e3c4426ca333c2d6b5b4fa8ece144dddf3

 tools/install_venv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f373a0f6f83181c9b51d7d7faa2e055d9ad92868
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:54 2011 +0100

    install_venv: pass the --upgrade argument to pip install
    
    Subsequent runs of install_venv.sh should upgrade packages to the
    latest available.
    
    Change-Id: Ib9c9ee270b778363900d92398f00c1cab3508578

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit de5e6ea29efe02de42d95109e22bdd0039789f1b
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Sep 29 15:06:54 2011 +0100

    install_venv: refactor out pip_install helper
    
    We don't need to pass the -E argument since we're already running
    inside the virtualenv.
    
    Change-Id: Idd77b9bdc067e2288d0fa694a2bb6769675065cf

 tools/install_venv.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 1bcec83ffd19ae6ef08cad860a731bcb08acb19b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Sep 29 10:20:57 2011 -0400

    Replace socat with netcat.
    
    Replace socat with netcat. Fixes bug 856612.
    
    Change-Id: Ic286acb389755e7f1b932fe513b67cb7fb3ee3af

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ae7fb0a49a0072834b6a82938668cc8c962661f
Author: Brendan Maguire <B_Maguire@Dell.com>
Date:   Fri Sep 16 14:56:13 2011 +0100

    api.ec2.admin unit tests
    
    Change-Id: Ibc1fec34c7aee40c1252da8a3d174683434269c1

 nova/tests/api/ec2/test_admin.py |  464 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 464 insertions(+)

commit 6183586fab71922675c573ddfd5854a7e1349c3f
Author: Brendan Maguire <B_Maguire@Dell.com>
Date:   Wed Sep 28 13:10:41 2011 +0100

    Fixes Bug #861293
    nova.auth.signer.Signer now honors the SignatureMethod parameter for
    SHA1 when creating signatures
    
    Change-Id: I4050407d374d18427f9a955ea98242f7325a5d54

 nova/auth/signer.py       |   28 ++++++++++++++++++----------
 nova/tests/test_signer.py |   39 +++++++++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 18 deletions(-)

commit eb6432361ee4946d93867e2d3f0870d892a25c66
Author: David Subiros <david.perez5@hp.com>
Date:   Wed Sep 28 15:19:04 2011 +0100

    Enforce snapshot cleanup.
    
    Makes sure that the snapshot and the temporary directory is cleaned up,
    even if qemu-img fails. Fixes bug 861582.
    
    Change-Id: I3c7798215c8d0d5dc979379a13e038098b0f31d4

 Authors                         |    1 +
 nova/virt/libvirt/connection.py |   48 ++++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

commit 0546616926d7f95017405b4abb532a4517db7d90
Author: Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com>
Date:   Wed Sep 28 18:07:22 2011 +0530

    bug 861310
    
    Check if host list is not empty before trying to weigh the hosts.
    
    Change-Id: I4014bf64951963088cdfaad1210fa9d23e7cc08b

 nova/scheduler/base_scheduler.py |    3 +++
 1 file changed, 3 insertions(+)

commit bb410b3f1bbdebdbdf540a22cd37fc9526897fe1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 28 23:52:57 2011 +0000

    Change 'recurse_zones' to 'local_zone_only'.
    
    Fixes bug 861753
    
    Zone recursion should be the default and now 'recurse_zones' as an
    optional search argument no longer makes sense.  'local_zone_only=True' can
    now be specified to override the new default of recursing zones.
    
    Change-Id: I5c3c849e9077117b2023f637b82831fa14b656b1

 nova/api/openstack/servers.py |   10 +++++-----
 nova/compute/api.py           |   18 ++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

commit 4584e552a653904c36cf04cb295a7bf09d2def28
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 28 22:56:34 2011 +0000

    Fixes euca-describe-instances failing or not showing IPs
    
    Fixes bug 855660
    
    Makes EC2 call network manager to get IP information now, to match the
    same change to OS API
    Also refactors a bit of OS API's calls... moving some code into 'common'
    
    Fixed tests.  Some tests for OS API v1.0 were not properly testing.
    
    Fixed imports per HACKING in files touched.
    
    Change-Id: I455637a9feb802291dfaf2ef694dabc2607784f9

 nova/api/ec2/cloud.py                            |   97 ++++++---
 nova/api/openstack/common.py                     |   61 +++++-
 nova/api/openstack/ips.py                        |   66 +-----
 nova/api/openstack/servers.py                    |   85 ++++----
 nova/api/openstack/views/servers.py              |   34 ++--
 nova/network/api.py                              |   25 ++-
 nova/tests/api/ec2/test_cloud.py                 |   77 ++++++-
 nova/tests/api/openstack/contrib/test_volumes.py |   10 -
 nova/tests/api/openstack/fakes.py                |   14 +-
 nova/tests/api/openstack/test_servers.py         |  233 ++++++++++++----------
 nova/tests/integrated/test_servers.py            |    1 -
 nova/tests/test_metadata.py                      |   20 +-
 12 files changed, 443 insertions(+), 280 deletions(-)

commit ef22c0054ccb846dd7e81ba35f7e9c2b533d5ff7
Merge: b5abd8e 9f8955d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 20:51:38 2011 +0000

    Merge "Fixes a test failure in master"

commit 9f8955d27097fdc951712b0c12bd28aa5b59b61d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 28 12:08:14 2011 -0700

    Fixes a test failure in master
    
    Fixes bug 861691
    
    Problem is likely due to python version.. 'with self.AssertRaises' not
    supported?
    
    Change-Id: Ida0bf74ea20ae1b4b3a25a3e1cb9d58ac51f24c8

 nova/tests/test_signer.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit b9aac1181581b9036c98f5aa493731fdc74be7e1
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Sep 28 15:05:54 2011 -0400

    Fixed bug lp850602.
    Adding backing file copy operation on kvm block migration.
    
    Change-Id: I165b0f8778e712c8932260c0110e159b2e9a6cfb

 nova/tests/test_libvirt.py      |   26 +++++++++++++++++---------
 nova/virt/libvirt/connection.py |   33 ++++++++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 12 deletions(-)

commit a870dfae7da2df1e51a9066bf0583c3ab86690e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 23 12:08:23 2011 -0700

    Add nova-all to run all services
    
     * Cleans up service for objectstore and vncproxy
     * Fixes virt.fake to be runnable via a flag
    
    Change-Id: I18e05a4d727bbbd3481063623dc3b6ad52e233d4

 bin/nova-all                 |   80 +++++++++++++++++++++++++++++++++++
 bin/nova-objectstore         |   12 +-----
 bin/nova-vncproxy            |   76 ++-------------------------------
 nova/objectstore/s3server.py |    7 +++
 nova/virt/fake.py            |    2 +-
 nova/vnc/auth.py             |    5 +--
 nova/vnc/server.py           |   96 ++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 190 insertions(+), 88 deletions(-)

commit b5abd8e7415c28630852107da7755045f6522b50
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Sep 26 23:41:28 2011 -0400

    Snapshots/backups can no longer happen simultaneously. Tests included.
    
    Implemented exception.InstanceBusy when attempting to snapshot/backup an
    instance which is already snapshotting or being currently backed up.
    
    Fixes bug 727502.
    
    (Patch Set 2) 3 new exceptions: InstanceBusy, InstanceSnapshotting, and InstanceBackingUp
    (Patch Set 3) Oops. New exceptions now inherit from InstanceBusy
    (Patch Set 4) Tests now tear down created instances
    
    Change-Id: I9614740bba26c04e64b0e27c24fbace12334f4d1

 nova/api/openstack/images.py             |   13 +++++++++----
 nova/api/openstack/servers.py            |   12 ++++++++----
 nova/compute/api.py                      |    8 ++++++++
 nova/exception.py                        |   12 ++++++++++++
 nova/tests/api/openstack/test_servers.py |   17 ++++++++++++++++
 nova/tests/test_compute.py               |   31 ++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 8 deletions(-)

commit ebec34e374bd9ec5354e3648a6e8f3ce26c951b5
Merge: 00bb8f9 82bef28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 17:26:26 2011 +0000

    Merge "Accept message as sole argument to NovaException"

commit 00bb8f9d03f18ce6efbf128cef6d07bbfe99677f
Merge: 4fb1ac2 dbe4d21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 16:53:11 2011 +0000

    Merge "Fix 047 migration with SQLAlchemy 0.7.2"

commit 4fb1ac26cb15ea7e21ab9873e1dd253da0c77157
Merge: 6574d1b 07cf091
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 15:25:24 2011 +0000

    Merge "Signer no longer fails if hashlib.sha256 is not available. test_signer unit test added."

commit 82bef282c93a574ee5cfb2b34e0d8c077c2a7efe
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 28 15:01:27 2011 +0000

    Accept message as sole argument to NovaException
    
    Fixes bug 860666
    
    Python nose will sometimes recreate an exception to add captured log
    information to the string representation of the exception. It assumes
    that it can do this by reinstantiating the class of the originally
    triggered exception with one argument, a new string description.
    NovaException, and some child classes, didn't work well with this
    scheme and would result in a further exception during formatting, which
    would result in an unformatted string being displayed.
    
    Change-Id: I7152cb7809fa1deb3986c127370f670fb2da342d

 nova/exception.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 8fcc23c833b8b2945b6a212d79d670031bead2d1
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Sep 28 14:57:03 2011 +0100

    Use latest version of SQLAlchemy
    
    Fedora 16 has SQLAlchemy-0.7.2 and it seems to work fine with Nova,
    modulo these occassional migration errors that crop up. The
    foreign_keys set in 047 issue is the third such problem fixed lately.
    
    Is there any particular reason to stick with 0.6.3?
    
    Change-Id: Ia65bc1f6035917b5aec84ad51d6504543256f7ca

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dbe4d21ff3b3be53e059d0a942bdc26843295633
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Sep 28 14:49:40 2011 +0100

    Fix 047 migration with SQLAlchemy 0.7.2
    
    In 0.6.3, foreign_keys was an OrderedSet which can be indexed. In 0.7.2
    it's a plain old set which can't be indexed.
    
      File ".../nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py", line 35, in upgrade
          fkey_name = vifs.c.instance_id.foreign_keys[0].constraint.name
      TypeError: 'set' object does not support indexing
    
    Change-Id: I8d6378d2fd25f7659d6a6469de762728639cc4ad

 .../versions/047_remove_instances_fk_from_vif.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65d6b6b721a7251ebe6029f875366a12d8a525a7
Author: Brendan Maguire <B_Maguire@Dell.com>
Date:   Wed Sep 7 20:39:29 2011 +0100

    Beef up nova/api/direct.py tests
    
    Change-Id: I4f9fd9518285c6bbd170159742a186eea6c58369

 Authors                   |    1 +
 nova/tests/test_direct.py |   97 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 93 insertions(+), 5 deletions(-)

commit 07cf091f9f3b6412d3aed4a1a49d2b0d0bb95247
Author: Brendan Maguire <B_Maguire@Dell.com>
Date:   Tue Sep 13 11:57:33 2011 +0100

    Signer no longer fails if hashlib.sha256 is not available. test_signer unit test added.
    
    Change-Id: I7cea9900c2ccabc30800a167f127ada8386a724b

 Authors                   |    1 +
 nova/auth/signer.py       |   14 +++++--
 nova/tests/test_signer.py |   92 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 4 deletions(-)

commit 6574d1bb17ad111e5dd5b1c7b2e6f0a698e2c275
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 28 02:53:58 2011 +0000

    Make snapshots private by default
    
    Fixes bug 850389
    
    Change-Id: I22284c2f71b77aaa1aff0c0679320664cd23dae2

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e320fe5006278777033937d2aa744a74951cee3f
Author: termie <code@term.ie>
Date:   Mon Sep 26 15:49:33 2011 -0700

    use git config's review.username for rfc.sh
    
    Change-Id: I6e2e58bf37f49f023ae242b98c11f10e3f2de8b1

 tools/rfc.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit a2646129bc9dbd9dec57bdde7f510e0ea7bbddea
Merge: 7dba1d9 0fab788
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 20:01:30 2011 +0000

    Merge "compute_api create*() and schedulers refactoring"

commit 7dba1d9aa989760b190f1cf3bad2ed22bb2e2fc5
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Mon Sep 26 18:22:03 2011 -0500

    Raise InsufficientFreeMemory
    
    Kind of fixes bug 851374 & bug 858679
    
    Raises InsufficientFreeMemory if an instance can't
    start because of that. This will cause the normal
    instance failure recovery to catch this problem,
    set the state, and log the error. This also
    removes instance_set_state from db/api.py as that
    was causing these exceptions in the first place.
    
    Change-Id: I199aa6900890531b175e28c3b93d8dfb88e135d0

 nova/exception.py         |    4 ++++
 nova/tests/test_xenapi.py |    2 +-
 nova/virt/xenapi/vmops.py |    7 +------
 3 files changed, 6 insertions(+), 7 deletions(-)

commit d6b460e2e87e573500f6b521939895c6d93f5fdf
Merge: d2ac401 f3dd56e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 17:00:53 2011 +0000

    Merge "Removed db_pool complexities from nova.db.sqlalchemy.session. Fixes bug 838581."

commit d2ac401fbb6620700772ed2abb5a6e9296ff3a93
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Tue Sep 27 09:43:48 2011 -0500

    Adding run_test.sh artifacts to .gitignore
    
    Adding myself to the Authors file.
    
    Change-Id: Ifcedc2b7925f293cc47fb1eda9fbc14fa045918a

 .gitignore |    5 +++--
 Authors    |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 21da183edee9c8f8ddf0ff6a880486c0ed2e4623
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 27 08:58:54 2011 -0400

    Make sure options is set before checking managed_disk setting. Fixes bug 860520.
    
    Change-Id: I83c6c1cdb8e11959d6af5c08827e9f9ce82a5913

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fab78825ef06310926181f6f97d377058b56b97
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Sep 24 23:49:36 2011 +0000

    compute_api create*() and schedulers refactoring
    
    Fixes bug 844160
    
    Makes the servers create API call work with all schedulers, removes
    'zone boot', and folds create_instance_helper back into servers
    controller.
    
    Notable changes:
    1) compute API's create_at_all_once has been removed. It was only used
    by zone boot.
    2) compute API's create() no longer creates Instance DB entries. The
    schedulers now do this. This makes sense, as only the schedulers will
    know where the instances will be placed. They could be placed locally or
    in a child zone. However, this comes at a cost. compute_api.create() now
    does a 'call' to the scheduler instead of a 'cast' in most cases (* see
    below). This is so it can receive the instance ID(s) that were created
    back from the scheduler. Ultimately, we probably need to figure out a
    way to generate UUIDs before scheduling and return only the information
    we know about an instance before it is actually scheduled and created.
    We could then revert this back to a cast. (Or maybe we always return a
    reservation ID instead of an instance.)
    3) scheduler* calls do not return a host now.  They return a value
    that'll be returned if the caller does an rpc.call().  The casts to
    hosts are now done by the scheduler drivers themselves.
    4) There's been an undocumented feature in the OS API to allow multiple
    instances to be built. I've kept it.
    5) If compute_api.create() is creating multiple instances, only a single
    call is made to the scheduler, vs the old way of sending many casts. All
    schedulers now check how many instances have been requested.
    6) I've added an undocumented option 'return_reservation_id' when
    building. If set to True, only a reservation ID is returned to the API
    caller, not the instance. This essentially gives you the old 'nova
    zone-boot' functionality.
    7) It was requested I create a stub for a zones extension, so you'll see
    the empty extension in here. We'll move some code to it later.
    8) Fixes an unrelated bug that merged into trunk recently where zones DB
    calls were not being done with admin context always, anymore.
    9) Scheduler calls were always done with admin context when they should
    elevate only when needed.
    10) Moved stub_network flag so individual tests can run again.
    
    * Case #6 above doesn't wait for the scheduler response with instance
    IDs. It does a 'cast' instead.
    
    Change-Id: Ic040780a2e86d7330e225f14056dadbaa9fb3c7e

 doc/source/devref/distributed_scheduler.rst        |    2 +
 nova/api/ec2/cloud.py                              |   10 +-
 nova/api/openstack/__init__.py                     |    3 +-
 nova/api/openstack/contrib/createserverext.py      |    3 +-
 nova/api/openstack/contrib/volumes.py              |   43 +-
 nova/api/openstack/contrib/zones.py                |   50 ++
 nova/api/openstack/create_instance_helper.py       |  606 -------------------
 nova/api/openstack/servers.py                      |  616 +++++++++++++++++++-
 nova/api/openstack/zones.py                        |   48 +-
 nova/compute/api.py                                |  217 ++++---
 nova/compute/manager.py                            |    2 -
 nova/flags.py                                      |    3 +
 nova/scheduler/abstract_scheduler.py               |   75 +--
 nova/scheduler/api.py                              |    4 +-
 nova/scheduler/chance.py                           |   25 +-
 nova/scheduler/driver.py                           |  115 +++-
 nova/scheduler/least_cost.py                       |    3 +-
 nova/scheduler/manager.py                          |   24 +-
 nova/scheduler/multi.py                            |    8 +-
 nova/scheduler/simple.py                           |   74 ++-
 nova/scheduler/vsa.py                              |   33 +-
 nova/scheduler/zone.py                             |   28 +-
 .../api/openstack/contrib/test_createserverext.py  |   13 +-
 nova/tests/api/openstack/contrib/test_volumes.py   |   14 +-
 nova/tests/api/openstack/test_extensions.py        |    3 +-
 nova/tests/api/openstack/test_server_actions.py    |    4 +-
 nova/tests/api/openstack/test_servers.py           |  183 ++++--
 nova/tests/integrated/api/client.py                |   19 +-
 nova/tests/integrated/test_servers.py              |   36 ++
 nova/tests/scheduler/test_abstract_scheduler.py    |   75 ++-
 nova/tests/scheduler/test_least_cost_scheduler.py  |    2 +-
 nova/tests/scheduler/test_scheduler.py             |  487 ++++++++++------
 nova/tests/scheduler/test_vsa_scheduler.py         |   30 +-
 nova/tests/test_compute.py                         |  153 ++++-
 nova/tests/test_quota.py                           |   17 +
 35 files changed, 1774 insertions(+), 1254 deletions(-)

commit a51533729a262be258f99b0c5669eed78981eba5
Merge: 144b5e4 774b5aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 05:05:35 2011 +0000

    Merge "Adds disk config"

commit 144b5e403c211c34651ba9295d12f2077f8b15a7
Merge: 532cd93 6c52cff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 04:40:23 2011 +0000

    Merge "Fix some minor issues due to premature merge of original code."

commit f3dd56e916232e38e74d9e2f24ce9a738cac63cf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Sep 26 11:52:21 2011 -0400

    Removed db_pool complexities from nova.db.sqlalchemy.session. Fixes bug 838581.
    
    Change-Id: I9b1f4790fcdb890a5113b853f1b1483f3212c530

 nova/db/sqlalchemy/session.py |   34 +---------------------------------
 nova/flags.py                 |    6 ------
 2 files changed, 1 insertion(+), 39 deletions(-)

commit 532cd9347b5afd31fdc72957b4a942d6e7020aa7
Merge: eed6ee7 14eb9c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 19:29:35 2011 +0000

    Merge "Call endheaders when auth_token is None. Fixes bug 856721."

commit eed6ee7cfff8c7586c825fd93fa65f5f1f5e2053
Merge: 89de26a 3981a21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 18:47:56 2011 +0000

    Merge "Ensure minRam and minDisk are always integers"

commit 89de26a42360ee06b7a4d143d8d04c9dc21e2791
Merge: a884e3a 6415999
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 18:39:22 2011 +0000

    Merge "put fully qualified domain name in local-hostname"

commit 3981a218da0c201a89158cf9a95400e44f9c6eb2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 26 13:13:33 2011 -0400

    Ensure minRam and minDisk are always integers
    
    Fixing bug 859149
    
    Change-Id: I52bcb442225e8e3cb4aecc6d993e1c3a774cdf84

 nova/api/openstack/views/images.py      |   17 +++++++++++++----
 nova/tests/api/openstack/fakes.py       |    3 ++-
 nova/tests/api/openstack/test_images.py |   10 ++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

commit 14eb9c6ec9c82c9f56cde5279aebb1e5a8fac4f4
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 26 13:39:14 2011 -0400

    Call endheaders when auth_token is None. Fixes bug 856721.
    
    Change-Id: I2be932d3c532a7be03a0e5296e592e681c05b75d

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a884e3a161462f9a357efd6075f6fabb4d2308e1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 26 13:34:44 2011 -0400

    Catch ImageNotFound on image delete in OSAPI
    
    Fixes bug 859148
    
    Change-Id: I2fe5ba4505a90029e3209d197d8a3664e1d0614e

 nova/api/openstack/images.py            |    6 +++++-
 nova/tests/api/openstack/test_images.py |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 0acc924d2e286f8f897d2374d3d7600dcedefe4c
Merge: 1c8957a 1af4c1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 15:55:49 2011 +0000

    Merge "Add next links to images requests"

commit 114ca0b2dc090270d8d20bd10b6e1e7a0b451db2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 26 08:34:14 2011 -0700

    Fix the grantee group loading for source groups
    
    Fixes bug 859679.
    
    Change-Id: Ia0b90b8373a02955f23b6dda0495f01511762822

 nova/db/sqlalchemy/api.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 1c8957abd216d983b56bde0bdf3338ca5a730b15
Merge: 7a95f73 569b310
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 14:53:14 2011 +0000

    Merge "Makes sure to recreate gateway for moved ip"

commit 1af4c1ee47ebcf84e63590c27a4d1f4c94c073cb
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Sep 13 18:16:28 2011 -0400

    Add next links to images requests
    
    This adds next links to list images responses in JSON and xml.
    It keeps all other filters and query parameters in tact to ensure
    pagination works correctly when using the next links.
    
    Change-Id: If61e34589a91f528093c0d05522600d3eee8d89e

 nova/api/openstack/images.py                     |   29 ++-
 nova/api/openstack/schemas/v1.1/images_index.rng |    3 +
 nova/api/openstack/views/images.py               |   36 +++
 nova/tests/api/openstack/test_images.py          |  276 +++++++++++++++++++++-
 4 files changed, 327 insertions(+), 17 deletions(-)

commit 6415999523d26f1680265e5ca438020b7d6542c6
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 23 16:44:44 2011 -0400

    put fully qualified domain name in local-hostname
    
    make metadata service return fully qualified domain name (fqdn) in
    the local-hostname field. (bug 854614)
    
    Also, move the dhcp_domain flag from being in nova.network.linux_net to be
    in the more common nova.network.manager.  Since it is being used for
    something more generic, it shouldnt be stuck in linux_net.
    
    Change-Id: Ieab3cb1b7b0b78aff8df25bbc35b96924a8e7e60

 nova/api/ec2/cloud.py       |    3 ++-
 nova/network/linux_net.py   |    3 ---
 nova/network/manager.py     |    3 +++
 nova/tests/test_metadata.py |    8 ++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

commit 7a95f73ad7b295ddd2313152973c6da2c78fac76
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 23 10:35:18 2011 -0400

    Removing old code that snuck back in
    
    Change-Id: I52ba155e02a92eac417dba220a41acf32d3141e8

 nova/api/openstack/_id_translator.py       |   43 ----------------------------
 nova/api/rackspace/controllers/__init__.py |    5 ----
 2 files changed, 48 deletions(-)

commit 569b310b003c1c96151a3e3d448ddf5fe4e9299a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 26 05:14:39 2011 -0700

    Makes sure to recreate gateway for moved ip
    
    If nova moves an ip when setting up dhcp, make sure to reset
    the default gateway.  Fixes bug 859587
    
    Change-Id: I9f2b7bc5ede142717df6cb1653043b4f5c09959a

 nova/network/linux_net.py    |   13 +++++++++++++
 nova/tests/test_linux_net.py |   32 +++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

commit 6c52cffab5c35c9d668e0ef5f612004cb7940091
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Sep 25 22:23:15 2011 +0000

    Fix some minor issues due to premature merge of original code.
    
    Consolidate duplicated code between delete() and force_delete(). Treat soft
    deleted instances like hard deleted instances in queries. Fix running unit
    tests individually do to using flags from a non-imported module.
    
    blueprint deferred-delete-instance
    
    Change-Id: Id58b607320536364867ee5c8d347b250406d9a2d

 nova/compute/api.py              |   40 ++++++++++++++++----------------------
 nova/db/sqlalchemy/api.py        |   14 ++++++++++++-
 nova/tests/api/ec2/test_cloud.py |   16 +++++++++++----
 3 files changed, 42 insertions(+), 28 deletions(-)

commit 8be1c68f809b55088c1ad00ef86cb13b0103aab0
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 20 16:13:12 2011 -0500

    * Rework osapi to use network API not FK backref
    * Fixes lp854585
    
    Change-Id: I270794a08a1bfafe7af427cd31f1f60df1faa4ba

 nova/api/openstack/ips.py                          |   93 +++--
 nova/api/openstack/servers.py                      |   23 +-
 nova/api/openstack/views/addresses.py              |   98 ++---
 nova/api/openstack/views/servers.py                |   43 +--
 nova/db/api.py                                     |    5 +
 nova/db/sqlalchemy/api.py                          |   17 +
 nova/network/api.py                                |    6 +
 nova/network/manager.py                            |   11 +
 .../api/openstack/contrib/test_createserverext.py  |   26 +-
 nova/tests/api/openstack/contrib/test_volumes.py   |   13 +-
 nova/tests/api/openstack/fakes.py                  |   42 ++-
 nova/tests/api/openstack/test_server_actions.py    |    1 +
 nova/tests/api/openstack/test_servers.py           |  389 ++++++++++----------
 nova/tests/integrated/test_servers.py              |    2 +
 nova/tests/integrated/test_volumes.py              |    1 +
 15 files changed, 441 insertions(+), 329 deletions(-)

commit 0a56ae6fa27ee08a0cb237c7872dc872ae9cc766
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Sep 24 23:46:23 2011 -0700

    Allow tenant networks to be shared with domain 0.
    
    If domain 0 has an IP address on a given bridge, then add a flow rule to
    allow traffic to leave that port.  This allows for the case where domain 0
    and the tenant network are sharing a bridge, which is useful in non-production
    environments.
    
    At the same time, simplify the interface to ovs_configure_base_rules.py.
    There is no need to pass the bridge in, because it's implicit in the selection
    of the physical interface, and can be obtained using ovs-vsctl iface-to-br.
    
    Having made these two changes, it's now reasonable to apply flow rules to all
    interfaces as a default (if not overridden in the sysconfig file).
    
    Change-Id: I2a33ed55246d49b0e4f57db909e1b40351d27602

 .../networking/etc/init.d/openvswitch-nova         |   11 +++++----
 .../networking/etc/sysconfig/openvswitch-nova      |   16 +++++++++++-
 .../xensource/scripts/ovs_configure_base_flows.py  |   26 ++++++++++++++------
 3 files changed, 40 insertions(+), 13 deletions(-)

commit 16e3f2effcddf838cc8927cc6fc8a968de0034bd
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Sep 24 23:37:07 2011 -0700

    Use ovs-vsctl iface-to-br to look up the bridge associated with the given VIF.
    This avoids assuming that vifX.Y is attached to xenbrY, which is untrue in
    the general case.
    
    Change-Id: Ie3398b4a2231e0483acae272be71cb09a1744872

 .../xensource/scripts/ovs_configure_vif_flows.py   |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bca7dd3e1d8bec758faf511338617f6d4121e0b8
Merge: ddb6945 c586e4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 21:55:51 2011 +0000

    Merge "Made jenkins email pruning more resilient."

commit c586e4ed23846420177802c164f594e021cceea8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Sep 23 17:37:29 2011 -0400

    Made jenkins email pruning more resilient.
    
    Change-Id: I812e95fb0744ad84abd7ea2ad7d11123667abbc8

 nova/tests/test_misc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ddb6945e8fbb8a00d5b67a6a6b8a069b7642022d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 23 16:39:21 2011 -0400

    Fixing bug 857712
    
    Change-Id: I495363b44d9da96d66f85c2a621393329830aeb3

 nova/compute/api.py        |    4 ++--
 nova/tests/test_compute.py |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 774b5aaa173fa04675be5252c5d47f67a07347ac
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Sep 23 15:36:50 2011 -0500

    Adds disk config
    
    Change-Id: If3e1765b659ead77f9cdaaa86ee8478a82bf67c0

 nova/api/openstack/contrib/diskconfig.py           |  150 +++++++++++++++++++
 .../versions/050_add_disk_config_to_instances.py   |   39 +++++
 nova/db/sqlalchemy/models.py                       |    1 +
 .../tests/api/openstack/contrib/test_diskconfig.py |  156 ++++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py        |    1 +
 nova/tests/xenapi/stubs.py                         |    3 +
 nova/virt/xenapi/vm_utils.py                       |   20 +--
 nova/virt/xenapi/vmops.py                          |   11 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    8 +-
 9 files changed, 377 insertions(+), 12 deletions(-)

commit 4e94ec1a0a566b66f09b734e6ffe964b4b3b4bee
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 23 15:03:35 2011 -0400

    Adding xml schema validation for /versions resource.
    
    Change-Id: I8e0b7695743844614b3e7c5a08bb88d3a7500b5d

 nova/api/openstack/schemas/v1.1/version.rng  |   17 +++++++++++++++++
 nova/api/openstack/schemas/v1.1/versions.rng |   11 +++++++++++
 nova/api/openstack/xmlutil.py                |    5 ++++-
 nova/tests/api/openstack/test_versions.py    |   14 ++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)

commit e15258def26bd3b4781486a7a85ca599cbdb07f6
Author: Troy Toman <troy.toman@rackspace.com>
Date:   Fri Sep 23 10:47:31 2011 -0500

    Fix bug 856664 overLimit errors now return 413
    
    Added personal email to .mailmap to allow merge
    
    Change-Id: Ic9595b9b00cc6a388550ea558a5748c326f91736

 .mailmap                                |    1 +
 nova/api/openstack/faults.py            |    2 +-
 nova/tests/api/openstack/test_limits.py |    8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

commit 637cd313cfff44c1d805fe75b8674cae6c01de82
Merge: b020a05 affabf5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 17:38:21 2011 +0000

    Merge "Don't use GitPython for authors check"

commit affabf5be4db8b15974bb9ce4c16b0a8242e1fc2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Sep 23 15:57:55 2011 +0100

    Don't use GitPython for authors check
    
    I hit this issue with an older GitPython version:
    
      https://bugzilla.redhat.com/740852
    
    Seeing as all GitPython is doing for us is running:
    
      $> git rev-list --pretty=raw HEAD
    
    and parsing the output, I figure it's just as easy for us to run git
    directly.
    
    Change-Id: Ib43e2346c7d4c47e7776919f2b9c982133628129

 nova/tests/test_misc.py |   15 +++++----------
 tools/pip-requires      |    2 --
 2 files changed, 5 insertions(+), 12 deletions(-)

commit b020a057724cdf3cff59e168058ec9eb11a347ba
Merge: 7c74180 48bc664
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 15:51:35 2011 +0000

    Merge "Fix rfc.sh's check for the project"

commit 7c741809e5b0dce9ed464d04254f01648d3f6c20
Merge: 21dcf66 64736d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 15:42:47 2011 +0000

    Merge "Add minDisk and minRam to OSAPI image details"

commit 21dcf669c72fddc7b26018388e678fe0b033e318
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Sep 22 18:22:42 2011 -0400

    Fix outstanding pep8 errors for a clean trunk.
    
    Also, add an option to run_tests.sh to skip running pep8. We have a separate
    job in Jenkins which runs pep8, so there's no need to spin our wheels on it
    during the test run.
    
    Change-Id: I552330994e55a36fa96b63658493ed30e2720c85

 nova/api/openstack/_id_translator.py               |    3 ++-
 nova/api/openstack/ips.py                          |    4 ++--
 nova/compute/manager.py                            |    4 ++--
 .../sqlalchemy/migrate_repo/versions/001_austin.py |   24 ++++++++++----------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |   18 +++++++--------
 .../versions/003_add_label_to_networks.py          |    2 +-
 .../migrate_repo/versions/004_add_zone_tables.py   |    2 +-
 .../versions/005_add_instance_metadata.py          |    2 +-
 .../versions/008_add_instance_types.py             |   16 ++++++-------
 .../versions/009_add_instance_migrations.py        |    2 +-
 .../versions/010_add_os_type_to_instances.py       |    2 +-
 .../migrate_repo/versions/011_live_migration.py    |    4 ++--
 .../versions/012_add_ipv6_flatmanager.py           |    6 ++---
 .../014_add_instance_type_id_to_instances.py       |    2 +-
 .../versions/019_add_volume_snapshot_support.py    |    2 +-
 .../versions/024_add_block_device_mapping.py       |    4 ++--
 .../migrate_repo/versions/026_add_agent_table.py   |    2 +-
 .../versions/027_add_provider_firewall_rules.py    |    8 +++----
 .../versions/029_add_zone_weight_offsets.py        |    2 +-
 .../migrate_repo/versions/030_multi_nic.py         |    2 +-
 .../versions/042_add_volume_types_and_extradata.py |    2 +-
 .../migrate_repo/versions/048_add_zone_name.py     |    2 +-
 nova/tests/api/openstack/test_flavors.py           |    6 +++--
 nova/tests/api/openstack/test_servers.py           |    2 +-
 nova/tests/fake_network.py                         |    2 +-
 nova/tests/scheduler/test_scheduler.py             |    2 +-
 nova/tests/test_libvirt.py                         |   16 ++++++-------
 run_tests.sh                                       |   10 ++++++--
 28 files changed, 81 insertions(+), 72 deletions(-)

commit 64736d1e12b9754562d2980234a96f6eeb18e704
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Sep 15 14:46:19 2011 -0400

    Add minDisk and minRam to OSAPI image details
    
    Change-Id: I4bf1920a245de85c88c38ec3ad82dc0e93cc671c

 nova/api/openstack/create_instance_helper.py |    4 +
 nova/api/openstack/images.py                 |    6 +
 nova/api/openstack/schemas/v1.1/image.rng    |    6 +
 nova/api/openstack/views/images.py           |    5 +
 nova/compute/api.py                          |    5 +
 nova/exception.py                            |    8 ++
 nova/image/glance.py                         |    2 +-
 nova/tests/api/openstack/test_images.py      |  189 ++++++++++++++++++++++++++
 nova/tests/image/test_glance.py              |   12 ++
 nova/tests/test_compute.py                   |   91 +++++++++++++
 10 files changed, 327 insertions(+), 1 deletion(-)

commit 48bc6645da2f12a6c1667d2db49afe1d5417de9f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Sep 23 12:14:20 2011 +0100

    Fix rfc.sh's check for the project
    
    From 'git remote show origin' we get 'openstack/nova.git' but gerrit's
    ls-projects returns 'openstack/nova'
    
    Change-Id: I4ea6361633d0e94895dbbdaf3837f12c6c307bfc

 tools/rfc.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 37100f5653960b7f898e91663839feed51e14419
Author: James E. Blair <jeblair@hp.com>
Date:   Thu Sep 22 12:06:01 2011 -0700

    Add rfc.sh to help with gerrit workflow.
    
    Change-Id: Ida3c5cd3f10d776890f3f50bf18c8e5d2817c391

 .mailmap     |    2 +-
 Authors      |    1 +
 tools/rfc.sh |  145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)

commit 853aad905531fbdf6d5ddce4bc26b3caeebbc49f
Merge: f81b8e1 b1daaa0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Sep 22 16:42:20 2011 +0000

    This patch adds flavor filtering, specifically the ability to flavor on minRam, minDisk, or both, per the 1.1 OSAPI spec.
    
    In addition, this patch refactors instance_type_get_all to return a *list* of instance_types instead of a *dict*. This makes it more consistent with the rest of the DB API.

commit f81b8e1efe0fdce003078b1ae328c7bee18e875d
Merge: 4e85d75 2fdc37c
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 22 15:41:34 2011 +0000

    Add next links for server lists in OSAPI 1.1. This adds servers_links to the json responses, and an extra atom:link element to the servers node in the xml response.

commit 4e85d7555c0b7844c22ed1bc6c8a24d9abe61dc4
Merge: d865a2a 19b3b7a
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Sep 22 15:31:37 2011 +0000

    Update exception.wrap_exception so that all exceptions (not just Error and NovaException types) get logged correctly.

commit b1daaa0b216d341c69421e4d9666e73860eec68c
Merge: 57a67cf d865a2a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:50:02 2011 -0500

    Merging trunk

commit 57a67cf27a51e6849bff6236f896ecbee6345250
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:49:35 2011 -0500

    Adding OSAPI tests for flavor filtering

 nova/api/openstack/flavors.py            |   11 +-
 nova/db/sqlalchemy/api.py                |    1 -
 nova/tests/api/openstack/test_flavors.py |  223 +++++++++++++++++++++++++++++-
 3 files changed, 225 insertions(+), 10 deletions(-)

commit d865a2a97c013a811c2c6baad00fa1eb95406c8d
Merge: 221509a 4fb602f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 22:14:15 2011 +0000

    This patch adds instance progress which is used by the OpenStack API to indicate how far along the current executing action is (BUILD/REBUILD, MIGRATION/RESIZE).
    
    For the first cut, we decided to keep it simple and compute progress by counting discrete steps. This is not ideal since some steps, in particular, steps which involve transferring large amounts of data over the network, take *much* longer than others. A better approximation would account for the data-transferred to the destination host, since in most cases, this dominates the time spent.
    
    In addition to adding progress, this patch:
    
    - Allows resizes to use same host for source and destination which is useful for dev environments without a second host. This is enabled by the --allow_resize_to_same_host flag.
    
    - Fixes a bug in the glance and migration XenAPI plugins where the VHDs were being copied into the SR in the wrong order. Before the base-copy was copied first meaning it was possible for snapwatchd to see the base-copy before the dependent cow was present. It was treat the base_copy as an unreferenced parent, and GC it.
    
    - Additional refactoring and cleanups.

commit be8b40a02858a0f054c96d97a9881a9e3e4a1f49
Merge: 7a68fe1 221509a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:07:56 2011 -0500

    Merging trunk

commit 221509abcdef0077e8c592c5e0a6ae3add78b007
Merge: 9cf7352 a63ca42
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 21:31:32 2011 +0000

    Fixes lp:855115 -- issue with disassociating floating ips.

commit 4fb602fcbc2a7b0681e79454fe7c3f01110b1f0e
Merge: 748b056 9cf7352
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:00:53 2011 -0500

    Renumbering instance progress migration

commit 748b056209947032735c71212b8be21a16f2cadf
Merge: a3b311d d9752d4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 15:59:40 2011 -0500

    Fixing tests

commit 9cf7352fbd26fe8db4205c385b92778603af7797
Merge: d9752d4 cd40504
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 20:52:18 2011 +0000

    Keystone support in Nova across Zones.

commit cd4050422340d27ba6161e2b9c4ccc7f057fb4bb
Merge: 1051adc d9752d4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 13:17:05 2011 -0700

    trunk merge fixup

commit d9752d46554ffa87360bfd740177b40871cfbea6
Merge: 14068bc 43f59d5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 19:27:14 2011 +0000

    Fix keys in ec2 conversion to make sure not to use unicode.

commit 14068bc8f748ee3bee3c5b86ac19cd21b0ff8b67
Merge: 7e3bebb 10589fa
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Sep 21 18:27:23 2011 +0000

    Adds an 'alternate' link to image views per 3.10 and 3.11 of http://docs.openstack.org/cactus/openstack-compute/developer/openstack-compute-api-1.1/content/LinksReferences.html

commit 7a68fe15076984a23b937eb55bea870e56a94fb4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:04:38 2011 +0000

    Typo

 nova/tests/api/openstack/test_flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2a7b10f335f9393315755ad5cea2c0f2bc386319
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:58:19 2011 +0000

    Fixing tests

 nova/tests/api/openstack/test_flavors.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit fc1ce7821dd5b4c23afd5ae49c68459a8f2207c7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:43:45 2011 +0000

    Fixing tests

 nova/tests/api/openstack/test_flavors.py |    8 ++++----
 nova/tests/db/fakes.py                   |    2 +-
 nova/tests/vmwareapi/db_fakes.py         |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 09:34:59 2011 -0700

    make sure kwargs are strings and not unicode

 nova/api/ec2/ec2utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ebd5675cde9cfedc58da36e22d97968264310ac
Merge: ec2a93c 7e3bebb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:30:30 2011 +0000

    Merging trunk

commit ec2a93ca94e3d8ce436858380fc2c46963c76e05
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:29:36 2011 +0000

    Adding flavor filtering

 nova/api/openstack/flavors.py     |    8 +++++++-
 nova/db/api.py                    |    5 +++--
 nova/db/sqlalchemy/api.py         |   10 +++++++++-
 nova/tests/test_instance_types.py |   37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

commit 7e3bebbe8e911851a7398b8d5ad81afb421dfd62
Merge: 1fc5abe ad3f3d0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 21 15:54:30 2011 +0000

    Instance deletions in Openstack are immediate. This can cause data to be lost accidentally.
    
    This branch adds a new configuration flag, reclaim_instance_interval. The default of 0 results in the same behavior before this patch, immediate deletion of the instance. Any value greater than 0 will result in the instance being powered off immediately and then later the instance will be reclaimed.
    
    New actions, restore and forceDelete allow a previously deleted instance to be restored, or reclaimed immediately.

commit 1fc5abe0c63c6395e77c8031ae0a0b49e251f470
Merge: 4e985b4 5ed0157
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 13:31:54 2011 +0000

    Makes sure ips are moved on the bridge for nodes running dnsmasq so that the gateway ip is always first.

commit 5ed0157ba4c8218680906e63277dfdf45e5719c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 05:56:48 2011 -0700

    pep8

 nova/network/linux_net.py    |    2 +-
 nova/tests/test_linux_net.py |   40 +++++++++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 14 deletions(-)

commit 2810a7aca4fc7d9773d77e5186f87dcf77f60ef4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 05:34:56 2011 -0700

    add tests and fix bug when no ip was set

 nova/network/linux_net.py    |    2 +-
 nova/tests/test_linux_net.py |   55 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

commit 1051adcfc88c7a9eacef2a7000f43f9e66e1cb47
Merge: 9dc5939 c77c080
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:19:53 2011 -0700

    fix diverged branch

commit 9dc59398a2278034be1c391f460406365a808bb7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:07:17 2011 -0700

    migration conflict fixed

 .../migrate_repo/versions/047_add_zone_name.py     |   35 --------------------
 .../migrate_repo/versions/048_add_zone_name.py     |   35 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)

commit e44bef0cd4264cabc0d7f116e841a2a185af9c52
Merge: ed4d173 4e985b4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:04:37 2011 -0700

    clean up based on cerberus review

commit ed4d1733c5308d6591587471cacf6b09bbb99f10
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:03:37 2011 -0700

    clean up based on cerberus review

 nova/api/openstack/servers.py |    2 +-
 nova/scheduler/api.py         |   12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

commit 4e985b4c71df3ae87c2027f4d6ca9d82e8266dfd
Merge: 67420a5 7e7880e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 10:47:07 2011 +0000

    Remove keystone middlewares.

commit e86dc6b69f775c283a61932a456b50af15073ed7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 02:09:37 2011 -0700

    fix moving of ips on flatdhcp bridge

 nova/network/linux_net.py |   40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

commit a63ca427e75c73611dd129bc7b5a625f6c06fa44
Merge: 4d0bb87 d9752d4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 09:00:18 2011 +0000

    Merged trunk

commit 50ddd81251a187f96768d8cad48d785b63ed602f
Merge: 67a2445 9760241
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 02:00:07 2011 -0700

    merged trunk

commit 4d0bb8730a076b44d0a37fd0770c743b834e5751
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 08:47:33 2011 +0000

    update floating ips tests

 nova/api/openstack/contrib/floating_ips.py         |    7 ++++++-
 .../api/openstack/contrib/test_floating_ips.py     |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

commit aff43d206a679c1b81904a72cb2e4fb6dadbd515
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 08:37:54 2011 +0000

    floating ip could have no project and we should allow access

 nova/db/sqlalchemy/api.py  |   21 +++++++++++----------
 nova/tests/test_network.py |    6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

commit f752e712b7710b921f332c5c8459a29e064e8681
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 08:27:48 2011 +0000

    actions on floating IPs in other projects for non-admins should not be allowed.

 nova/api/ec2/__init__.py   |    4 ++++
 nova/db/sqlalchemy/api.py  |    2 +-
 nova/tests/test_network.py |   46 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

commit 778a1d162bbb8032e319d2bc2ae99c20339e1a47
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 06:40:52 2011 +0000

    floating_ip_get_by_address should check user's project_id

 nova/db/sqlalchemy/api.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 275f58c5649653632b8c28b66b59ff19d2cdf366
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:55:28 2011 +0000

    Pep8 fixes

 nova/db/sqlalchemy/api.py                     |    2 +-
 nova/tests/api/openstack/test_flavors.py      |    1 +
 nova/tests/test_instance_types_extra_specs.py |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

commit 9e1f1f91c3c66febcb2d624d32d2a3639f0d0598
Merge: 827d359 67420a5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:33:55 2011 +0000

    Merging trunk

commit 827d3593452c2892d5076fb0d2548b73a39ab262
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:33:31 2011 +0000

    Refactoring instance_type_get_all

 nova/api/ec2/admin.py                         |    5 +--
 nova/api/openstack/flavors.py                 |    6 ++--
 nova/compute/instance_types.py                |    8 +++--
 nova/db/sqlalchemy/api.py                     |   27 ++++++---------
 nova/tests/api/openstack/test_flavors.py      |   46 +++++++++++++------------
 nova/tests/db/fakes.py                        |    2 +-
 nova/tests/test_instance_types_extra_specs.py |   41 ++++++++++++----------
 nova/tests/vmwareapi/db_fakes.py              |    2 +-
 8 files changed, 71 insertions(+), 66 deletions(-)

commit 7e7880ea2c088c330a4e27c70ef23915c5b81d4a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:52:03 2011 -0700

    remove keystone url flag

 nova/api/ec2/__init__.py |    3 ---
 1 file changed, 3 deletions(-)

commit 830431dccd1e23ed8f7fab17eecb76405583e302
Merge: 4360452 9760241
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:37:41 2011 -0700

    merge trunk, fix conflicts

commit 43604520de242b46d8d6bdab1fada84bac57b4dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:17:03 2011 -0700

    remove keystone

 etc/nova/api-paste.ini   |   30 -----------------------------
 nova/api/auth.py         |   31 ------------------------------
 nova/api/ec2/__init__.py |   48 ----------------------------------------------
 3 files changed, 109 deletions(-)

commit 10589faa5fbde09689641d5e64ddd41a341eaade
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 16:11:49 2011 -0500

    Include 'type' in XML output.

 nova/api/openstack/images.py |    2 ++
 1 file changed, 2 insertions(+)

commit a1256381c107fd0cf91bd11a319c38918778079b
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:38:44 2011 -0500

    Minor cleanup.

 nova/tests/api/openstack/test_images.py |    2 --
 1 file changed, 2 deletions(-)

commit 525ad7c6b033a7da2fe023d42745696c9bae1e74
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:35:23 2011 -0500

    Added another unit test.

 nova/tests/test_utils.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit c07b24cdd6606950b0a4fef730c277b499eb65f4
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:21:06 2011 -0500

    Fixed unit tests with some minor refactoring.

 nova/api/openstack/views/images.py      |   13 ++--
 nova/tests/api/openstack/test_images.py |  102 +++++++++++++++++++++++++++++--
 nova/utils.py                           |    7 +++
 3 files changed, 108 insertions(+), 14 deletions(-)

commit 67420a537ba6bdf19aaada3ca25be30559965742
Merge: 9760241 51c8ca9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 19:51:55 2011 +0000

    Fix the display of swap units in nova manage.

commit 13e346df0bc88279242ed1c56ad39b36a22c8a39
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 13:56:15 2011 -0500

    Refactored alternate link generation.

 nova/api/openstack/views/images.py      |   19 ++++++++++++++++++-
 nova/image/glance.py                    |    7 -------
 nova/tests/api/openstack/test_images.py |   14 ++++++++++++++
 nova/tests/image/test_glance.py         |   11 -----------
 4 files changed, 32 insertions(+), 19 deletions(-)

commit 2fdc37c21ee9c6533cf7452e4347a9fa9212c31d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Sep 20 14:43:50 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_servers.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bb018b14fb8786090b2cf8b23723fa97defef9ce
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 12:41:23 2011 -0500

    Added function to construct a glance URL and unit test.

 nova/flags.py                   |    4 +++-
 nova/image/glance.py            |    7 +++++++
 nova/tests/image/test_glance.py |   11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

commit 4ee5cab427a95d451a3f33e90d0d5f9d3879c12d
Merge: f27ed55 9760241
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Sep 20 09:22:25 2011 -0400

    merge from trunk

commit 97602419375622006a20f81d0f83fd005c6816ac
Merge: 086a218 382f1dc
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 10:12:01 2011 +0000

    convert images that are not 'raw' to 'raw' during caching to node

commit 51c8ca90cc09890e742c1822d07a5cc6bc065154
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 02:55:56 2011 -0700

    show swap in Mb in nova manage

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 382f1dc728c2503e28237e9b2b455d46570943e6
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 05:40:18 2011 -0400

    Address Soren's comments:
     * clean up temp files if an ImageUnacceptable is going to be raised
       Note, a qemu-img execution error will not clean up the image, but I
       think thats reasonable.  We leave the image on disk so the user can
       easily investigate.
     * Change final 2 arguments to fetch_to_raw to not start with an _
     * use 'env' utility to change environment variables LC_ALL and LANG so
       that qemu-img output parsing is not locale dependent.
       Note, I considered the following, but found using 'env' more readable
         out, err = utils.execute('sh', '-c', 'export LC_ALL=C LANG=C && exec "$@"',
             'qemu-img', 'info', path)

 nova/virt/images.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 086a2184bc29880ce97e826fc43656a7eec54986
Merge: 0e0a2e7 a1229e5
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Sep 20 09:37:07 2011 +0000

    Add iptables filter rules for dnsmasq (lp:844935)
    
    On Fedora, the default policy for the INPUT chain in the filter table
    is DROP. This means that DHCP and DNS request packets from the guest
    get dropped.
    
    Add these rules to allow the traffic through:
    
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p udp -m udp --dport 67 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p tcp -m tcp --dport 67 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p udp -m udp --dport 53 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p tcp -m tcp --dport 53 -j ACCEPT

commit 0e0a2e7fc8f98c7ef9c85e466dae985e5a529238
Merge: dcd646e a3ccd0f
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 08:41:51 2011 +0000

    create disk.local the same way ephemerals are created (LP: #851145)
    
    If the user did not specify '--block-device-mapping /dev/vdb=ephemeral0', then the first non-root device would end up being created differently then if they had.  It would not have a filesystem on it.
    
    This makes 'local_gb' in the libvirt connection created the same way that
    it would be if it were named ephemeral0.

commit 2eb2120f98cfe70ce67325ffe26cfb5cc86c6356
Merge: b399ac7 dcd646e
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 03:23:34 2011 -0400

    merge with trunk r1601

commit b399ac7b6e80d16fddd61c9b2d505cff09cb8889
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 03:18:45 2011 -0400

    fix call to gettext

 nova/virt/images.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit dcd646e6610e2a5cc6da78220ab0c8acde48d401
Merge: 7a64d31 b9c7080
Author: Brad McConnell bmcconne@rackspace.com <>
Date:   Tue Sep 20 06:50:27 2011 +0000

    Fixed --uuid network command in nova-manage to desc to "uuid" instead of "net_uuid"

commit 7a64d31b447fcff331877c6bf7ab06ba49e1b086
Merge: 5db721d eee411b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Sep 20 06:38:04 2011 +0000

    removes warning set forth in d3 for deprecated setting of bridge automagically

commit 5db721df9b2733ac513bff12ffbdb2148a9d229d
Merge: b905030 869b072
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 20 06:26:58 2011 +0000

    Update migration 047 to dynamically lookup the name of the instance_id
    fkey before dropping it. We can't hard code the name of the fkey since we
    didn't name it explicitly on create.

commit b9c708064a256f0fc4c1559b28265c0485ef634f
Author: Brad McConnell bmcconne@rackspace.com <>
Date:   Mon Sep 19 22:21:10 2011 -0500

    added to authors cuz trey said I cant patch otherwise!

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 5a9c4ef3786d99373b1d3c16b499420425221ae0
Author: Brad McConnell bmcconne@rackspace.com <>
Date:   Mon Sep 19 21:35:47 2011 -0500

    Fixed --uuid network command in nova-manage to desc to "uuid" instead of "net_uuid"

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f27ed550fae070c8cfeaf638b2a00a9b80f188c1
Merge: a0e7053 b905030
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 22:09:53 2011 -0400

    merged with trunk

commit 869b0724e897d75695c2a1a559d1447745f9dce8
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 19 22:04:32 2011 -0400

    Update migration 047 to dynamically lookup the name of the instance_id
    fkey before dropping it. We can't hard code the name of the fkey since we
    didn't name it explicitly on create.

 .../versions/047_remove_instances_fk_from_vif.py   |   32 ++++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

commit a0e705359353cb6a9b0c3fc8178e714e4350c585
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 21:53:21 2011 -0400

    oops, add project_id and 'servers' to next links

 nova/api/openstack/views/servers.py      |    4 +++-
 nova/tests/api/openstack/test_servers.py |   15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

commit b90503021b5d55c51cf082fd168512bd4586383d
Merge: 58acb29 f8d6243
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 20 00:57:14 2011 +0000

    Fixes migration for Mysql to drop the FK on the right table

commit 58acb29afb45f15196484e5fcd40b3e098a82d24
Merge: 897f595 879f425
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Sep 20 00:46:38 2011 +0000

    Reverted some changes to instance_get_all_by_filters() that was added in rev 1594.  An additional argument for filtering on instance uuids is not needed, as you can add 'uuid: uuid_list' into the filters dictionary.  Just needed to add 'uuid' as an exact_match_filter.  This restores the filtering to do a single DB query.
    
    Also updated ID/UUID mapping code to be a little more efficient, by returning a dictionary of 'ID: UUID'... vs a list.
    
    Fixed a test that assumed list order.
    
    A couple of typo fixes and a pep8 issue in trunk also fixed.

commit 5428587ed2085abfd909834a890251cb4cfb372b
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 20:39:02 2011 -0400

    fix syntax error in exception, remove "Dangerous!" comment

 nova/virt/images.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 879f4259e6512f03d5b49a22e219d17d3aa04b56
Merge: 83023c3 897f595
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:32:45 2011 -0700

    merged trunk and resolved conflict

commit f8d62435f5171ab47aba7d966b2b8b0561c5f5ba
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 17:27:25 2011 -0500

    run the alter on the right table

 .../versions/047_remove_instances_fk_from_vif.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 83023c3035746f296fd024b282c355e8499770f1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:23:52 2011 -0700

    fix unrelated pep8 issue in trunk

 nova/network/linux_net.py |    1 -
 1 file changed, 1 deletion(-)

commit cd392de955e442d93cfca6efab8a51d64e7f9940
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 18:13:08 2011 -0400

    use dictionary format for exception message

 nova/virt/images.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b0ca3a42995cc25852420083e431c3be5071d221
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:08:25 2011 -0700

    fix a test where list order was assumed

 nova/tests/test_db_api.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 83aca0e78727a870fb6aa788158920a1c8321541
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 14:53:17 2011 -0700

    Removed the extra code added to support filtering instances by instance uuids.
    Instead, added 'uuid' to the list of exact_filter_match names.
    Updated the caller to add 'uuid: uuid_list' to the filters dictionary, instead of passing it in as another argument.
    Updated the ID to UUID mapping code to return a dictionary, which allows the caller to be more efficient... It removes an extra loop there.
    A couple of typo fixes.

 nova/compute/api.py        |    5 +++--
 nova/db/api.py             |   13 ++++++-------
 nova/db/sqlalchemy/api.py  |   40 ++++++++++++----------------------------
 nova/network/manager.py    |    9 +++------
 nova/tests/fake_network.py |    8 +++++---
 nova/tests/test_compute.py |    4 ++--
 6 files changed, 31 insertions(+), 48 deletions(-)

commit 897f595b86d8f403c4afa0f2aa73bb815030a943
Merge: 682d358 358dffe
Author: paul@openstack.org <>
Date:   Mon Sep 19 21:41:48 2011 +0000

    Reworked the export command to be
    nova-manage shell export --filename=somefile
    
    This will output the somefile file in to the keystone-manage syntax that will then be used by a shellscript that is being proposed to keystone.

commit 682d358555e9f43acdb037cae5ad35a14d1cbcbd
Merge: 3da916d bff43a5
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 21:21:54 2011 +0000

    Adds the ability to automatically confirm resizes after the `resize_confirm_window` (0/disabled by default).

commit cb363ba54a55f0f73eae741701dc2256d571b802
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 17:10:48 2011 -0400

    use '_(' for exception messages

 nova/virt/images.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bff43a5f0da9a891386d2d09464fb8f5e222d46d
Merge: 6697783 3da916d
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 16:02:29 2011 -0500

    PEP8 cleanup.

commit ff9d353b2f4fee469e530fbc8dc231a41f6fed84
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 16:57:44 2011 -0400

    convert images that are not 'raw' to 'raw' during caching to node
    
    This uses 'qemu-img' to convert images that are not 'raw' to be 'raw'.
    By doing so, it
     a.) refuses to run uploaded images that have a backing image reference
         (LP: #853330, CVE-2011-3147)
     b.) ensures that when FLAGS.use_cow_images is False, and the libvirt
         xml written specifies 'driver_type="raw"' that the disk referenced
         is also raw format. (LP: #837102)
     c.) removes compression that might be present to avoid cpu bottlenecks
         (LP: #837100)
    
    It does have the negative side affect of using more space in the case where
    the user uploaded a qcow2 (or other advanced image format) that could have
    been used directly by the hypervisor.  That could, later, be remedied by
    another 'qemu-img convert' being done to the "preferred" format of the
    hypervisor.

 nova/virt/images.py             |   55 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

commit eee411b90f7c6eda0de898489daff6e6aa006bb1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Sep 19 15:56:42 2011 -0500

    now raising instead of setting bridge to br100 and warning as was noted

 bin/nova-manage |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 3da916de6165e1e7012f61a05a6a0d9d06906b48
Merge: 64e7f6d f2d0001
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 20:16:49 2011 +0000

    * Remove the foreign key and backrefs tying vif<->instance
    * Update instance filtering to pass ip related filters to the network manager
    * move/update tests

commit 64e7f6dfcd4496157c06cfed9b3078c474113877
Merge: 08d3053 6220ae4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 19 20:06:37 2011 +0000

    Adds an optional flag to force dhcp releases on instance termination.  This allows ips to be reused without having to wait for the lease to timeout.

commit c7f04b68ba752766fa2fc1edb68e6fb0219606e3
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 16:03:31 2011 -0400

    remove urllib import

 nova/api/openstack/views/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 08d3053aea0f77f38f1614e7cb867bddb8e55302
Merge: eea1afc 4c29835
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 19 19:56:51 2011 +0000

    Fixing case where OSAPI server create would return 500 on malformed body.

commit eea1afce94dd1f1303a5bda4c157894a45ee88cf
Merge: 0561c0e 629ed28
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 19 19:47:00 2011 +0000

    Fix the issue with the new dnsmasq where it tries and fails to bind to ipv6 addresses.

commit a3b311de88f625072da13446be0b5a7132829ff1
Merge: 768b219 0561c0e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Sep 19 19:32:33 2011 +0000

    Merging trunk

commit 768b219eb21c03681924f5dca36fd59e31291ea7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Sep 19 19:32:09 2011 +0000

    Renaming progress migration to 47

 .../versions/046_add_instances_progress.py         |   43 --------------------
 .../versions/047_add_instances_progress.py         |   43 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)

commit 90aeccc8675da40109f8e53dfd9b2b8902e5bd4f
Merge: 5feb413 0561c0e
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 14:07:14 2011 -0400

    merge with trunk

commit 66977838d02ad51ced525321b21e648bcc2065bc
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 11:58:20 2011 -0500

    Added unit test.

 nova/tests/test_db_api.py |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit bd5a0a2bf42686efb81bb08de5d6938e2c076f0b
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 11:10:50 2011 -0500

    Corrected the status in DB call.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 629ed282f528fd3096ec26d0afe7bd7f51c16127
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 19 08:52:41 2011 -0700

    don't try to listen on ipv6 addresses, or new dnsmasq goes boom

 nova/network/linux_net.py |    1 -
 1 file changed, 1 deletion(-)

commit 5feb413f7698633c6a598ec2899772269a96b690
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 11:26:14 2011 -0400

    make our own function instead of using urllib.urlencode since we apparently don't suppor urlencoded strings yet

 nova/api/openstack/common.py             |   10 ++++++++++
 nova/api/openstack/views/servers.py      |    2 +-
 nova/tests/api/openstack/test_servers.py |    6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

commit 91664a2c07e4a5627558dbcaa2dd4a6719315561
Merge: 90f0105 0561c0e
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 10:25:00 2011 -0500

    Merged trunk.

commit f2d0001217ec51d323642a6dd1f8fc559702b5e3
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:50:13 2011 -0500

    remove unused import

 nova/db/sqlalchemy/api.py |    1 -
 1 file changed, 1 deletion(-)

commit 041b4a64b09941c7168cc5ef0e348a68a2cdab0e
Merge: bd8133c 0561c0e
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:35:08 2011 -0500

    merge the sknurt

commit bd8133c8a9ca39ae3bb66499975462ccec5f8ca8
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:34:19 2011 -0500

    remove the polymorph

 nova/db/sqlalchemy/api.py |    2 --
 1 file changed, 2 deletions(-)

commit a51ea2b13dd865530fed1bb303ab2e259ddf7ec2
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:33:47 2011 -0500

    Fix typo in comment

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0561c0e01822d81fc90fed00f41b8d469c6c7808
Merge: 2835134 7139d74
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Mon Sep 19 14:22:34 2011 +0000

    Fixes the handling of snapshotting in libvirt driver to actually use the proper image type instead of using raw for everything. Also cleans up an unneeded flag.  Based on doude's initial work.

commit 1e094377ada74202bfc4d3c03f6b7f747ad570d7
Merge: ff788a0 2835134
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 09:25:02 2011 -0400

    merge with trunk

commit 4c29835b6e5bd89460846588994f75543e5c235a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Sep 18 17:01:44 2011 -0400

    removing extra newline

 nova/api/openstack/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 340c0dd5250d6cdee08ccf86cf7a1e88cfbeea07
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Sep 18 16:01:28 2011 -0400

    catching AttributeError and adding tests

 nova/api/openstack/servers.py            |    7 +++-
 nova/tests/api/openstack/test_servers.py |   52 ++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

commit 2835134095fb645caac5cd7720febfa871084c05
Merge: 09b9026 3648023
Author: Jason Koelker <jason@koelker.net>
Date:   Sun Sep 18 19:36:16 2011 +0000

    Remove vestigial db call for fixed_ips.

commit 09b902638a38f1965101182d66cde3cd661e39c4
Merge: 9741f5a ad11c1c
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Sun Sep 18 18:52:22 2011 +0000

    Fixes the user credentials for installing a config-drive from imageRef

commit 9741f5ad231e1e759955ad6952af148227300cd7
Merge: 7f80909 f30d986
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Sep 18 18:34:09 2011 +0000

    Some Linux systems can also be slow to start the guest agent. This branch extends the windows agent timeout to apply to all systems.

commit 6220ae46be5c1a4346b3036c6e8d31ddb1bcb4ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 18 02:37:09 2011 -0700

    remove extra line

 nova/network/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 78f7cd742126a9f758ae3a6c133af99df12e838b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 17 15:26:31 2011 -0700

    get the interface using the network and instance

 nova/network/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit f69ccc655fb132f344fe633279d1a73e2e30245a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 17 15:09:36 2011 -0700

    flag typo

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 992049badd5d7809d61732a5d30290c562a7bf60
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 17 15:06:39 2011 -0700

    add an optional flag to force dhcp release using dnsmasq-utils

 nova/network/linux_net.py |   19 +++++++++++++++++++
 nova/network/manager.py   |    7 +++++++
 2 files changed, 26 insertions(+)

commit ad11c1c92d39d14c72ec5bf10394fca9021d87ce
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Sat Sep 17 13:05:42 2011 -0700

    Fix user_id, project_id reference for config_drive with imageRefs

 nova/tests/test_compute.py      |   14 ++++++++++++++
 nova/virt/libvirt/connection.py |    4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

commit 7f80909f4818a5a8d9b61816a3ce23792cdba8a0
Merge: 830a858 2d3027d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Sep 17 18:00:25 2011 +0000

    Fix a bug that would make spawning new instances fail if no port/protocol is given (for rules granting access for other security groups).

commit 830a85815cc6b53395a91efb93466692dc33fc83
Merge: 0dc0671 24db80b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Sep 17 17:50:41 2011 +0000

    When swap is specified as block device mapping, its size becomes 0 wrongly.
    This patch make it set to correct size according to instance_type.

commit a1229e5dbc3c03887dec49d93f55a0e4f60d96be
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Sep 17 08:28:16 2011 +0100

    Fix pep8 issues

 nova/network/linux_net.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 05521b82b5bb381b72319b5b05e03b8eb35af6c8
Merge: 0bcfe0b 0dc0671
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Sep 17 07:47:45 2011 +0100

    Merge trunk to resolve nova/network/linux_net.py conflict

commit 358dffe941cd280a69134dc59d3670e50b811800
Author: paul@openstack.org <>
Date:   Fri Sep 16 21:12:50 2011 -0500

    fixed grant user, added stdout support

 bin/nova-manage |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

commit 0dc06712aa06a60a582938770a9555b9df90fa22
Merge: 8c5c5bb 4c701ef
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 16 21:17:13 2011 +0000

    This changes the interpretation of 'swap' for an instance-type to be in MB rather than GB.

commit 5652459c41534bed1d19a794659146ef99941f0f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 20:07:38 2011 +0000

    Fixing list prepend

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f2ef26d5e4e34c26bd3c8fe62b81bd6409de2c5
Merge: f31b37c 8c5c5bb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 19:45:46 2011 +0000

    Merging trunk

commit a3ccd0f8454a0c381debf180b589d5837ef6674d
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 16 15:38:29 2011 -0400

    create disk.local the same way ephemerals are created (LP: #851145)
    
    If the user did not specify '--block-device-mapping /dev/vdb=ephemeral0', then
    then the first non-root device would end up being created differently then
    if they had.  It would not have a filesystem on it.
    
    This makes 'local_gb' in the libvirt connection created the same way that
    it would be if it were named ephemeral0.

 nova/virt/libvirt/connection.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 2d3027da762cdac0c5a12adee15d1bb28fb7bf10
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 21:27:25 2011 +0200

    Fix failing test.

 nova/tests/test_libvirt.py |    8 --------
 1 file changed, 8 deletions(-)

commit 8c5c5bb4dd8b8c53fb3ed0bbed5598da55fab12b
Merge: 5cc402a 79cc91f
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 16 19:12:55 2011 +0000

    Authorize to start a LXC instance withour, key, network file to inject or metadata.

commit 5cc402a8fedd5862ee82fdcac72d659039cdff97
Merge: 2e0e2de 5d5a05b
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Sep 16 19:02:08 2011 +0000

    Update the v1.0 rescue admin action and the v1.1 rescue extension to
    generate 'adminPass'. Fixes an issue where rescue commands were broken
    on XenServer. lp#838518
    
    Also relocate 'password_length' flag and replace cases where password length was hard-coded.

commit 364802336339eee72fdacd0ee2935822f7bfdc93
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:52:06 2011 -0500

    pep8

 nova/tests/test_compute.py |    1 -
 1 file changed, 1 deletion(-)

commit bb697d435d3a07bbf2b58db9ed4b13135579fd3a
Merge: 060ab84 2e0e2de
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:48:52 2011 -0500

    merge the trunks

commit d468902389d794c97f7dcb678cfac8e9d9b53bce
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:44:16 2011 -0500

    update tests to return fake_nw_info that is valid for the pre_live_migrate

 nova/tests/test_compute.py |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

commit d503671714645115eef0345e9ed1dbb6ff2fb883
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:43:31 2011 -0500

    make sure to raise since the tests require it

 nova/compute/manager.py |    5 +++++
 1 file changed, 5 insertions(+)

commit f31b37c80a9ef0c4ba07940897388094e5ed052c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:37:53 2011 +0000

    Pep8 Fix

 nova/virt/xenapi/vmops.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5d5a05bddb59cff6cf5ac1f7104da6030197a9c3
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Sep 16 14:35:10 2011 -0400

    Update test_volumes to use FLAGS.password_length.

 nova/tests/api/openstack/contrib/test_volumes.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit d6afa7c9d9897f5cdd54a54361c41d2665afc56a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:34:21 2011 +0000

    Zero out the progress when beginning a resize

 nova/virt/xenapi/vmops.py |    5 +++++
 1 file changed, 5 insertions(+)

commit c9aa038e6a1400852f67ab956b98270db52618b2
Merge: 9c43122 2e0e2de
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Sep 16 14:30:40 2011 -0400

    Merge w/ trunk.

commit 10f7128079942b14e7627fa34b93e2e0ae05058f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:06:27 2011 +0000

    Adding migration progress

 nova/api/openstack/views/servers.py |    3 +-
 nova/compute/manager.py             |    2 +-
 nova/tests/test_virt_drivers.py     |    3 +-
 nova/tests/test_xenapi.py           |    2 +-
 nova/virt/driver.py                 |    3 +-
 nova/virt/fake.py                   |    2 +-
 nova/virt/xenapi/vmops.py           |   97 ++++++++++++++++++++++-------------
 nova/virt/xenapi_conn.py            |    4 +-
 8 files changed, 70 insertions(+), 46 deletions(-)

commit 90f01055a92153709a90115688a8fce3d3029976
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 16 13:06:21 2011 -0500

    Only log migration info if they exist.

 nova/virt/xenapi/vmops.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit fa359fa8024f247f119d97be46fb7886e999969b
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:02:13 2011 -0500

    remove getting fixed_ips directly from the db

 nova/compute/manager.py |    5 -----
 1 file changed, 5 deletions(-)

commit c77c080d0aa0e5a93caa1e6c92ff6aca9464ee1f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 16 14:54:21 2011 -0300

    removed unused import

 nova/scheduler/api.py |    2 --
 1 file changed, 2 deletions(-)

commit 2e0e2def5cd4a3fe899573304beb2d4851cc37b8
Merge: 4e6c2cc e09b3d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 16 16:24:32 2011 +0000

    Fixes libvirt rescue to use the same strategy as xen.  Use a new copy of the base image as the rescue image.  It leaves the original rescue image flags in, so a hand picked rescue image can still be used if desired.

commit 80462f3e446964560198e77af6903d84a05cab87
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 11:17:44 2011 -0500

    Fixing tests, PEP8 failures

 nova/compute/manager.py    |    3 ++-
 nova/tests/test_xenapi.py  |    6 ++++--
 nova/tests/xenapi/stubs.py |    3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

commit e09b3d70e5a4aaa00f5ba62d1eab5d6d57a800e1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 16 08:44:25 2011 -0700

    fix permissions

 nova/virt/libvirt/connection.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4e6c2cc8028a5569599dedbab6fa8010115b4dd2
Merge: 895e776 6b3ac77
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Sep 16 15:36:57 2011 +0000

    Add a FakeVirDomainSnapshot and return it from snapshotCreateXML.
    Fixes libvirt snapshot tests.

commit 060ab8475d2a90b942473148a51889796ea2adc7
Merge: 5cdd247 895e776
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 10:28:54 2011 -0500

    merge the trunks

commit fc23a22534d27a187145b4c942f12ae458754ffe
Merge: 62516ca 895e776
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 16 10:25:53 2011 -0500

    Merged trunk.

commit 895e776fcb8d4f961ef52b7dd20bc1964d248538
Merge: 23fefd1 ecd77c0
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 16 15:22:14 2011 +0000

    I am using iputils-arping package to send arping command.
    You will need to install this package on the network nodes using apt-get command
    apt-get install iputils-arping

commit 322f5458236a64bc6d12ba29cee6750d452f1ecd
Merge: 1d2a5bd 23fefd1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 17:17:34 2011 +0200

    Merge trunk

commit ecd77c06d47f79d6c6341a0407e68507468553a4
Merge: f8d751d 23fefd1
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 16 07:40:37 2011 -0700

    Removed sudo from the arguments

commit 6b3ac77dabc3891648399c367546474fe3450fd1
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Sep 16 09:40:24 2011 -0400

    Add a FakeVirDomainSnapshot and return it from snapshotCreateXML.
    Fixes libvirt snapshot tests.

 nova/tests/test_libvirt.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit ff788a08746040a9ea6e17c625088d4295e4edba
Merge: 3b2e719 23fefd1
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Sep 16 09:28:51 2011 -0400

    merge from trunk

commit 1d2a5bd706736bff2e2d82ebeb813438493cea41
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 14:28:57 2011 +0200

    Make sure grantee_group is eagerly loaded.

 nova/db/sqlalchemy/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 79cc91fcd1086c8de16fb4ba8a38bac31240f5e8
Merge: e1d38ca 23fefd1
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 16 11:20:38 2011 +0200

    Merged trunk.

commit 24db80baa4a5125ba32250b7aa495b58465cfdf5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Sep 16 17:04:27 2011 +0900

    compute/api: swap size issue
    
    When --block-device-mapping swap= is specified, its swap size is
    wrongly set to 0. Thus swap device will be missing.
    This is reported by https://bugs.launchpad.net/bugs/851218
    This patch fixes it.

 nova/compute/api.py        |   37 +++++++++++++++++++------------------
 nova/tests/test_compute.py |   14 +++++++++-----
 2 files changed, 28 insertions(+), 23 deletions(-)

commit 19b3b7a0c50dd6a68238daf8827519fd83a395cc
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Sep 15 22:53:42 2011 -0400

    Update exception.wrap_exception so that all exceptions (not just Error
    and NovaException types) get logged correctly.

 nova/exception.py            |    7 -------
 nova/tests/test_exception.py |    7 +++----
 2 files changed, 3 insertions(+), 11 deletions(-)

commit 23fefd17727966b0a1397f40b25bedcd668206d7
Merge: 8a91c95 19736d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 16 01:57:03 2011 +0000

    Removes the on-disk internal libvirt snapshot after it has been uploaded to glance.

commit 1b18dca93ddd232d14599c39201b459160490fb4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 18:20:35 2011 -0700

    cleaned up

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41c642ce4abef72c79cb6443ce575d8398b1f452
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 18:10:04 2011 -0700

    remove debugging

 nova/api/openstack/servers.py |    3 ---
 nova/scheduler/api.py         |   16 +++++-----------
 2 files changed, 5 insertions(+), 14 deletions(-)

commit bc8c34050df9060e9632f6a4fb341a2fc119e0c7
Merge: 6f3ae6e af7a495
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 00:25:39 2011 +0000

    Merging trunk

commit 6f3ae6e1e5453330e14807348f6e3f6587877946
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 00:22:31 2011 +0000

    Allowing resizes to the same machine

 nova/compute/manager.py                            |   12 ++--
 nova/flags.py                                      |    4 ++
 nova/tests/test_compute.py                         |    2 +-
 nova/tests/test_xenapi.py                          |   72 ++++++++++++--------
 nova/tests/xenapi/stubs.py                         |    4 +-
 nova/virt/driver.py                                |   13 ++--
 nova/virt/xenapi/vm_utils.py                       |    4 ++
 nova/virt/xenapi/vmops.py                          |   71 ++++++++++++-------
 nova/virt/xenapi_conn.py                           |   17 +++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    6 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   11 +--
 11 files changed, 139 insertions(+), 77 deletions(-)

commit 06c4eb3d8570e4f07a6c3012d2dc2ab907c460d8
Merge: 2fd55dd 8a91c95
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 16:52:58 2011 -0700

    trunk merge

commit 8a91c953b286c9de4a715cd01ab82c571db4e3c9
Merge: 0975217 caf0e0f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 15 22:26:48 2011 +0000

    updates Exception.NoMoreFixedIps to subclass NovaException instead of Error.

commit caf0e0f10167fd31ea16a56d471380537a6ee03a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 15 16:58:22 2011 -0500

    NoMoreFixedIps now subclasses NovaException instead of Error

 nova/exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5cdd2479f8fbd8c79572acb8e2e767e42e866211
Merge: 694ba0a 0975217
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 16:46:08 2011 -0500

    merge trunk

commit 694ba0aa7f10601746e9fa6c07d9ffeea3f26850
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 16:23:27 2011 -0500

    was trying to create the FK when Should have been dropping

 .../versions/047_remove_instances_fk_from_vif.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fea284a8c554cfcc3120fffdc710cc2cfc12c61d
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 16:20:13 2011 -0500

    pep8

 .../versions/047_remove_instances_fk_from_vif.py   |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5675ac808e49845b91bca300a67ce4e9ad7f04c8
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:43:32 2011 -0500

    well since sqlalchemy-migrate and sqlalchemy can't agree on what the FK is called, we fall back on just manually dropping it

 .../versions/047_remove_instances_fk_from_vif.py   |   25 +++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit 2fd55ddfdf065a8792fdd0e3f3e97b5e56e4a4a3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 13:42:30 2011 -0700

    tests working again

 nova/api/openstack/servers.py          |    1 +
 nova/tests/scheduler/test_scheduler.py |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 7151a76f31de9edb82df04daccdb9073d82e7535
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:24:12 2011 -0500

    the table is the table for the reason its a table

 .../versions/047_remove_instances_fk_from_vif.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit af492993cefe514eba3f7569fdfccc3b25162ca8
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:20:05 2011 -0500

    uhh dialect doesn't exist, beavis

 .../versions/047_remove_instances_fk_from_vif.py   |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 0d674b525811583c4cc70accb8745be85199e76a
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:07:49 2011 -0500

    update comment

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 09752178191cd18c12e7845d1e199a112170ba17
Merge: 0e5e684 5ddfd1c
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 15 20:04:31 2011 +0000

    if no public-key is given (--key), do not show public-keys in metadata service

commit d84574760f88612a34751d9a2615bd7b85501ab7
Merge: 7fe530a 0e5e684
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:01:49 2011 -0500

    it merges the trunk; or else it gets the conflicts again

commit 97f28ec95ce1c6a1d3cb9c896b4ac2b4b51589e2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 13:00:21 2011 -0700

    exceptions properly passed around now

 nova/api/openstack/servers.py |   44 +++++++++++++++++++++++++++++++++++++++++
 nova/scheduler/api.py         |   14 ++++++++++---
 2 files changed, 55 insertions(+), 3 deletions(-)

commit 4c701ef40c45955b44ad70f57325c3ca55e1efb5
Merge: f3a1378 db70c96
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 15 15:49:47 2011 -0400

    merge with trunk at revno 1573

commit 7fe530a24917ea072adcb459e06cc42ce7c3a992
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:41:53 2011 -0500

    add the fake_network Manager to prevent rpc calls

 nova/tests/test_metadata.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 0e5e684b4079749c922143be76183c65e6403e5c
Merge: 25b1c67 c31a892
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Thu Sep 15 19:40:23 2011 +0000

    This makes the OS api extension for booting from volumes work.
    The _get_view_builder method was replaced in the parent class, but the BootFromVolume controller was not updated to use the new method.

commit 95443980b8aecbfd4531e0ec7baefa519d235aa1
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:25:52 2011 -0500

    remove undedded imports and skips

 nova/tests/fake_network.py  |    1 -
 nova/tests/test_metadata.py |    9 ---------
 nova/tests/test_network.py  |    4 ++--
 3 files changed, 2 insertions(+), 12 deletions(-)

commit 3b2e71962dfab872134e69a76dddeef73aedbcbf
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 15:18:25 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 62516cac832bd24003f1bf29b4a03e7f5d9a1579
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 14:09:14 2011 -0500

    Added a unit test.

 nova/tests/test_virt_drivers.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 35bf3c005538c243351a89332f0866836f788d29
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 15:03:53 2011 -0400

    pass-through all other parameters in next links as well

 nova/api/openstack/servers.py            |    7 ++++++-
 nova/api/openstack/views/servers.py      |   10 +++++-----
 nova/tests/api/openstack/test_servers.py |   32 ++++++++++++++++++++++++++----
 3 files changed, 39 insertions(+), 10 deletions(-)

commit 03e01921b1043337515777849aa5432ba08b66f7
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:02:24 2011 -0500

    update for the id->uuid flip

 nova/tests/fake_network.py |    6 ++++--
 nova/tests/test_network.py |   42 +++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

commit 47f0edd2aa06c99b5b3f8700e513f227a9097ee2
Merge: 11293e0 25b1c67
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 14:00:19 2011 -0500

    Merged trunk.

commit 25b1c6727bdb04ec55a51023f3dab76ba57a54f7
Merge: f3a1378 aa0361c
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 15 18:57:35 2011 +0000

    Adding flavor extra data extension.

commit 11293e0c95c350e62c5a4d6fb437037312d4d6d1
Merge: 2477ebf f3a1378
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 13:56:45 2011 -0500

    Merged trunk.

commit 5a264e9844eba5ef0c21ae47f300f5c805eda71d
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:47:26 2011 -0500

    fix test

 nova/tests/test_db_api.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit be156e9f2ac58706c7fd69df06cbd5259ec20675
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:47:16 2011 -0500

    revert last change

 nova/db/sqlalchemy/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 2477ebf17add4c0e44ad9dd9a7ac3b632a8929f4
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 13:44:49 2011 -0500

    Added virt-level support for polling unconfirmed resizes.

 nova/virt/driver.py             |    5 +++++
 nova/virt/fake.py               |    3 +++
 nova/virt/hyperv.py             |    3 +++
 nova/virt/libvirt/connection.py |    4 ++++
 nova/virt/xenapi/vmops.py       |   21 +++++++++++++++++++++
 nova/virt/xenapi_conn.py        |    4 ++++
 6 files changed, 40 insertions(+)

commit 3929ab2f32de6db7fee0394e276a5ceeca356368
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:44:29 2011 -0500

    build the query with the query builder

 nova/db/sqlalchemy/api.py |    6 +++---
 nova/tests/test_db_api.py |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

commit f3a137800c6b236eb811da05c45ac26f8524eb67
Merge: c3654d4 34a08d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 15 18:32:10 2011 +0000

    Removing toprettyxml from OSAPI xml serialization in favor of toxml.

commit af986ef55f01a702eb29b834be9fe237bf1981a2
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:31:15 2011 -0500

    use uuids everywhere possible

 nova/network/api.py     |    6 +++---
 nova/network/manager.py |   11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

commit f0f13454a68cdf5e33bb9c667f2e57d84b70ae11
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:30:38 2011 -0500

    make sure to use the uuid

 nova/compute/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0e492344e49b21fd3e08ab5dcf631012044cef9c
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:30:17 2011 -0500

    update db api for split filterings searches

 nova/db/api.py            |    9 +++++++--
 nova/db/sqlalchemy/api.py |   48 ++++++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 18 deletions(-)

commit 0a564c054d8e8bfe726dbd942ad7d00b42da788d
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:29:37 2011 -0500

    update tests

 nova/tests/fake_network.py |    8 +++--
 nova/tests/test_compute.py |   74 +++++++++++++++-----------------------------
 2 files changed, 31 insertions(+), 51 deletions(-)

commit 19736d4991ff55f300fddd0ab48af40a081f2272
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 15 11:27:16 2011 -0700

    delete the internal libvirt snapshot after it is saved to glance

 nova/virt/libvirt/connection.py |    1 +
 1 file changed, 1 insertion(+)

commit c31a892e167f81d5816ecb48faae3947bf424b89
Merge: 6cd4e1d c3654d4
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Thu Sep 15 11:10:33 2011 -0700

    Merge trunk.

commit fb8302c48ce41f31946045a19abb66fce516f5c7
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:10:26 2011 -0400

    cleanup prints in tests

 nova/tests/api/openstack/test_servers.py |    6 ------
 1 file changed, 6 deletions(-)

commit b7aff10d1aa76b764ab354cc04ae03ba8bf678e3
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:09:00 2011 -0400

    cleanup prints in tests

 nova/tests/api/openstack/test_servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 6cd4e1dadda93d2e8fa4ed26f3e8d83ea22292d3
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Thu Sep 15 11:05:57 2011 -0700

    Add a simple test for the OS boot from volume api.
    
    This would have detected lp:850305.

 nova/tests/api/openstack/contrib/test_volumes.py |   73 ++++++++++++++++++++++
 1 file changed, 73 insertions(+)

commit f4a453cb99bf76e17c4ec89c850f65f6c704b4fe
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:04:50 2011 -0400

    get rid of debugs

 nova/api/openstack/views/servers.py |    2 --
 1 file changed, 2 deletions(-)

commit f8d751de0aef0b7b6afc9a2f0d8c427de24bb3a6
Merge: 5579ade c3654d4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 15 10:43:42 2011 -0700

    Merged from trunk and resolved conflicts

commit 5579ade405ce3318d4a5d33e68e39ee76c80b27c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 15 10:05:07 2011 -0700

    Execute arping command using run_as_root=True instead of sudo

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 63c4cc459a5b27040610ca9071ac578ecd43c059
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 15 18:15:19 2011 +0200

    Return three rules for describe_security_groups if a rule refers to a foreign group, but does not specify protocol/port.

 nova/api/ec2/cloud.py    |   18 ++++++++++------
 nova/tests/test_cloud.py |   52 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 49 insertions(+), 21 deletions(-)

commit 98693520d262dec4849c2aa71a090acfd37c73dd
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 11:52:12 2011 -0400

    pep8 issues

 nova/api/openstack/views/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 16f3e0b4f1212ab8d34a68ad763ff6c870dbbe73
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 11:32:37 2011 -0400

    added xml support for servers_list in response with tests

 nova/api/openstack/schemas/v1.1/servers_index.rng |    3 +
 nova/api/openstack/servers.py                     |   10 +-
 nova/tests/api/openstack/test_servers.py          |  105 ++++++++++++++-------
 3 files changed, 79 insertions(+), 39 deletions(-)

commit fbb49c73a90e99e145863e0d6820e5040c379723
Merge: 7e379f6 c3654d4
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 10:08:04 2011 -0500

    Merged trunk.

commit 41e8bbd9fd9daa669e0becd762c3c0e4639287ea
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 10:21:33 2011 -0400

    added servers_links in v1.1 with tests

 nova/api/openstack/servers.py            |    2 +-
 nova/api/openstack/views/servers.py      |   19 +++++++-
 nova/tests/api/openstack/test_servers.py |   78 ++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)

commit ad3f3d0f845fddb2658c427085e426e45b88ab4b
Merge: 54d4970 c3654d4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 15 14:21:26 2011 +0000

    Merge with trunk

commit 9c431227549a8df740b94e1adfda99b52322b2fb
Merge: 6fafde1 b7997e4
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Sep 15 10:07:58 2011 -0400

    Merge w/ trunk.

commit bfa8075f659f6fe18eb2442f2ae0722d0fd1c2ff
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 10:00:38 2011 -0400

    added build_list to servers controllers and view builder and kept all old tests passing

 nova/api/openstack/servers.py            |   27 +++++++++++++++++++++++----
 nova/api/openstack/views/servers.py      |   22 +++++++++++++++++++++-
 nova/tests/api/openstack/test_servers.py |    2 ++
 3 files changed, 46 insertions(+), 5 deletions(-)

commit c3654d48f8278d96003bf1d7d3a4bcbe2354f0b5
Merge: b7997e4 8638db0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 15 13:32:24 2011 +0000

    The 1.1 API specifies that two vendor content types are allowed in addition to the standard JSON and XML content types.
    
    This branch adds support for application/vnd.openstack.compute+json and application/vnd.openstack.compute+xml.

commit 65e3f8201d88f231dfbd7934f5b920ae3b1d8e31
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 04:54:01 2011 -0700

    pep8

 nova/scheduler/api.py                  |    1 +
 nova/tests/scheduler/test_scheduler.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit fba1d427a941f1eb6971611cf1b016274ed19baa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 14 19:55:51 2011 -0700

    tests are back

 .../migrate_repo/versions/046_add_zone_name.py     |   35 ------------------
 .../migrate_repo/versions/047_add_zone_name.py     |   35 ++++++++++++++++++
 nova/scheduler/api.py                              |   28 +++++++++++---
 nova/tests/scheduler/test_scheduler.py             |   39 ++++++++++++--------
 4 files changed, 80 insertions(+), 57 deletions(-)

commit af7a495d7a2b394938e9677fc7fe679c9a963f8c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 18:22:39 2011 -0500

    PEP8 fix

 nova/virt/xenapi/vmops.py |    1 +
 1 file changed, 1 insertion(+)

commit e0cf82323ab19bbcbad88aa75045b3e55692f071
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 23:11:03 2011 +0000

    Adding progress

 nova/api/openstack/views/servers.py                |    9 ++--
 nova/compute/api.py                                |    9 ++--
 nova/db/sqlalchemy/models.py                       |    2 +
 .../api/openstack/contrib/test_createserverext.py  |    6 ++-
 nova/tests/api/openstack/test_server_actions.py    |    1 +
 nova/tests/api/openstack/test_servers.py           |   15 ++++---
 nova/utils.py                                      |   14 ++++++
 nova/virt/xenapi/vmops.py                          |   45 ++++++++++++++++++++
 8 files changed, 86 insertions(+), 15 deletions(-)

commit 54d4970b9f6d6f1c52d94e5ee5d5905699bc9fc6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 22:38:48 2011 +0000

    In the unlikely case of an instance losing a host, make sure we still
    delete the instance when a forceDelete is done

 nova/compute/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit ae825c5aa9f3741402407c8d8d78a3b1941d1131
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 17:36:19 2011 -0500

    0 for the instance id is False ;)

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 084606b2f69f05c5604489224f2d9ea2e984c8c2
Merge: a5b339f b7997e4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 22:33:58 2011 +0000

    Merge with trunk

commit a5b339fb75e1e5f525a758ea1fb2fb35d1b9044a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 22:31:00 2011 +0000

    Cleanup state management to use vm_state instead of task_state
    Add schedule_delete() method so delete() actually does what it says it does

 nova/api/ec2/cloud.py         |    1 +
 nova/api/openstack/common.py  |    3 +++
 nova/api/openstack/servers.py |   10 ++++++--
 nova/compute/api.py           |   55 ++++++++++++++++++++++++++++-------------
 nova/compute/manager.py       |    8 +++---
 nova/compute/task_states.py   |    4 +--
 nova/compute/vm_states.py     |    1 +
 7 files changed, 58 insertions(+), 24 deletions(-)

commit f31748460180aeff00f08b70b6134b63faf293fa
Merge: d0daaaa b7997e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 15:30:27 2011 -0700

    merge trunk

commit d0daaaa320ecb408e721d5e856676a87d7e98ea6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 15:28:22 2011 -0700

    write out xml for rescue

 nova/virt/libvirt/connection.py |   52 ++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

commit e8a2a540e574ca2d242b9c2749c1f285498809e7
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 17:11:21 2011 -0500

    fix up the filtering so it does not return duplicates if both the network and the db filters match

 nova/compute/api.py       |    9 ++-------
 nova/db/api.py            |    4 ++--
 nova/db/sqlalchemy/api.py |   24 +++++++++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

commit 3d88e123624694b557f44cad44335bcadc404631
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 14:38:07 2011 -0700

    fix rescue to use the base image, reset firewall rules,  and accept network_info

 nova/virt/libvirt/connection.py |   41 +++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 15 deletions(-)

commit 9936e1e9457234f7285c794b7c2c286603c84e52
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 16:13:59 2011 -0500

    make sure to pass in the context

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d2c111697e158feefaf585332f32f471809ea6e8
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:59:12 2011 -0500

    move the FakeNetworkManager into fake_network

 nova/tests/fake_network.py |   54 +++++++++++++++++++++++++-
 nova/tests/test_network.py |   92 ++++++++++----------------------------------
 2 files changed, 73 insertions(+), 73 deletions(-)

commit b7997e4f3257304229045d75e23749520630ed10
Merge: 49df523 de3d947
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 20:57:15 2011 +0000

    Fix issue where floating ips don't get recreated when a network host reboots.

commit b1a98b631c9d97b85884c54465f6f0e2f4099e0d
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:49:10 2011 -0500

    ip tests were moved to networking

 nova/tests/test_compute.py |  183 --------------------------------------------
 1 file changed, 183 deletions(-)

commit 543fe5ced18a95faa6ef3f2b774beb052aa7d27f
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:47:41 2011 -0500

    add tests

 nova/network/manager.py    |    2 +-
 nova/tests/test_network.py |  134 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 128 insertions(+), 8 deletions(-)

commit 6155c128dbd5baf14e749036c0a3920ca8b7ae40
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:23:53 2011 -0500

    fix typo

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 259ba685d9a719c1b25083a139d6ad9ae7a86aea
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:23:14 2011 -0500

    allow matching on fixed_ip without regex and don't break so all results are reported

 nova/network/manager.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit fd8c3437f0530176b9a46f65782de32fcabe158f
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:03:07 2011 -0500

    add case where vif may not have an instance_id associated with it

 nova/network/manager.py |    3 +++
 1 file changed, 3 insertions(+)

commit eaa86c8eb837f751e41695ec56a50f00b0a9a733
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:52:56 2011 -0500

    fix typo

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e379f6a77f53ad4d6ddc98fbb30cd853933bb08
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Sep 14 14:38:40 2011 -0500

    Initial pass at automatically confirming resizes after a given window.

 nova/compute/manager.py   |   16 ++++++++++++++--
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   22 +++++++++++++++++++---
 3 files changed, 38 insertions(+), 5 deletions(-)

commit cecc822c0bc10c8d5cc5168329ae04172c6e609e
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Wed Sep 14 12:33:51 2011 -0700

    Use the correct method to get a builder.

 nova/api/openstack/contrib/volumes.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 8eab53e3b871c6b0e428cdd0be81eba12666cc1a
Merge: 4248cfe 49df523
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:13:54 2011 -0500

    merge trunks

commit 4248cfe6864b81fcf6a2038bfb4c472039368c61
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:13:26 2011 -0500

    pep8

 nova/network/manager.py    |    1 -
 nova/tests/test_network.py |   10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 8f9453aeb8882509d825c9715fde4e6827b0bbf7
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:02:54 2011 -0500

    move ip filtering over to the network side

 nova/compute/api.py     |    7 ++++--
 nova/network/api.py     |    4 ++--
 nova/network/manager.py |   57 +++++++++++++++++++++++++++++------------------
 3 files changed, 42 insertions(+), 26 deletions(-)

commit aa0361c41d2e2feff18915ac93107727f52b15ca
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:58:47 2011 -0400

    fix pep8 whitespace error

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 74a1045dd133fe708cb0f42bd4fae4198ee337ff
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:51:55 2011 -0400

    add necessary fields to flavor.rng schema

 nova/api/openstack/schemas/v1.1/flavor.rng |    4 ++++
 1 file changed, 4 insertions(+)

commit ee11a4661bb855c354ae567fd18b8b3274d05df8
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:47:35 2011 -0500

    get all the vifs

 nova/db/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit ffddc029198b88d0a2cd42e6c5e9d21a6ad259fa
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:47:11 2011 -0500

    get all the vifs

 nova/db/sqlalchemy/api.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit aa4375c21a874fb619d38fb17c8026d083b73ffd
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:46:09 2011 -0500

    make sure we are grabbing out just the ids

 nova/compute/api.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 9ce2e4f80f249d58622b7235aec55e823f9cd6c8
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:37:32 2011 -0400

    flavor_elem.setAttribute -> flavor_elem.set, flavor -> flavor_dict

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 94e23a3def4172e58264f051a9558ba536dd1d19
Author: paul@openstack.org <>
Date:   Wed Sep 14 13:20:16 2011 -0500

    minor changes to credentials for the correct format

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 8638db07c4ad2177249a70708969c7a1cba09037
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:55:15 2011 +0000

    Don't report the wrong content type if a mapped type doesn't exist

 nova/api/openstack/wsgi.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0a06f649f0ed18344fb9a8fb5d4c6fa1a3151554
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 12:54:08 2011 -0500

    add stubs for future tests that need to be written

 nova/tests/test_network.py |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 4fa96895f1c32e09db31532886d67a675fe66208
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:44:22 2011 +0000

    Test both content types for JSON and XML

 nova/tests/api/openstack/test_wsgi.py |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit d678d8c4d024a4154ecd2ea77a42063ad1253364
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:32:33 2011 +0000

    Remove unnecessary vendor content types now that they are mapped to standard
    content types automatically

 nova/api/openstack/versions.py |    3 ---
 1 file changed, 3 deletions(-)

commit 1b836a4159bd324572f71dab4abcef5a8d3292e5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:29:28 2011 +0000

    Add copyright

 nova/api/openstack/wsgi.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 2b41dd235b50e3003a42e0b860c5915d06d86071
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:23:40 2011 +0000

    Map vendor content types to their standard content type before serializing
    or deserializing. This is so we don't have to litter the code with both
    types when they are treated identically

 nova/api/openstack/wsgi.py |   36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

commit 5b436ffc2a46e34c8b4cc94780a9059dbef58cda
Author: paul@openstack.org <>
Date:   Wed Sep 14 12:10:33 2011 -0500

    exporting auth to keystone (users, projects/tenants, roles, credentials)

 bin/nova-manage |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

commit f9cac7659a761fa32fac0153f8ecb0334149a486
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 13:10:23 2011 -0400

    make xml-api tests pass

 nova/tests/api/openstack/test_flavors.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit 95e06c5d88f5500805fb8d9505a4db61560bf8e1
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:59:10 2011 -0400

    update variable name after merge: flavor_node -> flavor_elem

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1b056abbdaf91d382c56967b4bfc886f54b95a7
Merge: 092ff28 89736bf
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:52:00 2011 -0400

    resolve conflicts / merge with trunk revno 1569

commit 49df5238f7a25ed9b09f1f1ffe10b1b845cf29c3
Merge: 89736bf 79661fe
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 14 16:41:57 2011 +0000

    Fixes an issue where 'invalid literal for int' would occur when listing images after making a v1.1 server snapshot (with a UUID).
    
    v1.1 image id's are now treated as strings (not integer ID's). The v1.0 API still tries to treat image id's as integers but doesn't fail miserably if they are uuid's either.
    
    This should pave the way for image ID's as uuids and more closely matches the v1.1 spec with regards to images and the server refs they contain.

commit 7139d7459f2bedc055080a5effc2377b55bffe6b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 09:37:24 2011 -0700

    fixed tests

 nova/tests/test_libvirt.py      |    4 ++--
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 34a08d831418b934f4cceaae69dbf17d90ecd5e0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Sep 14 12:32:00 2011 -0400

    removing toprettyxml

 nova/api/openstack/wsgi.py              |    2 +-
 nova/tests/api/openstack/test_images.py |   16 ++++++----------
 nova/tests/api/openstack/test_limits.py |   14 ++++++--------
 3 files changed, 13 insertions(+), 19 deletions(-)

commit 092ff28b9f141368aed0d719140212e5fc8652f8
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:25:47 2011 -0400

    add attributes to xml api

 nova/api/openstack/flavors.py |    3 +++
 1 file changed, 3 insertions(+)

commit 9f83b51ae2afeb45ed9bdcb8c3b63ced78f8050e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 16:19:18 2011 +0000

    Remove debugging

 nova/api/openstack/wsgi.py |    1 -
 1 file changed, 1 deletion(-)

commit 9614c5690118f239652e7ebccdd4ce6ecffbe4ee
Merge: 147290d 89736bf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 16:19:00 2011 +0000

    Merge with trunk

commit 89736bf13562811cebb42cd6e3377d7f9e0a0b9c
Merge: b96d0af a85a2c2
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 14 16:15:09 2011 +0000

    Update test_libvirt so that flags and fakes are used instead of mocks for utils.import_class and utils.import_object. Fixes #lp849329.

commit c70595e1631cc2568599c457b503329cfa4b09c9
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 11:06:28 2011 -0500

    fix the test so that it fakes out the network

 .../openstack/contrib/test_virtual_interfaces.py   |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit c20228123c1774a1e2aa1b4ee7155a62336f5934
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 11:55:18 2011 -0400

    fix white space for pep8

 nova/api/openstack/views/flavors.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit efaa0e6590985e3d4bdeeb18e1d41a037856ea89
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 11:54:56 2011 -0400

    fix test_extensions test to know of new extension FlavorExtraData

 nova/tests/api/openstack/test_extensions.py |    1 +
 1 file changed, 1 insertion(+)

commit d36e59f4480265741018a1fd5160f5262b7e9331
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 11:54:13 2011 -0400

    add extension description for FlavorExtraData

 nova/api/openstack/contrib/flavorextradata.py |   46 +++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

commit 2d4181e483fbba4c08458892fd2dcb228700ecf5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 15:52:30 2011 +0000

    Adding migration for instance progress

 .../versions/046_add_instances_progress.py         |   43 ++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 79661fece4f48e8bc92b6699f7f68bd1bfebe9fc
Merge: 7a02394 b96d0af
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 14 11:34:08 2011 -0400

    Merge w/ trunk.

commit 7a02394009aae85f722430682f8360371121504b
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 14 11:33:36 2011 -0400

    Make tests pass.

 nova/tests/api/openstack/test_images.py |   38 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 4f27ce297ac74ac1c11f959cb44eb4bb3cd4b81a
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:29:46 2011 -0500

    no need for the instance at all or compute

 nova/api/openstack/contrib/virtual_interfaces.py |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

commit 269aec5b02d9afef61dab3927d534ab807464ef3
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:23:36 2011 -0500

    bump the migration

 .../versions/046_remove_instances_fk_from_vif.py   |   57 --------------------
 .../migrate_repo/versions/046_sqlite_downgrade.sql |   47 ----------------
 .../migrate_repo/versions/046_sqlite_upgrade.sql   |   45 ----------------
 .../versions/047_remove_instances_fk_from_vif.py   |   57 ++++++++++++++++++++
 .../migrate_repo/versions/047_sqlite_downgrade.sql |   47 ++++++++++++++++
 .../migrate_repo/versions/047_sqlite_upgrade.sql   |   45 ++++++++++++++++
 6 files changed, 149 insertions(+), 149 deletions(-)

commit 89979f6cb526010b38f0b699396146a870ac68b2
Merge: 4eb704e 7f1a0a0
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 14 11:23:11 2011 -0400

    Merge w/ trunk.

commit fa4dbed251f8ec0b0a44407005feaa86539a7823
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:21:45 2011 -0500

    remove unused import, make call to network api to get vifs for the instance

 nova/api/openstack/contrib/virtual_interfaces.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit f229adef552cf313fa2c5806098577e4864887f4
Merge: 1a8f5bb b96d0af
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:19:03 2011 -0500

    merge the trunk

commit 1a8f5bb3961f000d3159fd7478e8644afed5dc8d
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:17:25 2011 -0500

    skip a bunch of tests for the moment since we will need to rework them

 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/test_compute.py               |    4 ++++
 nova/tests/test_metadata.py              |    7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

commit 08fdbdddc66a616121a6b752af4ae26abbd25027
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:17:01 2011 -0500

    remove the vif joins, some dead code, and the ability to take in some instances for filtering

 nova/db/sqlalchemy/api.py |   84 +++++++--------------------------------------
 1 file changed, 12 insertions(+), 72 deletions(-)

commit ee5ebf5a46de7534d038f17468a254005796684c
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:16:02 2011 -0500

    allow passing in of instances already

 nova/db/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 84b0492ccfd61a0e7f04db48abb83ec708ddb2d4
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:15:20 2011 -0500

    run the instances filter through the network api first, then through the db

 nova/compute/api.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit dff4897056f41333dadd7b110692d80a409eb29a
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:14:21 2011 -0500

    add get_vifs_by_instance and stub get_instance_ids_by_ip_filter

 nova/network/manager.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit 7c727b7700298e0d280e11cb2e06b177ee63a83b
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:13:36 2011 -0500

    change vifs to rpc call and add instance ids by ip

 nova/network/api.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit b96d0af411163d295a96da277b7da2defce5f7f7
Merge: 7f1a0a0 6930c62
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Sep 14 15:13:02 2011 +0000

    Multi-NIC support for vmwareapi virt driver in nova.
    Does injection of Multi-NIC information to instances with Operating system flavors Ubuntu, Windows and RHEL.
    vmwareapi virt driver now relies on calls to network manager instead of nova db calls for network configuration information of instance.
    Re-oranized VMWareVlanBridgeDriver and added session parmeter to methods to use existing session. Also removed session creation code as session comes as argument.
    Added check for flat_inject flag before attempting an inject operation.
    
    This branch resolves the following bugs:
      Bug #831497 in OpenStack Compute (nova): "Instance spawn operation fails on ESXi compute node"
      https://bugs.launchpad.net/nova/+bug/831497
      Bug #839383 in OpenStack Compute (nova): "ESX(i) VIFs and mac addresses"
      https://bugs.launchpad.net/nova/+bug/839383

commit ed0d8bfd0fd7bbe81dd5e39683ec3e90fc86c16c
Merge: 542ea00 7f1a0a0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 15:00:26 2011 +0000

    Merge with trunk

commit 4eb704e9024111c80f6f7c83810a08d7eec5c4af
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 13 21:13:58 2011 -0400

    last of the api.openstack.test_images merge fixes.

 nova/tests/api/openstack/test_images.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 4941d62b35792a450c2b83d6c82f820f48562433
Merge: c4e4911 e7a2ddd
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 13 21:00:10 2011 -0400

    Merge w/ trunk.

commit a85a2c2e82fa8820b04f669c92a3500c7c6cebe2
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 13 20:38:26 2011 -0400

    pep8 fixes.

 nova/tests/test_libvirt.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 86b60c769a1e6c482afcd11fe6d11a6dd8bae2c0
Merge: 8a9b192 7f1a0a0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 13 16:46:53 2011 -0700

    trunk merge

commit de3d94726c980f40181693256c0f650d492451ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 13 16:38:46 2011 -0700

    makes sure floating addresses are associated with host on associate so they come back

 nova/db/api.py            |    8 +++++---
 nova/db/sqlalchemy/api.py |    5 ++++-
 nova/network/manager.py   |    3 ++-
 nova/tests/db/fakes.py    |    4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

commit 7f1a0a05ec32ecb07c3a5f2286f841c4abc8f5e0
Merge: a565f3a de94312
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 13 22:18:54 2011 +0000

    Deprecate aoe in preperation for removal in essex.

commit a565f3abd7fb7c5b10ea6942823aadd68fffada1
Merge: 462635a 98e2fd7
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 21:54:40 2011 +0000

    Only allow up to 15 chars for a Windows hostname.

commit dfeaf988a11fe2d7cee4533ef89e2544fd70e965
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 13 16:38:11 2011 -0500

    pep8

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit de94312a584a25bd70e0410e69aef34bf7c275d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 13 14:32:24 2011 -0700

    deprecate aoe

 nova/volume/driver.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 462635a8aa6301b79023e8232b20a0f753c0d24a
Merge: 95b024d 4cbfc60
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Sep 13 21:29:26 2011 +0000

    Fix instance rebooting (lp847604) by correcting a malformed cast in compute.api and an incorrect method signature in the libvirt driver.

commit 147290d01389d72d3754bbaa088660f38a6871d8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 21:09:25 2011 +0000

    Fix mismerge

 nova/tests/api/openstack/test_versions.py |    2 --
 1 file changed, 2 deletions(-)

commit 877d92845a5d2002c4adc0c8398469e66fd0907e
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 13 17:06:15 2011 -0400

    make tests pass

 nova/api/openstack/views/flavors.py      |    7 +++----
 nova/tests/api/openstack/test_flavors.py |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

commit 95b024d53c0c54197ef69d436aa2da1da373ff12
Merge: 2f45e36 d8abe79
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Sep 13 21:04:13 2011 +0000

    This patch teaches virt/libvirt how to format filesystem on ephemeral device depending on os_type so that the behaviour matches with EC2's.
    Such behaviour isn't explicitly described in the documentation, but it is confirmed by checking realy EC2 instances.  This patch introduces options virt_mkfs as multistring.
    Its format is --virt_mkfs=<os_type>=<mkfs command> When creating ephemeral device, format it according to the option depending on os_type.  This addresses the bugs,
    https://bugs.launchpad.net/nova/+bug/827598
    https://bugs.launchpad.net/nova/+bug/828357

commit 2d9a807556f439a40c7dc3536c21c9d4cd9b4838
Merge: 660706e 2f45e36
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:48:15 2011 +0000

    Merge with trunk

commit 660706ec03a55e5875b1af875f1a5f157d4a04f1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:36:54 2011 +0000

    Test new vendor content types as well

 nova/tests/api/openstack/test_api.py |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit 98e2fd764b33fa5a3af6ca982a171717a12ee206
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 15:33:34 2011 -0500

    Only allow up to 15 chars for a Windows hostname.

 nova/tests/test_xenapi.py |    3 ++-
 nova/virt/xenapi/vmops.py |    8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 9ced215b37dca65b3bf9cfe2d41518c2a563ff2d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:15:51 2011 +0000

    Split accept tests to better match the name of the test

 nova/tests/api/openstack/test_wsgi.py |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit b815c3c6cadd72c496e087080a4a6652e0a5be72
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:06:18 2011 +0000

    Remove debugging print

 nova/tests/api/openstack/test_wsgi.py |    1 -
 1 file changed, 1 deletion(-)

commit c4e4911bc90b37afc498f05f88f1128cbeff80e0
Merge: 9b12a6c 9f39ff0
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 13 15:59:45 2011 -0400

    Merge with trunk. Still one test failure in test_images.

commit 2f45e36060378048de0fec0cb1fa47da51f7a633
Merge: c3195f0 3f92fc9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 19:57:40 2011 +0000

    Inject hostname to xenstore upon creation.

commit b05121e1e1b2a8276d1dd21583c379dc4755b3dd
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 13 15:48:10 2011 -0400

    Update test_libvirt so that flags and fakes are used instead of mocks
    for utils.import_class and utils.import_object. Fixes #lp849329.

 nova/tests/fake_network.py |   30 +++++++++++++++
 nova/tests/test_libvirt.py |   87 ++++++++++++++++----------------------------
 2 files changed, 62 insertions(+), 55 deletions(-)

commit db70c96fce51d39e51d480b38f4d8d1e9e7ecff5
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 13 15:46:29 2011 -0400

    interpret 'swap' to be in MB, not in GB.
    
    This fixes libvirt connection to interpret swap in MB.
    I'm not sure if virt/xen needs updating.

 nova/virt/libvirt/connection.py |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 357e0ed26e2eb7f6ca19b629c28a9712cc804381
Merge: 2b8463b c3195f0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:34:07 2011 +0000

    Merge with trunk

commit 2b8463b664d450af045c1bd01accce4126933755
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:33:09 2011 +0000

    Actually test expected matches received

 nova/tests/api/openstack/test_versions.py |    2 ++
 1 file changed, 2 insertions(+)

commit 7d76c99526271077420e3f6a03e14bf1e037a3eb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:32:42 2011 +0000

    Test new content-types

 nova/tests/api/openstack/test_wsgi.py |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit c3195f02cad33acc7c43030b0a7151cd8a439ef3
Merge: 61e5825 59cd446
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 18:17:13 2011 +0000

    This branch changes XML Serializers and their tests to use lxml.etree instead of minidom.
    
    The current use of minidom in tests unnecessarily forces xml ordering as well as pretty printing. Using etree allows for validating the XML and checking individual element values.
    
    Changing all the serializers to use etree allows for fixing of bug 814196 and consistency among the serializers.
    
    Schema validation has been added for addresses, flavors, images, limits, metadata and servers resources.
    
    The atom feeds we generated are now tested using the feedparser module. This allows for stronger, cleaner and more correct validation.
    
    Note: Not all minidom usage has been replaced with lxml. We realized this was too big a job to tackle in a single merge. Fixing those in subsequent merges will be more manageable.

commit e411fcd647e3cdcf415465288e527aecfd026fc5
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 13 14:15:29 2011 -0400

    add additional data to flavor's ViewBuilder
    
    This adds missing fields that were trying to be used by python-novaclient.
    Previously, 'nova flavor-list' would have empty columns for fields other
    than 'disk' and 'ram'.
    
    Now all columns are filled in appropriately.

 nova/api/openstack/views/flavors.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 59cd446cc61fdbf933c504d498852835a187ea6f
Merge: 613bcfc 61e5825
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 14:00:20 2011 -0400

    Merge from trunk.

commit 3f92fc99c23b0cc17f31ff9d988733abac98028a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 12:33:09 2011 -0500

    Inject hostname to xenstore upon creation.

 nova/virt/xenapi/vmops.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 2de5870dfaf0671657a6b8c275acc6405d04274c
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 13 11:09:27 2011 -0500

    drop the virtual_interfaces key back to instances

 .../versions/046_remove_instances_fk_from_vif.py   |   57 ++++++++++++++++++++
 .../migrate_repo/versions/046_sqlite_downgrade.sql |   47 ++++++++++++++++
 .../migrate_repo/versions/046_sqlite_upgrade.sql   |   45 ++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    5 +-
 4 files changed, 150 insertions(+), 4 deletions(-)

commit ef7b0013d527b37edba3d3d41ac09a0a501ef3a7
Merge: 050be20 61e5825
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:56:27 2011 +0000

    Merge with trunk

commit f30d986eb28821d68447aa0fe40956d7b84c023b
Merge: cf9c76c 61e5825
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:49:37 2011 +0000

    Merge with trunk

commit 542ea00d6fd22253f50d8bd5fd5319aa42ba9e04
Merge: cc86ca1 61e5825
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:47:25 2011 +0000

    Merge with trunk

commit 61e5825a43fff1ad60dcd26454dc4881bdc13ef6
Merge: 5f52e14 07eb6b5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 13 15:23:15 2011 +0000

    - remove translation of non-recognized attributes to user metadata, now just ignored
    - ensure all keys are defined in image dictionaries, defaulting to None if glance client doesn't provide one
    - remove BaseImageService
    - reorganize some GlanceImageService tests

commit 613bcfc45865c9d7c7577e124b187920970d031e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 11:22:45 2011 -0400

    And again.

 nova/tests/api/openstack/test_versions.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 5f52e146eb16994366900b298fb28cd658013c6b
Merge: e7a2ddd d379cdc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Sep 13 15:11:58 2011 +0000

    Update MANIFEST.in to match directory moves from rev1559

commit 8a9b192f5436fa53b58b713e193733ea677766cc
Merge: 9ccefca 9f39ff0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 13 07:49:03 2011 -0700

    we're back

commit d379cdcacc2191f557fc378ec6c40e2642261467
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Sep 13 15:09:10 2011 +0200

    Update MANIFEST.in to match directory moves from rev1559

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7a2dddd0c5fd4d995e5e81c8d7bfe3fd7e775ca
Merge: 9f39ff0 a5c6548
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 13 12:21:48 2011 +0000

    Moving tests/test_cloud.py to tests/api/ec2/test_cloud.py. They are EC2-specific tests, so this makes sense.

commit 4c2f8b561390358cbd1c8dbfbc7e4d8370b2b84e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 02:45:11 2011 -0400

    Same as last time.

 nova/tests/api/openstack/test_versions.py |  109 ++++++++++++-----------------
 1 file changed, 46 insertions(+), 63 deletions(-)

commit 837f611af4467c716a0585bb8f38345ceef32921
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Sep 12 19:13:18 2011 -0400

    Made tests version version links more robust

 nova/tests/api/openstack/test_versions.py |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

commit cc86ca1ddc3c5b33d1469619ae491bf09c1ac6b5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:59:46 2011 +0000

    PEP8 cleanup

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf9c76cae68ef8efcc8f3a82ade728fed8175c73
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:58:07 2011 +0000

    PEP8 cleanup

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fd5de705c0cd2d7df09a667d15005eee95bae2d
Merge: 79ef79a 9f39ff0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:46:43 2011 +0000

    Merge with trunk

commit 7acaf3b4fc08e5fb374959981a65b87c254dc3cf
Merge: 8413641 9f39ff0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:46:12 2011 +0000

    Merge with trunk

commit 84136418aef3922989ba269604a6cb1125d5014b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:45:38 2011 +0000

    PEP8 cleanups

 nova/db/sqlalchemy/api.py |    2 +-
 nova/virt/disk.py         |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 9ccefcaa44062f5aa2e562dd126e22d06a06c392
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 15:36:18 2011 -0700

    zone manager tests working

 nova/tests/test_zones.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit a5c654884abee43760f4b43368f352272ae090dd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 18:23:46 2011 -0400

    fixing import

 nova/tests/test_direct.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c0c046ef7d30787fe72b8de6c290a4b72cb207fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 15:22:30 2011 -0700

    working on getting tests back

 nova/db/sqlalchemy/api.py              |    2 +-
 nova/rpc/impl_kombu.py                 |    1 -
 nova/scheduler/api.py                  |    2 +-
 nova/scheduler/zone_manager.py         |    4 +++-
 nova/tests/scheduler/test_scheduler.py |   32 ++++++++++++++++++++------------
 nova/tests/test_zones.py               |   22 ++++++++++++++--------
 6 files changed, 39 insertions(+), 24 deletions(-)

commit 17afc6e53f5d53ea80fd747d6ce059c11980c817
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 18:17:32 2011 -0400

    relocating ec2 tests

 nova/tests/api/ec2/public_key/dummy.fingerprint |    1 +
 nova/tests/api/ec2/public_key/dummy.pub         |    1 +
 nova/tests/api/ec2/test_cloud.py                | 1623 +++++++++++++++++++++++
 nova/tests/public_key/dummy.fingerprint         |    1 -
 nova/tests/public_key/dummy.pub                 |    1 -
 nova/tests/test_cloud.py                        | 1623 -----------------------
 6 files changed, 1625 insertions(+), 1625 deletions(-)

commit 07eb6b50c8b7ba30a5923976b66108f136f8628e
Merge: 4a1db74 9f39ff0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 17:52:29 2011 -0400

    merging trunk; resolving conflicts

commit 9f39ff070b5500a0ccb9a6454995f97342254381
Merge: 68551bb 9b8e73d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 21:21:54 2011 +0000

    Correctly map image statuses from Glance to OSAPI v1.1

commit 79ef79abf24f7b8c8d3c9b652285a69fee7e9d14
Merge: 2351c06 68551bb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 20:48:43 2011 +0000

    Merge with trunk

commit 68551bb375588470b41606f181c445192c18cdaa
Merge: 9df16b1 81fe8c8
Author: Antony Messerli <ant@openstack.org>
Date:   Mon Sep 12 20:19:48 2011 +0000

    pep8 fixes in nova/db/sqlalchemy/api.py and nova/virt/disk.py

commit 050be203cb43a12ca430eadfd30c87690b33b9cf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 20:10:57 2011 +0000

    Add support for vendor content types

 nova/api/openstack/versions.py |    7 +++++++
 nova/api/openstack/wsgi.py     |   20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

commit 81fe8c89061fa15ebcea9d20f39cf79b63cf8522
Author: Antony Messerli <ant@openstack.org>
Date:   Mon Sep 12 14:43:15 2011 -0500

    pep8 fixes

 nova/db/sqlalchemy/api.py |    2 +-
 nova/virt/disk.py         |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 4a1db744cc812c29ebaac3180bf32fc033029513
Merge: d5c4be4 9df16b1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 15:39:13 2011 -0400

    merging trunk; resolving conflicts

commit 9df16b1aca4c17f60e145aa18531266880b95632
Merge: 4bea421 40df48f
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 12 19:37:08 2011 +0000

    Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with Glance keystone.

commit ff721f2b52bdb9abab4b7af0e6fcdab09e8de092
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 19:19:04 2011 +0000

    Fix typo (woops)

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 40df48ff0047caeca0472ee652a250c5d5a3e74f
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 12 15:17:57 2011 -0400

    pep8 fix.

 nova/image/glance.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0fb6ac43871a4ef70ec8f845a6fa925df6575e3b
Merge: 9d7807d 4bea421
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 19:17:46 2011 +0000

    Merge with trunk

commit 4bea4218fcfe700007b12d274f98aa778d8f98c4
Merge: b727f3d 965e510
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Sep 12 18:56:51 2011 +0000

    Some arches dont have dmidecode, check to see if libvirt is capable of running rather getInfo of the arch its running on.

commit d5c4be43c60bcd5fa0fae130ad41f847e28d84fe
Merge: 0611e3f 9482275
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 14:29:06 2011 -0400

    merging parent branch lp:~rackspace-titan/nova/glance-client-keystone

commit 9b8e73d9ef1a5bd4efb460f3a0c033fc748ccdd9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 14:22:46 2011 -0400

    adding tests for deleted and pending_delete statuses

 nova/tests/api/openstack/test_images.py |   96 ++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 7 deletions(-)

commit b727f3d77544fce3966e5ad939ba1d39fc526705
Merge: 8e4cb45 cd5084f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Sep 12 18:07:09 2011 +0000

    Fixes rogue usage of sudo that crept in

commit cc9e254d9f28c12abe555b2ddad92ccc533bc547
Merge: 0a8ea63 8e4cb45
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Sep 12 12:53:56 2011 -0400

    Merge from trunk

commit 5c5948ffe158d9834d13a80a3ff4e73f79d0d7e0
Merge: 043a136 6299edf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 09:29:08 2011 -0700

    fixups

commit 4cbfc60b225d0386b6719e49fc9797fd72dc219b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 09:15:31 2011 -0700

    remove unused dep

 nova/tests/test_libvirt.py |    1 -
 1 file changed, 1 deletion(-)

commit f40955d419c886be29213f73f5ffdf2f38e00057
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 08:00:30 2011 -0700

    add test for method sig

 nova/tests/test_libvirt.py |   46 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

commit 6299edf0f240d46b3de1de4bf89f839b5737a7f2
Merge: 5de08f3 043a136
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:42:28 2011 -0700

    parent merge

commit 5de08f3ac11d936979a3c08c27b3b19b72d58373
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:37:02 2011 -0700

    migration move

 .../migrate_repo/versions/045_add_zone_name.py     |   35 --------------------
 .../migrate_repo/versions/046_add_zone_name.py     |   35 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)

commit 043a13690dc4f2ba20965cced85d705e59f7406b
Merge: a27aa5d 66dd778
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:36:14 2011 -0700

    bug fixes

commit 0611e3fc3165ce916d83b0fa421e6dafa2b2387e
Merge: 8debe1f 8e4cb45
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 10:13:34 2011 -0400

    merging trunk

commit 8e4cb45399ea4203bcc81d5c67e8197b482a1f8a
Merge: 66dd778 212ec3a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Sep 12 13:52:04 2011 +0000

    Fixes shutdown of lxc containers.

commit 6fafde1fa52d1eba0c77f403b9e2a6f77b5379cd
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 12 09:20:11 2011 -0400

    Make quoting consistent.

 nova/api/openstack/contrib/rescue.py |    2 +-
 nova/api/openstack/servers.py        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit cd5084f8a69b0e2a14f01aa9a4f3d8588a83c923
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Sep 12 14:30:56 2011 +0200

    Fix rogue usage of 'sudo' bypassing the run_as_root=True method

 nova/tests/test_libvirt.py |    4 ++--
 nova/virt/disk.py          |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit b8fe070ee78f5b005e6e82934fa6e4605ebb66dd
Merge: bb6374d 66dd778
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 05:01:02 2011 -0700

    trunk merge

commit bb6374dfeb81f020d82161c28a6b31be636fbc01
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 04:59:58 2011 -0700

    region name

 nova/scheduler/zone_manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a27aa5dce2788560b29fd33b4805acf0190a27e3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 04:58:39 2011 -0700

    tweaks

 nova/scheduler/abstract_scheduler.py |    3 ++-
 nova/scheduler/zone_manager.py       |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 7ac94ccf7dbb5838ef877b9d954ea96bf1412b4b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 00:16:49 2011 -0700

    fix for lp847604 to unbreak instance rebooting

 nova/compute/api.py             |    2 +-
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 66dd77887641f9db5f690f871b0cfb4d381d6a3e
Merge: 020d4e7 dd7aa02
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 12 02:23:20 2011 +0000

    use 'qemu-image resize' rather than 'truncate' to grow image files
    
    qcow-image is capable of growing qcow formated disks in addition to
    being able to grow a qcow formated one. (LP: #836759)
    
    I've verified that after this change both a full disk uploaded as 'raw' and one that was uploaded as 'qcow2' are correctly resized, and that in oneiric, the instance has its root filesystem resized for /dev/vda1 correctly.

commit 020d4e735977ffa4f632500f7b977c64721861e9
Merge: e587fc0 7e96a2d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Sep 12 02:11:43 2011 +0000

    When vpn=true in allocate ip, it attempts to allocate the ip that is reserved in the network. Unfortunately fixed_ip_associate attempts to ignore reserved ips.
    This fix allows to filter reserved ip address only when vpn=True.

commit e587fc09545eebe71b9d3bd9ed5d7fe62424a8a6
Merge: 1a5a93d c173b6b
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sun Sep 11 12:57:05 2011 +0000

    Do not require --bridge_interface for FlatDHCPManager (lp:844944)
    
    Unlike VlanManager, FlatDHCPManager actually works fine without a bridge
    interface on single host deployments.

commit 1a5a93d40aba591f715413fbc02e3233da1a7b91
Merge: 717f739 98a5e14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 10 18:41:23 2011 +0000

    Makes nova-vncproxy listen for requests on the queue like it did before the bin files were refactored.

commit 9482275a60ab8caa546ec402f61c60b9f5e7e33f
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Sep 10 13:56:54 2011 -0400

    Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with
    Glance keystone.

 nova/api/auth.py                                   |    1 +
 nova/api/openstack/create_instance_helper.py       |    3 +-
 nova/compute/api.py                                |    3 +-
 nova/compute/manager.py                            |    3 +-
 nova/context.py                                    |    9 +-
 nova/image/__init__.py                             |   56 +-----------
 nova/image/glance.py                               |   91 +++++++++++++++-----
 nova/tests/api/openstack/fakes.py                  |    2 +-
 nova/tests/glance/stubs.py                         |    6 +-
 nova/tests/integrated/integrated_helpers.py        |    2 +-
 nova/tests/test_xenapi.py                          |    3 +-
 nova/virt/images.py                                |    3 +-
 nova/virt/libvirt/connection.py                    |    4 +-
 nova/virt/vmwareapi/fake.py                        |    6 +-
 nova/virt/vmwareapi/vmops.py                       |    4 +-
 nova/virt/vmwareapi/vmware_images.py               |   69 ++-------------
 nova/virt/xenapi/vm_utils.py                       |   17 ++--
 nova/virt/xenapi/vmops.py                          |    4 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    6 +-
 19 files changed, 124 insertions(+), 168 deletions(-)

commit d8abe79da8dde2667936ee97d88d30d5cf0e6d7f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Sep 10 17:11:31 2011 +0900

    api/ec2/ebs: make metadata returns correct swap and ephemeral0

 nova/api/ec2/cloud.py                              |    6 +++
 .../migrate_repo/versions/046_add_instance_swap.py |   48 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 nova/virt/libvirt/connection.py                    |    8 ++++
 4 files changed, 64 insertions(+)

commit c890890c7ccbc7df1060d59747089b5e39c5510a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Sep 10 17:11:21 2011 +0900

    api/ec2: make get_metadata() return correct mappings
    
    The entries corresponding to volumes are in the form
    of ebs<N>': <device name>

 nova/api/ec2/cloud.py    |   20 ++++++++++++++++++--
 nova/tests/test_cloud.py |    4 +++-
 2 files changed, 21 insertions(+), 3 deletions(-)

commit 248787462473195ab35591946ed6e3f0e2a818b0
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Sep 10 17:08:43 2011 +0900

    virt/libvirt: format ephemeral device and add fs label when formating ext3 fs
    
    his patch fixes the but reported by
    ttps://bugs.launchpad.net/bugs/827590
    ttps://bugs.launchpad.net/nova/+bug/828357
    The ephemeral device is formated as ext3 on Amazon ec2.
    
    The new options, vir_mkfs, is introduced.
    virt_mkfs use the format of <os_type>=<mkfs command>

 nova/virt/disk.py               |   41 +++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py |   13 +++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

commit 0a8ea633b56fece6280b2ff6752e544d99d4b301
Merge: 13ee200 717f739
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 9 22:14:39 2011 -0400

    Merge from trunk

commit 965e510e7c3d66efd8d806418ca6a5c2f1c5b94e
Merge: c3cb1d3 717f739
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Sep 9 20:48:53 2011 -0400

    Merge trunk

commit c3cb1d38ca4a6f3308503c79e13e3e8688143163
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Sep 9 20:47:37 2011 -0400

    Fix spelling mistake

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 717f73909ac6ec71b9a9b0234585c862d909d2a0
Merge: ed0435b c0700ea
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 9 22:22:10 2011 +0000

    Stock zones follows a fill-first methodology—the current zone is filled with instances before other zones are considered.  This adds a flag to nova to select a spread-first methodology.  The implementation is simply adding a random.shuffle() prior to sorting the list of potential compute hosts by weights.

commit ed0435b487fe22023f559ac173e14b6ceb67eb47
Merge: 128294a 64317cd
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 9 21:37:10 2011 +0000

    Pass reboot_type (either HARD or SOFT) to the virt layers from the API.
    
    This only works with XenAPI at the moment. The other hypervisors will need to be implemented as their maintainers see fit.

commit 8debe1f4164b323b751cd5b01859a08c5e85ab9a
Merge: 71d0b46 128294a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 17:27:42 2011 -0400

    merging trunk

commit 65a0cc41b1b9ead5acd3128a4a6202bb02e3a6e5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 17:25:45 2011 -0400

    fixing image status mapping

 nova/api/openstack/views/images.py      |   15 ++++++++-------
 nova/tests/api/openstack/test_images.py |   10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

commit c0700ea7bbb4d860610b71e635b8dbde19157e85
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 9 20:27:22 2011 +0000

    don't need random in abstract_scheduler.py anymore...

 nova/scheduler/abstract_scheduler.py |    1 -
 1 file changed, 1 deletion(-)

commit bb293431d27ee5450d1e12f25f8dbaffe36df3d3
Merge: d05d4e7 e03f6a2
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 9 20:23:00 2011 +0000

    pull-up from trunk; move spread_first into base_scheduler.py

commit 65593df54c7f547451b903ed148b0dc9ecebca19
Merge: 41086f8 128294a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 9 12:58:29 2011 -0700

    trunk merge

commit 41086f811b3e65077dd9222db98406af59fde30f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 9 12:54:22 2011 -0700

    adding auth tokens to child zone calls

 nova/scheduler/api.py |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit d05d4e77df0bdfd2b802186762391d7f91361701
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 9 14:35:38 2011 -0500

    Add comment to document why random.shuffle() works

 nova/scheduler/abstract_scheduler.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 64317cd7dead447280e1d143863c59d20e9f53e0
Merge: 17b3120 128294a
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 9 14:05:11 2011 -0500

    Merged trunk.

commit 2351c06f50d4556e564a7b0abb1653805e661330
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:38:01 2011 +0000

    Make whitespace consistent

 nova/api/openstack/contrib/deferred_delete.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a5093b81b9aa5fffb71e7638b0c06c7f6b1c2d84
Merge: 3279898 128294a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:35:07 2011 +0000

    Merge with trunk

commit 3279898ffcd66870b8523e5281993311a513f0f9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:33:36 2011 +0000

    Use triple quotes for docstrings to be consistent

 nova/api/openstack/contrib/deferred_delete.py |    4 ++--
 nova/compute/manager.py                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 128294ab9f5c03426ecb2154c48ea98186256d5b
Merge: 266fe18 9dd2d6c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 18:26:47 2011 +0000

    Remove the unnecessary sudo from qemu-img as it is unneeded and doesn't work with our current packaging.

commit 266fe18ef4ec474926908fcd9aeb2d7de4b34447
Merge: e03f6a2 7352e3e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 18:06:34 2011 +0000

    Remove chanes_since and key_name from basic server entity.

commit 17b3120d6c5459c993f23256ca7e4b40a420b067
Merge: cbc46d1 e03f6a2
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 9 13:05:33 2011 -0500

    Merged trunk.

commit 2127b587a1870cd0f08466e8fe53697337292645
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 10:44:06 2011 -0700

    remove extra line for pep8

 nova/tests/test_libvirt.py |    1 -
 1 file changed, 1 deletion(-)

commit 3a0df2ca9b145d0ef5808def1f2f990a74e607e0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 10:27:00 2011 -0700

    remove unnecessary qemu-img flag, use base image type by default

 nova/virt/libvirt/connection.py |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit 5ddfd1c1add955aa14c5e5174b1942eb8f748031
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 9 10:20:36 2011 -0700

    shorten comment to < 79 chars

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f9665344b4197c48c5388314e7ecf4fb5eef4406
Merge: ccb5334 67a2445
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 10:14:24 2011 -0700

    merged rbp

commit 9dd2d6c49a36c1834d0ef842c47d2ef400642ff2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 08:59:02 2011 -0700

    remove sudo from qemu-img commands

 nova/virt/libvirt/connection.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e03f6a245d5be18e3918090cdd951f17b59d3585
Merge: 33e389c 2bed69e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 9 15:22:09 2011 +0000

    adds a fake_network module to tests to generate sensible network info for tests. It does not require using the db.
    
    This is the first round of a few, it creates the fake_get_instance_nw_info function and updates the libvirt tests to use it.

commit 33e389c647f94798898a89b3bee9e864a31741b7
Merge: 9975c68 4bf6508
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 14:17:03 2011 +0000

    Adding a can_read_deleted filter back to db.api.instance_get_all_by_filters that was removed in a recent merge.

commit 7352e3e1eb7a4d29b556492a208e80439828f211
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 09:48:38 2011 -0400

    removing key_name and config_drive from non-detailed server entity

 nova/api/openstack/views/servers.py      |    7 ++-----
 nova/tests/api/openstack/test_servers.py |    4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

commit e1d38ca90c259a44035cf3bd5ad17d9ca5d93472
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 9 15:21:00 2011 +0200

    Authorize to start a LXC instance withour, key, network file to inject or metadata.

 nova/virt/libvirt/connection.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 9975c680fadf0a75639452db308e70a4be18c45d
Merge: 67a2445 4ffe41d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 08:56:42 2011 +0000

    Open Essex (switch version to 2012.1)

commit 67a2445265c8bce704802935b83c6e1ece805332
Merge: 2446136 99f9dcc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 07:41:53 2011 +0000

    Last Diablo translations for Nova

commit 4ffe41dffaab64c96649bfc3236e5ba6bb9d8b37
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 09:27:26 2011 +0200

    Open Essex (switch version to 2012.1)

 nova/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99f9dcca59836938fe89c26eef5ead2be1172ca8
Merge: 2446136 2abdd4c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 08:46:58 2011 +0200

    Last Diablo translations

commit 13ee200d8265175922b5747f9e00fc31db4803fd
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 21:37:40 2011 -0400

    pep 8

 nova/tests/api/openstack/test_servers.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b890b992f3013a1959e3c3cdf1f149cacf4e569b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 21:30:21 2011 -0400

    Fixing security groups stuff

 nova/api/openstack/servers.py                      |   20 ++++-----
 .../api/openstack/contrib/test_createserverext.py  |    6 ++-
 nova/tests/api/openstack/test_versions.py          |   43 +++++++-------------
 3 files changed, 26 insertions(+), 43 deletions(-)

commit 3202b7a9193796170fbb25a793e40ff14f9b9621
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 8 18:02:02 2011 -0700

    put key into meta-data, not top level 'data'

 nova/api/ec2/cloud.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit f2c887824cd56fe83f4db2bf94279684a1daba05
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 8 17:42:49 2011 -0700

    metadata key is 'public-keys', not 'keys'

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2446136426bf1bbe8c3f20604eabb5ec18b2e5a7
Merge: 67534d8 fe355a1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Sep 8 23:56:42 2011 +0000

    fix for lp844364: fix check for fixed_ip association in os-floating-ips

commit a8acd5fbd55ad4cd2cd502e95b2399657fbd162f
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 8 16:02:10 2011 -0700

    if no public-key is given (--key), do not show public-keys in metadata service

 nova/api/ec2/cloud.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit 67534d897896c2b3ebddcac9be86f669c431a7c2
Merge: b48ccfd 34baac0
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 8 21:11:52 2011 +0000

    NetworkManager's add_fixed_ip_to_instance calls _allocate_fixed_ips without vpn or requested_networks parameters. If vpn or requested_networks is not provided to the _allocate_fixed_ips method, it throws an exception. This issue is fixed now.

commit cbc46d1d82541197aeb51ca330d17d4c9ff850d0
Merge: aec647b b48ccfd
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 16:10:45 2011 -0500

    Merged trunk.

commit aec647b3b42c4cd56a9509c2d1ac25ff12b0664e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 16:10:03 2011 -0500

    First pass at adding reboot_type to reboot codepath.

 nova/api/openstack/servers.py            |    5 ++---
 nova/compute/api.py                      |    5 +++--
 nova/compute/manager.py                  |    4 ++--
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/test_compute.py               |   15 ++++++++++++---
 nova/tests/test_virt_drivers.py          |    3 ++-
 nova/tests/test_vmwareapi.py             |    3 ++-
 nova/virt/driver.py                      |    3 ++-
 nova/virt/fake.py                        |    2 +-
 nova/virt/hyperv.py                      |    2 +-
 nova/virt/vmwareapi_conn.py              |    2 +-
 nova/virt/xenapi/vmops.py                |    9 +++++++--
 nova/virt/xenapi_conn.py                 |    4 ++--
 13 files changed, 38 insertions(+), 21 deletions(-)

commit 86aa054687f3ee4c48b3b2f089f10d3f18e1fae0
Merge: 2a8b4b9 bb3b61b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 8 13:53:03 2011 -0700

    child zone queries working with keystone now

commit 7e96a2d7c5f2ac8572c6d0fd20e4e8c7e146dce9
Merge: 9773d90 b48ccfd
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 8 13:49:03 2011 -0700

    Added docstring to explain usage of reserved keyword argument

commit b48ccfdfbc42f399aaeb29e5305c3855a719b02d
Merge: 22690dd c8a48ee
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 20:27:33 2011 +0000

    One more bug fix to make zones work in trunk.  Basic problem is that in novaclient using the 1.0 OSAPI, servers.create() takes an ipgroups argument, but when using the 1.1 OSAPI, it doesn't, which means booting instances in child zones won't work with OSAPI v1.0.  This fix works around that by using keyword arguments for all the arguments after the flavor, and dropping the unused ipgroups argument.

commit 22690ddbe73cdd0087d0b5c6d82be7ecdf048932
Merge: 1b5a4e5 61394a9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 20:18:11 2011 +0000

    Fixes the reroute_compute decorator in the scheduler API so that it properly:
    
    1) Raises InstanceNotFound when all zones return no instance
    2) If an instance is found in a zone, ignore whether other zones may be down.  Return the instance
    information, catching the novaclient exceptions from the other zones.
    3) If a zone is down and no instances are found in other zones, raise a ZoneRequestError... as it's possible the instance exists in the downed zones.

commit fe355a10ad0a215eb5295e46e6c106221972e7ed
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Sep 8 13:18:08 2011 -0700

    make check for fixed_ip association more defensive

 nova/api/openstack/contrib/floating_ips.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1b5a4e553216376c44d6adb8af8aa425d0ec1b92
Merge: a09d812 7a0752e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 20:07:18 2011 +0000

    Fix lp:844155
    
    When using an abstract scheduler class, if no compute hosts are available locally, the checking of child zones is short circuited.  I've removed the broken check.

commit a09d8123c6e7cea8f097fcdeb7f57cd75d682745
Merge: 816ae51 229e5fe
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Thu Sep 8 19:56:45 2011 +0000

    Changing a behavior of update_dhcp() to write out dhcp options file.
    This option file make dnsmasq offer a default gateway to only NICs of VM belonging to a network that the first NIC of VM belongs to.
    So, first NIC of VM must be connected to a network that a correct default gateway exists in.
    By means of this, VM will not get incorrect default gateways.

commit 7a0752ee27f037dba4b741c25b1615a367cece3d
Merge: bc84c13 816ae51
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 12:40:45 2011 -0700

    merged trunk

commit 71d0b4644aa16c2aa792ea47c3b6781ff3252423
Merge: b24189a 816ae51
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:40:30 2011 -0400

    merging trunk

commit b24189ad5df28ae9acfa8fc5feaa8971e676343e
Merge: 57aff93 5606988
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:40:07 2011 -0400

    merging trunk

commit 61394a97c07b65a6e4a480ec0edee57093bce52f
Merge: 973870c 816ae51
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 12:33:43 2011 -0700

    merged trunk

commit 816ae51f6580e3ed20597157f94a4ffd4e690c04
Merge: 29849c5 d5babda
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 19:28:20 2011 +0000

    Make weigh_hosts() return a host per instance, instead of just a list of hosts.

commit 4bf6508a026c62a7aa2423b1910c871ddc3f0916
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:26:44 2011 -0400

    converting fix to just address ec2; updating test

 nova/api/ec2/cloud.py     |    4 +++-
 nova/db/sqlalchemy/api.py |    4 ----
 nova/tests/test_cloud.py  |    4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

commit 29849c59b4c1d865307b396d454e16a60480d5aa
Merge: bb3b61b 3f6738b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 19:17:10 2011 +0000

    Do not attempt to mount the swap VDI for file injection.

commit c8a48eec1fb9f205af5cef2b882fc171bcca4d57
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 19:08:46 2011 +0000

    Add a NOTE()

 nova/scheduler/abstract_scheduler.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 229e5fe8a1bb94bdea17b2fd5868a0aac992e2b1
Merge: 4d98408 bb3b61b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 8 11:47:56 2011 -0700

    Merged trunk

commit 236cbc0c13deaef69daba38e83cc7c294ea0bac2
Merge: d155f42 bb3b61b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 13:44:37 2011 -0400

    Merge from trunk

commit 3f6738b9f07640b0950793975cfc55e62aa3e1ad
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 12:11:39 2011 -0500

    Use .get instead.

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 763bf3f1282e3d9723a356d4014a9599601637eb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 11:43:43 2011 -0500

    Do not attempt to mount the swap VDI for file injection.

 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/virt/xenapi/vmops.py                |   13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

commit baf9435d2a1be8bbfd27278b19f6f35bb3e316ea
Merge: ad25b7a bb3b61b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:41:55 2011 +0000

    pull-up from trunk

commit d5babda2742ffca8034866efb21fe0fbce861eab
Merge: 91ac11a bb3b61b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:41:27 2011 +0000

    pull-up from trunk

commit 1268f81ec950a6c1a06a74245ca132fb916a1fdd
Merge: 27b052c bb3b61b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:40:52 2011 +0000

    pull-up from trunk

commit 6cbbdb909443a33c2af8ddd73b861cd41201fa0b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 11:32:11 2011 -0400

    adding can_read_deleted back to db api

 nova/db/sqlalchemy/api.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 212ec3af4b11a770d7e4cf7869b1865b0f067e5c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Sep 8 10:52:29 2011 -0400

    Clean up shutdown of lxc containers

 nova/virt/disk.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 60a54cfe6111166fe643ccc753f6f9d6265c4fac
Merge: 15fe220 bb3b61b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:54:10 2011 +0000

    Merge with trunk

commit 15fe2208e858434c6a6f8ee329055da2ce77b348
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:53:51 2011 +0000

    Cleanup some more comments

 nova/compute/api.py |    2 --
 1 file changed, 2 deletions(-)

commit 35eb007a07a14f2bf389e53e771114217f1b018e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:53:31 2011 +0000

    Cleanup some comments

 nova/tests/integrated/test_servers.py |    3 ---
 1 file changed, 3 deletions(-)

commit 98a5e149395ee58d1830d4671e2c70aaf0008585
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 8 04:45:04 2011 -0700

    fixes vncproxy service listening on rabbit

 bin/nova-vncproxy |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 973870c82445d4c1ebbd46f2ba7c3817ae5e7f87
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 01:09:22 2011 -0700

    added tests for failure cases talking with zones

 nova/tests/scheduler/test_scheduler.py |  102 ++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 5 deletions(-)

commit bb3b61b61dc4b45fba4bdab7ead69af239eac40a
Merge: ede5066 0f5eb3f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 8 07:43:11 2011 +0000

    This code contains contains a new NetworkManager class that can leverage Quantum + Melange.
    
    Thierry suggested that I merge prop this to get feedback, even though it is too late to get a branch of this size in for D-4.  Feedback will help determine whether we can get this code in during the Diablo time frame or not.  This branch was developed stacked on top of the melange branch, which is still not merged, but I am merge-propping it without that branch so that the diff is correct.
    
    The vast majority of the code is in nova/network/quantum and is only invoked if the network manager is set to nova.network.quantum.QuantumManager
    
    In addition to implementing networks with Quantum instead of the linux bridge, the QuantumManager also provides a new, more flexible model of associating vNICs with networks.  It supports the creation of networks that are specific to a project and networks that are "global".  When a VM is created, it gets a vNIC for each project network, as well as each global network.  For example, this could support giving a VM a "public" vNIC on a shared network and a "private" vNIC on a tenant-specific network.
    
    The branch also implements Tushar's 'os-create-server-ext' extension, so that the server create API call can indicate the set of networks the VM should be attached to (if this extension is used, it replaces the above mechanism for determining vNICs).
    
    QuantumManager can use either the traditional IPAM functionality in nova DB (i.e., the networks, fixed_ips tables) or melange.  Similar to FlatManager, QuantumManager does not currently support DHCP, gateway/NAT, or floating IPs.
    
    This branch requires additional testing before it is really ready for merge, but we thought it would be best to merge prop as soon as possible to identify any significant concerns people had.

commit be7a081976d37b84d93028673d08ab78bc9d8a73
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 23:45:11 2011 -0700

    comment fix

 nova/scheduler/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d1b1f301583fd67050c45f4c863733f251620a9c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 23:39:39 2011 -0700

    typo trying to raise InstanceNotFound when all zones returned nothing

 nova/scheduler/api.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit be645283c85d69e2d3cf4f4eabdbb545aaf139bf
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 23:24:07 2011 -0700

    create a new exception ZoneRequestError to use for returning errors when zone requests couldn't complete

 nova/exception.py     |    7 +++++++
 nova/scheduler/api.py |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

commit bc84c1306e9334d4082cadee4dcb5cd14a905afe
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 22:57:36 2011 -0700

    pep8 fix for tests/api/openstack/test_servers.py which is an issue in trunk

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b13ca667bdd3303bbfcd4e58cc6d773cea09661d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 21:48:11 2011 -0700

    catch exceptions from novaclient when talking to child zones.  store them and re-raise if no other child zones return any results.  If no exceptions are raised but no results are returned, raise a NotFound exception.

 nova/scheduler/api.py |   48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

commit 5426687825cd64adf0524de2808eed1cca15f521
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 20:49:42 2011 -0700

    added test to cover case where no local hosts are available but child hosts are

 nova/tests/scheduler/test_abstract_scheduler.py |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit b3bc07d4dcb43b6e070a136eb5532def6b623e6e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 20:40:47 2011 -0700

    remove the short circuit in abstract scheduler when no local hosts are available

 nova/scheduler/abstract_scheduler.py |    3 ---
 1 file changed, 3 deletions(-)

commit b6d454762d7fdf9b202d8a580dd9bfdf069a5e80
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Sep 7 16:38:41 2011 -0700

    fix for lp844364: improve check for fixed_ip association

 nova/api/openstack/contrib/floating_ips.py         |    4 +-
 .../api/openstack/contrib/test_floating_ips.py     |   78 +++++++++++++++++++-
 2 files changed, 77 insertions(+), 5 deletions(-)

commit d55394af12ab9507d0284f222c1acb66206b187b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 23:11:38 2011 +0000

    Ensure restore and forceDelete don't do anything unless the server is
    waiting to be reclaimed

 nova/tests/integrated/test_servers.py |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit ad25b7aa2ad744607b20432d635f70cc645cc6f6
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 18:08:39 2011 -0500

    actually shuffle the weighted_hosts list...

 nova/scheduler/abstract_scheduler.py |    2 ++
 1 file changed, 2 insertions(+)

commit da40f02dc7ef4e568ef872628402f11f666e3e2b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 23:03:18 2011 +0000

    Check task_state for queued delete

 nova/compute/api.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit d2b9299408f07f995fffc8b8559f52ee6adeeaad
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 18:01:52 2011 -0500

    spread-first strategy

 nova/scheduler/abstract_scheduler.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4968aade5ce77d1068a014baf5d520b94fd668dc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:59:13 2011 +0000

    Make sure instance is deleted before allowing restore or forceDelete

 nova/compute/api.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 7b73ecf540b9bd14bdc97306018eed170b0959eb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:49:24 2011 +0000

    Add local hostname to fix Authors test

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit c70cd1d73682d4380213332cd2a640927d95636c
Merge: 2655520 ede5066
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:40:05 2011 +0000

    Merge with trunk

commit 2655520793dfcfa5b4e779c15abfd2490b193a94
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:39:15 2011 +0000

    delete_instance_interval -> reclaim_instance_interval

 nova/compute/api.py                   |    4 +---
 nova/compute/manager.py               |    5 ++++-
 nova/tests/integrated/test_servers.py |    6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

commit d046c059ed421cfe901c00d53414dfe20be66c97
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:33:59 2011 +0000

    PEP8 cleanup

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3aa265623cf42a1e94aedbc1ec17656302a36761
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:32:54 2011 +0000

    Restart compute with a lower periodic_interval to make test run faster

 nova/tests/integrated/integrated_helpers.py |    8 ++++----
 nova/tests/integrated/test_servers.py       |   14 +++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

commit 9d7807d2a24fd72383641c545c214488121b93e6
Merge: e11c56f ede5066
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 21:55:18 2011 +0000

    Merge trunk

commit 0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc
Merge: e5e3b30 3e0698e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Sep 7 14:27:06 2011 -0700

    merge trunk

commit 2bed69e61aefdc8e2aa7eeb31fe9f338e912a01d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 16:06:35 2011 -0500

    properly handle the id resetters

 nova/tests/fake_network.py |    1 +
 1 file changed, 1 insertion(+)

commit 3334fabe55c862531e3ced21b211710857c1e087
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 15:48:31 2011 -0500

    removed vestige

 nova/tests/fake_network.py |   15 ---------------
 1 file changed, 15 deletions(-)

commit 91ac11af8cd8b06feb2bd53bc39ba4636977e7b5
Merge: 591997a ede5066
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 20:41:03 2011 +0000

    pull-up from trunk

commit 591997a76a8395a72c7316207983e1225c9c4a62
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 20:40:48 2011 +0000

    fix a couple of typos in the added unit test

 nova/tests/scheduler/test_abstract_scheduler.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4d98408d4ec605ad9a591d5166f2b8ea6e723ecb
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Sep 7 13:37:58 2011 -0700

    modified unit tests, set use_single_default_gateway flag to True whereever needed instead of setting it in the init method

 nova/tests/test_linux_net.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a158d5721c18902b290a42bb3874b34e54dbcd7b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Sep 7 13:10:05 2011 -0700

    exclude net tag from host_dhcp if use_single_default_gateway flag is set to false

 nova/network/linux_net.py    |   17 ++++++++++++-----
 nova/tests/test_linux_net.py |    6 ++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

commit 31ae07f06c71968deb67c5aa1c111fe9e14fb5d8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 14:36:22 2011 -0500

    forgot _id

 nova/tests/fake_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3e61268a350ba0ec43d28dfbac6e82503a174dba
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 14:33:43 2011 -0500

    had used wrong variable

 nova/tests/fake_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ede50666215d38f037d9783556647889bc88c6bc
Merge: 3e0698e 3bb0a6f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Sep 7 18:51:52 2011 +0000

    Fixes a case where if a VIF is returned with a NULL network it might not be able to be deleted. Added test case for that fix.

commit 34baac0f11ff2084caa46a533aad411988e1541e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Sep 7 11:41:33 2011 -0700

    Fix for LP Bug #837867

 nova/network/manager.py    |    6 ++---
 nova/tests/test_network.py |   58 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 5 deletions(-)

commit 262b5cf6e8bd577d2b08fb92e6da56f8bcdecd57
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 13:37:29 2011 -0500

    weigh_hosts() needs to return a list of hosts for the instances, not just a list of hosts

 nova/scheduler/base_scheduler.py                |   16 ++++++++++--
 nova/tests/scheduler/test_abstract_scheduler.py |   32 +++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

commit 3bb0a6f75c31ada38a6049db449b748ea922131f
Merge: aef85a2 78a63bc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Sep 7 14:18:45 2011 -0400

    Merged trunk.

commit 3e0698e3b57c9f73a359340f51c2797d8adc669a
Merge: 5606988 41f3d15
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Sep 7 17:46:55 2011 +0000

    Set flat_injected to False by default.

commit e3cb2c82224fad59c16010c0842ebcfa1ac0dc95
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 12:41:16 2011 -0500

    changed the fixed_ip_generator

 nova/tests/fake_network.py |  110 ++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 39 deletions(-)

commit e11c56ff3c8894895274f65f7a33a1460434baa3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 17:23:20 2011 +0000

    PEP8 cleanup

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9dd628cd7a4ac32281702f653fd8285cb758c700
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 17:22:48 2011 +0000

    Wait longer for all agents, not just Windows

 nova/virt/xenapi/vmops.py |   64 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

commit 8e7b68a17951631e0d33534253232fd81984649e
Merge: c1763de 5606988
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 11:12:23 2011 -0500

    merged trunk

commit c1763deb23dc6dcf7ca4f32aafde47501a87083f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 11:11:19 2011 -0500

    updated floating_ip generation

 nova/tests/fake_network.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit f0c22583bc835a5937a2c2c20926804f9a5acefa
Merge: 8f523e9 5606988
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 15:38:28 2011 +0000

    Merge with trunk

commit 8f523e90d5c5da15fc72d33ec9abdd47798f5c7c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 15:31:38 2011 +0000

    Tests for deferred delete, restore and forceDelete

 nova/tests/integrated/test_servers.py |  123 +++++++++++++++++++++++++++++----
 1 file changed, 109 insertions(+), 14 deletions(-)

commit 560698829e4c7168053775e7e5e9f1e92bb98fa8
Merge: d010105 59cac7c
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Wed Sep 7 14:32:00 2011 +0000

    An AMI image without ramdisk image should start.
    
    It's possible with EC2 API but it fails with OS API.
    This patch corrects that by returns 'None' value if AMI image doesn't contain 'ramdisk_id' metadata.

commit 1a22d1da448eb08fc4559619b450d716757b6e11
Merge: 2c16115 d010105
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 7 09:28:45 2011 -0400

    Merge w/ trunk.
    Fix test_rescue_with_preset_password.

commit 53357516226a1c00217c742eb512b7efc0f574b2
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Sep 6 18:01:57 2011 -0700

    Added use_single_default_gateway to switch from multiple default gateways to single default gateway

 nova/network/linux_net.py    |   72 +++++++++++++++++++-----------------------
 nova/tests/test_linux_net.py |   17 +++-------
 2 files changed, 38 insertions(+), 51 deletions(-)

commit 41f3d157c917255683ae23313704f357e061911c
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 6 16:41:35 2011 -0500

    Fixed unit test.

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 57aff93284bff196b37d0deb995ff46d4708bbda
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 17:38:48 2011 -0400

    reverting change to GlanceImageService._is_image_available

 nova/image/glance.py |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

commit d01010583d5d581591c9edcf36c4da54f0c78da9
Merge: 99e223d 1f3856f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Sep 6 20:56:42 2011 +0000

    At present, the os servers.detail api does not return server.user_id or server.tenant_id.  This is problematic, since the servers.detail api defaults to returning all servers for all users of a tenant, which makes it impossible to tell which user is associated with which server.
    
    Similarly, when admin users access servers.list, all instances for all tenants are returned.  Without a tenant_id field, administrators can't sift through the server list very easily.
    
    This merge request does the following:
    
    * add user_id and tenant_id to servers.detail
    * makes it possible for admins to filter with the term 'tenant_id' (rather than project_id)

commit 0f1db545f1a3c8b016cd7bcf21813019262b9b7a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 16:28:34 2011 -0400

    reverting xenapi change

 nova/image/glance.py              |    1 -
 nova/image/s3.py                  |    1 -
 nova/tests/api/openstack/fakes.py |    1 -
 nova/tests/test_xenapi.py         |    2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

commit 99e223dc231bae3d98f7979a403d97fd100f03a1
Merge: 78a63bc 9b28850
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Sep 6 20:26:25 2011 +0000

    Micro-fix; "exception" was misspelled as "exceptions"

commit 9b2885076d2ed438fb3189b8528f5bec6a2cda4d
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Sep 6 15:02:04 2011 -0500

    Fix a misspelling of "exception"

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1f3856ffb92ab690b1d630deb6fa025ae74348f7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 6 12:48:41 2011 -0700

    revert changes to display description

 nova/api/openstack/create_instance_helper.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit f23c0569e72e875de3c51fb9d65606c400f0dc1c
Merge: 6eb28b5 78a63bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 6 12:47:09 2011 -0700

    merged trunk

commit 27b052c1aa2b5ae191c2e2986788c152eef9c221
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Sep 6 14:36:58 2011 -0500

    novaclient v1_0 has an ipgroups argument, but novaclient v1_1 doesn't

 nova/scheduler/abstract_scheduler.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0589ecebb5e610ba6a6787fada14e96af92361c2
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 6 14:26:02 2011 -0500

    Set flat_injected to False by default.

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b12a6c5ec11fd6ef3e110e6f0574762060ac809
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 6 15:19:37 2011 -0400

    Fixes an issue where 'invalid literal for int' would occur when
    listing images after making a v1.1 server snapshot (with a UUID).
    
    v1.1 image id's are now treated as strings (not integer ID's). The v1.0
    API still tries to treat image id's as integers but doesn't fail
    miserably if they are uuid's either.
    
    This should pave the way for image ID's as uuids and more closely matches
    the v1.1 spec with regards to images and the server refs they contain.

 nova/api/openstack/common.py            |   24 ++------
 nova/api/openstack/views/images.py      |   10 ++++
 nova/tests/api/openstack/test_common.py |   40 +++++++++----
 nova/tests/api/openstack/test_images.py |   95 ++++++++++++++++++++++++-------
 4 files changed, 118 insertions(+), 51 deletions(-)

commit 35e0ae794f6cd5fda47c4795da34f9f57f52614f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 15:16:40 2011 -0400

    further cleanup

 nova/api/openstack/image_metadata.py            |   58 ++---
 nova/image/glance.py                            |   44 ++--
 nova/tests/api/openstack/fakes.py               |  125 +++------
 nova/tests/api/openstack/test_image_metadata.py |  163 +++++-------
 nova/tests/api/openstack/test_images.py         |  313 ++++++++++++-----------
 nova/tests/glance/stubs.py                      |   69 +++++
 nova/tests/image/test_glance.py                 |  269 ++++++-------------
 nova/tests/test_xenapi.py                       |    2 +-
 8 files changed, 461 insertions(+), 582 deletions(-)

commit c11fa8152afce89bddeca0ca92693e00c08a34af
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:36 2011 +0000

    Default to 0 seconds (off)

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 124f577387f8cec5098ea783db32b80e4d677c59
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:22 2011 +0000

    PEP8 cleanups

 nova/compute/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3d37846624839d239e35b6c91aa4357844585d36
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:02 2011 +0000

    Include new extension

 nova/tests/api/openstack/test_extensions.py |    1 +
 1 file changed, 1 insertion(+)

commit f05f3273b1e7a9f647b175aef9dcd950ea5ba688
Merge: 71b7298 78a63bc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 15:23:10 2011 +0000

    Merge with trunk

commit 71b7298788045d4832dd8ec44cba3785955aa847
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 15:21:15 2011 +0000

    Implement deferred delete of instances

 nova/api/openstack/contrib/deferred_delete.py |   76 +++++++++++++++++++++++++
 nova/compute/api.py                           |   50 +++++++++++++++-
 nova/compute/manager.py                       |   59 +++++++++++++++++--
 nova/compute/task_states.py                   |    2 +
 nova/virt/driver.py                           |    8 +++
 nova/virt/xenapi/vmops.py                     |   10 ++++
 nova/virt/xenapi_conn.py                      |    8 +++
 7 files changed, 204 insertions(+), 9 deletions(-)

commit 2a8b4b9912feb848f047273cb66721997856f59d
Merge: 9bfdf23 78a63bc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 6 07:37:03 2011 -0700

    trunk merge

commit c87009f009cb749dbccd6bd155ec1a6800631ae1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 09:24:24 2011 -0400

    cleaning up tests

 nova/image/glance.py            |    2 +-
 nova/tests/image/test_glance.py |  549 ++++++++++++++++++---------------------
 2 files changed, 250 insertions(+), 301 deletions(-)

commit 9bfdf239df25496e5ff13fbe3cf086f4cd1d4df2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 6 05:00:18 2011 -0700

    zone name not overwritten

 nova/scheduler/zone_manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 2c16115e236760f3933eadd3a5d7d20dda39866d
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Sep 6 07:31:39 2011 -0400

    Update the v1.0 rescue admin action and the v1.1 rescue extension to
    generate 'adminPass'. Fixes an issue where rescue commands were broken
    on XenServer. lp#838518

 nova/api/openstack/contrib/rescue.py            |   13 +++++--
 nova/api/openstack/create_instance_helper.py    |    4 +-
 nova/api/openstack/servers.py                   |   20 +++++++---
 nova/compute/api.py                             |    9 ++++-
 nova/compute/manager.py                         |   12 ++++--
 nova/flags.py                                   |    3 ++
 nova/tests/api/openstack/contrib/test_rescue.py |   23 ++++++++++--
 nova/tests/api/openstack/test_server_actions.py |    3 +-
 nova/tests/api/openstack/test_servers.py        |   45 +++++++++++++++++++----
 9 files changed, 103 insertions(+), 29 deletions(-)

commit 6c55199d3ec900cea771e4f8077c87efa968c2f0
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 17:20:10 2011 +0900

    fix a mistaking of dataset and expected values on small test.

 nova/tests/test_linux_net.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit d4668c7351fab83930a6fe5ee8f67dabe8027b48
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 13:57:14 2011 +0900

    fix a mistaking of deletion in ensure_floating_forward

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 00c3cbe8621918fdd60f9068df2a41db52a7f76f
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 10:20:28 2011 +0900

    revert codes for db

 0 files changed

commit b922e08a6c15eeaab1f7ec342c00673b610d0e76
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 10:14:27 2011 +0900

    correct a method to collect instances from db
    add interface data to test

 nova/db/api.py               |    5 ---
 nova/db/sqlalchemy/api.py    |   14 --------
 nova/network/linux_net.py    |    8 +++--
 nova/tests/test_linux_net.py |   74 ++++++++++++++++++++++++++++--------------
 4 files changed, 54 insertions(+), 47 deletions(-)

commit b9ef3dcaa241088e205e170ca0a236afb0ea34dd
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 10:10:25 2011 +0900

    added me to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 9347124127624bd949a986bab348a81085a91a1c
Merge: 26e581a 78a63bc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 5 13:09:17 2011 +0000

    meeging trunk

commit 14314701bac27ce0e913f8e0587c354819a4bd9e
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 21:32:52 2011 +0900

    format for pep8

 nova/tests/test_linux_net.py |    1 -
 1 file changed, 1 deletion(-)

commit 418923c385a34265dd33a0c2ada3aa97a5749a06
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 21:13:00 2011 +0900

    format for pep8

 nova/db/api.py               |    4 +-
 nova/db/sqlalchemy/api.py    |    5 +-
 nova/network/linux_net.py    |    6 +-
 nova/tests/test_linux_net.py |  177 ++++++++++++++++++++++++++++++++----------
 4 files changed, 141 insertions(+), 51 deletions(-)

commit d6f1a31d56de84398246498d0f2676d9741cdccf
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 20:23:28 2011 +0900

    implement unit test for linux_net

 nova/db/api.py               |    5 +
 nova/network/linux_net.py    |   17 ++--
 nova/tests/test_linux_net.py |  232 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 247 insertions(+), 7 deletions(-)

commit 95fc404a5e3588d9f40cf7236fbda129346d134d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 5 12:06:13 2011 +0200

    Adjust test_api to account to multiple rules getting returned for a single set rule.

 nova/tests/test_api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21e31635e699c5a1d5c64ddda03516174567483f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 5 12:05:47 2011 +0200

    Clean up security groups after use

 nova/tests/test_cloud.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 7d923d28d673340af1e168f99e7178cd01ea3ac3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 5 09:32:14 2011 +0200

    Make a security group rule that references another security group return ipPermission for each of tcp, udp, and icmp.

 nova/api/ec2/cloud.py    |   15 +++++++++++----
 nova/tests/test_cloud.py |   30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

commit 6930c62a02a39f64506a7b2d2ec5b04dbff5fe3a
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Sep 5 12:51:07 2011 +0530

    Multi-NIC support for vmwareapi virt driver in nova.
    Does injection of Multi-NIC information to instances with Operating system flavors Ubuntu, Windows and RHEL.
    vmwareapi virt driver now relies on calls to network manager instead of nova db calls for network configuration information of instance.
    Ensure if port group is properly associated with vlan_interface specified in case of VLAN networking for instances.
    Re-oranized VMWareVlanBridgeDriver and added session parmeter to methods to use existing session. Also removed session creation code as session comes as argument.
    Added check for flat_inject flag before attempting an inject operation.
    Removed stale code from vmwareapi stubs.
    Also updated some comments to be more meaningful.
    Did pep8 and pylint checks. Tried to improve pylint score for newly added lines of code.

 nova/tests/vmwareapi/stubs.py  |    2 -
 nova/virt/vmwareapi/fake.py    |    2 +-
 nova/virt/vmwareapi/vif.py     |   27 +++++-----
 nova/virt/vmwareapi/vm_util.py |   26 +++++-----
 nova/virt/vmwareapi/vmops.py   |  106 +++++++++++++++++++++++-----------------
 tools/esx/guest_tool.py        |   70 ++++++++++++++------------
 6 files changed, 124 insertions(+), 109 deletions(-)

commit 6b61a6be4a14444723e3728fb0fcdd77bac8fe74
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 14:45:41 2011 +0900

    Fix bug #835919 that output a option file for dnsmasq not to offer a default gateway on second vif.

 nova/db/sqlalchemy/api.py |   15 +++++++++++++
 nova/network/linux_net.py |   55 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 2 deletions(-)

commit 077a6971016b112fa7133f2b00aaed5d922386e1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Sep 4 21:06:10 2011 +0200

    Accidentally added instance to security group twice in the test. Fixed.

 nova/tests/test_libvirt.py |    3 ---
 1 file changed, 3 deletions(-)

commit d155f4224cb97e43cacd4102ba01f0e1775dfbdf
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Sep 4 05:39:59 2011 -0400

    Minor cleanup.

 nova/tests/api/openstack/test_versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b35957eef001ae1c3329e9197984d3aca0da787
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Sep 4 05:39:21 2011 -0400

    Fixing xml serialization of limits resource.

 nova/api/openstack/limits.py            |   24 +++++++++++-----------
 nova/tests/api/openstack/test_limits.py |   34 +++++++++++++++----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

commit 80059b3e87f6ce7ab2ba18a135e5c469d2be8f88
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Sun Sep 4 01:19:21 2011 -0500

    correct floating ip id to increment in fake_network

 nova/tests/fake_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0bcfe0b990fb8df799df2c2bb95f324beeccc974
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Sep 3 14:32:35 2011 +0100

    Add iptables filter rules for dnsmasq
    
    On Fedora, the default policy for the INPUT chain in the filter table
    is DROP. This means that DHCP and DNS request packets from the guest
    get dropped.
    
    Add these rules to allow the traffic through:
    
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p udp -m udp --dport 67 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p tcp -m tcp --dport 67 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p udp -m udp --dport 53 -j ACCEPT
     $> sudo iptables -t filter -A nova-network-INPUT -i br0 -p tcp -m tcp --dport 53 -j ACCEPT

 nova/network/linux_net.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 59cac7cfc5fba0aa084171958b5b28f51a723010
Merge: 864f3b2 78a63bc
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Sat Sep 3 09:40:19 2011 +0200

    Merged trunk.

commit 864f3b24c6cd0753474ac152bce73c2df64bbdd1
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Sat Sep 3 09:36:06 2011 +0200

    Change non E ascii characte.

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2abdd4c2fab39b6373a1562fb260168e515e43e9
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Sep 3 05:50:53 2011 +0000

    Launchpad automatic translations update.

 po/pt_BR.po |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 78a63bcad5f29c8927151556229271668b0f9e2b
Merge: 1049a91 494eb94
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sat Sep 3 00:37:13 2011 +0000

    Instance record is not inserted in db if the security group passed to the RunInstances API doesn't exists.

commit 494eb94192a971f64fa6aa78092074f8ed437a7f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 17:09:09 2011 -0700

    Added unit tests to check instance record is not inserted in db when security groups passed to the instances are not existing

 nova/tests/test_compute.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit f970ce0fbb3d4de560f73a01b508d8f0f7ac9117
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 18:02:41 2011 -0500

    removed unneeded import

 nova/tests/fake_network.py |    1 -
 1 file changed, 1 deletion(-)

commit cfdc4642bfa3d96e2335079d187945b9ca4c0141
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 18:00:34 2011 -0500

    rick nits

 nova/tests/fake_network.py |   68 +++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

commit 53f1aafc546b165cfdd74aa6620fe4c288a9359a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 17:28:58 2011 -0500

    alex meade issues

 nova/tests/fake_network.py |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 1049a91ef72b09cbff488baec20dc8486d67c475
Merge: 3d54208 d3de969
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 22:17:55 2011 +0000

    Added list of security groups to the newly added extension (Createserverext)  for the Create Server and Get Server detail responses.

commit 6eb28b5748a829d058fd35888f03f2ee1f26f5b5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 13:31:19 2011 -0700

    default description to name

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd7aa0234080d5c3512d0e9bab831a621aac10aa
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 2 16:30:52 2011 -0400

    use 'qemu-image resize' rather than 'truncate' to grow image files
    
    qcow-image is capable of growing qcow formated disks in addition to
    being able to grow a qcow formated one. (LP: #836759)

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc0ee0d01320d81b5bb6cd1bc6cb23c90c8246a7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 13:24:40 2011 -0700

    remove extra description stuff

 .../api/openstack/contrib/test_createserverext.py  |    1 -
 nova/tests/api/openstack/test_servers.py           |   19 +------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

commit e5e3b306985a3b1fdd8a971f48b76eaf8f923f21
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 13:24:38 2011 -0700

    fix pep8 violation

 nova/network/quantum/melange_connection.py |    1 +
 1 file changed, 1 insertion(+)

commit 752b6c9e26b718ab86f04c25a8c7f977bbea4a22
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 13:05:24 2011 -0700

    feedback from jk0's review, including removing a lot of spaces from docstrings

 bin/nova-manage                            |    3 +-
 nova/db/sqlalchemy/api.py                  |    2 +-
 nova/network/manager.py                    |    2 +-
 nova/network/quantum/client.py             |   45 ++++++++--------
 nova/network/quantum/manager.py            |   76 ++++++++++++++--------------
 nova/network/quantum/melange_connection.py |    2 +-
 nova/network/quantum/melange_ipam_lib.py   |   63 +++++++++++------------
 nova/network/quantum/nova_ipam_lib.py      |   56 ++++++++++----------
 nova/network/quantum/quantum_connection.py |   34 ++++++-------
 9 files changed, 141 insertions(+), 142 deletions(-)

commit cc3bd1da5edc368871d2c8de0e498ab2649ae0dd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 12:52:02 2011 -0700

    revert description changes, use metadata['description'] if it is set to populate field in db

 nova/api/openstack/create_instance_helper.py |    9 ++++++---
 nova/api/openstack/schemas/v1.1/server.rng   |    1 -
 nova/api/openstack/servers.py                |    6 +-----
 nova/api/openstack/views/servers.py          |    1 -
 nova/tests/api/openstack/test_servers.py     |   28 --------------------------
 5 files changed, 7 insertions(+), 38 deletions(-)

commit e5527e712c17baa0b526cdd8dd04f6c4a7434b82
Merge: b4b03e0 3d54208
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 12:42:43 2011 -0700

    merged trunk

commit bcb6f7d570ed24e0bf083cd4f4c8be0f20e69918
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 12:40:55 2011 -0700

    change db migrate script again to match other similar scripts

 .../versions/044_add_network_priority.py           |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9773d900d35316edbad4468a869ca62a353d3114
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 12:34:14 2011 -0700

    Fix for LP Bug #839269

 nova/db/api.py             |    6 ++++--
 nova/db/sqlalchemy/api.py  |    5 +++--
 nova/network/manager.py    |    3 ++-
 nova/tests/test_network.py |    3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

commit 435016f27ea36a6780897efe1289328c51e1463f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 12:31:14 2011 -0700

    move networks declarations within upgrade/downgrade methods

 .../versions/044_add_network_priority.py           |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit bd1bc5e3c6f52963ce088e2e0a6da41f125d29f1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 12:11:28 2011 -0700

    more review cleanup

 .../versions/044_add_network_priority.py           |    4 +---
 nova/network/quantum/melange_connection.py         |   17 +++++++++--------
 nova/tests/test_quantum.py                         |    4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

commit 5fe5c5dc26276a10b7dc766104a7e2d6c7793dc3
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 11:51:55 2011 -0700

    remove import of 'fake' from nova manager, now that we've moved that to test_quantum.py

 nova/network/quantum/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 3d542086f23b7b432fe776aed1498f9a7a6ebc7d
Merge: d80dc5b 666f715
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 18:31:23 2011 +0000

    Fixes a small bug which causes filters to not work at all.  Also reworks a bit of exception handling to allow the exception related to the bug to propagate up.

commit 55f0a6a058546f0ffbf4bee0e92eea2e70d8c76f
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 20:29:58 2011 +0200

    Email error again. Tired.

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5acb6186318541b1743bf62daa0510c9dba9c48
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 20:25:18 2011 +0200

    Email error.

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3de96998110185d4b67309808cbd9c488597739
Merge: 2d2d9a5 d80dc5b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 11:00:33 2011 -0700

    Fixed review comments

commit 666f7152910838f866ca4b76258b025c27744ffb
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 12:31:10 2011 -0500

    Add documentation comment

 nova/scheduler/host_filter.py |    5 +++++
 1 file changed, 5 insertions(+)

commit ef1df6eb8ba69224216ed2d3afc7455abfd342ce
Merge: f119805 d80dc5b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 11:01:05 2011 -0500

    pull-up from trunk

commit f119805aa7c8e2dd7f0bafe666d976f3a0c08795
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 11:00:03 2011 -0500

    Forgot to handle return value

 nova/scheduler/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ccb5334c600de07f1c9aa2657dd29134fda29bc4
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 17:49:45 2011 +0200

    Add tests for flags 'snapshot_image_format'.

 nova/tests/test_libvirt.py |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

commit cae343eecdeba6b3f18dbdc330206edabd9ed287
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 17:39:37 2011 +0200

    Update snapshot image metada 'disk_format'.

 nova/virt/libvirt/connection.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 1b93fdbf13c67bd5b0a5efc1306b95f30c64cc34
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 17:28:11 2011 +0200

    Add flag 'snapshot_image_format' to select the disk format of the snapshot image generated with the libvirt driver.

 nova/virt/libvirt/connection.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 75c355b42f6c24723c57228d8acfad64fd4ec7d0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 2 07:38:22 2011 -0700

    missing migration

 .../migrate_repo/versions/044_add_zone_name.py     |   35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 78bb09eacedb91f0b5bf294ede9372768409590b
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 16:17:18 2011 +0200

    Email contact error.

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5a90f842c99f94af2e321051d85e81f49c1e692
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 16:01:13 2011 +0200

    Update Authors file.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 5a4f9b949ecabc385de66a20714c3a13de424ea4
Merge: 1081b9d d80dc5b
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 15:58:20 2011 +0200

    Merged trunk.

commit 1081b9d52026afb84128c15a1df0998f80810ce9
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Fri Sep 2 15:48:32 2011 +0200

    Correct tests associated.

 nova/tests/api/openstack/test_servers.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 8a5611f9b2fa632ccfcd04523ee42f69b223ea6e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 2 13:44:10 2011 +0200

    Fix protocol-less security groups.

 nova/tests/test_libvirt.py    |   11 +++++++++++
 nova/virt/libvirt/firewall.py |    4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

commit c5ad2b155a2ad7d7aefea316362cc354d0cf4cf3
Merge: 4f72f6c d80dc5b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 2 01:39:31 2011 -0400

    Merge from trunk

commit 4f72f6c0fb88baaa680e5dd7973a2b1aa9bd6aaf
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 2 01:28:11 2011 -0400

    Adding feedparser to pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 0c737cb60980b8db74496e7914322f567950c2c3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 2 01:07:30 2011 -0400

    Removing xml functions that are no longer called.

 nova/api/openstack/versions.py            |  105 +++++------------------------
 nova/tests/api/openstack/test_versions.py |   19 ++++--
 2 files changed, 27 insertions(+), 97 deletions(-)

commit 81f3c9e0d1657783edf8f2ab7e055c5628af33ec
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Sep 2 04:53:10 2011 +0000

    Launchpad automatic translations update.

 po/pt_BR.po |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit d80dc5bbbd1781bd33d9f69b608014e9cc2e41a3
Merge: ce6f55b 83a56a2
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 22:31:54 2011 +0000

    Glance can now perform its own authentication/authorization checks when we're using keystone.

commit e6e3f46bf449fa371a584720c12c21e0832f4160
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 17:15:21 2011 -0500

    import filters in scheduler/host_filter.py so default_host_filter gets added to FLAGS; rework SchedulerManager() to only catch missing 'schedule_<method>' attribute and report other missing attributes

 nova/scheduler/host_filter.py |    1 +
 nova/scheduler/manager.py     |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 38373bf8f60dd068dec69933d1456a8deb75bf8e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 15:02:09 2011 -0700

    move content of quantum/fake.py to test_quantum.py in unit testing class (most original content has been removed anyway)

 nova/network/quantum/fake.py    |   92 ---------------------------------------
 nova/network/quantum/manager.py |    9 ++--
 nova/tests/test_quantum.py      |   76 +++++++++++++++++++++++++++++++-
 3 files changed, 78 insertions(+), 99 deletions(-)

commit 527670d632788d20aca7a3f12495d4c97e036d51
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 14:40:30 2011 -0700

    melange testing cleanup, localization cleanup

 nova/network/quantum/client.py             |    5 +++--
 nova/network/quantum/fake.py               |    4 ++--
 nova/network/quantum/manager.py            |   19 +++++++++----------
 nova/network/quantum/melange_connection.py |   19 +++++++++++--------
 nova/network/quantum/melange_ipam_lib.py   |    7 ++++---
 5 files changed, 29 insertions(+), 25 deletions(-)

commit f0a6c35149a1b9cc278cd3ba960861da9189b5bf
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 14:39:34 2011 -0700

    remove references to MelangeIPAMTest, as they cannot be used yet

 nova/tests/test_quantum.py |   10 ----------
 1 file changed, 10 deletions(-)

commit 2d2d9a5f5caed27d9ade06b2dbc56b793b7e5d3b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 1 14:32:48 2011 -0700

    Deleted debug messages

 .../api/openstack/contrib/test_createserverext.py  |    3 ---
 1 file changed, 3 deletions(-)

commit d55dedbcceeab883c22eda19879221edb7a9d7e0
Merge: 43a3928 ce6f55b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 1 14:29:43 2011 -0700

    Resolved conflicts and fixed pep8 errors

commit ce6f55b4bd889d9e873598bb23ed37327d75252e
Merge: dbd5acd 59be9be
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 1 21:06:22 2011 +0000

    Fix a few references to state_description that slipped through.

commit 43a392814150e49769e935f4972c9901612570af
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 1 14:03:22 2011 -0700

    added unit tests and cleanup of import statements

 .../api/openstack/contrib/test_createserverext.py  |  113 ++++++++++++++++----
 1 file changed, 95 insertions(+), 18 deletions(-)

commit 04cfb6356b920941080fbc58301b6d005d21ac5f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:50:38 2011 -0500

    renamed fake_network_info.py

 nova/tests/fake_network.py      |  144 +++++++++++++++++++++++++++++++++++++++
 nova/tests/fake_network_info.py |  144 ---------------------------------------
 nova/tests/test_libvirt.py      |    6 +-
 nova/tests/test_network.py      |    4 +-
 4 files changed, 149 insertions(+), 149 deletions(-)

commit 53b11e5cf144716a4052d26d75dd5d1490d7f111
Merge: ab8cfda dbd5acd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:30:52 2011 -0500

    trunk merge

commit ab8cfda10ed12dd592ef3b06806a80b1922707c1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:29:00 2011 -0500

    moved cidr_v6 back

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aef85a2596e943299542f05e165774250476bc5b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 16:11:14 2011 -0400

    Probably shouldn't leave that commented out.

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 833ac1674d33cde3721b2d10a3d9545cc8320b37
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 16:09:23 2011 -0400

    Added test for NULL network.

 nova/network/manager.py    |    4 ++--
 nova/tests/test_network.py |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 0baf5c3d0319b8b6a70730b08837ccfb792edef2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 15:42:31 2011 -0400

    Fixed lp835242

commit a36e0a1cbc5645ab47041c2627dba80b39b23cc2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 15:42:01 2011 -0400

    Fixes for minor network manager issues centered around deleting/accessing instances which don't have network information set.

 nova/api/openstack/views/addresses.py |    1 -
 nova/network/manager.py               |    5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 59be9be68c0fd9b33b72257b8a1eb8c357ce9217
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 1 12:22:32 2011 -0700

    remove extra references to state_description

 bin/nova-manage                                   |    6 +++---
 nova/api/ec2/admin.py                             |    5 ++---
 nova/api/openstack/contrib/simple_tenant_usage.py |    2 +-
 nova/tests/test_libvirt.py                        |   10 ++++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

commit 83a56a247cf026e4782b430c611adc2fc4158835
Merge: 0972283 12ebed3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 19:19:38 2011 +0000

    pull-up from trunk

commit 0972283db75f9fe3cb53dd029633879c7afb793b
Merge: 2cf0b67 dd5eeaf
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 19:19:19 2011 +0000

    merge unit test from Chris MacGown

commit dd5eeafbfe1013fd9acdb119933cb5bf986706e6
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Thu Sep 1 12:05:21 2011 -0700

    Adds test for image.glance.GlanceImageService._is_image_available

 nova/tests/image/test_glance.py |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit dbd5acd2ba6bc9853f165d457eaf6abe7559a92e
Merge: 12ebed3 9b3a6c8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 17:54:52 2011 +0000

    - implements changes-since for servers resource
    - default sort is now created_at desc for instances

commit 35c4cecc8d29da32bd816bb68f8b45c2d03f892f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 09:42:44 2011 -0700

    undo change in setting q_tenant_id in quantum_manager.create_network

 nova/network/quantum/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5b3b3d1b357c085c2088df7d76df8392118fb82e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 09:39:36 2011 -0700

    additional review cleanup

 .mailmap                                   |    2 +-
 nova/network/quantum/client.py             |   12 ++++++++----
 nova/network/quantum/fake.py               |   10 ++++++----
 nova/network/quantum/manager.py            |    2 +-
 nova/network/quantum/melange_connection.py |    4 +++-
 nova/network/quantum/melange_ipam_lib.py   |    3 ++-
 nova/network/quantum/nova_ipam_lib.py      |    2 +-
 nova/network/quantum/quantum_connection.py |    8 ++++----
 nova/tests/test_quantum.py                 |   21 +++++++++++----------
 9 files changed, 37 insertions(+), 27 deletions(-)

commit 26e581ac03336182a44f2a411f28da36beef0f89
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 11:40:44 2011 -0400

    docstring cleanup

 nova/tests/image/test_glance.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 9b3a6c8cda99290f0b7aff740faec0e8544aafe0
Merge: 1c6d74a 17de95f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 11:08:41 2011 -0400

    merging trunk

commit 12ebed39bba39b4207344b90ec26323d4c251958
Merge: 17de95f 470b9dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 1 14:02:02 2011 +0000

    Fixes NotFound exceptions to show the proper instance id in the ec2 api.

commit 76a60bf27cc8864e397139a3497b1f571ce38d88
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:42:24 2011 -0700

    typo

 nova/network/quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 02093fbe185e52a3c22b748811e60e988150a352
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:37:26 2011 -0700

    more review cleanup

 nova/network/quantum/manager.py       |   16 ++++++++--------
 nova/network/quantum/nova_ipam_lib.py |    8 +++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

commit 90529a272a71c9b2c56378005b69b0332389ed7c
Merge: 3ae639e f4dc231
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:14:49 2011 -0700

    another commit from brad

commit 3ae639e5acd965999138e307508933ae1624b476
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:12:09 2011 -0700

    add specific exceptions for quantum client.  Fix doc-strings in client.py

 nova/network/quantum/client.py             |   93 +++++++++++++---------------
 nova/network/quantum/quantum_connection.py |    7 +--
 2 files changed, 46 insertions(+), 54 deletions(-)

commit 015670a9d3ebbf39e7cc9d475c3517f43adf905b
Merge: bb4f712 551b4b1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 22:43:46 2011 -0700

    merge brad's changes that address most review feedback

commit 17de95f0c2b6431a4ae5bf39beb4d3cee2f843b2
Merge: ab00393 fdf076a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Sep 1 05:37:27 2011 +0000

    fix for lp838583 - fixes bug in os-floating-ips view code that prevents instance_id from being returned for associated addresses.

commit ab00393da6ab61db1952b6826ea806b66ca6cc29
Merge: e0e9807 6180df0
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Sep 1 05:22:15 2011 +0000

    Accept keypair when you launch a new server. These properties would be stored along with the other server properties in the database (like they are currently for ec2 api).

commit 7be0e4cd371691253aa332c2c180be1a83f7f98b
Author: Launchpad Translations on behalf of nova-core <>
Date:   Thu Sep 1 05:02:30 2011 +0000

    Launchpad automatic translations update.

 po/pt_BR.po |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd
Merge: 642c9ce e0e9807
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 21:55:12 2011 -0700

    merge trunk, fix tests

commit fdf076a04e001b897d01b2a8c4a9e3c980ea8f94
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 21:34:10 2011 -0700

    fix for lp838583 - return instance_id for associated floating_ips, add test

 nova/api/openstack/contrib/floating_ips.py         |    6 +++---
 .../api/openstack/contrib/test_floating_ips.py     |   21 ++++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

commit b63b6d896917af60fcc1b76b22cb912faab3c1c3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:26:18 2011 -0400

    removing unnecessary imports

 nova/tests/api/openstack/test_images.py |    6 ------
 1 file changed, 6 deletions(-)

commit 69aeb326d6da85a3b0566d973588eab6668ffa36
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:13:21 2011 -0400

    remove BaseImageService

 nova/api/ec2/cloud.py |    2 +-
 nova/image/fake.py    |    3 +-
 nova/image/s3.py      |    2 +-
 nova/image/service.py |  200 -------------------------------------------------
 4 files changed, 3 insertions(+), 204 deletions(-)

commit 62e2ad123685ab01accfb9988013225fe377dfbe
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:07:07 2011 -0400

    pep8

 nova/image/glance.py            |    1 -
 nova/tests/image/test_glance.py |    5 -----
 2 files changed, 6 deletions(-)

commit 13c74c252b0b7f900cde6a09201ea01c389f73a8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 22:43:26 2011 -0400

    move GlanceImageService tests to proper module; remove translation of non-standard image attributes to properties; ensure all image properties are available, defaulting to None if not provided

 nova/api/openstack/images.py            |    2 +-
 nova/image/glance.py                    |   60 ++++--
 nova/tests/api/openstack/test_images.py |  279 +--------------------------
 nova/tests/image/test_glance.py         |  318 ++++++++++++++++++++++++++++++-
 4 files changed, 363 insertions(+), 296 deletions(-)

commit b4b03e0beb873a0f4853f0da6a64b9bb388d73e8
Merge: ced3ea3 e0e9807
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 19:28:57 2011 -0700

    merge trunk

commit f4dc231069c530f8f6055b1b7fa006750795b6e4
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 31 18:54:15 2011 -0700

    Add comment for an uncommon failure case that we need to fix

 nova/network/quantum/manager.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 20beec509aff1bb3a30e9f1d95d3e2825f2b38ea
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 31 17:30:11 2011 -0700

    Fix for LP Bug #838466

 nova/compute/api.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit e0e98075fc520428033e7ebd11eb68d37a4ca5c8
Merge: 65231ec a87a0bb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 00:26:55 2011 +0000

    Correctly yield images from glance client through image service.

commit 65231ec1b9296bb26544d414e3033c9058ba07b7
Merge: 3bc7a44 0f83de8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 1 00:16:34 2011 +0000

    Simple usage extension for nova.  Uses db to calculate tenant_usage for specified time periods.
    
    Methods:
        * index: return a list of tenant_usages, with option of incuding detailed server_usage
        * show: returns a specific tenant_usage object
    
    tenant_usage object:
        * tenant_usage.total_memory_mb_usage: sum of memory_mb * hours for all instances in tenant for this period
        * tenant_usage.total_local_gb_usage: sum of local_gb * hours for all instances in tenant for this period
        * tenant_usage.total_vcpus_usage: sum of vcpus * hours for all instances in tenant for this period
        * tenant_usage.total_hours: sum of all instance hours for this period
        * tenant_usage.server_usages: A detailed list of server_usages, which describe the usage of a specific server
    
    For larger instances db tables, indexes on instance.launched_at and instance.terminated_at should significantly help performance.

commit e1cd8f036f34fc622416e74a302959c9e50a798c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 31 17:06:15 2011 -0700

    Fix for LP Bug #838251

 nova/api/ec2/cloud.py                         |   12 ++----------
 nova/api/openstack/contrib/createserverext.py |   24 +++++++++++++++++++-----
 nova/api/openstack/servers.py                 |   18 ++++++++++++++++++
 nova/utils.py                                 |    9 +++++++++
 4 files changed, 48 insertions(+), 15 deletions(-)

commit 0f83de82b93d714be6df16b7f151141ab3f4d987
Merge: bd917fe 3bc7a44
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 17:01:19 2011 -0700

    merge trunk, fix conflict

commit 3bc7a44dad3233595beb20b63204f16f1cb4376e
Merge: 3fa7bf7 476101d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 31 23:50:08 2011 +0000

    Validates that user-data is b64 encoded.

commit d99588a4caf855f3876ea83fa0d8517a77727aef
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 19:32:55 2011 -0400

    Updated VersionsAtomSerializer.index to use lxml.etree to generate atom feed.

 nova/api/openstack/versions.py |  102 ++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 57 deletions(-)

commit bd917feb287a3d0e8f2f9f9c60b716c7f599f4ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 16:13:55 2011 -0700

    remove extra test

 nova/tests/api/openstack/test_server_actions.py |   13 -------------
 1 file changed, 13 deletions(-)

commit 4b8e3dd48e74e70514c6cc722489b0b0ec98dd52
Merge: 5cf27b5 3fa7bf7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 16:07:29 2011 -0700

    merged trunk

commit 3fa7bf7cc4dece3662cf31e8fb0b6daa7df54f8b
Merge: 32f639a c9a6681
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 31 22:55:34 2011 +0000

    Fixed and improved the way instance "states" are set. Instead of relying on solely the power_state of a VM, there are now explicitly defined VM states and VM task states which respectively define the current state of the VM and the task which is currently being performed by the VM.

commit 162f1750344a4e1812a15ec132fefd6e1fd47ca5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 18:38:55 2011 -0400

    Updating test for <choices> xml to use lxml.

 nova/tests/api/openstack/test_versions.py |   61 +++++++++++++++--------------
 1 file changed, 32 insertions(+), 29 deletions(-)

commit 642c9ceb1bae9fa5ba008cb69c47f449ea173c3a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 15:24:29 2011 -0700

    expect key_name attribute in 1.1

 nova/tests/api/openstack/test_servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit 9de8a589b4ee0e007267efe2394b504382e4cdc1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 14:58:55 2011 -0700

    change to use _get_key_name to retrieve the key

 nova/api/openstack/servers.py |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit 32f639aa6a6d017b234987757d7db1a3600009d8
Merge: 20f674a ba8163f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 31 21:15:00 2011 +0000

    Implements lp:798876 which is 'switch carrot to kombu'.  Leaves carrot as the default for now... decision will be made later to switch the default to kombu after further testing.  There's a lot of code duplication between carrot and kombu, but I left it that way in preparation for ripping carrot out later and to keep minimal changes to carrot.
    
    This also fixes bug: lp:794627 (re-establish connections to carrot when it restarts), but only fixes it in kombu.
    This also fixes bug: lp:803168 (msg-id response queues being left around), but also only fixes it in kombu.
    
    See those bugs for comments.

commit 20f674a5c0903b563e43a37e11bfacc81804b96f
Merge: 964bf2f f687e97
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 21:05:11 2011 +0000

    Disassociated previously associated floating ips when calling network_api.associate_floating_ip.  Also guard against double-association in the network.manager.

commit a87a0bba9c7b046b36ee80bc033df5499cca35e1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 17:05:01 2011 -0400

    adding support for limiting in image service; updating tests with fixture ids and marker support

 nova/image/glance.py            |    9 +++++++++
 nova/tests/image/test_glance.py |   29 ++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

commit bee6b35db1828c973b1c9578136d3e91354a613a
Merge: 156430b 964bf2f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 31 15:53:56 2011 -0500

    trunk merge

commit 6d206c85968ade7413191b2deeb4be0e2ae1a9b7
Merge: 615e17e 964bf2f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 16:03:25 2011 -0400

    merging trunk

commit c9758dd4832c167562baefad5dcc88f2a1a19b73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 12:51:16 2011 -0700

    fix keypairs stubs

 nova/api/openstack/create_instance_helper.py |    1 +
 nova/tests/api/openstack/fakes.py            |    7 +++++++
 2 files changed, 8 insertions(+)

commit f687e978a41c78e10e0c371c5486298925b5857f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 12:44:15 2011 -0700

    add explicit message for NoMoreFloatingIps exception

 nova/api/openstack/contrib/floating_ips.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ced3ea3e8d7cf02f988d968d6078182815226719
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 12:23:43 2011 -0700

    fix for chris behrens' comment - move tenant_id => project_id mapping to compute.api.get_all

 nova/api/openstack/servers.py            |    5 -----
 nova/compute/api.py                      |    1 +
 nova/tests/api/openstack/test_servers.py |   11 ++++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

commit abd6b240b5247a2981e86c1d3161306fb2b4c4c5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 12:02:14 2011 -0700

    moved key_name per review

 nova/api/openstack/views/servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 6b67b2f391830da52dea5cd84bd564bab692f365
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Aug 31 11:54:30 2011 -0700

    zone_add fixed to support zone name

 nova/api/openstack/zones.py  |    2 +-
 nova/db/sqlalchemy/models.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit ba8163fed57bcd1948be4cfb021fb32391702cc5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 31 11:54:19 2011 -0700

    kludge for kombu 1.1.3 memory transport bug

 nova/rpc/impl_kombu.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit c1d71294a1fc2f65089b5e539f9b610668e03b2f
Merge: 19cb367 964bf2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 11:51:19 2011 -0700

    merged trunk

commit c9a6681f484f38778987fbbaa352d07bd8f747c3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 31 10:14:07 2011 -0400

    Removed extraneous import and s/vm_state.STOP/vm_states.STOPPED/

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c490b7531edc5f87210c719149d663000e69a0ce
Merge: fdbb12e 964bf2f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 31 10:05:22 2011 -0400

    Merged trunk.

commit 13d68b59833f55d69497a0f5ac5ec8904af9ab0a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 03:40:42 2011 -0400

    Code cleanup.

 nova/tests/api/openstack/test_versions.py |   94 ++++++++++++++---------------
 1 file changed, 46 insertions(+), 48 deletions(-)

commit 9e3fd76a2f7d55ef111631e6ffac5575a6dd4817
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 02:35:01 2011 -0400

    Use feedparser to parse the generated atom feeds in the tests for the versions
    resource.

 nova/tests/api/openstack/test_versions.py |  374 +++++++++++++----------------
 1 file changed, 167 insertions(+), 207 deletions(-)

commit 1477b8c33374db1166c6c67ff68e03c94f3436a5
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 30 21:16:26 2011 -0700

    add test to verify 400 response when out of addresses

 nova/api/openstack/contrib/floating_ips.py         |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |   18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

commit e43ffb5137ba256a21b3241b549d7c66cb7e5e04
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 21:05:43 2011 -0700

    switched default to kombu per vishy

 nova/rpc/__init__.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b7c98734f8829fb4b213869bdfca6481fbeab98e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 20:53:27 2011 -0700

    use kombu.connection.BrokerConnection vs kombu.connection.Connection so that older versions of kombu (1.0.4) work as well as newer.

 nova/rpc/impl_kombu.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66aa9a6306cde5db2039daaf11a8422619560a33
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 30 20:45:51 2011 -0700

    fix FloatingIpAlreadyInUse to use correct string pattern, convert ApiErrors to 400 responses

 nova/api/openstack/contrib/floating_ips.py         |    6 +++-
 nova/exception.py                                  |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |   32 ++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

commit 0a5365bd2a324ce3485f58e39365354ff39bfb7e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 17:57:05 2011 -0700

    Fix for LP Bug #782364

 nova/network/linux_net.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 048c7fe5b0f38a675a8540228add59e24737e674
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 16:32:46 2011 -0700

    Fix for LP Bug #782364

 nova/network/linux_net.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 964bf2f246eddd31eb49fde1c589ccdc55d8f45b
Merge: 0362f35 024b76a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Aug 30 23:22:08 2011 +0000

    more logging info to help identify bad payloads

commit 0362f35fe8f1504a191118083f6a211d272bf715
Merge: 056832e 8292b56
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 30 23:06:29 2011 +0000

    Removed test_parallel_builds in the XenAPI tests due to it frequently hanging indefinitely.

commit 2e12e975ee9d4ab7a17eebb0e36714b56d6b1779
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 15:52:25 2011 -0700

    logging change when rpc pool creates new connection

 nova/rpc/impl_carrot.py |    2 +-
 nova/rpc/impl_kombu.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 5ccbce699880557f9c58d4d403487979d3604ccf
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 15:30:16 2011 -0700

    pep8 fix

 nova/rpc/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit 4ec4ddd2e6465f0483ecf50d430458169ad4c348
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 15:12:43 2011 -0700

    make default carrot again and delay the import in rpc/__init__.py

 nova/rpc/__init__.py |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 476101d81cf81e6035b44e2257c1bcd8e958043a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 15:09:08 2011 -0700

    Removed debug messages

 .../api/openstack/contrib/test_createserverext.py  |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit e326acf46748904704dd97f511927559dc2480f2
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 15:05:39 2011 -0700

    Fix for LP Bug #837534

 nova/api/openstack/create_instance_helper.py       |   13 ++++++
 .../api/openstack/contrib/test_createserverext.py  |   46 +++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

commit b6c306b1a207fd2c5ee2e53d841fd8e60c2fd8e1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 13:55:06 2011 -0700

    add kombu to pip-requires and contrib/nova.sh

 contrib/nova.sh    |    2 +-
 tools/pip-requires |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 4f65e0153c22886b118bdb92402b91d9b209632c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 13:53:01 2011 -0700

    restore old way FLAGS.rpc_backend worked..  no short name support for consistency

 nova/rpc/__init__.py |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

commit 5cf27b5a338f7821f82c91df5889159b56fa0bb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:41:30 2011 -0700

    fix remaining tests

 nova/api/openstack/contrib/simple_tenant_usage.py  |    2 +-
 nova/compute/api.py                                |    2 +-
 .../api/openstack/contrib/test_security_groups.py  |   72 ++++++++++----------
 nova/tests/api/openstack/test_extensions.py        |    1 +
 nova/tests/api/openstack/test_server_actions.py    |    2 +-
 5 files changed, 40 insertions(+), 39 deletions(-)

commit 056832ea04728d387ebbb5d9b2abfe4838b9431d
Merge: 2a2aa10 ebd47b7
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 30 19:27:30 2011 +0000

    Update RequestContext so that it correctly sets self.is_admin from the roles array. Additionally add a bit of code to ignore case as well.
    
    Resolves issues when accessing admin API's w/ Keystone.

commit 2fcc6da8ba528c5169f7394d57f90ccd2754a23c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:14:25 2011 -0700

    pep8, fix fakes

 nova/api/openstack/contrib/simple_tenant_usage.py  |    1 +
 nova/compute/api.py                                |   12 ++++++------
 .../api/openstack/contrib/test_createserverext.py  |    2 ++
 .../openstack/contrib/test_simple_tenant_usage.py  |    2 +-
 nova/tests/api/openstack/test_servers.py           |    1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

commit 85e182e72d8f15678234701f6b254bf6c8e17f3a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:08:53 2011 -0700

    fix a bunch of direct usages of db in compute api

 nova/compute/api.py |   52 ++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

commit dcf5970dd9bed27201c593d7d053970a632e5eee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:01:18 2011 -0700

    make two functions instead of fast flag and add compute api commands instead of hitting db directly

 bin/instance-usage-audit                           |    5 ++-
 nova/api/openstack/contrib/simple_tenant_usage.py  |   14 ++++----
 nova/compute/api.py                                |   17 ++++++---
 nova/db/api.py                                     |   16 ++++++---
 nova/db/sqlalchemy/api.py                          |   36 ++++++++++++++------
 .../openstack/contrib/test_simple_tenant_usage.py  |   10 +++---
 6 files changed, 62 insertions(+), 36 deletions(-)

commit 615e17eac9663b7909dfa6f70e6327d099774e20
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:54:24 2011 -0400

    fixing bug

commit 09fd29a9cc29904679cc8921adaf7559c23f347f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:52:23 2011 -0400

    fixing short-ciruit condition

 nova/image/glance.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 980ae6aa2f3797e428beee6e383d8bd134175734
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:48:02 2011 -0400

    yielding all the images

 nova/image/glance.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 30a1d84529cfc093b1652ac9bb72871f8bc3ce36
Merge: 400427a 2a2aa10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 11:12:38 2011 -0700

    merged trunk

commit 1c6d74a08dbb5b472e85e3d3a1fe2b3b8b9b89e3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 12:51:02 2011 -0400

    changing default sort to created_at

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8db401156cdb842ef7bf15e44e34ac5ae672e46
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Tue Aug 30 18:27:48 2011 +0200

    The exception 'RamdiskNotFoundForImage' is no longer used.

 nova/exception.py |    4 ----
 1 file changed, 4 deletions(-)

commit b515d427e05010ba5a984dd549cb6418629de50d
Author: Thuleau Édouard <edouard1.thuleau@orange.com>
Date:   Tue Aug 30 18:18:23 2011 +0200

    With OS API, if the property 'ramdisk_id' isn't set on the AMI image, Nova can not instantiate it.
    With EC2 API, the AMI image can be instantiate.

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a127747db0ab3405a768e8f680a2eb94ae8ce314
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 11:44:19 2011 -0400

    adding an assert

 nova/tests/api/openstack/test_servers.py |    1 +
 1 file changed, 1 insertion(+)

commit edc43980ff56777e8200022f888c7170ca9baaea
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Aug 30 11:26:59 2011 -0400

    Use getCapabilities rather than getInfo() since some versions of libvirt dont provide dmi information

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1155b734164eb5856d68c926f7bf64a37ae4a3a4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 11:13:25 2011 -0400

    supporting changes-since

 nova/api/openstack/servers.py            |   24 +++++++++++++-----------
 nova/db/sqlalchemy/api.py                |   12 ++++++++----
 nova/tests/api/openstack/test_servers.py |   24 ++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 15 deletions(-)

commit fdbb12e1e4b0b2cc28344510afb1c57620240901
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 30 10:42:51 2011 -0400

    Fix a bad merge on my part, this fixes rebuilds\!

 nova/compute/manager.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit a635027ddbeb73dfad8bbf2890f67cb1ed7511bf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 30 00:03:39 2011 -0700

    disassociate floating ips before re-associating, and prevent re-association of already associated floating ips in manager

 nova/exception.py                                  |    4 ++
 nova/network/api.py                                |    6 ++
 nova/network/manager.py                            |    7 ++
 .../api/openstack/contrib/test_floating_ips.py     |   68 ++++++++++++++++++--
 nova/tests/test_network.py                         |   16 +++++
 5 files changed, 96 insertions(+), 5 deletions(-)

commit ebd47b7cb397f33c1e7c9f32dd5b77f7fd5d6642
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 29 22:27:28 2011 -0400

    Update RequestContext so that it correctly sets self.is_admin from the
    roles array. Additionally add a bit of code to ignore case as well.
    
    Resolves issues when accessing admin API's w/ Keystone.

 nova/context.py            |    2 +-
 nova/tests/test_context.py |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 5fe31539102d4c2c7b58363c55b6f242d4c120f9
Merge: 7343549 2a2aa10
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 18:31:15 2011 -0400

    Merged trunk.

commit 8965e567ce25e6b9718f1bca60b35f586bab985f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:26:26 2011 -0700

    remove unneeded connection= in carrot Consumer init

 nova/rpc/impl_carrot.py |    1 -
 1 file changed, 1 deletion(-)

commit 345afb31678a1f94fcca6d63a4ab506e537c3a9c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:25:54 2011 -0700

    pep8 fix for test_rpc_common.py

 nova/tests/test_rpc_common.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 468ed475207b023cfa3eada48338d34375f55be2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:15:58 2011 -0700

    fix ajax console proxy for new create_consumer method

 bin/nova-ajax-console-proxy |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit db27d93bc195598a5dd0e7a35480281447cf4ea1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:08:32 2011 -0700

    doc string cleanup

 nova/rpc/impl_kombu.py |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

commit a16efa7b94a15040657b961b0fd29a4d2720ef21
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 14:54:20 2011 -0700

    created nova/tests/test_rpc_common.py which contains a rpc test base class so we can share tests between the rpc implementations

 nova/tests/test_rpc.py        |  157 +---------------------------------
 nova/tests/test_rpc_carrot.py |  169 ++----------------------------------
 nova/tests/test_rpc_common.py |  188 +++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_rpc_kombu.py  |  172 +++----------------------------------
 4 files changed, 211 insertions(+), 475 deletions(-)

commit ee15f2a58217d522e23d811db4958e2e9b2338d6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 14:36:12 2011 -0700

    ditched rpc.create_consumer(conn) interface... instead you now do conn.create_consumer(..

 nova/rpc/__init__.py          |    6 +----
 nova/rpc/impl_carrot.py       |   29 +++++++++++-----------
 nova/rpc/impl_kombu.py        |   55 ++++++++++++++++++++---------------------
 nova/service.py               |    8 +++---
 nova/tests/test_rpc.py        |   10 ++------
 nova/tests/test_rpc_carrot.py |   10 ++------
 nova/tests/test_rpc_kombu.py  |   10 ++------
 nova/tests/test_test.py       |    3 +--
 8 files changed, 52 insertions(+), 79 deletions(-)

commit 2a2aa10316abe9135541198bddd4c189976eb2fd
Merge: cff35e4 6b6de43
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 29 18:36:30 2011 +0000

    Update the EC2 ToToken middleware to use eventlet.green.httplib instead of httplib2. Fixes issues where the JSON request body wasn't getting sent to Keystone.

commit bb4f7129e945602a8e830520e7877a33b2539530
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 11:04:27 2011 -0700

    remove brackets from mailmap entry

 .mailmap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e8e39160d1329f4923334fa822310d266651907
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 10:43:26 2011 -0700

    access db directly in networkmanagers's delete_network method, so stubbed test call works correctly

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 024b76a8df5c96d37dea0a05f66dfe4628a64a28
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 29 10:27:25 2011 -0700

    more logging info to help identify bad payloads

 nova/notifier/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cff35e4bc169d3d011aa3b32f3812ec21455b365
Merge: e103b1c c35086c
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 29 17:11:41 2011 +0000

    In the XenAPI simulator, set VM.domid, when creating the instance initially,
    and when starting the VM.
    
    This shows up in the logs for Bug #831599, but this fix doesn't actually
    fix the hang.

commit 6d8663a887a1241b1c3136626e7b915be860273b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 09:04:43 2011 -0700

    remove 'uuid' param for nova-manage network delete that I had add previously

 bin/nova-manage |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit dc129eeb96a0a201fb3d032078eaf8ab192ca207
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 09:03:56 2011 -0700

    add alias to mailmap

 .mailmap |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ed1399b5a4a023b606263b5464dfe684e460a126
Author: danwent@gmail.com <>
Date:   Mon Aug 29 08:33:12 2011 -0700

    update file name for db migrate script after merge (again)

 .../versions/043_add_network_priority.py           |   44 --------------------
 .../versions/044_add_network_priority.py           |   44 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)

commit 81d30e900d3329f40bfd05682b73e73951c435ca
Author: danwent@gmail.com <>
Date:   Mon Aug 29 08:31:56 2011 -0700

    update file name for db migrate script after merge

 .../versions/041_add_network_priority.py           |   44 --------------------
 .../versions/043_add_network_priority.py           |   44 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)

commit c0775bfd7d6f2b21b95e459e4c78c5ed9b445efe
Merge: 25cd526 e103b1c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 08:07:34 2011 -0700

    merged trunk

commit 8292b56f9710dd3448f8424faa6ffd85b2aa9f8f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 10:14:45 2011 -0400

    Fixes this bug by removing the test. The test has no asserts and seems to be raising more problems than it could solve.

commit 0972d9188b0b73fa357f75896ab3bebda9a2a9de
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 10:13:39 2011 -0400

    Removed test_parallel_builds

 nova/tests/test_xenapi.py |   37 -------------------------------------
 1 file changed, 37 deletions(-)

commit 734354980d7f205d613a13110654abd81219a200
Merge: 39ca3df e103b1c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 09:45:41 2011 -0400

    Merged trunk.

commit 39ca3df042bd3fa9a8ae2bf97d9383be7360d900
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 09:45:00 2011 -0400

    Increased migration number.

 .../versions/043_update_instance_states.py         |  138 --------------------
 .../versions/044_update_instance_states.py         |  138 ++++++++++++++++++++
 2 files changed, 138 insertions(+), 138 deletions(-)

commit e103b1c471d1f507075542b795d8620a89132de9
Merge: 49af6fa 392b2ca
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 12:46:12 2011 +0000

    Fixes lp:813864 by removing the broken assert.  The assert was a check for isinstance of 'int' that should have been 'long'.  But it doesn't appear this assert really belongs, anyway.

commit 4ef1d00d355dd21f23b78aebe6dc4feae667072c
Merge: b846d22 49af6fa
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 08:34:40 2011 -0400

    Merged trunk.

commit 49af6fa8e07b566237e6b80244ffe117568957d5
Merge: 0ef2581 8bfa5e2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 09:06:13 2011 +0000

    Adds assertIn and assertNotIn support to TestCase for compatibility with python 2.6
    This is a very minimal addition which doesn't require unittest2.

commit 8bfa5e23e90279dfdbef3e38fca810ccca540513
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 01:13:08 2011 -0700

    support the extra optional arguments for msg to assertIn and assertNotIn

 nova/test.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 392b2cae41ad35715940544a976edc0b9edadf9c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 00:50:17 2011 -0700

    removed broken assert for abstract_scheduler

 nova/scheduler/abstract_scheduler.py |    1 -
 1 file changed, 1 deletion(-)

commit 25cd526a72a98f184ed57fc85e7be2997305ce31
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 00:12:30 2011 -0700

    pep8 fixes

 nova/flags.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 599467124e812eb8ae73eb7a9af3fea71ee25157
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 23:39:43 2011 -0700

    fix for assertIn and assertNotIn use which was added in python 2.7.  this makes things work on 2.6 still

 nova/test.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit a4bd14f86f31ea82daad8e194b26e86e6dd37398
Merge: 605fe4f 0ef2581
Author: danwent@gmail.com <>
Date:   Sun Aug 28 20:06:55 2011 -0700

    merge trunk

commit 605fe4f19af3af830a2a8c82809e9ce5909c602d
Author: danwent@gmail.com <>
Date:   Sun Aug 28 20:00:38 2011 -0700

    restore fixed_ip_associate_pool in nova/db/sqlalchemy.py to its original form before this branch.  Figured out how to make unit tests pass without requiring that this function changes

 nova/db/sqlalchemy/api.py  |    4 +++-
 nova/tests/test_quantum.py |   11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 53f796e0cfcec9d5c56dca86ee3c185625917dca
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 19:27:49 2011 -0700

    remove unused rpc connections in test_cloud and test_adminapi

 nova/tests/test_adminapi.py |    2 --
 nova/tests/test_cloud.py    |    2 --
 2 files changed, 4 deletions(-)

commit 4c2e9ae35b22e7ef2e3fdd20ed72bac115510ada
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 19:23:31 2011 -0700

    carrot consumer thread fix

 nova/rpc/impl_carrot.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6fbb35d596f670d6dcdda2486a12fc09ef9be853
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 19:22:53 2011 -0700

    add carrot/kombu tests... small thread fix for kombu

 nova/rpc/__init__.py          |    4 +-
 nova/rpc/common.py            |    6 +
 nova/rpc/impl_carrot.py       |    4 -
 nova/rpc/impl_kombu.py        |   12 +-
 nova/tests/test_rpc_amqp.py   |   88 --------------
 nova/tests/test_rpc_carrot.py |  202 +++++++++++++++++++++++++++++++
 nova/tests/test_rpc_kombu.py  |  266 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 481 insertions(+), 101 deletions(-)

commit 716303049eaee59841ca4679d73ecb4e5be52cfd
Author: danwent@gmail.com <>
Date:   Sun Aug 28 19:13:02 2011 -0700

    add doc-strings for all major modules

 nova/network/quantum/manager.py            |   97 ++++++++++++++++++++++++----
 nova/network/quantum/melange_ipam_lib.py   |   81 ++++++++++++++++-------
 nova/network/quantum/nova_ipam_lib.py      |   85 +++++++++++++++++-------
 nova/network/quantum/quantum_connection.py |   28 +++++++-
 4 files changed, 226 insertions(+), 65 deletions(-)

commit 822d92ed1f6a5f2f0951c5e43be6ce0c8fb75e65
Author: danwent@gmail.com <>
Date:   Sun Aug 28 19:12:43 2011 -0700

    remove fake IPAM lib, since qmanager must now access nova DB directly

 nova/network/quantum/fake.py |  124 ------------------------------------------
 nova/tests/test_quantum.py   |    8 ---
 2 files changed, 132 deletions(-)

commit 6b6de435efb83fc88c885c459fb70c46c646be84
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Aug 28 22:02:43 2011 -0400

    Update the EC2 ToToken middleware to use eventlet.green.httplib instead
    of httplib2. Fixes issues where the JSON request body wasn't getting sent
    to Keystone.

 nova/api/ec2/__init__.py |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

commit da11af2893719677a9113ce391d37b0dada6585c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:19:41 2011 -0700

    fix nova/tests/test_test.py

 nova/tests/test_test.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e5310d666f167efe6e3c9f97176d13801489fdfd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:18:40 2011 -0700

    fix nova-ajax-console-proxy

 bin/nova-ajax-console-proxy |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 32943729861ba4ad562e899a55af77b7974af8db
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:17:21 2011 -0700

    fix test_rpc and kombu stuff

 nova/rpc/FIXME          |    2 --
 nova/rpc/__init__.py    |    7 +-----
 nova/rpc/impl_carrot.py |   56 +++++++++++++++++++++++++++++++++++++++--------
 nova/rpc/impl_kombu.py  |   21 +++++++++++++-----
 nova/tests/test_rpc.py  |   25 ++++++++++++---------
 5 files changed, 79 insertions(+), 32 deletions(-)

commit 431cd5d17780aa7ea9d03b028a78ec4e20b22440
Author: danwent@gmail.com <>
Date:   Sun Aug 28 17:37:07 2011 -0700

    always set network_id in virtual_interfaces table, otherwise API commands that show IP addresses get confused

 nova/network/quantum/manager.py          |   24 +++++++++++++++++++-----
 nova/network/quantum/melange_ipam_lib.py |   11 ++++++++---
 nova/network/quantum/nova_ipam_lib.py    |    2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

commit 256cb956abeff85f3cddce499b488dd112c4137d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 17:33:11 2011 -0700

    start to rework some consumer stuff

 nova/rpc/impl_kombu.py |  127 +++++++++++++++++++++++++++++-------------------
 nova/service.py        |   24 ++-------
 2 files changed, 81 insertions(+), 70 deletions(-)

commit 56891283f117997042363aee2e3ce00a5a12d9e0
Author: danwent@gmail.com <>
Date:   Sun Aug 28 15:39:27 2011 -0700

    update melange ipam lib to use network uuid, not bridge

 nova/network/quantum/melange_ipam_lib.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 1bfc7ce80c3936a19434dfc45c44f8a1acfd65ed
Author: danwent@gmail.com <>
Date:   Sun Aug 28 12:53:32 2011 -0700

    fix issue with setting 'Active' caused by Quantum API changes.  Other misc fixes

 nova/network/quantum/quantum_connection.py |    6 +++---
 nova/virt/libvirt/vif.py                   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 0ef2581749f39fa4fd41c2376186418e730f0afb
Merge: de05bf0 07cbdbe
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 28 19:41:22 2011 +0000

    Bug #835952: pep8 failures do not cause the tests to fail
    
    Add set -eu to run_tests.sh.  This will cause it to fail whenever anything
    goes wrong, which is exactly what we want in a test script.
    
    To do this, I had to remove the use of the "let" keyword, which has a bizarre
    exit status in bash.
    
    I also removed the "|| exit" after run_tests, which means that this script
    will now exit with status 1, not status 0, if run_tests fails.

commit c35086ca2d2ac1a519442217bf89c0572b28053b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 29 00:41:14 2011 +0530

    Start domid's at 1, not 0, to avoid any confusion with dom0.

 nova/tests/xenapi/stubs.py |    4 ++--
 nova/virt/xenapi/fake.py   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit d5b489383710605b10067550417a4e62a5f4f3e1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Aug 28 11:37:19 2011 -0700

    use 'uuid' field in networks table rather than 'bridge'.  Specify project_id when creating instance in unit test

 bin/nova-manage                       |   16 +++++++++++-----
 nova/db/api.py                        |    5 +++++
 nova/db/sqlalchemy/api.py             |   13 +++++++++++++
 nova/exception.py                     |    4 ++++
 nova/network/quantum/manager.py       |    5 +++--
 nova/network/quantum/nova_ipam_lib.py |   30 +++++++++++++++++-------------
 nova/tests/test_quantum.py            |    6 ++++--
 7 files changed, 57 insertions(+), 22 deletions(-)

commit de05bf07a69f07871e3c6d3e2d87ed8be178754c
Merge: 2a2672f 75c7c84
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 28 18:11:36 2011 +0000

    Bug #835964: pep8 violations in IPv6 code
    
    Fix pep8 violations.

commit 17c0a1aad98effa4554a9083b35185f2d430d81f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 28 23:40:09 2011 +0530

    In the XenAPI simulator, set VM.domid, when creating the instance initially,
    and when starting the VM.
    
    This shows up in the logs for Bug #831599, but this fix doesn't actually
    fix the hang.

 nova/tests/xenapi/stubs.py |    4 ++++
 nova/virt/xenapi/fake.py   |    3 +++
 2 files changed, 7 insertions(+)

commit 07cbdbedcab3e796f330e21b1ffe407bd646ae67
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 28 16:19:55 2011 +0530

    Bug #835952: pep8 failures do not cause the tests to fail
    
    Add set -eu to run_tests.sh.  This will cause it to fail whenever anything
    goes wrong, which is exactly what we want in a test script.
    
    To do this, I had to remove the use of the "let" keyword, which has a bizarre
    exit status in bash.
    
    I also removed the "|| exit" after run_tests, which means that this script
    will now exit with status 1, not status 0, if run_tests fails.

 run_tests.sh |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 75c7c841379341c63598850e4676f2146d63334a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 28 16:17:17 2011 +0530

    Bug #835964: pep8 violations in IPv6 code
    
    Fix pep8 violations.

 nova/ipv6/account_identifier.py |    3 ++-
 nova/tests/test_ipv6.py         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 2a2672f92eacdde70cde3b105b36927d934bbd49
Merge: 4884e19 209334e
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Aug 28 04:38:21 2011 +0000

    Virtual Storage Array (VSA) feature.
    - new Virtual Storage Array (VSA) objects / OS API extensions / APIs / CLIs
    - new schedulers for selecting nodes with particular volume capabilities
    - new special volume driver
    - report volume capabilities
    - some fixes for volume types

commit 4faaf9c37d030d68cfea818d396963e3ed7deeaa
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Aug 27 21:33:14 2011 -0700

    fix FALGS typo

 nova/rpc/impl_carrot.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4884e19c55fe2ea4d1596bba309d4bf7747fe7db
Merge: 9cef606 8bd8103
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Sun Aug 28 04:28:41 2011 +0000

    changes a few double quotes to be single, as the rest in the vicinity are

commit 3a4ee30de0f619b7046e90ce9b6978e3a6dd20a2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Aug 27 14:07:55 2011 -0700

    Default rabbit max_retries to forever
    Modify carrot code to handle retry backoffs and obey max_retries = forever
    Fix some kombu issues from cut-n-paste
    Service should make sure to close the RPC connection

 nova/flags.py           |    6 +++---
 nova/rpc/impl_carrot.py |   28 +++++++++++++++++++++-------
 nova/rpc/impl_kombu.py  |   35 +++++++++++++++++------------------
 nova/service.py         |    6 ++++++
 4 files changed, 47 insertions(+), 28 deletions(-)

commit e39ec75169ff3b7ac29212ca315ad213997a8cbc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat Aug 27 04:32:20 2011 -0400

    Updated VersionsXMLSerializer and corresponding tests to use lxml.

 nova/api/openstack/limits.py              |    1 -
 nova/api/openstack/versions.py            |   65 ++++++-----
 nova/api/openstack/views/versions.py      |    2 +-
 nova/tests/api/openstack/test_versions.py |  176 ++++++++++++-----------------
 4 files changed, 109 insertions(+), 135 deletions(-)

commit 19cb3672f2849fe659173631f7f81ed489f1ea7e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Aug 26 17:46:47 2011 -0700

    v1.0 of server create injects first users keypair

 nova/api/openstack/create_instance_helper.py |    1 -
 nova/api/openstack/servers.py                |   13 +++++++++++++
 nova/tests/api/openstack/test_servers.py     |    6 ++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

commit 470b9dc73c5e27ef8716436fe22e9f32dbdffd28
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 26 17:40:22 2011 -0700

    add tests to verify NotFound exceptions are wrapped with the proper ids

 nova/tests/api/ec2/__init__.py        |   19 +++++
 nova/tests/api/ec2/test_middleware.py |  130 +++++++++++++++++++++++++++++++++
 nova/tests/test_cloud.py              |    7 --
 nova/tests/test_middleware.py         |   85 ---------------------
 4 files changed, 149 insertions(+), 92 deletions(-)

commit 400427ab786779109d49b27eda2fe9e246503dd6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 26 16:17:40 2011 -0700

    use db layer for aggregation

 nova/api/openstack/contrib/simple_tenant_usage.py  |   72 +++++-------------
 nova/db/api.py                                     |   11 ++-
 nova/db/sqlalchemy/api.py                          |   19 +++--
 .../openstack/contrib/test_simple_tenant_usage.py  |   77 ++++++++------------
 4 files changed, 70 insertions(+), 109 deletions(-)

commit aaec0f17abccf0b6d842b21d5c6e34fb972afa2c
Merge: de0a173 847d6ae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 26 16:16:17 2011 -0700

    merged trunk

commit 3c835ebe4bb6e0aa61da2a2e44a6b19bc92fc72a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 16:04:34 2011 -0700

    flag for kombu connection backoff on retries

 nova/flags.py          |    1 +
 nova/rpc/impl_kombu.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 1c5031ca6f89de4ac8a7dac271aff9942fc9602a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 16:00:50 2011 -0700

    more fixes

 nova/rpc/impl_kombu.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 9cb46c48682657039173447f9689e15ed3ce15af
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 15:59:15 2011 -0700

    more work done to restore original rpc interfaces.

 nova/rpc/FIXME         |    2 +
 nova/rpc/__init__.py   |    3 +-
 nova/rpc/impl_kombu.py |  307 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 306 insertions(+), 6 deletions(-)

commit 6f8f9c7b829bf1654305d22745ac2ea1d4dcc089
Merge: 87a5fef 3a91fa8
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 15:57:31 2011 -0700

    merge changes from brad due to recent quantum API changes

commit 3a91fa89ea23d22cd34336aa9281a439579d4ce0
Author: Brad Hall <brad@nicira.com>
Date:   Fri Aug 26 15:48:53 2011 -0700

    Minor changes based on recent quantum changes

 nova/network/quantum/client.py             |    3 ++-
 nova/network/quantum/manager.py            |    3 ++-
 nova/network/quantum/quantum_connection.py |    6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

commit 8b44cedcc099542e6485a33764cece4c141fd4ab
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 15:40:04 2011 -0700

    start of kombu implementation, keeping the same RPC interfaces

 nova/rpc/__init__.py    |   25 +-
 nova/rpc/amqp.py        |  593 ---------------------------------------------
 nova/rpc/impl_carrot.py |  607 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/rpc/impl_kombu.py  |  426 +++++++++++++++++++++++++++++++++
 4 files changed, 1045 insertions(+), 606 deletions(-)

commit 8bd8103c86fc021ff86b923883b66371052b3f93
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 17:32:44 2011 -0500

    doubles quotes to single

 nova/network/manager.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 209334e4740087aa0fd4b1aac8fcaf1a74ff7220
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 15:07:34 2011 -0700

    changed format string in nova-manage

 bin/nova-manage |  152 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 78 insertions(+), 74 deletions(-)

commit 156430b2d795833245c069f83c435a8a240556fd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 17:04:30 2011 -0500

    removed self.test ip and _setup_networking from libvirt

 nova/tests/test_libvirt.py |   64 +++-----------------------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

commit 9737731fff7f6d4d19213b453315610bd095a0e6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 17:00:06 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 4389153161827166dac3acb02d3e7c6d07170714
Merge: 1ab7b11 9cef606
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Aug 26 14:57:53 2011 -0700

    merge trunk

commit d0f42b4bf6e60485c7bebe1c60dccce48a0ddcb3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 16:55:52 2011 -0500

    stubbed some stuff in test_libvirt

 nova/tests/test_libvirt.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 6f467a94e3f7bdab41ebdcb7b987ca5544bfe321
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 13:55:43 2011 -0700

    removed create_volumes, added log & doc comment about experimental code

 nova/volume/manager.py |    4 ----
 nova/vsa/api.py        |    6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 0f7cd2be9143b63a90a37c7b59f07c6fcbd31bb2
Merge: 96a1b21 9cef606
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 13:36:45 2011 -0700

    reverted CA files

commit 477510214e80be21a40bff6c053090793653f6a1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 15:09:39 2011 -0500

    couple of pep8s

 nova/tests/fake_network_info.py |    1 +
 1 file changed, 1 insertion(+)

commit b846d22937ac62549832e16105ed06a21a3e34d0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 26 15:36:33 2011 -0400

    Tiny tweaks to the migration script.

 .../versions/043_update_instance_states.py         |   21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit adf03e7274636cd58d9c04461896a50f43934e15
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:47:54 2011 -0500

    updated fake values

 nova/tests/test_libvirt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 02c501391ad9f6bb55771053418f10301e644c8f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:44:26 2011 -0500

    updated fake values

 nova/tests/test_libvirt.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit f53a92748320e95a5a2ec60c76bb429f90c3a4f4
Merge: 63b2617 9cef606
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 26 14:43:27 2011 -0400

    Merged trunk and fixed conflicts.

commit 698e6052d70bd6da4b6b1d2cfcf096ea576c36a6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:37:25 2011 -0500

    updated fake values

 nova/tests/test_libvirt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ae6943354a8c22e65233bca38f38c3521b1cce4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:32:16 2011 -0500

    updated fake values

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2fdf2d3fb05f58d1778671830eab111328f624fc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:28:17 2011 -0500

    forgot )

 nova/tests/test_libvirt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe74d65f7a8ccba26a03c72edbadf4b00e9a5294
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:26:33 2011 -0500

    update libvirt tests

 nova/tests/test_libvirt.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 9cef60664f0619b608cef182cc65306caf5c348c
Merge: e38ba3a 5dc7956
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 26 18:16:00 2011 +0000

    Update compute API and manager so that the image_ref is set before spawning the rebuilt instance. Fixes issue where rebuild didn't actually change the image_id.

commit 96a1b218d1d1d24853df3eceff11ba7676cd48ae
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 11:14:44 2011 -0700

    added debug prints for scheduler

 nova/scheduler/vsa.py |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

commit 49d24725031d7ebfb1a90517bcead02c09a4ebaf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:38:20 2011 -0500

    update libvirt

 nova/virt/libvirt/firewall.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9f0015c727986d17a14f905a1779cc31397a071f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:33:08 2011 -0500

    updated instance type fake model

 nova/tests/fake_network_info.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit f684e293b02a168e3e45d915645142229fdc7561
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:29:44 2011 -0500

    added vcpus to instance flavor test model

 nova/tests/fake_network_info.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2d3c516f5943efac0ab836818a759ba9291910b4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:28:14 2011 -0500

    added memory_mb to instance flavor test model

 nova/tests/fake_network_info.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 79602b6d9d7f3ef9777cc0e5f7a0476e1f71ffa0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:26:09 2011 -0500

    forgot test print statements

 nova/tests/fake_network_info.py |    2 --
 1 file changed, 2 deletions(-)

commit a7e7be67a79fab4348f68c5738656f1ac401c39a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:24:35 2011 -0500

    misplaced comma...

 nova/network/manager.py         |    2 +-
 nova/tests/fake_network_info.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 5dc7956eed749c33b6cfaaaf122e829feec62ea9
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 26 09:54:53 2011 -0400

    Update compute API and manager so that the image_ref is set before
    spawning the rebuilt instance. Fixes issue where rebuild didn't actually
    change the image_id.

 nova/compute/api.py                   |    3 +--
 nova/compute/manager.py               |   14 +++-----------
 nova/tests/integrated/test_servers.py |    3 ++-
 3 files changed, 6 insertions(+), 14 deletions(-)

commit 87a5fefe5b0e3379ef93fede0750ddd76dd3c20d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:18:38 2011 -0700

    Add brad to Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit b66840327ad183619995bc9e88a0d4ea01ab0b59
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:08:15 2011 -0700

    replace accidental deletion in nova-mange

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8d02ac1b5e9a45cc19992d232d4148f9db720ca
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:02:46 2011 -0700

    rearrange imports

 bin/nova-manage                                    |    2 +-
 .../versions/041_add_network_priority.py           |    5 ++---
 nova/network/quantum/fake.py                       |    5 +++--
 nova/network/quantum/manager.py                    |    2 +-
 nova/network/quantum/melange_connection.py         |    1 +
 nova/network/quantum/melange_ipam_lib.py           |    1 +
 nova/network/quantum/nova_ipam_lib.py              |    4 ++--
 nova/network/quantum/quantum_connection.py         |   10 +++++-----
 nova/tests/test_quantum.py                         |    2 +-
 9 files changed, 17 insertions(+), 15 deletions(-)

commit 16290908eaca73caa6b3f2ce36fb8add0b7d3615
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 22:45:24 2011 -0700

    fix for quantum api changes, change nova-mange to have quantum_list command

 bin/nova-manage                            |   23 +++++++++++++++++------
 nova/network/quantum/client.py             |    2 +-
 nova/network/quantum/quantum_connection.py |    4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

commit e2b8e3ac4ae6228e73de68372341346e5a78b7bf
Merge: 5823a72 2e7447a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 21:11:27 2011 -0700

    merge brad's fixes

commit 5823a72690155d9d69e4d23a81be2ea0945809dc
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 21:09:15 2011 -0700

    add priority for static networks

 nova/network/quantum/fake.py             |   13 ++++++----
 nova/network/quantum/manager.py          |    9 +++----
 nova/network/quantum/melange_ipam_lib.py |   30 ++++++++++++++++++++---
 nova/network/quantum/nova_ipam_lib.py    |   22 ++++++++++-------
 nova/tests/test_quantum.py               |   38 +++++++++++++-----------------
 5 files changed, 69 insertions(+), 43 deletions(-)

commit eecb6ce2acee168713177459942e405b099fb25a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:47:12 2011 -0700

    driver: added vsa_id parameter for SN call

 nova/volume/driver.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 8b4d46285b7f00a89bad6000fdc78cc2ab1d5608
Merge: 59e9adb e38ba3a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:18:46 2011 -0700

    merged with rev.1499

commit 59e9adb8e2ef39474a04ead76975a1fc3f913550
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:09:50 2011 -0700

    cosmetic cleanup

 .../openstack/contrib/virtual_storage_arrays.py    |    6 +++---
 nova/api/openstack/contrib/volumes.py              |   14 +++++++-------
 nova/log.py                                        |    6 +-----
 nova/tests/scheduler/test_vsa_scheduler.py         |    1 -
 nova/tests/test_vsa.py                             |    1 -
 nova/tests/test_vsa_volumes.py                     |    2 --
 nova/tests/test_xenapi.py                          |    1 -
 7 files changed, 11 insertions(+), 20 deletions(-)

commit 39169914aa43a911735267577e60bc977bcd5117
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 21:50:18 2011 -0400

    Updated server and image XML serializers to take advantage of the addresses and metadata serializers

 nova/api/openstack/common.py  |    9 ++++-----
 nova/api/openstack/images.py  |   10 +++++-----
 nova/api/openstack/ips.py     |    8 ++++----
 nova/api/openstack/servers.py |   20 ++++++++------------
 4 files changed, 21 insertions(+), 26 deletions(-)

commit 4834b920e3186712ab56e65a88c2e8c838d16f9c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 18:38:35 2011 -0700

    VSA code redesign. Drive types completely replaced by Volume types

 bin/nova-manage                                    |  206 +++++++++++---------
 bin/nova-vsa                                       |   10 +-
 nova/api/openstack/contrib/drive_types.py          |  143 --------------
 .../openstack/contrib/virtual_storage_arrays.py    |   54 ++---
 nova/db/api.py                                     |   45 -----
 nova/db/sqlalchemy/api.py                          |  153 +--------------
 .../migrate_repo/versions/042_add_vsa_data.py      |  133 -------------
 .../migrate_repo/versions/043_add_vsa_data.py      |   75 +++++++
 nova/db/sqlalchemy/models.py                       |   43 +---
 nova/db/sqlalchemy/session.py                      |    2 +
 nova/exception.py                                  |   12 --
 nova/log.py                                        |    2 +-
 nova/network/linux_net.py                          |    1 -
 nova/quota.py                                      |    5 +-
 nova/scheduler/vsa.py                              |   68 ++++---
 .../api/openstack/contrib/test_drive_types.py      |  192 ------------------
 nova/tests/api/openstack/contrib/test_vsa.py       |   79 ++++----
 nova/tests/api/openstack/test_extensions.py        |    3 +-
 nova/tests/scheduler/test_vsa_scheduler.py         |   68 +++++--
 nova/tests/test_drive_types.py                     |  146 --------------
 nova/tests/test_vsa.py                             |   49 +++--
 nova/tests/test_vsa_volumes.py                     |   77 ++++----
 nova/tests/test_xenapi.py                          |    1 +
 nova/virt/libvirt/connection.py                    |    5 +-
 nova/volume/api.py                                 |   63 ++----
 nova/volume/driver.py                              |   74 +++++--
 nova/volume/manager.py                             |   27 ++-
 nova/volume/san.py                                 |   12 +-
 nova/volume/volume_types.py                        |   43 +++-
 nova/vsa/api.py                                    |  148 ++++++--------
 nova/vsa/drive_types.py                            |  114 -----------
 nova/vsa/fake.py                                   |    2 +-
 nova/vsa/manager.py                                |   52 ++---
 nova/vsa/utils.py                                  |   80 ++++++++
 34 files changed, 761 insertions(+), 1426 deletions(-)

commit d51a2ab1796417cf591ac3acc884566a18f120c7
Merge: e4966cc e38ba3a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 21:08:17 2011 -0400

    merged trunk

commit e38ba3a6066de8499ea5cc8d1fb2e5daefbf336a
Merge: 303568b b77d146
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Aug 26 00:14:51 2011 +0000

    Just a couple of small changes I needed to get the migrations working with SQLAlchemy 0.7.x on Fedora 16

commit 2e7447a9ca180b68b49984d57e224e7fdd6d27e2
Author: Brad Hall <brad@nicira.com>
Date:   Thu Aug 25 17:13:09 2011 -0700

    Minor fixes

 nova/network/quantum/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 303568b6ec3bfc36199029bc7b6d3817712bc276
Merge: 655846b 4859cce
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 00:00:13 2011 +0000

    check log file's mode prior to calling chmod

commit 655846bd29c440294a2b044cf7a5b616d14c4c30
Merge: 34ff962 beed018
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 25 23:49:57 2011 +0000

    The fix for run_iscsiadm in rev 1489 changed the call to use a tuple because values were being passed as tuples.  Unfortunately a few calls to the method were still passing strings.

commit 34ff9626584436babfa257cb6667b8deab8ced0e
Merge: 847d6ae a42d842
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 25 23:15:21 2011 +0000

    Add a set of generic tests for the virt drivers.
    Update a bit of documentation to match reality.

commit e4966cc21ca34380be98a9f24c76404ca43f663f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:31:41 2011 -0400

    updated LimitsXMLSerializer to use etree and supply the xml declaration

 nova/api/openstack/limits.py            |   81 +++++++++++++++----------------
 nova/tests/api/openstack/test_limits.py |   12 +++++
 2 files changed, 52 insertions(+), 41 deletions(-)

commit beed018c5034c33fa806b80ba719e57ae9347acd
Merge: fafaf04 0fc1264
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 25 15:22:51 2011 -0700

    merge underlying fix for testing

commit be503387c1f352f8bccd9025f1fe46e1f0fb8448
Merge: bcdec7d 847d6ae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:11:04 2011 -0400

    merged trunk

commit bcdec7da59ade484d370fb4a605e4f6926038252
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:10:43 2011 -0400

    updated additional limits test

 nova/tests/api/openstack/test_limits.py |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit bebc02efbf4f049efeb4e1f72a21a8fdc825903a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:08:46 2011 -0400

    pep8

 nova/tests/api/openstack/test_limits.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit fafaf040ed4518006efd3e5909ac31bae47af33d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 25 15:08:28 2011 -0700

    pass all commands to run_iscsiadm as a tuple

 nova/volume/driver.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9df1fe10f39d4b1b4753a5c5366e68dd1efa9e77
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 17:04:26 2011 -0500

    altered fake network model

 nova/tests/fake_network_info.py |    3 +++
 1 file changed, 3 insertions(+)

commit 1e6eed6b064632996b56ba6952b52c07e28c114c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:01:35 2011 -0400

    Updated limits serialization tests to use etree and added limits schema

 nova/api/openstack/schemas/v1.1/limits.rng |   28 ++++++++++++++
 nova/tests/api/openstack/test_limits.py    |   56 +++++++++++++++-------------
 2 files changed, 58 insertions(+), 26 deletions(-)

commit 63b26178407423524390b2a47425b6953c910e00
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 18:00:32 2011 -0400

    Test fixup after last review feedback commit.

 nova/tests/api/openstack/test_servers.py |   11 ++++-------
 nova/tests/test_cloud.py                 |    2 +-
 nova/tests/test_xenapi.py                |    2 --
 3 files changed, 5 insertions(+), 10 deletions(-)

commit 2cf0b67e08e1608bd717ffadd41d5029db2b4a3a
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Aug 25 21:56:45 2011 +0000

    Fix glance image authorization check now that glance can do authorization checks on its own; use correct image service when looking for ramdisk, etc.; fix a couple of PEP8 errors

 nova/api/openstack/create_instance_helper.py |    6 +++---
 nova/image/glance.py                         |   14 ++++++++++++++
 nova/ipv6/account_identifier.py              |    3 ++-
 nova/tests/test_ipv6.py                      |    2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

commit 590e7445d937485280e60743318000d0bfc80236
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:49:09 2011 -0500

    forget a return

 nova/tests/fake_network_info.py |    2 ++
 1 file changed, 2 insertions(+)

commit c316782f8879ef321c4545b04bc9d24e11bb4ee6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 17:27:10 2011 -0400

    review feedback

 nova/api/ec2/cloud.py        |    3 +--
 nova/api/openstack/common.py |    7 ++-----
 nova/compute/manager.py      |   12 ++++++------
 nova/compute/task_states.py  |   21 +++++++++++++++------
 nova/compute/vm_states.py    |    9 +++++++--
 nova/db/sqlalchemy/api.py    |   40 ----------------------------------------
 6 files changed, 31 insertions(+), 61 deletions(-)

commit 75ef563099133efd47a97c7e989d0188a054eebc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 17:10:35 2011 -0400

    Fixed integrated.test_xml to be more robust

 nova/tests/integrated/test_xml.py |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 5daa66cb91f95ff341ce5ec762fb1060f22e587f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:10:25 2011 -0500

    typo

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 416b270374d64f976c91a3efb74dcb467bfbcc8c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:02:52 2011 -0500

    fixed a couple of syntax errors

 nova/tests/fake_network_info.py |    2 +-
 nova/tests/test_libvirt.py      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit a42d8427de9c641c4da7a87dfd7500b09af1ec9b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 25 22:56:59 2011 +0200

    Add bug reference

commit 86029908254850e9d04fcc2399eef54e7af58193
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 16:56:21 2011 -0400

    updated tests

 nova/tests/api/openstack/test_servers.py |   46 +++---------------------------
 nova/tests/integrated/test_xml.py        |    7 +++--
 2 files changed, 8 insertions(+), 45 deletions(-)

commit 358c346a7d01336f23b21a18f33c3213b3672f0a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 15:53:13 2011 -0500

    updated libvirt tests to use fake_network_info

 nova/network/manager.py         |    2 +-
 nova/tests/fake_network_info.py |   30 ++++++++++++++++++++----
 nova/tests/test_libvirt.py      |   49 +++++++++++++++++++++------------------
 3 files changed, 53 insertions(+), 28 deletions(-)

commit ae1ac682673648f2a2f364eabd525985f3d16a9d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:40:15 2011 -0400

    Bumped migration number.

 .../versions/042_update_instance_states.py         |  141 --------------------
 .../versions/043_update_instance_states.py         |  141 ++++++++++++++++++++
 2 files changed, 141 insertions(+), 141 deletions(-)

commit 1fab446e655db8055ee8c051c279a76bea961f48
Merge: d8d4aff 847d6ae
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:38:57 2011 -0400

    Merged trunk.

commit d8d4aff908925b2f351e77291f4a8f394994063d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:38:38 2011 -0400

    Review feedback.

 nova/api/ec2/cloud.py        |    8 +++++---
 nova/api/openstack/common.py |    7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

commit 73311c4e71e72f2866bb47063ddf9b5a04c3736d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 16:36:41 2011 -0400

    pep8

 nova/api/openstack/common.py |    1 +
 1 file changed, 1 insertion(+)

commit b02a5e4f581590c1bf31dae1c9c2bc1e448a6106
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 16:35:04 2011 -0400

    DRYed up code by moving _to_xml into XMLDictSerializer

 nova/api/openstack/common.py             |    5 --
 nova/api/openstack/flavors.py            |    5 --
 nova/api/openstack/images.py             |    5 --
 nova/api/openstack/ips.py                |    6 +-
 nova/api/openstack/servers.py            |    4 --
 nova/api/openstack/wsgi.py               |    5 ++
 nova/tests/api/openstack/test_common.py  |   14 +++++
 nova/tests/api/openstack/test_flavors.py |   27 +++++++++
 nova/tests/api/openstack/test_images.py  |   45 +++++++++++++++
 nova/tests/api/openstack/test_servers.py |   89 ++++++++++++++++++++++++++++++
 10 files changed, 181 insertions(+), 24 deletions(-)

commit aafd1ff68f2f6085ddf0d6762ed9ed594d23a321
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 15:30:52 2011 -0400

    updated addresses serializer to use etree instead of minidom

 nova/api/openstack/ips.py |   63 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

commit 8e712b30911956531e346723fbbcaaa49f166ab7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 15:12:34 2011 -0400

    Added addresses schema

 nova/api/openstack/schemas/v1.1/addresses.rng |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit bed249069e2770d1248ab9ef89751c15be8a13d6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 15:12:02 2011 -0400

    updated addresses xml serialization tests to use etree instead of minidom

 nova/tests/api/openstack/test_servers.py |   54 +++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

commit 73704209a146bf51f51f445dc1ccc4410181ad6c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 14:58:31 2011 -0400

    Updated ServerXMLSerializer to use etree instead of minidom

 nova/api/openstack/schemas/v1.1/server.rng |    6 +-
 nova/api/openstack/servers.py              |  215 +++++++++++++---------------
 2 files changed, 105 insertions(+), 116 deletions(-)

commit 847d6aecb64d7abece4d4f426f26a9561ffb1e51
Merge: ae07c41 dde9fdc
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Aug 25 16:55:33 2011 +0000

    added unit tests to instance_types for rainy day paths

commit 6758779249d490fd21bfdeae6d40adfc33d8cd17
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 12:50:36 2011 -0400

    Reverted two mistakes when looking over full diff.

 nova/api/ec2/cloud.py   |   10 ++++------
 nova/compute/manager.py |    2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

commit e0b64c9aa0d2617d1d9e4dc0c35dc3899e0e527a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 12:44:01 2011 -0400

    Updated MetadataXMLSerializer to use etree instead of minidom

 nova/api/openstack/common.py |   71 +++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

commit ae07c417b554d0b26d055a7bd8b3217a59c1966f
Merge: f136cf1 3a2cdb0
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 16:14:44 2011 +0000

    Added:
    - volume metadata
    - volume types
    - volume types extra_specs
    
    Volume create API receives volume types & metadata.
    
    Work in progress on Openstack APIs for volume types & extra_specs.

commit 48b2de98d002a3f7dac03d29696e4c37ed4f983f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 12:05:53 2011 -0400

    Added schemas
    Updated metadata tests to use etree instead of minidom

 nova/api/openstack/schemas/v1.1/image.rng        |   30 ++++++
 nova/api/openstack/schemas/v1.1/images.rng       |    6 ++
 nova/api/openstack/schemas/v1.1/images_index.rng |   12 +++
 nova/api/openstack/schemas/v1.1/metadata.rng     |    9 ++
 nova/tests/api/openstack/test_common.py          |  122 ++++++++++++----------
 5 files changed, 125 insertions(+), 54 deletions(-)

commit f136cf119778b4d5d09e607487cf011b9f16dedb
Merge: ce413a5 42f9739
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 25 16:05:03 2011 +0000

    Servers with metadata will now boot on xenserver with flat_injected==False

commit 4859cce97b328cf6f76b3b5bd7a0e7d3227428f7
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 08:59:21 2011 -0700

    moved import up

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a14e2b1d8cbc87d5bcb31b9127035160fde4acc5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:44:28 2011 -0400

    Verify resize needs to be set.

 nova/compute/api.py     |    8 ++++----
 nova/compute/manager.py |    5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 42f9739a608b5b6219aa9f51bc90c2d072edc33a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 25 11:44:21 2011 -0400

    changing comment

 nova/virt/xenapi/vmops.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d8da62dd6b30505bc700bafcd73f4f990cdab807
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 25 11:37:17 2011 -0400

    fixing bug

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6f26250de71edcea39568edb9ce192852aae6ef9
Merge: f1ccdc5 ce413a5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 11:25:30 2011 -0400

    merged trunk

commit f1ccdc547d083ffe4c5d03f26f2658d98bc21541
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 11:24:25 2011 -0400

    Updated ImagesXMLSerializer to use etree instead of minidom

 nova/api/openstack/images.py |  145 +++++++++++++++++++-----------------------
 1 file changed, 65 insertions(+), 80 deletions(-)

commit 423a29ff347d3911ba1a98aa224e2a29bdbb8d4c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:17:31 2011 -0400

    Set error state when migration prep fails.

 nova/compute/manager.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 0e3986e71f4bbc848e81f18d6c3e6ad33ab3684c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:12:53 2011 -0400

    Removed invalid test.

 nova/tests/api/openstack/test_server_actions.py |   13 -------------
 1 file changed, 13 deletions(-)

commit 6e14007c09a465374d1b50cd00549c1be6dc536c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:11:51 2011 -0400

    Removed RESIZE-CONFIRM hack.

 nova/api/openstack/views/servers.py |    8 --------
 1 file changed, 8 deletions(-)

commit 881fb85c9a74fc3436d07d3cf3876c2f815b5618
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 10:59:04 2011 -0400

    Set state to RESIZING during resizing...

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8991b46e19ca757fdef6c19df497ea727eb32687
Merge: f0fcc4b ce413a5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 09:04:20 2011 -0400

    Merged trunk.

commit f0fcc4ba61b4658b1e28bd69cfcf395cc408496a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 09:04:04 2011 -0400

    Another attempt at fixing hanging test.

 nova/tests/test_xenapi.py |    2 ++
 run_tests.py              |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

commit ce413a5b5344a79d612e36c64ddbcb7bfb4ac98b
Merge: 9c871b3 88a2dfb
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Aug 25 08:16:06 2011 +0000

    Once a network is associated with project, I can’t delete this network with ‘nova-manage network delete’.
    As you know, I can delete network by scrubbing the project with ‘nova-manage project scrub’.
    However it is too much.
    The cause of this problem is there is no modify command of network attribute.
    
    This branch adds 'nova-manage network modify' command.
    In this branch, we only support project and host value modifications.
    Another attributes are in future work.

commit 9c871b3e815798616623bb8771af7f0e6b24e603
Merge: 9751d4e 1ba7527
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 25 08:08:36 2011 +0000

    Update paste config so that EC2 admin API defaults to noauth.

commit 2d7f401c4fb555d947bc10b4f0ddf9bdfd86b69d
Merge: 08af6ab 3a2cdb0
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:54:00 2011 -0700

    merged with volume types (based on rev.1490). no code rework yet

commit 08af6ab6325e27b60d3d036d6e780f8e594234cc
Merge: 48cd968 96f85f9
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:48:04 2011 -0700

    merged with volume_types. no code refactoring yet

commit 3a2cdb0d9dc3e8a4ebf30bb31b37bb6bca84330f
Merge: 0c88dbc 9751d4e
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:42:32 2011 -0700

    merged with nova 1490

commit 0c88dbc01ae9c10a3a83072ecdef201103a46752
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:41:14 2011 -0700

    added new tables to list of DBs in migration.py

 nova/db/sqlalchemy/migration.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit dde9fdc6665e2562ec490fe43f46dcf945c59220
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 16:03:32 2011 -0700

    removes french spellings to satisfy american developers

 nova/tests/test_instance_types.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48cd9689de31e408c792052747f714a9dbe1f8f7
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 15:51:29 2011 -0700

    added virtio flag; associate address for VSA; cosmetic changes. Prior to volume_types merge

 bin/nova-manage                                    |    4 --
 bin/nova-vsa                                       |    1 -
 nova/api/openstack/contrib/drive_types.py          |    1 -
 .../openstack/contrib/virtual_storage_arrays.py    |   49 +++++++++++++++-
 .../migrate_repo/versions/037_add_vsa_data.py      |    1 -
 nova/db/sqlalchemy/session.py                      |    2 -
 nova/network/linux_net.py                          |    1 +
 nova/scheduler/vsa.py                              |    1 -
 nova/tests/test_drive_types.py                     |   59 ++++++++++----------
 nova/tests/test_vsa.py                             |    2 +-
 nova/virt/libvirt.xml.template                     |    4 +-
 nova/virt/libvirt/connection.py                    |    4 ++
 nova/vsa/__init__.py                               |    1 -
 nova/vsa/api.py                                    |    7 +--
 nova/vsa/connection.py                             |    1 -
 nova/vsa/drive_types.py                            |    1 -
 nova/vsa/fake.py                                   |    1 -
 nova/vsa/manager.py                                |    1 -
 18 files changed, 88 insertions(+), 53 deletions(-)

commit 6c4329f846685ee54c5265e5cc56e58e6fbd55e9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 18:25:21 2011 -0400

    stub_instance fix from merge conflict

 nova/tests/api/openstack/test_server_actions.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit e356009b3ab374f073c2ff2cdb30d78bf432670d
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 15:20:37 2011 -0700

    moved import to the top

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e30d2c372cc36d7e9a6cf3af5016834b499a7b42
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 15:18:17 2011 -0700

    fixing inappropriate rubyism in test code

 nova/tests/test_instance_types.py |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit 5f1380bfc69913f6aeb2a64e3501f77973493bc3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 18:14:13 2011 -0400

    Added fix for parallel build test.

 nova/tests/api/openstack/test_server_actions.py |    2 +-
 run_tests.py                                    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 575f72693fa20c7c4157c8ce9702751cd54f1a82
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 18:00:03 2011 -0400

    Fixed silly ordering issue which was causing tons of test failures.

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 80adf41ded7fc09aa1b59e567b917f7fc1e865f6
Merge: a6bf7c0 9751d4e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 17:41:39 2011 -0400

    merged trunk

commit 0343a328e66557abda9d0817558ad09a73962eb9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 24 14:39:47 2011 -0700

    change snapshot msg too

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96f85f94f23c9eeac3f43e122d2992b6d0938827
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 14:30:40 2011 -0700

    forgot to add new extension to test_extensions

 nova/tests/api/openstack/test_extensions.py |    1 +
 1 file changed, 1 insertion(+)

commit b77d1462eb40fc9473aed5df84903e80fd6a1525
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Aug 24 22:16:02 2011 +0100

    Add me to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 576dd4a0dce66c7949a1f66a6979d9e1d11916bf
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 14:07:17 2011 -0700

    added Openstack APIs for volume types & extradata

 nova/api/openstack/contrib/volumetypes.py          |  197 ++++++++++++++++++++
 nova/db/sqlalchemy/api.py                          |    2 +-
 nova/tests/api/openstack/test_volume_types.py      |  171 +++++++++++++++++
 .../api/openstack/test_volume_types_extra_specs.py |  181 ++++++++++++++++++
 4 files changed, 550 insertions(+), 1 deletion(-)

commit 88a2dfb582eec7b4c7547c2aa51f3b661a3b9c5d
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 14:01:33 2011 -0700

    Add comments for associate/dissociate logic

 bin/nova-manage |    4 ++++
 1 file changed, 4 insertions(+)

commit 08981ee7228aa0e4b68ec8e9016ef68b987a3ac3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 24 16:41:26 2011 -0400

    Updated ImageXMLSerialization tests to use etree instead of minidom
    Fixed incorrect server entity ids in tests

 nova/api/openstack/images.py            |    5 +-
 nova/tests/api/openstack/test_images.py |  347 +++++++++++++++----------------
 2 files changed, 164 insertions(+), 188 deletions(-)

commit cdfce179bed8a1404b6d31a65567a945fb031753
Merge: 156f2fb 9751d4e
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 13:11:41 2011 -0700

    Merged from trunk

commit 156f2fb68981bde1a24233e2648d11890a98e34a
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 13:10:56 2011 -0700

    Add names to placeholders of formatting

 nova/tests/test_nova_manage.py |   40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

commit 9751d4e59e093bcfd96ed6b361ebdbd5227a0acc
Merge: 4a99c3f 343a29b
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Wed Aug 24 19:24:46 2011 +0000

    The notifiers API was changed to take a list of notifiers. Some people might want to use more than one notifier so hopefully this will be accepted into trunk.

commit 0571c86d18c242f46e44e380b257cfc40598d31b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 24 12:17:58 2011 -0700

    use dict.get for user_id, project_id, and display_description in servers view as suggested by ed leaf, so that not all tests require these fields

 nova/api/openstack/views/servers.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ba0bc2830e3a67617a0199a2a5079f5dfd3b22af
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 24 15:07:57 2011 -0400

    Updated flavors xml serialization to use lxml instead of minidom

 nova/api/openstack/flavors.py |   70 +++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

commit e2e32589c247bfa790f4459a51742cc335581d0c
Merge: 3d17d22 4a99c3f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 24 11:45:12 2011 -0700

    merge trunk, fix tests

commit 3d17d22926e2f589648fdac26302a58e8c4e9069
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 24 11:36:41 2011 -0700

    fix more tests

 .../api/openstack/contrib/test_createserverext.py  |    3 +++
 1 file changed, 3 insertions(+)

commit e51c73a2d953103d4245cb8d456cad590be73ff5
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 11:10:05 2011 -0700

    Removed unused imports

 nova/tests/test_nova_manage.py |    6 ------
 1 file changed, 6 deletions(-)

commit 026efcd174cdb1b1d0fece9611dbae358de48387
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 24 14:08:25 2011 -0400

    Updated FlavorsXMLSerialization tests to use etree and validation instead of minidom

 nova/api/openstack/schemas/v1.1/flavor.rng        |   10 ++
 nova/api/openstack/schemas/v1.1/flavors.rng       |    6 +
 nova/api/openstack/schemas/v1.1/flavors_index.rng |   12 ++
 nova/tests/api/openstack/test_flavors.py          |  180 +++++++++------------
 4 files changed, 107 insertions(+), 101 deletions(-)

commit d3112780748d647a34ec7178835a17a37bbc07ea
Merge: 5ab769d 4a99c3f
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 10:47:46 2011 -0700

    Merged from trunk

commit 5ab769daf354033f5044c88d4f899d56effd998e
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 10:47:11 2011 -0700

    split test_modify() into specific unit tests

 nova/tests/test_nova_manage.py |   88 +++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

commit a6bf7c0b2522509dda8dd5e537fad49665aa2af2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:27:23 2011 -0400

    Added DELETED status to OSAPI just in case.

 nova/api/openstack/common.py |    3 +++
 1 file changed, 3 insertions(+)

commit 4a99c3f134e20445eb1f6bdabf0f0c53ff9c39c5
Merge: bde2e87 0fc1264
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 24 17:24:52 2011 +0000

    Fixes iscsiadm commands to run properly.

commit 1c7002db8be430cded6efb7378103e17c8df21b4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:24:37 2011 -0400

    Fixed issue where we were setting the state to DELETED before it's actually deleted.

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3c58bd43a8fe892b2da4f8a45f29ac4a76aeac64
Merge: 207ce4f bde2e87
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 10:20:27 2011 -0700

    merged with rev.1488

commit c34c9a008f1314de6eeb41b1f57b6056a3f951f6
Merge: 64f946a bde2e87
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:16:37 2011 -0400

    Merged trunk and fixed conflicts.

commit 207ce4f19655e70d14f3a67a45ba6acf8f12380d
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 10:16:20 2011 -0700

    added volume type search by extra_spec

 nova/tests/test_volume_types.py |   55 +++++++++++++++++++++++++++++++++++++++
 nova/volume/volume_types.py     |   34 ++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 2 deletions(-)

commit 64f946a6a0a6e08d7046ab98776928abe24f8d93
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:01:20 2011 -0400

    Fix for trying rebuilds when instance is not active.

 nova/api/openstack/servers.py |   10 ++++------
 nova/compute/api.py           |   11 +++--------
 nova/exception.py             |    2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

commit ca8b3c7635208ab0776f51661708ecea1bfc222a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 12:42:42 2011 -0400

    Fixed rebuild naming issue and reverted other fix which didn't fix anythin.

 nova/compute/api.py     |    2 ++
 nova/compute/manager.py |    7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

commit 007efcab4b668e7a4b1d26ff274693824f6d7445
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 12:26:05 2011 -0400

    Attempt to fix issue when deleting an instance when it's still in BUILD.

 nova/compute/manager.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit bde2e876034219b614395ccd66cb45b0e23d348f
Merge: af5c480 326268b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 24 16:23:20 2011 +0000

    Fix default hostname generator so that it won't use underscores, and use minus signs instead.

commit 163923f57d075fa5d46a5b54073fc6cd30e5c624
Merge: 8ad9373 af5c480
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:20:54 2011 -0700

    merged with 1487

commit 8ad9373648dea11783545ad88429def4691a2925
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:18:53 2011 -0700

    pep8 compliant

 nova/db/api.py                                     |    2 --
 nova/db/sqlalchemy/api.py                          |    4 +---
 .../versions/042_add_volume_types_and_extradata.py |    5 ++++-
 nova/tests/integrated/test_volumes.py              |    5 +++--
 nova/tests/test_volume_types.py                    |    2 --
 nova/tests/test_volume_types_extra_specs.py        |    1 -
 6 files changed, 8 insertions(+), 11 deletions(-)

commit 7b95251a5c86d2b2a88734d0c96b88ec4416c43b
Merge: 390f35f af5c480
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 09:17:33 2011 -0700

    Merged from trunk

commit af5c4805368a59a757c657193b9582bb2bf0547d
Merge: 9d7ece3 998f405
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 16:12:11 2011 +0000

    - rebuilds are functional again
    - OSAPI v1.1 rebuild will accept adminPass or generate a new one, returning it in a server entity
    - OSAPI v1.0 will generate a new password, but it doesn't communicate it back to the user

commit 390f35f8e7736bfbd650c9e3f522274e92adb005
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 09:11:57 2011 -0700

    Fix flag override in unit test

 nova/tests/test_nova_manage.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cac910b2b58536eb8ef151b1b5a48ea95d0df51b
Merge: 29940dd c8920f4
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:10:28 2011 -0700

    merged with rev.1485

commit 9d7ece3f7cee968123850b1092d8ea78580c7eb1
Merge: c8920f4 d4b09b8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 16:01:48 2011 +0000

    add rainy day test to to_global
    fixed to_global to catch correct error from incorrect mac addresses

commit 326268b9bf5d958263b70c64ca2ed21deac1a14e
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 24 18:01:29 2011 +0200

    Let's be more elegant

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c8920f480233546d8a57265da66de7821c32ac7e
Merge: a6cbc5b b5bf5fb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 15:54:00 2011 +0000

    similar to lp828614: add rainy day test and fix exception error catch to AddrFormatError

commit df0f06a8f0d66f07f402aa54cb1aa7ce1b7416c9
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 08:51:14 2011 -0700

    check log file mode prior to chmod

 nova/log.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit a6cbc5bb63aacf6746ef9f6a4beb841cca95cdb3
Merge: 83856c9 f2981d8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 15:44:52 2011 +0000

    added unit tests for version.py

commit 9304d2b4222cbb7225a95d57f307b125db988390
Merge: 53b0a2e 83856c9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:33:18 2011 -0400

    Merged trunk.

commit 53b0a2ea13e148fc5f461211ca9056b30db6c43d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:32:58 2011 -0400

    Fix for migrations.

 .../versions/042_update_instance_states.py         |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 1ee1bda6cd164bd1e3cc400838830a747371ce9e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:27:02 2011 -0400

    Conversion to SQLAlchemy-style.

 .../versions/042_update_instance_states.py         |   55 ++++++++------------
 1 file changed, 21 insertions(+), 34 deletions(-)

commit 998f40594841094291c7472dd608b6a2ba689e4d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 11:11:20 2011 -0400

    dict formatting

 nova/tests/api/openstack/test_server_actions.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit df77c6c168d4370ec582ffbccd43e3b9cb551b98
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:00:21 2011 -0400

    Commit without test data in migration.

 .../versions/042_update_instance_states.py         |   43 +++-----------------
 1 file changed, 5 insertions(+), 38 deletions(-)

commit 8b3ac90bd53ec81e6669c6169969e1e8da3e2d4f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 10:59:12 2011 -0400

    Commit with test data in migration.

 nova/compute/api.py                                |    1 -
 .../versions/042_update_instance_states.py         |  165 +++++++++++++++++---
 nova/exception.py                                  |    3 +
 3 files changed, 149 insertions(+), 20 deletions(-)

commit c173b6bef17d8efe64b43664cc39d81a1c31f3b8
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Aug 24 15:53:23 2011 +0100

    Do not require --bridge_interface for FlatDHCPManager
    
    Unlike VlanManager, FlatDHCPManager actually works fine without a bridge
    interface on single host deployments.

 bin/nova-manage |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit b428ac4c20e44f537b0dedeefcc2637efbc998ea
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Aug 24 15:50:46 2011 +0100

    Fix quotas migration failure
    
    With sqlalchemy 0.7.2 and migrate 0.7.1, I was seeing:
    
       Traceback (most recent call last):
         File "/usr/lib/python2.7/site-packages/nova/db/migration.py", line 37, in db_sync
           ret = IMPL.db_sync(version=version)
         [..]
         File "/usr/lib/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/versions/016_make_quotas_key_and_value.py", line 189, in upgrade
           new_quotas.rename('quotas')
         [..]
         File "/usr/lib/python2.7/site-packages/migrate/changeset/schema.py", line 479, in deregister
           del meta.tables[key]
         File "/usr/lib64/python2.7/site-packages/sqlalchemy/util/_collections.py", line 38, in _immutable
           raise TypeError("%s object is immutable" % self.__class__.__name__)
       TypeError: immutabledict object is immutable
    
    This is actually a bug in sqlalchemy-migrate:
    
      http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=128
    
    But it can be worked around by ensuring there isn't a 'quotas' table in
    the metadata's table hash before renaming.

 .../versions/016_make_quotas_key_and_value.py      |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 0873a3c7b9a1a75c6e04bd1b66f8fbe4935585b2
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Aug 24 15:49:53 2011 +0100

    Fix flavorid migration failure
    
    With sqlalchemy 0.7.2 and migrate 0.7.1, I was seeing:
    
       Traceback (most recent call last):
          File "/usr/lib/python2.7/site-packages/nova/db/migration.py", line 37, in db_sync
            ret = IMPL.db_sync(version=version)
          [...]
          File "/usr/lib/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/versions/036_change_flavor_id_in_migrations.py", line 46, in upgrade
            .values(old_instance_type_id=instance_type.id))
          [...]
          File "/usr/lib64/python2.7/site-packages/sqlalchemy/engine/default.py", line 301, in do_commit
            connection.commit()
        OperationalError: (OperationalError) database is locked None None
    
    It looks like the database is being held open as we iterate over the
    rows in the instance_types table.

 .../versions/036_change_flavor_id_in_migrations.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 6e3d657c5733154bbf818bb5318fa5da2deb0122
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:45:53 2011 -0400

    fixed indentation

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d4d3d7f422c7327346b5731ad3c620f279411f2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:37:59 2011 -0400

    adding xml serialization and handling instance not found

 nova/api/openstack/servers.py                   |    8 ++
 nova/tests/api/openstack/test_server_actions.py |   20 ++++
 nova/tests/api/openstack/test_servers.py        |  135 +++++++++++++++++++++++
 3 files changed, 163 insertions(+)

commit e5e95e1bfb6b1569b7e30a7066a0cd9c6ebff2c7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:06:20 2011 -0400

    removing extraneous imports

 nova/tests/api/openstack/test_server_actions.py |    2 --
 1 file changed, 2 deletions(-)

commit bc235682305c3eb70eb80f1dddc15d86359a9ca3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 09:38:43 2011 -0400

    pep8

 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8191cd38b2030a9d8816bcc21bd0cbc0119a7d91
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 24 14:42:30 2011 +0200

    Thou shalt not use underscores in hostnames

 nova/compute/api.py        |    6 +++---
 nova/tests/test_compute.py |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 551b4b1b16c894551e5337663374a40aa46663d7
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 24 03:14:39 2011 -0700

    Catch exception for instances that aren't there
    
    If an instance failed to spawn it will be in a shutdown state but the instance
    won't actually be there when we attempt to deallocate for the instance.  For
    now we catch the exception and just log a message.
    
    Also made some minor formatting changes.

 nova/network/quantum/manager.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 13544ec52d4f84032b7925b1dab00fbdc5ca0c79
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 24 03:07:11 2011 -0700

    pep8 fixes

 nova/network/quantum/client.py        |    4 ++--
 nova/network/quantum/nova_ipam_lib.py |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 3058e5eeb5e1068b7b5f721b985c735bc5486c92
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 24 02:11:56 2011 -0700

    Couple of fixes to the review feedback changes

 nova/network/quantum/client.py  |   12 ++++++------
 nova/network/quantum/manager.py |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

commit f95d187e7b9f6f1c3d244668cc4aec49339ed169
Author: Launchpad Translations on behalf of nova-core <>
Date:   Wed Aug 24 04:47:59 2011 +0000

    Launchpad automatic translations update.

 po/cs.po    |   26 +---
 po/de.po    |   44 +-----
 po/es.po    |  484 +----------------------------------------------------------
 po/ja.po    |  479 +---------------------------------------------------------
 po/pt_BR.po |  156 +------------------
 po/ru.po    |  126 +---------------
 po/tl.po    |   13 +-
 po/uk.po    |   42 +-----
 8 files changed, 31 insertions(+), 1339 deletions(-)

commit c96a9ae1b84ee370ff5d8282a8e0531a97c5a396
Author: Brad Hall <brad@nicira.com>
Date:   Tue Aug 23 21:18:47 2011 -0700

    Address code review feedback from Rick and Matt

 bin/nova-manage                            |   11 ++--
 nova/network/manager.py                    |    2 +-
 nova/network/quantum/client.py             |   63 +++++++++----------
 nova/network/quantum/fake.py               |   19 +++---
 nova/network/quantum/manager.py            |   35 ++++++-----
 nova/network/quantum/melange_connection.py |    6 +-
 nova/network/quantum/melange_ipam_lib.py   |   90 ++++++++++++++--------------
 nova/network/quantum/nova_ipam_lib.py      |   39 ++++++------
 nova/network/quantum/quantum_connection.py |   10 ++--
 nova/tests/test_quantum.py                 |   18 +++---
 10 files changed, 146 insertions(+), 147 deletions(-)

commit 8b6f6145a4a99f8b60e77cb8758ffcc2c0591ebd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 23:27:36 2011 -0400

    removing print statement

 nova/tests/api/openstack/test_server_actions.py |    1 -
 1 file changed, 1 deletion(-)

commit 29940dd27f3a40a4ad54bc2f7a4cea5ac2226b83
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 23 20:22:27 2011 -0700

    added volume metadata APIs (OS & volume layers), search volume by metadata & other

 nova/api/openstack/contrib/volumes.py |   36 +++++++++++++++-
 nova/db/sqlalchemy/api.py             |   24 +++++------
 nova/tests/integrated/test_volumes.py |   16 ++++++++
 nova/volume/api.py                    |   73 +++++++++++++++++++++++++++++++--
 4 files changed, 129 insertions(+), 20 deletions(-)

commit 1ba752768a8834a855bd968a5772588f23b81c80
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 23 22:43:10 2011 -0400

    Update paste config so that EC2 admin API defaults to noauth.

 etc/nova/api-paste.ini |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 410edd037486a2e09bfc8276adc2a25459e2e2c8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 22:00:42 2011 -0400

    cleanup

 nova/compute/api.py     |    1 -
 nova/compute/manager.py |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 309a264db6c952081f2e85db21efc719596240a6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 20:59:24 2011 -0400

    updating tests

 nova/api/openstack/servers.py                   |    9 +-
 nova/tests/api/openstack/test_server_actions.py |  122 ++++++++++++++++-------
 2 files changed, 95 insertions(+), 36 deletions(-)

commit 0fc12640a09792fbf278c050c35c62933afcb68d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 15:53:59 2011 -0700

    fix iscsi adm command

 nova/volume/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9fbdfa5061dc17e43fc8a5200415e0dffc55b911
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Aug 23 15:40:28 2011 -0700

    Fix pep8

 nova/tests/test_nova_manage.py |    1 -
 1 file changed, 1 deletion(-)

commit 2fc6837064bfe4eb96b8b130631f75f73364568c
Merge: 8cd7dcc 83856c9
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Aug 23 15:32:44 2011 -0700

    Merged from trunk

commit ddc7d9470674a4d7300d15e5c6fa54b784b6a36f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 23 15:18:50 2011 -0700

    added volume_types APIs

 .../versions/037_add_volume_types_and_extradata.py |    4 +-
 nova/tests/test_volume_types.py                    |  156 ++++++++++++++++++++
 nova/volume/api.py                                 |    9 +-
 nova/volume/volume_types.py                        |   14 +-
 4 files changed, 170 insertions(+), 13 deletions(-)

commit da02fc6e4191bdbbb2015b78f9c3fe5045bb0460
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 15:14:09 2011 -0700

    Fix not found exceptions to properly use ec2_ips for not found

 nova/api/ec2/__init__.py |   10 ++++++----
 nova/exception.py        |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 8cd7dcca1ccac0347289d633ebd10567d6cba4c7
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Aug 23 15:06:24 2011 -0700

    Stub out the DB in unit test.
    Fix 'nova-manage network modify' to use db.network_update()

 bin/nova-manage                |   18 ++---
 nova/db/api.py                 |    6 --
 nova/db/sqlalchemy/api.py      |   31 --------
 nova/tests/test_nova_manage.py |  162 ++++++++++++++++++++++++++--------------
 4 files changed, 113 insertions(+), 104 deletions(-)

commit 360dbeebadb76b3628b2cfbd8b3c41e77581b24c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 17:31:19 2011 -0400

    rebuilds are functional again

 nova/api/openstack/servers.py |   14 ++++++++++----
 nova/compute/api.py           |    6 ++++--
 nova/compute/manager.py       |    6 ++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

commit 83856c9dd6e1f75e3db51574f3db2b4dc4922186
Merge: 474d394 8c30e3e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 21:19:44 2011 +0000

    Adds a use_deprecated_auth flag to make sure creds generated using nova-manage commands will work with noauth.

commit 343a29b3b1f922dec5ca48f179bac28cc1b54cf4
Merge: cbf8b3b 474d394
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 15:51:39 2011 -0500

    Merged from upstream.

commit cbf8b3b36dde763164fcfd06e1d3c5732f57311d
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 15:50:39 2011 -0500

    Fixed some pep8 and pylint issues.

 nova/notifier/list_notifier.py            |    7 ++++---
 nova/tests/notifier/test_list_notifier.py |    6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

commit 8c30e3e4b1847e6f44790fc4b614fe56de84cbfb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 13:44:21 2011 -0700

    Forgot to set the flag for the test

 nova/tests/test_auth.py |    1 +
 1 file changed, 1 insertion(+)

commit 474d394ebb077bb2cfc778d67ab4b1e3ccc7ceb0
Merge: 731d4e7 6bbef76
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 20:04:53 2011 +0000

    I added notifications  decorator for each API call using monkey_patching.
    By this merge, users can get API call notification from any modules.

commit 731d4e7f7631e8a8a303bef7779e3f0e513332ae
Merge: e23eb5a 295bcc8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 19:55:12 2011 +0000

    Fixes bug that causes 400 status code when an instance wasn't attached to a network.

commit a5fd82841bfada1b59066d82094f41ffa9389dec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 12:21:52 2011 -0700

    fix for rc generation using noauth.

 nova/auth/manager.py |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 6bbef7627200f6c6ef27b5ae5c9b114e8e6d0f52
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 12:06:25 2011 -0700

    Fixed doc string

 nova/flags.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 83713359429263154cd4e0f8c9de0ee3f8f0636f
Merge: b75f90e e23eb5a
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 13:16:04 2011 -0500

    Merged from upstream.

commit b75f90e0d83e50b6699a8e6efc60cc97a00c0678
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 13:12:54 2011 -0500

    Switched list_notifier to log an exception each time notify is called, for each notification driver that failed to import.

 nova/notifier/list_notifier.py            |   13 +++++++++++--
 nova/tests/notifier/test_list_notifier.py |   10 +---------
 2 files changed, 12 insertions(+), 11 deletions(-)

commit 295bcc8ef70d767bf1539defe1a79a67bdf555ff
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 13:44:39 2011 -0400

    updating tests

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3a64fa3171d424d02c68ec1fbecd4087edb694a0
Merge: 5ad22e3 e23eb5a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 13:08:42 2011 -0400

    merging trunk

commit 76f02277a3677d40a13a8b05a12f9d83053808c3
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 09:46:49 2011 -0700

    Fixed some docstring
    Added default publisher_id flagw

 nova/notifier/api.py                         |    7 +++++--
 nova/tests/monkey_patch_example/__init__.py  |   13 ++++++-------
 nova/tests/monkey_patch_example/example_a.py |    7 ++-----
 nova/tests/monkey_patch_example/example_b.py |    6 ++----
 nova/tests/test_notifier.py                  |    3 +--
 5 files changed, 16 insertions(+), 20 deletions(-)

commit f380b65cdce439d440b68b0f4a65be45d13ce453
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 08:51:44 2011 -0700

    Removed blank line

 nova/utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 82019a47e029427760db86762fc6cf95d14e0a84
Merge: 5ae4421 e23eb5a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 08:46:55 2011 -0700

    Merged with trunk

commit 5ae44219fd82d843cc5e715c318d9e80ab20b1a2
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 08:07:25 2011 -0700

    Fixed typo and docstring and example class name

 nova/notifier/api.py                         |    7 +++---
 nova/tests/example/__init__.py               |   34 --------------------------
 nova/tests/example/example_a.py              |   32 ------------------------
 nova/tests/example/example_b.py              |   32 ------------------------
 nova/tests/monkey_patch_example/__init__.py  |   34 ++++++++++++++++++++++++++
 nova/tests/monkey_patch_example/example_a.py |   32 ++++++++++++++++++++++++
 nova/tests/monkey_patch_example/example_b.py |   32 ++++++++++++++++++++++++
 nova/tests/test_utils.py                     |   25 ++++++++++---------
 nova/utils.py                                |    4 +--
 9 files changed, 116 insertions(+), 116 deletions(-)

commit 657e58113d481d5c03cb3395cd714846434675f0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 11:01:57 2011 -0400

    Updated migration number.

 .../versions/040_update_instance_states.py         |   57 --------------------
 .../versions/042_update_instance_states.py         |   57 ++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)

commit e23eb5aa5c9810f68f3818cd1119e4993b99a297
Merge: 787913d e1c2776
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 23 15:00:01 2011 +0000

    Move use_ipv6 into flags. Its used in multiple places (network manager and the OSAPI) and should be defined at the top level.

commit 30133c4f40a4891bbe4d5d8930af00b26026230d
Merge: 2fbaac5 787913d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 10:59:17 2011 -0400

    Merged trunk.

commit 2fbaac5e07b558d7829253915523f073b07e24d4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 10:57:47 2011 -0400

    PEP8 fixes

 nova/api/ec2/cloud.py       |   18 ++++++++-----
 nova/compute/task_states.py |   63 +++++++++++++++++++++----------------------
 nova/compute/vm_states.py   |   24 ++++++++---------
 nova/tests/test_compute.py  |   15 ++++++-----
 4 files changed, 63 insertions(+), 57 deletions(-)

commit e1c27761863a50bf33a2dcfffa96e911ae9b5b55
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 23 10:31:34 2011 -0400

    'use the ipv6' -- 'use ipv6'

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 909e0ea5c61ba66e5c07b91ff225d64adf60f960
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 23 10:21:07 2011 -0400

    Move use_ipv6 into flags. Its used in multiple places (network manager and the OSAPI) and should be defined at the top level.

 nova/flags.py           |    2 ++
 nova/network/manager.py |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 787913ddedce4f3395b4e3d5073a0eea259ed9f7
Merge: de114ef a7798c2
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 23 10:35:08 2011 +0000

    Refresh translations

commit 8d2401efe90368420ad347a4d523416785725eb7
Merge: 25ec08a 1500980
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 23 09:55:15 2011 +0200

    Merge generic virt-driver tests.

commit de114ef5af2d7abaf84be0b71638b45e5de23393
Merge: a69924e 6f36100
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 07:21:13 2011 +0000

    This branch does the final tear out of AuthManager from the main code. The NoAuth middlewares (active by default) allow a user to specify any user and project id through headers (os_api) or access key (ec2_api).
    
    The plan is to leave the auth manager code in but mention that it is deprecated.  There is a sample paste config in ini to still allow old auth.  Immediately after the diablo release we can tear out all of the Auth related code and not support the deprecated auth anymore.

commit a69924e60848cf420aa76816aa9c41fd0a5d2995
Merge: c2fb948 7f1adb5
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Tue Aug 23 06:00:12 2011 +0000

    Implements first-pass of config-drive that adds a vfat format drive to a vm when config_drive is True (or an image id).

commit 01a219f7bb5fb5101bdbaa49d7e46f55d51dcfd2
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Aug 23 05:21:47 2011 +0000

    Launchpad automatic translations update.

 po/it.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 632526f0cf7a5be3a26c3ae14683b75bfb6afbfd
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 22 22:18:43 2011 -0700

    pulling all qmanager changes into a branch based on trunk, as they were previously stacked on top of melange

 bin/nova-manage                                    |   35 ++-
 nova/db/api.py                                     |    5 +
 nova/db/sqlalchemy/api.py                          |   20 +-
 .../versions/041_add_network_priority.py           |   45 +++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/network/manager.py                            |   37 ++-
 nova/network/quantum/__init__.py                   |   16 +
 nova/network/quantum/client.py                     |  306 ++++++++++++++++++++
 nova/network/quantum/fake.py                       |  213 ++++++++++++++
 nova/network/quantum/manager.py                    |  232 +++++++++++++++
 nova/network/quantum/melange_connection.py         |  133 +++++++++
 nova/network/quantum/melange_ipam_lib.py           |  135 +++++++++
 nova/network/quantum/nova_ipam_lib.py              |  152 ++++++++++
 nova/network/quantum/quantum_connection.py         |   97 +++++++
 nova/tests/test_quantum.py                         |  261 +++++++++++++++++
 15 files changed, 1660 insertions(+), 28 deletions(-)

commit 7f1adb50cfab91a553f2d129b9b2eef1e5b2145b
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 22:17:51 2011 -0700

    Moved migration and fixed tests from upstream

 nova/compute/api.py                                |    2 +-
 .../versions/041_add_config_drive_to_instances.py  |   38 ++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py           |   28 ++++++++-------
 nova/tests/test_compute.py                         |    2 +-
 nova/virt/disk.py                                  |    2 +-
 nova/virt/libvirt/connection.py                    |    7 ++--
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 7 files changed, 61 insertions(+), 20 deletions(-)

commit b91a5542c17e25e3b1cf08a79d88673cfe0a7e9e
Merge: c2fb948 4c26745
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 21:17:57 2011 -0700

    Merged trunk

commit 4c2674516897b6cce0441efe4ebb005c01cb3411
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 21:06:47 2011 -0700

    Added the fixes suggested by Eric Windisch from cloudscaling...

 nova/virt/disk.py            |    2 +-
 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

commit 5ad22e341e0ad5ff62e97906edf7822ee53b4ae9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 23:30:12 2011 -0400

    removing unnecessary tthing

 nova/api/openstack/views/addresses.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f304ecb74cced6d57dc4590f5bf41b7df88a504
Merge: af39051 c2fb948
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 20:05:08 2011 -0700

    merge trunk, resolve conflicts, fix tests

commit 6f3610042452cc1cb6b1e0c204a127c0c48794f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 19:25:22 2011 -0700

    unindented per review, added a note about auth v2

 nova/api/openstack/auth.py |   32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

commit c2fb9485f956482a5e6d628bb80e86d3e8d90d3a
Merge: 4e987a0 4ded14d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 23 02:05:35 2011 +0000

    Our goal is to add optional parameter to the Create server OS 1.0 and 1.1 API to achieve following objectives:-
    
    1) Specify number and order of networks to the create server API.
    
    In the current implementation every instance you launch for a project having 3 networks assigned to it will always have 3 vnics. In this case it is not possible to have one instance with 2 vnics ,another with 1 vnic and so on. This is not flexible enough and the network resources are not used effectively.
    
    2) Specify fixed IP address to the vnic at the boot time. When you launch a server, you can specify the fixed IP address you want to be assigned to the vnic from a particular network. If this fixed IP address is already in use, it will give exception.
    
    Example of Server Create API request XML:
    <?xml version="1.0" encoding="UTF-8"?>
    
    <server xmlns="http://docs.nttpflab.com/servers/api/v1.0"
            name="new-server-test" imageId="1" flavorId="1">
      <metadata>
        <meta key="My Server Name">Apache1</meta>
      </metadata>
      <personality>
        <file path="/etc/banner.txt">
            ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
        </file>
      </personality>
      <networks>
          <network uuid="6622436e-5289-460f-8479-e4dcc63f16c5" fixed_ip="10.0.0.3">
          <network uuid="d97efefc-e071-4174-b6dd-b33af0a37706" fixed_ip="10.0.1.3">
      </networks>
    </server>
    
    3) Networks is an optional parameter, so if you don't provide any networks to the server Create API, it will behave exactly the same as of today.
    
    This feature is supported to all of the network models.

commit d994b06f65af9d4c523a4123f915c6147ada7c05
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 22:00:13 2011 -0400

    fixing exception logging

 nova/api/openstack/views/addresses.py |    9 +++------
 nova/api/openstack/wsgi.py            |    5 ++---
 2 files changed, 5 insertions(+), 9 deletions(-)

commit 4e987a070ad3d50d2b47a894029f981168bacd1f
Merge: 2444acd 0a9a6db
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 23 00:44:47 2011 +0000

    Fixes bug 831627 where nova-manage does not exit when given a non-existent network address

commit 2444acdff40c6c44fc0f3d013b6a893f3a0b5c1d
Merge: 71f039b 25ec08a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 23 00:34:32 2011 +0000

    Move documentation from nova.virt.fake into nova.virt.driver.

commit 1d121a42f5072026a3ad19cb5fd1915d7cd2ff63
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Aug 22 17:31:48 2011 -0700

    initial cut on volume type APIs

 nova/db/sqlalchemy/api.py    |   16 +++----
 nova/db/sqlalchemy/models.py |    2 +-
 nova/exception.py            |    4 ++
 nova/volume/api.py           |    8 +++-
 nova/volume/volume_types.py  |  101 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 120 insertions(+), 11 deletions(-)

commit af39051bd033e9e4017fec0fe1647aef582bc38e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 17:02:54 2011 -0700

    fix pep8 issue

 nova/api/openstack/create_instance_helper.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 20a58d38232e910f0a5d844caaf506c8d710477f
Merge: 0d0c8df 4ded14d
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 17:01:54 2011 -0700

    Merge latest lp:~tpatil/nova/add-options-network-create-os-apis and resolve the conflict

commit 0d0c8dfbf29b47aa13e18dd8861bad6ccb10cf12
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 16:46:29 2011 -0700

    Change parameters of 'nova-manage network modify'.
    Move common test codes into private method.

 bin/nova-manage                |   40 +++++++++++++++++++++-------------------
 nova/tests/test_nova_manage.py |   21 +++++++++++----------
 2 files changed, 32 insertions(+), 29 deletions(-)

commit 4ded14d0d8fb4ec1bbc14255e90cbaae0626997f
Merge: 94b3055 71f039b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 22 16:35:09 2011 -0700

    Merged from trunk,resolved conflicts and fixed broken unit tests due to changes in the extensions which now include ProjectMapper

commit 49ef06ba21115a64c2efbb6fa81e0e6ee3f9095d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 16:21:29 2011 -0700

    xml deserialization, and test fixes

 nova/api/openstack/servers.py            |    9 +++-
 nova/tests/api/openstack/test_servers.py |   66 +++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 3 deletions(-)

commit 158a953f98f8d4ee365cbc4936754fe7a8c89082
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Aug 22 17:52:54 2011 -0500

    syntax

 nova/tests/test_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d2ea838bfad96bae172458ac6389a9f98111a7df
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Aug 22 17:46:47 2011 -0500

    update test_network test_get_instance_nw_info()

 nova/network/manager.py         |   12 +++----
 nova/tests/fake_network_info.py |   21 +++++++-----
 nova/tests/test_network.py      |   71 +++++++++++++++++----------------------
 3 files changed, 48 insertions(+), 56 deletions(-)

commit de0a17310e7228aa96263243851a89fb016f9730
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 15:21:31 2011 -0700

    remove extra spaces

 nova/api/openstack/contrib/simple_tenant_usage.py |    2 --
 1 file changed, 2 deletions(-)

commit 63a1591fb502fbabe050363beb7ef89aa745a567
Merge: 5a28848 dd9d919
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Mon Aug 22 14:45:18 2011 -0700

    Fixed conflict with branch

commit 0a9a6db83aca1f84b6e7943edd492e9fbc066063
Merge: 77f1515 71f039b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 17:35:43 2011 -0400

    merged trunk

commit 71f039b936aabb7381b0423e743da65f1475fb35
Merge: dd9d919 8d62d47
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 21:34:32 2011 +0000

    The FixedIpCommandsTestCase in test_nova_manage previously accessed the database. This branch stubs out the database for these tests, lowering their run time from 104 secs -> .02 secs total.
    
    I have verified the tested functionality is still being tested.

commit 4b0944731a25d3cfcd30358619376dedf2251701
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 14:31:26 2011 -0700

    some readability fixes per ja feedback

 nova/api/openstack/contrib/simple_tenant_usage.py |   29 +++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

commit 43add36446e6b4172dc8ed5043e11187a9992474
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 14:26:41 2011 -0700

    fix comment

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 150098011db8ca6c534c4a281df388bd42301eea
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 22 23:26:12 2011 +0200

    Update a few doc strings.
    Address a few pep8 issues.
    Add nova.tests.utils which provides a couple of handy methods for testing stuff.

 nova/tests/test_test_utils.py   |   41 +++++++++++++++++++++++
 nova/tests/test_virt_drivers.py |   26 +++++++++------
 nova/tests/utils.py             |   68 +++++++++++++++++++++++++++++++++++++++
 nova/virt/driver.py             |   18 ++++-------
 4 files changed, 132 insertions(+), 21 deletions(-)

commit b24a05dbc19eaf67661eac98aa778d789ffa7b4e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 22 23:25:08 2011 +0200

    Make snapshot raise InstanceNotRunning when the instance isn't running.

 nova/virt/fake.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c3ed01d7d53dbade412122743078d60131adbf9f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 14:24:59 2011 -0700

    change NoAuth to actually use a tenant and user

 etc/nova/api-paste.ini     |   12 +++++-----
 nova/api/auth.py           |   19 +---------------
 nova/api/ec2/__init__.py   |   21 ++++++++++++++++++
 nova/api/openstack/auth.py |   52 +++++++++++++++++++++++++++++++++-----------
 4 files changed, 67 insertions(+), 37 deletions(-)

commit 5a288485215a13f3892ae17a46b9644ed84fc089
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Mon Aug 22 14:24:37 2011 -0700

    Added Test Code, doc string, and fixed pip-requiresw

 nova/flags.py               |    5 +++--
 nova/notifier/api.py        |    8 ++++++++
 nova/tests/test_notifier.py |   22 ++++++++++++++++++++++
 nova/tests/test_utils.py    |   44 +++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py               |   26 ++++++++++++++++++++++---
 tools/pip-requires          |    1 -
 6 files changed, 100 insertions(+), 6 deletions(-)

commit fb6a2543fd97116daa8688a9f696cf0781562e3b
Merge: 3ad42ee dd9d919
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 17:18:47 2011 -0400

    Merged trunk.

commit 3ad42eea208a85619efe0096be8388526b5ffe3b
Merge: ea3684d 393c937
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 17:17:39 2011 -0400

    Merge and fix tests.

commit 77f15157c5ca7013df397abc22a8866cce02976d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 17:08:11 2011 -0400

    Ensure that reserve and unreserve exit when an address is not found

 bin/nova-manage                |    2 ++
 nova/tests/test_nova_manage.py |   10 ++++++++++
 2 files changed, 12 insertions(+)

commit 7726b3d763a136347f2324e630f0a3cdc60a045b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 14:08:03 2011 -0700

    Simple usage extension for nova.  Uses db to calculate tenant_usage for specified time periods.
    
    Methods:
        index: return a list of tenant_usages, with option of incuding detailed server_usage
        show: returns a specific tenant_usage object
    
    tenant_usage object:
        tenant_usage.total_memory_mb_usage: sum of memory_mb * hours for all instances in tenant for this period
        tenant_usage.total_local_gb_usage: sum of local_gb * hours for all instances in tenant for this period
        tenant_usage.total_vcpus_usage: sum of vcpus * hours for all instances in tenant for this period
        tenant_usage.total_hours: sum of all instance hours for this period
        tenant_usage.server_usages: A detailed list of server_usages, which describe the usage of a specific server
    
    For larger instances db tables, indexes on instance.launched_at and instance.terminated_at should significantly help performance.

 nova/api/openstack/contrib/simple_tenant_usage.py  |  268 ++++++++++++++++++++
 .../openstack/contrib/test_simple_tenant_usage.py  |  189 ++++++++++++++
 2 files changed, 457 insertions(+)

commit 259e71903bab4fe7039ec58a3c5b140bafc65e62
Merge: f05da72 94b3055
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 13:42:09 2011 -0700

    Merge latest lp:~tpatil/nova/add-options-network-create-os-apis

commit 8d62d47a1148cc79c0ef0330e0c2d70177ea71c8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 16:39:05 2011 -0400

    Stubbed out the database in order to improve tests

 nova/tests/test_nova_manage.py |   42 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

commit 269b4e00e82b8f99d2fc24f935ff165d62f19891
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 16:23:48 2011 -0400

    logging as exception rather than error

 nova/api/openstack/views/addresses.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5c4d35f94f5bb85b2140b0d68e545b5c23725f56
Merge: 51344d7 dd9d919
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 15:22:21 2011 -0500

    Merged from upstream.

commit 51344d7be195f9342d24d461f4c07fa1c9141da4
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 15:21:31 2011 -0500

    Changed list_notifier to call sys.exit if a notification driver could not be found.

 nova/notifier/list_notifier.py            |   15 ++++-----------
 nova/tests/notifier/test_list_notifier.py |   15 ++++++++++-----
 2 files changed, 14 insertions(+), 16 deletions(-)

commit fa168605f6636f7a4b07be7be5a085b81890b124
Merge: 6d87608 dd9d919
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 13:14:08 2011 -0700

    merged trunk

commit dd9d9195b0d77e2801e001be45aafe9bc14b4b2c
Merge: 0af1508 e490e3c
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 20:00:11 2011 +0000

    implemented tenant ids to be included in request uris.

commit 25ee794d803fa522d31177dc16d8c535d9b8daab
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 22 21:52:49 2011 +0200

    Add a generic set of tests for hypervisor drivers.

 nova/tests/test_virt_drivers.py |  483 +++++++++++++++++++++++++++++++++++++++
 nova/virt/fake.py               |    8 +
 2 files changed, 491 insertions(+)

commit 1b9cc046e9ae2bc5d0c1bd015d4e3304541ebd3c
Merge: e36ebf3 0af1508
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 14:07:27 2011 -0500

    Upstream merge

commit e36ebf31699546e48d27754ac1e26b3704399ab0
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 14:06:59 2011 -0500

    Added ability to detect import errors in list_notifier if one or more drivers could not be loaded.

 Authors                                   |    1 +
 nova/notifier/list_notifier.py            |   23 ++++++++++---
 nova/tests/notifier/test_list_notifier.py |   52 ++++++++++++++---------------
 3 files changed, 46 insertions(+), 30 deletions(-)

commit f05da72e28fac1bfc7f208ce57d4462a53f290f2
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 11:50:44 2011 -0700

    Fix pep8

 bin/nova-manage                |    5 ++++-
 nova/db/api.py                 |    3 ++-
 nova/tests/test_nova_manage.py |    6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

commit 9bcd9fc5b339af97d161a65f3da84ed1bd99da2f
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 10:27:54 2011 -0700

    delete debug code.

 nova/db/sqlalchemy/api.py |    1 -
 1 file changed, 1 deletion(-)

commit ea3684d2a2e60f19bdea6b3117be613103a605dc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 13:16:48 2011 -0400

    Fixes for a number of tests.

 nova/compute/api.py              |    3 +++
 nova/compute/task_states.py      |    1 +
 nova/tests/vmwareapi/db_fakes.py |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

commit 393c9375626812ecb904d9048c833b0d110e9aa8
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 13:04:05 2011 -0400

    Use 'vm_state' instead of 'state' in instance filters query.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3fd521615337e68c56e62c20f3bba68f63223914
Merge: c273678 d60f813
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 12:01:11 2011 -0400

    Merged with Dan to fix some EC2 cases.

commit 9508bb599c15035f7afbdc80fe70d539e8598edf
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 08:59:35 2011 -0700

    Add 'nova-manage network modify' command.

 bin/nova-manage                |   30 ++++++++++++++++++++++++
 nova/db/api.py                 |    5 ++++
 nova/db/sqlalchemy/api.py      |   32 +++++++++++++++++++++++++
 nova/tests/test_nova_manage.py |   50 +++++++++++++++++++++++++++++++---------
 4 files changed, 106 insertions(+), 11 deletions(-)

commit d60f813201df345507ce0aca7bed0f8b719aabfe
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 11:59:08 2011 -0400

    Fixes/updates to make test_cloud pass.

 nova/api/ec2/cloud.py    |    1 +
 nova/compute/manager.py  |    2 +-
 nova/tests/test_cloud.py |    7 ++++---
 nova/virt/fake.py        |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

commit c2736787be23d0893e2d4aebcc2cad6fdc5c2bd1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 11:57:42 2011 -0400

    Fix scheduler and integrated tests.

 nova/tests/integrated/test_servers.py  |   11 +++++++++--
 nova/tests/scheduler/test_scheduler.py |    6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

commit a450c0f3bcc93fe3ec74939e49b109cb02624913
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 11:09:24 2011 -0400

    Update migration number.

 .../versions/039_update_instance_states.py         |   57 --------------------
 .../versions/040_update_instance_states.py         |   57 ++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)

commit 49618e4b03f890424a580a77a583ed2c18989dc6
Merge: 699cf3e 0ea797c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 11:05:54 2011 -0400

    Merged with Dan.

commit 699cf3e939fd0d2e3e50841ac229d3670787bfe9
Merge: 0de475b 44aea95
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 11:04:45 2011 -0400

    Merged task_state -> task_states and fixed test_servers test.

commit 0ea797cd8e709d910c428234417fb179bdfd1525
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 10:50:05 2011 -0400

    Update virt/fake to correct power state issue.

 nova/virt/fake.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e490e3c612792725970c8b5a697e457153fac827
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 10:19:01 2011 -0400

    fix test_servers tests

 nova/tests/api/openstack/test_servers.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 3fd594b0c51f3dcd5bdea252bf365c243864bd8b
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 10:08:48 2011 -0400

    update test_security_group tests that have been added

 .../api/openstack/contrib/test_security_groups.py  |   40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit 0de475bb878189c217eb208540c9f2079f3db78f
Merge: f82d2d3 0af1508
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 10:01:49 2011 -0400

    Merged trunk.

commit 44aea954e5efa7d94d8333ddbf54dab6464018a0
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 10:01:13 2011 -0400

    Renamed task_state to task_states...

 nova/api/openstack/common.py                    |    6 ++--
 nova/compute/manager.py                         |   30 ++++++++--------
 nova/compute/task_state.py                      |   43 -----------------------
 nova/compute/task_states.py                     |   43 +++++++++++++++++++++++
 nova/tests/api/openstack/test_server_actions.py |    1 -
 nova/tests/vmwareapi/db_fakes.py                |    4 +--
 6 files changed, 63 insertions(+), 64 deletions(-)

commit f82d2d309a0f826522854fe331d1c53b8c6d6879
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 22 09:54:33 2011 -0400

    Ec2 API updates.

 nova/api/ec2/cloud.py    |   25 ++++++++++++++++++++++++-
 nova/tests/test_cloud.py |    8 ++++----
 nova/virt/fake.py        |   12 ++++++------
 3 files changed, 34 insertions(+), 11 deletions(-)

commit ba218353bcc905fd40ca4838c625fdbc371b9974
Merge: 4d9cd63 0af1508
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 08:28:12 2011 -0400

    merge with trunk

commit a7798c2962348ea503e960fb83884972537f6380
Merge: 0af1508 6d6ea16
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Aug 22 09:54:28 2011 +0200

    Fixing merge conflicts

commit 6d6ea16b2840d876120f7cad2aa679eee0370cb9
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Aug 22 04:48:50 2011 +0000

    Launchpad automatic translations update.

 po/it.po |   83 ++++++++++++++++++--------------------------------------------
 1 file changed, 24 insertions(+), 59 deletions(-)

commit 0af1508c38bcf027153dd91c0d862307e90a164e
Merge: 34f3599 c7e0aa5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 03:17:04 2011 +0000

    Adds accessIPv4 and accessIPv6 to servers requests and responses as per the current spec.

commit 9fc23f1055be435e8a21b999f748a8461552bd13
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Aug 21 23:16:26 2011 -0400

    adding import

 nova/api/openstack/wsgi.py |    1 +
 1 file changed, 1 insertion(+)

commit 34f35990ed675a9360db3cbb317b9560755b22ef
Merge: 271817c c11a156
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 22 03:09:47 2011 +0000

    Fixes utils.to_primitive (again) to handle modules, builtins and whatever other crap might be hiding in an object.

commit 34e310eff24b96bcc27df176bfecbd02ac863e7c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Aug 21 22:59:46 2011 -0400

    fixing bug lp:830817

 nova/api/openstack/views/addresses.py    |   26 +++++++++++++++++++++++---
 nova/api/openstack/wsgi.py               |    6 +++---
 nova/tests/api/openstack/test_servers.py |   21 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 6 deletions(-)

commit d4b09b85ad20bd0b83bc48d7bd1e0c6754b2649b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Aug 21 18:07:07 2011 -0700

    added test for bad project_id ... although it may not be used

 nova/tests/test_ipv6.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit b5bf5fbb77e95b44f3254a111374ddba73016c4d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Aug 21 18:01:34 2011 -0700

    added exception catch and test for bad project_id

 nova/ipv6/account_identifier.py |    2 ++
 nova/tests/test_ipv6.py         |    7 +++++++
 2 files changed, 9 insertions(+)

commit 326cfda8cc50f5db083e9df381d3109e0302605d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Aug 21 17:55:54 2011 -0700

    added exception catch for bad prefix and matching test

 nova/ipv6/account_identifier.py |    2 ++
 nova/tests/test_ipv6.py         |    7 +++++++
 2 files changed, 9 insertions(+)

commit 0fdbea56baaef08575b98e8a553ceac9876e4962
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Aug 21 17:52:14 2011 -0700

    added exception catch and test for bad prefix

 nova/ipv6/rfc2462.py    |    2 ++
 nova/tests/test_ipv6.py |    7 +++++++
 2 files changed, 9 insertions(+)

commit f2981d8463779fa1fca52c840d91b47845719340
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 18:28:30 2011 -0700

    comment strings

 nova/tests/test_versions.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 3bbecbbb8c857079f75bea6fc6610bce9942de34
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 18:20:55 2011 -0700

    added unit tests for versions.py

 nova/tests/test_versions.py |   58 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

commit 271817cdce37c55f29bb9782429ee8b6ad57364e
Merge: 7924fb7 bb98913
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sun Aug 21 00:04:29 2011 +0000

    Added OS APIs to associate/disassociate security groups to/from instances.
    
    I will add views to return list of security groups associated with the servers later after this branch is merged into trunk. The reason I will do this later is because my previous merge proposal (https://code.launchpad.net/~tpatil/nova/add-options-network-create-os-apis/+merge/68292) is dependent on this work. In this merge proposal I have added a new extension which still uses default OS v1.1 controllers and views, but I am going to override views in this extension to send extra information like security groups.

commit bb989133196744779527e36cba22a76bd44e533b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sat Aug 20 15:38:13 2011 -0700

    add/remove security groups to/from the servers as server actions

 nova/api/openstack/contrib/security_groups.py      |  248 ++++++-----------
 nova/compute/api.py                                |   72 +++++
 nova/exception.py                                  |   10 +
 .../api/openstack/contrib/test_security_groups.py  |  294 +++++++++-----------
 4 files changed, 296 insertions(+), 328 deletions(-)

commit 43e2ca531f0fdea5173b7f237627fc3543caf13b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 15:30:59 2011 -0700

    lp:828610

 nova/ipv6/account_identifier.py |    2 +-
 nova/tests/test_ipv6.py         |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit bad921b5efa7b11a91d1df32b3d17fdb95852589
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 15:07:37 2011 -0700

    removed leftover netaddr import

 nova/tests/test_ipv6.py |    1 -
 1 file changed, 1 deletion(-)

commit f4cd3a72fa2a3630ccab2c0224777c3eff05380e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 14:55:41 2011 -0700

    added rainy day test for ipv6 tests. fixed ipv6.to_global to trap correct exception.

 nova/ipv6/rfc2462.py    |    2 +-
 nova/tests/test_ipv6.py |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 71ae1f16312371fee810221e81c2bcb0fcb5a4ef
Merge: c3ef50f 7924fb7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sat Aug 20 13:15:05 2011 -0700

    Merged from trunk

commit 65b30ad73338fa481d1ab9155153b8265fbe8f90
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 12:43:50 2011 -0700

    pep8

 nova/tests/test_instance_types.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 37508da788c5b2c2eadb36ef61d58836d93a3365
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 12:41:38 2011 -0700

    improve test coverage for instance types / flavors

 nova/tests/test_instance_types.py |   66 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

commit f2fdb6a3028172d9085d0759d4b6770da9e71cb7
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Aug 20 05:06:37 2011 +0000

    Launchpad automatic translations update.

 po/zh_CN.po |  122 ++++++++---------------------------------------------------
 1 file changed, 15 insertions(+), 107 deletions(-)

commit 7924fb7899b02d3cb7420c916e035094d5c90194
Merge: 2837a9f 9b65cdf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 23:59:23 2011 +0000

    Assorted fixes to os-floating-ips to make it play nicely with an in-progress novaclient implementation, as well as some changes to make it more consistent with other os rest apis.  Changes include:
    
    * switch associate/disassociate to PUTs.  Previously, it was doing create calls with one-off parameter resources.
    * allow graceful handling when there are no floating ips for a tenant
    * allow graceful handling when disassociating an already disassociated address

commit 4d975772a6a488a99bec616f0118dd1ce74e9403
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 18:04:08 2011 -0500

    finished fake network info, removed testing shims

 nova/tests/test_compute.py |    3 ---
 1 file changed, 3 deletions(-)

commit 154f1fbcc7098aca210514ce9f458fb755b4b50b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:51:14 2011 -0500

    updated a maths

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32e5341af311faf9838bd5d039b2153549726a71
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:36:52 2011 -0500

    updated a maths

 nova/tests/fake_network_info.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 46d8b0340b5e210898099de4cf8df05879c6c7a4
Merge: c4e77b6 2837a9f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 19 18:36:09 2011 -0400

    Merged trunk.

commit c4e77b67a74cb0828bb9a7ccbedcaa1baeb6188d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 19 18:34:34 2011 -0400

    Lots of modifications surrounding the OSAPI to remove any mention of dealing with power states and exclusively using vm_states and task_state modules. Currently there are still a number of tests failing, but this is a stopping place for today.

 nova/api/openstack/common.py                    |   52 ++++++------
 nova/api/openstack/servers.py                   |   12 ++-
 nova/api/openstack/views/servers.py             |    5 +-
 nova/compute/vm_states.py                       |    2 +
 nova/tests/api/openstack/test_server_actions.py |   28 ++++---
 nova/tests/api/openstack/test_servers.py        |  102 +++++++++++++++--------
 nova/tests/integrated/test_servers.py           |   27 +++---
 nova/tests/vmwareapi/db_fakes.py                |    5 +-
 8 files changed, 138 insertions(+), 95 deletions(-)

commit 44af602dbc6f02de44e2b844a8d53a87680b7a94
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:18:57 2011 -0500

    who cares

 nova/tests/test_compute.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95851baea252d801cbb704e869f78162ea995ceb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:05:29 2011 -0500

    added return

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 94b3055ade678a80d88b5e8ee8c3491c7bce95a2
Merge: d27a4d4 2837a9f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 19 15:04:25 2011 -0700

    Merged from trunk and fixed review comments

commit 6ab9559b5f1f398cdaac4eca7bfcfcda859d8bc8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:02:21 2011 -0500

    fixed formatting string

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 429d28df87e887ef297453f3dc186c1a99ba0a7a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:00:13 2011 -0500

    typo

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e6451b722b1e77ccab702482d5d5ad516056825
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:58:39 2011 -0500

    typo

 nova/tests/fake_network_info.py |    1 +
 nova/tests/test_compute.py      |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 23e163199e3b3208d7ba16049b7a93cbd59a8eaf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:48:01 2011 -0500

    typo

 nova/tests/fake_network_info.py |    1 -
 1 file changed, 1 deletion(-)

commit ca83ca57646ba76908e9b5e600208fe9afde78a4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:47:10 2011 -0500

    typo

 nova/tests/fake_network_info.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c4d73b638dee9dc4c1b2883affc0c00cdfc5ecb6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:44:23 2011 -0500

    typo

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 608a6c3e719fffe9af6f8f7cc6d18824d0c28c36
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:42:52 2011 -0500

    typo

 nova/tests/fake_network_info.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 773f64af47e38f10b20399fcfaa43cc52eb1d2e6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:41:02 2011 -0500

    added fake network info

 nova/tests/fake_network_info.py |  107 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

commit d27a4d4a59a0103762ece2776ddd484629a72d54
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 19 14:25:41 2011 -0700

    Fixed review comments

 nova/db/api.py                                     |   21 +---
 nova/db/sqlalchemy/api.py                          |  104 ++++++--------------
 .../versions/037_add_uuid_to_networks.py           |   43 --------
 .../versions/039_add_uuid_to_networks.py           |   43 ++++++++
 nova/exception.py                                  |    6 +-
 nova/network/manager.py                            |   68 ++++++-------
 nova/tests/test_network.py                         |   81 ++++++++-------
 7 files changed, 151 insertions(+), 215 deletions(-)

commit e10aa40bd6c2f96b2f5bba8b38b9605f019328e9
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:22:53 2011 -0700

    Fixed typo

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b65cdf0b2d5cc7ed7adcaca0dde4d6e2a10bf95
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 14:16:57 2011 -0700

    better handle malformed input, and add associated tests

 nova/api/openstack/contrib/floating_ips.py         |    6 +++
 .../api/openstack/contrib/test_floating_ips.py     |   40 ++++++++++++++++++++
 2 files changed, 46 insertions(+)

commit 27723b95f7b3a64226ebe431e17cbf681b40303b
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:13:39 2011 -0700

    Fixed typo

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8ec1a5b9002f4a4cda5d7156c6006aac0035c33
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:12:33 2011 -0500

    initial committ

 nova/tests/test_compute.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 75eb485c3a0e53380b9247d45e2a66159928dcd2
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:04:58 2011 -0700

    Fixed NoneType returned bugw

 nova/notifier/api.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit c7e0aa577d1747ddb74703c5c46f3e180985c458
Merge: 5f6cd49 2837a9f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 16:44:13 2011 -0400

    merged trunk

commit 5f6cd490425d8d91870de1b4a492a6cb34502bcb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 16:36:20 2011 -0400

    Updated accessIPv4 and accessIPv6 to always be in a servers response

 nova/api/openstack/views/servers.py      |    6 ++----
 nova/tests/api/openstack/test_servers.py |   19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

commit 46ba1b111bfff27edcb963bc43869f26b02d569a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 13:31:54 2011 -0700

    Fixed mistake on mergew

 bin/nova-scheduler |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ce4ac4be2b813a8f025a9f2891fbc1ed4101c496
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 13:31:49 2011 -0700

    tweak to comment

 nova/api/openstack/contrib/floating_ips.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9059902c7281467d6a9314f01d2b2767213f89c5
Merge: c06bbe9 2837a9f
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 13:25:49 2011 -0700

    Merged with trunkw

commit 468893c667c7ce6cddb9d62906dfcb807fcd6da1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 13:25:33 2011 -0700

    a few tweaks - remove unused member functions, add comment

 nova/api/openstack/contrib/floating_ips.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 5366332a84b89bc5a056bd7f43e528a908e8d188
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 13:15:42 2011 -0700

    incorporate feedback from brian waldon and brian lamar.  Move associate/disassociate to server actions

 nova/api/openstack/contrib/floating_ips.py         |   69 +++++++++++++-------
 .../api/openstack/contrib/test_floating_ips.py     |   57 +++++++---------
 2 files changed, 69 insertions(+), 57 deletions(-)

commit 4d9cd63c2f269f795e476869557f6bd3d7dcc777
Merge: 70cfff2 2837a9f
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 16:03:24 2011 -0400

    merge from trunk

commit 9827c92838d144f7c129e9e5545126f100926dba
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 15:58:50 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit c75e132786a65501477f77efa1bc9147b7763c31
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 15:55:56 2011 -0400

    Finished changing ServerXMLSerializationTest to use XML validation and lxml

 nova/api/openstack/schemas/v1.1/server.rng        |   50 +++
 nova/api/openstack/schemas/v1.1/servers.rng       |    6 +
 nova/api/openstack/schemas/v1.1/servers_index.rng |   12 +
 nova/tests/api/openstack/test_servers.py          |  349 +++++++++++----------
 4 files changed, 251 insertions(+), 166 deletions(-)

commit c06bbe99734f2fea35cfb4bdd854814c9119b617
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 12:30:55 2011 -0700

    Added monkey patching notification code function
    w

 bin/nova-api         |    2 +-
 bin/nova-compute     |    1 +
 bin/nova-network     |    1 +
 bin/nova-objectstore |    1 +
 bin/nova-scheduler   |    1 +
 nova/flags.py        |    8 ++++++++
 nova/notifier/api.py |   18 ++++++++++++++++++
 nova/utils.py        |   24 +++++++++++++++++++++++-
 tools/pip-requires   |    1 +
 9 files changed, 55 insertions(+), 2 deletions(-)

commit fe8800ada8670cb29417fcdec085800b66cd881f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 15:21:04 2011 -0400

    Updated test_show in ServerXMLSerializationTest to use XML validation

 nova/tests/api/openstack/test_servers.py |  101 +++++++++++++++++-------------
 1 file changed, 58 insertions(+), 43 deletions(-)

commit 3bd386cdba53f6a54a29e510c0f9eecf9b9ea7d9
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 19 15:13:40 2011 -0400

    vm_state --> vm_states

 nova/api/ec2/cloud.py                  |   24 +++++++--------
 nova/compute/api.py                    |   46 ++++++++++++++---------------
 nova/compute/manager.py                |   50 ++++++++++++++++----------------
 nova/compute/vm_state.py               |   31 --------------------
 nova/compute/vm_states.py              |   31 ++++++++++++++++++++
 nova/scheduler/driver.py               |    4 +--
 nova/tests/scheduler/test_scheduler.py |    2 +-
 nova/tests/test_compute.py             |    8 ++---
 8 files changed, 98 insertions(+), 98 deletions(-)

commit 2837a9f8e81fd67b01971a4d8c308f79ab7e7d68
Merge: 1bcdf2f 509ce9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 19 19:02:02 2011 +0000

    Next round of prep for keystone integration.
    
     * adds middleware for authenticating ec2 signature with keystone
     * adds middleware for converting keystone response into request context
     * gives examples of alternative pipelines for keystone integration
    
    Next steps:
     * provide default config with no keystone integration (perhaps setting every context to admin?)
     * write authmanager to keystone conversion code
     * add api extension to create and destroy access/secret keys
     * deprecate authmanager
     * rename project to tenant

commit 70cfff2a9ee4e34705a342157c8711552f89d764
Merge: ba9c7de 1bcdf2f
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 14:55:38 2011 -0400

    merge from trunk

commit 1bcdf2f32d02e52c61c7b6d0f90d0354612d511e
Merge: ba079e5 ce5c954
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 19 18:37:39 2011 +0000

    Removes the incorrect hard-coded filter path.

commit 25ec08a208474e1cf5827c1eb8b231d631c489e9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 20:09:31 2011 +0200

    Revert irrelevant changes that accidentally crept into this patch :(

 nova/virt/fake.py |    2 --
 1 file changed, 2 deletions(-)

commit 34ef09beb3bf00fd9eb16b8517c520af24641e8c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 10:10:51 2011 -0700

    add tenant_id to api.  without tenant_id, admins can't tell which servers belong to which tenants when retrieving lists

 nova/api/openstack/servers.py            |    5 +++++
 nova/api/openstack/views/servers.py      |    1 +
 nova/tests/api/openstack/test_servers.py |   29 ++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

commit 10fdf234039d1c5e21037a17809186152f1d718d
Merge: 69c2621 ba079e5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 19 10:08:46 2011 -0700

    Merged from trunk

commit c11a156b1e50fde6cf3047057746564d491634e2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 19 10:01:25 2011 -0700

    Fixes primitive with builtins, modules, etc

 nova/tests/test_utils.py |   10 ++++++++++
 nova/utils.py            |   12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

commit ba9c7ded1da97094743a1c27d8f0665378ad726f
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 13:01:21 2011 -0400

    fix test_virtual interfaces for tenant_id stuff

 .../openstack/contrib/test_virtual_interfaces.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba074440df8908727f6bffdba5100f146000f05a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 13:00:22 2011 -0400

    fix test_rescue tests for tenant_id changes

 nova/tests/api/openstack/contrib/test_rescue.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b3d3f735a7402c49b8db0e19c9b1f8521187378b
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Aug 19 09:32:39 2011 -0700

    Fix unit test for the change of 'nova-manage network list' format

 nova/tests/test_nova_manage.py |   42 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

commit c4fc9f0737ec9f8d5c950b850fed9930a68164f4
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 19 08:44:14 2011 -0700

    Add copyright notices

 nova/api/openstack/create_instance_helper.py       |    1 +
 nova/api/openstack/views/servers.py                |    1 +
 nova/compute/api.py                                |    1 +
 .../versions/037_add_config_drive_to_instances.py  |    4 ++--
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/scheduler/simple.py                           |    1 -
 nova/tests/api/openstack/test_servers.py           |    1 +
 nova/tests/test_compute.py                         |    1 +
 nova/virt/libvirt/connection.py                    |    1 +
 nova/virt/xenapi/vm_utils.py                       |    1 +
 10 files changed, 10 insertions(+), 3 deletions(-)

commit 456997b121c8139605a2b01fa27b5b568a125957
Merge: be0c705 ba079e5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 11:26:32 2011 -0400

    merged trunk

commit 276403dcb6a8c7802c456b88f8dad249b7513e64
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 19 08:16:17 2011 -0700

    Define FLAGS.default_local_format. By default it's None, to match current expected _create_local

 nova/virt/libvirt/connection.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 83d4c5b9b1f7ed9b75ae04464423b7ca4b5d627d
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 19 08:08:23 2011 -0700

    Fix config_drive migration, per Matt Dietz.

 .../versions/037_add_config_drive_to_instances.py  |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit be0c70562ce978e3ffa85465fc08dd5cb3ca07c3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 10:47:16 2011 -0400

    updated migration number

 .../versions/037_add_instances_accessip.py         |   48 --------------------
 .../versions/038_add_instances_accessip.py         |   48 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 48 deletions(-)

commit 98c7aeddbec9279970fcb197c89315839f6d94cb
Merge: 254d45a ba079e5
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 09:54:05 2011 -0400

    merge with trunk

commit 9b96b24ec93864731b6fc5031d2eceb22398be24
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 19 09:30:52 2011 -0400

    Bump migration number.

 .../versions/037_update_instance_states.py         |   57 --------------------
 .../versions/039_update_instance_states.py         |   57 ++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)

commit c80e21c2753707d990f512132a133755396cb5e0
Merge: cab13db ba079e5
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 19 09:30:17 2011 -0400

    Merge w/ trunk.

commit d1f5d1fae10bb8a1d0e445ec2b9153542eb025f4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 13:54:18 2011 +0200

    pep8

 nova/virt/driver.py |    1 -
 1 file changed, 1 deletion(-)

commit a2c7e0f7fc6e25828ab32f133965b300e37d9264
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 13:44:32 2011 +0200

    Start improving documentation.

 nova/virt/driver.py |   57 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 16 deletions(-)

commit ba079e5ccfa6b5f9fdfa036842f3e5ba51df4b75
Merge: 965f82a 93bf9b4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 19 08:54:49 2011 +0000

    Added uuid column in virtual_interfaces table, and an OpenStack extension API for virtual interfaces to expose these IDs.  Also set this UUID as one of the external IDs in the OVS vif driver.

commit 794d73a916a6bf97cbad4d0cfd5cf359e0418af0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 09:53:31 2011 +0200

    Move documentation from nova.virt.fake to nova.virt.driver.

 nova/virt/driver.py |  247 ++++++++++++++++++++++++++++++++++++++++++---
 nova/virt/fake.py   |  278 +--------------------------------------------------
 2 files changed, 238 insertions(+), 287 deletions(-)

commit 1ab7b11a439cef8b48621355467d5fb460d9b2e2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 22:52:45 2011 -0700

    add key_name/data support to server stub

 nova/tests/api/openstack/test_servers.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 5ef94944514c3f81e31cc60d3d63b903859dca45
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Aug 18 22:15:13 2011 -0700

    add user_id and description.  without user_id, there is no way for a tenant to tell which user created the server.  description should be added for ec2 parity.

 nova/api/openstack/create_instance_helper.py |    3 ++-
 nova/api/openstack/views/servers.py          |    2 ++
 nova/tests/api/openstack/test_servers.py     |   22 +++++++++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

commit 92a27eb89b17130beb41cc88454b47c10f25387b
Merge: 9ad17de 69c2621
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Aug 18 20:02:17 2011 -0700

    Merge lp:~tpatil/nova/add-options-network-create-os-apis

commit 254d45ac22c1f4f9cb6e6b02e7a416e5d94f401e
Merge: a711bf6 2d21bd0
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 18 22:24:31 2011 -0400

    merge

commit 965f82ac122173f942806cd8a39890a1678a641e
Merge: 862dc7a 1ef677a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 19 02:14:17 2011 +0000

    Bugfix for lp 828429.  Its still not clear to me exactly how this code path is actually invoked when nova is used, so I'm looking for input on whether we should be adding a test case for this, removing the code as unused, etc.  Thanks.

commit 203309693fc2dd648b9d4b211686228557728c89
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Aug 18 19:05:40 2011 -0700

    remove security groups, improve exception handling, add tests

 nova/api/openstack/create_instance_helper.py |    5 +--
 nova/api/openstack/views/servers.py          |    1 -
 nova/tests/api/openstack/test_servers.py     |   42 +++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 10 deletions(-)

commit 93bf9b46a8ca28063752bc9e6c14ed59e91c50a9
Merge: 54883a4 862dc7a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 19 10:22:24 2011 +0900

    Merged trunk

commit 65a8ad501e8bc306ab89b67b339615967d0af6c5
Merge: 4ffd317 862dc7a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 21:09:01 2011 -0400

    merged trunk

commit 862dc7acaf86bcfaebfce423c8198ea18b5e07c4
Merge: 3d1de2a c718702
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 19 00:22:45 2011 +0000

    Currently, rescue/unrescue is only available over the admin API. Non-admin tenants also need to be able to access this functionality. This patch adds rescue functionality over an API extension.

commit 3d1de2a18ef1c1a5c5d311a1e97a417faea0ab64
Merge: c9831b2 32e57db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 19 00:04:02 2011 +0000

    Makes all of the binary services launch using the same strategy.
     * Removes helper methods from utils for loading flags and logging
     * Changes service.serve to use Launcher
     * Changes service.wait to actually wait for all the services to exit
     * Changes nova-api to explicitly load flags and logging and use service.serve
     * Fixes the annoying IOError when /etc/nova/nova.conf doesn't exist

commit f4f0ce95946962be73cfc509b24fd000fc931198
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 16:46:16 2011 -0700

    tests pass

 nova/api/openstack/views/servers.py      |    4 ++--
 nova/tests/api/openstack/test_servers.py |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

commit c9831b28a57355ed86d3dfea1abf8b45600cf092
Merge: f959269 041dcdb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 23:44:16 2011 +0000

    Fixes issue where ServersXMLSerializer was missing a method for update actions

commit bbe414cba5d389b553fb3122a3a7dbc9c6d898f2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 16:26:32 2011 -0700

    follow same pattern as userdata (not metadata apporach)

 nova/api/openstack/create_instance_helper.py |   27 +++++++++++++-------------
 nova/api/openstack/views/servers.py          |    3 +++
 2 files changed, 16 insertions(+), 14 deletions(-)

commit 32e57db9fdc5c48b3546640e838f5eb260080442
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 16:22:22 2011 -0700

    rename the test method

 nova/tests/test_service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f959269ab33b1cc8e134af3efff31881ab184f0d
Merge: 407582f c6c004c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 23:01:46 2011 +0000

    Updated docs for the recent scheduler class changes.

commit 407582f9fd1e97caa15a9fb043962cd2ff8e4f96
Merge: 2cb2e71 bbcb84a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Aug 18 22:54:30 2011 +0000

    Passes empty string instead of None to MySQLdb driver if the DB password isn't set.

commit 2d21bd0fdd392d9b3b79876c4962bf2757a3e679
Merge: fdfd551 2cb2e71
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 18:48:47 2011 -0400

    merged trunk

commit ef3f02fb37d49ccf6099e012bc27b87d7859a306
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 15:42:30 2011 -0700

    added volume metadata. Fixed test_volume_types_extra_specs

 nova/db/api.py                                     |   18 +++
 nova/db/sqlalchemy/api.py                          |  140 ++++++++++++++++++++
 .../versions/037_add_volume_types_and_extradata.py |   20 ++-
 nova/db/sqlalchemy/models.py                       |   15 +++
 nova/exception.py                                  |    5 +
 nova/tests/test_volume_types_extra_specs.py        |    6 +-
 6 files changed, 201 insertions(+), 3 deletions(-)

commit 509ce9d3016731c183bb565e8726a27010eaf02a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 15:41:20 2011 -0700

    declare the use_forwarded_for flag

 nova/api/ec2/__init__.py               |    1 +
 nova/api/ec2/metadatarequesthandler.py |    1 +
 2 files changed, 2 insertions(+)

commit 983e37ac5451cf26baf3460b33c90da498dff8ea
Merge: 805c1ce 2cb2e71
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 15:33:15 2011 -0700

    merge trunk

commit 2cb2e71454373f6baa857c8d73122c485e18c4c3
Merge: d327987 f3f7808
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 18 22:10:35 2011 +0000

    Fixes lp828207
    
    The Host API reboot action was broken due to addition of a parameter to a utility method in compute/api.py

commit c718702496a98cefb434b4b21c3ea22fc6c8dc2d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 17:09:34 2011 -0500

    Added unit test.

 nova/tests/api/openstack/contrib/test_rescue.py |   55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 805c1cec609b39ee5a0ba1517bf2f1d41e0c4fa9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 15:05:35 2011 -0700

    allow specification of key pair/security group info via metadata
    
    extract metadata about keypair / security group configuration from server
    metadata sent on create.  This allows users to use these extensions with
    their existing api implementations.
    
    Also remove the code that choose the first key pair in the tenant - since
    it seems to have been used during the development of os api

 nova/api/openstack/create_instance_helper.py |   21 ++++++++-------------
 nova/api/openstack/servers.py                |    1 -
 2 files changed, 8 insertions(+), 14 deletions(-)

commit d327987cdd0eed43e5400b392086446b0c73b035
Merge: 48e22da ca13037
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 18 21:57:52 2011 +0000

    Fixed bug in which DescribeInstances was returning deleted instances.  Added tests for pertinent api methods.

commit 48e22daa0d09bbaf889a343fb557a229210ec73e
Merge: b4c4665 56129e4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 18 21:49:30 2011 +0000

    Accept binary user_data in radix-64 format when you launch a new server using OSAPI. This user_data would be stored along with the other server properties in the database. Once the VM instance boots you can query for the user-data to do any custom installation of applications/servers or do some specific job like setting up networking route table.
    
    You can query for user-data using curl with the URL:-
    curl http://169.254.169.254/latest/user-data

commit b703b33cdd48c2409205504ef09cc91d287862bf
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 14:40:05 2011 -0700

    added unittests for volume_extra_data

 nova/db/sqlalchemy/api.py                          |   26 ++--
 .../versions/037_add_volume_types_and_extradata.py |    9 --
 nova/tests/test_volume_types_extra_specs.py        |  131 ++++++++++++++++++++
 3 files changed, 144 insertions(+), 22 deletions(-)

commit ce5c95424148649cbd4faca1d5c85c0d6209e3d4
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 21:38:29 2011 +0000

    Removed extra parameter from the call to _provision_resource_locally()

 nova/scheduler/abstract_scheduler.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f3f780858e4a4076905b09faf6902bcab1071f11
Merge: e877efe 19495e5
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 16:24:24 2011 -0500

    resolve conflicts after upstream merge

commit e877efe3b1de00d8b2eb3139ee60fd6c2464ce7d
Merge: 69996e8 abf7e2f
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 16:23:08 2011 -0500

    Change the call name

commit b4c46652fda699d18ddb8f197e8fdda168d7ed0e
Merge: e160074 0385ef2
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 18 21:14:55 2011 +0000

    Cleanup the '_base' directory in libvirt tests.

commit 22ba538b3cb3ddd22cef0fc06b136db433a8d202
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 16:07:02 2011 -0500

    Oops.

 nova/api/openstack/contrib/rescue.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f86a5cc4bc43923077ffe1d4098e550841f1c4f0
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 15:58:12 2011 -0500

    Review feedback.

 nova/api/openstack/contrib/rescue.py |   40 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

commit 041dcdb2eba968d5be17c9a10bf333e1307f0537
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 16:56:23 2011 -0400

    Added 'update' method to ServersXMLSerializer

 nova/api/openstack/servers.py            |    6 ++
 nova/tests/api/openstack/test_servers.py |  121 ++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

commit 56129e4a0b0c5cb2f8766e023bcaff77fc990008
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 18 13:45:45 2011 -0700

    Added more unit testcases for userdata functionality

 nova/tests/test_metadata.py |   40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit e1600746110c9e2e4478d5be5f3f97a068e64c08
Merge: abf7e2f 6b8c26d
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 18 20:44:30 2011 +0000

    Remove instances.admin_pass column.

commit 4ffd31764f47bbe11d59753ef9731b8eb2c61243
Merge: cca07a4 abf7e2f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 16:41:48 2011 -0400

    merged trunk

commit ae3da99ae46f8966f20c0d8ee90239c376e8147f
Merge: 9a4b1de abf7e2f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 18 13:41:02 2011 -0700

    Merged with trunk

commit 7399805b96cefd9d0f88cec202edd9fdb2c91ec0
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 13:38:11 2011 -0700

    typo

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cca07a461d6c826a9dcc902b7b88afe602377756
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 16:27:49 2011 -0400

    updated PUT to severs/id to handle accessIPv4 and accessIPv6

 nova/api/openstack/servers.py            |   10 +++++-
 nova/tests/api/openstack/test_servers.py |   53 +++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

commit bbcb84a5fed2c537bd6d2143e344fa96f669d231
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Aug 18 20:25:32 2011 +0000

    DB password should be an empty string for MySQLdb

 nova/db/sqlalchemy/session.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 50b7db2ab71c40732a979b1f424bd60627a74768
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 13:24:56 2011 -0700

    first cut on types & extra-data (only DB work, no tests)

 nova/db/api.py                                     |   60 +++++++
 nova/db/sqlalchemy/api.py                          |  180 +++++++++++++++++++-
 .../versions/037_add_volume_types_and_extradata.py |  103 +++++++++++
 nova/db/sqlalchemy/models.py                       |   30 ++++
 nova/exception.py                                  |   18 ++
 5 files changed, 390 insertions(+), 1 deletion(-)

commit a711bf61b274eb38face3957549acd4ee3c9b6a1
Merge: b29b5c8 abf7e2f
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 18 16:12:49 2011 -0400

    merge from trunk

commit 508b45a3fda9caa92c90282045495acb6e2f638b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 15:08:51 2011 -0500

    Better docstring for _unrescue().

 nova/api/openstack/contrib/rescue.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit fe28c88a6bfff9d8e0d83751ab89e83173aaf092
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 14:56:22 2011 -0500

    Review feedback.

 nova/api/openstack/contrib/rescue.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 19495e51bc86bf1bc333759e3825ab4b5592ff66
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 18 19:40:59 2011 +0000

    Need to pass the action

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c6c004c44595f218f66eee8f6f9173c6108be8a4
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 14:39:25 2011 -0500

    Updated the distributed scheduler docs with the latest changes to the classes.

 doc/source/devref/distributed_scheduler.rst |   56 +++++++++++++--------------
 doc/source/images/base_scheduler.png        |  Bin 0 -> 17068 bytes
 doc/source/images/zone_overview.png         |  Bin 0 -> 51587 bytes
 3 files changed, 27 insertions(+), 29 deletions(-)

commit 69996e83f10387b83bdc7e5e76b62fe67ea6c2ab
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 13:55:38 2011 -0500

    Syntax error

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit af9681bc82d7509cb2f65d213bd4d8ae24286663
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 13:47:09 2011 -0500

    Moved compute calls to their own handler

 nova/compute/api.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 6b8c26d230d06c35921e2e0a2d30d9d3d745eff4
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 18 14:44:10 2011 -0400

    Remove old comment.

 nova/compute/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit b98c14c411ae09d9a8b5b2112d0e1b01b71ced44
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 18 14:34:14 2011 -0400

    Don't send 'injected_files' and 'admin_pass' to db.update.

 nova/compute/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a4d63f18971bad12ea812c63bcee35d8070333f7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:31:28 2011 -0700

    fix docstrings in new api bins

 bin/nova-api-ec2 |    6 +-----
 bin/nova-api-os  |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

commit 05e8c1755d8fde5a9a3bde02e339938f670694c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:28:43 2011 -0700

    one more

 bin/nova-scheduler |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 97552f05d5d26e596ddf0cda8169f3a5d131a55a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:28:02 2011 -0700

    fix typo

 bin/nova-compute   |    2 +-
 bin/nova-console   |    2 +-
 bin/nova-network   |    2 +-
 bin/nova-scheduler |    2 +-
 bin/nova-volume    |    2 +-
 nova/service.py    |   35 +++++++++++++++++++----------------
 6 files changed, 24 insertions(+), 21 deletions(-)

commit 788e5c5e94c224c3909c4f12ecc569bba3ba1c9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:00:47 2011 -0700

    remove signal handling and clean up service.serve

 nova/service.py |   33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

commit 0cf36be73e7de4942f395a2a7dfeb58df5870821
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 10:56:14 2011 -0700

    add separate api binaries

 bin/nova-api-ec2 |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/nova-api-os  |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

commit 125a2affec7713cdbcb925537d34aea29a2e4230
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 10:55:39 2011 -0700

    more cleanup of binaries per review

 bin/nova-ajax-console-proxy |    7 +++----
 bin/nova-api                |    8 +++-----
 bin/nova-compute            |    5 ++---
 bin/nova-console            |    5 ++---
 bin/nova-direct-api         |   11 +++++++----
 bin/nova-network            |    5 ++---
 bin/nova-objectstore        |   14 +++++++-------
 bin/nova-scheduler          |    5 ++---
 bin/nova-vncproxy           |   15 ++++++---------
 bin/nova-volume             |    5 ++---
 10 files changed, 36 insertions(+), 44 deletions(-)

commit ffbf26392f06ecac55e72ed25f59fd550a5262f5
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 17:30:00 2011 +0000

    Changed the filter specified in _ask_scheduler_to_create_instance() to None, since the value isn't used when creating an instance.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9d87715133ae79518cef6aafd87c95e26f20765
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 12:25:22 2011 -0500

    Minor housecleaning.

 nova/api/openstack/contrib/rescue.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit abf7e2f767e1e535f40550945af466436d0cf541
Merge: fc7106a 228b185
Author: Troy Toman <troy.toman@rackspace.com>
Date:   Thu Aug 18 17:21:18 2011 +0000

    Fix to return 413 for over limit exceptions with instances, metadata and personality

commit a68c1cde2e73e6d39d7ff6024cd3ff289c465619
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 12:20:40 2011 -0500

    Refactored a little and updated unit test.

 nova/api/openstack/contrib/rescue.py        |   12 ++++++++----
 nova/tests/api/openstack/test_extensions.py |    1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 9033d4879556452d3b7c0ee9fa9fcafbea59e5be
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 12:55:27 2011 -0400

    minor cleanup

 nova/compute/api.py                      |    1 -
 nova/tests/api/openstack/test_servers.py |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

commit 1ef677a2eac6129aa3847aa10996f4357ec72a48
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 18 09:50:24 2011 -0700

    dhcpbridge: add better error if NETWORK_ID is not set, convert locals() to static dict

 bin/nova-dhcpbridge |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 7c957d7821437604b99d7383c8674676dc3921dc
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 16:40:41 2011 +0000

    Added the fix for the missing parameter for the call to create_db_entry_for_new_instance()

 nova/scheduler/abstract_scheduler.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit cab13dbfd652d1fcf9443e796e50f7eb374fc3fc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 18 12:34:01 2011 -0400

    Updated a number of items to pave the way for new states.

 nova/compute/manager.py                            |   31 ++++++++++----------
 nova/db/sqlalchemy/api.py                          |    4 +--
 .../versions/037_update_instance_states.py         |    2 +-
 nova/db/sqlalchemy/models.py                       |   16 ++--------
 nova/scheduler/driver.py                           |   11 ++++---
 nova/tests/scheduler/test_scheduler.py             |   13 +++++---
 nova/tests/test_compute.py                         |   29 +++++++++---------
 7 files changed, 51 insertions(+), 55 deletions(-)

commit 186987d854fabde120a37713909eaecfbabeaece
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 16:22:56 2011 +0000

    Corrected the hardcoded filter path. Also simplified the filter matching code in host_filter.py

 nova/compute/api.py           |    3 +--
 nova/scheduler/host_filter.py |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

commit 9011bf57d8caf8a0bd11dfb33cf968b2b65fe294
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 11:21:35 2011 -0500

    Added rescue mode extension.

 nova/api/openstack/contrib/rescue.py |   72 ++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit 155d640d3d53bcf76daa0ff0ae67ac5dbbe3022a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 12:19:47 2011 -0400

    Fixed issue where accessIP was added in none detail responses

 nova/api/openstack/views/servers.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 9b5416e8afc115fabb76664a65b6d33e9ba89b7f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 11:05:59 2011 -0400

    Updated ServersXMLSerializer to allow accessIPv4 and accessIPv6 in XML responses

 nova/api/openstack/servers.py            |    4 ++++
 nova/tests/api/openstack/test_servers.py |    6 ++++++
 2 files changed, 10 insertions(+)

commit a876958e6474957bb63eab6702c1633b6995e56c
Merge: feabc36 fc7106a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 10:05:37 2011 -0500

    Merged trunk.

commit af333cc72e753a4a28d0deb20369076df7bf09e3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 10:53:01 2011 -0400

    Added accessIPv4 and accessIPv6 to servers view builder
    Updated compute api to handle accessIPv4 and 6

 nova/api/openstack/create_instance_helper.py |    2 +
 nova/api/openstack/views/servers.py          |    4 +
 nova/compute/api.py                          |   15 ++-
 nova/tests/api/openstack/test_servers.py     |  173 ++++++++++++++++++++++++++
 4 files changed, 189 insertions(+), 5 deletions(-)

commit fc7106a5ea476f94c0f832dafebb17181cbe6177
Merge: c7ecb22 2dcd442
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 13:19:33 2011 +0000

    Fixed several logical errors in the scheduling process. Renamed the 'ZoneAwareScheduler' to 'AbstractScheduler', since the zone-specific designation is no longer relevant. Created a BaseScheduler class that has basic filter_hosts() and weigh_hosts() capabilities. Moved the filters out of one large file and into a 'filters' subdirectory of nova/scheduler.
    
    Since I had to do a lot of editing of the files to change the naming and references, I cleaned up much of the inconsistent formatting. Normally formatting changes don't belong in a code change merge prop, but as I was making large-scale changes to the files, it was simplest to do it all at once.

commit 2dcd44235dde51ca1ea288efc654da9a24ffb46e
Merge: d8a156f c7ecb22
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 12:57:34 2011 +0000

    Merged trunk

commit c7ecb22e46bf316fa2506dd3664c77274b6ee94d
Merge: aca07a4 ecc4e9e
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 09:57:16 2011 +0000

    Adds the enabled status of a host when XenServer reports its host's capabilities. This allows the scheduler to ignore hosts whose enabled is False when considering where to place a new instance.

commit 54883a4ca07fe6b2f966a604f84e1127477d9a55
Merge: 2e44657 aca07a4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Aug 18 15:50:50 2011 +0900

    merge trunk and fix unit test errors

commit b7019a57c416f7a14f8e8229776a18c28c109d38
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 17 22:29:04 2011 -0700

    in dhcpbridge, only grab network id from env if needed

 bin/nova-dhcpbridge |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 635306fd009ea9e50259d01e10762f6b5ab45049
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 17 22:00:38 2011 -0700

    bug #828429: remove references to interface in nova-dhcpbridge

 bin/nova-dhcpbridge |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 6d87608cf835e1c27f3b6b6b31e6b41b0aa90b90
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:35:54 2011 -0700

    pep8

 nova/api/openstack/auth.py |    1 +
 1 file changed, 1 insertion(+)

commit 6c256a9a5c013f8674776adb2005b4f541f705b5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:26:33 2011 -0700

    remove extra reference in pipelib

 nova/cloudpipe/pipelib.py |    2 --
 1 file changed, 2 deletions(-)

commit a1ceed43d6ab871d3dea721b855bd7eabec48433
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:24:52 2011 -0700

    clean up fake auth from server actions test

 nova/tests/api/openstack/test_server_actions.py |    8 --------
 1 file changed, 8 deletions(-)

commit 41819d8d048b889f2e7f5e4ee0ff2873bfdef904
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:22:30 2011 -0700

    fix integration tests

 etc/nova/api-paste.ini                      |    7 +-
 nova/api/openstack/auth.py                  |   17 +++++
 nova/tests/integrated/integrated_helpers.py |  109 ++++-----------------------
 nova/tests/integrated/test_login.py         |   33 --------
 nova/tests/integrated/test_servers.py       |    2 +-
 5 files changed, 36 insertions(+), 132 deletions(-)

commit 90650e5becb541790a8949edebaf0bff0ceb8f5b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 19:31:01 2011 -0700

    make admin context the default, clean up pipelib

 bin/nova-manage           |   19 ++++++++++---------
 etc/nova/api-paste.ini    |   15 ++++++++++++---
 nova/api/auth.py          |   18 ++++++++++++++++++
 nova/api/ec2/admin.py     |    4 +++-
 nova/auth/manager.py      |    3 +++
 nova/cloudpipe/pipelib.py |    7 +++----
 6 files changed, 49 insertions(+), 17 deletions(-)

commit dd749989dd30fdc49af7e4af453e91faf3914b75
Merge: 93207c1 aca07a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 19:06:21 2011 -0700

    merged trunk

commit c3ef50fd4b866ec6dc90ad114e36b16c857ca206
Merge: 19a4dda aca07a4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 17 17:17:47 2011 -0700

    Merged with trunk and fixed broken testcases

commit 2bc1e302910d9f66448618ddf140b72e85292d0f
Merge: cabf9cc aca07a4
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 17 16:44:34 2011 -0700

    merged with nova-1450

commit cabf9cc8f29ad8c99971c434516e1b911f07f32f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 17 16:27:12 2011 -0700

    nova-manage VSA print & forced update_cap changes; fixed bug with report capabilities; added IP address to VSA APIs; added instances to APIs

 bin/nova-manage                                    |  196 +++++++++++++++++---
 .../openstack/contrib/virtual_storage_arrays.py    |  107 ++++++++++-
 nova/tests/api/openstack/contrib/test_vsa.py       |    2 +
 nova/volume/manager.py                             |   12 +-
 4 files changed, 282 insertions(+), 35 deletions(-)

commit 6cdee8590528a95e9e3c7f2fc156cc9ebb8b39b2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 16:25:53 2011 -0700

    Make all services use the same launching strategy

 bin/nova-api    |   44 +++++++++++++++++---------------------------
 nova/service.py |   47 ++++++++++++++++++++++++++++-------------------
 nova/utils.py   |   41 +++--------------------------------------
 nova/wsgi.py    |    3 ---
 4 files changed, 48 insertions(+), 87 deletions(-)

commit 1d1d027554d6be355bd9b52b2d87081d06f05045
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 17 16:23:40 2011 -0400

    Updated compute manager/API to use vm/task states.
    Updated vm/task states to cover a few more cases I encountered.

 nova/compute/api.py        |   57 ++++--
 nova/compute/manager.py    |  441 ++++++++++++++++++++++++--------------------
 nova/compute/task_state.py |   17 +-
 nova/compute/vm_state.py   |    8 +-
 4 files changed, 296 insertions(+), 227 deletions(-)

commit a4379a342798016a9dc40761561c996093945d87
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 16:03:03 2011 -0400

    Updated server create XML deserializer to account for accessIPv4 and accessIPv6

 nova/api/openstack/create_instance_helper.py |    3 +-
 nova/tests/api/openstack/test_servers.py     |   56 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

commit ecc4e9ee389115e3793f94aaf53f8fbe59e7ac66
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 17 19:58:22 2011 +0000

    Added the host 'enabled' status to the host_data returned by the plugin.

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    1 +
 1 file changed, 1 insertion(+)

commit 8ba3ea03aa58d5b0791b9fd3654dd034cbd3a8bc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 15:40:17 2011 -0400

    Added accessip to models
    pep8

 .../versions/037_add_instances_accessip.py         |    1 -
 nova/db/sqlalchemy/models.py                       |    5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

commit 7e3f360eb256ba82629a44de60d36be643d5105d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 15:33:08 2011 -0400

    Added migration for accessIPv4 and accessIPv6

 .../versions/037_add_instances_accessip.py         |   49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)

commit 69c26210dd821df0d2160e51b10f147db2a40249
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 17 12:08:14 2011 -0700

    Fixed broken unit testcases

 nova/tests/api/openstack/test_extensions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bd2e98c064b7c1e9c866f3013e13af7883e11e05
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Aug 17 13:30:47 2011 -0400

    Initial instance states migration.

 .../versions/037_update_instance_states.py         |   57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit 65d7db1136557b7af1f0b9413bacc8fc59e7211f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 17 10:23:44 2011 -0700

    pep8 fix

 nova/api/openstack/contrib/floating_ips.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4f3a33859c350ff13b2fd94e33de4f10a7f93bc1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 17 10:05:01 2011 -0700

    fix some naming inconsistencies, make associate/disassociate PUTs

 nova/api/openstack/contrib/floating_ips.py         |   35 ++++++++------------
 .../api/openstack/contrib/test_floating_ips.py     |    6 ++--
 2 files changed, 17 insertions(+), 24 deletions(-)

commit 9ad17dec99608b3738d662d91c49964b3f207d02
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 17 09:57:15 2011 -0700

    Add NetworkCommandsTestCase into unit test of nova-manage

 nova/tests/test_nova_manage.py |   73 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

commit fdfd551dd46b831f5c44a8c62614de7bcbc1a5eb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 12:37:50 2011 -0400

    very minor cleanup

 nova/api/openstack/auth.py |    1 -
 1 file changed, 1 deletion(-)

commit 289219f8ef7ae677aaa8d0720167470e80843fe1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 12:36:39 2011 -0400

    Undo an unecessary change

 nova/api/openstack/contrib/security_groups.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit feabc363f29659c6d3846b9996c79e6ad5bfe6bc
Merge: ef0e505 aca07a4
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Aug 17 11:19:43 2011 -0500

    Merged trunk.

commit 6515b115de8cd026ea88aab796d4364ccc2ac4f0
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Aug 17 11:51:39 2011 -0400

    Pep8 fixes.

 nova/db/sqlalchemy/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5270b0a565ec26d2f7de3a7d95be86433d8c6bd2
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Aug 17 11:46:28 2011 -0400

    Split set state into vm, task, and power state functions.

 nova/db/sqlalchemy/api.py |   46 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

commit a81aae612f409bc767af3013eeccb71226831fc2
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Aug 17 11:19:34 2011 -0400

    Add modules for task and vm states.

 nova/compute/task_state.py |   28 ++++++++++++++++++++++++++++
 nova/compute/vm_state.py   |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

commit b29b5c85cbd5ab3c21fc00d1c037af1118ea30b4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 10:55:27 2011 -0400

    Updated tests to correctly use the tenant id

 nova/tests/api/openstack/contrib/test_quotas.py |   11 ++++++-----
 nova/tests/api/openstack/test_auth.py           |    8 +++++---
 nova/tests/integrated/api/client.py             |    5 +++--
 3 files changed, 14 insertions(+), 10 deletions(-)

commit aca07a42fabb7f506cf132b995b4ad0139987b02
Merge: 6dbcc60 7193520
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 17 13:54:38 2011 +0000

    DB object was being casted to dict() in API code. This did not work as intended and logic has been updated to reflect a more accurate way of getting information out of DB objects.

commit 18537ac9ff6d9338282c536251a667fb297e6503
Merge: 3dc1c35 6dbcc60
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 17 08:41:40 2011 -0400

    merge from trunk

commit 2e44657a20cdd620d982b252ca35413c07fd3c2b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:23:21 2011 +0900

    Cleaned up the extension metadata API data

 nova/api/openstack/contrib/virtual_interfaces.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 5415a59d473fb9ed374e746fb36f30fc664c4dec
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:17:09 2011 +0900

    Updated get_updated time

 nova/api/openstack/contrib/virtual_interfaces.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4407405244c3797ed1c0433eec7686e15340dca7
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:12:24 2011 +0900

    Cleaned up the file

 nova/api/openstack/contrib/virtual_interfaces.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit ad8081a5b3abfc63834594c5dbf8ac1bb0721a4b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:58:57 2011 +0900

    Fixed vif test to match the JSON key change

 .../openstack/contrib/test_virtual_interfaces.py   |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 751c8b4ff0e94b4f665af5541b9249637623d193
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:58:26 2011 +0900

    Added XML support and changed JSON output keys

 nova/api/openstack/contrib/virtual_interfaces.py |   28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

commit 623aa3a38cab6cc617fb5fb512cdc733f69b4887
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:07:14 2011 +0900

    Added virtual interfaces API test

 .../openstack/contrib/test_virtual_interfaces.py   |   55 ++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 77e1e0d3359bce9e5e30134f141151fc271a2e4b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:05:29 2011 +0900

    Removed serverId from the response

 nova/api/openstack/contrib/virtual_interfaces.py |    1 -
 1 file changed, 1 deletion(-)

commit c2b904d1ca27c184aa11a6e9463abffe39247634
Merge: 26d7e23 6dbcc60
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 17:58:14 2011 +0900

    Merged trunk

commit 26d7e23d991c0abe7f912458da490c99428247af
Merge: c3c1644 536c1e9
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 17:33:56 2011 +0900

    Merged Dan's branch to add VIF uuid to VIF drivers for Quantum

commit 228b185f1366df62da42b646ce98711de4195a5d
Author: Troy Toman <troy.toman@rackspace.com>
Date:   Wed Aug 17 03:03:25 2011 -0500

    Removed a change from faults.py that was not required."

 nova/api/openstack/faults.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79f3b1512166a37790c5cb2863140d696c717455
Author: Troy Toman <troy.toman@rackspace.com>
Date:   Wed Aug 17 02:41:17 2011 -0500

    Changed return code to 413 for metadata, personality and instance quota issues

 Authors                                          |    1 +
 nova/api/openstack/common.py                     |    3 ++-
 nova/api/openstack/create_instance_helper.py     |   13 ++++++++++---
 nova/api/openstack/faults.py                     |    2 +-
 nova/api/openstack/server_metadata.py            |    3 ++-
 nova/quota.py                                    |    2 +-
 nova/tests/api/openstack/test_image_metadata.py  |    4 ++--
 nova/tests/api/openstack/test_server_actions.py  |    4 ++--
 nova/tests/api/openstack/test_server_metadata.py |    4 ++--
 9 files changed, 23 insertions(+), 13 deletions(-)

commit 3dc1c357ca280705bc745b601daaa81e679d08d3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 17 01:18:16 2011 -0400

    Append the project_id to the SERVER-MANAGEMENT-URL header for v1.1 requests.
    Also, ensure that the project_id is correctly parsed from the request.

 nova/api/openstack/auth.py |   47 +++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 14 deletions(-)

commit 536c1e95a68569abda6fe8ee4e3f571976521c8e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 16 20:36:49 2011 -0700

    add new vif uuid for OVS vifplug for libvirt + xenserver

 nova/virt/libvirt/vif.py |   13 +++++++------
 nova/virt/xenapi/vif.py  |    4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

commit c890722ddfec7b6ef1911bfbbfd834ac1e3666d5
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 16 23:15:54 2011 -0400

    Remove instances.admin_pass column.

 .../versions/037_instances_drop_admin_pass.py      |   37 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 -
 nova/virt/xenapi/vmops.py                          |    3 --
 3 files changed, 37 insertions(+), 4 deletions(-)

commit 6165b4a4db3d35f900d7d994540c923a3d2e56b0
Merge: 8317775 6dbcc60
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 17:01:08 2011 -0700

    merge trunk

commit 83177757632b381d42cc5107fe7d1cba8830a10a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 16:59:36 2011 -0700

    all tests passing

 nova/api/openstack/contrib/floating_ips.py         |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit ed3927455cd4054b5741fe5a3f0917d91a9066db
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 16:50:15 2011 -0700

    fix unit tests

 .../api/openstack/contrib/test_floating_ips.py     |   26 ++++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 982427040554d3cfcee25abab981215f73650b3e
Merge: 9081e8b 6dbcc60
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 16 16:18:48 2011 -0700

    Resolved conflicts and merged with trunk

commit 9081e8b62ea01828238ecaebdcf3e627ada3fe9a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 16 16:04:18 2011 -0700

    Added uuid for networks and made changes to the Create server API format to accept network as uuid instead of id

 bin/nova-manage                                    |   37 +++++-----
 nova/api/openstack/create_instance_helper.py       |   39 +++++-----
 nova/db/api.py                                     |   23 ++----
 nova/db/sqlalchemy/api.py                          |   40 +++--------
 .../versions/037_add_uuid_to_networks.py           |   43 +++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/exception.py                                  |    4 +-
 nova/network/manager.py                            |   67 +++++++++--------
 .../api/openstack/contrib/test_createserverext.py  |   75 +++++++++-----------
 nova/tests/api/openstack/test_servers.py           |   38 +++++-----
 nova/tests/test_network.py                         |   72 +++++++++++--------
 11 files changed, 230 insertions(+), 209 deletions(-)

commit 6dbcc60d5f8d4995a706f0de449756ecea4ebaa0
Merge: a6a6f81 53ca062
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 16 22:59:43 2011 +0000

    I'm taking Thierry at his word that I should merge early and merge often :)
    
    In Diablo-3 we introduced "vif-plugging" to the hypervisor "virt" layer, allowing flexibility in how vNICs are attached to the network switch. This allowed non-linux bridge switch technologies (e.g., Open vSwitch, 802.1qbh) to be used with nova.
    
    This blueprint adds a similar capability to linux_net.py, allowing the L3/DHCP capabilities to be "plugged" into Quantum networks.  Like in the virt layer, we created a vif driver that represents the behavior of Nova prior to the change (LinuxBridgeInterfaceDriver) and make it the default.  We also add a new driver for Open Vswitch that can be enabled using a flag (LinuxOVSInterfaceDriver).  The code is designed to support other drivers as well.
    
    Most of the interesting code is at the bottom of linux_net.py, where the drivers are defined.  I had to pull some common code related to setting IPs on devices out of ensure_bridge() so it could be used by either approach.  The driver's plug() method is invoked by the VlanManager's _setup_network() method.  Currently unplug() is unused, which seems to be inline with how the existing nova code works.
    
    In many places in linux_net.py, I had to tweak functions to accept the name of the linux device to configure, rather than just assuming it was the 'bridge' field in the network object, since with OVS it could be any linux device.  The code I am least sure about are the changes to bin/nova-dhcpbridge.  I changed to this key off of the network ID, rather than the bridge name.
    
    I've tested this with the linux bridge and with the OVS vif-plugging driver.  I was able to confirm that L3 forwarding and DHCP were operating correctly.

commit a6a6f811fb9279c21de36ea844b14bfa11c46af3
Merge: d9d9c8c c4f6df5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 16 20:29:09 2011 +0000

    Fixes issue with exceptions getting eaten in image/s3.py if there is a failure during register.  The variables referenced with locals() were actually out of scope.

commit d9d9c8ca54c693c234d23c2f30a55cfa45647369
Merge: ef0e505 0610893
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 20:22:17 2011 +0000

    Allow local_gb size to be 0. libvirt uses local_gb as a secondary drive, but XenServer uses it as the root partition's size. Now we support both.
    
    Include some random PEP8 fixes.

commit 0610893331233769d9d2aa31618aecca7a3e0068
Merge: dc2ccb9 ef0e505
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 14:22:26 2011 -0500

    Merged trunk.

commit 718341d96d591f3646b17f171838511261f3576a
Merge: f4d6085 ef0e505
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 15:12:42 2011 -0400

    merge from trunk

commit f4d608549f0a539e48276be163593ced558a136f
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 15:11:32 2011 -0400

    make project_id authorization work properly, with test

 nova/api/openstack/auth.py          |   23 ++++++++++++++++++-----
 nova/tests/integrated/api/client.py |   15 +++++++++++++--
 nova/tests/integrated/test_login.py |    6 ++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

commit ef0e505d1914f0a549aa66063323d4a153ed3e03
Merge: 3df6995 7fd89d5
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 16 18:54:34 2011 +0000

    Use netaddr's subnet features to calculate subnets.

commit fb43ea94e81e5eec51b73c2aab4a8a38cdf71361
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 16 11:46:22 2011 -0700

    make delete more consistant

 nova/api/openstack/contrib/floating_ips.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit dc2ccb95848c330eeb8e6fa55bf487c54e03a3c3
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:45:13 2011 -0500

    Review feedback.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ee7e94ab89189c284348c8756da611192dfe5ec
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:43:33 2011 -0500

    Updated note.

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 935c43b414c1685163957590a6fb77fd8ddbac2f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:36:11 2011 -0500

    Allow local_gb to be 0; PEP8 fixes.

 nova/compute/manager.py         |   10 +++++++++-
 nova/virt/libvirt/connection.py |    5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

commit 71935201aed268e94ee9674e887d67b4b9f217a6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 16 13:44:03 2011 -0400

    Updated ViewBuilderV10 as per feedback.

 nova/api/openstack/views/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3df69958daa57f267cbce84e29d48bf69d79c509
Merge: cb967b7 f9cf0d3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 16 17:34:38 2011 +0000

    * Added search instance by metadata.
    * instance_get_all_by_filters should filter deleted

commit cb967b7b726e0678ccb7f0c6fb7daf77c1aa3aab
Merge: 7e4d35d f3e64fe
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 16:39:45 2011 +0000

    This branch implements a nova api extension which allows you to manage and update tenant/project quotas.

commit ca13037d2cd130f5b970d3af219566f3a70a9cb5
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 16 09:18:13 2011 -0700

    test improvements per peer review

 nova/tests/test_cloud.py  |   10 ++++++----
 nova/tests/test_db_api.py |   12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

commit f3e64fea374df91a6ff78a891ff627edf635fdb2
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 issue

 nova/tests/api/openstack/contrib/test_quotas.py |    1 -
 1 file changed, 1 deletion(-)

commit b85deda977ff46722a4461aca98f0378fd10ee1b
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    defaults now is referred to using a tenant

 nova/api/openstack/contrib/quotas.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6a5b9831c4b32053996a99307b7303ca851bf508
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing up the show quotas tests, and extension

 nova/api/openstack/contrib/quotas.py            |    8 ++++++--
 nova/tests/api/openstack/contrib/test_quotas.py |   16 +++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

commit 029261908ac5acd9950a4b027b7daec17c92854d
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    making get project quotas require context which has access to the project/tenant)

 nova/db/sqlalchemy/api.py |    1 +
 1 file changed, 1 insertion(+)

commit bf269b3d799a431ad3fc68cdb039b826685c8760
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 issues again

 nova/tests/api/openstack/contrib/test_quotas.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit a3a0782f65d85c873c2ec3fc8f94486225cb6f76
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing spacing issues

 nova/tests/api/openstack/contrib/test_quotas.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 8b6e551813ef964af38335fcca749ab9d0971200
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    cleaning up a few things from pyflakes

 nova/api/openstack/contrib/quotas.py            |    3 +--
 nova/tests/api/openstack/contrib/test_quotas.py |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

commit 903ae5a8274051aaf40a62c929117d7165729360
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 errors

 nova/api/openstack/contrib/quotas.py            |    2 +-
 nova/tests/api/openstack/contrib/test_quotas.py |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 817b596bccd38f84f72e1ee73df3c3b35287c75c
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    refactoring tests to not use authmanager, and now returning 403 when non admin user tries to update quotas

 nova/api/openstack/contrib/quotas.py            |    4 +-
 nova/tests/api/openstack/contrib/test_quotas.py |  113 +++++++++++------------
 2 files changed, 58 insertions(+), 59 deletions(-)

commit 02c5d589483abef3fb8ec65f983e5b43a9e41f71
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    removed index, and separated out defaults into its own action

 nova/api/openstack/contrib/quotas.py            |   28 ++++++-------------
 nova/tests/api/openstack/contrib/test_quotas.py |   33 +++++++++--------------
 2 files changed, 20 insertions(+), 41 deletions(-)

commit e9cf4ff5c14b274b8a1d7aa39567768368851e81
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    merging test_extensions.py

 nova/tests/api/openstack/test_extensions.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b6c8985cb10b40572d23b7971aac6d0577ebfe82
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:01 2011 -0700

    another trunk merge

 nova/tests/api/openstack/contrib/test_quotas.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6220c4276e30c633ffc4165ce6db0d120c0e88a7
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:13:10 2011 -0700

    another trunk merge... a new change made it into nova before the code was merged

 nova/api/openstack/contrib/quotas.py            |  107 +++++++++++++++
 nova/tests/api/openstack/contrib/test_quotas.py |  158 +++++++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py     |    1 +
 3 files changed, 266 insertions(+)

commit 0385ef219b47fca0e98130d1c4c54c1673519f48
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 16 12:02:39 2011 -0400

    Cleanup the '_base' directory in libvirt tests.

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit 44a278bc5a456c8eda74c61aaa68cfd74ee0d6e8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 16 11:31:29 2011 -0400

    Small bug fix...don't cast DB objects to dicts.

 nova/api/openstack/views/servers.py   |    4 ++--
 nova/tests/integrated/test_servers.py |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

commit d3becc6a0c99fb73637e7fdb89540fd8c4b48be2
Merge: 5278d7e 7e4d35d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 11:31:08 2011 -0400

    merge from trunk

commit 7e4d35db17a6d129fe9cbfd3d4ffaeb96fd1fc69
Merge: 76eebe8 0801dee
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 16 15:04:27 2011 +0000

    Updated the EC2 metadata controller so that it returns the correct value for instance-type metadata.

commit 0801dee7b05463b40bf66ee5911c92ac5e4aabc8
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 16 10:49:26 2011 -0400

    Fix test_metadata tests.

 nova/api/ec2/cloud.py       |    2 +-
 nova/tests/test_metadata.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 7fd89d5d6d7cc43d8804877cf206e86799ada1f1
Merge: e57e9e9 76eebe8
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 16 09:23:38 2011 -0500

    merge the trunk

commit 51f82c87755c1871adb4d26bf2007f03ab4a184d
Merge: f115812 76eebe8
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 16 08:56:08 2011 -0500

    Merged with upstream.

commit f11581221a3739c25e5f7b77b96f3dc8d332af5c
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 16 08:55:17 2011 -0500

    Added list_notifier, a driver for the notifer api which calls a list of other drivers.

 nova/notifier/list_notifier.py            |   50 +++++++++++++++++
 nova/tests/notifier/__init__.py           |   16 ++++++
 nova/tests/notifier/test_list_notifier.py |   85 +++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+)

commit 5278d7e7a28b49ef1d7acafa9283360b0b33a725
Merge: 8e7163c ea53d0f
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 09:26:55 2011 -0400

    merge with trunk

commit 76eebe86f383989ab012b9ad8a5b6fc4bbfee4af
Merge: 7920902 f881bee
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 16 13:01:41 2011 +0000

    Refactored the HostFilterScheduler and LeastCostScheduler classes so that they can be combined into a single class that can do both host filtering and host weighting, allowing subclasses to override those processes as needed. Also renamed the ZoneAwareScheduler to AbstractScheduler, for two reasons: one, the 'zone-aware' designation was necessary when the zone code was being developed; now that it is part of nova, it is not an important distinction. Second, the 'Abstract' part clearly indicates that this is a class that is not designed to be used directly, but rather as the basis for specific scheduler subclasses.

commit 79209025ee4a14f29183656db8da7bb713661f7d
Merge: 43bf1b5 8c9eedb
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 16 12:54:30 2011 +0000

    cosmetic change in test_extensions.
    Avoids constant merge conflicts between proposals with new extensions.

commit 43bf1b5bd4ee0ab737959e411864dcdab8e1337d
Merge: ea53d0f bbd577d
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 12:47:35 2011 +0000

    Validate the size of VHD files in OVF containers.

commit 741d45ce20844fb28f5f0ade48701a5858cf2a4b
Merge: c81febc ea53d0f
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 16 08:41:52 2011 -0400

    Merge w/ trunk.

commit c3c164455f9b5d4ea994a4453342ccb00d987766
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 18:52:29 2011 +0900

    Include vif UUID in the network info dictionary

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit ee06de65b674a7a91597bc9121b3bd3bd11e658b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 18:37:50 2011 +0900

    Added uuid to allocate_mac_address

 nova/network/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 92c6ee9dc7eeaa44bf6162387b5815fc0cdb1c71
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 17:51:45 2011 +0900

    Fixed the naming of the extension

 nova/api/openstack/contrib/virtual_interfaces.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 83b45a371665fd069fc7e372628f82874258fd08
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 16 00:31:54 2011 -0700

    redux of floating ip api

 nova/api/openstack/contrib/floating_ips.py |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

commit 9d6b9c01a5652cea1aa51aa56eafada92fa82f7a
Merge: 7407a1a ea53d0f
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 14:20:09 2011 +0900

    Merged trunk

commit 2be419cd88d23ae5c0b6e5bd56fff5791e4685a7
Merge: 24df378 ea53d0f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 17:30:13 2011 -0700

    Merged trunk

commit c4f6df55fa8a9c0746074c814b510e4a4cd4e512
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 17:12:03 2011 -0700

    log the full exception so we don't lose traceback through eventlet

 nova/image/s3.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 8d83ceb9f8baef3c768c4fc087afb89188250c26
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 16:29:52 2011 -0700

    fix error logging in s3.py

 nova/image/s3.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit d8a156f9ed0729c4c5553fe3b28f6c3afb93d54f
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:31:24 2011 -0500

    pep8 cleanup

 nova/compute/manager.py                           |    3 ++-
 nova/scheduler/abstract_scheduler.py              |    6 +++---
 nova/scheduler/filters/abstract_filter.py         |    4 ++--
 nova/scheduler/host_filter.py                     |    1 +
 nova/tests/scheduler/test_host_filter.py          |    5 -----
 nova/tests/scheduler/test_least_cost_scheduler.py |    3 ++-
 nova/virt/libvirt/connection.py                   |    3 ++-
 7 files changed, 12 insertions(+), 13 deletions(-)

commit 32461499f0a66debdfcf54bab0bf78ef6c806238
Merge: 55dd18f ea53d0f
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:11:58 2011 -0500

    Merged trunk

commit 9a4b1deb5f9abdc88809ff80bccdfb503e66dccd
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 15:09:42 2011 -0700

    Removed newly added userdatarequesthandler for OS API, there is no need to add this handler since the existing Ec2 API metadatarequesthandler does the same job

 etc/nova/api-paste.ini                             |    7 --
 nova/api/__init__.py                               |    6 --
 nova/api/ec2/__init__.py                           |    3 +
 nova/api/openstack/userdatarequesthandler.py       |  110 --------------------
 nova/network/linux_net.py                          |    5 -
 nova/tests/api/openstack/fakes.py                  |    2 -
 .../api/openstack/test_userdatarequesthandler.py   |   80 --------------
 7 files changed, 3 insertions(+), 210 deletions(-)

commit 55dd18f30eee4f4a75c825c33d4a78b2ef94be4a
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:09:39 2011 -0500

    got tests passing with logic changes

 nova/scheduler/abstract_scheduler.py              |   53 +++---
 nova/scheduler/base_scheduler.py                  |   50 +-----
 nova/scheduler/filters/__init__.py                |   17 ++
 nova/scheduler/filters/abstract_filter.py         |    2 +-
 nova/scheduler/filters/json_filter.py             |   14 +-
 nova/scheduler/host_filter.py                     |   25 +--
 nova/scheduler/least_cost.py                      |  134 +++++++-------
 nova/tests/scheduler/test_host_filter.py          |    2 -
 nova/tests/scheduler/test_least_cost_scheduler.py |   16 +-
 nova/tests/test_host_filter.py                    |  200 ---------------------
 10 files changed, 125 insertions(+), 388 deletions(-)

commit e57e9e9bbc37fbe87052ccc66bf7b97501e1e759
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:48:28 2011 -0500

    pep8

 nova/virt/libvirt/connection.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8b4805b24bb51adca501a38b4b7dbf730cc826d2
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:47:48 2011 -0500

    pep8

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cef63a6c2e8f3e1baa126ba41703aac81c2fc6ae
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:46:30 2011 -0500

    add note

 nova/network/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit a34943e89e9aee0a26bd4fd03a2b12fc954029fd
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:41:11 2011 -0500

    have the tests call create_networks directly

 nova/network/manager.py    |   28 ++++++++++++-----
 nova/tests/test_network.py |   72 +++++++++++++++++++++++++++-----------------
 2 files changed, 65 insertions(+), 35 deletions(-)

commit a20e18c5ae2c77ed005e5dc9cec7b92d67e50a0b
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:30:51 2011 -0500

    allow for finding a network that fits the size, also format string correctly

 nova/network/manager.py |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit 3e561f148fcba627f8fbd4ab1089f426fbc2e61b
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 15 13:58:44 2011 -0700

    adding sqlalchemi api tests for test_instance_get_all_by_filter to ensure doesn't return deleted instances

 nova/tests/test_cloud.py  |    1 -
 nova/tests/test_db_api.py |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

commit f06f80591a41f5d1b373677937bbbcddcfb0bb7c
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 15 13:48:09 2011 -0700

    added cloud unit test for describe_instances to ensure doesn't return deleted instances

 nova/tests/test_cloud.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 945a874a77c63710f57fa31988ba7f9ba65a5ad0
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:47:11 2011 -0500

    return the created networks

 nova/network/manager.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 5276b4981dc6e8c4f3d4b9c733939290df3c6a72
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:45:14 2011 -0500

    pep8 fix

 nova/network/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 93d26d3fe4030372fe111baebf700162c2d95c72
Merge: d3e2be6 ea53d0f
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:33:37 2011 -0500

    merge trunk

commit ea53d0f37a4f478ffbe18516f99ca26192117e80
Merge: a18d859 7393a11
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Aug 15 20:31:43 2011 +0000

    Adding kvm-block-migration feature.
    
    I wrote some description the below URL. I hope it may help for reviewing.
    <http://etherpad.openstack.org/kvm-block-migration>

commit d3e2be67d116dcdbe0484a10708ae00d040d2d9f
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:29:55 2011 -0500

    i hate these exceptions where it should just return an empty list

 nova/network/manager.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 54ba0d6d25f60b5acb363d141aeba63e4c727c72
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:28:28 2011 -0500

    fix typo where I forgot a comma

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ff86b8bc57bf9c66bfa6b4dc705f3e51952b521
Merge: a256b37 2ed3b12
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:24:57 2011 -0500

    merge trunk, remove _validate_cidrs and replace functionality with a double for loop

commit 066b675e3ce5c2bd67dde124cbe01b68bd1eded8
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 15 13:22:14 2011 -0700

    fix bug which DescribeInstances in EC2 api was returning deleted instances

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a18d8597c2fb52d77b8b827f2c440787b1165150
Merge: bd5ba98 055c769
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 20:10:07 2011 +0000

    We don't have source for open-wrt in the source tree, so we shouldn't use the images.  Since the images are only there for uploading smoketests, They are now replaced with random images.

commit bd5ba9853109e7869d06b24bcf98ba254cb88820
Merge: 22087f3 b46320a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Aug 15 19:50:14 2011 +0000

    Make response structure for list floating ips conform with rest of openstack api

commit 8e7163cd413eebd2e08b5ad32d155f643e972740
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 15 15:41:07 2011 -0400

    put tenant_id back in places where it was

 nova/api/openstack/contrib/security_groups.py      |    6 +++---
 .../api/openstack/contrib/test_security_groups.py  |    7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 22087f39641202635787d5e2a4d0bd527043afa3
Merge: 0f54002 fdb8c92
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 15 19:36:21 2011 +0000

    This branch allows the standard inclusion of a body param which most http clients will send along with a POST request.

commit 0f54002fb29a520a694858685018f07a36de3233
Merge: 2ed3b12 c53d056
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 19:29:18 2011 +0000

    Libvirt has some autogenerated network info that is breaking ha network.
    
     * pases network info from manager wherever it is needed
     * fixes libvirt tests
     * renames allow_project_net_traffic to allow_same_net_traffic
     * makes firewall driver use dhcp_server instead of gateway for dhcp exception.

commit fdb8c92739026e96ac52fc165d70c8f8c7594177
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 15 12:04:51 2011 -0700

    making body default to none

 nova/api/openstack/contrib/floating_ips.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32ab7846b7781c557429600f419b9f7c8768cdce
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 15 15:00:42 2011 -0400

    pep8 fix

 nova/tests/api/openstack/__init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bc7892f698fbfc21f8d242f52e012d9165e46de7
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 15 11:55:53 2011 -0700

    Adding standard inclusion of a body param which most http clients will send along with a POST request.

 nova/api/openstack/contrib/floating_ips.py         |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 8666aca320ce95840a378231bfe81bc4e759df6e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 11:50:54 2011 -0700

    Fixed merging issue

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4fc0801c18e1127e3e7072d318e227518a9b1929
Merge: 651e5f9 2ed3b12
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 11:47:30 2011 -0700

    Merged with trunk

commit 157047664a1ff7f6061cc122df533d3500e926b1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 14:45:08 2011 -0400

    Updated rate limiting tests to use tenants

 nova/tests/api/openstack/__init__.py            |   28 +++++++++++------------
 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

commit bbd577de616915025e524e330f1991f3f155388c
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 13:35:53 2011 -0500

    Corrected names in TODO/FIXME.

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 055c7692fc91d1d7d709c975fd223cc67f18ef8f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 11:31:44 2011 -0700

    remove openwrt image

 smoketests/openwrt-x86-ext2.image |  Bin 4612608 -> 0 bytes
 smoketests/openwrt-x86-vmlinuz    |  Bin 1169948 -> 0 bytes
 smoketests/random.image           |  Bin 0 -> 65536 bytes
 smoketests/random.kernel          |  Bin 0 -> 16384 bytes
 smoketests/test_sysadmin.py       |    4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)

commit c53d0567e4526b1e4a2ee5665ac81170a1771d17
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 11:10:44 2011 -0700

    Fix the tests when libvirt actually exists

 nova/tests/test_libvirt.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2c6022a90011bba4618ac6dde06969bea180a2f3
Merge: 1a2bc77 2ed3b12
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 12:18:22 2011 -0500

    Merged trunk.

commit 2ed3b12cc8da82304cef88dde64631b6348ee60e
Merge: 1fe628f 6a5fa0b
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Aug 15 16:14:35 2011 +0000

    Add durable flag for rabbit queues.

commit 1a2bc77871af060069ba0de80637198be78f8169
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 09:47:01 2011 -0500

    Fixed merge conflict.

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit faa7239eea756bfd337a7d9c3e0ebb63cbbe58a2
Merge: a1dc7e0 1fe628f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 09:57:55 2011 -0400

    merged trunk

commit 2d191324f72c1219d07168ab644d68da21f8a815
Merge: e6590e2 1fe628f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 08:55:33 2011 -0500

    Merged trunk.

commit a1dc7e0dbcff7130adb0274e6628ce30d1ac83c1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 09:35:44 2011 -0400

    Dryed up contructors

 nova/api/openstack/__init__.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit b46320a4175adc4012e60d4eae793a42f3a8186b
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Aug 15 02:55:22 2011 -0700

    make list response for floating ip match other apis

 nova/api/openstack/contrib/floating_ips.py         |    4 ++--
 .../api/openstack/contrib/test_floating_ips.py     |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 53ca062830639de242d2cadda4f6bf473d4b6b62
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Aug 14 20:05:18 2011 -0700

    fix missing 'run_as_root' from bad merge

 nova/network/linux_net.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 1fe628fbe1f9964ac4536ce1c859d84d9cd8cb08
Merge: eede601 d2aa9dd
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Sun Aug 14 04:25:46 2011 +0000

    Added ability too boot VM from install ISO.  System detects an image of type iso.  Images is streamed to a VDI and mounted to the VM.  Blank disk allocated to VM based on instance type.
    
    Currently available for XenServer.

commit eede601db836643a0fbc6689fb9ee9db15a822bc
Merge: a538f40 adc4d2d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Aug 14 04:17:48 2011 +0000

    Add source-group filtering.
    
    Move refresh to be triggered by allocation and deallocation of IP's rather than creation/destruction of instances.
    
    There really needs a way to use ipsets for this, but it's not widely supported yet (went into mainline linux at 2.6.39), so this implementation just uses regular iptables.

commit a538f400b5ced8357fa0e892fffd5a01b8e63cec
Merge: 452b343 353fa48
Author: John Tran <jhtran@att.com>
Date:   Sun Aug 14 04:10:26 2011 +0000

    added logic to make the creation of networks (IPv4 only) validation a bit smarter:
      - detects if the cidr is already in use
      - detects if any existing smaller networks are within the range of requested cidr(s)
      - detects if splitting a supernet into # of num_networks && network_size will fit
      - detects if requested cidr(s) are within range of already existing supernet (larger cidr).
    
    IPv6 logic remains intact yet had not been improved by this code.

commit 452b343811311acbe35ccb5a896569127647f613
Merge: 89ddaa6 7b72972
Author: John Tran <jhtran@att.com>
Date:   Sun Aug 14 03:47:48 2011 +0000

      fix InvalidPortRange exception shows up in euca2ools  instead of UnknownError when euca-authorize is specified w/ invalid port #.

commit 89ddaa639ec197a019f34921707a60a48979bf87
Merge: ba11ce1 5dd39df
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Aug 14 03:41:01 2011 +0000

    Changes requests with an invalid server action to return an HTTP 400 instead of a 501.

commit ba11ce16711b39263c9f9e1fa006270073aa55e6
Merge: 549e721 2ccec88
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sun Aug 14 03:34:19 2011 +0000

    Currently OS API doesn't accept availability zone parameter so there is no way to instruct scheduler (SimpleScheduler) to launch VM instance on specific host of specified zone.
    
    Now changes have been made in the create_instance_helper to read the availability zone and pass it to the compute create API. Any OS extensions can take a advantage of it.
    Also changes have been made in the nova-manage ServiceCommands class to expose zone information to the admin users. Only admin users will be allowed to launch VM instance on specific host.

commit 549e721b62ce46a39c431be57496df36b0278879
Merge: aca43c9 4ce5c65
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Aug 14 03:27:38 2011 +0000

    typo fix

commit aca43c9c892a0aa8e07f8191a7c712d928f702ee
Merge: 551edae 258e169
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Sun Aug 14 03:20:52 2011 +0000

    Fix v1.1 /servers/<id> PUT request to match API documentation by returning 200 code and the server data in the body

commit 551edae9b40fb0049257f4cb858d0fa63e598ca8
Merge: 7aef19a 500bd32
Author: termie <code@term.ie>
Date:   Sun Aug 14 03:14:08 2011 +0000

    Allow different schedulers for compute and volume.

commit e0e49dd7340bbb26c82f18a94a6582a5684925fa
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 13 18:58:29 2011 -0700

    have NetworkManager generate MAC address and pass it to the driver for plugging.  Sets the stage for being able to do duplicate checks on those MACs as well.

 nova/network/linux_net.py |   68 ++++++++++++++++++++++++++-------------------
 nova/network/manager.py   |   18 +++++++++---
 nova/utils.py             |    9 ------
 3 files changed, 54 insertions(+), 41 deletions(-)

commit c533e6ed3d2df8725dbcb48e7e546eb853b7ad41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 22:36:10 2011 -0700

    make sure security groups come back on restart of nova-compute

 nova/compute/manager.py         |    6 ++++--
 nova/tests/test_compute.py      |    4 ++--
 nova/tests/test_libvirt.py      |    2 ++
 nova/virt/driver.py             |    2 +-
 nova/virt/fake.py               |    4 ++--
 nova/virt/libvirt/connection.py |    9 +++++----
 nova/virt/libvirt/firewall.py   |   14 ++++++--------
 nova/virt/xenapi_conn.py        |    2 +-
 8 files changed, 23 insertions(+), 20 deletions(-)

commit f7d1270c94d884e661a79d74fb2b2f88f6eb619f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 22:05:34 2011 -0700

    fix all of the tests

 nova/tests/test_libvirt.py      |   84 +++++++++++++++++++++------------------
 nova/virt/libvirt/connection.py |    8 ++--
 2 files changed, 50 insertions(+), 42 deletions(-)

commit 87ff404bf2bffe690292f7d3922c1ca2529f852b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 21:17:20 2011 -0700

    rename project_net to same_net

 nova/virt/libvirt/connection.py |    6 +++---
 nova/virt/libvirt/firewall.py   |    8 ++++----
 nova/virt/libvirt/vif.py        |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

commit 87e97a868b4b7361937bac8f637ec014276aaf5c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 21:03:53 2011 -0700

    use dhcp server instead of gateway for filter exception

 nova/virt/libvirt/firewall.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1e60edee71d2cb24739f2f44ba13fbf28e72c95
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 21:03:11 2011 -0700

    get rid of network_info hack and pass it everywhere

 nova/virt/libvirt/connection.py |   22 ++++++-------
 nova/virt/libvirt/firewall.py   |   64 ++++++++++++++-----------------------
 nova/virt/libvirt/netutils.py   |   67 ---------------------------------------
 3 files changed, 33 insertions(+), 120 deletions(-)

commit 1f3eb69ec547737447e91116881a8cb85157d65c
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 12 18:16:07 2011 -0700

    fix issue introduced in merge

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bfee9bd461174b90c7936ced1b62ef27529081f2
Merge: 86d2109 7aef19a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 12 17:43:19 2011 -0700

    merge trunk, fix conflict frim dprince's branch to remove hostname from bin/nova-dhcpbridge

commit 86d2109b8f3b27e460aa41c11924166cb07d7bb4
Merge: 18f09f1 fe0bde6
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 12 17:33:30 2011 -0700

    merge in trunk, resolving conflicts with ttx's branch to switch from using sudo to run_as_root=True

commit 6a5fa0bd07e305c21c32ea6863614fa9d25566ac
Merge: e7858fa 7aef19a
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Sat Aug 13 00:06:42 2011 +0000

    remerge trunk

commit e7858fabb433a0ee587a9444f749381bf36d5d92
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Aug 12 23:58:13 2011 +0000

    Added durable option for nova rabbit queues
    added queueu delete script for admin/debug purposes

 bin/clear_rabbit_queues |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/flags.py           |    1 +
 nova/rpc/amqp.py        |    8 ++++--
 3 files changed, 79 insertions(+), 3 deletions(-)

commit 19a4ddaf157ebb388cce37ddc142dfad304b8cf0
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 12 16:48:13 2011 -0700

    Added add securitygroup to instance and remove securitygroup from instance functionality

 nova/api/openstack/contrib/security_groups.py      |  199 +++++++++++--
 nova/api/openstack/create_instance_helper.py       |   30 +-
 nova/db/api.py                                     |    6 +
 nova/db/sqlalchemy/api.py                          |   15 +
 .../api/openstack/contrib/test_security_groups.py  |  299 ++++++++++++++++++++
 5 files changed, 530 insertions(+), 19 deletions(-)

commit 91eaa647506a2e343e8c689289529eafea0bc9d3
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 12 14:33:27 2011 -0700

    Fix ugly little violations before someone says anything

 nova/api/openstack/create_instance_helper.py |    2 --
 run_tests.sh                                 |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

commit e6590e2063748b1ed88910e91204257a52ee248e
Merge: b238bcd 7aef19a
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:29:44 2011 -0500

    Merged trunk.

commit b238bcd9de989e7dabe6698b3de77a104d96a941
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:25:16 2011 -0500

    Updated logging.

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3f82580b98252af4bbeb54bc64e725856c2fde15
Merge: 069056b b776f19
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 12 14:23:10 2011 -0700

    Merge config_drive with trunk

commit d940fa4619584dac967176d045407f0919da0a74
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 16:19:46 2011 -0500

    end of day

 nova/scheduler/filters/__init__.py             |    1 +
 nova/scheduler/filters/abstract_filter.py      |   54 +----------------
 nova/scheduler/filters/all_hosts_filter.py     |    3 +-
 nova/scheduler/filters/instance_type_filter.py |    5 +-
 nova/scheduler/filters/json_filter.py          |   39 ++++++++----
 nova/scheduler/host_filter.py                  |   75 ++++++++++++++++++++++++
 nova/tests/scheduler/test_host_filter.py       |   34 ++++++-----
 7 files changed, 129 insertions(+), 82 deletions(-)

commit b60fa0d09d02066863736a3e98f07094c4db05a6
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:18:48 2011 -0500

    Check uncompressed VHD size.

 nova/tests/xenapi/stubs.py   |    4 +--
 nova/virt/xenapi/fake.py     |    1 +
 nova/virt/xenapi/vm_utils.py |   74 +++++++++++++++++++++++++++++++++++++-----
 nova/virt/xenapi/vmops.py    |    6 ++--
 4 files changed, 72 insertions(+), 13 deletions(-)

commit 8c9eedb4b4dd9653cca302ae4bbd23d895761aee
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 12 14:18:25 2011 -0700

    reworked test_extensions code to avoid constant merge conflicts with newly added ext

 nova/tests/api/openstack/test_extensions.py |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit 711a02450d24ba7385f2f22bf70a60ecfb452cfc
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 12 13:37:22 2011 -0700

    nova-manage: fixed instance type in vsa creation

 bin/nova-manage |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 258e169a60d3551e789022ec23d6ae040c1f981e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Aug 12 20:18:47 2011 +0000

    Stub out instance_get as well so we can show the results of the name change

 nova/api/openstack/servers.py            |    2 +-
 nova/tests/api/openstack/test_servers.py |   19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

commit b66ea57ae10bac1656e11663e273837dfae67814
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 12 12:51:54 2011 -0700

    removed VSA/drive_type code from EC2 cloud. changed nova-manage not to use cloud APIs

 bin/nova-manage          |   87 ++++++++++++++------------
 nova/api/ec2/__init__.py |    4 --
 nova/api/ec2/cloud.py    |  153 ----------------------------------------------
 nova/vsa/api.py          |    2 +-
 nova/vsa/drive_types.py  |   19 +++++-
 5 files changed, 65 insertions(+), 200 deletions(-)

commit 778ae42d8c488083f4c6e6675ab31378f74666de
Merge: 26d96b8 7aef19a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Aug 12 19:48:19 2011 +0000

    Merge with trunk

commit 24df37853288d2a1fb8e51c23a78816da4d0d4b4
Merge: 8a8b71b 069056b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 12 12:29:24 2011 -0700

    Merged with trunk and fixed broken unit testcases

commit 7393a114f421f1b54019099777fea34a09a80737
Merge: c75e2ee c1deb4b
Author: Kei masumoto <masumotok@nttdata.co.jp>
Date:   Sat Aug 13 04:00:48 2011 +0900

    merged rev1418 and fixed code so that less than 1G image can be migrated

commit 90c6641d47e9c1012b9fb3e53fe0da21ae3d42b7
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 13:58:26 2011 -0500

    Created the filters directory in nova/scheduler

 nova/scheduler/__init__.py                        |    2 +
 nova/scheduler/abstract_scheduler.py              |   30 +-
 nova/scheduler/base_scheduler.py                  |  312 +-------------------
 nova/scheduler/filters/__init__.py                |   18 ++
 nova/scheduler/filters/abstract_filter.py         |   87 ++++++
 nova/scheduler/filters/all_hosts_filter.py        |   31 ++
 nova/scheduler/filters/instance_type_filter.py    |   86 ++++++
 nova/scheduler/filters/json_filter.py             |  141 +++++++++
 nova/scheduler/host_filter.py                     |  314 ---------------------
 nova/tests/scheduler/test_abstract_scheduler.py   |    3 +
 nova/tests/scheduler/test_host_filter.py          |    4 +-
 nova/tests/scheduler/test_least_cost_scheduler.py |    7 +-
 12 files changed, 391 insertions(+), 644 deletions(-)

commit 93207c19c72aff5eb2c99b0b42649a75def35cf0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 11:29:25 2011 -0700

    removed admincontext middleware

 etc/nova/api-paste.ini |    3 ---
 1 file changed, 3 deletions(-)

commit 9ab61aaa194a787b41b1d634c1b56c98574dcbc9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 11:28:47 2011 -0700

    updates from review

 nova/api/auth.py         |   26 +++++---------------------
 nova/api/ec2/__init__.py |    4 ++--
 2 files changed, 7 insertions(+), 23 deletions(-)

commit 477edc038940e622394a5e5e5915a2c1b91b0249
Merge: 26216f2 7aef19a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 14:09:53 2011 -0400

    merge from trunk

commit 26216f23741abb92cf520d9d144a1fb303567ed2
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 14:09:25 2011 -0400

    fix merges from trunk

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7aef19a8757dc9558b1c0d83cb1fb08ac976cf5b
Merge: 069056b 346454c
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 12 17:58:55 2011 +0000

    Nuke hostname from nova-dhcpbridge. We don't use it.

commit a256b3718c3e2f44563ca3422820b29dc9e23c74
Merge: dbaa1c2 069056b
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:28:53 2011 -0500

    merge the trunk

commit dbaa1c2299d3b97273698050b372b9714324706a
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:23:50 2011 -0500

    need to actually assign the v4 network

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 069056b7f5c9b2e9a1c35d37501897fd26100bac
Merge: bf334c7 f95e011
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 12 17:17:20 2011 +0000

    Fixes to the OSAPI floating API extension DELETE.
    Updated to use correct args for self.disassociate (don't sweep exceptions which should cause test cases to fail under the rug).
    Additionally updated to pass network_api.release_floating_ip the address instead of a dict.

commit 665d6130d0eb95ba1464e0ef7c09c4fa8f7f61b8
Merge: 24796de bf334c7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 12:15:13 2011 -0500

    Merged trunk.

commit 24796debe819641b1cba58ba966b0d6d5a253fd8
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 12:14:40 2011 -0500

    Fixed unit tests.

 nova/compute/manager.py                |   15 ++++++++++++++-
 nova/tests/scheduler/test_scheduler.py |    4 +++-
 2 files changed, 17 insertions(+), 2 deletions(-)

commit 411ee0c1a1901de7c9b7ceae1d41b7742fce609e
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:13:14 2011 -0500

    only run if the subnet and cidr exist

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 07aae460e848af51667537d56ec8b89d0c79f048
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:11:13 2011 -0500

    only run if the subnet and cidr exist

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3cbf0267efdef7d36a88faeb545342619f82f108
Merge: cfa7142 bf334c7
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 13:07:24 2011 -0400

    merge from trunk

commit 0beef1b24ee63f554f5478d54ee32f86fe5f4f2c
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:06:57 2011 -0500

    make sure network_size gets set

 bin/nova-manage |    3 +++
 1 file changed, 3 insertions(+)

commit cfa71424fd1724b809c0794fb4ae56f1b1c30e8a
Merge: 8131a99 c3b1538
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 13:06:51 2011 -0400

    merge from trunk

commit 21707674ce862f4e12a8ee9db665829f09d29467
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:03:02 2011 -0500

    don't require ipv4

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f5f2c651846f8a3ff66821451216552d71c8fe6
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:00:23 2011 -0500

    forgot the closing paren

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee8ef9ab1de284ec77d33bb27741f010f9a63961
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 11:55:38 2011 -0500

    use subnet iteration from netaddr for subnet calculation

 nova/network/manager.py |   55 +++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

commit bf334c786091ace63dd943e5e5893a239a22d21e
Merge: 7610b83 15271a0
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 12 16:49:08 2011 +0000

    Fix a typo that causes ami images to launch with a kernel as ramdisk when using xen.

commit 7610b839a05bbde730b28d73586ba8ba096d0044
Merge: 1f116df 954e8e2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 12 16:09:01 2011 +0000

    Fixing a 500 error when -1 is supplied for flavorRef on server create.

commit 954e8e24c6b8ceb541c539ce7c26da4b35b5f0b1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 12 11:44:49 2011 -0400

    rewriting parsing

 nova/api/openstack/common.py |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 15271a08de44da1813bfb2a2b68a2f28ef887c21
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 12 08:43:42 2011 -0700

    fix typo that causes ami instances to launch with a kernal as ramdisk

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 712cfc91c773107e1e5d3fe201e7ef9dbe1f6473
Merge: 9402b5c 1f116df
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 10:34:45 2011 -0500

    Merged trunk.

commit 1f116df9b65fc317db26492115bc36ce465ba296
Merge: c3b1538 3017d3a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 12 15:24:33 2011 +0000

    Allows for a tunable number of SQL connections to be maintained between services and the SQL server using new configuration flags. Only applies when using the MySQLdb dialect in SQLAlchemy.

commit 9402b5cdcdac0ca88d3d51c5c382baaba9dc055f
Merge: b29bc97 c3b1538
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 10:12:37 2011 -0500

    Merged trunk.

commit c3b1538261313132fc7e2fa28d7f66aa4c4a0926
Merge: d5dbbb5 03cf655
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 15:04:13 2011 +0000

    Fixes pep8 issues in test_keypairs.py

commit 8ec51d12d02b0addfa1b4595ffd0bc338d38c613
Merge: 0bc7814 d5dbbb5
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 10:01:38 2011 -0500

    Merged trunk

commit 0bc781425bea1162cd81bdc95f49d50068857057
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 10:01:04 2011 -0500

    start of day

 nova/scheduler/abstract_scheduler.py |  180 +++++----------
 nova/scheduler/base_scheduler.py     |  403 ++++++++++++++++++++++++++++++++++
 2 files changed, 459 insertions(+), 124 deletions(-)

commit f95e0118d91a8f77345e4d78980e2523cb4dba56
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 12 10:59:10 2011 -0400

    Fixes to the OSAPI floating API extension DELETE.
    Updated to use correct args for self.disassociate (don't sweep exceptions
    which should cause test cases to fail under the rug).
    Additionally updated to pass network_api.release_floating_ip the address
    instead of a dict.

 nova/api/openstack/contrib/floating_ips.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit d5dbbb55e7740c8441c60d15737c0f21d9e2e8e2
Merge: c1deb4b c398d6c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 12 14:38:49 2011 +0000

    API needs virtual_interfaces.instance joined when pulling instances from the DB.  Updated instance_get_all() to match instance_get_all_by_filters() even though the former is only used by nova-manage now.  (The latter is used by the API).

commit 7295b93192d2b151c108d7631c3b404ef65fdedf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 01:21:47 2011 -0700

    remove extra log statements

 nova/api/ec2/__init__.py |    3 ---
 1 file changed, 3 deletions(-)

commit c398d6cf85dcb30b8cd499f410618b88a0b5c8c9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 11 22:02:21 2011 -0700

    join virtual_interfaces.instance for DB queries for instances.  updates instance_get_all to match instance_get_all_by_filters.

 nova/db/sqlalchemy/api.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit e294303750f032f22dadaba7eb0c743effa8c3f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:30:07 2011 -0700

    remove accidentally duplicated flag

 nova/api/ec2/__init__.py |    2 --
 1 file changed, 2 deletions(-)

commit b1fe9bbce7dca84203105547ccd439583a115b33
Merge: 9ce9ef1 c1deb4b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:03:49 2011 -0700

    merged trunk

commit 9ce9ef1166075e539442c61c65cf21b8d6e90cdd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:03:37 2011 -0700

    add keystone middlewares for ec2 api

 etc/nova/api-paste.ini            |   32 ++++++++++++-
 nova/api/auth.py                  |   91 +++++++++++++++++++++++++++++++++++++
 nova/api/ec2/__init__.py          |   55 ++++++++++++++++++++--
 nova/tests/api/openstack/fakes.py |    5 +-
 nova/tests/test_api.py            |    3 +-
 nova/wsgi.py                      |   12 -----
 6 files changed, 179 insertions(+), 19 deletions(-)

commit 651e5f91a53c8a11d4817b756f54a8cedf9aa02c
Merge: 7507ba2 c1deb4b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 18:23:49 2011 -0700

    Merged with trunk

commit 7507ba23004c989c75962c47efbd2ce5e5178a90
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 18:22:35 2011 -0700

    added userdata entry in the api paste ini

 etc/nova/api-paste.ini                       |    7 +++++++
 nova/api/openstack/userdatarequesthandler.py |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit ca7bf95e610bdc47f01b8fb7b459269bb8e5df66
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 18:11:59 2011 -0700

    Initial version

 nova/api/__init__.py                               |    6 ++
 nova/api/ec2/__init__.py                           |    3 -
 nova/api/openstack/create_instance_helper.py       |    4 +-
 nova/api/openstack/userdatarequesthandler.py       |  110 ++++++++++++++++++++
 nova/network/linux_net.py                          |    5 +
 nova/tests/api/openstack/fakes.py                  |    2 +
 .../api/openstack/test_userdatarequesthandler.py   |   80 ++++++++++++++
 7 files changed, 206 insertions(+), 4 deletions(-)

commit b776f19c21d1a56ac851435182c0c267166d49dd
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Thu Aug 11 17:59:41 2011 -0700

    Accidentally added inject_files to merge

 nova/virt/disk.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit c1deb4b35107eff13d0d614fef28fb9af04c7b88
Merge: fe0bde6 68161e3
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 12 00:43:41 2011 +0000

    Support for management of security groups in OS API as a new extension.

commit f22cfa05f7c796fbda3d832e4bfadc325f8af6f5
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Thu Aug 11 17:40:13 2011 -0700

    Updates to libvirt, write metadata, net, and key to the config drive

 nova/network/manager.py         |    3 ++-
 nova/virt/disk.py               |   33 ++++++++++++++++++++-----
 nova/virt/libvirt.xml.template  |   14 +++++------
 nova/virt/libvirt/connection.py |   51 ++++++++++++++++++++++++---------------
 4 files changed, 68 insertions(+), 33 deletions(-)

commit 68161e3e224ff77e4e93d02e5fabbd9ea17b0d48
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 17:04:33 2011 -0700

    prefixed with os- for the newly added extensions

 nova/api/openstack/contrib/security_groups.py      |    4 ++--
 .../api/openstack/contrib/test_security_groups.py  |   22 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

commit 6ffb426f99fe17e929eea5b14def6b49064f23c1
Merge: 4f26dad fe0bde6
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 16:52:36 2011 -0700

    Merged with trunk

commit 4ce5c65e4002f1c3cca02bb06d892a6d270a0149
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 16:32:51 2011 -0700

    Author added

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 500bd3218906e2575467467700f80f5b31e0a87e
Author: termie <code@term.ie>
Date:   Thu Aug 11 16:26:26 2011 -0700

    allow scheduling topics to multiple drivers

 nova/scheduler/manager.py              |    5 ++-
 nova/scheduler/multi.py                |   73 ++++++++++++++++++++++++++++++++
 nova/tests/scheduler/test_scheduler.py |   24 ++++++++++-
 3 files changed, 98 insertions(+), 4 deletions(-)

commit b29bc97d5a69abe71dea5b9ff9dcfc65fcd59cc9
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 11 17:10:25 2011 -0500

    Check compressed image size and PEP8 cleanup.

 nova/compute/manager.py                           |   40 +++++++++++++++++++++
 nova/exception.py                                 |    4 +++
 nova/tests/api/openstack/contrib/test_keypairs.py |   17 +++++++--
 3 files changed, 59 insertions(+), 2 deletions(-)

commit 26d96b80fdc07d8bb9453112cd33ee12143c6f46
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 11 20:48:16 2011 +0000

    v1.1 API also requires the server be returned in the body

 nova/api/openstack/servers.py            |   83 ++++++++++++------------------
 nova/tests/api/openstack/test_servers.py |    6 ++-
 2 files changed, 37 insertions(+), 52 deletions(-)

commit fe8b1023bc9b800f628c0e35b29c165863b17206
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 13:45:55 2011 -0700

    capabilities fix, run_as_root fix

 nova/scheduler/manager.py      |    4 ++--
 nova/scheduler/zone_manager.py |    2 --
 nova/volume/driver.py          |   15 ++++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

commit 684c41e7a4aa5fdab78f2e1aac1d309c3bb16412
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 13:18:30 2011 -0700

    lp824780: fixed typo in update_service_capabilities

 nova/scheduler/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8131a998bba1ec2893043e5e02b66ea7df38a4ba
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:06:28 2011 -0400

    fix pep8

 nova/api/openstack/auth.py                        |    2 +-
 nova/tests/api/openstack/contrib/test_keypairs.py |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

commit 03cf6551feae597dd71fbf7b52b41415863d1241
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:05:33 2011 -0400

    spacing fixes

 nova/tests/api/openstack/contrib/test_keypairs.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f3ad17b4ee25fedeee98132f22cf1eeb5974a2c
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:04:12 2011 -0400

    fixed pep8 issue

 nova/tests/api/openstack/contrib/test_keypairs.py |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

commit 5704f0a0cbc06c04a8ed6bf72bc1b5214016d083
Merge: 4275c90 fe0bde6
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 15:49:58 2011 -0400

    merge from trunk

commit 4275c9062e2d89c30472ba6646fd3c2503c0e984
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 15:49:28 2011 -0400

    fixed v1.0 stuff with X-Auth-Project-Id header, and fixed broken integrated tests

 nova/api/openstack/auth.py          |   17 ++++++++++-------
 nova/tests/integrated/api/client.py |    4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

commit 4ae770dc2f6c89b2efae5e55d434b58bae19000c
Merge: 57b8f97 fe0bde6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 12:31:09 2011 -0700

    merged with 1416

commit 45d6ab8ffec6ff4b26500df7049ce4092b15f00c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 11 15:30:43 2011 -0400

    fixing id parsing

 nova/api/openstack/common.py             |    9 ++++++---
 nova/tests/api/openstack/test_common.py  |    4 ++++
 nova/tests/api/openstack/test_servers.py |   16 ++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

commit 57b8f976f18b1f45de16ef8e87a6e215c009d228
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 12:04:03 2011 -0700

    moved vsa_id to metadata. Added search my meta

 nova/db/sqlalchemy/api.py  |   33 +++++++++++++++--------
 nova/tests/test_compute.py |   63 ++++++++++++++++++++++++++++++++++++++++++++
 nova/vsa/api.py            |    3 ++-
 nova/vsa/manager.py        |    1 -
 4 files changed, 87 insertions(+), 13 deletions(-)

commit f881bee5b1283d5bec2396b45cea9a062cb2a4b2
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 11 14:00:56 2011 -0500

    Refactored the scheduler classes without changing functionality. Removed all 'zone-aware' naming references, as these were only useful during the zone development process. Also fixed some PEP8 problems in trunk code.

 nova/scheduler/abstract_scheduler.py              |  403 +++++++++++++++++++++
 nova/scheduler/host_filter.py                     |   51 +--
 nova/scheduler/least_cost.py                      |    7 +-
 nova/scheduler/zone_aware_scheduler.py            |  383 --------------------
 nova/tests/scheduler/test_abstract_scheduler.py   |  364 +++++++++++++++++++
 nova/tests/scheduler/test_least_cost_scheduler.py |    4 +-
 nova/tests/scheduler/test_zone_aware_scheduler.py |  364 -------------------
 7 files changed, 782 insertions(+), 794 deletions(-)

commit f9cf0d334330f034d0e0fb2ae8c88dda38e62832
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 11:54:35 2011 -0700

    Added search instance by metadata. get_all_by_filters should filter deleted

 Authors                    |    1 +
 nova/db/sqlalchemy/api.py  |   20 +++++++++++++-
 nova/tests/test_compute.py |   63 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

commit 01c7da9e861fee3201e2bc5dcc289024aa5ced61
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 14:40:05 2011 -0400

    got rid of tenant_id everywhere, got rid of X-Auth-Project-Id header support (not in the spec), and updated tests

 nova/api/openstack/__init__.py                    |    4 +-
 nova/api/openstack/auth.py                        |   10 ++-
 nova/api/openstack/extensions.py                  |    2 +-
 nova/api/openstack/wsgi.py                        |    5 +-
 nova/tests/api/openstack/contrib/test_keypairs.py |    8 +--
 nova/tests/api/openstack/extensions/foxinsocks.py |    4 +-
 nova/tests/api/openstack/fakes.py                 |    1 +
 nova/tests/api/openstack/test_flavors.py          |    8 +--
 nova/tests/api/openstack/test_images.py           |   28 ++++----
 nova/tests/api/openstack/test_servers.py          |   76 ++++++++++-----------
 nova/tests/integrated/api/client.py               |    2 +-
 11 files changed, 76 insertions(+), 72 deletions(-)

commit 3017d3a7cd9cd4928a5e5247054b877e63fac095
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 14:36:29 2011 -0400

    Silly fixes.

 nova/db/sqlalchemy/session.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 3bfaf0a0720fc8713fb77fddd8f1b2dffa0eabfc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 11 18:28:15 2011 +0000

    v1.0 and v1.1 API differs for PUT, so split them out
    Update tests to match API

 nova/api/openstack/servers.py            |   72 +++++++++++++++++++-----------
 nova/tests/api/openstack/test_servers.py |    4 +-
 2 files changed, 48 insertions(+), 28 deletions(-)

commit 49da55f7952f8daecf6df9498769b336af95ce6d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 14:27:14 2011 -0400

    Removed postgres, bug in current ubuntu package which won't allow it to work easily. Will add a bug in LP.

 nova/db/sqlalchemy/session.py |   31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

commit 5dd39df596f7038cffde5079822ae4b747b92b72
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 14:20:18 2011 -0400

    minor cleanup

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ccec88a5a5c85ce7776b4b70d490189d63d3098
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 11:15:14 2011 -0700

    Added availability zone support to the Create Server API

 bin/nova-manage                              |   14 +++++++++++---
 nova/api/openstack/create_instance_helper.py |    4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

commit 24869338aad2dfd36db9d466820325d1a3ed1adb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 11 18:01:37 2011 +0000

    Make PUT /servers/<id> follow the API specs and return a 200 status

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 253d75e71beb1ce9c65e84233a3178f95f82d77d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 12:02:05 2011 -0400

    More logging.

 nova/db/sqlalchemy/session.py |    3 +++
 1 file changed, 3 insertions(+)

commit 7ae64a0b7e1db7e46d183bfa8a2fe1be5d47f1cc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 11:57:16 2011 -0400

    removed extra paren

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b121cd266d3d5e1719e644d6bd82d6402f13d2e2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 11:55:02 2011 -0400

    Logging for SQLAlchemy type.

 nova/db/sqlalchemy/session.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit 79a013893acf4f09091c7e6260622bd3b23cc3eb
Merge: 4d2d064 fe0bde6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 11:28:11 2011 -0400

    merged trunk

commit 8517d9563191b635669032e8364d8fa64876b977
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 10:53:40 2011 -0400

    Fixed per HACKING

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fe0bde67193ce76376e72a7263b89240a63722a8
Merge: e78499c 7d9ff45
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Aug 11 12:34:04 2011 +0000

    * Removes rogue direct usage of subprocess module by proper utils.execute calls
    * Adds a run_as_root parameter to utils.execute, that prefixes your command with FLAG.root_helper (which defaults to 'sudo')
    * Turns all sudo calls into run_as_root=True calls
    * Update fakes accordingly
    * Replaces usage of "sudo -E" and "addl_env" parameter into passing environment in the command (allows it to be compatible with alternative sudo_helpers)
    * Additionally, forces close_fds=True on all utils.execute calls, since it's a more secure default

commit 7d9ff45ec1acc3cba0d58341f3cce011df140f8e
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Aug 11 12:37:29 2011 +0100

    Remove doublequotes from env variable setting since they are literally passed

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0a543d4f8ff31733c32cbd9063e461ca41a0b076
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 10 21:27:40 2011 -0400

    Changed bad server actions requests to raise an HTTP 400

 nova/api/openstack/servers.py                   |   10 +++++++---
 nova/tests/api/openstack/test_extensions.py     |    2 +-
 nova/tests/api/openstack/test_server_actions.py |   20 +++++++++++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

commit 7b72972cbc9fbd267160d8d3282e1d0ec888de98
Author: John Tran <jhtran@att.com>
Date:   Wed Aug 10 16:19:21 2011 -0700

    removed typos, end of line chars

 nova/api/ec2/__init__.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4f26dad3e25dcd3a48528e94035c63db9d23efbf
Merge: f73b6dc e78499c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 10 14:16:13 2011 -0700

    Fixed broken unit testcases

commit 4d2d064e9da37ce72010408bc1aad8ca67708462
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 16:20:31 2011 -0400

    Support for postgresql.

 nova/db/sqlalchemy/session.py |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

commit 76e9bbde798012628a27b8330706a77467ee2d2a
Merge: 203326b e78499c
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 15:49:17 2011 -0400

    merge from trunk

commit 203326be6c4acdd474fe307fb608ef35d95e0a4e
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 15:47:22 2011 -0400

    tenant_id -> project_id

 nova/api/openstack/__init__.py                     |    9 +++++----
 nova/api/openstack/extensions.py                   |    4 ++--
 nova/api/openstack/wsgi.py                         |    4 ++--
 .../api/openstack/contrib/test_multinic_xs.py      |    8 ++++----
 nova/tests/test_compute.py                         |    6 +++---
 nova/utils.py                                      |    2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)

commit e78499c51b1cec93c0bdaadbcb78e71bf66d473d
Merge: b9c2aad 0719b03
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 10 19:08:35 2011 +0000

    Adding keypair support to the openstack contribute api

commit 8331fee7695a40824ae1bd24c52b22987b5f3507
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 15:06:04 2011 -0400

    elif and FLAG feedback

 nova/db/sqlalchemy/session.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit ad3ccef3e86220b480a114bb70eaa9def2abd430
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 14:03:16 2011 -0400

    Removed un-needed log line.

 nova/db/sqlalchemy/session.py |    2 --
 1 file changed, 2 deletions(-)

commit 93c4a691c28668d62103b2ae2f90b284950cd95f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 14:01:18 2011 -0400

    Make sure to not use MySQLdb if you don't have it.

 nova/db/sqlalchemy/session.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit cec8ee56a3a2b43ba3c257390b89ef54a79aa78a
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 13:24:11 2011 -0400

    get last extension-based tests to pass

 .../api/openstack/contrib/test_floating_ips.py     |   12 +++----
 nova/tests/api/openstack/test_extensions.py        |   14 ++++-----
 .../api/openstack/test_flavors_extra_specs.py      |   22 ++++++-------
 nova/tests/integrated/api/client.py                |   33 +++++++-------------
 nova/tests/integrated/test_extensions.py           |    2 +-
 5 files changed, 37 insertions(+), 46 deletions(-)

commit a46964ad11a85effa833decb81384b478a0cf75d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 13:21:36 2011 -0400

    Allows multiple MySQL connections to be maintained using eventlet's db_pool.

 nova/db/sqlalchemy/session.py |   92 ++++++++++++++++++++++++++++++-----------
 nova/flags.py                 |    6 +++
 2 files changed, 74 insertions(+), 24 deletions(-)

commit b9c2aad3eca2cc397f96682907a0c4e8c7b6005b
Merge: 651ff37 b3b13df
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 10 16:43:46 2011 +0000

    Removed verbose debugging output when capabilities are reported. This was clogging up the logs with kbytes of useless data, preventing actual helpful information from being retrieved easily.

commit b3b13df03f0e843300f63bded410ffc4e0bd4e9f
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 10 11:25:38 2011 -0500

    Removed verbose debugging output when capabilities are reported.

 nova/scheduler/zone_manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2046554bc54a2ebbc9ea681b9f35eef79e0a1c0c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 10 11:49:54 2011 -0400

    Updated extensions to use the TenantMapper

 nova/api/openstack/extensions.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 057449d4f96fd168b2e949b6ce429ce012911bec
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 11:37:44 2011 -0400

    fix pep8 issues

 nova/api/openstack/contrib/floating_ips.py        |    2 +-
 nova/api/openstack/servers.py                     |    2 +-
 nova/tests/api/openstack/extensions/foxinsocks.py |    2 +-
 nova/tests/integrated/api/client.py               |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit caf7312a479a634ab02ccf38f53d510d20e25646
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 10 11:23:40 2011 -0400

    Fixed metadata PUT routing

 nova/api/openstack/__init__.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 651ff375247d3e1b68513a0af607d977a32623c8
Merge: a3059b7 83ed9fa
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 10 14:53:53 2011 +0000

    These fixes are the result of trolling the pylint violations here
    
    https://jenkins.openstack.org/job/nova-pylint-errors/violations/

commit a3059b7cce9719d0911191957746b23b581c1511
Merge: 4b31654 1d054a0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 10 14:28:18 2011 +0000

    Pass py_modules=[] to setup to avoid installing run_tests.py as a top-level module.

commit 1d054a0595ec64a4fea3982c8b195d32e1960c27
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 10 10:16:59 2011 +0100

    Add bug reference

commit 5ad921d7ae360b60c14e1e85b237af7f02b14fdc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 10 10:09:50 2011 +0100

    Pass py_modules=[] to setup to avoid installing run_tests.py as a top-level module.

 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9459fededca405881ed2c555b9a19c7bdcfcb7ff
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 02:13:59 2011 -0400

    fix servers test issues and add a test

 nova/tests/api/openstack/test_servers.py |   52 ++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 14 deletions(-)

commit 434801e22bbfe2d8e74e18773c109ee657b22616
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 02:01:03 2011 -0400

    added project_id for flavors requests links

 nova/api/openstack/flavors.py            |    3 +-
 nova/api/openstack/images.py             |    6 +--
 nova/api/openstack/servers.py            |    2 +-
 nova/tests/api/openstack/test_flavors.py |   80 +++++++++++++++++-------------
 4 files changed, 52 insertions(+), 39 deletions(-)

commit e68ace1d6f7cb6db842aae69faa89cb4679016e7
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 01:44:15 2011 -0400

    added project_id for images requests

 nova/api/openstack/images.py            |    3 +-
 nova/tests/api/openstack/test_images.py |   92 +++++++++++++++++--------------
 2 files changed, 52 insertions(+), 43 deletions(-)

commit c8a4a55437a332c49c7c1afc52a9c1c8bf93e593
Merge: a8a5b27 4b31654
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 01:18:44 2011 -0400

    merge trunk

commit 6548ce754984f2eb5e72612392a8a3392c2a21a2
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 9 18:43:18 2011 -0700

    fix so that the exception shows up in euca2ools  instead of UnknownError

 nova/api/ec2/__init__.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 820d28dcf09088b5878d4cd5dcb5f4765e0b4992
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 18:14:41 2011 -0700

    Dropped vsa_id from instances

 nova/compute/api.py                                |    8 ++----
 nova/db/api.py                                     |   12 --------
 nova/db/sqlalchemy/api.py                          |   30 +-------------------
 .../migrate_repo/versions/037_add_vsa_data.py      |    7 -----
 nova/db/sqlalchemy/models.py                       |    3 --
 nova/vsa/manager.py                                |    3 +-
 6 files changed, 6 insertions(+), 57 deletions(-)

commit 0719b038ba1548f98668991507c001eb18c82981
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 17:22:01 2011 -0700

    import formatting - thx

 nova/api/openstack/contrib/keypairs.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit f73b6dc8e90b763da1fe86496fc6fd6a80b99f0a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 9 17:03:24 2011 -0700

    List security groups project wise for admin users same as other users

 nova/api/openstack/contrib/security_groups.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit f3530742645d0a71593d1aa923f5e383e31a64e0
Merge: 2a329ff 4b31654
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 9 16:59:51 2011 -0700

    Merged with trunk

commit bd39829cc1908cb5ead899c9659a5c516b073a4f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 16:55:51 2011 -0700

    merge with nova-1411. fixed

 nova/api/ec2/cloud.py                      |    2 +-
 nova/api/openstack/contrib/floating_ips.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 83ed9faa488b3ec0f1cb16e7147293c912e2fc2b
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 19:35:40 2011 -0400

    pep8 fix

 nova/api/openstack/contrib/floating_ips.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c6ebaf9861e3b652663c0ff60ad545864f72677
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 19:34:51 2011 -0400

    use correct variable name

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a8a5b27a577f8e007e2cc79570f97ae075fda767
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 9 19:26:35 2011 -0400

    adding project_id to flavor, server, and image links for /servers requests

 nova/api/openstack/servers.py                      |    8 ++-
 nova/api/openstack/views/flavors.py                |   15 +++--
 nova/api/openstack/views/images.py                 |   16 ++++--
 nova/api/openstack/views/servers.py                |    8 ++-
 .../api/openstack/contrib/test_multinic_xs.py      |    8 +--
 nova/tests/api/openstack/test_image_metadata.py    |   28 +++++-----
 nova/tests/api/openstack/test_server_actions.py    |   58 ++++++++++----------
 nova/tests/api/openstack/test_server_metadata.py   |   56 +++++++++----------
 nova/tests/api/openstack/test_servers.py           |   56 +++++++++----------
 nova/tests/integrated/api/client.py                |   32 +++++++----
 nova/tests/integrated/test_extensions.py           |    2 +-
 11 files changed, 156 insertions(+), 131 deletions(-)

commit 8a8b71b2eaf72b03c0c2bc847b449d2d640fc6c0
Merge: 96631a9 4b31654
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 9 16:26:12 2011 -0700

    Merged with trunk

commit 131b2185e23567895e3f87cdfe9c2822d18910b2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 16:12:59 2011 -0700

    tests pass

 nova/api/openstack/contrib/keypairs.py            |   16 ++++++++--------
 nova/tests/api/openstack/contrib/test_keypairs.py |    8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

commit e33a54ec84d7dde281f7a125695aabc171989964
Merge: 1fc7164 4b31654
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 18:46:57 2011 -0400

    merge from trunk

commit 48d9436ecde7d65699897f158247981fcbb65c72
Merge: f34b542 4b31654
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 15:21:46 2011 -0700

    merged with nova-1411

commit 4b3165429797d40da17f5c59aaeadb00673b71b2
Merge: e8b0a16 cfa2303
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 9 22:08:37 2011 +0000

    This branch makes sure to detach fixed ips when their associated floating ip is deallocated from a project/tenant.

commit f34b542b28f68951a74591bb686953a621dd1ed2
Merge: d4cf1c2 ec57e2a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 15:06:59 2011 -0700

    Merge with nova. Moved user+access to flags. changes for log access mode

commit cfa2303fcb0b59e64504d079256e4356fa3bf01f
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 9 14:45:31 2011 -0700

    adding other emails to mailmap

 .mailmap |    2 ++
 1 file changed, 2 insertions(+)

commit 568188c158db3caddfcd9ecb384189f93b076dd9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 14:23:30 2011 -0700

    add Keypairs to test_extensions

 nova/tests/api/openstack/test_extensions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit adc4d2dc71b6dcdad4bca57925f89d7344a613e8
Merge: 1d269ad d6943d7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 9 22:20:53 2011 +0100

    Merge trunk

commit c95954ca1a704b6f6e53e7b37f797ad51cb5efa9
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 9 14:17:56 2011 -0700

    adding myself to authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit e8b0a164eb3e9021d3d1e2ab12eb31bf561e996c
Merge: 44d4994 e817896
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 9 21:09:10 2011 +0000

    This adds the servers search capabilities defined in the OS API v1.1 spec.. and more for admins.
    
    For users, flavor=, image=, status=, and name= can be specified.  name= supports regular expression matching.
    Most other options are ignored.  (things outside of the spec like 'recurse_zones' and 'reservation_id' still work, also)
    
    If admin_api is enabled and context is an admin: along with the above, one can specify ip= and ip6= which will do regular expression matching.  Also, any other 'Instance' column name can be specified, so you can do regexp matching there as well.  Unknown Instance columns are ignored.
    
    Also fixes up fixed_ip=, making a 404 returned vs a 500 error... and handling this properly with zone recursion as well.

commit 44d4994eadc7413e27ebe60d7880278fc0365b6f
Merge: 5afb04d 47229cb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Aug 9 20:08:23 2011 +0000

    Be more tolerant of agent failures. It is often the case there is only a problem with the agent, not with the instance, so don't claim it failed to boot so quickly.

commit c81febc28a602989636e77d1b3e9a75741e04352
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 9 16:00:54 2011 -0400

    Updated the EC2 metadata controller so that it returns the correct value
    for instance-type metadata.

 nova/api/ec2/cloud.py       |    2 +-
 smoketests/test_netadmin.py |   19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

commit 057b6ad650013a952f88f6e02f3e3db0164084d1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 13:00:13 2011 -0700

    added tests - list doesn't pass due to unicode issues

 nova/api/openstack/contrib/keypairs.py            |   26 +++---
 nova/crypto.py                                    |   10 ++-
 nova/tests/api/openstack/contrib/test_keypairs.py |   99 +++++++++++++++++++++
 3 files changed, 122 insertions(+), 13 deletions(-)

commit d5bcc6764b418d7aa16b53b50173261385445ee8
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 11:31:48 2011 -0700

    initial port

 nova/api/openstack/contrib/keypairs.py |  137 ++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

commit 8aa400844da8d22ad77a6908a92a870b01393e2e
Merge: 05cbe30 5afb04d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 13:38:09 2011 -0400

    merged trunk

commit 47229cb10c7a322755d36229649c9d3e5712592d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Aug 9 17:32:39 2011 +0000

    Be more tolerant of agent failures. The instance still booted (most likely)
    so don't treat it like it didn't

 nova/virt/xenapi/vmops.py |   90 +++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

commit 05cbe3032dfdfb4229718ead981c982864118f15
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 12:51:42 2011 -0400

    Updated extensions to expect tenant ids
    Updated extensions tests to use tenant ids

 nova/api/openstack/extensions.py                  |    5 +++--
 nova/tests/api/openstack/extensions/foxinsocks.py |   10 ++++++----
 nova/tests/api/openstack/test_extensions.py       |   17 ++++++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

commit 5afb04d2fbeccf31a83681ef6b58cb9a7674993b
Merge: 78d086b e24e031
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 9 16:33:13 2011 +0000

    Update the OSAPI v1.1 server 'createImage' and 'createBackup' actions to limit the number of image metadata items based on the configured quota.allowed_metadata_items that is set.

commit 78d086b62cb7f1bf043d368e7d2b9e304d4c764f
Merge: 86007fe 73a2689
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 16:12:59 2011 +0000

    Fix pep8 error.

commit 73a26895d850d717d5bd5f106edc6c9ae09218a4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 11:47:46 2011 -0400

    fixing one pep8 failure

 nova/tests/api/openstack/test_server_metadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86007fec1c53fa4361d15042dfa609a8ee2b3ef1
Merge: b43b3d1 9a52a79
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Aug 9 15:41:55 2011 +0000

    I think this restores the functionality ...
    
    
    $ bin/nova-manage flavor list
    m1.medium: Memory: 4096MB, VCPUS: 2, Storage: 40GB, FlavorID: 3, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    $ bin/nova-manage flavor delete m1.medium
    m1.medium deleted
    $ bin/nova-manage flavor delete m1.medium --purge
    m1.medium purged
    $ bin/nova-manage flavor list
    m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
    m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB

commit b43b3d147ce80f130ea971b6333ed729ac83cdfa
Merge: 9d43baf 56ae11d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 15:34:32 2011 +0000

    Adds missing nova/api/openstack/schemas to tarball

commit 9d43baf7d392056c92f84508d2f20d94ec7e4737
Merge: 2b50db4 d72e36d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 15:27:56 2011 +0000

    Instance metadata now functionally works (completely to spec) through OSAPI

commit 8ae2a4cdebc080ba4def0ed07e3e1587f9db9bce
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 11:24:27 2011 -0400

    updated v1.1 flavors tests to use tenant id

 nova/tests/api/openstack/test_flavors.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit d72e36d63b1aefe7731d5c832c2b2fa52227407c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 11:10:14 2011 -0400

    making usage of 'delete' argument more clear

 nova/api/openstack/server_metadata.py |    9 ++++++---
 nova/compute/api.py                   |    8 +++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

commit 2b50db44ee1b9b1d8c011a752eab6773694992a3
Merge: f5f5476 f80ac0c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 15:02:54 2011 +0000

    Fix the two pep8 issues that sneaked in while the test was disabled.

commit f80ac0c7404882fa0f3e640d1330ab37e6da797a
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 15:44:43 2011 +0100

    Fix remaining two pep8 violations

 bin/nova-manage                                 |    3 +--
 nova/tests/api/openstack/test_server_actions.py |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

commit d4d2227cd396455c881f2ed36008578b2d4a7720
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 10:29:56 2011 -0400

    Updated TenantMapper to handle resources with parent resources

 nova/api/openstack/__init__.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit ed4a3b33647d3cbf5b1733596c1e180078e23cb0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 10:29:07 2011 -0400

    updating tests; fixing create output; review fixes

 nova/api/openstack/server_metadata.py            |   24 ++++++++++-------
 nova/compute/api.py                              |    2 ++
 nova/db/sqlalchemy/api.py                        |    2 +-
 nova/tests/api/openstack/test_server_metadata.py |   30 +++++++++++++++++-----
 4 files changed, 41 insertions(+), 17 deletions(-)

commit f5f54769bd827681a527daefd9a15eb43dde2c03
Merge: d6943d7 44fc059
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 14:07:55 2011 +0000

    OSAPI v1.1 POST /servers now returns a 202 rather than a 200

commit 56ae11d27bb3a2ee00b0151983fd2a0f14667a0d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 14:25:52 2011 +0100

    Include missing nova/api/openstack/schemas

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit c1ac67222e18c5fe74a52aa864231d5311374816
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 14:11:15 2011 +0100

    Rename sudo_helper FLAG into root_helper

 nova/flags.py |    2 +-
 nova/utils.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 238122f55fe70eedcd670714d80e6d2c10c4f3ab
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 13:47:55 2011 +0100

    Minor fix to reduce diff

 nova/tests/fake_utils.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit d6943d72525fd6a48bc9b3407bc90d9da7f99ad9
Merge: 816f773 82eb299
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Tue Aug 9 12:47:47 2011 +0000

    Initial validation for ec2 security groups name.

commit 142f072cc3416f88dd0af757b17d7ddd473c5e20
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 13:34:54 2011 +0100

    Remove old commented line

 nova/network/linux_net.py |    1 -
 1 file changed, 1 deletion(-)

commit 446fb79eb0025ce50cac9fc5496d4e4840134bce
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 13:30:06 2011 +0100

    Command args can be a tuple, convert them to list

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e810e1f266daaa63167ea8412dc0416e88f688f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 12:21:28 2011 +0100

    Fix usage of sudo -E and addl_env in dnsmasq/radvd calls, remove addl_env support, fix fake_execute allowed kwargs

 nova/network/linux_net.py |   63 +++++++++++++++++++--------------------------
 nova/tests/fake_utils.py  |   12 ++++++---
 nova/utils.py             |    8 +-----
 3 files changed, 35 insertions(+), 48 deletions(-)

commit ed9ea0848e4c8e8220a7f3bc175d7855c88c84d0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 12:05:05 2011 +0100

    Use close_fds by default since it's good for you

 nova/utils.py |    1 +
 1 file changed, 1 insertion(+)

commit 2a8cff40af58d6d2b2fc3a818816eb2a913cccfb
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 11:22:32 2011 +0100

    Fix ajaxterm's use of shell=True, prevent vmops.py from running its own version of utils.execute

 nova/utils.py                   |    4 ----
 nova/virt/libvirt/connection.py |    6 +++---
 nova/virt/xenapi/vmops.py       |   26 ++++++++------------------
 3 files changed, 11 insertions(+), 25 deletions(-)

commit 816f7736eb03b16e1d0a9a1906bb436c7ad9f351
Merge: a1aaddb fe343a3
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Aug 9 09:54:51 2011 +0000

    With this branch, boot-from-volume can be marked as completed in some sense.
    The remaining is minor if any and will be addressed as bug fixes.
    
    With this branch the following is enabled.
    - describe instance attribute
    - get_metadata for euca-bundle-vol
    - root/ephemeral/swap device support

commit a1aaddb35ee81417fc8028c326b4b2940cbc801f
Merge: c8c76cb 458932a
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 9 05:27:52 2011 +0000

    Update the curl command in the __public_instance_is_accessible function of test_netadmin to return an error code which we can then check for and handle properly. This should allow calling functions to properly retry and timeout if an actual test failure happens.

commit 44fc059d8bf8e57a808d69ba3b5c9a4235707d34
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 00:47:16 2011 -0400

    updating more test cases

 nova/tests/api/openstack/test_servers.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit d7880c2a0ba1d4285edb33208e8a94a8e9f15a21
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 00:27:28 2011 -0400

    changing server create response to 202

 nova/api/openstack/servers.py            |    3 +++
 nova/tests/api/openstack/test_servers.py |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

commit c8c76cb1e276d242b97b9e540a9831ccaa6d32c8
Merge: d63bfef 72dc793
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Aug 9 02:07:20 2011 +0000

    Added xml schema validation for extensions resources.
    Added corresponding xml schemas.
    Added lxml dep, which is needed for doing xml schema validation.

commit 72dc7939f4bfd05588b09046cbd25be09413c4eb
Merge: 543a783 d63bfef
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 8 20:25:31 2011 -0400

    Merge from trunk.

commit 543a783cefc3b34fa4a5d4ae5b9034090666d182
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 8 20:23:15 2011 -0400

    Fixing a bug in nova.utils.novadir()

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d63bfef32d33edca440038c978f61bd303db23aa
Merge: 9e2abcc fee2812
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 23:24:32 2011 +0000

    Adds the ability to read/write to a local xenhost config. No changes to the nova codebase; this will be used only by admin tools that have yet to be created.

commit 9a52a79f45bb526f5ff15d8bb136bb947a114824
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Aug 8 15:33:17 2011 -0700

    fixed conditional because jk0 is very picky :)

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fee2812193258a1a4ade3116282d3f5c1cf1f58c
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 21:46:33 2011 +0000

    Fixed typo found in review

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 607d919420913969c90cedfba8857f07fc355c5e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 17:44:58 2011 -0400

    removing log lines

 nova/api/openstack/server_metadata.py |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 450a9ff6d7082c2c12ad933be0743c010103ffa9
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Aug 8 14:43:52 2011 -0700

    added --purge optparse for flavor delete

 bin/nova-manage |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4de24a4d44040ba38a474cd789b95a2b59d494ff
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 17:33:03 2011 -0400

    making server metadata work functionally

 nova/api/openstack/server_metadata.py |   18 +++++++++++-------
 nova/db/api.py                        |    2 +-
 nova/db/sqlalchemy/api.py             |   12 ++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

commit 61cf3721ce94d7f2458e4e469cbee3333f954588
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 16:38:14 2011 -0400

    cleaning up instance metadata api code

 nova/api/openstack/server_metadata.py            |   28 ++++++----------
 nova/compute/api.py                              |   25 +++++++++-----
 nova/db/api.py                                   |    6 ++--
 nova/db/sqlalchemy/api.py                        |   39 ++++++++++++++++------
 nova/tests/api/openstack/test_server_metadata.py |   32 +++++++++---------
 5 files changed, 75 insertions(+), 55 deletions(-)

commit 59426d29116ed53dbbe4a060227a1e68fc49a178
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 16:36:17 2011 -0400

    Updated servers tests to use tenant id

 nova/tests/api/openstack/test_servers.py |   94 +++++++++++++++---------------
 1 file changed, 47 insertions(+), 47 deletions(-)

commit 9e2abcca6bd0d60bc06e2dbb1c430c8ade4914a7
Merge: 439afc3 e4ee8b5
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 8 20:17:48 2011 +0000

    Set image progress to 100 if the image is active.

commit 3f23c79bbb556cf05f7cf8c839edb6398464e051
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:12:35 2011 +0000

    Cleaned up merge messes.

 nova/api/openstack/contrib/hosts.py |   15 +--------------
 nova/compute/api.py                 |    5 -----
 2 files changed, 1 insertion(+), 19 deletions(-)

commit 8f6b59f0a12a60ef7e45607d9dbcb8bf1c707297
Merge: de23e5a 439afc3
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:06:54 2011 +0000

    Merged trunk.

commit de23e5ad63f6293060835e496363c935044480d6
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:03:14 2011 +0000

    cleaned up unneeded line

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    1 -
 1 file changed, 1 deletion(-)

commit 439afc337fec1064ff8eff58625f54f8450dce47
Merge: 047f6e0 9788cdd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Aug 8 19:48:07 2011 +0000

    nova.exception.wrap_exception will re-raise some exceptions, but in the process of possibly notifying that an exception has occurred, it may clobber the current exception information. nova.utils.to_primitive in particular (used by the notifier code) will catch and handle an exception clobbering the current exception being handled in wrap_exception. Eventually when using the bare 'raise', it will attempt to raise None resulting a completely different and unhelpful exception.
    
    The patch saves the exception at the beginning of wrap_exception and then re-raises the original exception avoiding the possibility of a clobbered exception.

commit 1fc7164ecaa42c33ff510ec8ef3ca92f183c96e3
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Mon Aug 8 15:37:23 2011 -0400

    remove obsolete script from setup.py

 setup.py |    1 -
 1 file changed, 1 deletion(-)

commit 4c7a33ee907ae7abcff020c75dde8ed320fe7aeb
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Mon Aug 8 15:30:44 2011 -0400

    assert that vmops.revert_migration is called

 nova/tests/test_xenapi.py  |   25 ++++++++++++++++++-------
 nova/tests/xenapi/stubs.py |    4 ----
 2 files changed, 18 insertions(+), 11 deletions(-)

commit 9788cddbf7833a82fc5589dd5f2869a309d1f657
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Aug 8 19:28:42 2011 +0000

    Import sys as well

 nova/exception.py |    1 +
 1 file changed, 1 insertion(+)

commit 96631a9e1188d1781381cafc409c2ec3ead895fb
Merge: fb0b82c ec57e2a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 8 12:20:06 2011 -0700

    Resolve conflicts and fixed broken unit testcases

commit 047f6e0351c21ff2caff903731e61f10ac38e59d
Merge: 12bc21f b23387e
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 19:10:58 2011 +0000

    This branch adds additional capability to the hosts API extension. The new options allow an admin to reboot or shutdown a host. I also added code to hide this extension if the --allow-admin-api is False, as regular users should have no access to host API calls.

commit c600b2cf3697fc3587fe5519fda8dd4b82d67234
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 8 12:10:14 2011 -0700

    adding forgotten import for logging

 nova/api/openstack/contrib/floating_ips.py |    1 +
 1 file changed, 1 insertion(+)

commit 12bc21f7d40f39bd0a2f69da07af42232bd303a9
Merge: ec57e2a 7730d4d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 8 19:05:09 2011 +0000

    Adds OS API 1.1 support

commit 21e4cc9c4e79e8e291ac845d9dc08153c09fbf02
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 13:54:18 2011 -0400

    Updated test_images to use tenant ids

 nova/tests/api/openstack/test_images.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 6107aeceab2f3226bb1f3bff820cdcc2bc9be3cc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 13:50:31 2011 -0400

    Don't do anything with tenant_id for now

 nova/api/openstack/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b23387ef7a0024ac11e0970e3b76fa3441e30a9c
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 17:34:42 2011 +0000

    Review fixes

 nova/compute/api.py                                |    4 ++--
 nova/compute/manager.py                            |    6 ++----
 nova/virt/xenapi/vmops.py                          |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

commit b2b5131ac2ab532afb1a3e507992d60b15dd3855
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 13:34:20 2011 -0400

    fixed wrong syntax

 nova/api/openstack/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe4c7ca6f21f367b3f6ca1a536fdcd550f301fba
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 12:57:38 2011 -0400

    Assign tenant id in nova.context

 nova/api/openstack/wsgi.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7730d4d1ebda5c88ae83f1f5e6dbd6b0a5c82ee4
Merge: 19e5032 ec57e2a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 8 09:12:56 2011 -0700

    another trunk merge

commit 6dcea0da62e881eaeb02027ea868d49c2402209d
Merge: 966b721 eb66810
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 15:34:04 2011 +0000

    Merged trunk

commit 966b7218a0fc96222e0ef0a22526f1bf3e7f2a9c
Merge: 3f7c71f ec57e2a
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 15:31:29 2011 +0000

    Merged trunk

commit 586359f792cb32210f83046e46a0cdb85b319fcd
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:51:42 2011 +0000

    Cleaned up some old code added by the last merge

 nova/compute/manager.py         |    8 +-------
 nova/virt/fake.py               |    4 ----
 nova/virt/hyperv.py             |    4 ----
 nova/virt/libvirt/connection.py |    4 ----
 nova/virt/vmwareapi_conn.py     |    4 ----
 nova/virt/xenapi/vmops.py       |   11 -----------
 nova/virt/xenapi_conn.py        |    4 ----
 7 files changed, 1 insertion(+), 38 deletions(-)

commit 973032959ea4b1300cb68f767885dbd3226bebd9
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:42:18 2011 +0000

    Fixed some typos from the last refactoring

 nova/api/openstack/contrib/hosts.py |    2 +-
 nova/tests/test_hosts.py            |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

commit b1a503053cb8cbeb1a4ab18e650b49cc4da15e23
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:19:53 2011 +0000

    Moved the restriction on host startup to the xenapi layer.:

 nova/api/openstack/contrib/hosts.py |   18 +++++++-----------
 nova/virt/xenapi/vmops.py           |    2 +-
 nova/virt/xenapi_conn.py            |   13 +++++++++++--
 3 files changed, 19 insertions(+), 14 deletions(-)

commit d2aa9ddcb26b1217de55fc5cd6c886059e781cda
Merge: 157d856 ec57e2a
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Aug 8 15:15:49 2011 +0100

    Remove nova/tests/network, which was accidentally included in commit.

commit e4ee8b54d0e840050357902b78f7e48013be9096
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Aug 8 10:12:01 2011 -0400

    upper() is even better.

 nova/api/openstack/views/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4cf1c2d8c5fa21a2f08ee35ce98cb98122e89c4
Merge: 6090e05 6d24d3d
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Aug 8 07:10:12 2011 -0700

    merged with 1383

commit 10ab2e76b1ea8bbbb6bff4ccaf506bfdd5b57388
Merge: f1f86d2 dcac4bc
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:07:03 2011 +0000

    Updated with code changes on LP

commit f1f86d229cff084a3f6257565a991c7ffe010907
Merge: f81122d ec57e2a
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 13:55:04 2011 +0000

    Merged trunk

commit 27a77fbc2651381d9663064a363105f803781924
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Aug 8 09:30:56 2011 +0000

    Save exception and re-raise that instead of depending on thread local
    exception that may have been clobbered by intermediate processing

 nova/exception.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 309e49873fd2535fa64b242aea254b72b5cbb4a9
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Aug 7 22:05:01 2011 -0400

    Adding __init__.py files

 0 files changed

commit ec57e2a27ebfc8eba84d82f5372408e3d85a9272
Merge: c911c6d 7a5bb39
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Aug 8 01:52:36 2011 +0000

    Adds ability to disable snapshots in the Openstack API.

commit 157d85633bf11e91a17d9181cb56c45a4074ac66
Merge: 17eff9d c911c6d
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Sun Aug 7 21:42:46 2011 +0100

    Sync trunk

commit 8c75de3188fdbec6456fcf7071b6b08b9d1a0d40
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Aug 7 16:40:07 2011 -0400

    Set image progress to 100 if the image is active.

 nova/api/openstack/views/images.py      |    4 +++-
 nova/tests/api/openstack/test_images.py |   19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

commit 17eff9d2112acd925ca191e342bb66eec9023396
Merge: c45bb82 6d24d3d
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Sun Aug 7 20:54:26 2011 +0100

    Sync trunk

commit 458932a4f069225ff1a2fad0df81242f058e7af9
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Aug 6 22:59:09 2011 -0400

    Update the curl command in the __public_instance_is_accessible function
    of test_netadmin to return an error code which we can then check for
    and handle properly. This should allow calling functions to properly
    retry and timout if an actual test failure happens.

 smoketests/test_netadmin.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit e24e031b453f90bb1d26616ec8d3975048d46220
Merge: a30856c c911c6d
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Aug 6 20:42:33 2011 -0400

    Merge w/ trunk. Fix pep8 fix conflict.

commit c911c6d737e9794cb6e4a64d530bc98056c005a0
Merge: c5cff2f 8c6ccfd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Aug 6 20:07:48 2011 +0000

    ZoneAwareScheduler classes couldn't build local instances due to an additional argument ('image') being added to compute_api.create_db_entry_for_new_instance() at some point.
    
    With this fix, 'image' is now being passed down to the scheduler and into the above call.  Updated an existing test so that it didn't stub around the above failing call.

commit 82eb299fd0fa6601d4704836ed7e76369f086ffc
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sat Aug 6 20:18:35 2011 +0100

    simplified test cases further, thanks to trunk changes

 nova/tests/test_api.py |   12 ------------
 1 file changed, 12 deletions(-)

commit 43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf
Merge: 2e3b199 c5cff2f
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sat Aug 6 19:08:08 2011 +0100

    Merge with trunk, resolving merge conflict

commit c5cff2f02e887e518744f42f5a21605398a301a4
Merge: bfd34aa a77f10e
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Aug 6 11:27:43 2011 +0000

    Added possibility to mark fixed ip like reserved and unreserved.

commit a30856cd5a7358772d47c3877dd01d1078ffe472
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 5 20:05:33 2011 -0400

    Update the OSAPI v1.1 server 'createImage' and 'createBackup' actions to limit the number of image metadata items based on the configured quota.allowed_metadata_items that is set.

 nova/api/openstack/common.py                    |   14 +++++++-
 nova/api/openstack/image_metadata.py            |   16 ++-------
 nova/api/openstack/servers.py                   |    6 ++--
 nova/tests/api/openstack/test_server_actions.py |   40 +++++++++++++++++++++++
 4 files changed, 60 insertions(+), 16 deletions(-)

commit 7a5bb39ef11d630df26f2fcfbf249f0c34e9fa55
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 18:51:17 2011 -0500

    Pep8 fix

 nova/api/openstack/common.py |    1 -
 1 file changed, 1 deletion(-)

commit 8c6ccfd51698bffe0d56193bc4137ad80708e6d3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 5 16:41:03 2011 -0700

    zone_aware_scheduler classes couldn't build instances due to a change to compute api's create_db_entry_for_new_instance call.  now passing image argument down to the scheduler and through to the call.  updated a existing test to cover this

 nova/compute/api.py                               |    4 +++
 nova/scheduler/zone_aware_scheduler.py            |    3 ++-
 nova/tests/scheduler/test_zone_aware_scheduler.py |   27 +++++++++++++++++----
 3 files changed, 28 insertions(+), 6 deletions(-)

commit b15535a20b7f717aa23f5bc6d695e574bb86c407
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 23:26:08 2011 +0000

    Adding check to stub method

 nova/api/openstack/common.py  |    2 +-
 nova/api/openstack/servers.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit fe7f229c8ad91b1ae9187b8c541fdefd535eed9b
Author: Jake Dahn <jake@ansolabs.com>
Date:   Fri Aug 5 16:20:53 2011 -0700

    moving try/except block, and changing syntax of except statement

 nova/api/openstack/contrib/floating_ips.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit bfd34aa48fbe8ebe8b2057c09eb947977018c37c
Merge: 429b42f 8a87a3e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 5 22:57:42 2011 +0000

    Fixes broken image_convert.  The context being passed to glance image service was not a real context.

commit bdabdd50845279cbca11f510dd5da6a5aa110528
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:56:08 2011 +0000

    Using decorator for snapshots enabled check

 nova/api/openstack/common.py  |   14 ++++++++++++++
 nova/api/openstack/images.py  |    7 +------
 nova/api/openstack/servers.py |    7 +------
 3 files changed, 16 insertions(+), 12 deletions(-)

commit c49e99a7fc590c2dde6125843d904895ca8861a3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:29:28 2011 +0000

    Disable flag for V1 Openstack API

 nova/api/openstack/servers.py                   |    6 ++++++
 nova/tests/api/openstack/test_server_actions.py |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

commit ccea6c91b2314311587466d67d20f1583ddba1ee
Author: Jake Dahn <jake@ansolabs.com>
Date:   Fri Aug 5 15:28:10 2011 -0700

    adding logging to exception in delete method

 nova/api/openstack/contrib/floating_ips.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 8a87a3ecc0bc9fe524f42950ec0d50124bb5b2b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 5 15:25:12 2011 -0700

    Pass a real context object into image service calls

 bin/nova-manage |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 9633e9877c7836c18c30b51c8494abfb025e64ca
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:14:15 2011 +0000

    Adding flag around image-create for v1.0

 nova/api/openstack/__init__.py          |    3 +++
 nova/api/openstack/images.py            |    6 ++++++
 nova/tests/api/openstack/test_images.py |   10 ++++++++++
 3 files changed, 19 insertions(+)

commit fb0b82c0d6af2d67ec9a88842d857b558eaec5d1
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 5 15:00:31 2011 -0700

    Refactored code to reduce lines of code and changed method signature

 nova/db/api.py             |   12 ++++++------
 nova/db/sqlalchemy/api.py  |   14 ++------------
 nova/network/manager.py    |   31 +++++++++++++++++--------------
 nova/tests/test_network.py |   32 ++++++++++++++++----------------
 4 files changed, 41 insertions(+), 48 deletions(-)

commit 09772f5bf3140a6f4cbaace50ead8d25a874cbb0
Author: Jake Dahn <jake@ansolabs.com>
Date:   Fri Aug 5 14:37:44 2011 -0700

    If ip is deallocated from project, but attached to a fixed ip, it is now detached

 nova/api/openstack/contrib/floating_ips.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 429b42f9fdec768a4a63ed8c2d7a92f130f90f0d
Merge: d6c6059 a3e618b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 19:58:01 2011 +0000

    Glance Image Service now understands how to use glance client to paginate through images.

commit d6c6059abefa422bc6f98f4f6c912f5dbb670fb6
Merge: 7bdc430 f03c926
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 5 19:47:52 2011 +0000

    Allow actions queries by UUID and PEP8 fixes.

commit 2a329ff0734bc4413723322e289a0ac486ed7e2f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 5 12:43:27 2011 -0700

    Fixed localization review comment

 nova/api/openstack/contrib/security_groups.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f03c926a7d28ee35789048ea53c36cd452ed3571
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 5 14:28:22 2011 -0500

    Allow actions queries by UUID and PEP8 fixes.

 nova/api/direct.py           |    1 +
 nova/api/openstack/common.py |    3 ++-
 nova/db/sqlalchemy/api.py    |   10 ++++++++--
 nova/tests/test_image.py     |    2 ++
 nova/tests/test_xenapi.py    |    1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

commit 2fe0c5fe95487df8827db10f38065e3c8ac3800f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 5 12:09:46 2011 -0700

    Fixed review comments

 nova/api/openstack/contrib/security_groups.py      |  101 ++++++++------------
 .../api/openstack/contrib/test_security_groups.py  |    8 +-
 2 files changed, 44 insertions(+), 65 deletions(-)

commit a3e618bdc64f5e2cbb62fcf4a5b2df0e437c4fd9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 15:02:18 2011 -0400

    fixing filters get

 nova/image/glance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 353fa4871069cf0b926f09aa00496002f65584cb
Author: John Tran <jhtran@att.com>
Date:   Fri Aug 5 11:48:06 2011 -0700

    fixed per peer review

 nova/network/manager.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3812d22b7a6f5d74418a7a99dc69c68a5b9f9046
Author: John Tran <jhtran@att.com>
Date:   Fri Aug 5 11:36:00 2011 -0700

    fixed per peer review

 nova/network/manager.py    |   27 ++++++++++++---------------
 nova/tests/test_network.py |   40 ++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

commit 681d3e2bfac2aa8e19cb393591b99efcbcdd8230
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 14:15:53 2011 -0400

    re-enabling sort_key/sort_dir and fixing filters line

 nova/image/glance.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 7bdc430d334d51193492191e490be20d41dd5125
Merge: c07e9eb d470f82
Author: Adam Gandelman <adamg@canonical.com>
Date:   Fri Aug 5 18:14:26 2011 +0000

    Make sure mapping['dns'] is formatted correctly before injecting via template into images.
    mapping['dns'] is retrieved from the network manager via info['dns'], which is a list constructed of multiple DNS servers.
    
    Fixes LP Bug #821203

commit c07e9ebf8396f42607b0c324a9b8edda00ec0fb9
Merge: c6b84e7 070d832
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 18:07:43 2011 +0000

    Add a generic image service test and run it against the fake image service.

commit c6b84e785a704b2d9ee8ce7102df7d2cca47f188
Merge: 6d24d3d 13fb04e
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Fri Aug 5 17:32:46 2011 +0000

    Implemented @test.skip_unless and @test.skip_if functionality in nova/test.py.
    
    Added nova/tests/test_skip_examples.py which contains example skip case usages.

commit 6090e05f4d3fbe11723e37de32a8c29077deaddb
Merge: f4359a7 a844741
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 5 09:59:28 2011 -0700

    merged with 1382

commit 6d24d3dc3713c644726ff7b66e58b9e514a554c1
Merge: a844741 1491530
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:52:43 2011 +0000

    Updates v1.1 servers/id/action requests to comply with the 1.1 spec

commit 2935bebd718e770d0f2c9d1ab5dca76cc7d5f76a
Author: John Tran <jhtran@att.com>
Date:   Fri Aug 5 09:50:11 2011 -0700

    fix typo

 nova/tests/test_network.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 149153085027237c343cc325e163979f1cd31a21
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:22:21 2011 +0000

    Moving from assertDictEqual to assertDictMatch

 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5d6e0a15d7bee07f00a0dfff3e043208ab8ed6a3
Merge: c26ac97 a844741
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:13:59 2011 +0000

    merging trunk

commit c26ac9785503b65b6af0ed829941ddaf9a74cf1c
Merge: 637dfc0 56ec8f0
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:13:44 2011 +0000

    merging trunk

commit a8447412b48c44c06c05d3f7d01468156f7adc6f
Merge: 56ec8f0 336efaf
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 5 16:07:45 2011 +0000

    Add exception logging for instance IDs in the __public_instance_is_accessible smoke test function. This should help troubleshoot an intermittent failure.

commit d76046a76fd086d5a09f9b7cdf94f61e740a63e6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 12:00:13 2011 -0400

    adding --fixes

commit 9602a558b6be6e6812626b986c0f9557a3862fe6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 11:59:14 2011 -0400

    glance image service pagination

 nova/api/openstack/images.py |    4 +--
 nova/exception.py            |    4 +++
 nova/image/glance.py         |   82 ++++++++++++++++++++++++++++--------------
 3 files changed, 61 insertions(+), 29 deletions(-)

commit 4acc4a9757af6e68456aba1fea2b320b2311b971
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 5 11:58:21 2011 -0400

    Pass tenant ids through on on requests

 nova/api/openstack/__init__.py |   17 ++++++++++++++++-
 nova/api/openstack/wsgi.py     |    3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

commit a77f10ee052fdafeb9d52407695719397c52e68d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 19:45:17 2011 +0400

    methods renamed

 bin/nova-manage                |    2 +-
 nova/tests/test_nova_manage.py |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 336efaf814c7796b9426d045f82f2d1e30d8db72
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 5 11:17:05 2011 -0400

    Add exception logging for instance IDs in the __public_instance_is_accessible
    smoke test function. This should help troubleshoot an intermittent failure.

 smoketests/test_netadmin.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c45bb82b65c5fb781ce500c11c5f931c77cda7bf
Merge: 04af316 56ec8f0
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 15:37:07 2011 +0100

    Merge to trunk.

commit 38756955417e5c2fad7c8848252c5a2334912e02
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Aug 5 16:23:48 2011 +0200

    Removed most direct sudo calls, make them use run_as_root=True instead

 nova/network/linux_net.py        |   78 ++++++++++++++++-------------
 nova/tests/test_libvirt.py       |   10 ++--
 nova/tests/test_volume.py        |   10 ++--
 nova/tests/test_xenapi.py        |   10 ++--
 nova/virt/disk.py                |   47 +++++++++---------
 nova/virt/libvirt/connection.py  |    7 +--
 nova/virt/libvirt/vif.py         |   16 +++---
 nova/virt/xenapi/vm_utils.py     |   15 +++---
 nova/virt/xenapi/volume_utils.py |    4 +-
 nova/volume/driver.py            |  101 +++++++++++++++++++++-----------------
 10 files changed, 161 insertions(+), 137 deletions(-)

commit 19e50320e36f02ce11a6aaae8f88a6ddbc132859
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:21:55 2011 -0700

    pep8 violations sneaking into trunk?

 nova/db/sqlalchemy/api.py |    3 ++-
 nova/tests/test_xenapi.py |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e3433605d77492a58916d2e131eb0701baf849fa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:19:35 2011 -0700

    pep8 violations sneaking into trunk?

 nova/api/direct.py           |    1 +
 nova/api/openstack/common.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 781025f246375c19a4dc663b42551c47d07f701a
Merge: ab1ba7c 56ec8f0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:13:52 2011 -0700

    trunk merge

commit 56ec8f040ba65e3b5ec1da768afaf0671fdb79f6
Merge: 502801b 5fe9205
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Aug 5 14:07:48 2011 +0000

    Fixes lp821144
    
    Revert resize broken because an incorrect number of parameters and a bad call at the virt layer

commit 070d832dad062dfb18439e77b4460e6ebe75bdb0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 15:38:25 2011 +0200

    Make disk_format and container_format optional for libvirt's snapshot implementation.

 nova/virt/libvirt/connection.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 1e366d9de180347b47675bf7f811ffd5a293ef10
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 15:37:36 2011 +0200

    pep8

 nova/image/fake.py       |    2 +-
 nova/tests/test_image.py |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

commit ab1ba7cbcffc92c2c82c468fb0a2a81f93db3f85
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 06:01:55 2011 -0700

    fixed up zones controller to properly work with 1.1

 nova/api/openstack/zones.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9742ff588d3ce90b1420eaf95e311f02a4e196da
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 14:54:56 2011 +0200

    Add generic image service tests.

 nova/image/fake.py       |   41 ++++++++++----
 nova/tests/test_image.py |  135 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+), 11 deletions(-)

commit ecdb1c87fb3904080d48f3fd3b3619f6c4a40df9
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Aug 5 14:33:12 2011 +0200

    Add run_as_root parameter to utils.execute, uses new sudo_helper FLAG to prefix command

 nova/flags.py |    3 +++
 nova/utils.py |    8 ++++++++
 2 files changed, 11 insertions(+)

commit 2a89883297f6b5398abb7486e9e26c12ab0fc0ec
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Aug 5 14:02:55 2011 +0200

    Remove spurious direct use of subprocess

 nova/console/xvp.py             |    1 -
 nova/utils.py                   |    4 ++++
 nova/virt/libvirt/connection.py |    3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

commit 7407a1a86c4039bdc541e9a26cc68c9c93f49bc3
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 5 18:29:32 2011 +0900

    Added virtual interfaces REST API extension controller

 nova/api/openstack/contrib/virtual_interfaces.py |  102 ++++++++++++++++++++++
 1 file changed, 102 insertions(+)

commit 04af316f176bdc5c26e68aff62a165e71e1b38e9
Merge: e1d914b 502801b
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 09:51:50 2011 +0100

    Trunk contained PEP8 errors.  Fixed.

commit e1d914bb0b7460bdb50d28f6b044521b65820b5f
Merge: 0c19e26 a9326d7
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 09:29:40 2011 +0100

    Trunk merge.

commit fe343a30ad5317ac5635667e72f56be775284658
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Aug 5 15:23:54 2011 +0900

    fix mismerge

 nova/virt/libvirt/connection.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit aee7778549904dc89fbd792ee60924932621a720
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 5 15:02:29 2011 +0900

    Added migration to add uuid to virtual interfaces.  Added uuid column to models

 .../versions/037_add_uuid_to_virtual_interfaces.py |   44 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 2 files changed, 46 insertions(+)

commit c6843bd0fc4e8a39d85662386030b721ff122249
Merge: e2770a4 502801b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 5 14:59:33 2011 +0900

    merged trunk

commit 4d868c9ee79bba04cebf1e0cb71b6af2044e46ed
Merge: 0ffc3b8 502801b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Aug 5 14:06:22 2011 +0900

    merged with nova trunk.

commit fa340e03bf33105053160d1d10973f5ea34cb0da
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Aug 5 04:47:13 2011 +0000

    Launchpad automatic translations update.

 po/zh_CN.po |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

commit 13fb04effa25e860eaa9e4ebaca2b4d906a140b0
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 23:01:22 2011 -0500

    fixed pep8 issue

 nova/tests/test_skip_examples.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 625330bbc70b7be0d007c2a5ce1fba4dfcc29bf8
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 22:59:36 2011 -0500

    utilized functools.wraps

 nova/test.py |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit b068e1edd79a5382ef1237d0b47e60dc141bae35
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 07:55:22 2011 +0400

    added missing tests

 nova/tests/test_nova_manage.py |   79 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

commit 8ecaec5719766811e60920293739595bce37fd0e
Merge: 40a9488 502801b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 07:49:29 2011 +0400

    tests and merge with trunk

commit b7167b21d615f8617d588a1656aa341fd226ded9
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 20:13:23 2011 -0700

    removed redundant logic

 nova/network/manager.py |    6 ------
 1 file changed, 6 deletions(-)

commit d4c5d5b18fc3b51fcb1ee5bc39ac866c4aa47d48
Merge: b557b63 502801b
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 19:43:33 2011 -0700

    merged trunk

commit 502801bfff0015ed3aa93b9d65a87cb6b80fd11d
Merge: 0b275cd f942a7f
Author: John Tran <jhtran@att.com>
Date:   Fri Aug 5 02:27:36 2011 +0000

    For nova-manage network create cmd, added warning when size of subnet(s) being created are larger than FLAG.network_size,  in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why

commit 0b275cd9d7a82aa596cc45be7137176de479cb4b
Merge: e4011ea c56d203
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Fri Aug 5 02:22:13 2011 +0000

    Remove instances of the "diaper pattern"
    
    Anywhere "except:" occurs, I tried to replace it with an explicit except on
    known error types. If none were known, Except was used.
    
    In the process I've been able to unearth a few evasive bugs and clean up some
    adjacent code.

commit e4011ea5c6b4782adbdba3911acdfdf4d524d217
Merge: 0fea610 66916be
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 02:02:31 2011 +0000

    Read response to reset the connection state-machine for the next request/response cycle.

commit 637dfc0f44cbd5bf0c76d80d708a241e562403ac
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:55:53 2011 +0000

    Added explanations to exceptions and cleaned up reboot types

 nova/api/openstack/servers.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit b557b6366b21a0d3795369785037ee29c8cef377
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 18:52:15 2011 -0700

    fix pep8 issues

 nova/network/manager.py    |   14 +++++++++-----
 nova/tests/test_network.py |    5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

commit 38eb72be5f15731ba34a7dc0f8a28aa0fb63ea90
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 18:37:36 2011 -0700

    fixed bug , when logic searched for next avail cidr it would return cidrs that were out of range of original requested cidr block.  added test for it

 nova/network/manager.py    |    4 ++++
 nova/tests/test_network.py |   17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

commit 02bf32d40cba09a688583e684f4b55dace1ee20a
Merge: 5b463f5 0fea610
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:29:39 2011 +0000

    Merge from trunk

commit 6c25f23673eb583d53053299448ce4504789685e
Merge: 79e51d7 0fea610
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:24:37 2011 +0000

    Merge with trunk

commit 79e51d7b138948eddd307747c517be9ad1aa67d1
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:07:53 2011 +0000

    Adding missing module xmlutil

 nova/api/openstack/xmlutil.py |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

commit 89ec28c70d7795d427ecd4242cb1856eabdca104
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 18:01:07 2011 -0700

    fixed bug, wasn't detecting smaller subnet conflict properly added test for it

 nova/network/manager.py    |   35 ++++++++++++++++++++++++-----------
 nova/tests/test_network.py |   30 +++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 12 deletions(-)

commit d470f82ea09214b6f535995aa551a23eb4ccc4ed
Author: Adam Gandelman <adamg@canonical.com>
Date:   Thu Aug 4 17:43:37 2011 -0700

    Properly format mapping['dns'] before handing off to template for injection (Fixes LP Bug #821203)

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66916be1ad5bbc0cdc19928ee35e5e8f4e4a3915
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 00:12:19 2011 +0000

    Read response to reset HTTPConnection state machine

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +++
 1 file changed, 3 insertions(+)

commit f58d441b55e143de35aefd039b80e0b27dad9ce2
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 16:27:55 2011 -0700

    removed unnecessary context from test I had left there from prior

 nova/tests/test_network.py |    1 -
 1 file changed, 1 deletion(-)

commit 18f09f165b5dca5f11253b143045b2ff7327532d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 4 16:20:38 2011 -0700

    move ensure_vlan_bridge,ensure_bridge,ensure_vlan to the bridge/vlan specific vif-plugging driver

 nova/network/linux_net.py |  166 +++++++++++++++++++++++----------------------
 nova/virt/libvirt/vif.py  |    6 +-
 2 files changed, 90 insertions(+), 82 deletions(-)

commit 8c7b71f65e54d67615e52927591e12a43b8b3991
Author: John Tran <jhtran@att.com>
Date:   Thu Aug 4 16:05:08 2011 -0700

    re-integrated my changes after merging trunk.  fixed some pep8 issues.  sorting the list of cidrs to create, so that it will create x.x.0.0 with a lower 'id' than x.x.1.0 (as an example).  <- was causing libvirtd test to fail

 nova/network/manager.py    |   54 ++++++++++++++++++++++++++++++++++++++++----
 nova/tests/test_network.py |    6 ++---
 2 files changed, 52 insertions(+), 8 deletions(-)

commit 5fe92058d0ee11a7e9ea1c8f56b7e9350cf703e4
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 4 22:18:52 2011 +0000

    Revert migration now finishes

 nova/compute/manager.py   |    4 ++--
 nova/tests/test_xenapi.py |   47 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

commit 0fea610a6918089c53cc33335a4db4557820675f
Merge: 790d035 4eed25b
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 4 21:39:37 2011 +0000

    The OSAPI v1.0 image create POST request should store the instance_id as a Glance property.

commit 790d035953a36ac89e954c4db8c98af749cb342d
Merge: b38b29f b02fb7f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 21:32:56 2011 +0000

    There was a recent change to how we should flip FLAGS in tests, but not all tests were fixed.  This covers the rest of them.  I also added a method to test.UnitTest so that FLAGS.verbose can be set.  This removes the need for flags to be imported from a lot of tests.
    
    Another side effect is that it fixes a bug in host_test_filter.py where there was a tearDown method in the class that didn't call its parent.  Ie, test.TestCase.tearDown() was not being called.  host_test_filter.py's tearDown has been removed as a part of this cleanup, so the parent will be called now.
    
    This happens to fix an unrelated pep8 issue in trunk, as well, so that my tests pass cleanly.

commit 77a1a63c30a9797f2f729c7b815d6660bed880d5
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 4 21:26:21 2011 +0000

    Bad method call

 nova/virt/xenapi_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dae356ad06bb4926ca91fd9a5182271d93c4b7be
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 4 21:18:55 2011 +0000

    Forgot the instance_id parameter in the finish call

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit eb66810f6034a29724630e89739217a83b858d86
Merge: b5ff9bc dcac4bc
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 21:17:21 2011 +0000

    Merged in the power action changes

commit b5ff9bc2add98444773a26ce37e1ceb82e9531ae
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 21:10:22 2011 +0000

    Removed test show() method

 nova/api/openstack/contrib/hosts.py |    7 -------
 1 file changed, 7 deletions(-)

commit b38b29f672f20a7db3f19857d53671429004a9e1
Merge: a546f5e 475963e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 21:04:21 2011 +0000

    Fixed rescue/unrescue since the swap changes landed in trunk. Minor refactoring (renaming callback to _callback since it's not used here).

commit a546f5e488e6486bdf21678fb829ccc567d6e4aa
Merge: 848b10a 5e1d63c
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 4 20:57:49 2011 +0000

    Updates to the XenServer glance plugin so that it obtains the set of
    existing headers and sends them along with the request to PUT a
    snapshotted image into glance.

commit dcac4bc6c7be9832704e37cca7ce815e083974f5
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 20:55:56 2011 +0000

    Added admin-only decorator

 nova/api/openstack/contrib/admin_only.py |   30 ++++++++++++++++++++++++++++++
 nova/api/openstack/contrib/hosts.py      |   14 ++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

commit 848b10a7fbc1da9d1d6615e56f3aa212f366ca3d
Merge: 6cb5d4d ca79470
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Thu Aug 4 20:52:34 2011 +0000

    This updates nova-ajax-console-proxy to correctly use the new syntax introduced last week by Zed Shaw <zedshaw@zedshaw.com>.
    
    rpc.Connection -> rpc.create_connection
    rpc.TopicAdapterConsumer -> rpc.create_consumer

commit 2c63da94da4ef7f1848867eed4760bb70f9a8d82
Merge: 75b110a 6cb5d4d
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 20:49:31 2011 +0000

    Merged trunk

commit 75b110aa451382cce94f10a392597b40df97839c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 20:49:21 2011 +0000

    Changed all references to 'power state' to 'power action' as requested by review.

 nova/api/openstack/contrib/hosts.py                |   43 +++++++++++---------
 nova/compute/api.py                                |    6 +--
 nova/compute/manager.py                            |    6 +--
 nova/tests/test_hosts.py                           |   31 +++++++-------
 nova/virt/driver.py                                |    2 +-
 nova/virt/fake.py                                  |    2 +-
 nova/virt/hyperv.py                                |    2 +-
 nova/virt/libvirt/connection.py                    |    2 +-
 nova/virt/vmwareapi_conn.py                        |    2 +-
 nova/virt/xenapi/vmops.py                          |    8 ++--
 nova/virt/xenapi_conn.py                           |    4 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   12 +++---
 12 files changed, 61 insertions(+), 59 deletions(-)

commit 5b463f5d14c62f66250d5edc3edbd2ded704e0da
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 16:38:55 2011 -0400

    Added missing tests for server actions
    Updated reboot to verify the reboot type is HARD or SOFT
    Fixed case of having an empty flavorref on resize

 nova/api/openstack/servers.py                   |    9 +-
 nova/tests/api/openstack/test_server_actions.py |  107 +++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

commit 475963efeae1b12ae7474508559fb904bc9c1675
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:31:18 2011 -0500

    Added more informative docstring.

 nova/virt/xenapi/vmops.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0f515d6d31b2c95ed7f1e3ca8d9d67f98fda9fbe
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 16:26:31 2011 -0400

    Added XML serialization for server actions

 nova/api/openstack/create_instance_helper.py    |   46 ++++++++
 nova/tests/api/openstack/test_server_actions.py |  144 +++++++++++++++++++++++
 2 files changed, 190 insertions(+)

commit eca23b1ad18a8626dd68cded4d488ca1aa779f69
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:22:36 2011 -0500

    Removed debugging code.

 nova/compute/manager.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 9ce80fc74b3ea4513369b795d1e6891d6dfa8e03
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 16:20:37 2011 -0400

    Updated create image server action to respect 1.1

 nova/api/openstack/create_instance_helper.py    |   23 ++++++++++++++---------
 nova/tests/api/openstack/test_server_actions.py |    1 -
 nova/tests/api/openstack/test_servers.py        |   10 ----------
 3 files changed, 14 insertions(+), 20 deletions(-)

commit 6cb5d4d7fdf4731112cefbe6f13794b081a82c5f
Merge: b971409 bd0a2ed
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 4 20:19:22 2011 +0000

    Fixes lp819397
    
    migrations/resize no longer go through the full create process, but instead are merely powered on.

commit b8d4004e9de28dae47c6a1772a0caac965f7a69f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:16:42 2011 -0500

    Fixed rescue unit tests.

 nova/tests/test_xenapi.py |    6 ++++++
 nova/virt/xenapi/vmops.py |   15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

commit 346454c7fb1156d8dff075042f1c45dbb22cded1
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 4 16:02:28 2011 -0400

    Nuke hostname. We don't use it.

 bin/nova-dhcpbridge |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit f22c19c6f78451074c33fe8da855755574cb6b49
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 15:51:41 2011 -0400

    Split serverXMLDeserializers into v1.0 and v1.1

 nova/api/openstack/create_instance_helper.py    |   48 +++++++++++++++++++++++
 nova/api/openstack/servers.py                   |    7 +++-
 nova/tests/api/openstack/test_server_actions.py |    4 +-
 nova/tests/api/openstack/test_servers.py        |    2 +-
 4 files changed, 57 insertions(+), 4 deletions(-)

commit e770068ae33afb444140de624d6f5f8543e0136b
Merge: dfc9c9c eb9c0b4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 4 12:45:29 2011 -0700

    another merge

commit 12404f486a825dc8afdc45db0b10347a3a782e6d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 14:41:54 2011 -0500

    Removed temporary debugging raise.

 nova/exception.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 416686617944dba7fe9b77de294eee9e7e92a1cd
Merge: 7b69ef4 b971409
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:36:29 2011 +0000

    Merged trunk

commit dfc9c9c2b5e92e599bdeae4c03d3761215a0deca
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 4 12:36:11 2011 -0700

    modify _setup_network for flatDHCP as well

 nova/network/linux_net.py |   12 ++++++++----
 nova/network/manager.py   |   13 +++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

commit 088b67c345804108426f6d3d36b2355babe05827
Merge: 6ff2d66 b971409
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:33:02 2011 +0000

    Merged trunk

commit 6ff2d660d777087b1a83550e81b1df24aea8f7a5
Merge: 3f7c71f 7b69ef4
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:32:10 2011 +0000

    Added xenhost config get/setting.

commit c56d20383a432aa2c83e7e3c2beebdb49cbe9efc
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Aug 4 15:30:39 2011 -0400

    fix syntax error

 nova/cloudpipe/pipelib.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cae90fb1d5a798673416e51c5cf1f7db6cbd6c23
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 14:30:12 2011 -0500

    Fixed rescue and unrescue.

 nova/compute/manager.py   |   10 ++++------
 nova/virt/xenapi/vmops.py |    4 ++--
 nova/virt/xenapi_conn.py  |    8 ++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

commit b02fb7f6a3c35673122d7f409d8c999cc9fbae46
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:21:09 2011 -0700

    remove storing original flags verbosity

 nova/test.py |    1 -
 1 file changed, 1 deletion(-)

commit 7f35b6ee93ea2192a8c81a7c17e2e74694a397a1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:07:07 2011 -0700

    remove set_flags_verbosity.. it's not needed

 nova/test.py                                    |    5 -----
 nova/tests/api/openstack/test_accounts.py       |    3 +--
 nova/tests/api/openstack/test_adminapi.py       |    2 +-
 nova/tests/api/openstack/test_server_actions.py |    2 +-
 nova/tests/api/openstack/test_servers.py        |    2 +-
 nova/tests/api/openstack/test_users.py          |    3 +--
 nova/tests/api/openstack/test_zones.py          |    3 +--
 nova/tests/integrated/integrated_helpers.py     |    2 +-
 8 files changed, 7 insertions(+), 15 deletions(-)

commit dcc4cd05202ffec36f4160a52e95d26005759c40
Merge: 7f35619 b971409
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:03:36 2011 -0700

    Merged trunk

commit bdbf3efcadeda46e66787edee344def84dccef73
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Aug 4 11:50:20 2011 -0700

    OS v1.1 is now the default into novarc

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7381c55a3549ead494c6bd13dece17f293442940
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Aug 4 11:40:07 2011 -0700

    added NOVA_VERSION to novarc

 nova/auth/novarc.template |    1 +
 1 file changed, 1 insertion(+)

commit 7e70e5ff7c39862a328b304f13778936e422a212
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Aug 4 14:37:24 2011 -0400

    remove unused reference to exception object

 nova/virt/libvirt/vif.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b97140981a30571750ca135330fe0efaaa5f50cf
Merge: a9326d7 ae6b54c
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 4 18:07:49 2011 +0000

    Add a test for empty dns list in network_info

commit 0c19e26cddb50bf6808670d550d71ab435df37c5
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 18:48:31 2011 +0100

    Fix comments.

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 194f0e4909490c4b626bd211c46121ae37db20dd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Aug 4 10:43:42 2011 -0700

    uses 2.6.0 novaclient (OS API 1.1 support)

 nova/compute/manager.py                |    5 +++--
 nova/scheduler/api.py                  |   13 +++++++------
 nova/scheduler/zone_aware_scheduler.py |    9 +++++----
 nova/scheduler/zone_manager.py         |    7 ++++---
 nova/tests/scheduler/test_scheduler.py |   12 +++++++-----
 nova/tests/test_zones.py               |    1 -
 tools/pip-requires                     |    2 +-
 7 files changed, 27 insertions(+), 22 deletions(-)

commit ca79470843ff351623d07378ab553b2548cb8dc0
Author: Mandell Degerness <mdegerne@gmail.com>
Date:   Thu Aug 4 10:43:16 2011 -0700

    Fix to nova-ajax-console-proxy to use the new syntax.
    
    create_consumer and create_connection abstractions were added recently.

 Authors                     |    1 +
 bin/nova-ajax-console-proxy |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

commit a9326d78c4493765f023106b2fa33df4faa33a93
Merge: c526147 5826a79
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 17:37:57 2011 +0000

    Update the OS API servers metadata resource to match the current v1.1 specification
    - move /servers/<id>/meta to /servers/<id>/metadata
    - add PUT /servers/<id>/metadata

commit 7f35619377593b5bb30425984999e8bb9ed2bdb2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:34:36 2011 -0700

    fix pep8 issues that are in trunk

 nova/compute/manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 24b308ebb4f7fff5520383248170bfb7d51c6755
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:17:55 2011 -0700

    test_host_filter setUp needs to call its super

 nova/tests/scheduler/test_host_filter.py |    1 +
 1 file changed, 1 insertion(+)

commit 8fd335e309ea48d1460ee4d04105e429575f47f6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:03:15 2011 -0700

    fix up new test_server_actions.py file for flags verbosity change

 nova/tests/api/openstack/test_server_actions.py |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 4438d4f92b2f066744d626943690ed9d391aa163
Merge: 544eecd c526147
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:01:52 2011 -0700

    merged trunk

commit e975428488137b1d95f5862729a0e6479a2ea206
Merge: 54a7204 c526147
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 17:55:29 2011 +0100

    Merge trunk; attempting to solve integration test failure.

commit 5826a793e7e05db8ccc14d15326245246fb652d4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 12:48:13 2011 -0400

    fixing typo

 nova/api/openstack/create_instance_helper.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 54a7204204b644a4b286ebe6c6487a2ae3b78a13
Merge: 028c0ab 1f24040
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 17:39:56 2011 +0100

    Sync with latest tests.

commit c52614791167b3986a3d196dc859a8683f437138
Merge: 78a39b2 6f3b63c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 4 16:26:14 2011 +0000

    The logic for confirming and reverting resizes was flipped. As a result, reverting a resize would end up deleting the source (instead of the destination) instance, and confirming would end up deleting the destination (instead of the source) instance.
    
    This branch fixes the logic to be correct.

commit 78a39b2ed793ad59e59cf75756fefb09def49f1f
Merge: fdf1fd0 05243e8
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 16:09:26 2011 +0000

    Found a case where an UnboundLocalError would be raised in xenapi_conn.py's wait_for_task() method. This fixes the problem by moving the definition of the unbound name outside of the conditional.

commit fdf1fd0e06b88603811a4a324ba5e070245afcdd
Merge: 1f24040 0e6d442
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Thu Aug 4 15:57:52 2011 +0000

    Moves code restarting instances after compute node reboot from libvirt driver to compute manager; makes start_guests_on_host_boot flag global.

commit 1f240405a2abd177d02e8bc98e7cf0d2fffda852
Merge: 1616398 cb3bc75
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 4 15:52:27 2011 +0000

    Moved server actions tests to their own test file. Updated stubbing and how flags are set to be in line with how they're supposed to be set in tests.

commit 609de81aa1f279455c6966e97ea87787611b3008
Merge: 60e486a 1616398
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 11:50:57 2011 -0400

    merging trunk

commit ae6b54cc1748d7b9c7bfa55374e9355665343b82
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 4 11:45:24 2011 -0400

    add test for spawning a xenapi instance with an empty dns list

 nova/tests/test_xenapi.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 1616398214ff531062aac63a3bd555684a5ac070
Merge: 9da88ea b87a999
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 4 15:42:41 2011 +0000

    Nova uses instance_type_id and flavor_id interchangeably when they almost always different values. This can often lead to an instance changing instance_type during migration because the values passed around internally are wrong. This branch changes nova to use instance_type_id internally and flavor_id in the API. This will hopefully avoid confusion in the future.

commit 028c0ab138defc742b9eefecf93c7e07afd15aca
Merge: df9dc85 9da88ea
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 16:40:10 2011 +0100

    Merge with trunk.

commit 4eed25b0f01b510d0d90e864eef7f285964ab293
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 4 11:11:12 2011 -0400

    The OSAPI v1.0 image create POST request should store the instance_id
    as a Glance property.

 nova/api/openstack/images.py            |    8 ++++++--
 nova/tests/api/openstack/test_images.py |    3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 05243e858f1bf51264302b96b84b3dfd4de11725
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 15:03:29 2011 +0000

    Linked to bug

commit a3abff9c6243ecfddac72167320c74dce7398941
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 15:02:28 2011 +0000

    Changed the definition of the 'action' dict to always occur.

 nova/virt/xenapi_conn.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 5e1d63cf3b16f78f02e9c2642f60a43402a933a9
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Aug 4 10:41:42 2011 -0400

    Updates to the XenServer glance plugin so that it obtains the set of
    existing headers and sends them along with the request to PUT a
    snapshotted image into glance.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

commit dbbc07750c2624b61af4f824d29c99bffe5f722f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 09:40:51 2011 -0500

    Fixed rescue and unrescue.

 nova/compute/manager.py   |   25 ++++++++++++-------------
 nova/exception.py         |    3 ++-
 nova/virt/xenapi/vmops.py |    3 ++-
 3 files changed, 16 insertions(+), 15 deletions(-)

commit 144720ce87b3f0f469ed748780af55e32babc821
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 09:29:43 2011 -0500

    Added in tests that verify tests are skipped appropriately.

 nova/tests/test_skip_examples.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 7974365eba03f4cc45fc3e30af1e57270a61cf51
Merge: 518cddd 9da88ea
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 08:28:16 2011 -0500

    Merged trunk.

commit 518cddd9b90126616467cc7c6b5714d2639599a0
Merge: 671f1b6 5027838
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 08:27:45 2011 -0500

    Merged dietz' branch.

commit 9da88eac8fe728f506633f86ec6e75cf0212795b
Merge: 1b17bca 3d9f5b5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 12:50:32 2011 +0000

    Update HACKING:
    - Make imports more explicit
    - Add some dict/list formatting guidelines
    - Add some long method signature/call guidelines
    - Add explanation of i18n

commit 1b17bcab41041d5b2f416565d729fb39b1a914f7
Merge: 43c2965 736a18a
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Aug 4 12:45:15 2011 +0000

    Pep8 cleanup

commit 43c29656156319d3e1de94b190d472f3ae5a1e09
Merge: 56ecfa3 6166415
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Aug 4 12:40:14 2011 +0000

    Defaults `dns` to '' if not present, just as we do with the other network info data.

commit 56ecfa3954381ed4711948ffac3372621f672b3a
Merge: e2770a4 5027838
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 4 12:35:20 2011 +0000

    Removes extraneous bodies from certain actions in the OSAPI servers controller
    
    Requires the latest version of python-novaclient to test

commit 6f3b63cd51549843b269cc6c138575a5af2337b2
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Aug 4 08:43:13 2011 +0000

    Revert should be sent to destination node and confirm should be sent to source
    node

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 27392e9412c7042b67947dbc103704d121d60e12
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed Aug 3 20:48:17 2011 -0500

    Conditionals were not actually runing the tests when they were supposed to. Renamed example testcases

 nova/test.py                     |    2 ++
 nova/tests/test_skip_examples.py |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 23f6ec84a93638e880f60bec00db8587b9e3e8d8
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 20:26:37 2011 -0400

    fix pylint W0102 errors.

 nova/api/openstack/extensions.py        |    6 +++++-
 nova/compute/api.py                     |   19 +++++++++++++++----
 nova/objectstore/s3server.py            |    5 ++++-
 nova/scheduler/manager.py               |    4 +++-
 nova/tests/api/openstack/test_limits.py |    5 ++++-
 nova/tests/test_auth.py                 |    7 ++++++-
 nova/tests/test_compute.py              |   10 ++++++++--
 nova/tests/test_libvirt.py              |    5 ++++-
 nova/virt/vmwareapi/io_util.py          |    5 ++++-
 nova/virt/vmwareapi/vim_util.py         |   10 ++++++++--
 nova/virt/vmwareapi/vmware_images.py    |    6 +++++-
 11 files changed, 66 insertions(+), 16 deletions(-)

commit b94eb7bf4fd71a23cacc20def2b5a47dad053b56
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 3 16:42:23 2011 -0700

    Remove whitespaces from name and description before creating security group

 nova/api/openstack/contrib/security_groups.py |    2 ++
 1 file changed, 2 insertions(+)

commit f34a6fb9efd8d950555431f5e7268dbde8ae78c8
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 19:17:08 2011 -0400

    Remove instances of the "diaper pattern"
    
    Anywhere "except:" occurs, I tried to replace it with an explicit except on
    known error types. If none were known, Except was used.
    
    In the process I've been able to unearth a few evasive bugs and clean up some
    adjacent code.

 nova/api/direct.py              |    5 ++---
 nova/api/ec2/__init__.py        |    4 ++--
 nova/api/ec2/apirequest.py      |    2 +-
 nova/api/openstack/common.py    |   27 +++++++++++----------------
 nova/api/openstack/servers.py   |   22 +++++++++++-----------
 nova/cloudpipe/pipelib.py       |   17 +++++++----------
 nova/db/sqlalchemy/api.py       |   14 ++++++++------
 nova/image/__init__.py          |    3 ++-
 nova/utils.py                   |   18 +++++++++++++++++-
 nova/virt/libvirt/connection.py |    6 +++---
 nova/virt/libvirt/vif.py        |    5 +++--
 nova/virt/xenapi_conn.py        |    2 +-
 nova/vnc/proxy.py               |    4 ++--
 13 files changed, 70 insertions(+), 59 deletions(-)

commit bd0a2ed74764de262a828fd086fa0e08493b2cec
Author: matt.dietz@rackspace.com <>
Date:   Wed Aug 3 17:39:51 2011 -0500

    Fixes lp819397

 nova/tests/test_xenapi.py |    7 +++++++
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit 634fe881223a7ea8e04b3054b39724207153be5b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 3 15:03:34 2011 -0700

    Initial version

 nova/api/openstack/contrib/security_groups.py      |  489 +++++++++++++
 nova/api/openstack/extensions.py                   |   11 +-
 nova/db/api.py                                     |    5 +
 nova/exception.py                                  |    4 +
 .../api/openstack/contrib/test_security_groups.py  |  761 ++++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py        |    6 +-
 6 files changed, 1271 insertions(+), 5 deletions(-)

commit b87a999725c90e1c80ff7c2b8102b1c5921f8bc0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 21:44:03 2011 +0000

    Load instance_types in downgrade method too

 .../versions/036_change_flavor_id_in_migrations.py |    1 +
 1 file changed, 1 insertion(+)

commit 4fe63486dd44b036b87d0357563afe4396ecaeb3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 21:43:48 2011 +0000

    Fix trailing whitespace (PEP8)

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 544eecd0adc2c774e512f5c364f6952fb3fd1155
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:13:37 2011 -0700

    fix test_cloud FLAGS setting

 nova/tests/test_cloud.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 3765fca2cfd323c047141a27df248d9617d71ad0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:11:37 2011 -0700

    dist scheduler flag setting fixes

 nova/tests/scheduler/test_host_filter.py          |   11 ++--------
 nova/tests/scheduler/test_least_cost_scheduler.py |   23 ++++++++-------------
 2 files changed, 11 insertions(+), 23 deletions(-)

commit 4f9f56d8e9917f5db0c5f76653d7ee3a2db52a5f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:08:22 2011 -0700

    fix scheduler tests that set FLAGS

 nova/tests/scheduler/test_scheduler.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit ff5dbc6d985d11ef937baa930ee96c93cbd8ccf9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:06:56 2011 -0700

    fix more tests that use FLAGS setting

 nova/tests/integrated/integrated_helpers.py |    4 +---
 nova/tests/integrated/test_extensions.py    |    5 -----
 nova/tests/integrated/test_login.py         |    4 ----
 nova/tests/integrated/test_servers.py       |    5 -----
 nova/tests/integrated/test_volumes.py       |    5 -----
 nova/tests/integrated/test_xml.py           |    5 -----
 6 files changed, 1 insertion(+), 27 deletions(-)

commit 8b0ebd90edb47be344b355334ae16d6b7715087d
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 17:02:45 2011 -0400

    all subclasses of ComputeDriver should fully implement the interface of the destroy method.

 nova/virt/fake.py           |    2 +-
 nova/virt/hyperv.py         |    2 +-
 nova/virt/vmwareapi_conn.py |    2 +-
 nova/virt/xenapi_conn.py    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit e7cb0c70384fc247a7f330ed7c4db5a3b0de814c
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 16:45:46 2011 -0400

    align multi-line string

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25655e0bcea99ea27108d954104138a09f922f30
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 12:26:51 2011 -0700

    fix test_s3 FLAGS uses

 nova/tests/api/openstack/__init__.py |    3 ---
 nova/tests/image/test_s3.py          |   10 +---------
 2 files changed, 1 insertion(+), 12 deletions(-)

commit 8efe41aaa4993d0aa9ad381d202ba7b7d025939e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 12:22:58 2011 -0700

    switch FLAGS.* = in tests to self.flags(...)
    remove unused cases of FLAGS from tests
    modified test.TestCase's flags() to allow multiple overrides
    added missing license to test_rpc_amqp.py

 nova/test.py                   |    8 +++-----
 nova/tests/hyperv_unittest.py  |    5 +----
 nova/tests/test_auth.py        |    4 ++--
 nova/tests/test_host_filter.py |   12 +++---------
 nova/tests/test_ipv6.py        |    3 ---
 nova/tests/test_libvirt.py     |   23 +++++++++-------------
 nova/tests/test_network.py     |    2 --
 nova/tests/test_quota.py       |   42 ++++++++++++++++------------------------
 nova/tests/test_rpc.py         |    2 --
 nova/tests/test_rpc_amqp.py    |   24 +++++++++++++++++++++--
 nova/tests/test_service.py     |    1 -
 nova/tests/test_xenapi.py      |   12 ++++++------
 12 files changed, 63 insertions(+), 75 deletions(-)

commit a5add8b30c96ad1d83eebcd9756b0f358c9cb725
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 15:16:38 2011 -0400

    follow convention when raising exceptions

 nova/api/openstack/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6203ae5d5b285d62bd2c1bf1f2f11d3b64b53511
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 15:05:57 2011 -0400

    pep8 fixes

 nova/scheduler/zone_aware_scheduler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4aada43cc0d1a3cb32094d6d6be1eb662f01d063
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:51:47 2011 -0400

    use an existing exception

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98307324d7b1cce2f7312d1195c9674f0e0323b6
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:49:14 2011 -0400

    use correct exception name

 nova/virt/vmwareapi/vif.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 933587d821797037bb765e9d0bd5ea063c07785b
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:47:35 2011 -0400

    fix duplicate function name

 nova/tests/test_instance_types_extra_specs.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a049e682b54525d2814f20b08ca64320040675b8
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:46:02 2011 -0400

    fix undefined variable error

 nova/scheduler/least_cost.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 91e16e057f083d1a0b8dffaa00b5979c12c23edc
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:30:45 2011 -0400

    fix potential runtime exception
    
    The exception could occur if a client were to create an APIRouter object.
    The fix relies on more established OOP patterns.

 nova/api/openstack/__init__.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 916e0ce0997bdf3135684865eff6fadcda95752b
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:13:53 2011 -0400

    remove unused imports

 nova/api/openstack/create_instance_helper.py |    2 --
 1 file changed, 2 deletions(-)

commit e34a4c2feb7b2abef806ed720e1533e2e0fb94ef
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:05:58 2011 -0400

    remove bit-rotted code.
    
    fixes #820062

 bin/nova-import-canonical-imagestore |  110 ----------------------------------
 1 file changed, 110 deletions(-)

commit d7f704876f5cfab165c855170468274e57935d15
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 10:11:20 2011 -0700

    more cleanup of API tests regarding FLAGS

 nova/test.py                                       |    6 ++++++
 nova/tests/api/openstack/test_accounts.py          |    6 +-----
 nova/tests/api/openstack/test_adminapi.py          |    5 +----
 nova/tests/api/openstack/test_extensions.py        |    2 --
 .../api/openstack/test_flavors_extra_specs.py      |    3 ---
 nova/tests/api/openstack/test_images.py            |    8 +-------
 nova/tests/api/openstack/test_servers.py           |    1 +
 nova/tests/api/openstack/test_users.py             |    7 +------
 nova/tests/api/openstack/test_zones.py             |    2 +-
 9 files changed, 12 insertions(+), 28 deletions(-)

commit 4d500af8bdb4eda2d6040b54c217905cd7ed8bff
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 09:56:37 2011 -0700

    fix use of FLAGS in openstack API servers tests to use the new way

 nova/tests/api/openstack/test_servers.py |   35 ++++++++++++------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

commit 5027838724a5adfd0e15c4a10be723f03b6bbbae
Author: matt.dietz@rackspace.com <>
Date:   Wed Aug 3 11:48:50 2011 -0500

    Removes extraneous body argument from server controller methods

 nova/api/openstack/create_instance_helper.py |    2 +-
 nova/api/openstack/servers.py                |   12 ++++++------
 nova/tests/api/openstack/test_servers.py     |   24 ------------------------
 3 files changed, 7 insertions(+), 31 deletions(-)

commit 3f7c71fd38a67e6983de0bb268e5c65abc5753f4
Merge: 1753da4 e2770a4
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 16:39:48 2011 +0000

    Merged trunk

commit 671f1b61884e0cab3be7496a493fd002c8c54cab
Merge: aec2813 e2770a4
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Aug 3 11:38:01 2011 -0500

    Merged trunk.

commit 6166415d03db8f7af93778bdf7a735fb81e63fc5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Aug 3 15:50:29 2011 +0000

    Default dns to '' if not present

 nova/virt/xenapi/vm_utils.py |    2 ++
 1 file changed, 2 insertions(+)

commit c237b762381856b1041be06debf0deed4ae4e2a8
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed Aug 3 10:44:09 2011 -0500

    replaced raise Exception with self.fail()

 nova/tests/test_skip_examples.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d543b9914506b39defbf94ebc63eb95f0d58a8cd
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed Aug 3 09:32:24 2011 -0500

    Removed dependancy on os.getenv. Test cases now raise Exception if they are not properly skipped.

 nova/tests/test_skip_examples.py |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

commit cb3bc75b316281866eaf32040dccc3fc3be257c2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 3 10:03:15 2011 -0400

    PEP8 issue

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 736a18ad49b535ce9d935bbe8c3d8e67f73a4d15
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Aug 3 08:57:27 2011 -0500

    whoops, got a little comma crazy

 nova/tests/api/openstack/test_versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32ab936e7d1d2b20e7f8d5eef53b5b19cc766edc
Merge: ded9447 e2770a4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 3 09:54:40 2011 -0400

    Merged trunk and fixed conflicts to make tests pass.

commit 8c77b6afa20c443916dd71572f22b52a5ecc88e9
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Aug 3 08:54:00 2011 -0500

    fumigate non-pep8 code

 nova/api/openstack/create_instance_helper.py |    2 +-
 nova/api/openstack/versions.py               |   16 +++---
 nova/api/openstack/views/versions.py         |    6 +-
 nova/tests/api/openstack/test_versions.py    |   80 +++++++++++++-------------
 4 files changed, 52 insertions(+), 52 deletions(-)

commit a0b3f9cd7b9a45ec4385a1288588ddd9814c0c43
Merge: 2d2405e e2770a4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 11:32:27 2011 +0000

    Merge with trunk

commit 2d2405e35d34c928c87d575bcfc7c74db9de6b1d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 11:31:10 2011 +0000

    Use flavorid only at the API level and use instance_type_id internally

 nova/compute/api.py                                |    2 +-
 nova/compute/manager.py                            |   21 +++---
 .../versions/036_change_flavor_id_in_migrations.py |   71 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    6 +-
 nova/tests/test_compute.py                         |    4 +-
 5 files changed, 89 insertions(+), 15 deletions(-)

commit 0e6d442d9cbf6f60bf58c85044e878ce768a737e
Merge: 59b06aa e2770a4
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Aug 3 12:39:27 2011 +0400

    Yet another conflict resolved.

commit f942a7f22acb6a6719a3de778ba55ca25ea0ee68
Author: John Tran <jhtran@att.com>
Date:   Wed Aug 3 00:16:52 2011 -0700

    forgot to remove comment

 bin/nova-manage |    1 -
 1 file changed, 1 deletion(-)

commit bfb5a5e1204bf868b5db8d8d038b63d0899665ce
Author: John Tran <jhtran@att.com>
Date:   Wed Aug 3 00:11:52 2011 -0700

    updated to work w/ changes after merged trunk fixing var renaming.  the logic which forces default to FLAGS.network_size if requested cidr was larger, was also applying to requested cidrs smaller than FLAGS.network_size.   Requested cidrs smaller than FLAGS.network_size should be ignored and not overriden.

 bin/nova-manage |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 6d7e5196db2e852476f7d14007cf155e15815071
Merge: e239dc5 e2770a4
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 2 23:16:27 2011 -0700

    merged from trunk

commit 8b06f143ec1d91b3c95a43746bfdacbe3aec3829
Merge: 51f0cbf e2770a4
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 2 23:07:23 2011 -0700

    merged from trunk

commit eb9c0b45bf6fa8c83682bfbcfe523cf29f9a7d13
Merge: 857f445 e2770a4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 2 23:02:07 2011 -0700

    merge trunk

commit 26a14fe56708594362f7f17a4872c8797242fb69
Author: Launchpad Translations on behalf of nova-core <>
Date:   Wed Aug 3 04:44:31 2011 +0000

    Launchpad automatic translations update.

 po/ast.po   |   63 ++-------------------------------
 po/cs.po    |   63 ++-------------------------------
 po/da.po    |   63 ++-------------------------------
 po/de.po    |   81 +++++++++++-------------------------------
 po/en_AU.po |   63 ++-------------------------------
 po/en_GB.po |   84 ++++++++++++--------------------------------
 po/es.po    |   98 +++++++++++++++++++--------------------------------
 po/fr.po    |  113 ++++++++++++++++++++++++++---------------------------------
 po/it.po    |   86 +++++++++++++--------------------------------
 po/ja.po    |  109 +++++++++++++++++++++++++-------------------------------
 po/pt_BR.po |   86 +++++++++++++--------------------------------
 po/ru.po    |   81 +++++++++++-------------------------------
 po/tl.po    |   63 ++-------------------------------
 po/uk.po    |   71 ++++++-------------------------------
 po/zh_CN.po |   80 +++++++++++-------------------------------
 po/zh_TW.po |   74 +++++++-------------------------------
 16 files changed, 300 insertions(+), 978 deletions(-)

commit 836c394def93a8589bcb7387862390b24b8fdab8
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 22:25:23 2011 -0500

    Resolved pep8 errors

 nova/api/openstack/create_instance_helper.py |    2 +-
 nova/test.py                                 |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 44964f41ed591c8ece72dbc36f5d668d2e279274
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 22:22:34 2011 -0500

    renaming test_skip_unless_env_foo_exists()

 nova/tests/test_skip_examples.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a75445d6f0eefd5c69493701b5e7ab55fa7a3163
Merge: 883095f e2770a4
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 21:16:45 2011 -0500

    merging trunk

commit 7b69ef4fe1e4aabcf44789455b96492b168ad6f5
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 01:32:08 2011 +0000

    Removed trailing whitespace that somehow made it into trunk.

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8eab369a89cf0983011da0ea5dd60c3935fad401
Merge: a0ec6a6 e2770a4
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 00:52:33 2011 +0000

    Merged trunk

commit a0ec6a6aa5ebdde1d099c5f6c03cf1dbd28441fa
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 00:52:15 2011 +0000

    Removed duplicate methods created by previous merge.

 nova/compute/manager.py                            |    8 +-----
 nova/virt/driver.py                                |    4 ---
 nova/virt/fake.py                                  |    4 ---
 nova/virt/hyperv.py                                |    4 ---
 nova/virt/libvirt/connection.py                    |    4 ---
 nova/virt/vmwareapi_conn.py                        |    4 ---
 nova/virt/xenapi/vmops.py                          |   11 --------
 nova/virt/xenapi_conn.py                           |    4 ---
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   27 --------------------
 9 files changed, 1 insertion(+), 69 deletions(-)

commit 60e486ad24ae8a80fea4e2a917a7366ef10740bd
Merge: 695afaf e2770a4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Aug 2 20:11:44 2011 -0400

    Merge from trunk.

commit 4c36305ea2a43061a9012eae50bcb01cb7829bee
Merge: 71c21d1 e2770a4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Aug 2 19:49:31 2011 -0400

    Merge from trunk.

commit e2770a4558c95aa4b6e276ebe18dc580a82e6d67
Merge: 01f3134 a788cf3
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 23:31:14 2011 +0000

    Fixes lp819523
    
    OS API Migrate is now an admin-only method

commit 01f313433e6b2da9c9bd81f3a122c45504d534e0
Merge: 84b7fb7 8004e28
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 2 23:07:42 2011 +0000

    Fix for bug #798298
    
    * Removes restriction of have to have an IPv4 network to create and use an IPv6 network
    * Modifies nova-manage network to require either an IPv4 or IPv6 network be passed
    * Modifies nova-manage network to ignore FLAGS.use_ipv6 (what is passed on the command line is what you get)
    * Modifies nova-manage network to list IPv4 and IPv6 on list, no longer lists IPv4 netmask as it is implied by the cidr for the network
    * Modifies network/manage.py to allow for empty IPv4 assignments.

commit 84b7fb7e27904deafba8bff2fd9179013ec30e30
Merge: 3821904 0e5b2b0
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 2 22:57:24 2011 +0000

    fix for lp816713: In instance creation, when nova-api is passed imageRefs generated by itself, strip the url down to an id so that default glance connection params are used

commit 14e8257af4624fa5b056a1b0e94d1b584e080ce9
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 22:48:47 2011 +0000

    Added check for --allow-admin-api to the host API extension code.

 nova/api/openstack/contrib/hosts.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit a788cf381d6d37dc32e08d8887ca1d15ee176c58
Merge: 6fca50d 3821904
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 17:30:01 2011 -0500

    Merge from trunk

commit 6fca50df17eb2f366e2e41cf0bd1a14ebc99744e
Merge: 1c8d297 0d8942f
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 17:29:34 2011 -0500

    Another unittest

commit aec281367e93fb9805236ff9be1a3a9671efccf8
Merge: ffbd2b4 3821904
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 17:24:12 2011 -0500

    Merged trunk.

commit 3821904c962ac0826d42660898b20b8413c727f2
Merge: 9004558 284d817
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 22:22:53 2011 +0000

    Add support for 300 Multiple Choice responses when no version identifier is used in the URI (or no version header is present)
    
    Also adds support for server detail json/xml/atom requests.

commit ffbd2b4e787f6b43e33933fdcd69f1459474f422
Merge: b7fe3f1 9004558
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 16:54:41 2011 -0500

    Merged trunk.

commit 90045589111111a46203271618a5d8f9f9f7494b
Merge: 65ba8bd fa6cc94
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 21:45:57 2011 +0000

    Glance has been updated for integration with keystone.  That means that nova needs to forward the user's credentials (the auth token) when it uses the glance API.  This patch, combined with a forth-coming patch for nova_auth_token.py in keystone, establishes that for nova itself and for xenapi; other hypervisors will need to set up the appropriate hooks for their use of glance.

commit f81122da314a02a1d68f8bbd01fb96d68df61125
Merge: f06dee2 1d3d1d5
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 21:23:35 2011 +0000

    Added changes from mini server

commit 8774c69c4a8d97ab2dac32c0f52e6963543a46f1
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:11:53 2011 -0400

    raise correct error

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d3d1d5fb552f2dc80c39ad15d89d59bfc7f873a
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 21:11:12 2011 +0000

    Minor test fixes

 nova/api/openstack/contrib/hosts.py |    4 ++--
 nova/tests/test_hosts.py            |   11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

commit 9bac11d9ff9933460f7ddf1bd1dd77d4d3397e47
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:05:21 2011 -0400

    fix failing tests

 nova/db/sqlalchemy/api.py              |   17 +++++++++++------
 nova/tests/scheduler/test_scheduler.py |    4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

commit b5a4a8d6cc68fec2dab205c5da494bce69241c33
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:05:10 2011 -0400

    fix pep8 complaints

 nova/tests/test_xenapi.py |    2 --
 1 file changed, 2 deletions(-)

commit 284d81736e66c939626d8abf22a1806af9a3f86f
Merge: c7eb792 65ba8bd
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 16:50:16 2011 -0400

    merge from trunk

commit 4c07cac5b0e79f3911fbcc392c3f9e7f07333968
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 20:39:14 2011 +0000

    Fixed a missing space.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d8942fc5f47a5f434115ac0c1444b6485c6ba1f
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Tue Aug 2 20:23:12 2011 +0000

    Bad merge res

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8004e28bb76d21790c2ba70b32cb87a6ca9b8231
Merge: 4c5f84f 65ba8bd
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 2 15:13:33 2011 -0500

    merge the trunk

commit 614895b6c93904888aab99d1507d94271d763c04
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 16:08:17 2011 -0400

    fix missing method call and add failing test

 nova/tests/test_xenapi.py  |    9 +++++++++
 nova/tests/xenapi/stubs.py |    4 ++++
 nova/virt/xenapi_conn.py   |    2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

commit 0079cc3536811baf9ed6fa0cedbd5863c602644b
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:50:54 2011 +0000

    Removed duplicate xattr from pip-requires

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit ded9447aca01d593b0efa91b5ec23ecf8aa97264
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 2 15:43:36 2011 -0400

    Fixed merge issues

 nova/api/openstack/images.py  |    3 ---
 nova/api/openstack/servers.py |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

commit b7fe3f11196d060ee0420bb091f7abad1cad4e3b
Merge: 113fe43 65ba8bd
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 14:39:41 2011 -0500

    Merged trunk.

commit a7e4142adea48e230f9111990485866b0ff0073a
Merge: f91413b 65ba8bd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 2 15:39:14 2011 -0400

    merged trunk

commit 1c8d2970456a713cebece538050f1efff9747d1a
Merge: 1c2bb5b 65ba8bd
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 14:37:54 2011 -0500

    Merge from trunk

commit d1891d2dd18a14535ec22a0363fd8234a01dbb8c
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:30:27 2011 -0400

    remove unused parameter

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 200b6b980aada1d38014e620e025ee61c38915da
Merge: 0bd6bf4 65ba8bd
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:30:03 2011 +0000

    Merged trunk

commit 0bd6bf4a791e03e2c1ad1715aeae3e4413705414
Merge: 29ef732 f06dee2
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:29:40 2011 +0000

    Merged from lab

commit 378571665538fb5c4667a9d068678378ddf8526f
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:19:00 2011 -0400

    fix pylint errors

 nova/db/sqlalchemy/api.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 4887331a0d972b4d9e1fbd365c36edf1d7b076ec
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:10:09 2011 -0400

    fix pylint errors

 nova/tests/scheduler/test_scheduler.py |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit c7eb792a132b407927496588f855b32793e5a270
Merge: 3e6c9dd cf7eefa
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 15:04:24 2011 -0400

    merge from trunk

commit 65ba8bda43aa79080f6fec9c396f412c294718b8
Merge: cf7eefa b65c7e2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 19:03:33 2011 +0000

    Moves image creation from POST /images to POST /servers/<id>/action

commit f06dee2b82bd658a57736d94974f431976085400
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:02:40 2011 +0000

    Fixed several typos

 nova/api/openstack/contrib/hosts.py |    5 ++---
 nova/compute/manager.py             |    2 +-
 nova/tests/test_hosts.py            |    2 +-
 tools/pip-requires                  |    1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

commit 1c2bb5bf81e384a2e833dfb172cdaf72b6ecdbae
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 13:56:58 2011 -0500

    Changed migration to be an admin only method and updated the tests

 nova/api/openstack/__init__.py           |    1 +
 nova/api/openstack/servers.py            |   20 ++++++++++----------
 nova/tests/api/openstack/test_servers.py |    2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

commit cf7eefab9e7891d449b115c0c50c4b76ae45743f
Merge: d6175dd 07646e8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 18:37:49 2011 +0000

    - Remove Twisted dependency from pip-requires
    - Remove Twisted patch from tools/install_venv.py
    - Remove eventlet patch from tools/install_venv.py
    - Remove tools/eventlet-patch
    - Remove nova/twistd.py
    - Remove nova/tests/test_twistd.py
    - Remove bin/nova-instancemonitor
    - Remove nova/compute/monitor.py
    - Add xattr to pip-requires until glance setup.py installs it correctly
    - Remove references to removed files from docs/translations/code

commit fa6cc945111dfa10fc98500765c71ced0c59015c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 18:36:12 2011 +0000

    Fix an error in fetch_image()

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 113fe431d61899b8402181d1016ab29479330636
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 13:34:29 2011 -0500

    Get instance by UUID instead of id.

 nova/compute/manager.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 5b11fe047ac9f58c88a771707a7c59ca4f5bd0f9
Merge: 2dce2d5 d6175dd
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 18:24:09 2011 +0000

    Merged trunk

commit 2dce2d54d14eed79ac3080e5f9ff6b715d5fc5c1
Merge: 85795ff 07d89c2
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 18:23:58 2011 +0000

    Added the powerstate changes to the plugin.

commit 520a3b5083311ea7fe324a30a8f386691eb0f7fc
Merge: 9c8b8bd d6175dd
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 17:33:04 2011 +0000

    pull-up from trunk/fix merge conflict

commit b65c7e2378d8344d1948fe4cf0dde66ef34b7204
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 13:32:14 2011 -0400

    fixing typo

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 51f0cbf9221b461eb92beae2497e871bf2a7f45f
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 2 10:06:22 2011 -0700

    refactored tests

 nova/network/manager.py    |   13 ++++++-------
 nova/tests/test_network.py |   27 ++++++++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

commit 9c8b8bdf3144b1b0459bd2533cdade3138b643f3
Merge: 8e7a4e6 83066aa
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 16:30:41 2011 +0000

    pull-up from trunk

commit d6175dddfe481a9d3cd4e9d8c8570911fa785a7d
Merge: 83066aa e34a4df
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 16:23:03 2011 +0000

    Removing the xenapi_image_service flag in favor of image_service.

commit 695afaffaa4de359b306280c252f8f40a3bab5a7
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 11:48:01 2011 -0400

    cleanup

 nova/api/openstack/server_metadata.py |    2 +-
 nova/api/openstack/servers.py         |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 29ef7326d1daf3227e0bf31b21eba6664683955b
Merge: a2551ad 83066aa
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 15:36:05 2011 +0000

    Merged trunk

commit 1fc4c4cb9bdfca2cf6a931cec44fa25ee76c502d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:24:23 2011 -0400

    abstraction of xml deserialization

 nova/api/openstack/create_instance_helper.py |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 804bbc7656080597880e9705532ac161d3124aa4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:21:36 2011 -0400

    fixing method naming problem

 nova/api/openstack/create_instance_helper.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 07646e85841a4f7c81e80254ac63715bece2aadd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:09:58 2011 -0400

    removing compute monitor

 bin/nova-instancemonitor                      |   59 ----
 bin/nova-logspool                             |    1 -
 bin/nova-objectstore                          |    2 +-
 contrib/nova.sh                               |    2 +-
 doc/source/api/autoindex.rst                  |    3 -
 doc/source/api/nova..compute.monitor.rst      |    6 -
 doc/source/api/nova..tests.test_twistd.rst    |    6 -
 doc/source/api/nova..twistd.rst               |    6 -
 doc/source/code.rst                           |    3 -
 doc/source/devref/architecture.rst            |    2 +-
 doc/source/devref/compute.rst                 |   13 -
 doc/source/devref/development.environment.rst |    2 +-
 doc/source/devref/nova.rst                    |   20 --
 nova/compute/monitor.py                       |  435 -------------------------
 nova/tests/test_twistd.py                     |   53 ---
 nova/twistd.py                                |  267 ---------------
 nova/virt/fake.py                             |   12 +-
 nova/virt/libvirt/connection.py               |   12 +-
 po/ast.po                                     |   59 ----
 po/cs.po                                      |   59 ----
 po/da.po                                      |   59 ----
 po/de.po                                      |   59 ----
 po/en_AU.po                                   |   59 ----
 po/en_GB.po                                   |   59 ----
 po/es.po                                      |   59 ----
 po/fr.po                                      |   61 ----
 po/it.po                                      |   60 ----
 po/ja.po                                      |   59 ----
 po/nova.pot                                   |   59 ----
 po/pt_BR.po                                   |   60 ----
 po/ru.po                                      |   59 ----
 po/tl.po                                      |   59 ----
 po/uk.po                                      |   59 ----
 po/zh_CN.po                                   |   59 ----
 po/zh_TW.po                                   |   59 ----
 setup.py                                      |    1 -
 tools/eventlet-patch                          |   24 --
 tools/install_venv.py                         |    9 -
 tools/pip-requires                            |    2 +-
 39 files changed, 13 insertions(+), 1934 deletions(-)

commit 3e6c9ddd98126d8152d9965b57cc84bdbdfaa8c7
Merge: 324c954 83066aa
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 10:01:17 2011 -0400

    merge from trunk

commit 83066aa64ccba34e23063eee661375b11de2161f
Merge: f05628d 094b984
Author: John Tran <jhtran@att.com>
Date:   Tue Aug 2 11:28:43 2011 +0000

    code was checking for key in sqlalchemy instance and will ignore if value is None, but wasn't working if floating_ip was a non-sqlalchemy dict obj.  Therefore, updated the error checking to work in both caes.

commit f05628dff7aebd15e3f3530295ece3372bf2dbec
Merge: efdd1bb 51f4d4c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Aug 2 11:23:11 2011 +0000

    While we currently trap JSON encoding exceptions and bail out, for error notification it's more important that *some* form of the message gets out. So, we take complex notification payloads and convert them to something we know can be expressed in JSON.

commit efdd1bb019ac431d7d7a1923ff8580de1bb34217
Merge: 483f8f9 25a831f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 2 11:17:42 2011 +0000

    Better error handling for resizing.

commit 483f8f9738b6e87642bfb0811b55ae6240f966cc
Merge: bdcfaa5 78379de
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 11:12:13 2011 +0000

    Adds the auth token to nova's RequestContext.  This will allow for delegation, i.e., use of a nova user's credentials when accessing other services such as glance, or perhaps for zones.

commit c75e2ee89f5510cab8d6da886cbcbbe850ccfd31
Merge: 79283cb bdcfaa5
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Aug 2 18:43:30 2011 +0900

    merged trunk rev1348

commit 92ab29ef58dd6dd42bb44ca721ba68cb615ae917
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Aug 2 04:52:00 2011 +0000

    Launchpad automatic translations update.

 po/es.po |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bcfd8f5e1e0c3b53a2ad4a5bb533d94dcf5ef18c
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 1 21:34:43 2011 -0700

    added some tests for network create & moved the ipv6 logic back into the function

 nova/network/manager.py    |   43 ++++++++++++++++++-------------------------
 nova/tests/test_network.py |   41 ++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 38 deletions(-)

commit 0ffc3b80490c24ee116f5be070249dcbbed9357b
Merge: a52b643 bdcfaa5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Aug 2 11:36:58 2011 +0900

    merged with nova trunk

commit 07d89c29389fe8f2b9f3a398ab99566d151e8e92
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 02:19:31 2011 +0000

    Added host shutdown/reboot conditioning.

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   27 ++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

commit 0e5b2b0bfb7f6b0af7f2c962a963830a8691410e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 1 18:56:16 2011 -0700

    avoid explicit type checking, per brian waldon's comment

 nova/api/openstack/create_instance_helper.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 883095f1e69d70173339ccba64f2b2a8a1d48a5f
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon Aug 1 20:45:30 2011 -0500

    Added @test.skip_unless and @test.skip_if functionality. Also created nova/tests/test_skip_examples.py to show the skip cases usage.

 nova/test.py                     |   31 +++++++++++++++++++++++++++++++
 nova/tests/test_skip_examples.py |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

commit 857f4453efaca98ced3e07d55ee6f0188713e60e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 18:30:59 2011 -0700

    fix LinuxBridgeInterfaceDriver

 nova/network/linux_net.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f51958a2aa811b9eb9dd3da0acf5a50e41666810
Merge: 873aad9 bdcfaa5
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 18:14:27 2011 -0700

    merge trunk, resolve conflict in net/manater.py in favor of vif-plug

commit 873aad92944f8840e772d65eda4b3320d65a9ce7
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 18:11:15 2011 -0700

    initial commit of vif-plugging for network-service interfaces

 bin/nova-dhcpbridge       |   24 +++---
 nova/network/linux_net.py |  205 +++++++++++++++++++++++++++++++--------------
 nova/network/manager.py   |   28 ++-----
 nova/utils.py             |    9 ++
 nova/virt/libvirt/vif.py  |    2 +-
 5 files changed, 174 insertions(+), 94 deletions(-)

commit a2551ad2a2c7fcb6ed36c0e77301fe1e23982e81
Merge: 60a9763 bdcfaa5
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 1 23:38:26 2011 +0000

    Merged trunk

commit ab4bfcf6c458ab6bf6ead126a91413b92aa543b8
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 1 16:27:17 2011 -0700

    pep8 fixes

 nova/network/manager.py    |   12 ++++++++----
 nova/tests/test_network.py |   36 +++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 17 deletions(-)

commit 25a831fd449dbbb7f0c2cdac404d7600a6da9f27
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 1 18:01:04 2011 -0400

    Controller -> self

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 85795ff1f8b6a0ff3de634828208d6debd91692f
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 1 21:06:47 2011 +0000

    Added option for rebooting or shutting down a host.

 nova/api/openstack/contrib/hosts.py                |   15 ++++++++++++
 nova/compute/api.py                                |    5 ++++
 nova/compute/manager.py                            |    8 ++++++-
 nova/tests/test_hosts.py                           |    9 +++++++
 nova/virt/driver.py                                |    4 ++++
 nova/virt/fake.py                                  |    4 ++++
 nova/virt/hyperv.py                                |    4 ++++
 nova/virt/libvirt/connection.py                    |    4 ++++
 nova/virt/vmwareapi_conn.py                        |    4 ++++
 nova/virt/xenapi/vmops.py                          |    8 +++++++
 nova/virt/xenapi_conn.py                           |    4 ++++
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   25 +++++++++++++++++++-
 12 files changed, 92 insertions(+), 2 deletions(-)

commit 71c21d159d1333af59af7166557416116971953a
Merge: 9afa443 bdcfaa5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 1 16:42:01 2011 -0400

    Merge from trunk.

commit 951114be20065044e7f12e37188eb30e859ff2cb
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 1 12:47:41 2011 -0700

    removed redundant logic

 nova/network/manager.py |    6 ------
 1 file changed, 6 deletions(-)

commit a73d1f200dc3e493ce7044bda9fe0a691dca1664
Merge: e72fafb bdcfaa5
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 1 12:39:26 2011 -0700

    merged from trunk

commit e72fafbf76ed456039426a96dd65d2c148dffa29
Author: John Tran <jhtran@att.com>
Date:   Mon Aug 1 12:37:12 2011 -0700

    adding a function with logic to make the creation of networks validation a bit smarter:
    - detects if the cidr is already in use
    - when specifying a supernet to be split into smaller subnets via num_networks && network_size, ensures none of the returned subnets are in use by either a subnet of the same size and range, nor a SMALLER size within the same range.
    - detects if splitting a supernet into # of num_networks && network_size will fit
    - detects if the supernet/cidr specified is conflicting with a network cidr that currently exists that may be a larger supernet already encompassing the specified cidr.
    "

 nova/network/manager.py    |   48 +++++++++++++++++++++
 nova/tests/test_network.py |  102 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

commit 78379de0561073facd6f23239be5081428349ce6
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Aug 1 19:05:32 2011 +0000

    Carry auth_token in nova's RequestContext

 nova/context.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit f383cbf4ddd644da62a49d58efb1cc137bd794fd
Merge: f9ff78a bdcfaa5
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 1 14:59:49 2011 -0400

    merge with trunk, resolve conflicts

commit 8e7a4e6147cb78b28fc2a2131591dbd37de2fa30
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Aug 1 18:59:29 2011 +0000

    Revert hasattr() check on 'set_auth_token' for clients

 nova/image/glance.py         |    3 +--
 nova/virt/xenapi/vm_utils.py |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 4c5f84fa890da6dfe11aefd5b3c27478a2aad5eb
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 1 13:37:22 2011 -0500

    it makes the pep8, or else it gets the vim again

 nova/tests/test_db_api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 324c95415fcd66265da62ff6280d4e7e6a4434f1
Merge: 6d62453 bdcfaa5
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 1 14:20:10 2011 -0400

    merge from trunk

commit cf751254185df8cdffb6491ba29b4a275a31e456
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 1 14:05:45 2011 -0400

    Fixes this issue that I may have introduced.

commit ede656a3e4615d2cfaf45b5b2354ace9283e2c4e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 1 13:38:14 2011 -0400

    Update compute tests to use new exceptions.

 nova/tests/test_compute.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit df9dc85ab20729290b3b1976ffb57d33041753f9
Merge: 8c54cfd bdcfaa5
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Aug 1 09:58:06 2011 +0100

    Resync to trunk

commit 8c54cfdabad3b3c102bae05283dd8484da38c557
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Aug 1 09:30:13 2011 +0100

    Remove copy/paste error.

 nova/virt/xenapi/vmops.py |    9 ---------
 1 file changed, 9 deletions(-)

commit 9fcd2e3719e1f3cd33f10a070e44c015a59817dd
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Aug 1 04:58:49 2011 +0000

    Launchpad automatic translations update.

 po/es.po |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 00f47c6637b740ffa890250000e6d02dc557832f
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sun Jul 31 04:51:55 2011 +0000

    Launchpad automatic translations update.

 po/es.po |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 3335a91c3c53513cc35e3f39a59975b33524950b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Jul 29 18:45:51 2011 -0700

    Fixed review comments: Put parsing logic of network information in create_instance_helper module and refactored unit testcases as per the changed code.

 nova/api/openstack/contrib/createserverext.py      |  213 +-----------
 nova/api/openstack/create_instance_helper.py       |   83 ++++-
 nova/compute/api.py                                |    1 -
 nova/network/manager.py                            |    2 +-
 .../api/openstack/contrib/test_createserverext.py  |  359 +-------------------
 nova/tests/api/openstack/test_extensions.py        |    6 -
 nova/tests/api/openstack/test_servers.py           |  229 ++++++++++---
 7 files changed, 265 insertions(+), 628 deletions(-)

commit e34a4dfd067ddf29651bf006869c012e48813a24
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 18:29:23 2011 -0400

    pep8

 nova/virt/xenapi/vm_utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 1b3a1d6a9abf1c248f4f379ba98f17d3947af5ea
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 17:26:44 2011 -0500

    wow, someone whent all crazy with exceptions, why not just return an empty list?

 nova/network/manager.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 1db6b5768a1160ee5e45ddadae7ba5c56b0abb4b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 22:24:02 2011 +0000

    Only call set_auth_token() on the glance client if there's one available

 nova/image/glance.py         |    3 ++-
 nova/virt/xenapi/vm_utils.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 3ab21a13aeca78cc310a93199b10891d2a6deaec
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 22:19:16 2011 +0000

    Make unit tests pass

 nova/tests/test_xenapi.py  |    2 +-
 nova/tests/xenapi/stubs.py |    2 +-
 nova/virt/xenapi_conn.py   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 7f9b1d8a4b4371f76b491087e1c5a8f1149bcdc5
Merge: d2ec9df bdcfaa5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 18:17:08 2011 -0400

    merging

commit cbb09485442d472f883829ba96f4c2d8b6d830fd
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 17:15:50 2011 -0500

    only attempt to get a fixed_up from a v4 subnet if there is a v4 subnet

 nova/network/manager.py |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit a7f0eb04236b15a026654346b47bc434886b9d97
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 18:13:28 2011 -0400

    FlavorNotFound already existed, no need to create another exception.

 nova/api/openstack/servers.py |    2 +-
 nova/compute/api.py           |    2 +-
 nova/db/sqlalchemy/api.py     |    9 +++++++--
 nova/exception.py             |    4 ----
 4 files changed, 9 insertions(+), 8 deletions(-)

commit 055a422643fc229ec0e7db3f6dcba9904c5a4f5d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 18:05:31 2011 -0400

    Created exceptions for accepting in OSAPI, and handled them appropriately.

 nova/api/openstack/servers.py |   40 ++++++++++++++++++++--------------------
 nova/compute/api.py           |    9 +++------
 nova/exception.py             |   12 ++++++++++++
 3 files changed, 35 insertions(+), 26 deletions(-)

commit c1f530c606a84de05becd412fe396acca385e342
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:58:42 2011 -0500

    only create fixed_ips if we have an ipv4 range

 nova/network/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fc2682bc9c01c445b9ee7003c5cb561c452757e5
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 21:58:27 2011 +0000

    Revert to using context; to avoid conflict, we import context module as nova_context; add context to rescue

 nova/compute/manager.py         |    2 +-
 nova/virt/driver.py             |    9 ++++---
 nova/virt/fake.py               |    6 ++---
 nova/virt/hyperv.py             |    2 +-
 nova/virt/images.py             |    6 ++---
 nova/virt/libvirt/connection.py |   36 +++++++++++++++-------------
 nova/virt/vmwareapi/vmops.py    |   12 +++++-----
 nova/virt/vmwareapi_conn.py     |    8 +++----
 nova/virt/xenapi/vm_utils.py    |   24 +++++++++----------
 nova/virt/xenapi/vmops.py       |   50 +++++++++++++++++++--------------------
 nova/virt/xenapi_conn.py        |   16 ++++++-------
 11 files changed, 86 insertions(+), 85 deletions(-)

commit 36846b40016a27b5f9e0762273de532f4e0e10cd
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:40:42 2011 -0500

    You see what happens Danny when you forget to close the parenthesis

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7abddf96789f3ceb6492649376a417f1d6de254c
Merge: b0ffe14 bdcfaa5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Jul 29 14:36:30 2011 -0700

    Merged with trunk

commit 7ac10c361af9bb52202abfacd75825496283774f
Merge: 50abd79 bdcfaa5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 17:33:55 2011 -0400

    Merged trunk.

commit 99db7ffaeaba067f2914c59423bb1a953f860e57
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:25:46 2011 -0500

    allow the manager to try to do the right thing

 nova/network/manager.py |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

commit a14a18157bb53934b3a86fc4a7b9c58d2aae8d56
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:16:05 2011 -0500

    allow getting by the cidr_v6

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 54f0ad92cf4f94097e62fc0e51fdc1403504a04b
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:10:45 2011 -0500

    the netmask is implied by the cidr, so use that to display the v6 subnet

 bin/nova-manage |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0f94eba2792244f03bbc5be3879ceedaaed148fa
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:09:57 2011 -0500

    either v4 or v6 is required

 bin/nova-manage |   20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

commit f2e5bbfca34622b8a765d11f8c03daac07892ee0
Merge: 20dd0fe bdcfaa5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 16:51:23 2011 -0400

    merging trunk

commit 649b0da35dbc36ce15cd3ada6e4e4b814a244158
Merge: 73711a9 bdcfaa5
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 20:19:48 2011 +0000

    pull-up from trunk and conflict resolution

commit 242308a8cc2a2c5551d083fdc62b4ec61f326261
Merge: 241bc43 bdcfaa5
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 15:06:33 2011 -0500

    merge trunk

commit 241bc43166dd174bd64ef4eda1ab368a5a312799
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 15:05:53 2011 -0500

    stwart the switch to just fixed_range

 bin/nova-manage |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 3d9f5b561063f714338c023d3b9ad6a786766279
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:58:41 2011 -0400

    typo

 HACKING |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bdcfaa5b927a096f507fb0f7e2d81989173957f8
Merge: 6703e33 277b63b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 29 19:54:54 2011 +0000

    Round 1 of changes for keystone integration.
     * Modified request context to allow it to hold all of the relevant data from the auth component.
     * Pulled out access to AuthManager from as many places as possible
     * Massive cleanup of unit tests
     * Made the openstack api fakes use fake Authentication by default
    
    There are now only a few places that are using auth manager:
     * Authentication middleware for ec2 api (will move to stand-alone middleware)
     * Authentication middleware for os api (will be deprecated in favor of keystone)
     * Accounts and Users apis for os (will be switched to keystone or deprecated)
     * Ec2 admin api for users and projects (will be removed)
     * Nova-manage user and project commands (will be deprecated and removed with AuthManager)
     * Tests that test the above sections (will be converted or removed with their relevant section)
     * Tests for auth manager
     * Pipelib (authman can be removed once ec2 stand-alone middleware is in place)
     * xen_api (for getting images from old objectstore. I think this can be removed)
    
    Vish

commit 1fb2a1b1f0b7a59193344103bdbb7d58b3a6e7c2
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 14:53:38 2011 -0500

    require either v4 or v6

 bin/nova-manage |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 73711a9e260fd8b6f747b9c8f09511eba149a1fb
Merge: 62c7ca6 6703e33
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 19:52:11 2011 +0000

    pull-up from trunk

commit 6703e33a68d0653f486d679337b4dfc4239eba34
Merge: bbfd483 798dbb5
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Fri Jul 29 19:48:58 2011 +0000

    Fix various errors discovered by pylint and pyflakes.

commit 57cda5b254d34af0a63b3cbcb895b04ec7bf5407
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:43:23 2011 -0400

    fixing underline

 HACKING |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70574077c469a69547d7702592f07ecd0d551daf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:42:10 2011 -0400

    removing extra verbage

 HACKING |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 277b63bd933f0c1bf9209f3c52d1e914fc1d2382
Merge: 3165783 bbfd483
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 29 19:36:37 2011 +0000

    merged trunk

commit bbfd483a5cb720eeee97787b10210129b5e4b38e
Merge: c4d7127 99459b5
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 19:34:18 2011 +0000

    This change creates a minimalist API abstraction for the nova/rpc.py code so that it's possible to use other queue mechanisms besides Rabbit and/or AMQP, and even use other drivers for AMQP rather than Rabbit.  The change is intended to give the least amount of interference with the rest of the code, fixes several bugs in the tests, and works with the current branch.  I also have a small demo driver+server for using 0MQ which I'll submit after this patch is merged.

commit c8a6bd03aa7a74a1adbf3df3c879811ef0cc9944
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:32:27 2011 -0400

    removing dict() comment

 HACKING |    7 -------
 1 file changed, 7 deletions(-)

commit 9fb6c29c10d3693c84e34c05092cac4117fa6eb5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:26:14 2011 -0400

    adding more on return_type in docstrings

 HACKING |    1 +
 1 file changed, 1 insertion(+)

commit c4d7127367ff4b34f11355e04e1f26fd414f459c
Merge: ab0c38e 50abd79
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 19:24:00 2011 +0000

    Fixes issue with OSAPI passing compute API a flavorid instead of an instance identifier. Added tests.

commit 99459b56fdd3cca269be39b96beab71ef10af25e
Merge: 87f021f ab0c38e
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 12:16:53 2011 -0700

    Merge from trunk.

commit 51f4d4c2e0c7d9f066b328014aa955b150b62c3a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 29 12:09:17 2011 -0700

    made the whole instance handling thing optional

 nova/notifier/api.py     |    2 +-
 nova/tests/test_utils.py |   23 +++++++++-----
 nova/utils.py            |   77 +++++++++++++++++++++++++++++++++-------------
 3 files changed, 71 insertions(+), 31 deletions(-)

commit 87f021f73c01806bc1c22106e3a169d60024104f
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 12:08:59 2011 -0700

    Reorganize the code to satisfy review comments.

 nova/rpc.py                 |   66 -----
 nova/rpc/__init__.py        |   66 +++++
 nova/rpc/amqp.py            |  591 +++++++++++++++++++++++++++++++++++++++++++
 nova/rpc/common.py          |   23 ++
 nova/rpc_backends/amqp.py   |  591 -------------------------------------------
 nova/rpc_backends/common.py |   23 --
 nova/tests/test_rpc_amqp.py |    2 +-
 7 files changed, 681 insertions(+), 681 deletions(-)

commit 62c7ca622a42aaed9a4f23e8fc2167655b2ff58f
Merge: c035503 ab0c38e
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 18:59:33 2011 +0000

    pull-up from trunk; fix problem obscuring context module with context param; fix conflicts and no-longer-skipped tests

commit 798dbb567be3e36eb2d6f0fbe27aa2eced0345d4
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Fri Jul 29 14:58:49 2011 -0400

    remove unused import

 nova/tests/scheduler/test_zone_aware_scheduler.py |    1 -
 1 file changed, 1 deletion(-)

commit ab0c38efa5440347c3c75171e703e010023affe2
Merge: 8c09996 396cf66
Author: matt.dietz@rackspace.com <>
Date:   Fri Jul 29 17:59:23 2011 +0000

    --Stolen from https://code.launchpad.net/~cerberus/nova/lp809909/+merge/68602
    
    Fixes lp809909
    
    Migrate of instance with no local storage fails with exception
    
    Simply checks to see if the instance has any local storage, and if not, skips over the resize VDI step.

commit e664443e2f2565150b35d813f6cd95c941033524
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:51:49 2011 -0400

    removing 'Defining Methods' paragraph

 HACKING |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

commit 58e2d9f46fef753857f559c8f5953e025d022d3c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:46:24 2011 -0400

    rewording

 HACKING |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit 14b5036d01cdfecd650755345589424969b675ff
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 10:33:58 2011 -0700

    Use the util.import_object to import a module.

 nova/rpc.py   |    4 ++--
 nova/utils.py |   11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

commit 5c7b70cef1abe91861dd4f82a365143256e9f2cf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:00:09 2011 -0400

    rewording

 HACKING |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit acf7b94a899b2901f102ad2fd176c895abf456a3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:54:55 2011 -0400

    one last change

 HACKING |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 05ca64bd1fbf70c7066e84426dd08b5beb9cbb6d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:49:48 2011 -0400

    upgrades

 HACKING |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 4438850e323e85673d504ae16bb09f6d05dc65bb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:44:11 2011 -0400

    expanding

 HACKING |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

commit 31657838acad069868675722575c1345869dc516
Merge: 1e8a7f2 8c09996
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 29 09:28:02 2011 -0700

    merged trunk and fix time call

commit 7a1b622ed6088aaaa711b44c50a26e1a33695f63
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:21:46 2011 -0400

    updating HACKING

 HACKING |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 6 deletions(-)

commit 9afa4437bf43655766e7a6f13f67ad52f27ba7b5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 12:14:29 2011 -0400

    Fixing lxml version requirement.

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50abd79432ff82a23da1934cc4d297c0c5051668
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 11:57:40 2011 -0400

    Oops, I wasn't actually being compatible with the spec here.

 nova/api/openstack/servers.py            |   12 +++---------
 nova/tests/api/openstack/test_servers.py |    4 +---
 2 files changed, 4 insertions(+), 12 deletions(-)

commit 20dd0fe8d5332f5a2d65a5496bcc60e04a4940c2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 11:35:50 2011 -0400

    bumping novaclient version

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec28f5495175939b7ea8f885e4468470eee411ca
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 11:07:07 2011 -0400

    Fixes lp:818050

commit 7a165843aa5c1a98b1dbf13dedf556878a3d0435
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 11:06:02 2011 -0400

    Updated resize to call compute API with instance_type identifiers instead of flavor identifiers. Updated tests.

 nova/api/openstack/servers.py            |   63 +++++++++++++++++++-----------
 nova/compute/instance_types.py           |    9 ++---
 nova/tests/api/openstack/test_servers.py |   61 +++++++++++++++++++++++++----
 3 files changed, 96 insertions(+), 37 deletions(-)

commit 6d62453f4834447f6c06a58ec52c1037d4142293
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 29 10:54:20 2011 -0400

    fix run_tests.sh

 run_tests.sh |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 396cf66676a64643645e25f81bd2422ac3ba5dbf
Merge: 815f8b5 8c09996
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 09:37:11 2011 -0500

    merge trunk

commit f91413bec1e6698935e00c323befa0655dea1ab1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 29 10:22:50 2011 -0400

    Fixed changes missed in merge

 nova/tests/api/openstack/test_server_actions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit eca19199bdfcc64948f41d7e6b1728cb17b3baa2
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 29 10:08:20 2011 -0400

    fix more spacing issues, and removed self link from versions template data

 nova/api/openstack/versions.py            |    8 ------
 nova/api/openstack/views/versions.py      |   12 +++++----
 nova/tests/api/openstack/test_versions.py |   42 +++++++++++++----------------
 run_tests.sh                              |    4 ++-
 4 files changed, 28 insertions(+), 38 deletions(-)

commit 50103de271b0a083599a4638edb831ede683a901
Merge: cd065f6 8c09996
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 29 10:07:38 2011 -0400

    merged trunk

commit 7250fe0521ccb77e73563a0a36d23cac81956457
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 29 07:05:27 2011 -0700

    added instance support to to_primitive and tests

 nova/notifier/api.py     |    4 +--
 nova/tests/test_utils.py |   71 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py            |    3 ++
 3 files changed, 75 insertions(+), 3 deletions(-)

commit 79283cbb13d91e3c25e42af765f9da627813a6d8
Author: Kei masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jul 29 20:03:23 2011 +0900

    merged trunk and fixed post_live_migratioin_at_destination to get nw_info

 nova/compute/manager.py         |    4 +++-
 nova/virt/libvirt/connection.py |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 22b0e3948beaa2b1b3d61562e453412abb5edcbc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 03:42:40 2011 -0400

    Removing unnecessary imports.

 nova/tests/api/openstack/test_extensions.py |    2 --
 1 file changed, 2 deletions(-)

commit 4bae92b7ae8816c0c25c4d2164793d86069793ad
Merge: eaf8385 8c09996
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Thu Jul 28 23:20:40 2011 -0700

    Merge in from trunk resolving a conflict in test_cloud.py

commit d0f4094a4dd914320e94913d0a36b12e882d5ac6
Merge: 45c3c01 8c09996
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 01:58:12 2011 -0400

    Merge from trunk.

commit 45c3c01f69e1f13ced70942e6c8369098a307c48
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 01:54:19 2011 -0400

    Added xml schema validation for extensions resources.
    Added corresponding xml schemas.
    Added lxml dep, which is needed for doing xml schema validation.

 nova/api/openstack/extensions.py               |   31 +-
 nova/api/openstack/schemas/atom-link.rng       |  141 ++++++
 nova/api/openstack/schemas/atom.rng            |  597 ++++++++++++++++++++++++
 nova/api/openstack/schemas/v1.1/extension.rng  |   11 +
 nova/api/openstack/schemas/v1.1/extensions.rng |    6 +
 nova/tests/api/openstack/test_extensions.py    |   26 +-
 tools/pip-requires                             |    1 +
 7 files changed, 793 insertions(+), 20 deletions(-)

commit 1e8a7f2846ce0a3fb3d9e31fc7d4dbf27d54fac2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 19:06:48 2011 -0700

    remove extra log statement

 nova/compute/api.py |    1 -
 1 file changed, 1 deletion(-)

commit a52b643b18e1bac18b642ecfd781809eb5612763
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 29 10:51:50 2011 +0900

    api/ec2: rename CloudController._get_instance_mapping into _format_instance_mapping
    
    This patch renames nova.api.ec2.cloud.CouldController._get_instance_mapping
    to _format_instance_mapping in order to make it clear that the method is
    for API formatting, not for internal use.

 nova/api/ec2/cloud.py    |    4 ++--
 nova/tests/test_cloud.py |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

commit ad8d33165f52ddf14dc9bd745db00eb039d74af7
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 21:00:55 2011 -0400

    fixed typo

 nova/api/openstack/versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf9c1fe00a53c91325c7984433178e1994329d0a
Merge: 54f652b 8c09996
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 21:00:17 2011 -0400

    merge with trunk

commit 54f652bbffaf8edf9ccfe35e1e1b15c20327340a
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 20:59:07 2011 -0400

    fixed pep8 issues and removed unnecessary factory function

 nova/api/openstack/versions.py       |   15 +++++----------
 nova/api/openstack/views/versions.py |    3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

commit 1d269ad0b9a8bc7d30ff1f91faa9afe465f87e98
Merge: 00171c3 8c09996
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 28 15:54:27 2011 -0700

    Merge trunk

commit f4359a7789ae96a36aaab8f53aa3234d13b1725a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 15:54:02 2011 -0700

    returned vsa_manager, nova-manage arg and print changes

 bin/nova-manage       |   39 ++++++++++++++++++++-------------------
 nova/api/ec2/cloud.py |    4 ++++
 nova/flags.py         |    2 ++
 nova/vsa/api.py       |    2 --
 4 files changed, 26 insertions(+), 21 deletions(-)

commit 1753da4d586f896f449828879e4361241289e376
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 28 22:25:08 2011 +0000

    Added the config values to the return of the host_data method.

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    2 ++
 1 file changed, 2 insertions(+)

commit 8c099960a0938f168fe8ca85c63988d697228512
Merge: 7173bf4 e43cdf3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 21:59:25 2011 +0000

    Adds XML serialization for servers responses that match the current v1.1 spec

commit fe195087797ca031e437c34e25380354e3ba4f56
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 28 21:59:02 2011 +0000

    Added methods to read/write values to a config file on the XenServer host.

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   48 +++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

commit 7834ab495fa657105a41dc590628981b5d44d8b9
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 17:41:13 2011 -0400

    fix pep8 errors

 nova/tests/scheduler/test_zone_aware_scheduler.py |    5 +++--
 nova/tests/test_xenapi.py                         |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

commit e43cdf309802d06d1f9534d898dc93f673d11547
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 17:21:06 2011 -0400

    minor cleanup

 nova/tests/api/openstack/test_servers.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 7173bf4dd3dbc1a88f8476c488a7b53fb7d7522b
Merge: 44bf6ac 7006693
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 21:08:47 2011 +0000

    Removed unused Duplicate catch.

commit c0355038b462cfd75b423a535601c4463c68f80f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 28 21:00:38 2011 +0000

    Fix to_dict() and elevated() to preserve auth_token; revert an accidental change from context.get_admin_context() to simply context

 nova/context.py           |    6 ++++--
 nova/virt/xenapi/vmops.py |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 44bf6ac19c4700e8a269440477156827db44e631
Merge: 3c58da1 b8183e1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 20:58:57 2011 +0000

    Fixes bug 816604, which is the problem that timeformat in server responses for updated and created are incorrect. This fix just converts the datetime into the correct format.

commit 1b4d0f8f72ec443027f8f83bffec9e02a76ce32f
Merge: 0a7e194 3c58da1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 16:35:56 2011 -0400

    merging trunk

commit 0a7e19481849f451f04063d3d2fc45b8f3328119
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 16:33:14 2011 -0400

    pep8

 nova/api/openstack/servers.py            |    2 --
 nova/tests/api/openstack/test_servers.py |    2 --
 2 files changed, 4 deletions(-)

commit 8141ef4139fbf8512150ce970cea4dc4bee22e1a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 16:21:12 2011 -0400

    moving server backup to /servers/<id>/action instead of POST /images

 nova/api/openstack/create_instance_helper.py |   12 +-
 nova/api/openstack/images.py                 |  112 +++--------------
 nova/api/openstack/servers.py                |  133 +++++++++++++-------
 nova/tests/api/openstack/test_images.py      |   76 ------------
 nova/tests/api/openstack/test_servers.py     |  169 ++++++++++++++++++++++++++
 5 files changed, 280 insertions(+), 222 deletions(-)

commit 2e3b199005d16ee3e35cd6c71b8512628e3631bc
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Thu Jul 28 21:12:03 2011 +0100

    Simplified test cases

 nova/api/ec2/cloud.py  |    2 +-
 nova/tests/test_api.py |   27 ++++++---------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

commit 0c9d1fcbdd1701f1206e1f66db47edd419c8901d
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:50:09 2011 -0400

    Rewrite ImageType enumeration to be more pythonic

 nova/virt/xenapi/vm_utils.py |   24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

commit 1c2ac1e7646d1432f57104c6ee3d1fa434387741
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 15:48:30 2011 -0400

    refactoring and make self links correct (not hard coded)

 nova/api/openstack/versions.py            |  136 +++++++++++----------
 nova/api/openstack/views/versions.py      |   33 +++--
 nova/tests/api/openstack/test_versions.py |  186 ++++++++++++++---------------
 3 files changed, 178 insertions(+), 177 deletions(-)

commit 782f86b931156bd81c05acabe200e123f6227ae4
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:46:20 2011 -0400

    Fix tests for checking pylint errors.

 nova/tests/scheduler/test_zone_aware_scheduler.py |   12 +++++-------
 nova/tests/test_xenapi.py                         |    2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

commit 89acd0c231b0c92724b188d11e7c1b541d931658
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:11:54 2011 -0400

    Use utils.utcnow. Use True instead of literal 1

 nova/db/sqlalchemy/api.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 0e3f66bac655b49329b5e90f23599ba45333543b
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:09:02 2011 -0400

    Some tests for resolved pylint errors.

 nova/tests/scheduler/test_zone_aware_scheduler.py |   20 ++++++++++++++++++++
 nova/tests/test_xenapi.py                         |   15 +++++++++++++++
 2 files changed, 35 insertions(+)

commit 969ba5028d8b07cece4b4c940ce02f661cecbb71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 12:04:49 2011 -0700

    simplify if statement

 nova/context.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 815f8b587310b396fa10011cb12e91d578a2cb60
Merge: c0bbcb5 3c58da1
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 14:01:30 2011 -0500

    merge trunk

commit 71414e65333692956023647b55be06de6a73f11f
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 14:59:28 2011 -0400

    use wsgi XMLNS/ATOM vars

 nova/api/openstack/versions.py            |   14 ++++++-------
 nova/api/openstack/wsgi.py                |    1 +
 nova/tests/api/openstack/test_versions.py |   32 ++++++++++++++---------------
 3 files changed, 22 insertions(+), 25 deletions(-)

commit 3c58da1a739c34d82f744692f0f9447453f3ff0a
Merge: 8243057 f8a182d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 18:59:10 2011 +0000

    Updated deserialization of POST /servers in the OSAPI to match the latest v1.1 spec

commit 700669329d7654d07645259c32034654dcb7c224
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 13:50:06 2011 -0500

    Removed unused Duplicate catch.

 nova/auth/dbdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98cf87e65cea624b05b5e66fa17e56bff22b4967
Merge: 4def65d 8243057
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 28 18:47:56 2011 +0000

    pull-up from trunk

commit 8243057d5692ab2e7b1670c9a6d67b0c33a4e9ae
Merge: 340c516 0004f6b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 18:38:39 2011 +0000

    Catch DBError for duplicate projects.

commit 0004f6bc6c772458f45027a76b1aa4fb31247264
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 12:52:47 2011 -0500

    Catch DBError for duplicate projects.

 nova/auth/dbdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 340c516817abdb93bcfe5830fee90b1e16ccda3d
Merge: 5072bce 129088a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jul 28 17:18:59 2011 +0000

    Make network_info truly optional

commit c0bbcb5d9f4deab1acc5ca03e270a5234d114ec5
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 11:01:38 2011 -0500

    trunk infected with non-pep8 code

 nova/tests/api/openstack/test_extensions.py |   38 +++++++++++++--------------
 nova/tests/api/openstack/test_limits.py     |   14 +++++-----
 nova/tests/api/openstack/test_servers.py    |    2 +-
 nova/tests/test_db_api.py                   |    4 +--
 nova/tests/test_libvirt.py                  |    2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

commit 1a97658a4bf7d0dab562f8b8c22a430f2da27f10
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 28 08:44:01 2011 -0700

    unicode instead of str()

 nova/notifier/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5072bce5102d94ed07b3475d0ace107d45b86a6c
Merge: 26fd6c3 4a26a6f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 15:43:58 2011 +0000

    Add a flag to set the default file mode of logs.

commit 3ead120b4b320de5bc700b2d6717485b76510762
Merge: 9fff1be 26fd6c3
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 10:43:06 2011 -0500

    merge trunk

commit 40683658929e38905c87e72988c797180797501e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 28 08:34:27 2011 -0700

    make payload json serializable

 nova/notifier/api.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit cd065f6669a666387c8f9efb5c0fff7eaf94521c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 10:31:06 2011 -0400

    moved test

 nova/tests/api/openstack/test_server_actions.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 92c8d269a13917de397c1d0ce9fecfaa36195ce9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 10:23:44 2011 -0400

    Removed v1_1 from individual tests

 nova/tests/api/openstack/test_server_actions.py |   32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit ae8422180ad05aee0c718980e100017810399e13
Merge: 03aac3f 26fd6c3
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 09:08:18 2011 -0400

    merge from trunk

commit 32276a0d4484668a6507335d6c5b48c692239132
Merge: 151ecdd 26fd6c3
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Jul 28 14:06:11 2011 +0100

    merge to trunk

commit 16cbba0838e9a2ac712b91b103dc794b0edebd00
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:45:16 2011 -0700

    more commented code removed

 .../openstack/contrib/virtual_storage_arrays.py    |    2 --
 nova/scheduler/vsa.py                              |    2 --
 nova/volume/manager.py                             |    3 ---
 3 files changed, 7 deletions(-)

commit b4159d95c32382d124c3f3f0a49f8ad9f2d41036
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:27:16 2011 -0700

    some minor cosmetic work. addressed some dead code section

 bin/nova-vsa                                       |    3 ---
 nova/api/openstack/contrib/drive_types.py          |    4 ----
 nova/db/sqlalchemy/api.py                          |    2 --
 .../migrate_repo/versions/036_add_vsa_data.py      |   12 ------------
 nova/flags.py                                      |    2 --
 nova/scheduler/vsa.py                              |   14 +++++---------
 6 files changed, 5 insertions(+), 32 deletions(-)

commit 73ac708932d411b92e91d39920c24e9536f4ba71
Merge: 401de17 26fd6c3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:01:21 2011 -0700

    merged with nova-1336

commit 401de172b86a13010885e70bc78351e72a7dfde3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Jul 27 22:49:16 2011 -0700

    prior to nova-1336 merge

 nova/scheduler/vsa.py                       |   77 ++--
 nova/tests/api/openstack/test_extensions.py |    7 +-
 nova/tests/scheduler/test_vsa_scheduler.py  |  616 +++++++++++++++++++++++++++
 nova/tests/test_vsa.py                      |    2 +
 nova/tests/test_vsa_volumes.py              |   23 +-
 nova/volume/driver.py                       |    4 +-
 nova/vsa/api.py                             |   41 +-
 nova/vsa/manager.py                         |    2 +-
 8 files changed, 689 insertions(+), 83 deletions(-)

commit 559b73ed18a271dd35c7b9d00306c8c5b33bd45b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 01:36:55 2011 +0000

    remove authman from images/s3.py and replace with flags

 nova/image/s3.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit d811f82e524bd7634dd59f0074129fb41fb28c12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 01:31:09 2011 +0000

    fix tests broken in the merge

 nova/tests/test_db_api.py    |   34 +++++++++++++---------------------
 nova/tests/test_quota.py     |    4 +---
 nova/tests/test_vmwareapi.py |    2 +-
 3 files changed, 15 insertions(+), 25 deletions(-)

commit d7c0f1da32a2a601dcef81030234310011ad3348
Merge: 8de3c0f 26fd6c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 01:17:21 2011 +0000

    merged trunk

commit c789c7e53976f45aa7a891c1399ae399bd39408f
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 21:11:22 2011 -0400

    fix undeclared name error

 nova/api/openstack/create_instance_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ca1bd15fdadf95d37669b4977625a364dd171698
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:56:12 2011 -0400

    fix undeclared name error

 nova/scheduler/least_cost.py |    1 +
 1 file changed, 1 insertion(+)

commit 7b66886c3067015d40b81748d253c3623e328d95
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:55:10 2011 -0400

    fix undeclared name error

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50360384800df72fc97a8e9e5e81833e6091c10c
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:49:51 2011 -0400

    fix undeclared name errors

 nova/virt/xenapi/vm_utils.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 968f0e17cbb9dfe881bcb2fa0c96b6aea4f566fa
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:48:26 2011 -0400

    remove unused assignment which causes undeclared name error

 nova/tests/scheduler/test_scheduler.py |    5 -----
 1 file changed, 5 deletions(-)

commit bf1cf9bb5089bf81c3fec456db381e9be4c37f81
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:45:04 2011 -0400

    fix undefined variable errors

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7026927fa52e34eebc17b387e0ca6feade99727a
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:32:46 2011 -0400

    fix call to nonexistant method to_global_ipv6.
    Add myself to authors file

 Authors                   |    1 +
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 129088abe597af9e6fa224378cca1a95dfe6cfe3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 27 23:32:39 2011 +0000

    Make network_info truly optional

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 26fd6c3f309a2febd7538684a470d462ab83dab3
Merge: 0fc7f12 7f5437a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 23:19:11 2011 +0000

    updates handling of arguments in nova-manage network create.
    updates a few of the arguments to nova-manage and related help.
    updates nova-manage to raise proper exceptions.
    
    updates network manager create_networks to handle ipv6 more correctly and efficiently.
    
    flat_network_bridge FLAG now defaults to None.

commit 7f5437a435cb7d98c65749488b9a45bfb8bd6fec
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 18:00:45 2011 -0500

    forgot a line

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 45ff96e29669c5650873b0a7ddcf52160eddd27c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 17:58:13 2011 -0500

    fixed create_networks ipv6 management

 nova/network/manager.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 0fc7f1220139318cfb9cd181324cce653cc27f58
Merge: ad00ca9 a57115e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 22:28:58 2011 +0000

    Fail silently.

commit f4c8c97cdd1ec9a9b6c7f271dcc92b1e716c3285
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 17:24:39 2011 -0500

    typo

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7c9dc248af2e19abd04b342f53b1f93fe1547bba
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 17:19:19 2011 -0500

    --bridge defaults to br100 but with a deprecation warning and to be removed in d4

 bin/nova-manage |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit b0ffe14da11addd2e1fcf14325b9bcf4c8cd3512
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 27 15:14:13 2011 -0700

    Reverting to original code

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 03aac3ffd546ab1528b73ee36c8632f30ed8af2f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 18:07:01 2011 -0400

    use ATOM_XMLNS everywhere

 nova/api/openstack/versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9fff1bee5f6205f1146d28699a6dc4ee1692dd54
Merge: 5ad96e6 ad00ca9
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 17:02:49 2011 -0500

    merge trunk

commit 6c25483c08965204e8a4199ec600098fe09ad87c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 27 15:02:00 2011 -0700

    added unit testcase to increase code coverage

 .../api/openstack/contrib/test_createserverext.py  |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 634702e9a6813b8793a82ddd87d24690b05ffc1e
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:59:05 2011 -0400

    stub out VERSIONS for the tests

 nova/tests/api/openstack/test_versions.py |   75 ++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

commit c00e933be6500caf25d55d32db5abb0e36600670
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:54:35 2011 -0400

    put run_tests.sh back to how it was

 run_tests.sh |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit a57115ef474440f21a500ce4f8970a9fcd99840e
Merge: 0b4e10a ad00ca9
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 16:39:27 2011 -0500

    Fixed conflict

commit 0b4e10a48e2aaa816ce4ca4565068d1655ad53ef
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 16:34:55 2011 -0500

    Fail silently.

 .../034_change_instance_id_in_migrations.py        |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit b9372552d81afca99c5367d0cf3b86a272335d3b
Merge: ae1fd7e 4a52d49
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 27 14:29:47 2011 -0700

    Merged with trunk and fixed broken unit test cases

commit ad00ca903b98fc33eca9f375b1e5dd146142839f
Merge: 3a726f8 54de340
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 21:23:01 2011 +0000

    Fix the skipped tests in vmwareapi and misc spots. The vmware networking stuff is stubbed out, so the tests can be improved there by fixing the fakes.

commit 9cc71286d6e5339e42d6957570bfc02ea71353fe
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:21:14 2011 -0400

    pep8 issue

 nova/tests/api/openstack/test_versions.py |    1 +
 1 file changed, 1 insertion(+)

commit f9ff78a5ac5f83d789334c36bebfce62af0ea406
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 17:20:42 2011 -0400

    refactoring MetadataXMLDeserializer in wsgi/common

 nova/api/openstack/common.py                 |   12 +++++++++++-
 nova/api/openstack/create_instance_helper.py |    7 +++++--
 nova/api/openstack/wsgi.py                   |   13 -------------
 3 files changed, 16 insertions(+), 16 deletions(-)

commit 22f502cdca94a20ebb061f434a9a78789a3b165d
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:19:59 2011 -0400

    move viewbuilder and serializer tests into their own test cases

 nova/tests/api/openstack/test_versions.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 3a726f80a56e3202e40526047ac58233632e7152
Merge: e258330 eb68f14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 21:17:07 2011 +0000

    Fix all of the skipped libvirt tests.

commit 5ad96e645de174b5d9982a161919293e37aa348d
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 16:13:07 2011 -0500

    fix typo

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5800a84f113e7b0748f93143a1c00d1658388bc3
Merge: 77d06c7 e258330
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:09:57 2011 -0400

    merged trunk

commit e258330eeae2e8e88ab6ad47bc73f8620675b25c
Merge: 4b926ab 2753f5b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 21:09:18 2011 +0000

    Fixes typo in attach volume.

commit 77d06c7c82bfafd956f1108b2adbcb378628511f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:09:17 2011 -0400

    utilize _create_link_nodes base class function

 nova/api/openstack/versions.py |   11 +++--------
 nova/api/openstack/wsgi.py     |    2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

commit ae6801fa1fe3cd83b3c51d4f3a9a9a265fc49588
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 16:06:08 2011 -0500

    default the paramater to None, not sure why it was required to begin with

 nova/virt/xenapi/vmops.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9b0979c43bcb9961dfd997a17eed307b1db17acd
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 16:02:00 2011 -0500

    pass None in for nw_info

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c220b1c4547ad2cdd6110fa029b6f9478bae99f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 16:54:09 2011 -0400

    added test for accept header of atom+xml on 300 responses to make sure it defaults back to json, and reworked some of the logic to make how this happens clearer

 nova/api/openstack/versions.py            |    3 ++-
 nova/tests/api/openstack/test_versions.py |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

commit 4b926ab5de00bc4885021fff0b2ac3679703707a
Merge: e281484 6158ffe
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 20:43:53 2011 +0000

    Drop FK before dropping instance_id column.

commit f2d8e91b83ff3a3bd1e2f3c53c25a418a578cd27
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 16:34:02 2011 -0400

    moved rest of build logic into builder

 nova/api/openstack/versions.py            |   42 ++------------------------
 nova/api/openstack/views/versions.py      |   46 +++++++++++++++++++----------
 nova/tests/api/openstack/test_versions.py |   31 ++++++++++++-------
 3 files changed, 54 insertions(+), 65 deletions(-)

commit 7d02bd555d7519d485d00e02136d26a6e4e7096e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 15:22:51 2011 -0500

    Drop FK before dropping instance_id column.

 .../034_change_instance_id_in_migrations.py        |    6 ++++++
 1 file changed, 6 insertions(+)

commit 6158ffea597149bbe4b1a61bfbaaab7fc185af5c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 15:02:48 2011 -0500

    Removed FK import.

 .../034_change_instance_id_in_migrations.py        |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 981e576635ed1830a30fd65e65d745825f73342a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 14:54:36 2011 -0500

    Delete FK before dropping instance_id column.

 .../034_change_instance_id_in_migrations.py        |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 92f82f620182eab0d5e6dffc8629ec0e25c52303
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 14:35:39 2011 -0500

    oops! moved ipv6 block back into the for loop in network manager create_networks

 nova/network/manager.py |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

commit 2ac60cd773bb25e19b50c082e0860b1c495d1527
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 15:29:15 2011 -0400

    update everything to use global VERSIONS

 nova/api/openstack/versions.py            |   49 ++++++++++-------------------
 nova/tests/api/openstack/test_versions.py |   18 +++++------
 2 files changed, 26 insertions(+), 41 deletions(-)

commit 5476f9da9085691377da2a550795f13a9a43fa2b
Merge: 047c0e9 e281484
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 14:20:30 2011 -0500

    merged trunk

commit b8183e11e56781fce27ec1af261c5e53bca78ca5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 15:15:48 2011 -0400

    change local variable name

 nova/api/openstack/views/servers.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 047c0e993e1dd63a2a6ad75ee40b892c0cd1aa25
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 14:07:31 2011 -0500

    updated handling of v6 in network manager create_networks to it can receive None for v6 args

 nova/network/manager.py |   39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

commit 2b0134bdfa73e7eb616414b3f8cd1b5ed99b8283
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 13:49:36 2011 -0500

    added ipv6 requirements to nova-manage network create. changed --network to --fixed_range_v4

 bin/nova-manage   |   30 ++++++++++++++++++------------
 nova/exception.py |    2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

commit a37f5eb58d6fea4f24ac3e97173c47102ecd73b1
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 13:36:16 2011 -0500

    remove unexpected parameter

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c20a4845afc47d124017de698657c1713dc11e7f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 14:35:47 2011 -0400

    fixed xmlns issue

 nova/api/openstack/versions.py            |    8 ++++----
 nova/tests/api/openstack/test_versions.py |   17 +++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

commit a300a964cedd44dec09dae3e631d0d11f5782213
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 13:34:45 2011 -0500

    updated the bridge arg requirements based on manager

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit e2ce48eb3ffde56fa8d74b397682814ad278ae63
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Jul 27 11:33:56 2011 -0700

    this change will require that local urls be input with a properly constructed local url:  http://localhost/v1.1/images/[id].  Such urls are translated to ids at the api layer.  Previously, any url ending with and int was ok.

 nova/tests/api/openstack/fakes.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 22beaf8802fdc44242f4a96e291c4fbb60af0e3a
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 14:24:35 2011 -0400

    make atom+xml accept header be ignored on 300 responses in the VersionsRequestDeserializer

 nova/api/openstack/versions.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 0c393d704050ab43b1b970428b7740609af86c74
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:20:34 2011 -0700

    Removed superfluous parameter

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9590508c6ed33891d4cec47939bbcab1a2260835
Merge: 66cf558 20f0aa2
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:13:29 2011 -0700

    Merge from trunk and conflict resolution

commit 4def65d37886fff0dc9f238bca5454abaacb6f76
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 27 18:13:04 2011 +0000

    Use auth_token to set x-auth-token header in glance requests

 nova/virt/xenapi/vm_utils.py                       |    7 +++++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   22 +++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

commit 66cf558f1497a1b917fb3db7a61826aefbd6af2e
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:10:35 2011 -0700

    Fixed the virt driver base

 nova/virt/driver.py      |    3 ++-
 nova/virt/xenapi_conn.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit f1830708f823a9de9c2f1cd24af5bed80302788f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Jul 27 11:08:44 2011 -0700

    Some work on testing.  Two cases related to lp816713 have some coverage already: using an id as an imageRef (test_create_instance_v1_1_local_href), and using a nova href as a url (test_create_instance_v1_1)

 nova/api/openstack/create_instance_helper.py |    4 +++-
 nova/tests/api/openstack/test_servers.py     |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit e2814844321ed032d4ae71b29a70a99780779a23
Merge: 20f0aa2 5fe5851
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 18:08:36 2011 +0000

    Remove xenapi_inject_image flag.

commit 4a26a6f2b9ac39d560046d0d9cb82f6ce4554e56
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 13:00:37 2011 -0500

    Add a flag to set the default file mode of logs.

 nova/flags.py |    2 +-
 nova/log.py   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 9a84b87ae04dc5220f95992d9a6c4e210fbc374f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 13:59:53 2011 -0400

    fixed issue with factory for Versions Resource

 nova/api/openstack/versions.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 50eb566ba5ce50127ad3df8984dd6895c31361a3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 27 17:56:12 2011 +0000

    Fix context argument in a test; add TODOs

 nova/tests/test_libvirt.py |    2 +-
 nova/virt/driver.py        |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 094b9845500e28d315f70aa1fbc37b75c143d0c0
Author: John Tran <jhtran@att.com>
Date:   Wed Jul 27 10:34:58 2011 -0700

    improved the code per peer review

 nova/api/openstack/contrib/floating_ips.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b847ed1cbac345bd2d7a8c252080656c8109c052
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 27 17:16:46 2011 +0000

    Add context argument a lot more places and make unit tests work

 nova/tests/test_libvirt.py      |    6 +++---
 nova/tests/test_xenapi.py       |   16 +++++++++-------
 nova/tests/xenapi/stubs.py      |    4 ++--
 nova/virt/driver.py             |    7 ++++---
 nova/virt/fake.py               |    5 +++--
 nova/virt/hyperv.py             |    3 ++-
 nova/virt/libvirt/connection.py |    5 +++--
 nova/virt/vmwareapi/vmops.py    |    4 ++--
 nova/virt/vmwareapi_conn.py     |    9 +++++----
 nova/virt/xenapi/vmops.py       |    4 ++--
 nova/virt/xenapi_conn.py        |   13 +++++++------
 11 files changed, 42 insertions(+), 34 deletions(-)

commit 2753f5b8b79141c36e58c2d22d3ae14aecb73625
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 10:08:26 2011 -0700

    fix hidden breakage in test

 nova/tests/test_compute.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5fe585190f9c5e54e8c8a83f0cfd0e237669d942
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 12:07:52 2011 -0500

    Remove xenapi_inject_image flag.

 nova/tests/test_xenapi.py |    2 +-
 nova/virt/xenapi/vmops.py |    2 +-
 nova/virt/xenapi_conn.py  |    9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

commit 0300c952d925ccaad2d3d4191d87c08656d4b413
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 12:54:12 2011 -0400

    removed unused import

 nova/api/openstack/image_metadata.py |    1 -
 1 file changed, 1 deletion(-)

commit eb68f14b4b07211a50145af134044c4430f3fe94
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 09:52:28 2011 -0700

    pep8

 nova/virt/libvirt/netutils.py |    1 -
 1 file changed, 1 deletion(-)

commit 5ca4d3a88f1dd758c4ab6133e26cf2f8b05a8339
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:50:52 2011 -0400

    pep8

 nova/api/openstack/versions.py            |   20 +++----
 nova/tests/api/openstack/test_versions.py |   84 ++++++++++++++---------------
 run_tests.sh                              |    4 +-
 3 files changed, 55 insertions(+), 53 deletions(-)

commit a0b536064620e4d18ab00c1154ec3b597ab16a67
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 11:44:14 2011 -0500

    updated nova-manage create network. better help, handling of required args, and exceptions. Also updated FLAG flat_network_bridge to default to None

 bin/nova-manage          |   89 +++++++++++++++++++++++++---------------------
 nova/exception.py        |    4 +++
 nova/network/manager.py  |    8 ++---
 nova/tests/fake_flags.py |    1 +
 nova/virt/libvirt/vif.py |    2 +-
 5 files changed, 59 insertions(+), 45 deletions(-)

commit ce8acf3275086e0337324fb69f3c1fa530e09e50
Merge: 4553a27 4f31356
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 16:41:16 2011 +0000

    Re-enables and fixes test_cloud tests that broke from multi_nic.

commit 4553a27ee492b9042cadaba9f2a98e00097dfe71
Merge: e538f45 d4b2a2b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 16:33:36 2011 +0000

    Fix for boto2.

commit 20f0aa25a64bc9f28cc2dceb4bec474fdfa54030
Merge: a1152e7 4f31356
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 16:23:51 2011 +0000

    Re-enables and fixes test_cloud tests that broke from multi_nic.

commit 9008b1f291ae38a4de9b5af5087b1815b3562e3f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 09:19:45 2011 -0700

    add invalid device test and make sure NovaExceptions don't get wrapped

 nova/exception.py               |    3 ++-
 nova/tests/test_libvirt.py      |    9 +++++++++
 nova/virt/libvirt/connection.py |    4 ----
 3 files changed, 11 insertions(+), 5 deletions(-)

commit dd72466c12ab6d64ee56257befe7e13cfd3ff5fa
Merge: 6dead0b a1152e7
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:06:59 2011 -0400

    merge from trunk

commit 6dead0b1706f3b2279504437aca63a3291dc2347
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:06:12 2011 -0400

    pep8

 nova/tests/api/openstack/test_versions.py |    1 -
 1 file changed, 1 deletion(-)

commit 572847f9eb43ce23190566439118547ae6d6a992
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:53:09 2011 -0400

    pep8

 nova/api/openstack/server_metadata.py            |    6 +++---
 nova/tests/api/openstack/test_common.py          |   14 +++++++-------
 nova/tests/api/openstack/test_server_metadata.py |   13 ++++++-------
 3 files changed, 16 insertions(+), 17 deletions(-)

commit b6ee05e9575769039aca2c65c2a761c14562e7e0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:45:22 2011 -0400

    updating common metadata xml serializer tests

 nova/tests/api/openstack/test_common.py |   60 +++++++++++--------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

commit 154129acf1ecbdd97e5bb8558598a9b24eb8559f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 11:43:20 2011 -0400

    Cleaned up test_servers

 nova/tests/api/openstack/test_servers.py |   17 -----------------
 1 file changed, 17 deletions(-)

commit 4add644dbd1650a3e83e715c6d6a38c4114e4d06
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 11:39:34 2011 -0400

    Moved server/actions tests to test_server_actions.py

 nova/tests/api/openstack/test_server_actions.py |  628 +++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py        |  492 ------------------
 2 files changed, 628 insertions(+), 492 deletions(-)

commit 0760948609ac89a43a590b36e79d691a6c79b4c3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:32:18 2011 -0400

    updating servers metadata resource

 nova/api/openstack/__init__.py                   |   11 +-
 nova/api/openstack/common.py                     |    4 +-
 nova/api/openstack/server_metadata.py            |  113 +++++++----
 nova/tests/api/openstack/test_server_metadata.py |  220 +++++++++++++++++++---
 4 files changed, 279 insertions(+), 69 deletions(-)

commit 435abc16d0c8ffd4316c919987c4f916973d0c09
Merge: b187544 a1152e7
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 27 15:25:27 2011 +0000

    pull-up from trunk

commit 151ecddc0227ff9e779712532971fac8a2c79c7b
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jul 27 15:40:13 2011 +0100

    Address merge review concerns.

 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |   28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

commit a1152e7361ed887fc38de42e8fc770cf2f7df7cb
Merge: 4a52d49 d4b2a2b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 13:43:31 2011 +0000

    Makes security group rules with the newer version of the ec2 api and correctly supports boto 2.0

commit 95558b6c822b8f6f80fd57dded97730cf022e443
Merge: d5b76d8 7cd146e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 09:40:19 2011 -0400

    merging parent branch servers-xml-serialization

commit d5b76d89d7cfc2581e2de618d33331f9267126d4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 09:33:20 2011 -0400

    updating tests

 nova/tests/api/openstack/test_server_metadata.py |   55 +++++++---------------
 1 file changed, 18 insertions(+), 37 deletions(-)

commit c5c3a5696d11320e7fe0bfbe942610e93fbd1ab4
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:30:15 2011 -0400

    updated serializer tests for multi choice

 nova/tests/api/openstack/test_versions.py |   71 ++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 22 deletions(-)

commit 8389d214a917f1c4f2d8ddb471f94c6087ec9ea9
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:13:48 2011 -0400

    pep8 cleanup

 nova/tests/api/openstack/test_versions.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 74e3218d2b6045457019c4de518ca4a869e37807
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:11:41 2011 -0400

    multi choice XML responses with tests

 nova/api/openstack/versions.py            |   15 +++--
 nova/tests/api/openstack/test_versions.py |   87 ++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 14 deletions(-)

commit 029c20cf43cb388b8b9be6bc5c80b1810e701b19
Merge: 20071a5 4a52d49
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jul 27 21:46:44 2011 +0900

    merged recent trunk

commit d19f53cfe958f63667ed429403bb50cbd97246dd
Merge: 848fd99 4a52d49
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jul 27 11:48:20 2011 +0100

    merge with trunk

commit e538f453109d7eda4e6871a6a58220936cdd25d3
Merge: cb631be 5c812bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 08:43:41 2011 +0000

    Cherry-pick of tr3buchet's fix for add_fixed_ip_to_instance.

commit 59b06aad6dd20188ae3bb4a0b66925732a3fc589
Merge: 8f5a6d1 4a52d49
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 27 12:28:23 2011 +0400

    Resolved conflicts with trunk

commit 30eea9c5f15775c96046091c874ee34bf366d566
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:50:49 2011 -0700

    fix typo in attach_volume

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 32e17ebeac99510dd155ce5560192ee6de9d83ab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:41:15 2011 -0700

    fix the last of them

 nova/tests/test_libvirt.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8c40dba0785dadf479e232c26023def4c5a38761
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:33:53 2011 -0700

    fake plug for vif driver

 nova/tests/test_libvirt.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit f1f191c381a43af1f8dc87246e7c4973cf50f78e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:22:50 2011 -0700

    couple more fixes

 nova/tests/test_libvirt.py |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

commit d64a54098bcecbb4c1001e99c1bf4c29b326265a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:13:03 2011 -0700

    cleanup network create

 nova/tests/test_libvirt.py |   95 +++++++++-----------------------------------
 1 file changed, 18 insertions(+), 77 deletions(-)

commit 6b33d0dfbfea7ee66a47947973133573070303cd
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 26 23:03:16 2011 -0700

    code was checking for key in sqlalchemy instance but if floating_ip is a non-sqlalchemy dict instance instead, value=None will cause NoneType exception.

 nova/api/openstack/contrib/floating_ips.py         |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 6a757bbbbda208a7e141e56e2334c5a501645adb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 22:55:58 2011 -0700

    fix more tests

 nova/tests/test_libvirt.py    |   11 +++++++----
 nova/virt/libvirt/netutils.py |   10 +++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

commit fc87e8acff4ef3b0e048f66c2cddfb6880f1fd60
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 01:01:43 2011 +0000

    fix the first round of missing data

 nova/tests/test_libvirt.py    |   26 ++++++--------------------
 nova/virt/libvirt/netutils.py |    1 +
 2 files changed, 7 insertions(+), 20 deletions(-)

commit 54de340991c6c2dbd50d6efa4054102eef6df3a0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 00:40:50 2011 +0000

    fix the skipped tests in vmwareapi xenapi and quota

 nova/tests/test_quota.py             |    3 +-
 nova/tests/test_vmwareapi.py         |  107 ++++++++++++++++------------------
 nova/tests/test_xenapi.py            |   56 +++++++++---------
 nova/tests/vmwareapi/db_fakes.py     |   10 ++--
 nova/tests/vmwareapi/stubs.py        |    7 +++
 nova/virt/vmwareapi/fake.py          |   10 ++++
 nova/virt/vmwareapi/network_utils.py |    1 +
 nova/virt/vmwareapi/vm_util.py       |    3 +-
 nova/virt/vmwareapi/vmops.py         |    7 ++-
 nova/virt/xenapi/vmops.py            |    2 +-
 10 files changed, 110 insertions(+), 96 deletions(-)

commit eaf8385dfc1bffff3d9a3af39f46deaec7cbb9c3
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Tue Jul 26 16:43:04 2011 -0700

    Add myself to authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 534b8c3c5b2f6eb3d4c3545c3d5dc2d15061cf6e
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Tue Jul 26 16:29:50 2011 -0700

    Implements a simplified messaging abstraction with the least amount of impact to the code base.

 nova/rpc.py                 |  598 ++-----------------------------------------
 nova/rpc_backends/amqp.py   |  591 ++++++++++++++++++++++++++++++++++++++++++
 nova/rpc_backends/common.py |   23 ++
 nova/service.py             |   28 +-
 nova/test.py                |   16 --
 nova/tests/test_adminapi.py |    2 +-
 nova/tests/test_cloud.py    |   68 +----
 nova/tests/test_rpc.py      |   61 +----
 nova/tests/test_rpc_amqp.py |   68 +++++
 nova/tests/test_service.py  |  170 ------------
 nova/tests/test_test.py     |   13 +-
 nova/utils.py               |   11 +
 12 files changed, 760 insertions(+), 889 deletions(-)

commit c95ee1625a6a88afdb77d305077d1ee7eeaae854
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jul 26 16:20:31 2011 -0700

    fix for lp816713: In instance creation, when nova-api is passed imageRefs generated by itself, strip the url down to an id so that default glance connection params are used

 nova/api/openstack/create_instance_helper.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 4f313565881608a19dd77be818e2c80c4e0e9c95
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 22:48:36 2011 +0000

    cloud tests all passing again

 nova/tests/test_cloud.py |   32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

commit 15068c4038d93db77278ea3306d992b424168c24
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 18:16:28 2011 -0400

    added multi_choice test just to hit another resource

 nova/tests/api/openstack/test_versions.py |   56 +++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

commit 6dbd7583f4f1ca4be59e163c4c568423a91cd29e
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 18:10:36 2011 -0400

    pep8 fixes

 nova/api/openstack/__init__.py            |    4 +--
 nova/api/openstack/versions.py            |   31 ++++++++---------
 nova/tests/api/openstack/test_versions.py |   52 ++++++++++++++---------------
 3 files changed, 41 insertions(+), 46 deletions(-)

commit e14754bbdbacaf6943c4061e3488f2580acd26ad
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 17:51:46 2011 -0400

    initial working 300 multiple choice stuff

 nova/api/openstack/__init__.py            |    2 +-
 nova/api/openstack/versions.py            |  191 ++++++++++++++++-------------
 nova/api/openstack/views/versions.py      |    8 ++
 nova/tests/api/openstack/test_versions.py |   59 ++++++++-
 4 files changed, 174 insertions(+), 86 deletions(-)

commit 5c812bbdc15e0cf974026fcfaacd54e7a9f144cc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 21:29:24 2011 +0000

    cherry-pick tr3buchet's fix for milestone branch

 nova/compute/manager.py |    2 +-
 nova/network/api.py     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9da71385e90a281483aac86a48e36a0e63bfe155
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 17:18:27 2011 -0400

    cleanup

 nova/tests/api/openstack/test_servers.py |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

commit 00171c3f50d333a1771efc048b064e1fd73614b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 14:10:26 2011 -0700

    pep8

 nova/db/sqlalchemy/models.py |    3 +--
 nova/tests/test_network.py   |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

commit 27f2f9d7efd72cc5275a82dfdb8f9f44ba7b71b3
Merge: 3841a55 4a52d49
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 14:08:29 2011 -0700

    Merge trunk

commit 84909f4a7733dde453afcc5cc540854ac1bc458c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 17:00:10 2011 -0400

    pep8

 nova/api/openstack/servers.py            |    9 +--------
 nova/tests/api/openstack/test_servers.py |    2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

commit b18754473785611112ae54523677da83dff24075
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jul 26 20:58:33 2011 +0000

    First pass at converting this stuff--pass context down into vmops.  Still need to fix unit tests and actually use auth_token from the context...

 nova/compute/manager.py      |    9 +++++----
 nova/virt/xenapi/vm_utils.py |   22 +++++++++++-----------
 nova/virt/xenapi/vmops.py    |   29 +++++++++++++++--------------
 3 files changed, 31 insertions(+), 29 deletions(-)

commit d4b2a2b3d552103414e4052773ac97939c66fa53
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 20:58:02 2011 +0000

    pep8 and simplify rule refresh logic

 nova/api/ec2/cloud.py |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

commit b97203f88c8e7926d32e8ddf664ba356869c9642
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 16:55:02 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 4dfc273aa946f6c901a78058def935774e51d989
Merge: c8b1a35 f8a182d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 16:53:58 2011 -0400

    merging parent branch lp:~rackspace-titan/nova/osapi-create-server

commit c8b1a357c9bd5fe4bc54e6472f9667123d91c02a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 16:53:00 2011 -0400

    adding xml deserialization for createImage action

 nova/api/openstack/create_instance_helper.py |   24 +++++++++
 nova/tests/api/openstack/test_images.py      |   73 --------------------------
 nova/tests/api/openstack/test_servers.py     |   43 ++++++++++++++-
 3 files changed, 66 insertions(+), 74 deletions(-)

commit 5bd11c44f791cfe4c371b33cd1b1253013a8f836
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 20:49:46 2011 +0000

    remove some logging, remove extra if

 nova/api/ec2/cloud.py  |    6 ++----
 nova/tests/test_api.py |    2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

commit 4a52d4984e9349115f37d34e47e4d1141a8cf6fc
Merge: b45fa22 79c06e6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jul 26 20:47:53 2011 +0000

    compute now appends self.host to the call to add an additional fixed ip to an instance

commit e4e9d7550c2eb29c5d8fed3af0b9112976d262de
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 20:44:29 2011 +0000

    Update security gropu rules to properly support new format and boto 2.0

 nova/api/ec2/cloud.py    |   53 +++++++++++++++++++++++++++++-----------------
 nova/tests/test_api.py   |    8 ++++++-
 nova/tests/test_cloud.py |   19 ++++++++++++++++-
 3 files changed, 59 insertions(+), 21 deletions(-)

commit 2e652f4cc72976ecc471a6c6f3b48afb3eb5a420
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 16:42:16 2011 -0400

    Updated test stubs to contain the correct data
    Updated created and updated in responses to use correct time format

 nova/api/openstack/views/servers.py      |   15 +++++++++++++--
 nova/tests/api/openstack/test_servers.py |   19 +++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

commit 336b2703ef90fcd7b422434434c9967880b97204
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Jul 26 13:28:23 2011 -0700

    pep8 compliance

 nova/tests/test_vsa_volumes.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a72f2e29e2a35791a1c53f4f606948572ab52280
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Jul 26 13:25:34 2011 -0700

    VSA volume creation/deletion changes

 nova/db/sqlalchemy/api.py      |    1 +
 nova/tests/test_vsa.py         |    5 +-
 nova/tests/test_vsa_volumes.py |  108 ++++++++++++++++++++++++++++++++++++++++
 nova/volume/api.py             |   12 ++++-
 4 files changed, 122 insertions(+), 4 deletions(-)

commit 241a926ed682cb6154ff8f37c4940e7b5885b6fe
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 16:13:09 2011 -0400

    moved v1.1 image creation from /images to /servers/<id>/action

 nova/api/openstack/images.py             |   37 +++++------
 nova/api/openstack/servers.py            |   93 ++++++++++++++++++++++++--
 nova/tests/api/openstack/test_images.py  |  107 ------------------------------
 nova/tests/api/openstack/test_servers.py |   66 ++++++++++++++++++
 4 files changed, 172 insertions(+), 131 deletions(-)

commit e239dc589982a0d90eb8a50967af05a10d5e4d5b
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 26 13:12:34 2011 -0700

    fixed per peer review

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79c06e6f9597a83ec172451eb2622927f5b9accd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jul 26 14:42:56 2011 -0500

    passing host from the compute manager for add_fixed_ip_to_instance()

 nova/compute/manager.py |    2 +-
 nova/network/api.py     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit f8a182d6196a9f1ba0065912e2b703ea61a1c260
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 14:09:49 2011 -0400

    adding assert to check for progress attribute

 nova/tests/api/openstack/test_servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 24e1f23dbaf9ffd3f42fe05c24b980a6a0f09499
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 14:06:02 2011 -0400

    removing extra function

 nova/api/openstack/servers.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 3841a5515807b42e2e74e3119f76cdb2ef0f5575
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 11:04:53 2011 -0700

    Remove debugging code.

 nova/compute/api.py |    4 ----
 1 file changed, 4 deletions(-)

commit e56d49721a22a1c337c6543c37bdd798a5c5230d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:55:07 2011 -0400

    cleanup

 nova/tests/api/openstack/test_servers.py |    5 -----
 nova/tests/integrated/test_servers.py    |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

commit 7cd146e7e658c51cc94664d8da8d2bc15b0141fc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 13:49:04 2011 -0400

    fixed minor issues

 nova/api/openstack/servers.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 94866fef798a6b72061720cb654442cd194b9f5f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:47:37 2011 -0400

    reverting tests to use imageRef, flavorRef

 nova/api/openstack/create_instance_helper.py |    7 ++---
 nova/tests/api/openstack/test_servers.py     |    5 +++-
 nova/tests/integrated/integrated_helpers.py  |    4 +--
 nova/tests/integrated/test_servers.py        |   40 +++++++-------------------
 4 files changed, 20 insertions(+), 36 deletions(-)

commit 3db1c53486fdb669ac2bab303335548d7a7c617d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:28:11 2011 -0400

    updating imageRef and flavorRef parsing

 nova/api/openstack/servers.py            |   42 ++++--------------------------
 nova/tests/api/openstack/test_servers.py |   29 +++++++--------------
 2 files changed, 15 insertions(+), 56 deletions(-)

commit b45fa225f9477f4bae11cd379288db459d4b3c02
Merge: b1e72bb d480303
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jul 26 17:23:21 2011 +0000

    Updates to the compute API and manager so that rebuild, reboot, snapshots, and password resets work with the most recent versions of novaclient.

commit d4803039c19a01087964c499c7e9ef9abfa82f74
Merge: 8501cc9 48a6bf4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:13:41 2011 -0400

    merging trunk; resolving conflicts

commit b1e72bbe231d29ddf62fb2942ab055b5c92f1a0a
Merge: 48a6bf4 9750341
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Tue Jul 26 17:10:31 2011 +0000

    Add OpenStack API support for block_device_mapping.
    
    This patch enables boot from volume feature already implemented in EC2
    API, as an OpenStack API extension.

commit 48a6bf42b3af5323d35f9a31bd4233712165b276
Merge: 8e087df 22d9e52
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Tue Jul 26 17:03:55 2011 +0000

    queries in the models.Instance context need to reference the table by name (fixed_ips) however queries in the models.FloatingIp context alias the tables out properly and return the data as fixed_ip (which is why you need to reference it by fixed_ip in that context).
    
    Ideally we should probably consider adding a fixed_ip alias to the models.Instance query context so that the api code is consistent, but for now this should resolve the outstanding issues.

commit 6fb2fe901bc4f4479e6a2bb087870927be7318a2
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 26 10:03:16 2011 -0700

    added warning when size of subnet(s) being created are larger than FLAG.network_size in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why.

 bin/nova-manage |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 1ad5f2eaf49904d8e14546d59699b1472a1a5bb2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 12:57:06 2011 -0400

    xml deserialization works now

 nova/api/openstack/create_instance_helper.py |   79 +++----------
 nova/api/openstack/wsgi.py                   |    9 +-
 nova/tests/api/openstack/test_servers.py     |  162 +++++++++++---------------
 3 files changed, 90 insertions(+), 160 deletions(-)

commit 05e7aedaa3124267450e2f74ca026680b15d6d27
Merge: 6107daa 8e087df
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 26 09:49:51 2011 -0700

    merged from trunk

commit 5ccd5afe1a854c82927b0dd1b2bf6cd795a23576
Merge: 422d532 8e087df
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 12:42:55 2011 -0400

    merged trunk

commit f900021b8a0e7df946fd6fabe34e560fe2c30356
Merge: 1dcc37a 8e087df
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 12:37:37 2011 -0400

    merging trunk

commit ab8c3d5e334b582a206ec2766f0adb409a013fe0
Merge: 4236f43 8e087df
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jul 26 16:21:50 2011 +0000

    pull-up from trunk

commit 58eef7695eb5539f75e358b2f55b50063551a44d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:44:19 2011 -0400

    got rid of print

 nova/tests/api/openstack/test_versions.py |    1 -
 1 file changed, 1 deletion(-)

commit 3b6208f44c079323efa290dfeb68a4afbdfb3349
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:43:57 2011 -0400

    got rid of more xml string comparisons

 nova/tests/api/openstack/test_versions.py |   90 +++++++++++++++++++----------
 1 file changed, 60 insertions(+), 30 deletions(-)

commit d3e557ae0d49ea8d4a1cd50abbada6e8c1c4a7fe
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:34:19 2011 -0400

    atom test updates

 nova/tests/api/openstack/test_versions.py |    1 +
 1 file changed, 1 insertion(+)

commit 26f980c955e357df3685bcccda005a3008f86afb
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:31:16 2011 -0400

    got rid of some prints

 nova/api/openstack/versions.py |    2 --
 1 file changed, 2 deletions(-)

commit bde063a98dad2ce75be1016b39a2c3f08759d4f6
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:30:58 2011 -0400

    got rid of string comparisons in serializer tests

 nova/api/openstack/versions.py            |    9 ++++
 nova/tests/api/openstack/test_versions.py |   67 ++++++++---------------------
 2 files changed, 26 insertions(+), 50 deletions(-)

commit d2ec9df5027befcfe1ffed19ed983906c2bc77a7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 11:26:33 2011 -0400

    removing objectstore and image_service flag checking

 nova/tests/test_xenapi.py    |   23 ----------
 nova/virt/xenapi/vm_utils.py |  104 ++++--------------------------------------
 2 files changed, 9 insertions(+), 118 deletions(-)

commit 8e087df9835f42efd54697faf150053a55c5ea30
Merge: 986da4b 8813445
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 15:18:11 2011 +0000

    Updates /servers requests to follow the v1.1 spec. Except for implementation of uuids replacing ids and access ips both of which are not yet implemented. Also, does not include serialized xml responses.

commit cdcc860cd5d513638c9d85b692f4b46b5e2832ef
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:18:08 2011 -0400

    fixed detail xml and json tests that got broken

 nova/tests/api/openstack/test_versions.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 696dc56b74a08d224beccdfd644536ec4217321d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:15:44 2011 -0400

    updated atom tests

 nova/api/openstack/versions.py            |   14 +++-
 nova/tests/api/openstack/test_versions.py |  111 ++++++++++++++---------------
 2 files changed, 65 insertions(+), 60 deletions(-)

commit 422d5329276f5c2252d7328d4112be7c696a274a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:57:39 2011 -0400

    Updated ServerXMLSerializer to utilize the IPXMLSerializer

 nova/api/openstack/servers.py |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

commit 881344568a076270e4932bc2ba8a5f6df12c27c3
Merge: ff5aa1a 986da4b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:47:39 2011 -0400

    merged trunk

commit c41423cdf3f1345e2be3c248f576d848253fd8a3
Merge: 7742ab5 986da4b
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:33:18 2011 -0400

    merge from trunk

commit ff5aa1a167459b922cc8195c1e6e1368a442610d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:29:50 2011 -0400

    fix pep8 issues

 nova/tests/api/openstack/test_servers.py |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit bdc31739b24fbcb07d05f413c2ba6554046a6b0e
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:25:34 2011 -0400

    fix issue with failing test

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fcf618f7c0ad27d59fa4c770c54d228b07227927
Merge: aad41d0 986da4b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:22:41 2011 -0400

    merged trunk

commit cb631be09c36d29ddb6e89a647c5161bc43c4aa7
Merge: 85522bb 5df221e
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 10:33:05 2011 +0000

    Merge diablo-3 development from trunk (rev1322)

commit 5df221e970d8b060423034fa627735c5c24fce5d
Merge: 85522bb 986da4b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Jul 26 11:46:25 2011 +0200

    Merge diablo-3 development from trunk (rev1322)

commit 986da4b2989bbd56db29117a0e8ad6a92643180c
Merge: b265135 01409c0
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jul 26 08:28:19 2011 +0000

    I'm sorry, for my fail with rebasing. Any way previous branch grew to many other futures, so I supersede it.
    1. Used optparse for parsing arg string
    2. Added decorator for describe method params
    3. Added option for assigning network to certain project.
    4. Added field to "network list" for showing which project owns network

commit b26513512b8bc1784f7394063485d536b60af6d6
Merge: 83033f6 1bb28f7
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Jul 26 07:48:46 2011 +0000

    Moved the VIF network connectivity logic('ensure_bridge' and 'ensure_vlan_bridge') from the network managers to the virt layer.  In addition, VIF driver class is added to allow customized VIF configurations for various types of VIFs and underlying network technologies.

commit 01409c0553eaa80c6f31ddc56e9a22054175fa0e
Merge: 88ee72f 83033f6
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jul 26 09:50:05 2011 +0400

    merge with trunk, resolve conflicts

commit 88ee72fbb50b5f7ead636ef65933489b0e099c2b
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jul 26 09:37:48 2011 +0400

    fix pep8

 bin/nova-manage |  192 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 128 insertions(+), 64 deletions(-)

commit af9eab72fb89350d23a5dcd5f64f0ddc0a2a6154
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Jul 26 04:53:45 2011 +0000

    Launchpad automatic translations update.

 po/pt_BR.po |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

commit ac1e571c6e767d5f6f1dc01b3d0b38333b3c3eb2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 23:03:01 2011 -0400

    removing rogue print

 nova/virt/xenapi/vm_utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 91eff4fd95ce28650800839aa50368a3c9280e72
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 22:55:37 2011 -0400

    removing xenapi_image_service flag

 nova/tests/test_xenapi.py    |   35 ++++++++++++++++++-----------------
 nova/virt/xenapi/vm_utils.py |   14 ++++++++------
 nova/virt/xenapi_conn.py     |    3 ---
 3 files changed, 26 insertions(+), 26 deletions(-)

commit 1bb28f728e4f9345cc482dccadd7a679b9bc1667
Author: Adam Johnson <adjohn@gmail.com>
Date:   Tue Jul 26 09:49:36 2011 +0900

    adding to authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit a9b10f32aeb9794e1c7ea80e1794d71876997cb1
Merge: 4c9ca09 83033f6
Author: Adam Johnson <adjohn@gmail.com>
Date:   Tue Jul 26 09:41:55 2011 +0900

    fixing merge conflict

commit 7742ab5e39c9b2147917d31c48aec1eae887357e
Merge: eba0945 83033f6
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 20:36:17 2011 -0400

    merge from trunk

commit eba09454a21ce49afa821ec63ed801883354ff7e
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 20:34:41 2011 -0400

    initial stuff to get away from string comparisons for XML, and use ElementTree

 nova/api/openstack/versions.py            |    7 ++
 nova/tests/api/openstack/test_versions.py |  109 ++++++++++++++++++++++-------
 2 files changed, 90 insertions(+), 26 deletions(-)

commit 410b1c054b692c99650792cbd6d4f69b502452ce
Merge: a0a3f01 83033f6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 17:17:17 2011 -0700

    merged with 1320

commit a0a3f0157d6f4e8563a5a1e4ee1bde92388f25fc
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 16:58:09 2011 -0700

    volume name change. some cleanup

 nova/db/sqlalchemy/models.py |   20 --------------------
 nova/flags.py                |    1 -
 nova/vsa/api.py              |   12 ++++++++----
 3 files changed, 8 insertions(+), 25 deletions(-)

commit 83033f69e19832dc50fccf5b833189f0c4e8de63
Merge: 650e1e7 175e42f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 23:43:22 2011 +0000

    - Updates /images/<id>/meta and /images/<id>/meta/<key> to respect the latest specification
    - Renames ../meta to ../metadata
    - Adds PUT on ../metadata to set entire container (controller action is called update_all)

commit 650e1e78ed01e93ae1f89ee0f3eb81d6223caf03
Merge: de7a1a5 b32b557
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 23:38:07 2011 +0000

    Adds proper xml serialization for /servers/<id>/ips and /servers/<id>/ips/<network_name>

commit c500eac4589e9cb22e5e71b900164a151290ec03
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 16:26:23 2011 -0700

    some cleanup. VSA flag status changes. returned some files

 bin/nova-vsa                                       |    8 ++-----
 nova/CA/projects/.gitignore                        |    1 +
 nova/CA/reqs/.gitignore                            |    1 +
 nova/api/ec2/cloud.py                              |    1 -
 nova/api/openstack/contrib/drive_types.py          |    2 +-
 .../openstack/contrib/virtual_storage_arrays.py    |   19 ++++++++++-------
 .../migrate_repo/versions/036_add_vsa_data.py      |    1 +
 nova/flags.py                                      |   14 -------------
 nova/scheduler/vsa.py                              |    6 ++++--
 nova/tests/api/openstack/contrib/test_vsa.py       |    4 +++-
 nova/tests/test_drive_types.py                     |    1 +
 nova/volume/driver.py                              |   21 +++----------------
 nova/vsa/__init__.py                               |    1 +
 nova/vsa/api.py                                    |   22 ++++++++++++++------
 nova/vsa/connection.py                             |    1 +
 nova/vsa/drive_types.py                            |    1 +
 nova/vsa/fake.py                                   |    1 +
 nova/vsa/manager.py                                |   12 +++++------
 18 files changed, 54 insertions(+), 63 deletions(-)

commit 4236f438a81e361beb1b05edd87154b4d5e1ce85
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jul 25 22:38:59 2011 +0000

    Pass on auth_token

 nova/context.py                 |    4 +++-
 nova/image/glance.py            |   11 +++++++++++
 nova/tests/glance/stubs.py      |    5 ++++-
 nova/tests/image/test_glance.py |    3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

commit 8f5a6d15e671c95c6e38147ca15fb49fd672e788
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 02:33:39 2011 +0400

    Warn user instead of ignoring

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4842ac958bda3b446d14c7348692acc231e0041
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 02:30:20 2011 +0400

    Added ensuring filter rules for all VMs.

 nova/compute/manager.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 7be2b2482fde20be8802cfe6a200590933a73d7e
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 18:28:43 2011 -0400

    atom and xml_detail working, with tests

 nova/api/openstack/versions.py            |   49 +++++--
 nova/tests/api/openstack/test_versions.py |  200 ++++++++++++++++++++---------
 2 files changed, 183 insertions(+), 66 deletions(-)

commit de7a1a5b56e20fd21a6f5a957a3f5714240d2c41
Merge: bc012e8 85ba562
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jul 25 21:52:53 2011 +0000

    Adds the -c|--coverage flag to run_tests.sh to generate a local code coverage report.

commit 879e49c67b78d3336a24cf1af12f21258c2225fa
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 01:46:40 2011 +0400

    Estetic fix.

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bc012e84e3b3706bbdf56b968936d2dfaf377a46
Merge: c8f9100 a2b07be
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Mon Jul 25 21:41:05 2011 +0000

    Fix boot from volume failure for network block devices.
    
    This patch looks up the device_path and swithes between 'block' and 'network' when creating libvirt.xml.

commit c8f91001eb357b75b82a7db537f9679d5b94f9bc
Merge: e2d3526 b878a6e
Author: Arvind Somya asomya@cisco.com <>
Date:   Mon Jul 25 21:29:58 2011 +0000

    Bug #796813: vmwareapi does not support distributed vswitch
    
    The extant API assumed a standard switch network for all cases of ESX(i), was not usable when the hypervisor was added to a distributed portgroup on a virtual switch. The VM's would create a new standard switch with the same name as the dv portgroup.
    
    Bug #796834: ESX(i) : Incorrect machine id parameters in vmx for guest_tool.py
    
    -The machine.id string was missing required information for the guest_tool.py script to set networking in the guest VMs.
    -Additionally the script crashed on Python > 2.4 due to the implicit gettext translator(_()) used.
    -Added support for Ubuntu guest operating systems.

commit e2d35269e7628cc0eedddaa3ac9b48a6bd95cdac
Merge: b2920f1 ab42384
Author: John Tran <jhtran@att.com>
Date:   Mon Jul 25 21:24:42 2011 +0000

     modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data

commit b2920f182803535e5f09eca5e9698d15c6dc3ecc
Merge: eba9e4a bdd70a8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 21:19:39 2011 +0000

    Fixes faults to use xml serializers based on api version. This fixed bug 814228

commit eba9e4abd6271e0265899a2d260b54068d78ee51
Merge: 335476d 67ccc98
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Mon Jul 25 21:14:08 2011 +0000

    Fixes a typo in rescue instance in ec2 api. This is mnaser's fix, I just added a test to verify the change.

commit 335476d1835a511d824a165301adace01766bf3b
Merge: 6107daa 2e142a0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 21:07:56 2011 +0000

    Fixes bug 797250 where a create server request with the body '{"name":"server1"}' results in a HTTP 500 instead of HTTP 422.

commit b32b5571807c36f30d5541d0e284fd0e66023626
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 17:00:19 2011 -0400

    adding xml serialization for /servers/<id>/ips and /servers/<id>/ips/<network>

 nova/api/openstack/ips.py                |   56 +++++++++++++++++++++++-----
 nova/tests/api/openstack/test_servers.py |   59 +++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 11 deletions(-)

commit 67ccc98d6a0d9e8618889fd9fa398a39735d044a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 25 20:33:20 2011 +0000

    add a simple broken test to verify the bug

 nova/tests/test_cloud.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit ba4946d0d3c73e5d9f67f42203d103bf98563458
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 00:31:42 2011 +0400

    Fixed old libvirt semantics, added resume_guests_state_on_host_boot flag.

 nova/compute/manager.py |    9 ++++-----
 nova/flags.py           |    2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 71a103822b41df3d90a1e958baffda55a9cb8730
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 16:25:19 2011 -0400

    xml version detail working with tests

 nova/api/openstack/versions.py            |   30 +++++-
 nova/tests/api/openstack/test_versions.py |  165 +++++++++++++++++++++--------
 2 files changed, 147 insertions(+), 48 deletions(-)

commit 175e42fe2310a3aff69527d5623d92f3d0b19258
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 15:56:23 2011 -0400

    adding testing to solidify handling of None in wsgi serialization

 nova/api/openstack/wsgi.py            |    2 +-
 nova/tests/api/openstack/test_wsgi.py |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

commit 2e142a02014940ebb1e775c26b60c576ad1e2bb3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 15:36:28 2011 -0400

    Added check to make sure there is a server entity in the create server request

 nova/api/openstack/create_instance_helper.py |   23 +++++++++++++----------
 nova/tests/api/openstack/test_servers.py     |   12 ++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

commit 6107daaff643fa65a493733bfa102f9c238d14b1
Merge: f3db3c1 a305222
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 19:32:41 2011 +0000

    Fixed some typos in log lines.

commit 810d4b89cbbfa9388fb61f9069ea0104a7d77752
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 15:28:06 2011 -0400

    removed prints, got versions detail tests passing, still need to do xml/atom

 nova/api/openstack/__init__.py            |    2 +-
 nova/api/openstack/versions.py            |   96 ++++++++--
 nova/tests/api/openstack/test_versions.py |  295 ++++++++++++++++++++---------
 3 files changed, 292 insertions(+), 101 deletions(-)

commit 28cc235edebf1986102cb51bebaacfa0c0bad984
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 15:08:26 2011 -0400

    reverting some wsgi-related changes

 nova/api/openstack/wsgi.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 00a17d33e206f3b2e7dd5f913f43641da3b8aa02
Merge: 9356ab2 f3db3c1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 14:53:42 2011 -0400

    merged trunk

commit bdd70a8c5e0aea3c1722817809c34cc78fee3ab9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 14:24:59 2011 -0400

    removed print lines

 nova/api/openstack/common.py |    3 ---
 1 file changed, 3 deletions(-)

commit f3db3c1178cb918194b65a96eea01eeb289ad3e3
Merge: f87514d 2df7470
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 25 18:14:18 2011 +0000

    This fixes the xml serialization of the /extensions and /extensions/foo resources. Add an ExtensionsXMLSerializer class and corresponding unit tests.

commit 99bc14f16bce9f125715fbe436b7fc0969b62420
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 14:10:08 2011 -0400

    added 1.0 detail test, added VersionRequestDeserializer to support Versions actions properly, started 300/multiple choice work

 nova/api/openstack/__init__.py            |    6 ++
 nova/api/openstack/versions.py            |   92 ++++++++++++++++++++++++++++-
 nova/tests/api/openstack/test_versions.py |   51 +++++++++++++++-
 3 files changed, 145 insertions(+), 4 deletions(-)

commit 8de3c0fcaee546fae3d415ef5ddcbb51fb1db6d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 25 17:49:09 2011 +0000

    fix for reviews

 nova/api/openstack/create_instance_helper.py |    2 ++
 nova/compute/api.py                          |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

commit e24988c3b154d188ac69030d0b1d2811fb91d2e7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 13:28:22 2011 -0400

    Fixed bad test
    Fixed using wrong variable

 nova/api/openstack/faults.py            |    2 +-
 nova/tests/api/openstack/test_images.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 4c9ca0962e98c33b54d289c5ac1cd0dc79d36b51
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Jul 26 01:52:12 2011 +0900

    Moved the exception handling of unplugging VIF from virt driver to VIF driver.  Added better comments.  Added OpenStack copyrights to libivrt vifs.py

 nova/network/manager.py         |    6 ++----
 nova/virt/libvirt/connection.py |    9 ++-------
 nova/virt/libvirt/vif.py        |   20 ++++++++++++++------
 nova/virt/xenapi/vmops.py       |    9 ++-------
 4 files changed, 20 insertions(+), 24 deletions(-)

commit 2df7470b89289c1a2cae4db8c21b5588622baf3c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 25 12:43:10 2011 -0400

    pep8 + spelling fixes

 nova/tests/api/openstack/test_extensions.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 22d9e52eaebb6c6c870c4eaf73da5fd42dadefa9
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Jul 25 10:10:27 2011 -0600

    Floating IP DB tests

 nova/tests/test_db_api.py |   86 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

commit a158166a1148a1ea35a04fb25b10361d86f36138
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 12:08:49 2011 -0400

    Updated Faults controller to choose an xml serializer based on api version found in the request url

 nova/api/openstack/common.py            |   28 ++++++++
 nova/api/openstack/faults.py            |   17 +++--
 nova/tests/api/openstack/test_common.py |   18 ++++++
 nova/tests/api/openstack/test_faults.py |  107 +++++++++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 4 deletions(-)

commit f87514d18b32480fd9c0d4bd215f317efc7cd8ce
Merge: 1a18ea6 02bdfd4
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 25 16:04:18 2011 +0000

    Merge translations

commit 8501cc95aa60a0a5759cf911e8adaf624fa9e547
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 12:02:26 2011 -0400

    removing unnecessary assignments

 nova/api/openstack/servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 9c88bbee56dd05703af8f7c0df839a4da73f491a
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 19:59:00 2011 +0400

    Hotfix.

 nova/compute/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit d85a43c4cdb1bfd28355ded486af2ded8f43d6b0
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 19:54:23 2011 +0400

    Some estetic refactoring.

 nova/compute/manager.py |   48 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

commit b878a6e7a3143e90b8d3d665dbec78a21ca63166
Author: Arvind Somya asomya@cisco.com <>
Date:   Mon Jul 25 11:20:23 2011 -0400

    Fixing PEP8 compliance issues.

 nova/virt/vmwareapi/vm_util.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit a30522281fdc94c81b6099173b9e12d41eca66fa
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 10:08:19 2011 -0400

    adding --fixes

commit 22c1d1c0e146a7e7987c01a9bbf343b2ae9f9db6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 10:07:32 2011 -0400

    fixing typos

 nova/compute/api.py     |    6 +++---
 nova/network/manager.py |    2 +-
 nova/volume/api.py      |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

commit 31b9bb98b067d45b7fcdf11fc5791b4b1379280b
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 17:38:42 2011 +0400

    add decorator for 'dns' params

 bin/nova-manage |    2 ++
 1 file changed, 2 insertions(+)

commit 48b0d1aa5bf6f5634b288c41bc872465a890ef30
Merge: 9088c9b 1a18ea6
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 17:35:26 2011 +0400

    merge with trunk, resolve conflicts

commit cf4aea379eb337b16a9816d45c50c0553c500d0d
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 15:03:02 2011 +0400

    pep8

 nova/compute/manager.py |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit 19379c78e6efd4637d876c91b022e6e7dbd38836
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:37:21 2011 +0400

    Fixed logging.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8f4d773b08a94b171ff2643d48daa5b2709118a
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:33:45 2011 +0400

    Fixed id.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 708b0cb65a672e9f6b8bab4817061be4fa2a8928
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:22:38 2011 +0400

    Fixed init_host context name.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 02bdfd4616683af0d28a0bbcb4b3ff679d1b5ad1
Merge: 1a18ea6 0baa4b1
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 25 10:13:21 2011 +0200

    Merge current translations

commit 4937c2f2c757776eacba20a6446c059c4938d6b8
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 11:06:06 2011 +0400

    Removed driver-specific autostart code.

 nova/virt/libvirt/connection.py |    5 -----
 1 file changed, 5 deletions(-)

commit 9088c9b51a0884b3ce1689dcebc28e985000d267
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 09:42:58 2011 +0400

    fix 'version' command

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1aea5e1efa50f9b259a934fabd409fe39026f876
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:53:21 2011 -0700

    Add bug reference

commit a88f7ab3b7469af70c74ed5962abf867e62d768f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:35:38 2011 -0700

    Use admin context when fetching instances.

 nova/network/manager.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 6ddc49298f87fc20c6daff994495d745dc82b6e3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:33:57 2011 -0700

    Use subscript rather than attribute.

 nova/virt/libvirt/firewall.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit a943c01dd56169270e1986ce62ae99f16ee4abe3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:30:59 2011 -0700

    Make IP allocation test work again.

 nova/tests/test_network.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 5961aa33f01db7503beeab4fabafb8e0d9ef6a3e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:29:43 2011 -0700

    Adjust and re-enable relevant unit tests.

 nova/tests/test_libvirt.py |   50 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

commit a719befe3e28994c02aab70e4b0e1871b318d971
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Jul 24 00:24:31 2011 -0700

    some file attrib changes

 0 files changed

commit fb755ae05b0b6a7b3701614c8d702e8a24ff380c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Jul 24 00:07:00 2011 -0700

    some cosmetic changes. Prior to merge proposal

 nova/tests/test_vsa.py |  185 ++++++++++++++++++++++++++++++++++++++++++++++++
 nova/vsa/api.py        |   44 +++++++-----
 2 files changed, 212 insertions(+), 17 deletions(-)

commit a7fdcb0f7dacfe41b5c85faee38c027b31ddaf81
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat Jul 23 16:13:48 2011 -0400

    Added test_serialize_extenstions to test ExtensionsXMLSerializer.index().

 nova/tests/api/openstack/test_extensions.py |  115 +++++++++++++++++++--------
 1 file changed, 83 insertions(+), 32 deletions(-)

commit 916231fd945c5e726a21decdf1b6370b2fcefe70
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: unit tests for describe instance attribute

 nova/tests/test_cloud.py |  144 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

commit 142a95a223a4259bcb3b35087b6d24f8310e3fa6
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: an unit test for nova.compute.api.API._ephemeral_size()

 nova/tests/test_compute.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 5113f78ddb8d7ccecea4e4ec8cbf35765af46d40
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: unit tests for nova.virt.libvirt.connection._volume_in_mapping()

 nova/tests/test_libvirt.py |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit ba6404f05d9fb34a729d45e1ee055c7a7156c5c4
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests/glance: unit tests for glance serializer

 nova/tests/image/test_glance.py |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 3af916ba0d87d383a89250b3aac4cf5e5b728f69
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: unit tests for nova.virt

 nova/tests/test_virt.py |   83 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

commit 4960b77202aba106adb8780ea724b26d958d5c81
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    tests: unit tests for nova.block_device

 nova/tests/test_block_device.py |   87 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

commit 24b6597035c4393383ed1bdc2a6e52830743a7ea
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    db/api: fix network_get_by_cidr()
    
    User of the function is only 'nova-manage network delete'.
    It doesn't check deleted flag which must be checked.
    Otherwise some it might pick up deleted column depending on query result,
    and tries to delete already deleted columns and results in exception.

 nova/db/sqlalchemy/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 405df88f00ce71621d3fda3ec52e5cf1217c8e05
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    image/glance: teach glance block device mapping

 nova/image/glance.py |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

commit 4c1fd45270faef4b42504bb5e2b8bd3e49b14d8c
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    tests/test_cloud:test_modify_image: make it pass

 nova/tests/test_cloud.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 77c34f0223a21d122062b2057e9ed1584dbbf8bf
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    nova/tests/test_compute.py: make test_compute.test_update_block_device_mapping happy

 nova/tests/test_compute.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 51c0c36bc5357102d0fa564a73631f1420e253b1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    test_metadata: make test_metadata pass

 nova/tests/test_metadata.py |    1 +
 1 file changed, 1 insertion(+)

commit 47e7a21d74ebd06d994ad41088adb92d615aab0c
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    test_compute: make test_compute pass

 nova/tests/test_compute.py |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

commit af21767505b668c882734552115decdf8a798581
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:03 2011 +0900

    test_libvirt: fix up for local_gb

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit 2c1b9ac98673c0ef1ae931c6b9d84e4b0741eed9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:03 2011 +0900

    virt/libvirt: teach libvirt driver swap/ephemeral device
    
    This patch teaches libvirt virt driver swap/ephemeral device.

 nova/virt/driver.py             |    4 ++
 nova/virt/libvirt.xml.template  |   22 +++++--
 nova/virt/libvirt/connection.py |  127 +++++++++++++++++++++++++++++++--------
 3 files changed, 122 insertions(+), 31 deletions(-)

commit 3c8cc5b06f477b88d20a748a924d6afac5c5260f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:01 2011 +0900

    virt/libvirt: teach libvirt driver root device name
    
    This patch teaches libvirt driver root device name.

 nova/virt/libvirt.xml.template  |   11 +++++++----
 nova/virt/libvirt/connection.py |   18 ++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

commit e05b3b11e67f18a6ff4867dfbc75554fd78cad1b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    compute/api: pass down ephemeral device info

 nova/compute/api.py |   70 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 16 deletions(-)

commit e0517aef19bb00aa88809cb3c7d650ea38a08be2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    compute/manager, virt: pass down root device name/swap/ephemeral to virt driver
    
    This patch makes compute/manager pass down infos about root device name,
    swap and ephemerals to virt driver.

 nova/compute/manager.py         |   33 +++++++++++++++++++++++++--------
 nova/virt/driver.py             |   25 ++++++++++++++++++++++++-
 nova/virt/fake.py               |    2 +-
 nova/virt/hyperv.py             |    2 +-
 nova/virt/libvirt/connection.py |   25 ++++++++++++++-----------
 nova/virt/xenapi_conn.py        |    2 +-
 6 files changed, 66 insertions(+), 23 deletions(-)

commit a840e368235938a2fda96ab1694196e551ad22cc
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    ec2/get_metadata: teach block device mapping to get_metadata()
    
    This patch teachs bout block device mapping to get_metadata()

 nova/api/ec2/cloud.py |   36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

commit 92ac32e148d31a957be6e8f3e90724216e10106a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    api/ec2: implement describe_instance_attribute()
    
    This patch implements DescribeInstanceAttribute.

 nova/api/ec2/cloud.py |  131 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 117 insertions(+), 14 deletions(-)

commit 9be2793c2e057a5e4f8c8c4dd2131ddcc3b11608
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    db/api: block_device_mapping_update_or_create()
    
    It is possible to have same virtual device name. So eliminate old entries
    whose entry has same virtual device name.

 nova/db/sqlalchemy/api.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit ba6b6a20eeedb0311e06090d2f60d36964d67cf4
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    block_device: introduce helper function to check swap or ephemeral device
    
    and move generic function, mappings_prepend_dev() from ec2utils to
    block_device

 nova/api/ec2/cloud.py    |    8 +++-----
 nova/api/ec2/ec2utils.py |   10 ----------
 nova/block_device.py     |   36 ++++++++++++++++++++++++++++++++++++
 nova/tests/test_api.py   |    2 +-
 4 files changed, 40 insertions(+), 16 deletions(-)

commit 1f55e116adbf00a0a5bd990f99a680e9d6b1618e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    ec2utils: factor generic helper function into generic place
    
    This patch moves out a helper function, properties_root_device_name(),
    into generic file nova/block_device.py.

 nova/api/ec2/cloud.py    |    5 +++--
 nova/api/ec2/ec2utils.py |   19 -------------------
 nova/block_device.py     |   35 +++++++++++++++++++++++++++++++++++
 nova/compute/api.py      |    3 ++-
 nova/tests/test_api.py   |    7 +++++--
 5 files changed, 45 insertions(+), 24 deletions(-)

commit 0baa4b107f9539777a1a08526b3edd454cffbda5
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Jul 23 05:12:38 2011 +0000

    Launchpad automatic translations update.

 po/ast.po   |    4 +-
 po/cs.po    |    4 +-
 po/da.po    |    4 +-
 po/de.po    |   49 +-
 po/en_AU.po | 2848 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/en_GB.po | 2873 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/es.po    |  139 +--
 po/fr.po    | 2992 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po    |    4 +-
 po/ja.po    |  482 +++++-----
 po/pt_BR.po |    4 +-
 po/ru.po    |   22 +-
 po/tl.po    | 2855 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/uk.po    |    4 +-
 po/zh_CN.po |   27 +-
 po/zh_TW.po | 2848 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 16 files changed, 14824 insertions(+), 335 deletions(-)

commit d963e25906b75a48c75b6e589deb2a53f75d6ee3
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Jul 22 20:29:37 2011 -0700

    Config-Drive happiness, minus smoketest

 Authors                                            |    1 +
 nova/api/openstack/create_instance_helper.py       |    7 +-
 nova/api/openstack/views/servers.py                |    4 +
 nova/compute/api.py                                |   21 ++-
 .../versions/035_add_config_drive_to_instances.py  |   43 +++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/scheduler/simple.py                           |    1 +
 nova/tests/api/openstack/test_servers.py           |  135 +++++++++++++++++++-
 nova/tests/test_compute.py                         |   14 ++
 nova/virt/libvirt.xml.template                     |    7 +
 nova/virt/libvirt/connection.py                    |   51 ++++++--
 run_tests.sh                                       |    2 +-
 12 files changed, 265 insertions(+), 22 deletions(-)

commit 10006a77176f5ffc6e9acd94fe44e6e6695a6716
Merge: 61781da 1a18ea6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 20:26:56 2011 -0700

    merged with latest nova-1308

commit 61781dae931ced36db0f2735da474d0bd38a53cf
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 20:25:32 2011 -0700

    more unittest changes

 .../openstack/contrib/virtual_storage_arrays.py    |    4 +
 nova/tests/api/openstack/contrib/test_vsa.py       |  238 ++++++++++++++++++--
 nova/virt/libvirt/netutils.py                      |    1 -
 3 files changed, 224 insertions(+), 19 deletions(-)

commit 1a18ea6d738b513e03e3f0eddfb9f01dff9addca
Merge: 5c12e11 0206da2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jul 23 02:32:45 2011 +0000

    Last patch broke libvirt mapping of network info. This fixes it.

commit 5c12e11b83de9deeb6dd6fb3edcd36349b248e48
Merge: c3a0c91 fc00b24
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jul 23 01:52:43 2011 +0000

    Fixes an issue with out of order operations in setup_network for vlan mode in new ha-net code.

commit a4f1ac011cdb086bf77ba3d2e14b9a34001cc8a7
Merge: 2b91816 c3a0c91
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 17:12:14 2011 -0700

    Merged with 1306 + fix for dns change

commit 0206da24a6d9175b9dd50000fb9d8435355696bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jul 23 00:00:04 2011 +0000

    update netutils in libvirt to match the 2 dns setup

 nova/virt/libvirt/netutils.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 08d60702f9995f9e756a16c733f6a26b9d0f5019
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jul 22 16:56:00 2011 -0700

    merge

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b9181632786bdbb92911b4a6e7180cb06c8f9d8
Merge: 0750370 15e7084
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 16:05:14 2011 -0700

    merge with 1305

commit fc00b24ddd4d2eceb68199b059fb895604ce361d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:39:08 2011 +0000

    make sure dhcp_server is available in vlan mode

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c3a0c914b17d3ad677208808162065b1688ec9ac
Merge: 15e7084 5593006
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 22:37:51 2011 +0000

    Adds ability to set DNS entries on network create. Also allows 2 dns servers per network to be specified.

commit 0750370553c3ce40fdd5e88d9616ddb0fbeedbc1
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 15:22:05 2011 -0700

    pep8-compliant. Prior to merge with 1305

 nova/volume/manager.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 9e74803d5eb8a70ba829ac0569f1cd6cd372a6f2
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 15:14:29 2011 -0700

    Reverted volume driver part

 bin/nova-vsa                                       |   49 ++++
 nova/api/ec2/cloud.py                              |   19 +-
 nova/api/openstack/contrib/drive_types.py          |   55 ++--
 .../openstack/contrib/virtual_storage_arrays.py    |   77 +++--
 nova/db/api.py                                     |   10 +-
 nova/db/sqlalchemy/api.py                          |   19 +-
 nova/scheduler/vsa.py                              |    5 +-
 .../api/openstack/contrib/test_drive_types.py      |  192 ++++++++++++
 nova/tests/api/openstack/contrib/test_vsa.py       |  239 +++++++++++++++
 nova/tests/test_drive_types.py                     |  146 ++++++++++
 nova/volume/driver.py                              |  220 ++++++++++++++
 nova/volume/manager.py                             |   81 ++---
 nova/volume/san.py                                 |  308 --------------------
 nova/vsa/api.py                                    |    2 +-
 nova/vsa/drive_types.py                            |   27 +-
 15 files changed, 987 insertions(+), 462 deletions(-)

commit 4e4bbda2a15df9f2366488d092bc466655a170b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:12:22 2011 +0000

    pep cleanup

 nova/context.py                          |    3 ++-
 nova/tests/api/openstack/test_servers.py |    3 ++-
 nova/tests/api/openstack/test_zones.py   |    3 ++-
 nova/tests/test_api.py                   |    1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

commit 164afd51017721b9cbaf2880b9dada3d4cd9b42c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:04:52 2011 +0000

    remove auth manager from instance helper

 nova/api/openstack/create_instance_helper.py |    5 +++--
 nova/auth/manager.py                         |    4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

commit 5593006970e56c7f53ce946cf234af7c8bd07690
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 17:02:31 2011 -0500

    docstring update

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e92595896531d56ce38169468a740b98624cb714
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 17:01:35 2011 -0500

    pass in the right argument

 nova/tests/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b9af8a63abb21aac1ef9ef8dcb801b7a3686ce8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:52:11 2011 +0000

    pull out auth manager from db

 nova/db/sqlalchemy/models.py |   16 ----------------
 1 file changed, 16 deletions(-)

commit 25fe6eec8d91115151ffbe750107684736a188ca
Merge: e54f0cb 15e7084
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 16:48:04 2011 -0500

    merge trunk

commit e54f0cb05a3e10ad4234c672e2096da2a3eaa2da
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 16:47:37 2011 -0500

    default to None in the method signature

 bin/nova-manage                                    |   12 ++++++------
 .../migrate_repo/versions/035_secondary_dns.py     |    2 ++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/network/manager.py                            |   10 +++++-----
 nova/tests/test_network.py                         |    4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

commit aced02086b97880b6caf7ad812ea842ffbab1cc0
Merge: 634a195 35deb55
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:46:55 2011 +0000

    merged trunk

commit 634a195da129fb043184ac1589efd0bdac5df256
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:40:10 2011 +0000

    remove some more stubouts and fakes

 nova/tests/api/openstack/test_accounts.py |   10 +---------
 nova/tests/api/openstack/test_auth.py     |    4 ----
 nova/tests/api/openstack/test_users.py    |    9 +--------
 3 files changed, 2 insertions(+), 21 deletions(-)

commit ccb5119280d341a2ea1b3e8352acbf32b7f243af
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:36:41 2011 +0000

    clean up fake auth manager in other places

 nova/api/ec2/__init__.py                           |    2 --
 nova/auth/manager.py                               |    3 +-
 .../api/openstack/contrib/test_floating_ips.py     |    5 ---
 .../api/openstack/contrib/test_multinic_xs.py      |    8 -----
 nova/tests/api/openstack/test_adminapi.py          |   17 ++-------
 nova/tests/api/openstack/test_flavors.py           |    5 ---
 nova/tests/api/openstack/test_image_metadata.py    |   14 +-------
 nova/tests/api/openstack/test_server_metadata.py   |   14 ++------
 nova/tests/api/openstack/test_servers.py           |   38 ++++++--------------
 nova/tests/api/openstack/test_shared_ip_groups.py  |   13 -------
 nova/tests/api/openstack/test_zones.py             |   24 +++----------
 nova/tests/test_objectstore.py                     |    3 +-
 12 files changed, 21 insertions(+), 125 deletions(-)

commit 15e7084b7a8378da215d43659f310195f841ef01
Merge: 35deb55 14ca0fd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jul 22 21:32:13 2011 +0000

    same as: https://code.launchpad.net/~tr3buchet/nova/lp812489/+merge/68448
    fixes: https://bugs.launchpad.net/nova/+bug/812489
    but in a slightly different context
    
    some of the changes got lost with the merging of ha-net, some no longer apply.
    
    This bug pops up now when starting an instance when no networks exist when using the flat or flatDHCP managers.

commit bc800b16cf304811802d1e441823cffff610fc6f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 22 17:04:26 2011 -0400

    pep8

 nova/api/openstack/__init__.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit faf71d498e9e98e60e65be94c7e306fc7b4e4f98
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 22 16:54:25 2011 -0400

    updating images metadata resource

 nova/api/openstack/__init__.py                  |   11 +-
 nova/api/openstack/create_instance_helper.py    |   45 +-----
 nova/api/openstack/image_metadata.py            |   53 ++++++-
 nova/api/openstack/wsgi.py                      |   52 +++++--
 nova/tests/api/openstack/test_image_metadata.py |  184 ++++++++++++++++++-----
 5 files changed, 251 insertions(+), 94 deletions(-)

commit 00fcb54769fdbe8828d7bd52a6636ffc5ad6c862
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 22 22:49:16 2011 +0200

    ...and this is me snapping back into reality removing all trace of ipsets. Go me.

 nova/network/linux_net.py           |   30 ---------------------------
 nova/tests/test_iptables_network.py |   39 ++---------------------------------
 nova/virt/libvirt/firewall.py       |   30 +++++++++------------------
 3 files changed, 12 insertions(+), 87 deletions(-)

commit 14ca0fd2db37699191432405585211c257a7433e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jul 22 15:47:33 2011 -0500

    fixed networks not defined error when creating instances when no networks exist

 nova/network/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e8defa6bdd5af85486d0d3acce8956670ca16882
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 20:41:46 2011 +0000

    fix test_access

 nova/api/ec2/__init__.py  |    7 ++++++-
 nova/auth/manager.py      |    9 +++++++++
 nova/tests/test_access.py |   19 +++++++++----------
 3 files changed, 24 insertions(+), 11 deletions(-)

commit c3cdcc1eb0c9fd37f49701d976c7ceae8df44caf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 22 22:41:29 2011 +0200

    This is me being all cocky, thinking I'll make it use ipsets...

 nova/compute/api.py                 |   18 +++++++-------
 nova/db/sqlalchemy/models.py        |    6 +++++
 nova/network/linux_net.py           |   30 ++++++++++++++++++++++++
 nova/network/manager.py             |   24 ++++++++++++++++++-
 nova/tests/test_iptables_network.py |   39 +++++++++++++++++++++++++++++--
 nova/virt/libvirt/firewall.py       |   44 ++++++++++++++++++++++++++---------
 6 files changed, 139 insertions(+), 22 deletions(-)

commit 0f8eee7ff32a91c866742939b1f551f3610f1276
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 20:20:31 2011 +0000

    fix auth tests

 nova/api/openstack/auth.py |    2 +-
 nova/auth/manager.py       |    2 +-
 nova/tests/test_auth.py    |   19 +++++++++----------
 3 files changed, 11 insertions(+), 12 deletions(-)

commit 348dcb39f879926c20ed87256b149aeeaa4c6832
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Sat Jul 23 05:11:39 2011 +0900

    Add i18n for logging, changed create_bridge/vlan to should_create_bridge/vlan, changed unfilter_instance's keyword param to positional, and added Dan's alternate ID to .mailmap

 .mailmap                        |    1 +
 nova/compute/manager.py         |    2 +-
 nova/network/manager.py         |   42 ++++++++++++++-------------------------
 nova/tests/test_compute.py      |    2 +-
 nova/tests/test_network.py      |    4 ++--
 nova/virt/driver.py             |    2 +-
 nova/virt/libvirt/connection.py |    6 +++---
 nova/virt/libvirt/vif.py        |    5 +++--
 nova/virt/xenapi/vif.py         |    2 +-
 nova/virt/xenapi/vmops.py       |    4 ++--
 nova/virt/xenapi_conn.py        |    2 +-
 11 files changed, 31 insertions(+), 41 deletions(-)

commit f9fb313ca2acaf2fd491d5b695381846969b132c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 19:54:11 2011 +0000

    fix extensions tests

 nova/tests/api/openstack/test_extensions.py |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit f3ddef7d541b31015117c35cb3aaa2fc15e1ccef
Merge: f087db3 35deb55
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 14:52:31 2011 -0500

    merge trunk

commit 44d1024a53b8150cf9542d08d5886f430365f161
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 19:47:41 2011 +0000

    fix all tests

 nova/api/ec2/__init__.py                           |   29 +--
 nova/api/openstack/auth.py                         |   20 +-
 nova/compute/api.py                                |    2 +
 .../extensions/test_flavors_extra_specs.py         |  198 --------------------
 nova/tests/api/openstack/fakes.py                  |   40 ++--
 nova/tests/api/openstack/test_auth.py              |   37 ++--
 nova/tests/api/openstack/test_extensions.py        |   29 ++-
 .../api/openstack/test_flavors_extra_specs.py      |  180 ++++++++++++++++++
 nova/tests/api/openstack/test_images.py            |   27 ++-
 nova/tests/api/openstack/test_servers.py           |   45 +++--
 nova/tests/test_access.py                          |    2 +-
 nova/tests/test_api.py                             |    3 +-
 nova/wsgi.py                                       |   12 ++
 13 files changed, 313 insertions(+), 311 deletions(-)

commit 7066537c32da8acaff0266634383efaccdfc6e9c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 22 14:17:37 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_extensions.py |   57 ++++++++++++++-------------
 1 file changed, 29 insertions(+), 28 deletions(-)

commit d06908783c9a20621af124d824a88d34b6d78b33
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Sat Jul 23 01:38:26 2011 +0900

    Updated the comments for VMWare VIF driver

 nova/virt/vmwareapi/vif.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0e2726f452fe6991797728bca1e514943725e7a2
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 22 10:34:01 2011 -0400

    initial test for v1.1 detail request

 nova/tests/api/openstack/test_versions.py |   53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit 8d97118be776fcaad3053d1f93f61d339685a4ae
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Fri Jul 22 17:26:11 2011 +0400

    Moved restaring instances from livbirt driver to ComputeManager.

 nova/compute/manager.py         |   19 +++++++++++++++++++
 nova/flags.py                   |    3 +++
 nova/virt/libvirt/connection.py |   25 ++-----------------------
 3 files changed, 24 insertions(+), 23 deletions(-)

commit 93ffbbb234df486a1adb558a5228a7f23ea3451b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 22:12:15 2011 +0900

    Added network_info to unfilter_instance to avoid exceptions when shutting down instances

 nova/compute/manager.py         |    3 ++-
 nova/tests/test_compute.py      |    2 +-
 nova/virt/driver.py             |    2 +-
 nova/virt/fake.py               |    2 +-
 nova/virt/libvirt/connection.py |    8 +++++---
 nova/virt/libvirt/firewall.py   |   11 ++++++-----
 nova/virt/xenapi_conn.py        |    2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)

commit 0880f170318cfa5d12b10e237f641b27c646c8b2
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 21:36:05 2011 +0900

    Removed unused exception object

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c4f650278d01437a9e1866ba2fec86d4a6d70d6a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 18:55:04 2011 +0900

    Fixed the missing quotes for 802.1Qbh in libvirt template

 nova/virt/libvirt.xml.template |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit c4affeaffd77b21a528c09b94f65d66fb07f5231
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 13:21:02 2011 +0400

    add decorator for multi host option

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit fd83e25589c4372eb53bec7215775028ca846b3c
Merge: c4cb428 162563d
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 14:39:12 2011 +0900

    Merged Dan's branch

commit c4cb4283bee6bb08903450e98ec037dd7a82a538
Merge: 6e3c492 35deb55
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 14:21:47 2011 +0900

    Merged trunk

commit 162563d48d5b5b4626c20de7fd93dd17ea31f123
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 22:17:37 2011 -0700

    use new 'create_vlan' field in XenAPIBridgeDriver

 nova/virt/xenapi/vif.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ce3f780f67f412bef618e17c9c6f1e099a54e4a
Merge: 88a0dd1 35deb55
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 09:02:28 2011 +0400

    merge with trunk, resolve conflicts

commit 88a0dd185ebef93845c026dceff0c32eaaffda11
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 08:58:34 2011 +0400

    remove IPy

 bin/nova-manage |    1 -
 1 file changed, 1 deletion(-)

commit ff9b31734f15fec0a5b1f9de96dadbda6475a3b4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 21:57:03 2011 -0700

    for libvirt OVS driver, do not make device if it exists already

 nova/virt/libvirt/vif.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit d78d188d41e580ef0e2b4f0116bb0402ce83930f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 21:36:26 2011 -0700

    refactor xenapi vif plug to combine plug + get_vif_rec, tested and fixed XenAPIBridgeDriver

 nova/virt/libvirt/vif.py  |   13 +++++---
 nova/virt/xenapi/vif.py   |   75 ++++++++++++++++++++++-----------------------
 nova/virt/xenapi/vmops.py |    2 +-
 3 files changed, 46 insertions(+), 44 deletions(-)

commit 0a462039e0e79bffc2f92e28d7ad073cd65dc520
Merge: c83546c 35deb55
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 23:44:45 2011 -0400

    Merge from trunk.

commit c83546c0c9d077fb69caf1d782e8cb420e399a20
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 23:36:40 2011 -0400

    Correctly add xml namespaces to extensions xml.

 nova/api/openstack/extensions.py            |   33 +++++++++++++++------------
 nova/api/openstack/wsgi.py                  |    1 -
 nova/tests/api/openstack/test_extensions.py |    2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

commit 16aa079b933a8788c926745e0794d85558d442a8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 22:35:26 2011 -0400

    Added xml serialization for GET => /extensions. Added corresponding tests.

 nova/api/openstack/extensions.py            |   43 ++++++++--------
 nova/tests/api/openstack/test_extensions.py |   72 +++++++++++++++++++--------
 2 files changed, 73 insertions(+), 42 deletions(-)

commit 21df6fcc098435d520ff46fff8d4ffdcee3dd3b3
Merge: c5c14a9 6e3c492
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 18:56:34 2011 -0700

    merge ryu's branch

commit c5c14a95355cef408e8dcfeb04b9d796be2af564
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 18:54:00 2011 -0700

    remove debugging

 nova/virt/xenapi/vif.py |    7 -------
 1 file changed, 7 deletions(-)

commit e1cf345fa82c3a9b8088237f1025c41db0f4e829
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 00:39:53 2011 +0000

    fix a whole bunch of tests

 nova/api/ec2/__init__.py        |   20 ++++++---
 nova/tests/hyperv_unittest.py   |    9 ++---
 nova/tests/test_adminapi.py     |   16 +++-----
 nova/tests/test_api.py          |   74 ++++------------------------------
 nova/tests/test_cloud.py        |   16 +++-----
 nova/tests/test_compute.py      |   37 ++++++-----------
 nova/tests/test_console.py      |   19 +++------
 nova/tests/test_libvirt.py      |   66 +++++++-----------------------
 nova/tests/test_objectstore.py  |   24 +++--------
 nova/tests/test_vmwareapi.py    |   15 +++----
 nova/tests/test_xenapi.py       |   85 ++++++++++++++++++++-------------------
 nova/virt/hyperv.py             |    6 +--
 nova/virt/images.py             |    2 +-
 nova/virt/libvirt/connection.py |   19 ++++-----
 nova/virt/xenapi/vm_utils.py    |   27 +++++++------
 nova/virt/xenapi/vmops.py       |   17 +++-----
 16 files changed, 155 insertions(+), 297 deletions(-)

commit 5f75097eb46fa03814fe53c5d9fda84f0000fdd4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 21 22:46:57 2011 +0000

    start removing references to AuthManager

 nova/api/direct.py                     |    3 +-
 nova/api/ec2/__init__.py               |   10 +++---
 nova/api/openstack/auth.py             |   26 ++++----------
 nova/cloudpipe/pipelib.py              |   18 +++++-----
 nova/compute/api.py                    |    2 +-
 nova/db/sqlalchemy/api.py              |    4 +--
 nova/image/s3.py                       |    6 ++--
 nova/log.py                            |    4 +--
 nova/tests/api/openstack/test_auth.py  |    1 -
 nova/tests/hyperv_unittest.py          |    2 +-
 nova/tests/scheduler/test_scheduler.py |   17 +++------
 nova/tests/test_access.py              |    2 +-
 nova/tests/test_adminapi.py            |    4 +--
 nova/tests/test_cloud.py               |   12 +++----
 nova/tests/test_libvirt.py             |    9 +++--
 nova/tests/test_quota.py               |   60 ++++++++++++++------------------
 16 files changed, 77 insertions(+), 103 deletions(-)

commit 8383838afffeedcde8cd0dc486e32d2f5bb26f8e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 21 22:46:36 2011 +0000

    change context to maintain exact time, store roles, use ids instead of objects and use a uuid for request_id

 nova/context.py |   88 +++++++++++++++++--------------------------------------
 nova/utils.py   |   23 ++++++++++-----
 2 files changed, 43 insertions(+), 68 deletions(-)

commit f67ffed5fc42a1234ccbf0909bd7326c5a06307e
Merge: 806be42 4902268
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 16:50:00 2011 -0500

    Resolved conflict with trunk

commit 35deb55f304bc380b2b17aa1caf65001a38ae486
Merge: 4902268 fe708ae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 21:37:09 2011 +0000

    Adds an XML serializer for limits and adds tests for the Limits view builder.

commit f087db34b840a74f9ba093128808230fd97ea9ec
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:20:32 2011 -0500

    pep8

 nova/tests/api/openstack/test_versions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2b03601d6659376ebfcdcade1937ec85e262c3b8
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:15:18 2011 -0500

    add in the right number of fields

 bin/nova-manage |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fe708ae810efd17da70659076faa9c2f3b544d3b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 17:13:12 2011 -0400

    pep8

 nova/api/openstack/views/limits.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f6514ba9fbb6b3c1939bde6ba081f632b3d0a24f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 17:11:57 2011 -0400

    updated next-available to use utc time

 nova/api/openstack/views/limits.py      |    2 +-
 nova/tests/api/openstack/test_limits.py |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit bb8d89e217c772fe335188212fe019f15a13aaf1
Merge: 99d13a4 4902268
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:10:14 2011 -0500

    merge trunk

commit 99d13a49fe32d22e0ed1642fcd790d45a8c201a3
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:09:43 2011 -0500

    rename in preperation for trunk merge

 .../migrate_repo/versions/034_secondary_dns.py     |   36 --------------------
 .../migrate_repo/versions/035_secondary_dns.py     |   36 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)

commit b346a456e9189f95780bf9c9d061969319a6b427
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:03:28 2011 -0500

    only include dns entries if they are not None in the database

 nova/network/manager.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 490226870887f9986f9f57b6af7cfcc92e45da7c
Merge: a1b4bf0 5913e53
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 20:57:26 2011 +0000

    Updated the compute API so that has_finished_migration uses instance_uuid.
    Fixes some regressions with 1295-1296.

commit 419b928ea2eb71fdcda66b4c83717120309ff36a
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 15:26:48 2011 -0500

    only use the flag if it evaluates true

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e3c492ae878335ea7ef7e00cc9e9abc55b0a0b4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 05:23:44 2011 +0900

    Catch the FixedIpNotFoundForInstance exception when no fixed IP is mapped to instance

 nova/network/manager.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit c1b4dd1b8e3a8043b494854bc9ddd5e6cd335ef0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 16:16:34 2011 -0400

    Updated time-available to be correct format
    Fixed old tests to respect this

 nova/api/openstack/views/limits.py      |    5 ++++-
 nova/tests/api/openstack/test_limits.py |   19 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

commit a1b4bf0d74deab62482d8244f8985f5dc1c0b56f
Merge: af1b6c9 8bf63ee
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 19:42:09 2011 +0000

    This fixes issues with invalid flavorRef's being passed in returning a 500 instead of a 400, and adds tests to verify that two separate cases work.

commit 8bf63ee3132e2f41eca5fa34ea8428e03b22986c
Merge: dc616cd af1b6c9
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 15:14:16 2011 -0400

    merge from trunk

commit af5c549d7795fcf9fdcb7d8e9193aa985f121fc6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 15:08:46 2011 -0400

    Moving lp:~rackspace-titan/nova/extensions-xml-serialization to new branch based off of trunk. To remove dep on another branch.

 nova/api/openstack/extensions.py            |   43 ++++++++--
 nova/api/openstack/wsgi.py                  |    4 +
 nova/tests/api/openstack/test_extensions.py |  113 ++++++++++++++++++++++++++-
 3 files changed, 152 insertions(+), 8 deletions(-)

commit af1b6c947a9bc8915e328546bda6ff454a1246e9
Merge: fe456e8 5133f92
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 19:07:32 2011 +0000

    Perform fault wrapping in the openstack WSGI controller. This allows us to just raise webob Exceptions in OS API controllers with the appropriate explanations set. This resolves some inconsistencies with exception raising and returning that would cause HTML output to occur when faults weren't being handled correctly.

commit 5133f92e5c00395b9a9d690e86815aa9c97cda9e
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 14:51:55 2011 -0400

    pep8 and stuff.

 nova/api/openstack/common.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f43706e43eab376349ba877bb8175dc4623b161c
Merge: 126714f fe456e8
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 14:49:57 2011 -0400

    Merge w/ trunk.

commit fe456e8b8dfa58b7900a5b5e6cfac8bed473d9a5
Merge: 74c399c 0f5184d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 21 18:47:29 2011 +0000

    Some code was recently added to glance to allow the is_public filter to be overridden.  This allows us to get all images and filter properly on the nova side until keystone support is in glance. This fixes the issue with private images and snapshots disappearing from the image list.

commit ae1fd7e73890d361d0bd6ad764118c1e5601cdca
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 21 11:25:02 2011 -0700

    pep8

 nova/network/manager.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a03210b262e258bb56377b5a2d46a1134cbe3450
Merge: 038565b 26ae789
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 21 11:21:38 2011 -0700

    Merged with trunk which includes ha-net changes

commit 5913e537ceb352ec4e5999cdadb1d826771d5d72
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 14:21:27 2011 -0400

    Updated the compute API so that has_finished_migration uses instance_uuid.
    Fixes some regressions with 1295-1296.

 nova/api/openstack/views/servers.py |    2 +-
 nova/compute/api.py                 |    4 ++--
 nova/db/api.py                      |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 74c399cb2ebb914973c2f0dc6ecf4dd8bbc062d7
Merge: d69bc49 10ef948
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 21 18:12:56 2011 +0000

    Updating the /images and /images/detail OSAPI v1.1 endpoints to match spec w/ regards to query params

commit d69bc49db837825608e68e738cf010816f3ad48f
Merge: 43d686c a57504e
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 18:07:54 2011 +0000

    Ensure valid json/xml/atom responses for versions requests

commit 43d686c89686dd83ec0ed5cab607890d271494ef
Merge: 1c9e25e 38fb47a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 21 18:02:47 2011 +0000

    Update OSAPI v1.1 /flavors, /flavors/detail, and /flavors/<id> to return correct xml responses

commit 806be42000cf54e5b2ff9fb03446e8e6924bd38b
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 12:46:58 2011 -0500

    Renamed the virt driver resize methods to migration for marginally more understandable code

 nova/compute/manager.py    |    4 ++--
 nova/tests/test_compute.py |    6 +++---
 nova/tests/test_xenapi.py  |    8 ++++----
 nova/virt/driver.py        |    4 ++--
 nova/virt/xenapi/vmops.py  |   24 +++++++++++++-----------
 nova/virt/xenapi_conn.py   |    6 +++---
 6 files changed, 27 insertions(+), 25 deletions(-)

commit d04b90ef23bd2e02e762ed22bce8729a2c619cf6
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 12:46:18 2011 -0500

    allow 2 dns servers to be specified on network create

 .../migrate_repo/versions/034_secondary_dns.py     |   36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 848de98876aecd084bb568907c3b121a7f5e38f0
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 12:45:53 2011 -0500

    allow 2 dns servers to be specified on network create

 bin/nova-manage              |   15 ++++++++++++---
 nova/db/sqlalchemy/models.py |    1 +
 nova/network/manager.py      |   10 +++++++---
 nova/tests/__init__.py       |    3 ++-
 nova/tests/test_network.py   |    2 ++
 5 files changed, 24 insertions(+), 7 deletions(-)

commit 1c9e25ed4cc4a88b915a3db8485727fab746406f
Merge: 26ae789 1230d93
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 17:37:32 2011 +0000

    Fixes lp813006
    
    Inconsistent database API method naming for instance_types

commit 26ae789a7a3c4b8819368b7e148d1296124e6994
Merge: 94a22ae 905599d
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 17:22:14 2011 +0000

    Fixes lp808949 - "resize doesn't work with recent novaclient"
    
    The issue was that uuid support hadn't yet been sprinkles throughout the resize code. This patch allows for this and also handles continuing to perform resizes through old-style instance ids.

commit 5f47389f6151d7ae80d91382d8dab32d6fb2f0c8
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Thu Jul 21 21:05:55 2011 +0400

    minor fix

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 905599d6a447ec66ddb33aaf75d18aa8e51a724e
Merge: e2eff68 94a22ae
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:55:46 2011 -0500

    Merge from trunk and moved the migration again

commit 1230d93f6154d73fcd8ce1c30c629d8a04c1c874
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:52:58 2011 -0500

    Some broken tests from my other merge

 nova/compute/manager.py    |    2 +-
 nova/tests/test_compute.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit f7988845281ab2fb963eaf059a6308917db79ff8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 12:51:29 2011 -0400

    Fixed import issue

 nova/tests/api/openstack/test_limits.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 5fbe60d4b51017732740535f147f6d48764b2006
Merge: 45bdf5c 94a22ae
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:38:15 2011 -0500

    Merge from trunk

commit a57504ef9a8b3e2c5d78cfe4ecf2f21c03653556
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 12:19:09 2011 -0400

    added tests, updated pep8 fixes

 nova/api/openstack/versions.py            |    1 -
 nova/tests/api/openstack/test_versions.py |   91 +++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)

commit 87403c1e8b27b52e9e84856490ea7a0dc51f5bb6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 01:13:34 2011 +0900

    Changed test_live_migration_raises_exception to use mock for compte manager method

 nova/tests/test_libvirt.py |    3 +++
 1 file changed, 3 insertions(+)

commit dc616cd633007aa83d7576ae74cf807aa0df6776
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 12:02:01 2011 -0400

    fixed another issue with invalid flavor_id parsing, and added tests

 nova/api/openstack/create_instance_helper.py |    6 ++++-
 nova/tests/api/openstack/test_servers.py     |   32 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

commit ca285e0cdede6f3332856e63d7828616aefdc4cc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 11:57:44 2011 -0400

    minor cleanup

 nova/tests/api/openstack/test_limits.py |    1 -
 1 file changed, 1 deletion(-)

commit 9a843b10f3145405ebc01ded5d32ce68d02fdd8d
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:56:15 2011 -0400

    pep8 issue

 nova/api/openstack/create_instance_helper.py |    2 --
 1 file changed, 2 deletions(-)

commit 210038b8d36e74ecfa791c1a25b5a8529cecdca0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 11:54:03 2011 -0400

    cleanup

 nova/tests/api/openstack/test_limits.py |   39 +++++++++++--------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

commit ad9d6f0feb0eecc59796d3dc4700d6241b693703
Merge: 0ce8407 94a22ae
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:42:13 2011 -0400

    merge with trunk

commit 7aca24e8463c38c4e051a59788de1c0c0b15cd0c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 00:27:45 2011 +0900

    Fixed the localization unit test error in the vif driver logging

 nova/virt/libvirt/vif.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 822b5ecede8f18120ae37eb07ff046101f50d3aa
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:10:47 2011 -0400

    cleanup tests and fix pep8 issues

 nova/api/openstack/versions.py            |   20 +++++++++++---------
 nova/tests/api/openstack/test_versions.py |   23 +++++++++++------------
 2 files changed, 22 insertions(+), 21 deletions(-)

commit d79ad70cf9ad959ea91b13a2724450cbadcdc0c4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 23:58:25 2011 +0900

    removed vif API extension

 nova/api/openstack/contrib/vifs.py |   85 ------------------------------------
 1 file changed, 85 deletions(-)

commit 337c1ae31b348f3103db09e81af6f27d5290b79e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 23:55:10 2011 +0900

    Fixed Xenapi unit test error of test_rescue

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85ba5628d607d2d4b25553e7225e4db4960a9a41
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jul 21 10:47:34 2011 -0400

    Slight indentation change

 run_tests.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit eef6d4376a6e41883c43c78215cb3b8b1830766f
Merge: 68134f8 a3c7611
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 23:47:32 2011 +0900

    Merged Dan Wendlandt's branch and fixed pep8 errors

commit 6e59df91514b6377e134b2221cfa3b52901e0596
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jul 21 10:43:20 2011 -0400

    Added  call to second coverage invocation

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eed00e5c826034b042abd713f03aefdfc376ed22
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jul 21 10:30:55 2011 -0400

    Fixed an issue where  was invoked before it was defined in the case of a venv

 run_tests.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 94a22ae4575a60e6b8096c1baeda8828feb30f3e
Merge: a559ca7 82e2eeb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 21 14:27:20 2011 +0000

    - Add 'fixed_ipv6' property to VirtualInterface model
    - Expose ipv6 addresses in each network in OSAPI v1.1

commit a3c761110d7ee49ac9d18ff13e584aa8cdaedab8
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 07:07:34 2011 -0700

    forgot to add xenapi/vif.py

 nova/virt/xenapi/vif.py |  146 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

commit 126714f297fc29c0a0c930e7e1f351bf114b3795
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 21 10:02:16 2011 -0400

    Perform fault wrapping in the openstack WSGI controller. This allows
    us to just raise webob Exceptions in OS API controllers with the
    appropriate explanations set. This resolves some inconsistencies
    with exception raising and returning that could cause HTML output
    to occur when an exception was raised.

 nova/api/openstack/accounts.py               |    6 +-
 nova/api/openstack/backup_schedules.py       |    9 ++-
 nova/api/openstack/common.py                 |   19 ++++--
 nova/api/openstack/consoles.py               |    7 +-
 nova/api/openstack/create_instance_helper.py |    7 +-
 nova/api/openstack/image_metadata.py         |    5 +-
 nova/api/openstack/images.py                 |    3 +-
 nova/api/openstack/ips.py                    |   11 ++-
 nova/api/openstack/server_metadata.py        |    1 -
 nova/api/openstack/servers.py                |   92 ++++++++++++--------------
 nova/api/openstack/shared_ip_groups.py       |   13 ++--
 nova/api/openstack/users.py                  |    3 +-
 nova/api/openstack/wsgi.py                   |    6 +-
 nova/api/openstack/zones.py                  |    8 +--
 nova/tests/api/openstack/test_servers.py     |    2 +-
 15 files changed, 90 insertions(+), 102 deletions(-)

commit b2f7ae2ad7762531a9200799de4be9849cd3b42c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 09:43:25 2011 -0400

    Added LimitsXMLSerializer
    Added LimitsViewBuidlerV11Test test case

 nova/api/openstack/limits.py            |   61 ++++++++-
 nova/tests/api/openstack/test_limits.py |  206 +++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+), 2 deletions(-)

commit 68134f862e8c3eaa571791d9675fd0f8dbc3b906
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 22:00:20 2011 +0900

    Added create_vlan/bridge in network unit test

 nova/tests/test_network.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 97503418bea47ca38d2181e5dc5fa710d6e15df3
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Thu Jul 21 21:44:12 2011 +0900

    Add OpenStack API support for block_device_mapping.
    
    This patch enables boot from volume feature already implemented in EC2
    API, as an OpenStack API extension.

 nova/api/openstack/contrib/volumes.py |   53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit b2b378748aa859bab63c65fe88aa45081945b3c6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 18:41:32 2011 +0900

    Changed the default of VIF driver

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b32c0270d6f61e0164185757ed97c82bda25600
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 16:31:14 2011 +0900

    Fixed PEP8 issues

 nova/network/manager.py      |    1 -
 nova/virt/driver.py          |    1 -
 nova/virt/libvirt/vif.py     |    2 +-
 nova/virt/vmwareapi/vif.py   |   26 ++++++++++++++------------
 nova/virt/vmwareapi/vmops.py |    1 -
 nova/virt/vmwareapi_conn.py  |    1 +
 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |    1 -
 8 files changed, 17 insertions(+), 18 deletions(-)

commit e3abccb611345d61584569114a4929e751de14ae
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 16:17:23 2011 +0900

    Combined bridige and vlan VIF driver to allow better transition for current Nova users

 nova/network/manager.py  |   29 ++++++++++++++++++++++++++++-
 nova/virt/libvirt/vif.py |   46 +++++++++++++++++++++-------------------------
 2 files changed, 49 insertions(+), 26 deletions(-)

commit c7f19fb7657212c4cd6a6af2b5823cfdbaf591b8
Merge: 2d678f2 a559ca7
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 15:38:13 2011 +0900

    Merged trunk

commit 2d678f23b4d7173b59698381d53e41dc7ccb1cd8
Merge: 90adc60 407e30e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 14:16:18 2011 +0900

    Merged lp:~~danwent/nova/network-refactoring

commit a559ca7e76195a8608a1cf884c7c8101544e1bda
Merge: d86af55 a01afcd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 21 03:22:29 2011 +0000

    Adds HA networking (multi_host) option to networks.
    
    * Adds extra flag for network creation: multi_host.
    * Multi hosts networks will send all network related commands to the host that the vm is on.
    * Requires nova-network to be run on every compute host.
    * Non multi_host networks work the same way.
    * Moved extra db access out of linux_net (there is still a little in the dhcp leases part that should probably be moved)
    * Fixed the logic on auto_assign which was messed up

commit 76aab6d65fa35ae88f9b16acd4ee2968dfe049ce
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 16:56:45 2011 -0500

    CHanges based on feedback

 nova/compute/manager.py   |   20 ++++++++++++--------
 nova/tests/test_xenapi.py |   36 +++++++++++++++++++++++++++++++++---
 nova/virt/xenapi/vmops.py |    9 +++++----
 nova/virt/xenapi_conn.py  |    6 ++++--
 4 files changed, 54 insertions(+), 17 deletions(-)

commit d86af556f44ccc1043be0de4d699812f3be483a6
Merge: 15d5396 58a76ce
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 21:07:09 2011 +0000

    Older Windows agents are very picky about the data sent to it. It also requires the public key for the password exchange to be in a string format and not an integer.
    
    Also, because of the length of time it takes Windows to boot fully (including a full reboot), the reset network command gets lost. Move this to after we've made sure the agent is up and running successfully.

commit 38fb47ab2a12be0b169e3f51f4da413efc041f9c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 20 17:06:36 2011 -0400

    adding flavors xml serialization

 nova/api/openstack/flavors.py            |   55 ++++-
 nova/tests/api/openstack/test_flavors.py |  374 ++++++++++++++++++++++++------
 2 files changed, 351 insertions(+), 78 deletions(-)

commit 148b4095a5f18f192ae243b02b4070af384c1152
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 16:47:17 2011 -0400

    added versions list atom test and it passes

 nova/api/openstack/versions.py            |   68 +++++++++++++++++++----------
 nova/api/openstack/views/versions.py      |    2 +-
 nova/tests/api/openstack/test_versions.py |   36 +++++++--------
 3 files changed, 64 insertions(+), 42 deletions(-)

commit 15d53966c321e9ec13345d4130ae2e5b98652ec5
Merge: e8ea08c 1b423b4
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jul 20 20:42:09 2011 +0000

    Set the status_int on fault wrapped exceptions. Fixes WSGI logging issues when faults are returned.
    
    Updated so that webob exceptions aren't used for the happy path (HTTP 200 responses). We now return a proper webob object response in these cases. This fixes issues where HTML/XML would get incorrectly returned with the old style happy path exceptions.

commit 77347efae5171e5a6ffa5af885c0ffd7220688cf
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 15:38:29 2011 -0500

    Fix plus passing tests

 nova/tests/test_xenapi.py |   39 +++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py |    9 ++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)

commit 407e30e4843d27943e38374d61525805236319d2
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jul 20 13:10:25 2011 -0700

    remove debug prints

 nova/virt/xenapi/vmops.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 47227b969e574a63f7ee7d5e354fabd2a112af25
Merge: 2b8cc5f 90adc60
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 13:06:31 2011 -0700

    merge ryu's branch

commit 2b8cc5f98435423eb2b8bc42bcb7e9c38e453c34
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 13:03:27 2011 -0700

    update for ryu's naming changes, fix some bugs.  tested with OVSDriver only so far

 nova/virt/xenapi/vmops.py |   32 +++++++++++++++++++-------------
 nova/virt/xenapi_conn.py  |    6 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

commit e8ea08c3a08ead45061fcca1ac051e7220ec0523
Merge: f47e59e 617fd37
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jul 20 19:57:10 2011 +0000

    Fixes bug #807764.  Please disregard previous proposal with incorrect bug #.

commit e2eff68dbe78d8639d4cb212ab48240ebf045f73
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 14:25:23 2011 -0500

    Whoops

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25bd75bfd2c72899bf139e671fd42fd2dc1dc0e1
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Wed Jul 20 20:12:19 2011 +0100

    Added LP bug num to TODO

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5e9e62c2382f29a55b9b0c7a2b4aefc16b9d623d
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Wed Jul 20 20:11:47 2011 +0100

    Split tests into 2

 nova/tests/test_api.py |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit 617fd37492af95e7276fbbe3b1cd400dea42beae
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jul 20 12:10:01 2011 -0700

    Fix email address in Author

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 58a76cede01b6bb141d060636c21318db1712527
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 18:46:29 2011 +0000

    Make sure reset_network() call happens after we've determined the agent is
    running.

 nova/virt/xenapi/vmops.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit a01afcd449d7f1f6ffd74d9ca314edcdbb9b155d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 18:27:15 2011 +0000

    pep8

 nova/network/manager.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 90adc6067b5b9c23e5380c9cfde33c049d43d4d1
Merge: 22f6b3d f47e59e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 03:23:18 2011 +0900

    Merged trunk

commit 22f6b3d99c94a4bdfb031767f86b3aee4396aa70
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 03:20:07 2011 +0900

    Added Dan Wendlandt to Authors, and fixed failing network unit tests

 Authors                    |    1 +
 nova/tests/test_network.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit b77a927c3651ba108b877807e7b8df3b3b734938
Merge: cfa755c f47e59e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 18:19:34 2011 +0000

    merged trunk

commit 38371fe9c073990ecf722dc3983d4d8fa968b198
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:58:42 2011 +0900

    Made all but one test pass for libvirt

 nova/tests/test_libvirt.py |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit cea17225c9a568e97f55287edf7510ebcfbae301
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:57:52 2011 +0900

    Moved back allow_project_net_traffic to libvirt conn

 nova/virt/libvirt/connection.py |    3 +++
 nova/virt/libvirt/vif.py        |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 1b423b464e0dd849d1a6dafde08b3c4420217151
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jul 20 13:52:22 2011 -0400

    Set the status_int on fault wrapped exceptions. Fixes WSGI logging issues
    when faults are returned.
    
    Updated so that webob exceptions aren't used for the happy path (HTTP 200
    responses). We now return a proper webob object response in these cases.
    This fixes issues where HTML/XML would get returned with the old style
    happy path exceptions.

 nova/api/openstack/consoles.py          |    3 +-
 nova/api/openstack/contrib/multinic.py  |    5 ++--
 nova/api/openstack/contrib/volumes.py   |    5 ++--
 nova/api/openstack/faults.py            |    1 +
 nova/api/openstack/servers.py           |   49 +++++++++++++++----------------
 nova/tests/api/openstack/test_faults.py |    5 ++++
 6 files changed, 37 insertions(+), 31 deletions(-)

commit f47e59e3b5cee88f15b2d22a555119d65dcbe3eb
Merge: 9f7cbe0 d8132fd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 20 17:49:23 2011 +0000

    lp812489: better handling of periodic network host setup to prevent exception

commit 0f5184da2bfd9fb9007ea786aff5117a5b4461f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 17:46:32 2011 +0000

    add smoketests to verify image listing

 smoketests/test_sysadmin.py |   33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

commit 775ea7f40d769645520d4ea7c7d9c0bfdb36c2dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 17:45:55 2011 +0000

    default image to private on register

 nova/image/s3.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f7cbe0c667eb7490b81bb46223ce9ef6acdfebf
Merge: b0e74f5 e65a9fe
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Jul 20 17:42:22 2011 +0000

    correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)
    
    This fixes the logic, so that lxc and uml will not get vnc arguments added to
    their libvirt xml. It also seems more readable to me.

commit 9fc4cfaafceb3b96c51bc49aec020f89068544a0
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:39:37 2011 -0500

    Stupid merge and fixed broken test

 nova/compute/manager.py    |    2 +-
 nova/tests/test_compute.py |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 52b68769d50118d8123ed0ee52d258c5285a7f1e
Merge: a497d2e f926ae2
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:30:21 2011 -0500

    Merge from trunk and migration rename

commit b0e74f57ccc75f616f82c31667a9d65435de8048
Merge: f926ae2 6a88f87
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 17:27:12 2011 +0000

    Most of the XenServer plugin files need the execute bit set to run properly. However, they are inconsistent as it is, with one file having the execute bit set, but the another having it set when it is not needed.
    
    This trivial merge fixes the permissions to what they need to be to ensure the plugins will work properly on the dom0.

commit 53506549e285ee85cb1911670a8ff24ccdd32d5c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:26:58 2011 +0900

    Made the compute unit tests to pass

 nova/tests/test_compute.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit a497d2e8f6beb667c73f66bef756fd955b9d6d69
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:26:50 2011 -0500

    Host fix

 nova/compute/api.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 2bf85d9151771aa4ca5c1201cadbb255db85643f
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:26:31 2011 +0900

    Created _get_instance_nw_info method to clean up duplicate code

 nova/compute/manager.py |   41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

commit a35a70fbaef0ef6634213308d5a68ee60bd714f2
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 13:12:18 2011 -0400

    initial changes for application/atom+xml for versions

 nova/api/openstack/versions.py            |   98 ++++++++++++++++++++++++++---
 nova/api/openstack/wsgi.py                |   19 ++++--
 nova/tests/api/openstack/test_versions.py |   42 +++++++++++++
 3 files changed, 145 insertions(+), 14 deletions(-)

commit 6178861ffdbc183962d8e519d2147b71ca3f2db8
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jul 20 10:03:56 2011 -0700

    Update Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit f926ae2a0fcf115beae78b8edfbf4ddee1d646be
Merge: b76d31c 1d4a789
Author: John Tran <jhtran@att.com>
Date:   Wed Jul 20 16:41:10 2011 +0000

    network api release_floating_ip method will now check to see if an instance is associated to it, prior to releasing.

commit 8b244480bcd2ae9ac4769530d4444e983cc5d1aa
Merge: 43de3c5 2bfa915
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 09:26:01 2011 -0700

    merge from lp:~midokura/nova/network-refactoring-l2

commit b76d31cf6be76f9ece78d2377c0cbad0cb10c584
Merge: 1f8c3f1 86fe491
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 20 16:23:10 2011 +0000

    Corrects a bad model lookup in nova-manage

commit e65a9fe5827e0d5961e618a3163382c2ad02274c
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Jul 20 12:17:44 2011 -0400

    correct indentation

 nova/virt/libvirt/connection.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1f8c3f1477eb5856dccb5d7bcdaa4cd5981174c8
Merge: 77db06c b2637c2
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 16:16:51 2011 +0000

    Fixes lp809587
    
    The original flavor wasn't being applied to the instance on a reversion of a resize

commit 6a88f87c11472484f35e1116f107410c031b6838
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 15:16:36 2011 +0000

    Fix permissions for plugins

 0 files changed

commit 1ba04869623a0152a487a50e25bfce0ee6a65f53
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jul 20 10:30:03 2011 -0400

    Ya! Apparently sleep helps me fix failing tests.

 nova/api/openstack/servers.py            |    4 ++--
 nova/tests/api/openstack/test_servers.py |   10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 686cd2c5b50b1a50bd3c942b8dde960b7b5fb5d8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 14:08:38 2011 +0000

    Some older windows agents will crash if the public key for the keyinit command
    is not a string.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 27f326c712e485322003ccdc13acfd04a6fdb119
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 09:59:56 2011 -0400

    added 'update' field to versions

 nova/api/openstack/versions.py            |    6 +++++-
 nova/api/openstack/views/versions.py      |    1 +
 nova/tests/api/openstack/test_versions.py |    9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

commit 2bfa91575d36363b16c25c29623f7ac988e844bb
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 22:22:07 2011 +0900

    First attempt at vmware API VIF driver integration

 nova/virt/vmwareapi/vmops.py |   29 ++++++++++++++++++++++++++---
 nova/virt/vmwareapi_conn.py  |    9 ++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

commit 27d8dc42120d3cefc91bf6510f215dfdef7f23d2
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 22:21:48 2011 +0900

    Removed unnecessary context parameter

 nova/compute/manager.py         |    2 +-
 nova/virt/driver.py             |    5 +++++
 nova/virt/libvirt/connection.py |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

commit 0c66b0b8caad7437fa2afd64a2038bcb166c83a5
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 21:34:30 2011 +0900

    Merged get_configurations and plug of VIF drivers

 nova/compute/manager.py         |    2 --
 nova/virt/libvirt/connection.py |    3 +--
 nova/virt/libvirt/vif.py        |    9 ++++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

commit 7bdd244541fd9cef4031d4050b5200f58a15f757
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 21:00:20 2011 +0900

    Moved ensure_vlan_bridge of vmware to VIF driver

 nova/network/vmwareapi_net.py |   82 ------------------------------------
 nova/virt/vmwareapi/vif.py    |   93 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 82 deletions(-)

commit 798a5e31b304df1c59e226f9426c07cb250dae16
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 20:21:44 2011 +0900

    Added network_info parameter to all the appropriate places in virt layers and compute manager

 nova/compute/manager.py         |   12 ++++++++----
 nova/virt/driver.py             |   10 +++++-----
 nova/virt/fake.py               |    8 ++++----
 nova/virt/hyperv.py             |    6 +++---
 nova/virt/libvirt/connection.py |   14 +++++++-------
 nova/virt/vmwareapi_conn.py     |    6 +++---
 nova/virt/xenapi_conn.py        |    6 +++---
 7 files changed, 33 insertions(+), 29 deletions(-)

commit 43de3c5f6b5d65d981fbebf169c05d06faa6a09e
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 01:03:02 2011 -0700

    remove xenapi_net.py from network directory, as this functionality is now moved to virt layer

 nova/network/xenapi_net.py |   87 --------------------------------------------
 1 file changed, 87 deletions(-)

commit 979282fba8b9dc20bc6345a3b3c017d6339662fa
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 00:41:26 2011 -0700

    first cut of xenserver vif-plugging, some minor tweaks to libvirt plugging

 nova/virt/libvirt/connection.py |    8 +++-----
 nova/virt/libvirt/vif.py        |    5 +++--
 nova/virt/xenapi/vm_utils.py    |   22 ----------------------
 nova/virt/xenapi/vmops.py       |   34 ++++++++++++++++++++++++----------
 nova/virt/xenapi_conn.py        |    3 +++
 5 files changed, 33 insertions(+), 39 deletions(-)

commit a2b07be9fb30321eb35ba7b76fac5588c8c06300
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Wed Jul 20 16:18:31 2011 +0900

    Refactor device type checking.
    
    Modify duplicated logics to use newly added _get_volume_device_info().

 nova/virt/libvirt.xml.template  |    2 +-
 nova/virt/libvirt/connection.py |   31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

commit 038565bdc735ff7a227a39d2ee21df0e8194929b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 18:24:44 2011 -0700

    Modified alias ^Cd minor fixes

 bin/nova-manage                                    |    2 +-
 nova/api/openstack/contrib/createserverext.py      |    4 ++--
 nova/network/manager.py                            |    1 -
 .../api/openstack/contrib/test_createserverext.py  |    4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

commit e863b9929f6232558986c5397f8d318584f36325
Merge: c8de39d 77db06c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 17:48:44 2011 -0700

    Merged with trunk

commit c8de39d52d48fc14b851cdd5de8b0d356f3291dc
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 17:38:51 2011 -0700

    Reverted to original code, after network binding to project code is in integration code for testing new extension will be added

 nova/tests/__init__.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 6b47f87c9e22fa09cedc3e48b7c8dcf52b5d016a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 17:35:44 2011 -0700

    Fixed broken unit testcases after adding extension and minor code refactoring

 nova/api/openstack/contrib/createserverext.py      |   11 +-
 nova/api/openstack/create_instance_helper.py       |    9 -
 .../api/openstack/contrib/test_createserverext.py  |  637 ++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py           |  151 -----
 nova/tests/integrated/test_servers.py              |  216 -------
 5 files changed, 647 insertions(+), 377 deletions(-)

commit 6cbd1d860d6a3fe96417391c21fb79b1750ecdcf
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 15:35:54 2011 -0700

    Added a new extension instead of directly making changes to OS V1.1. API

 nova/api/openstack/contrib/createserverext.py |  234 +++++++++++++++++++++++++
 nova/api/openstack/create_instance_helper.py  |   51 +-----
 nova/api/openstack/extensions.py              |    9 +-
 nova/api/openstack/servers.py                 |   35 ++--
 4 files changed, 262 insertions(+), 67 deletions(-)

commit c5cb902d19c890dd20e5120017973ea0172dd428
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 15:29:12 2011 -0700

    have to use string 'none' and add a note

 nova/image/glance.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit e22b4f1b80f60e7235ef6a1af7d6a7c2df88effe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 15:12:24 2011 -0700

    tell glance to not filter out private images

 nova/image/glance.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit bc2747faf2164833b3e5412dd226f9ee431b1bbf
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 19 17:51:43 2011 -0400

    updated links to use proper atom:link per spec

 nova/api/openstack/versions.py            |   36 ++++++++++++++++++++++++++++-
 nova/tests/api/openstack/test_versions.py |    8 ++-----
 2 files changed, 37 insertions(+), 7 deletions(-)

commit 6fafda1ffbf2838ef33a4948303f24ed075c292d
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 06:42:49 2011 +0900

    Renamed setup_vif_network to plug_vif

 nova/compute/manager.py         |   20 ++++++++++++--------
 nova/network/manager.py         |    4 +++-
 nova/virt/libvirt/connection.py |   11 ++++-------
 nova/virt/libvirt/vif.py        |   16 ++++------------
 nova/virt/vif.py                |    4 ++--
 5 files changed, 25 insertions(+), 30 deletions(-)

commit 45bdf5cc27c9389255d32ad189a561b967b8f89e
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 16:25:16 2011 -0500

    Fixes lp813006 - inconsistent DB API naming

 nova/compute/instance_types.py                |    2 +-
 nova/db/api.py                                |    4 ++--
 nova/db/sqlalchemy/api.py                     |    2 +-
 nova/network/manager.py                       |    3 +--
 nova/tests/db/fakes.py                        |    8 ++++----
 nova/tests/test_instance_types_extra_specs.py |    8 ++++----
 nova/tests/test_network.py                    |    4 ++--
 nova/virt/libvirt/netutils.py                 |    2 +-
 8 files changed, 16 insertions(+), 17 deletions(-)

commit 1d4a789ed370fe0cc00c292f89b96b0ffaf115ff
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 19 14:16:14 2011 -0700

    move import network to the top

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8a562edf819085820c1d6b4639f2331330cc454
Merge: aa3df15 9fe72ac
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 06:01:11 2011 +0900

    Merged lp:~danwent/nova/network-refactoring-l2

commit 12441aae27572a8966a42ff6c5b16cfc7195a634
Merge: ecb68bf 77db06c
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 19 13:56:28 2011 -0700

    merged from trunk

commit ecb68bf77565cb01ec0ea4d28c7f1315e10b21c4
Author: John Tran <jhtran@att.com>
Date:   Tue Jul 19 13:49:05 2011 -0700

    network api release_floating_ip method checks if an instance associated to the floating prior to releasing.  added test

 nova/network/api.py      |    3 +++
 nova/tests/test_cloud.py |   29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

commit aa3df15fa304894d9e62e3282956fe406a89b136
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 05:41:09 2011 +0900

    Added detroy_vif_network

 nova/virt/libvirt/connection.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit b2637c282fba3d542c4e157e3e5e22046d28bb29
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 15:21:39 2011 -0500

    Functionality fixed and new test passing

 nova/compute/manager.py    |   12 ++++++++----
 nova/tests/test_compute.py |   42 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 5 deletions(-)

commit 4b4bebad3b44e7b55e55a005a3629aebf50ecfa2
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jul 19 15:51:45 2011 -0400

    Updates to the compute API and manager so that rebuild, reboot, snapshots,
    and password resets work with the most recent versions of novaclient.

 nova/api/openstack/servers.py |    4 ++--
 nova/compute/api.py           |    6 ++++++
 nova/compute/manager.py       |    5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

commit d8132fd792d3316420033435a43604f7e09cfcdb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jul 19 14:29:44 2011 -0500

    better handling of periodic network host setup

 nova/network/manager.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit ef7de73bd5855e68484b6e0f1c446b65931a6880
Merge: 22b54cf 77db06c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 04:20:15 2011 +0900

    Merged trunk

commit 22b54cf790a60ecf255ce6eb8161105d81761fc6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 04:12:37 2011 +0900

    Removed blank lines

 nova/api/openstack/contrib/vifs.py |    1 -
 nova/virt/libvirt/vif.py           |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 36f8bd801bc8a7696e7850613747a5f7ae8c487a
Author: Adam Gandelman <adamg@canonical.com>
Date:   Tue Jul 19 10:19:10 2011 -0700

    Fix unchecked key reference to mappings['gateway6']. Fixes LP #807764.

 nova/virt/libvirt/connection.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit cfa755c6f3bbcc3dd376d66b3722021ad4b4ec62
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 10:00:00 2011 -0700

    add downgrade

 .../migrate_repo/versions/033_ha_network.py        |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 10c089ffbae29b8a2af120bff37d889e1e0688f4
Merge: 7e204b9 77db06c
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 11:26:50 2011 -0500

    Merge from trunk

commit 9febf1eec69708d8c54b6348e882da384d8b42a9
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Jul 19 12:26:41 2011 -0400

    correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)
    
    This fixes the logic, so that lxc and uml will not get vnc arguments added to
    their libvirt xml.  To also seems more readable to me.

 nova/virt/libvirt/connection.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 7e204b9df840c597a137b605a0d640222a5b97b6
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 11:25:33 2011 -0500

    Beginnings of the patch

 nova/compute/manager.py    |    4 +++-
 nova/tests/test_compute.py |   11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 09c14af77b5fbb721316ca18abe4b93bd8bf6fdf
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 00:58:19 2011 +0900

    Fixed equality comparison bug in libvirt XML

 nova/virt/libvirt.xml.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f55a362c0893c464055b125f6ef2853a8d26a4b5
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 00:57:35 2011 +0900

    Fixed bad parameters to setup_vif_networks

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 90c8a7c73d2f12b761440c2e2d14002f6897a438
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jul 19 11:04:36 2011 -0400

    Zapped an extra newline

 run_tests.sh |    1 -
 1 file changed, 1 deletion(-)

commit cd8142d16ba629cf59b9c6be673989e8f3303e1a
Merge: e68d53d 77db06c
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Tue Jul 19 15:55:22 2011 +0100

    Merged with trunk

commit 05751530cdd3a0833025435403f9312da1e2feee
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jul 19 10:52:38 2011 -0400

    Add support for generating local code coverage report

 .bzrignore   |    2 ++
 run_tests.sh |   14 ++++++++++++++
 2 files changed, 16 insertions(+)

commit 82e2eeb5a097f1c3c6cb56fc3dfa862575f5da9a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 19 09:36:37 2011 -0400

    respecting use_ipv6 flag if set to False

 nova/api/openstack/views/addresses.py    |   10 +++++--
 nova/tests/api/openstack/test_servers.py |   45 ++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

commit aad41d0c9469835017e91f0d9ba25efb052e0f92
Merge: b9d3164 77db06c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 19 09:25:56 2011 -0400

    merged trunk

commit 9356ab2c970543baa243c270414b51e966f231b6
Merge: ae7bd07 77db06c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 19 09:25:10 2011 -0400

    merged trunk

commit 20071a5bdbae426ffe6f8251273a4d471f1af805
Merge: ca92390 77db06c
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jul 19 22:22:38 2011 +0900

    fixed reviewer's comment. 1. ctxt -> context, 2. erase unnecessary exception message from nova.sccheduler.driver

commit 9fe72ac7b0ed0f8e294b97e267393f352c4af97f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jul 19 00:40:05 2011 -0700

    cleanup

 nova/api/openstack/contrib/vifs.py |    1 -
 nova/compute/manager.py            |    8 ++++----
 nova/network/manager.py            |    2 --
 nova/virt/libvirt/connection.py    |    2 +-
 nova/virt/libvirt/vif.py           |   16 ++++++++--------
 nova/virt/vif.py                   |    1 +
 6 files changed, 14 insertions(+), 16 deletions(-)

commit 7e4a23c489946eb5e6a1568d197cab34367d8078
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jul 19 00:26:58 2011 -0700

    merge of ovs L2 branch

 nova/compute/manager.py         |   20 ++++++++++++++-----
 nova/network/manager.py         |    2 ++
 nova/virt/libvirt.xml.template  |    4 ++--
 nova/virt/libvirt/connection.py |   23 +++++++++++++++++-----
 nova/virt/libvirt/vif.py        |   41 ++++++++++++++++++++++++++++++++++++---
 nova/virt/xenapi_conn.py        |    2 +-
 6 files changed, 76 insertions(+), 16 deletions(-)

commit 39701e13188275fc2f798a790e2edc4488ecb3e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:35:14 2011 -0700

    missed the vpn kwarg in rpc

 nova/network/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 89ead61d521c8f585732d50b8d3d31361d7c1d82
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:26:38 2011 -0700

    fix bad merge

 nova/network/manager.py |    8 --------
 1 file changed, 8 deletions(-)

commit 87434352e7dc165d269b5831af8ff690fcdbdb5b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:17:30 2011 -0700

    change migration number

 .../migrate_repo/versions/032_ha_network.py        |   37 --------------------
 .../migrate_repo/versions/033_ha_network.py        |   37 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 37 deletions(-)

commit b5ceab5a46ffac11cb229de86c49802bba3fa383
Merge: 67e5492 77db06c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 16:58:23 2011 -0700

    merged trunk

commit 77db06c908f9c08c80beb11241c0e23247129ad6
Merge: d101bb5 d5307a2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jul 18 23:42:02 2011 +0000

    This change adds the basic boot-from-volume support to the image service.
    
    Specifically following API will supports --block-device-mapping with volume/snapshot and root device name
    
    - register image
    
    - describe image
    
    - create image(newly support)
    
    
    
    At the moment swap and ephemeral aren't supported yet. They will be supported with the next step
    
    
    
    Next step
    
    - describe instance attribute with euca command
    
    - get metadata for bundle volume
    
    - swap/ephemeral device support

commit 115727a7cd41e703b35b6b061b64d097b9bbbf1d
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 18 17:58:33 2011 -0500

    Fixed the broken tests again

 nova/compute/manager.py    |    5 ++---
 nova/tests/test_compute.py |    6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 57e2f89311f59ac4f64a08d7952cfce316d030a4
Merge: 435c205 8bc0dcc
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 18 17:20:39 2011 -0500

    Merging from upstream

commit 8bc0dcc54a7218bd9f567c5719718f540f6ac549
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Mon Jul 18 22:16:38 2011 +0000

    Some missed instance_id casts

 nova/compute/manager.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit acf3e24c4b6d782543c1b8cdc4d25c9d129ecb95
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 17:45:39 2011 -0400

    pep8 cleanup

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8fb5c18abf4d9cc04bd63a451c8815a34c1226b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 17:36:42 2011 -0400

    adding --fixes

commit 55de6a262f40024c2c9c8f7c6e84c56eaa14d206
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 17:34:36 2011 -0400

    adding fixed_ipv6 property to VirtualInterface model; exposing ipv6 in api

 nova/api/openstack/views/addresses.py    |   22 ++++++++++++++++++----
 nova/db/sqlalchemy/api.py                |    2 +-
 nova/db/sqlalchemy/models.py             |   13 +++++++++++++
 nova/tests/api/openstack/test_servers.py |    6 ++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

commit 3983bca4c9528d286b4e154956ceb749b4875274
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 18 14:00:19 2011 -0700

    VSA schedulers reorg

 bin/nova-manage                |    2 +
 nova/scheduler/vsa.py          |  267 ++++++++++++++++++++++------------------
 nova/scheduler/zone_manager.py |    4 +-
 3 files changed, 149 insertions(+), 124 deletions(-)

commit 6d410105828c4dbfa11df5dd146b3b2591a24409
Merge: b4fba58 cf25ab3
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 18 12:19:31 2011 -0700

    Merged with trunk

commit 67e5492d6723a00b0ad5d7e8c44f5762a9b0a206
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 12:16:10 2011 -0700

    fix issues that were breaking vlan mode

 bin/nova-manage           |    8 ++++----
 nova/db/sqlalchemy/api.py |    4 +---
 nova/network/manager.py   |    2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

commit 86fe4915eeb656abb2abb5fb3c6875a77443b105
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 15:09:39 2011 -0400

    fixing bad lookup

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d101bb53cf310e1f093c46cdbdbe2c5b0207e49e
Merge: cf25ab3 813253e
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jul 18 19:07:20 2011 +0000

    Updates to the XenServer agent plugin to fix file injection:
    
      -Update _agent_has_method so that it parses the features 'message' from nova-agent correctly. (it was trying to call .split on a dict).
      -Rip out the agent_has_method caching functionality which just plain wasn't working (with XenServer 5.6 SP2).
      -Pass the arg_dict to _agent_has_method. This fixes an issue where a subsequent call to xenstore.write_record didn't get the 'dom_id' (KeyError).
      -Fix a string formatting issue in inject_file in creating the b64 data.

commit 813253e8bea9a8db9c1df45f9aa5e094503a015a
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jul 18 13:18:16 2011 -0400

    Don't jsonify the inject_file response. It is already json.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    1 -
 1 file changed, 1 deletion(-)

commit 15bbaf8bbdd48231f9ce98e4d8867b0477b44645
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 18 09:57:31 2011 -0700

    localization changes. Removed vsa params from volume cloud API. Alex changes

 nova/api/ec2/cloud.py   |   19 ++-----------------
 nova/scheduler/vsa.py   |    8 ++++----
 nova/vsa/api.py         |   11 +++++++----
 nova/vsa/drive_types.py |    8 --------
 nova/vsa/manager.py     |    6 ++++--
 5 files changed, 17 insertions(+), 35 deletions(-)

commit cc7c1c49cb15d39445e94c248697d62f63a014a7
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 18 08:59:00 2011 -0700

    Added auth info to XML

 nova/vsa/api.py |    4 ++++
 1 file changed, 4 insertions(+)

commit cf14d867673e944cc0c0d5fc160d2fbcfe56e98e
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jul 18 10:29:49 2011 -0400

    returncode is an integer.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c7a15b520ca55871c2e3ff3ff9024695c281105
Merge: cf25ab3 43713a2
Author: Arvind Somy <asomya@cisco.com>
Date:   Mon Jul 18 10:04:13 2011 -0400

    - Fixed the conflift in vmops.py

commit b927674112849e7b4ebbd59c188d8f7a1eb47e2a
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jul 18 09:38:50 2011 -0400

    Check returncode in get_agent_features.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ab42384131077bae3986141279b605d8f994143c
Author: John Tran <jhtran@att.com>
Date:   Mon Jul 18 03:45:16 2011 +0000

    resolved pep8 issues

 nova/api/ec2/cloud.py    |   33 ++++++++++++++++++---------------
 nova/tests/test_cloud.py |   14 +++++++++-----
 2 files changed, 27 insertions(+), 20 deletions(-)

commit 3fd9b0dbfcb42422a88c9b21f5353fdb9eea1fc1
Merge: b0a02fe cf25ab3
Author: John Tran <jhtran@att.com>
Date:   Mon Jul 18 03:03:57 2011 +0000

    merged from trunk

commit b9d316452a1e2a204e56d1434feade1ab0bd281c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 22:50:10 2011 -0400

    Updated servers to choose XML serializer based on api version

 nova/api/openstack/servers.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 596b38b8c899727c4750aa9b5a05a1ab2c2ecad3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 22:29:28 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e23e70afd096ca1d7ad22c776f6f439986bbc8b5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 22:28:16 2011 -0400

    updated servers to use ServerXMLSerializer

 nova/api/openstack/servers.py            |    3 +-
 nova/tests/api/openstack/test_servers.py |   71 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

commit 8ab775585fee4af7b30a28a5bffae46c23ec76d1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 21:36:57 2011 -0400

    added 'create' to server XML serializer

 nova/api/openstack/servers.py            |    7 ++
 nova/tests/api/openstack/test_servers.py |  123 ++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

commit baaaa80d36570d5734ac823bc49be8ff2477e5c2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 21:24:02 2011 -0400

    added 'detail' to server XML serializer

 nova/api/openstack/servers.py            |    7 ++
 nova/tests/api/openstack/test_servers.py |  188 ++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+)

commit e68d53df98890f424e361c7c79a5b2cd62723963
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon Jul 18 00:41:51 2011 +0100

    convert group_name to string, incase it's a long

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit beb2337f002178b7e764f3a6dcbab4637321aa34
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon Jul 18 00:22:01 2011 +0100

    nova/api/ec2/cloud.py: Rearranged imports to be alphabetical as per HACKING.

 nova/api/ec2/cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9d0b441939ab5a9227e91bb868f499d700c7c907
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon Jul 18 00:16:53 2011 +0100

    pep8'd

 nova/api/ec2/cloud.py  |    6 +++---
 nova/exception.py      |    6 ++++--
 nova/tests/test_api.py |    4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

commit 64a03d48bd714672a3d68136d365bf941201affa
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon Jul 18 00:06:48 2011 +0100

    Extended test to check for error specific error code and test cover for bad chars.

 nova/tests/test_api.py |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 5c6e4aa80672966ad4449007feea970cd62dee10
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sun Jul 17 23:52:50 2011 +0100

    Some basic validation for creating ec2 security groups. (LP: #715443)

 nova/api/ec2/__init__.py |    4 ++++
 nova/api/ec2/cloud.py    |   17 +++++++++++++++++
 nova/exception.py        |    4 ++++
 3 files changed, 25 insertions(+)

commit b0a02feb7bd25380a75b83344e0ac3210a168387
Author: John Tran <jhtran@att.com>
Date:   Sun Jul 17 22:07:07 2011 +0000

    changed to avoid localization test failure

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 718d4cf5cd4122bcecf0974c441d098f57a124b0
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sun Jul 17 22:49:22 2011 +0100

    Initial test case proving we have a bug of, ec2 security group name can exceed 255 chars.

 nova/tests/test_api.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 712493f65415a7a5fc727f6b316c66ef90f1cad5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 14:50:44 2011 -0400

    added index to servers xml serializer

 nova/api/openstack/servers.py            |   29 +++++++++++++++
 nova/tests/api/openstack/test_servers.py |   57 ++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

commit 3233d6cafb22305f09c1384ba30e677751cace6a
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Jul 16 23:30:47 2011 -0400

    Change _agent_has_method to _get_agent_features. Update the inject
    files function so that it calls _get_agent_features only once per injected
    file.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit c538d38d890e74382e928d225e8abdc57da9760e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sat Jul 16 19:45:28 2011 -0400

    pep8

 nova/api/openstack/image_metadata.py     |    2 +-
 nova/api/openstack/servers.py            |    1 -
 nova/tests/api/openstack/test_servers.py |    3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

commit 7af043463a350cfc71c45ff719354511173b5c39
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sat Jul 16 19:39:27 2011 -0400

    Moved Metadata Serialization Test

 nova/api/openstack/image_metadata.py            |    3 +-
 nova/api/openstack/images.py                    |    2 +-
 nova/tests/api/openstack/test_common.py         |  132 +++++++++++++++++++++++
 nova/tests/api/openstack/test_image_metadata.py |  132 -----------------------
 4 files changed, 135 insertions(+), 134 deletions(-)

commit 64a9c37cbf070345831ba6e4db646c5d972e179b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sat Jul 16 19:17:08 2011 -0400

    Added ServerXMLSerializer with working 'show' method
    Factored out MetadataXMLSerializer from images and servers into common

 nova/api/openstack/common.py             |   50 +++++++++++++++++
 nova/api/openstack/image_metadata.py     |   49 ----------------
 nova/api/openstack/images.py             |    4 +-
 nova/api/openstack/servers.py            |   89 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |   12 +++-
 5 files changed, 150 insertions(+), 54 deletions(-)

commit d340d7e90e245c79182906d603aec57d086cca1f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:25:37 2011 -0700

    added missing drive_types.py

 nova/vsa/drive_types.py |  106 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

commit f6844960dd062154244c706283cf1916ee7194ff
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:11:13 2011 -0700

    added missing instance_get_all_by_vsa

 nova/db/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit f21dad5a5ad8e06a4c86510bfa3bc430442328f4
Merge: b814f9f cf25ab3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:04:01 2011 -0700

    merged with 1280

commit b814f9fef3efa1bdcb7e03a9161e08721b7bc8c4
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 17:56:27 2011 -0700

    VSA: first cut. merged with 1279

 Authors                                            |    1 +
 bin/nova-manage                                    |  250 +++++++++-
 nova/CA/projects/.gitignore                        |    1 -
 nova/CA/reqs/.gitignore                            |    1 -
 nova/api/ec2/__init__.py                           |    4 +
 nova/api/ec2/cloud.py                              |  164 ++++++-
 nova/api/openstack/contrib/drive_types.py          |  147 ++++++
 .../openstack/contrib/virtual_storage_arrays.py    |  454 ++++++++++++++++++
 nova/api/openstack/contrib/volumes.py              |   14 +-
 nova/compute/api.py                                |   10 +-
 nova/db/api.py                                     |   88 +++-
 nova/db/sqlalchemy/api.py                          |  291 ++++++++++++
 .../migrate_repo/versions/032_add_vsa_data.py      |  152 ++++++
 nova/db/sqlalchemy/migration.py                    |    3 +-
 nova/db/sqlalchemy/models.py                       |   95 ++++
 nova/exception.py                                  |   20 +
 nova/flags.py                                      |   27 ++
 nova/quota.py                                      |    4 +-
 nova/scheduler/vsa.py                              |  495 ++++++++++++++++++++
 nova/tests/test_libvirt.py                         |    2 +-
 nova/volume/api.py                                 |   46 +-
 nova/volume/driver.py                              |   20 +-
 nova/volume/manager.py                             |  121 ++++-
 nova/volume/san.py                                 |  323 ++++++++++++-
 nova/vsa/__init__.py                               |   18 +
 nova/vsa/api.py                                    |  407 ++++++++++++++++
 nova/vsa/connection.py                             |   25 +
 nova/vsa/fake.py                                   |   22 +
 nova/vsa/manager.py                                |  172 +++++++
 29 files changed, 3328 insertions(+), 49 deletions(-)

commit cf25ab33cb7d6b5e233a767ad96b3c45b1387b5e
Merge: 48b28b0 a48041f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat Jul 16 00:46:09 2011 +0000

    Added some unit and integration tests for updating the server name via the openstack api.

commit 7498fa608def9613552cf0e26dcb03fddf7b298d
Author: John Tran <jhtran@att.com>
Date:   Fri Jul 15 22:56:16 2011 +0000

    renamed priv method arg_to_dict since it's not just used for revoke.  modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data

 nova/api/ec2/cloud.py    |   83 ++++++++++++++++++++++++++++++++++++++--------
 nova/tests/test_cloud.py |   47 ++++++++++++++++++++++----
 2 files changed, 110 insertions(+), 20 deletions(-)

commit ae7bd07b67b8d7feedbe01a62ebabca217473f13
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 16:37:20 2011 -0400

    got rid of return_server_with_interfaces and added return_server_with_attributes

 nova/tests/api/openstack/test_servers.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 74d8a358193c9119f2edd17300eebd699ed6e755
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 16:30:39 2011 -0400

    Added ServerXMLSerializationTest

 nova/tests/api/openstack/test_servers.py |  142 ++++++++++++++++++++++++++++--
 1 file changed, 136 insertions(+), 6 deletions(-)

commit 910dd2124123d8e1989ce85d57bcc2a245e39683
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 16:04:41 2011 -0400

    take out print statements

 nova/api/openstack/views/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 48b28b04be3b2f7a4aa5f124b66f1e1f669cb546
Merge: 3a11738 1539866
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 15 19:46:03 2011 +0000

    Ensures a bookmark link is returned in GET /images. Before, it was only returned in GET /images/detail

commit 435c205ddc04c5d5c33d23a326ade38dab8ed943
Author: matt.dietz@rackspace.com <>
Date:   Fri Jul 15 14:20:44 2011 -0500

    One last nit

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f3286494146cb2eb0f7aaf7efedfc133ec03bc25
Merge: 4c779a8 c8a3534
Author: matt.dietz@rackspace.com <>
Date:   Fri Jul 15 14:17:04 2011 -0500

    Tests passing again

commit 86ff6760b33671bd8bd9ddf808c7252f434d0931
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:14:58 2011 -0400

    put maxDiff in setUp

 nova/tests/api/openstack/test_servers.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit 1e16da70134537ae53d0c79214e70f0f06b14dd2
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:10:15 2011 -0400

    remove get_uuid_from_href and tests

 nova/api/openstack/common.py            |   23 -----------------------
 nova/api/openstack/views/servers.py     |    1 -
 nova/tests/api/openstack/test_common.py |   12 ------------
 3 files changed, 36 deletions(-)

commit 63d9a592823cdb2e120514137a1d71d838b336d7
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:08:31 2011 -0400

    stop using get_uuid_from_href for now

 nova/api/openstack/views/servers.py      |   36 +++++++++++-------------------
 nova/tests/api/openstack/test_servers.py |    1 +
 2 files changed, 14 insertions(+), 23 deletions(-)

commit c8a35349be912bb862789059abc95ccf9f7b8ef5
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Jul 15 19:07:58 2011 +0000

    Updated with some changes from manual testing

 nova/compute/api.py     |   14 +++++++++-----
 nova/compute/manager.py |   21 +++++++++++++++------
 nova/exception.py       |    2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

commit 58eb29ebe4376a276a54f4fd984802a0e50fb8e3
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jul 15 15:05:46 2011 -0400

    Updates to the XenServer agent plugin to fix file injection:
    
    -Update _agent_has_method so that it parses the features 'message' from
     nova-agent correctly. (it was trying to call .split on a dict).
    -Rip out the agent_has_method caching functionality which just plain
     isn't working with XenServer 5.6 SP2.
    -Pass the arg_dict to _agent_has_method. This fixes an issue where a
     subsequent call to xenstore.write_record didn't get the 'dom_id' (KeyError).
    -Fix a string formatting issue in inject_file in creating the b64 data.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   44 +++++++++------------
 1 file changed, 19 insertions(+), 25 deletions(-)

commit 1dcc37a2c129a225f83c5cc391412d5ac08b869a
Merge: 486afc9 3a11738
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 15 14:46:47 2011 -0400

    merging trunk

commit 1c6837c7940ed979a05a063595f4d7e7a2154ee9
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 14:43:33 2011 -0400

    use id in links instead of uuid

 nova/api/openstack/views/servers.py      |    4 +--
 nova/tests/api/openstack/test_servers.py |   40 ++++++++++++------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

commit 054f828d341b6cc576e30744a39d443af7784fd9
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 14:05:26 2011 -0400

    pep8 fixes

 nova/api/openstack/views/servers.py      |    1 -
 nova/tests/api/openstack/test_servers.py |   35 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

commit 14b5361d975ee017d95c159a9249d7e6dac662d9
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 13:45:56 2011 -0400

    fix ServersViewBuilderV11Tests

 nova/tests/api/openstack/test_servers.py |   45 ++++++++++--------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

commit 3a11738f517999ed1fd3a2c0a7ca452c7191b50f
Merge: 549b1e1 ac6dcb5
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 15 17:01:31 2011 +0000

    Adds greater configuration flexibility to rate limiting via api-paste.ini.  In particular:
    
    * "limits" relation provides a string representation of desired default limits in the form:
    
      - '(VERB, URI, REGEX, VALUE, UNIT); (VERB, URI, REGEX, VALUE, UNIT)'[...]
    
        + VALUE must be an integer, and UNIT must be one of SECOND, MINUTE, HOUR, DAY (case insensitive)
    
        + Empty string is also a valid value
    
    * "user:<username>" relations specify limits in the same format, but per user.
    
    * "limiter" relation can specify an alternate class to use in place of Limiter.
    
      - This makes it easier to use WsgiLimiterProxy if desired
    
    (All these relations are specified in the '[filter:ratelimit]' section.)

commit 1e7b21452a2e622b94531bea59c68e6abcded40a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 12:44:40 2011 -0400

    return id and uuid for now

 nova/api/openstack/views/servers.py      |    3 ++-
 nova/tests/api/openstack/test_servers.py |   16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

commit 3a2dbab191ded08da47fbe184d8f3865a8c835fe
Merge: 70e4516 4432dc1
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 12:09:21 2011 -0400

    merge with trunk

commit 549b1e180a724617b1904a8037364a41bcc06269
Merge: 4432dc1 3a89f16
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jul 15 15:51:15 2011 +0000

    Adds distributed scheduler and multinic docs to the Developer Reference page.

commit 70e4516173ed0e3efa5a4a6c88dafe8869530e06
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:48:09 2011 -0400

    Added more view builder tests

 nova/tests/api/openstack/test_servers.py |  124 +++++++++++++++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)

commit baa63fe9a01c1059d3623a9d7c8746680f94285a
Merge: a36d933 8d0ab9a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:31:02 2011 -0400

    merged wills revisions

commit a36d93372db8556b70d28cf52644da38c7f9a02f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:29:06 2011 -0400

    Added ViewBuilderV11 tests
    Fixed bug with build detail

 nova/api/openstack/views/servers.py      |   19 ++++---
 nova/tests/api/openstack/test_servers.py |   85 ++++++++++++++++++------------
 2 files changed, 64 insertions(+), 40 deletions(-)

commit 8d0ab9a9e927a82160f668ead2bd4daff481796c
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 09:57:28 2011 -0400

    fix issues with uuid and old tests

 nova/tests/api/openstack/test_servers.py |   44 ++++++++++++++----------------
 1 file changed, 20 insertions(+), 24 deletions(-)

commit 4432dc1fdf820f58a8afd701d6a87fee7725d10b
Merge: b353207 3eb382c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 15 13:56:09 2011 +0000

    - Present ip addresses in their actual networks, not just a static public/private
    - Floating ip addresses are grouped into the networks with their associated fixed ips
    - Add addresses attribute to server entities

commit b3532071f61fb8e66aa76fe66a71c704a119780f
Merge: ad700b0 6c3a8e1
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jul 15 12:51:30 2011 +0000

    Update the agent plugin so that it gets 'b64_contents' from the args dict instead of 'b64_file' (which isn't what nova sends).

commit a48041f7b587b91413a138264e0ec31ba4dcc78a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 15 04:33:20 2011 -0400

    Adding unit and integration tests for updating the server name via the 1.1 api.

 nova/tests/api/openstack/test_servers.py |   18 +++++++++++++++++-
 nova/tests/integrated/api/client.py      |   14 ++++++++++++++
 nova/tests/integrated/test_servers.py    |   19 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

commit cb172c1f085e7c22add4e0111bfc1fc199ace0bd
Merge: bfb4a87 ad700b0
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 11:46:33 2011 +0400

    merge with trunk, resolve conflicts

commit bfb4a870e44a90c004cd7d568eb35a50221c7bd5
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 11:13:21 2011 +0400

    remove argument help from docstrings + minor fix

 bin/nova-manage |  163 ++++++++++++++++---------------------------------------
 1 file changed, 48 insertions(+), 115 deletions(-)

commit ad700b0ecec0ffd8ed9c08caeb8f1f75fc4b482f
Merge: 168a218 0aeec37
Author: Stephanie Reese <reese.sm@gmail.com>
Date:   Fri Jul 15 06:52:32 2011 +0000

    Fixes Bug #810149 that had an incomplete regex

commit 168a2184b462b0cd8e09da3c3962146fcb6f3665
Merge: 5c4ff1e f98a067
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jul 15 06:46:30 2011 +0000

    Existing Windows agent behaves differently than the Unix agents and require some workarounds to operate properly. Fixes are going into the Windows agent to make it behave better, but workarounds are needed for compatibility with existing installed base.

commit 2d645197eb21a783de57cf10366db58fd41866fe
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jul 15 10:39:23 2011 +0400

    Add possibility to call commands without subcommands.

 bin/nova-manage |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 8a9c8bdc0cf6a79ed37090e595d2290fc900537c
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 08:27:16 2011 +0400

    fix redundency

 bin/nova-manage |    2 --
 1 file changed, 2 deletions(-)

commit 0aeec37c27e91d031ef53eeec9952c4f470990a1
Author: Stephanie Reese <reese.sm@gmail.com>
Date:   Thu Jul 14 23:12:42 2011 -0400

    Updated Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit dd78adbcf0b85f9473b5240af3366fb1dc2d4133
Author: Stephanie Reese <reese.sm@gmail.com>
Date:   Thu Jul 14 23:09:28 2011 -0400

    Fixed remove_version_from_href
    Added tests

 nova/api/openstack/common.py            |   13 ++++++++++---
 nova/tests/api/openstack/test_common.py |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

commit b4fba58f2785936f68a712d1cdd1d5c34f6a7c22
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 14 16:40:05 2011 -0700

    mistakenly commited this code into my branch, reverting it to original from trunk

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 793a02f30be7bcfd19d5651919c28fcbab8b1a24
Merge: 0655f97 5c4ff1e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 14 16:37:40 2011 -0700

    Merged with trunk and fixed pep errors

commit 0655f97b2cce1e28485ddb4c37a854a65cbbc276
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 14 15:53:16 2011 -0700

    added integrated unit testcases and minor fixes

 nova/api/openstack/create_instance_helper.py |    3 -
 nova/network/manager.py                      |    6 +-
 nova/tests/__init__.py                       |    3 +-
 nova/tests/api/openstack/test_servers.py     |    7 +
 nova/tests/integrated/test_servers.py        |  218 ++++++++++++++++++++++++++
 nova/tests/test_network.py                   |    8 -
 6 files changed, 231 insertions(+), 14 deletions(-)

commit 4c779a87651a37f9acf05f1101859a1ce4c288c1
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 14 17:49:29 2011 -0500

    First pass

 nova/compute/api.py                                |   15 ++--
 nova/compute/manager.py                            |   74 +++++++++++---------
 nova/db/sqlalchemy/api.py                          |   12 ++--
 .../032_change_instance_id_in_migrations.py        |   43 ++++++++++++
 nova/db/sqlalchemy/models.py                       |    3 +-
 nova/tests/test_compute.py                         |   24 ++++---
 6 files changed, 114 insertions(+), 57 deletions(-)

commit f98a0675ce2937675483e9f30e1b36d72a5b52e4
Merge: db7796b c1e7997
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jul 14 22:26:19 2011 +0000

    Merge with trunk

commit 5c4ff1e78588ffde1485f6376db3693ff9990701
Merge: b5af7c4 7d38598
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jul 14 22:06:37 2011 +0000

    corrected catching NoNetworksDefined exception in host setup and getting networks for instance

commit 7d3859833d0647cad15c614e816df9440bb99d44
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jul 14 16:52:27 2011 -0500

    catching the correct exception

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6cbce0442cf15d31e7ab05b808939bdc3a244f1b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 17:35:10 2011 -0400

    Added ServersTestv1_1 test case
    Changed servers links to use uuid instead of id

 nova/api/openstack/views/servers.py      |    4 +-
 nova/tests/api/openstack/test_servers.py |  129 ++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 2 deletions(-)

commit c7f8807ab545362c31be91a0f4081c7ef412f1e8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 16:02:52 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit 8435ffcaa7c154809c2687e011911cf1507497f2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 15:55:47 2011 -0400

    Updated old tests

 nova/tests/api/openstack/test_servers.py |   99 ++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 20 deletions(-)

commit b5af7c4df50812ba36a68b9a658f7df03ced0b1e
Merge: fa2cdbc ee14376
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Jul 14 19:13:15 2011 +0000

    add support to write to stdout rather than file if '-' is specified.
    see bug 810157

commit 3eb382ccd946844f9295156d29292310d67679ac
Merge: 38233d7 fa2cdbc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 14:47:14 2011 -0400

    merging trunk

commit 11e76f0e36f9da1840a9356b2e0a0dba87df3040
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 14:35:11 2011 -0400

    removed self links from flavors

 nova/api/openstack/views/servers.py      |   13 +++++--------
 nova/tests/api/openstack/test_servers.py |   14 +-------------
 2 files changed, 6 insertions(+), 21 deletions(-)

commit 40a9488b4b96fa809bd18f4a06018186a488507a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jul 14 22:34:49 2011 +0400

    added commands

 bin/nova-manage |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 38233d72aff36fbdb0fd49755458b7b5100366e1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 14:23:23 2011 -0400

    exposing floating ips

 nova/api/openstack/views/addresses.py    |   22 ++++++++++++----------
 nova/tests/api/openstack/test_servers.py |   16 ++++++++++++++--
 2 files changed, 26 insertions(+), 12 deletions(-)

commit 7044080daf2e487a92bba2a9f9b99e3cdb874e88
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 14:01:04 2011 -0400

    updated image entity for servers requests

 nova/api/openstack/views/servers.py      |   37 ++++++-----
 nova/tests/api/openstack/test_servers.py |   98 ++++++++++++++++++++++++++----
 2 files changed, 109 insertions(+), 26 deletions(-)

commit 6c3a8e16fb1347b0b5ecfc1850a4de5807004a2e
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jul 14 13:44:56 2011 -0400

    Update the agent plugin so that it gets 'b64_contents' from the args dict
    instead of 'b64_file' (which isn't what nova sends).

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ac6dcb5a8802d53390584fcde8cba8ca74c1d0d0
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 14 12:40:38 2011 -0500

    Use assertRaises instead of try/except--stupid brain-o

 nova/tests/api/openstack/test_limits.py |   35 +++++++++----------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

commit 3041f2e9eb90e447adbb48827c2c85ca27d436e6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 13:25:40 2011 -0400

    Added progress attribute to servers responses

 nova/api/openstack/views/servers.py      |    4 ++
 nova/tests/api/openstack/test_servers.py |   99 +++++++++++++++++++++++++++++-
 2 files changed, 101 insertions(+), 2 deletions(-)

commit 27b8d75f9b666ce08472270b38685d8e36a612d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 13:25:05 2011 -0400

    fixing bad merge

 nova/api/openstack/ips.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 008b8c0c01631ae636a47885604529da651a86da
Merge: cbf05e0 fa2cdbc
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 14 11:37:48 2011 -0500

    pull-up from trunk, while we're at it

commit cbf05e0b6351c9577e7e992da072d190c8c9a592
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 14 11:37:32 2011 -0500

    Comment on parse_limits(); expand an exception message; add unit tests; fix a minor discovered bug

 nova/api/openstack/limits.py            |   18 +++++--
 nova/tests/api/openstack/test_limits.py |   81 +++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 3 deletions(-)

commit 1539866314393e8565eef05f1f63dba9ffa69de3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 12:03:06 2011 -0400

    adding bookmark to images index

 nova/api/openstack/views/images.py      |   18 +++++++++++-------
 nova/tests/api/openstack/test_images.py |   14 ++++++++++----
 2 files changed, 21 insertions(+), 11 deletions(-)

commit 11f05e040ad50c64e4de46dc8f8e6246956f774b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 10:31:42 2011 -0400

    add updated and created to servers detail test, and make it work

 nova/api/openstack/views/servers.py      |    2 ++
 nova/tests/api/openstack/test_servers.py |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 10ef948271130db0dcc53b0ea94c3a47313244f4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 09:29:27 2011 -0400

    removing mox object instantiation from each test; renaming _param to filter_name

 nova/api/openstack/images.py            |    4 +-
 nova/tests/api/openstack/test_images.py |  112 +++++++++++++------------------
 2 files changed, 50 insertions(+), 66 deletions(-)

commit ee143766a32486664d47aee11f792854cbedd4ff
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Jul 14 07:08:02 2011 -0400

    add self to authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 7ed74cb999483e589e186944cb9116f507dbe60d
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Jul 13 22:01:52 2011 -0400

    use 'with' so that close is called on file handle

 bin/nova-manage |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 934e8ab289cd906a94170f0d53cc49edf2db0d6f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 19:32:17 2011 -0400

    adding new query parameters

 nova/api/openstack/images.py            |   13 ++-
 nova/tests/api/openstack/test_images.py |  142 +++++++++++++++++++++++--------
 2 files changed, 115 insertions(+), 40 deletions(-)

commit b9ea0f43c186d5fbc232b0ddd11c3e64898136ab
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Jul 13 17:16:27 2011 -0400

    support '-' to indicate stdout in nova-manage project 'environment' and 'zip'
    
    This just adds support to do:
      nova-manage project zip test-project admin - > out.zip
      nova-manage project environment test-project admin - | grep NOVA_URL

 bin/nova-manage |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit fa2cdbc5d4201ace6c1a6459bbd653b0b63b7667
Merge: 303f546 915c7d5
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Wed Jul 13 21:06:48 2011 +0000

    Improvements to nova-manage:
    1. nova-manage network list now shows what belongs to what project, and what's the vlan id, simplifying management in case of several networks/projects
    2. nova-manage server list [zone] - shows servers. Useful if you have many servers and want to list them in particular zone, instead of grep'ing nova-manage service list.

commit 2ecbdd46d48bafbeb451875ba6e7f67276d83602
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 13 13:57:50 2011 -0700

    Minor fixes

 nova/api/openstack/create_instance_helper.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9a77965327857e5b8acc2cfa083250f36743872b
Merge: 0b905cc 326074c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 13 13:56:35 2011 -0700

    Merged with Trunk

commit 38f949608fc3faaae855bf91719a074c1c545a1d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 16:22:55 2011 -0400

    updated to support and check for flavor links in server detail response

 nova/api/openstack/views/servers.py      |   11 +++++++++++
 nova/tests/api/openstack/test_servers.py |   31 +++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

commit 303f5467a13b8a5a61a2d6ee460538b3bd28fbb8
Merge: 326074c c0ba788
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 20:21:44 2011 +0000

    Updated responses for GET /images and GET /images/detail to respect the OSAPI v1.1 spec

commit 5392355f8de673eb357724c27e64f5eff83b9742
Merge: e1eca21 20b73cb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 16:01:11 2011 -0400

    merge

commit e1eca2190b66c745b425579affd2407e0ffd11c6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 15:59:05 2011 -0400

    beginning server detail spec 1.1 fixup

 nova/api/openstack/common.py             |   23 +++++++
 nova/api/openstack/views/servers.py      |   27 ++++++--
 nova/tests/api/openstack/test_common.py  |   12 ++++
 nova/tests/api/openstack/test_servers.py |  103 +++++++++++++++++++++++++-----
 4 files changed, 143 insertions(+), 22 deletions(-)

commit 6daf6d30dfeab459a0b672d909b115b1a5ce86c3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 13 14:41:13 2011 -0500

    Augment rate limiting to allow greater flexibility through the api-paste.ini configuration

 nova/api/openstack/limits.py            |   96 +++++++++++++++++++++++++++++--
 nova/tests/api/openstack/test_limits.py |   30 ++++++++--
 2 files changed, 116 insertions(+), 10 deletions(-)

commit 20b73cb6f57ef5313ce96d738200158601f776ab
Merge: ce146a7 326074c
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 13 15:11:11 2011 -0400

    merge from trunk

commit 0b905cc45b940579c6fc7363ecf5657d10a7aeed
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 13 12:07:05 2011 -0700

    added unit testcases for validating the requested networks

 nova/tests/test_network.py |  120 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)

commit 326074c903e8ec03b28154ea2547cf1dd00cdbac
Merge: b58e853 db13df6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 13 18:36:47 2011 +0000

    Extends the exception.wrap_exception decorator to optionally send an update to the notification system in the event of a failure.

commit db13df67f895c8e9b20e9faf4c488035c9f43e94
Merge: 72bdbc3 b58e853
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 13 11:19:32 2011 -0700

    trunk merge

commit bf7db726c3b26c8e13226cf5c1446befee6a6f2d
Merge: 132a476 b58e853
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 14:05:38 2011 -0400

    merging trunk

commit 132a47611b2fdbbb1e6c70a33bfd092854ea6e98
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 14:02:44 2011 -0400

    updating testing; simplifying instance-level code

 nova/api/openstack/servers.py            |    8 +-------
 nova/api/openstack/views/addresses.py    |    1 -
 nova/api/openstack/views/servers.py      |    2 +-
 nova/db/sqlalchemy/api.py                |    2 +-
 nova/tests/api/openstack/test_servers.py |   24 +++++++++++++++---------
 5 files changed, 18 insertions(+), 19 deletions(-)

commit 486afc9b9e38a68c18b80daab4f23c5b936ee185
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 11:17:05 2011 -0400

    pep8

 nova/api/openstack/servers.py               |    2 +-
 nova/tests/api/openstack/test_servers.py    |   44 +++++++++++++++------------
 nova/tests/integrated/integrated_helpers.py |    4 +--
 nova/tests/integrated/test_servers.py       |   21 ++++++-------
 4 files changed, 38 insertions(+), 33 deletions(-)

commit 880121c8498530d9c0e9a38e983c4d4518c1189e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 11:10:40 2011 -0400

    adding test; casting instance to dict to prevent sqlalchemy errors

 nova/api/openstack/__init__.py           |   13 ++++---------
 nova/api/openstack/ips.py                |    2 +-
 nova/api/openstack/servers.py            |    5 +++--
 nova/db/sqlalchemy/api.py                |    1 +
 nova/tests/api/openstack/test_servers.py |   16 ++++++++++++++++
 5 files changed, 25 insertions(+), 12 deletions(-)

commit ce146a76437401882e04305cc8ea64b3c638135e
Merge: b58e853 c085294
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 10:17:43 2011 -0400

    merged branch lp:~rackspace-titan/nova/images-response-formatting

commit 3a89f16ea07ebfc3d2c4e08ff9072b5020a5d348
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Jul 13 09:04:20 2011 -0500

    Add multinic doc and distributed scheduler doc to developer guide front page

 doc/source/devref/index.rst    |    7 +++++--
 doc/source/devref/multinic.rst |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

commit c0ba788ca2a25899578f729b00b7d8e2cd0a682a
Merge: c085294 b58e853
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 09:24:32 2011 -0400

    merged trunk

commit b58e853038e9c322be765600e225568689e5c479
Merge: 29ef49c f794139
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jul 13 12:51:29 2011 +0000

    Don't pop 'vpn' on kwargs inside a loop in RPCAllocateFixedIP._allocate_fixed_ips (fixes KeyError).
    
    Update allocate_fixed_ip methods in network manager to accept correct kwargs. (fixes regression in bzr 1266)

commit f794139e6ad70949bdaf26417989f3940e8af3b7
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jul 13 08:34:41 2011 -0400

    Added Mohammed Naser to Authors file.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 0beb900ec6a24f072b8cedcf45fc72e5a16a4787
Merge: ff19516 29ef49c
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jul 13 11:18:16 2011 +0400

    merge with trunk

commit ca92390f83850b75d447c9ecd2e4b8b4c50534ab
Merge: 840c3e0 1161171
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jul 13 14:38:15 2011 +0900

    fix reviewer's comment

commit 29ef49c205bf5d042e52a44dda8f16aca043b31c
Merge: 1161171 10a3b6c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 13 03:16:17 2011 +0000

    Starting part of multi-nic support in the guest. Adds the remove_fixed_ip code, but is incomplete as it needs the API extension that Vek is working on.

commit 7acb3d63cd2c487c78994e15f1e015d3b81febf8
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jul 12 21:50:12 2011 -0400

    Don't pop 'vpn' on kwargs inside a loop in RPCAllocateFixedIP._allocate_fixed_ips (fixes KeyError's).
    
    Fix allocate_fixed_ip method signature for FlatDHCP.

 nova/network/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6e75e608cc7260317f014e57ba070b152f83d0e7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 12 17:46:03 2011 -0700

    added unit test cases and minor changes (localization fix and added fixed_ip validation)

 nova/api/openstack/create_instance_helper.py |   18 ++-
 nova/tests/api/openstack/test_servers.py     |  200 +++++++++++++++++++++++++-
 2 files changed, 212 insertions(+), 6 deletions(-)

commit 952196a533c3577945a2c4245436d09eb75e0eb6
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Tue Jul 12 19:12:21 2011 -0400

    Made sure the network manager accepts kwargs for FlatManager

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 11611716e30f368df77816b40c4c77de0e0e047f
Merge: 76fbcb9 ee8c298
Author: Alexander Sakhnov <asakhnov@mirantis.com>
Date:   Tue Jul 12 20:56:10 2011 +0000

    Fix bug 809316. While attempting to launch cloudpipe instance via 'nova-manage vpn run' command, it comes up with IP from instances DHCP pool and not the second IP from the subnet, which break the forwarding rules that allow users to access the vpn.
    This is due 'allocate_fixed_ip' method in VlanManager doesn't receive 'vpn' as an argument from caller method and cloudpipe instances always considers as 'common' instances.

commit 07baabb67d9491da61fa5bfe9adc52f7ff744e22
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 12 16:02:39 2011 -0400

    cleanup

 nova/api/openstack/create_instance_helper.py |   24 ++++++---------
 nova/api/openstack/servers.py                |   41 +++++++++++---------------
 nova/tests/api/openstack/test_servers.py     |   37 +++++++----------------
 3 files changed, 37 insertions(+), 65 deletions(-)

commit 54be28647ac3ad401006bca3069b1dfc1a65d093
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 12 14:35:09 2011 -0400

    server create deserialization functional and tested

 nova/api/openstack/create_instance_helper.py |   81 +++--
 nova/api/openstack/servers.py                |   63 +++-
 nova/api/openstack/wsgi.py                   |   21 ++
 nova/tests/api/openstack/test_servers.py     |  414 +++++++++++++++++++++++---
 4 files changed, 508 insertions(+), 71 deletions(-)

commit 2be9a4e19449f9cf37f62f3f6e380de3e7ca0d38
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 12 11:28:06 2011 -0700

    added xml deserialization unit test cases and fixe some pep errors

 nova/api/openstack/create_instance_helper.py |    3 +-
 nova/tests/api/openstack/test_servers.py     |  144 ++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 1 deletion(-)

commit c085294ccb6a8d449ccfd5739be67ee12538f48f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 14:19:30 2011 -0400

    Updated some common.py functions to raise ValueErrors instead of HTTPBadRequests

 nova/api/openstack/common.py            |   13 +++++++------
 nova/tests/api/openstack/test_common.py |    4 ++--
 nova/tests/api/openstack/test_images.py |   22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)

commit 915c7d52fa1b2afe6af9686210982d5bc043be97
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Tue Jul 12 11:07:30 2011 -0700

    Renamed 'nova-manage server list' -> 'nova-manage host list' to differentiate physical hosts from VMs

 bin/nova-manage |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 51834c2141bdbc283b9d165372be08eb6b9409ca
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 12 10:36:55 2011 -0700

    Allowed empty networks, handled RemoteError properly, implemented xml format for networks and fixed broken unit test cases

 nova/api/openstack/create_instance_helper.py |   29 ++++++++++++++++++++------
 nova/network/manager.py                      |    4 ++--
 nova/tests/api/openstack/test_servers.py     |   14 +++++++++++++
 3 files changed, 39 insertions(+), 8 deletions(-)

commit 7a700362d63de1da51e9a890d854c3b0eeb97aae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 13:29:26 2011 -0400

    minor cleanup

 nova/api/openstack/wsgi.py              |    4 +++-
 nova/tests/api/openstack/test_images.py |   12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)

commit f4dc32ad0729b40ebe5765a57edff9535b992953
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:55:37 2011 -0400

    Updated ImageXMLSerializer to serialize links in the server entity

 nova/api/openstack/images.py            |    9 ++++-----
 nova/tests/api/openstack/test_images.py |   30 ++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

commit 3c8de7e99e7cd8868f63fb0d15845b2462b77b3e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:46:15 2011 -0400

    Updated images viewbuilder to return links in server entity

 nova/api/openstack/views/images.py      |   10 ++++++++++
 nova/tests/api/openstack/test_images.py |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 5ab2fd27ea930669c01f309dbbfb794fd7c37ad6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:42:56 2011 -0400

    updated images tests

 nova/tests/api/openstack/test_images.py |   74 ++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

commit cbcef100c16cc7368527c064ecc6fc7697928153
Merge: 5035768 76fbcb9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:13:02 2011 -0400

    merged trunk

commit 50357685282b9200ccc8c82361c5266f1f413531
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:11:49 2011 -0400

    pep8

 nova/tests/api/openstack/test_common.py |    6 ------
 1 file changed, 6 deletions(-)

commit 495137fb383766ae5345fd8b30610a93483c0eaf
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:01:13 2011 -0400

    Updated remove_version_from_href to be more intelligent
    Added tests

 nova/api/openstack/common.py            |   14 +++++++++--
 nova/tests/api/openstack/test_common.py |   39 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

commit ee8c298e4da1f59807d9223b33a7e3bb353641a9
Author: Alexander Sakhnov <asakhnov@mirantis.com>
Date:   Tue Jul 12 19:47:26 2011 +0400

    Fix PEP8 for 809316 bugfix.

 nova/network/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit db356e04fa79fc77a21017f2120580805a57010b
Author: Alexander Sakhnov <asakhnov@mirantis.com>
Date:   Tue Jul 12 17:25:42 2011 +0400

    Fix 809316 bug which prevent cloudpipe to get valid IP.

 Authors                 |    1 +
 nova/network/manager.py |   11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

commit 840c3e05c6c293810b1af0eacc5bea9942155c1b
Merge: 4001ee4 76fbcb9
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jul 12 17:59:24 2011 +0900

    fix reviewer's comment

commit 10a3b6c4e2ad1722ae4566f6ace997fe54769a36
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:59:01 2011 -0700

    stray debug

 nova/api/openstack/contrib/multinic.py |    1 -
 1 file changed, 1 deletion(-)

commit 46c59d20fd86f8ce6a57e7c663d893f6f5411d88
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:49:46 2011 -0700

    pep8

 nova/compute/api.py     |    2 +-
 nova/compute/manager.py |    2 +-
 nova/virt/driver.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 2ac53e21e99c45c801d4ff8f1db500dc98477585
Merge: 0c04ec9 d682fb4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:40:45 2011 -0700

    fixed marshalling problem to cast_compute...

commit bf30f9c1d65053aba29ffff8d8d9a3810455a082
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 16:02:46 2011 -0700

    fixed all failed unit test cases

 nova/compute/api.py        |    8 +++++---
 nova/tests/test_network.py |    5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

commit 76fbcb9bfd88a56c5a3419bf227cca28334f6844
Merge: fb34361 232bff1
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 21:51:33 2011 +0000

    This doesn't actually fix anything anymore, as the wsgi_refactor branch from Waldon took care of the issue. However, a couple rescue unit tests would have caught this originally, so I'm proposing this to include those.

commit fb34361314e580e8441caf71f979a0e2613962b8
Merge: fb9717a 5ba19f7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jul 11 21:31:18 2011 +0000

    fixes an issue where network host fails to start because a NoNetworksFound exception wasn't being handled correctly.

commit 232bff13a0363a09f9b12551c4cd02787cc73702
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 16:26:46 2011 -0500

    Bad test

 nova/tests/api/openstack/test_servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e30a9e1516e44d839ebd5b41586a32e99c47b8c9
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 14:25:51 2011 -0700

    unknowingly made these changes, reverting to original

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ba19f7d7d9e624be5aebce496f88120ea1175e4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jul 11 15:49:41 2011 -0500

    catch raise for networks not found in network host and instance setup

 nova/network/manager.py |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit 378215c20d372bc5617d6d1d7c32185def3cd59c
Merge: 2a6f979 fb9717a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 13:38:35 2011 -0700

    Merged with Trunk

commit 0b245e4ab91d2968b881fe01ae4f540e08371786
Merge: e20e6a8 fb9717a
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:37:03 2011 -0500

    Merge from trunk

commit 2a6f97940f71c056b4bfb0cd9a86f5d676abc4e1
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 13:34:39 2011 -0700

    add optional parameter networks to the Create server OS API

 bin/nova-manage                              |    6 +-
 nova/api/openstack/create_instance_helper.py |   55 +++++++++++-
 nova/compute/api.py                          |   34 +++++--
 nova/compute/manager.py                      |    4 +-
 nova/db/api.py                               |   32 +++++++
 nova/db/sqlalchemy/api.py                    |  125 +++++++++++++++++++++++++-
 nova/exception.py                            |   26 ++++++
 nova/network/api.py                          |    9 ++
 nova/network/manager.py                      |  125 +++++++++++++++++++++-----
 nova/utils.py                                |   16 ++++
 10 files changed, 394 insertions(+), 38 deletions(-)

commit e20e6a88c66aac240f18e6da604fc1e048f5b5ce
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:31:39 2011 -0500

    Changed broken perms

 0 files changed

commit 47c7a43ffcac3518543fdcc94ab54577249d9ced
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:08:53 2011 -0500

    Tests

 nova/tests/api/openstack/test_servers.py |   36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit fb9717a9057e881dca531516f7e65a8f9661c6f3
Merge: 92b0b61 efc5b19
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 19:47:23 2011 +0000

    Made xen plugins rpm noarch.

commit 92b0b614b1077bfc44bed0bd5d6e9e68d41c4f36
Merge: 11be49a 2aacfcb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 19:31:40 2011 +0000

    Set the proper return code for server delete requests

commit 559086fa3d435aeadee85d2e362d8e172b9f048e
Merge: 722cd2b 11be49a
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 14:25:08 2011 -0500

    Merge from trunk

commit efc5b1910d9c9cbe0d860e495c1bcaa1278cdc06
Merge: dcd1cbc 11be49a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 15:13:37 2011 -0400

    Merge from trunk.

commit dcd1cbc5e2ba5ee2a54dda4558d84d4ffc9850b9
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 15:12:47 2011 -0400

    Making the xen plugins rpm to be noarch.

 .../rpmbuild/SPECS/openstack-xen-plugins.spec      |    1 +
 1 file changed, 1 insertion(+)

commit 2aacfcbef233113ce25c52f1504bde9dd49f758e
Merge: 02b0ca3 11be49a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 14:41:29 2011 -0400

    merging trunk

commit 11be49aa59efc2d0d991d70546899b3625270af6
Merge: e938b69 ad23d0f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 18:36:38 2011 +0000

    Expanding OSAPI wsgi module to allow handling of headers and status codes

commit e938b698e5213fe6ab629fb9bef0ef59b736899c
Merge: d682fb4 b245dfd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 11 17:56:15 2011 +0000

    Updates some of the extra scripts in contrib and tools to current versions.

commit 02b0ca3e44626623c70d04ccaa50af8c75d640af
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:29:56 2011 -0400

    updating code to implement tests

 nova/api/openstack/servers.py       |    4 ++--
 nova/tests/integrated/api/client.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 07b8fc85bb5af2e76a9d970a3ea818aa65dc3b1f
Merge: 6a0b3b8 ad23d0f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:26:22 2011 -0400

    merging parent wsgi-refactor

commit ad23d0f354b8698b5314ed2a55e5a4d17abffba0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:16:22 2011 -0400

    allowing controllers to return Nonew

 nova/api/openstack/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6a0b3b8a143e60334dab7ed541caca1eba27c88b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:34:07 2011 -0400

    adding headers serializer

 nova/api/openstack/servers.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit ac894f7d4dfde9c4d818007e105860661b00fd04
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:33:53 2011 -0400

    pep8

 nova/tests/api/openstack/test_wsgi.py |    1 -
 1 file changed, 1 deletion(-)

commit 334f2215f0533e8181d40cd086e927e7913739f2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:31:38 2011 -0400

    minor refactoring

 nova/api/openstack/wsgi.py            |   52 ++++++++++++++-------
 nova/tests/api/openstack/test_wsgi.py |   83 +++++++++++++++++++++++----------
 2 files changed, 94 insertions(+), 41 deletions(-)

commit 722cd2b16f25b334cacad4bcc9df42202ea33166
Merge: 7142aa7 d682fb4
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 11:16:22 2011 -0500

    Merge from trunk

commit 0c04ec998a474da14ecf809168c6d80eb6638206
Merge: e6ebcbd 5230b28
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 09:13:55 2011 -0700

    minor tweaks

commit d682fb4431050d97f09fb9677f6dc8d242e68d74
Merge: 9095a49 d2c628c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jul 11 15:31:33 2011 +0000

    Adds an extension which makes add_fixed_ip() available through an OpenStack extension.

commit d2c628c0ecbae048fabaf60eff2afd4b8a9cd918
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jul 11 10:18:17 2011 -0500

    Comment out these two asserts; Sandy will uncomment in his merge-prop

 .../api/openstack/contrib/test_multinic_xs.py      |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9095a497dc7d645a77382ff3cabfca4154f39575
Merge: 5230b28 d326033
Author: Devendra Modium <dmodium@isi.edu>
Date:   Mon Jul 11 15:11:13 2011 +0000

    Fix the bug 800759.

commit 46f4cfddabd00a0b84ba9731dfa3a880950c73e7
Merge: 63ac91a b5ca0d7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 10:51:24 2011 -0400

    merging wsgi-refactor

commit 63ac91a2f62c2f07c7458e4f55a8e10e182b9fdf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 10:50:49 2011 -0400

    adding 204 response code

 nova/api/openstack/servers.py            |   33 ++++++++++++++++++++++--------
 nova/tests/api/openstack/test_servers.py |   16 +++++++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

commit e6ebcbd911467ed1a9a468a350c5488ac83811bd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 07:49:34 2011 -0700

    pre trunk merge

 nova/exception.py          |    4 ++++
 nova/network/manager.py    |    9 +++++----
 nova/tests/test_network.py |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

commit d326033f5ed4e8e24efddd4acf080ebfeb0caf2c
Author: Devendra Modium <dmodium@isi.edu>
Date:   Mon Jul 11 10:48:32 2011 -0400

    Missing Author updated

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 5230b28d9120201741059f2bab588118fe9b1c25
Merge: 6da178f a9b0dbb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 11 13:13:22 2011 +0000

    Allows for ports in serverRef in image create through the openstack api.

commit 6da178f06d77331edbf0ccf07d48aa8b2a1ae7e7
Merge: 0a2105d 8d2d02d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 11 13:06:55 2011 +0000

    Adds security groups to metadata server.  Also adds some basic tests for metadata code.

commit 4001ee488420589e345dc42001e6cab9c68a5e12
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jul 11 16:31:31 2011 +0900

    fix comments

 nova/compute/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 6906c3f01e4295fa61aa3ef6a9de9e91d942776b
Merge: 53b0fb0 6b5f32f
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jul 11 14:58:57 2011 +0900

    fix conflict

commit dea12df6165c3417efb0a3959462b9080be1bbca
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Mon Jul 11 05:21:06 2011 +0900

    Added vif OS API extension to get started on it

 nova/api/openstack/contrib/vifs.py |   86 ++++++++++++++++++++++++++++++++++++
 nova/network/api.py                |    4 ++
 2 files changed, 90 insertions(+)

commit 1da51f7b07f0080c44063a355c84fafd1fdf02bc
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Mon Jul 11 04:38:27 2011 +0900

    Moved 'setup_compute_network' logic into the virt layer

 nova/compute/manager.py          |   11 ++---
 nova/network/l2_drivers.py       |   56 ---------------------
 nova/network/linux_net.py        |    1 +
 nova/network/manager.py          |   56 +++------------------
 nova/virt/libvirt/connection.py  |   13 +++--
 nova/virt/libvirt/vif.py         |   99 ++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/vif_drivers.py |   76 -----------------------------
 nova/virt/vif.py                 |   29 +++++++++++
 8 files changed, 150 insertions(+), 191 deletions(-)

commit 9980a8a90c73f95440a760ae91bafc5b1f308931
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Sat Jul 9 22:00:27 2011 -0400

    Added myself to authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 9e7c7706a76ad76612ba75314d436a8ba419a3eb
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Sat Jul 9 21:45:54 2011 -0400

    Fixed two typos in rescue API command

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a2105dd88b400494d49fc7921deac4960b3515c
Merge: fab5c5a 17fceb2
Author: John Tran <jhtran@att.com>
Date:   Sat Jul 9 23:56:32 2011 +0000

    flaw in ec2 cloud api, _get_image method , if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister the ami instead. That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr

commit fab5c5a0f66d2ae9f85d82b6a40b45c3e20683f5
Merge: a5dc12c d287051
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sat Jul 9 23:41:04 2011 +0000

    Fixed up an incorrect key being used to check Zones.

commit 465f3d6c3c5386acd4dd3e34b33942e84758a3a6
Merge: 4858a27 a5dc12c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 19:03:31 2011 -0700

    merged trunk

commit 4858a276a4cb779de55d987f2b3c37db5bf24492
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 18:58:24 2011 -0700

    fix tests

 nova/tests/__init__.py     |    2 +-
 nova/tests/test_network.py |   16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

commit 71cbb30cfaf9b38786949fbf6314f0284e9a7efc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 18:45:13 2011 -0700

    make sure that old networks get the same dhcp ip so we don't break existing deployments

 nova/db/sqlalchemy/api.py |    7 ++++++-
 nova/network/manager.py   |    8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 5ef4e6e318caa038f2af31a930f6b2b952176661
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 18:28:25 2011 -0700

    cleaned up on set network host to _setup_network and made networks allocate ips dynamically

 nova/db/sqlalchemy/api.py |    2 +
 nova/network/api.py       |    3 +-
 nova/network/linux_net.py |    1 +
 nova/network/manager.py   |  184 +++++++++++++++++----------------------------
 4 files changed, 75 insertions(+), 115 deletions(-)

commit a5dc12c586f34fd92c7846ce7ec8ec2b86cc09de
Merge: 282ac84 93fe8b7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 22:36:22 2011 +0000

    Make the instance migration calls available via the API.

commit 282ac84e652d807a3927012192b5f79cc74d6426
Merge: 42765b2 209bf1e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 22:26:09 2011 +0000

    Add a flag to disable ec2 or osapi.

commit 209bf1ef495d2d599ef51e207e8de0694dec9790
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 17:12:14 2011 -0500

    Add a flag to disable ec2 or osapi.

 bin/nova-api  |   14 +++++++++-----
 nova/flags.py |    2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

commit b5ca0d793826ac10ee41be84f18d64b09113aa80
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 17:40:56 2011 -0400

    refactor

 nova/api/openstack/wsgi.py            |   25 ++++++++++++++-----------
 nova/tests/api/openstack/test_wsgi.py |    3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

commit fe8da67779dbb03654b1cce90eeafdb323507673
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 17:21:58 2011 -0400

    easing up content-type restrictions

 nova/api/openstack/wsgi.py            |    2 +-
 nova/tests/api/openstack/test_wsgi.py |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 17fceb2368d63dd937dc5e9385158c01130557a7
Author: John Tran <jhtran@att.com>
Date:   Fri Jul 8 14:19:35 2011 -0700

    peer review fix - per vish: 'This method automatically converts unknown formats to ami, which is the same logic used to display unknown images in the ec2 api.  This will allow you to properly deregister raw images, etc.'

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 93fe8b7844561f3872aa5afa5e85e7baf25f3ff4
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 14:50:52 2011 -0500

    Updated resize docstring.

 nova/compute/api.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 32a3cf25721173014fbd20c8f2954f015316f439
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 15:19:19 2011 -0400

    removing Content-Length requirement

 nova/api/openstack/wsgi.py |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

commit c98f37c00d802abf2ac85cb6c800f39e1b067d72
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 14:10:32 2011 -0500

    Add docstrings for multinic extension

 nova/api/openstack/contrib/multinic.py |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 921fee22ff42852b1ee0d7f3d051b44d60afd975
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 13:06:37 2011 -0500

    Add support for remove_fixed_ip()

 nova/api/openstack/contrib/multinic.py             |   20 +++++++++--
 .../api/openstack/contrib/test_multinic_xs.py      |   35 ++++++++++++++++++--
 2 files changed, 50 insertions(+), 5 deletions(-)

commit 9b9ed7a688236292d89298026450ed6fd631d017
Merge: ce0bdf7 42765b2
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 12:27:59 2011 -0500

    Merged trunk.

commit e7bc748edef30b106628946eeda36818aac4fe9d
Merge: fbf4d26 42765b2
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 12:21:26 2011 -0500

    pull-up from trunk

commit ce0bdf7de31dcee53ee5ccdc0cca57333c6b6bc1
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 11:47:34 2011 -0500

    Added unit tests.

 nova/tests/api/openstack/test_servers.py |   17 +++++++++++++++++
 nova/tests/test_compute.py               |    8 ++++++++
 2 files changed, 25 insertions(+)

commit 0130bb3d14e9e2db800ea0b15a48570085989521
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 10:59:17 2011 -0500

    First take at migrations.

 nova/api/openstack/servers.py |   10 +++++++++-
 nova/compute/api.py           |   17 ++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

commit 42765b2763260a9cae702585df1f0b9343937284
Merge: bc8f009 dead233
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Fri Jul 8 11:26:31 2011 +0000

    Fixes bug #805604 "Multiprocess nova-api does not handles SIGTERM correctly."

commit d5307a2e1575778fcbfcf3d8ad65733be7544a54
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 18:35:01 2011 +0900

    image/fake: added teardown method
    
    Unit tests may alter images in FakeImageService which has pre-defined images.
    Since some unit tests depend on those images, so it needs to be cleaned up
    after image alternation. Otherwise running many unit tests may fail.

 nova/image/fake.py |   11 ++++++++++-
 nova/test.py       |    4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

commit dead2335faf36d4ea80d074093af8beaef3dabd3
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Fri Jul 8 12:37:56 2011 +0400

    Updated mailmap due to wrong address in commit message.

 .mailmap |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 58d7fa8bf8610ac2fa65e974061bf8ae78ca321f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 15:36:40 2011 +0900

    tests/test_cloud: make an unit test, test_create_image, happy

 nova/tests/test_cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4f973269e84adb10ac3959ef255ecc60cc90620e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 15:36:18 2011 +0900

    nova/compute/api.py: fixed mismerge

 nova/compute/api.py |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 2c3eeb5f9f5f78d9cb8fb3e37d5b5e1610d32499
Author: John Tran <jhtran@att.com>
Date:   Thu Jul 7 20:43:50 2011 -0700

    ec2 api _get_image method logic flaw that strips the hex16 digit off of the image name, and does a search against the db for it and ignores that it may not be the correct image, such as if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister that.  That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr

 nova/api/ec2/cloud.py    |    6 +++++-
 nova/tests/test_cloud.py |   30 +++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 8 deletions(-)

commit 8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 12:09:50 2011 +0900

    sqlalchemy/migrate: resolved version conflict

 .../versions/028_add_root_device_name.py           |   47 --------------------
 .../versions/032_add_root_device_name.py           |   47 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)

commit a02895b6bb353a468ce7c58e60bc2dbd152c5ec9
Merge: 02c0bf3 bc8f009
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 12:07:58 2011 +0900

    merge with trunk

commit fbf4d26bc9bd038eeea270846bdc8003abf3b527
Merge: 9f3a309 bc8f009
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:47:42 2011 -0500

    pull-up from trunk

commit 9f3a309eab3af46aa3f8ac2767b7edcdeb49e043
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:46:55 2011 -0500

    unit test suite for the multinic extension

 .../api/openstack/contrib/test_multinic_xs.py      |   88 ++++++++++++++++++++
 1 file changed, 88 insertions(+)

commit b5f715966ded3924327603fe7b47e3a99472d375
Merge: aca9fc6 cd903f6
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:46:34 2011 -0500

    pull-up from trunk

commit a8c9082c701a65f221f218cd8baa92b3859fc0ab
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:52:32 2011 -0400

    Added server entity to images that only has id

 nova/api/openstack/views/images.py      |    5 +++--
 nova/tests/api/openstack/test_images.py |   15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

commit 49697c5fa1ce3d4b1ae366baeda3336f5edab5a8
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 16:47:23 2011 -0400

    Merging issues

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4540d2abde8db9519d8e4dad9b57a116a2c8b9e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:41:22 2011 -0400

    Updated _create_link_nodes to be consistent with other create_*_nodes

 nova/api/openstack/images.py |   15 ++++++++++++---
 nova/api/openstack/wsgi.py   |    6 ++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

commit 7c90561e7288967c364a874cde13d88a8cb8fab4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:32:17 2011 -0400

    Changed name of xml_string to to_xml_string

 nova/api/openstack/images.py |    8 ++++----
 nova/api/openstack/wsgi.py   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit ebd3b88d8b06e7e7f54671811ccff3bdc1531e08
Merge: 784c0a7 bc8f009
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 16:30:58 2011 -0400

    Merging issuse

commit 1ce2780b7fe6b10f7f0831b4d6bd91f694831f9e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:29:17 2011 -0400

    Temporarily moved create server node functionality into images.py
    Temporarily changed image XML tests to expect server entities with only ids

 nova/api/openstack/images.py            |    7 +++++--
 nova/api/openstack/servers.py           |   12 ------------
 nova/tests/api/openstack/test_images.py |   25 +++++--------------------
 3 files changed, 10 insertions(+), 34 deletions(-)

commit 1940ccffb6c22c39d6c21be4e84f20e350599f71
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:19:21 2011 -0400

    Removed serverRef from some tests and viewbuilder

 nova/api/openstack/views/images.py      |    4 +++-
 nova/tests/api/openstack/test_images.py |   33 ++-----------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

commit 784c0a76967310843269d7f8be9df6bc292ff3c8
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 15:55:34 2011 -0400

    Comments for bugfix800759 and pep8

 nova/scheduler/zone_manager.py |   12 +++---
 nova/tests/test_zones.py       |   88 ++++++++++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 24 deletions(-)

commit e9d712c52830725b24f20da7ff8662e97d22014d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:51:12 2011 -0400

    Removed bookmark link from non detailed image viewbuilder

 nova/api/openstack/views/images.py      |   13 ++++++-------
 nova/tests/api/openstack/test_images.py |    4 ----
 2 files changed, 6 insertions(+), 11 deletions(-)

commit bc8f009f8ac6393301dd857339918d40b93be63d
Merge: 877b1be cb4e9af
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 7 18:36:02 2011 +0000

    implemented clean-up logic when VM fails to spawn for xenapi back-end

commit 877b1bebe49ba87be373b5b2c8eff6d6c51f0ff7
Merge: 8af474f 9d29dc6
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 7 18:30:47 2011 +0000

    Adds the os-hosts API extension for interacting with hosts while performing maintenance. This differs from the previous merge prop as it uses a RESTful design instead of GET-based actions.
    
    This supersedes the previous merge prop (https://code.launchpad.net/~ed-leafe/nova/maintmode/+merge/66303). The code has been both simplified and cleaned up a great deal, so there is no real need for the previous interim code.

commit 162b9651c3e251d8acae764f08372f764597f8ca
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:27:27 2011 -0400

    Added param to keep current things from breaking until we update all of the xml serializers and view builders to reflect the current spec

 nova/api/openstack/images.py |    8 ++++----
 nova/api/openstack/wsgi.py   |   15 ++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

commit 8af474f32f8e53142cc5f10e567a03b274693d44
Merge: cd903f6 f9b6c84
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jul 7 18:22:20 2011 +0000

    Fixes Bug #805083: "libvirtError: internal error cannot determine default video type" when using UML

commit 14ee32f07536f5686794d2dbe8f1fad159af4dfe
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:09:23 2011 -0400

    Dried up images XML serialization

 nova/api/openstack/images.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 49683f2f84a9eb4436c63465d11ae8f451265eae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:08:57 2011 -0400

    Dried up images XML serialization

 nova/api/openstack/images.py  |   80 ++++++++++++++++++-----------------------
 nova/api/openstack/servers.py |   12 +++++++
 nova/api/openstack/wsgi.py    |   12 +++++++
 3 files changed, 58 insertions(+), 46 deletions(-)

commit d287051270330269a49442670aa5705debafa70b
Merge: c2bb273 cd903f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 10:20:35 2011 -0700

    stricter zone_id checking

commit ea44598a8be91c2da8b2650b838fef9e028e5b67
Merge: f2b1079 cd903f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 09:53:46 2011 -0700

    trunk merge

commit f2b107981c9b37043fe6c68e92cb170b2b701a18
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 09:45:00 2011 -0700

    cleanup

 nova/compute/api.py     |    2 --
 nova/compute/manager.py |    3 ---
 nova/network/api.py     |    3 ---
 nova/network/manager.py |    3 ---
 4 files changed, 11 deletions(-)

commit ddc33b8163423c5138b40885cb3430104896c676
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:36:45 2011 -0400

    Added image index

 nova/api/openstack/images.py            |   41 ++++++++++++++----
 nova/tests/api/openstack/test_images.py |   71 ++++++++++++-------------------
 2 files changed, 60 insertions(+), 52 deletions(-)

commit 60a9763382ccd77735a75b6047c821477eab684e
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 7 15:36:39 2011 +0000

    pep8 fixes

 nova/tests/test_hosts.py  |   16 ++++++++--------
 nova/virt/xenapi/vmops.py |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 7048530fb6083ab92fa6b7a2b5a73fc2bf30709f
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 11:25:45 2011 -0400

    Comments Incorporated for Bug800759

 Authors                        |    1 +
 nova/scheduler/zone_manager.py |   55 +++++++++++++-----
 nova/tests/test_zones.py       |  121 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 14 deletions(-)

commit 6b83e1cd31f5e138af20fbd5c118d55da092eb35
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 7 15:24:12 2011 +0000

    Added API and supporting code for rebooting or shutting down XenServer hosts.

 nova/api/openstack/contrib/hosts.py                |   26 ++++++++++++++++
 nova/compute/api.py                                |    6 ++++
 nova/compute/manager.py                            |    6 ++++
 nova/tests/test_hosts.py                           |   32 +++++++++++++++++---
 nova/virt/driver.py                                |    4 +++
 nova/virt/fake.py                                  |    4 +++
 nova/virt/hyperv.py                                |    4 +++
 nova/virt/libvirt/connection.py                    |    4 +++
 nova/virt/vmwareapi_conn.py                        |    4 +++
 nova/virt/xenapi/vmops.py                          |   21 +++++++++++--
 nova/virt/xenapi_conn.py                           |    4 +++
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   30 +++++++++++++++++-
 12 files changed, 137 insertions(+), 8 deletions(-)

commit 63d579523985cbd4c896d9a05e523761e1cadb3a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:11:40 2011 -0400

    fixed image create response test

 nova/tests/api/openstack/test_images.py |   44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

commit 634ffe4e815adcd060d99b84c2beab758c815584
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:06:35 2011 -0400

    Updated test_detail

 nova/tests/api/openstack/test_images.py |  117 ++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 48 deletions(-)

commit 6eb7228b95d0545fdac30cdc2f01b20a1c932a96
Merge: b50e92d cd903f6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 10:51:16 2011 -0400

    Merged trunk

commit b50e92d43f958bf966fce4f608daa467b40453c1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Jul 7 10:48:17 2011 -0400

    make server and image metadata optional

 nova/api/openstack/images.py            |    7 +-
 nova/tests/api/openstack/test_images.py |  158 ++++++++++++++++++++++++-------
 2 files changed, 128 insertions(+), 37 deletions(-)

commit cd903f6c813010c8f09adc0cb63d787108a52b8b
Merge: 2adb648 19e4cef
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:46:08 2011 +0000

    Updated the links container for flavors to be compliant with the current spec.
    
    bug #803505

commit 19e4cef2518e2c1e02e27137cadea55861d092c4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 10:02:06 2011 -0400

    pep8

 nova/api/openstack/common.py        |    2 +-
 nova/api/openstack/views/flavors.py |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit bf851c7f403c7be8d8f27274fa5216cfa6eaf4f4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 09:42:13 2011 -0400

    Renamed function

 nova/api/openstack/common.py        |    9 ++++++++-
 nova/api/openstack/views/flavors.py |    2 +-
 nova/api/openstack/views/images.py  |    2 +-
 nova/api/openstack/views/servers.py |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

commit a92158cee2a57316252ec6fd0d6c0c4f1e7a1fcf
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 09:26:25 2011 -0400

    moved remove_version to common.py

 nova/api/openstack/common.py        |    3 +++
 nova/api/openstack/views/flavors.py |    5 +----
 nova/api/openstack/views/images.py  |    7 +++----
 nova/api/openstack/views/servers.py |    5 +----
 4 files changed, 8 insertions(+), 12 deletions(-)

commit d24a8689dceaae1145d0cc0aa12e60bfdabbe2b2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 06:25:03 2011 -0700

    unit tests

 nova/compute/api.py        |    3 ++-
 nova/network/manager.py    |    4 ++--
 nova/tests/test_network.py |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

commit 8caf69dc93d9112e9be8989cd2136a407e09df44
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Jul 7 09:24:40 2011 -0400

    progress and server are optional

 nova/api/openstack/images.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit e817896c7aaf43822cf363a48fac60f013a5ecb0
Merge: ace9aa5 44d4994
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jul 7 05:56:15 2011 -0700

    merged trunk

commit 2adb64821c0185264ce75175d2581c6736fa3796
Merge: 6b5f32f efb5363
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jul 7 07:26:01 2011 +0000

    Add a socket server responding with an allowing flash socket policy for all requests from flash on port 843 to nova-vncproxy

commit efb5363356b13c3492ae895a1778428d06e6ca9c
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jul 7 08:10:45 2011 +0200

    pep8 compliance

 bin/nova-vncproxy |    9 ++++++---
 nova/wsgi.py      |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

commit aca9fc681eda3dca1b954b0ea22e56d669689cec
Merge: d764a48 6b5f32f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 6 16:37:50 2011 -0500

    Pull-up from trunk (post-multi_nic)

commit bd297ae3bc779853cf82f05d0d4da60305416a99
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 6 13:43:48 2011 -0700

    changed calling signature to be (instance_id, address)

 nova/compute/api.py     |    4 ++--
 nova/compute/manager.py |    6 ++----
 nova/network/api.py     |    6 ++----
 nova/network/manager.py |   32 +++++++++++---------------------
 4 files changed, 17 insertions(+), 31 deletions(-)

commit 0415c413872697c6f9fecc28928af0525780f868
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jul 6 16:40:00 2011 -0400

    correct test_show

 nova/api/openstack/images.py            |   70 +++++++++++++++++++++----------
 nova/tests/api/openstack/test_images.py |   23 +++++-----
 2 files changed, 61 insertions(+), 32 deletions(-)

commit bb09e0e1bc1c587e7677eb5db68a8fbd293ecd5b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 6 16:28:10 2011 -0400

    first round

 nova/api/openstack/accounts.py                     |    6 +-
 nova/api/openstack/backup_schedules.py             |   13 +-
 nova/api/openstack/consoles.py                     |   12 +-
 nova/api/openstack/contrib/floating_ips.py         |    4 +-
 nova/api/openstack/create_instance_helper.py       |    2 +-
 nova/api/openstack/flavors.py                      |    6 +-
 nova/api/openstack/image_metadata.py               |    5 +-
 nova/api/openstack/images.py                       |    6 +-
 nova/api/openstack/ips.py                          |    5 +-
 nova/api/openstack/limits.py                       |    6 +-
 nova/api/openstack/server_metadata.py              |    6 +-
 nova/api/openstack/servers.py                      |   10 +-
 nova/api/openstack/shared_ip_groups.py             |   12 +-
 nova/api/openstack/users.py                        |    6 +-
 nova/api/openstack/versions.py                     |    5 +-
 nova/api/openstack/wsgi.py                         |  144 +++++++++++++-------
 nova/api/openstack/zones.py                        |    9 +-
 .../api/openstack/contrib/test_floating_ips.py     |    3 +
 nova/tests/api/openstack/test_servers.py           |   46 +++----
 nova/tests/api/openstack/test_wsgi.py              |   61 +++++----
 nova/tests/integrated/api/client.py                |    7 +-
 21 files changed, 217 insertions(+), 157 deletions(-)

commit 0af41b8c50631252f0dfe0b11268beb3d5e49508
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 6 12:58:04 2011 -0700

    removed extra comment

 nova/db/api.py |    1 -
 1 file changed, 1 deletion(-)

commit 94a6af26e46d4df35294ad0bf4dc4883b7bf052e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 6 14:47:41 2011 -0400

    Further test update and begin correcting serialization

 nova/api/openstack/images.py            |    5 +++--
 nova/tests/api/openstack/test_images.py |   30 ++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

commit e71cf10dcf88f4a2f695285b25af75d8a0df2b3e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 03:16:28 2011 +0900

    Removed a typo error in libvirt connection.py

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 479b55aefadd88e59a6cd489a39df53fecc46bdf
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 6 13:19:37 2011 -0400

    updated expected xml in images show test to represent current spec

 nova/tests/api/openstack/test_images.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

commit 9d29dc60d904f2c5037d03cead71933dc62777ff
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jul 6 17:14:46 2011 +0000

    pep8 fixes

 nova/tests/test_hosts.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a05b0325a76dea16a2d5f7d1931a5cbc922e0364
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 02:13:18 2011 +0900

    Added VIF driver concept

 nova/virt/libvirt.xml.template   |   18 +++++++++
 nova/virt/libvirt/connection.py  |   48 +++++-------------------
 nova/virt/libvirt/vif_drivers.py |   76 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 39 deletions(-)

commit 23a5775d6dbd5f11ff0adb67dd6b5bceb96b8030
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 02:12:03 2011 +0900

    Added the missing 'self' parameter

 nova/network/l2_drivers.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit a4d2fa0a88f125f56023b5611ef6420d577594bf
Merge: 6435ba2 6b5f32f
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jul 6 17:02:00 2011 +0000

    after trunk merge

commit 6435ba27edea7e525305d349cafea3d08f5db2c6
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jul 6 16:53:08 2011 +0000

    Changed the exception type for invalid requests to webob.exc.HTTPBadRequest.

 nova/api/openstack/contrib/hosts.py |   12 +++++++-----
 nova/tests/test_hosts.py            |    5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

commit 2b553a89b34d7a3691c0952c5debda6b5ea1bb79
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 01:04:56 2011 +0900

    Added net_attrs argument for ensure_bridge/vlan methods

 nova/network/l2_drivers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f568d9345d19064c0024523195b17eb9e7d036ef
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 01:03:00 2011 +0900

    Added a L2 network driver for bridge/vlan creation

 Authors                    |    1 +
 nova/network/l2_drivers.py |   56 ++++++++++++++++++++++++++++++++++++++++++++
 nova/network/manager.py    |   32 +++++++++++++++----------
 3 files changed, 77 insertions(+), 12 deletions(-)

commit ace9aa5d91d839f66998c39a977857b7a7c466a4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 08:25:28 2011 -0700

    wrap list comparison in test with set()s

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f34952f27aa7acdb8bb617346aba281a86e918ae
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 6 08:14:58 2011 -0700

    slightly more fleshed out call path

 nova/compute/api.py     |    4 ++--
 nova/compute/manager.py |    7 +++++--
 nova/network/api.py     |    9 +++++++--
 nova/network/manager.py |   31 +++++++++++++++++++++++--------
 4 files changed, 37 insertions(+), 14 deletions(-)

commit 8d393d8da3b981fc96f03c02a1b64203b7a45df9
Merge: 65fcbc8 9e2abcc
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 08:12:44 2011 -0700

    merged trunk

commit 65fcbc8cf51cc02071d1d9cd60cf0eb59c2bcce0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 06:44:50 2011 -0700

    merge code i'd split from instance_get_fixed_addresses_v6 that's no longer needed to be split

 nova/db/sqlalchemy/api.py |   38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

commit b19dbcf21865aa0d1b422aecdb7ff13571ecb4e8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 06:37:28 2011 -0700

    fix metadata test since fixed_ip searching now goes thru filters db api call instead of the get_by_fixed_ip call

 nova/tests/test_metadata.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 1c90eb34085dbb69f37e2f63dea7496afabb06b3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 06:20:38 2011 -0700

    clean up compute_api.get_all filter name remappings.  ditch fixed_ip one-off code.  fixed ec2 api call to this to compensate

 nova/api/ec2/cloud.py      |    2 +-
 nova/compute/api.py        |   75 ++++++++++++++++++++++----------------------
 nova/tests/test_compute.py |   27 +++++++++++-----
 3 files changed, 57 insertions(+), 47 deletions(-)

commit ca152762aa73a93583be2ada237cf8bbbcc99220
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 05:41:47 2011 -0700

    clean up OS API servers getting

 nova/api/openstack/servers.py |   94 ++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 57 deletions(-)

commit b2fe710c59ba266b9afd67db1cae60a6db5c71e3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 5 15:06:07 2011 -0700

    rename _check_servers_options, add some comments and small cleanup in the db get_by_filters call

 nova/api/openstack/servers.py |    4 ++--
 nova/db/sqlalchemy/api.py     |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

commit fd9a761f25c6095d1ea47e09cdac503683b44bfc
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:59:22 2011 -0700

    pep8 fix

 nova/api/openstack/servers.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4d0125b34a4796fd6d3312a4144a0834ba318469
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:50:59 2011 -0700

    convert filter value to a string just in case before running re.compile

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8aeec07c2a5f8a5f1cfb049e20caa29295496606
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:36:39 2011 -0700

    add comment for servers_search_options list in the OS API Controllers.

 nova/api/openstack/servers.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 64966cbd83cbde6a240dad4ac786fe7a6a116f2f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:30:07 2011 -0700

    pep8 fixes

 nova/api/openstack/servers.py |    1 -
 nova/db/api.py                |    1 +
 nova/db/sqlalchemy/api.py     |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

commit d722d6f635c99a758910f24e7681753599894e70
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:09:36 2011 -0700

    fix ipv6 search test and add test for multiple options at once

 nova/tests/test_compute.py |  142 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 26 deletions(-)

commit 6e791e8b773565b62c4b8ba35cec455cb8c13ac8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 16:30:55 2011 -0700

    test fixes.. one more to go

 nova/compute/api.py        |   38 ++++++++++++++++++++++++++++----------
 nova/db/sqlalchemy/api.py  |    8 +-------
 nova/tests/test_compute.py |   35 ++++++++++++++++++++++++++---------
 3 files changed, 55 insertions(+), 26 deletions(-)

commit 04a2a64d42e6acf0addd8918acd3139dc4aff7c7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 15:04:36 2011 -0700

    resolved conflict incorrectly from trunk merge

 nova/tests/api/openstack/test_servers.py |  193 ------------------------------
 1 file changed, 193 deletions(-)

commit 738abc7e7f4f10051e72d5a807b1d1fd78d04e98
Merge: 2b45204 0fea610
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:58:42 2011 -0700

    merged trunk

commit 2b45204e593f9330c8b961cfae3ad5af0bd36642
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:47:05 2011 -0700

    doc string fix

 nova/api/openstack/servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e36232aed703eca43c6eb6df02a5c2aa0a1ac649
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:40:06 2011 -0700

    fix OS API tests

 nova/api/openstack/servers.py            |    5 ++
 nova/tests/api/openstack/fakes.py        |    8 +-
 nova/tests/api/openstack/test_servers.py |  124 +++++++++++++++++++++++-------
 3 files changed, 109 insertions(+), 28 deletions(-)

commit b1b919d42d8c359fc9ae981b44466d269fc688a6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 13:59:57 2011 -0700

    test fixes and typos

 nova/api/openstack/common.py             |   33 ++++++++++++++++++++
 nova/api/openstack/servers.py            |    9 +++---
 nova/api/openstack/views/servers.py      |    3 +-
 nova/compute/power_state.py              |   31 -------------------
 nova/db/sqlalchemy/api.py                |   49 ++++++++++++++++++------------
 nova/tests/api/openstack/fakes.py        |    2 --
 nova/tests/api/openstack/test_servers.py |   13 +++++---
 7 files changed, 75 insertions(+), 65 deletions(-)

commit b9ecf869761ee0506872b0d44d93d453be4c3477
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 01:45:42 2011 -0700

    typos

 nova/compute/api.py       |    4 ++--
 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit c0851f2ec5be12c43cc96367e22220d25589e4ae
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 01:36:12 2011 -0700

    cleanup checking of options in the API before calling compute_api's get_all()

 nova/api/openstack/servers.py |  104 ++++++++++++++++++-----------------------
 nova/db/sqlalchemy/api.py     |    7 +--
 2 files changed, 49 insertions(+), 62 deletions(-)

commit b5ac286fade15a61326068e5ef0959352f885efe
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 23:08:42 2011 -0700

    a lot of major re-work.. still things to finish up

 nova/compute/api.py       |  157 ++++------------------
 nova/db/api.py            |   39 +-----
 nova/db/sqlalchemy/api.py |  328 ++++++++++++++-------------------------------
 3 files changed, 129 insertions(+), 395 deletions(-)

commit 89351f005e8c2b5bc03697a0becc7fe75118600d
Merge: 450a21d e2770a4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 01:32:26 2011 -0700

    merged trunk

commit 450a21d8c1bed9cf6d1bcee9bcde7e88b9c3c6b9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:55:33 2011 -0700

    remove debug from failing test

 nova/tests/api/openstack/test_servers.py |    3 ---
 1 file changed, 3 deletions(-)

commit a5390a5b1cb95ca9aee6e2f99572498dd60b48e5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:53:13 2011 -0700

    remove faults.Fault wrapper on exceptions

 nova/api/openstack/servers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 994e219ab0b25d48b31484a43a0ac12099cf226e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:46:38 2011 -0700

    rework OS API checking of search options

 nova/api/openstack/servers.py            |  181 ++++++++++++------------------
 nova/tests/api/openstack/test_servers.py |   29 +++--
 2 files changed, 84 insertions(+), 126 deletions(-)

commit 865b8eba36072de5381a192eccc844573efbaf4d
Merge: 970b37f 26fd6c3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 27 17:04:06 2011 -0700

    merged trunk

commit 970b37ff9e9aef987f6e87df7d2c2e73c484e439
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:35:42 2011 -0700

    missing doc strings for fixed_ip calls I renamed

 nova/db/sqlalchemy/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit ff1c882d7b12aa77895c549769a27ff4913b29c8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:29:42 2011 -0700

    clarify a couple comments

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 11101dfb47a7c3a37d3d3ec04f36e33fff9f59e2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:22:02 2011 -0700

    test fixes after unknown option string changes

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a1cb17bf98359fae760800f8467c897d859b6994
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:16:23 2011 -0700

    minor fixups

 nova/api/openstack/servers.py |   14 +++++++++-----
 nova/compute/api.py           |    7 -------
 2 files changed, 9 insertions(+), 12 deletions(-)

commit 65d15d38a2552bdb6eca8c530eb1f03a7be4c3b4
Merge: bc2a2f3 f47e59e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:01:11 2011 -0700

    merged trunk

commit bc2a2f30e4b8ab92d6893ec333e756c92e96a932
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:48:52 2011 -0700

    pep8 fixes

 nova/compute/power_state.py |   18 ++++++++++--------
 nova/db/sqlalchemy/api.py   |    1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

commit 6ebd04c9c971e3be63cb3d6122bbca7c95004085
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:43:56 2011 -0700

    test fix for renamed get_by_fixed_ip call

 nova/tests/test_metadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b1099b43f34e41676b0508267e9ad40b2c3415e3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:32:43 2011 -0700

    ec2 fixes

 nova/api/ec2/cloud.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 7630aa8acc376364375ef48a3d955a7c21f50b04
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:02:00 2011 -0700

    added API tests for search options
    fixed a couple of bugs the tests caught

 nova/api/openstack/servers.py            |    5 +-
 nova/tests/api/openstack/fakes.py        |    3 +-
 nova/tests/api/openstack/test_servers.py |  204 +++++++++++++++++++++++++++++-
 3 files changed, 208 insertions(+), 4 deletions(-)

commit 0b9048bc3285b86a073da9aa9327815319aaa184
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 19 12:44:00 2011 -0700

    allow 'marker' and 'limit' in search options.
    fix log format error

 nova/api/openstack/servers.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 5a2add5c6011ce94f4727037c193274d21351cb2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 04:13:22 2011 -0700

    another typo

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce32a0fc1a0560a6b90e3aa501e6f653b3272292
Merge: 043cfae cf25ab3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:49:55 2011 -0700

    merged trunk

commit 043cfae7737a977f7f03d75910742f741b832323
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:36:08 2011 -0700

    missed power_state import in api
    fixed reversed compare in power_state

 nova/api/openstack/servers.py |    8 +++++---
 nova/compute/power_state.py   |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

commit edaeb96d6ce9c14b1f70a71c219d0353b59ed270
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:08:23 2011 -0700

    more typos

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bfee5105a2e557a28a605778599e99308f2a126e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:02:50 2011 -0700

    typos

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a6968a100d2a2409094f7b434a88c700ebb876f3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 02:59:03 2011 -0700

    flavor needs to be converted to int from query string value

 nova/api/openstack/servers.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 02:49:42 2011 -0700

    add image and flavor searching to v1.0 api
    fixed missing updates from cut n paste in some doc strings

 nova/api/openstack/servers.py |    3 ++-
 nova/compute/api.py           |    8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 102a0e5b9d6ce22a5fc5a00fc260bbe1e3592222
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 02:45:10 2011 -0700

    added searching by 'image', 'flavor', and 'status'
    reverted ip/ip6 searching to be admin only

 nova/api/openstack/servers.py       |   18 ++--
 nova/api/openstack/views/servers.py |   15 +---
 nova/compute/api.py                 |   47 +++++++++--
 nova/compute/power_state.py         |   29 +++++++
 nova/db/api.py                      |    5 ++
 nova/db/sqlalchemy/api.py           |   42 ++++++++++
 nova/tests/test_compute.py          |  156 +++++++++++++++++++++++++++++++----
 7 files changed, 271 insertions(+), 41 deletions(-)

commit 491c90924ac87e533ce61e3bf949a50bfdd6a31d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Jul 17 16:35:11 2011 -0700

    compute's get_all should accept 'name' not 'display_name' for searching Instance.display_name.
    Removed 'server_name' searching..
    Fixed DB calls for searching to filter results based on context

 nova/compute/api.py        |    5 ++--
 nova/db/sqlalchemy/api.py  |   58 +++++++++++++++++++++++++++++++------
 nova/tests/test_compute.py |   69 +++++++-------------------------------------
 3 files changed, 61 insertions(+), 71 deletions(-)

commit d2265cbe65f1b3940b37966245da13b9714234ef
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Jul 17 16:12:59 2011 -0700

    Refactored OS API code to allow checking of invalid query string paremeters and admin api/context to the index/detail calls.  v1.0 still ignores unknown parameters, but v1.1 will return 400/BadRequest on unknown options.  admin_api only commands are treated as unknown parameters if FLAGS.enable_admin_api is False.   If enable_admin_api is True, non-admin context requests return 403/Forbidden.
    
    Fixed EC2 API code to handle search options to compute_api.get_all() more correctly.
    
    Reverted compute_api.get_all to ignore unknown options, since the OS API now does the verification.
    
    Updated tests.

 nova/api/ec2/cloud.py         |   23 +++---
 nova/api/openstack/servers.py |  123 ++++++++++++++++++++++++++++----
 nova/compute/api.py           |  154 +++++++++++++++++++++++------------------
 nova/tests/test_compute.py    |    8 +--
 4 files changed, 215 insertions(+), 93 deletions(-)

commit 1dec3d7c3380d83398be0588b58c1cad13252807
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jul 14 12:13:13 2011 -0700

    clean up checking for exclusive search options
    fix a cut n paste error with instance_get_all_by_name_regexp

 nova/compute/api.py       |   32 +++++++++++++++-----------------
 nova/db/sqlalchemy/api.py |    4 ++--
 2 files changed, 17 insertions(+), 19 deletions(-)

commit e547f4bde48a0142fbdb407a4c51f4b6f8fa56e2
Merge: bbd8f48 1161171
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 16:13:01 2011 -0700

    merged trunk

commit bbd8f482b916168871d1d83192b354355858e77c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 15:16:16 2011 -0700

    python-novaclient 2.5.8 is required

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit edccef06c24df2fa785005f7a3c1f52a45bfc071
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 03:13:43 2011 -0700

    fix bugs with fixed_ip returning a 404
    instance searching needs to joinload more stuff

 nova/compute/api.py       |   17 +++++++-
 nova/db/sqlalchemy/api.py |  102 +++++++++++++++++++++++----------------------
 2 files changed, 68 insertions(+), 51 deletions(-)

commit a3096d593fbe21625e3c4102e69d12950e9d2ef2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 02:01:09 2011 -0700

    added searching by instance name
    added unit tests

 nova/compute/api.py        |    5 +
 nova/db/api.py             |    7 ++
 nova/db/sqlalchemy/api.py  |   24 +++-
 nova/tests/test_compute.py |  265 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 300 insertions(+), 1 deletion(-)

commit 04804aba3c995260cf376b8d979f032942cd0988
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 11 14:45:27 2011 -0700

    pep8 fixes

 nova/compute/api.py       |    5 ++---
 nova/db/sqlalchemy/api.py |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 04b50db56ee90c0f4dd685a8f45883522260164f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 11 14:27:01 2011 -0700

    Replace 'like' support with 'regexp' matching done in python.  Since 'like' would result in a full table scan anyway, this is a bit more flexible.
    Make search options and matching a little more generic
    Return 404 when --fixed_ip doesn't match any instance, instead of a 500 only when the IP isn't in the FixedIps table.

 nova/api/ec2/cloud.py         |   23 +++-
 nova/api/openstack/servers.py |   20 ++--
 nova/compute/api.py           |   75 ++++++++-----
 nova/db/api.py                |   44 ++++++--
 nova/db/sqlalchemy/api.py     |  239 ++++++++++++++++++++++++++++++-----------
 nova/db/sqlalchemy/models.py  |    1 +
 6 files changed, 292 insertions(+), 110 deletions(-)

commit 7a8ecdc03f838184b2e6eeac62d7f57ddc64967b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jul 8 01:39:58 2011 -0700

    start of re-work of compute/api's 'get_all' to handle more search options

 nova/compute/api.py |   83 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 24 deletions(-)

commit 6b5f32f78d8339a7bd1ab48dd520ca4076961f98
Merge: 6843421 7c270b0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jul 6 00:21:11 2011 +0000

    Silence warning in case tests.sqlite doesn't exist

commit e24c1d998331444235480be241484b0408cdaf9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 17:07:44 2011 -0700

    fix libvirt test

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit 77b655cd16a265eb2b8fc369941d19890766e712
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 17:01:19 2011 -0700

    update tests

 nova/tests/__init__.py     |    1 +
 nova/tests/test_network.py |    3 +++
 2 files changed, 4 insertions(+)

commit 11dfe937bcfa542c985a977e9ff855f717e80e69
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 16:24:43 2011 -0700

    don't set network host for multi_host networks

 nova/network/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 53213dc4cd0f6f940d707c5d5932f4af7e5f988a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 16:22:41 2011 -0700

    add ability to set multi_host in nova-manage and remove debugging issues

 bin/nova-manage           |    9 +++++++--
 nova/db/sqlalchemy/api.py |    1 -
 nova/network/manager.py   |    8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

commit 8e1a74e5604e1569e314af67b72966122940330b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 16:06:20 2011 -0700

    filter the dhcp to only respond to requests from this host

 bin/nova-dhcpbridge       |    2 +-
 nova/network/linux_net.py |   24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

commit 9b5adcbe92a4f7e0f9b1592be123c58f743def34
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 15:55:16 2011 -0700

    pass in dhcp server address, fix a bunch of bugs

 nova/compute/manager.py         |   17 +++++++-------
 nova/db/api.py                  |    2 +-
 nova/db/sqlalchemy/api.py       |    3 ++-
 nova/db/sqlalchemy/models.py    |    1 +
 nova/network/linux_net.py       |    4 ++--
 nova/network/manager.py         |   47 ++++++++++++++++++++++++++-------------
 nova/virt/libvirt/connection.py |    3 +--
 7 files changed, 48 insertions(+), 29 deletions(-)

commit 6b6fd2fe87ff23f3c056ba076218917404bd024a
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 01:31:04 2011 +0400

    PEP8 passed.

 bin/nova-api |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c3229ec37f117d4fe8fc280b726a2e410a4b42a0
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 01:09:00 2011 +0400

    Formatting fix.

 bin/nova-api |    1 +
 1 file changed, 1 insertion(+)

commit ca191deeca33bd8ff2330acaf02cafaf94bfe401
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 00:43:39 2011 +0400

    Proper Author section insertion (thx Eldar).

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fde44cdf69ad1884adf7007ae432438de5bcd664
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 00:24:55 2011 +0400

    Signal handler cleanup, proper ^C handling.

 bin/nova-api |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 46690df48392c8967fc4f0ea05b5dba152fa400a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jul 5 13:24:31 2011 -0700

    copy paste

 nova/compute/api.py     |   10 ++++++++--
 nova/compute/manager.py |   14 ++++++++++++++
 nova/network/api.py     |    8 ++++++++
 nova/network/manager.py |    7 +++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

commit 8d2f3f26e8089020616312334689f1c594a67b4f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 12:16:46 2011 -0700

    make sure to filter out ips associated by host and add some sync for allocating ip to host

 nova/db/sqlalchemy/api.py |    1 +
 nova/network/manager.py   |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

commit c2bb27363e5155adb9ba36844586d390ddd14de4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jul 5 12:16:35 2011 -0700

    fixed zone id check

 nova/scheduler/zone_aware_scheduler.py            |    2 +-
 nova/tests/scheduler/test_zone_aware_scheduler.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 9a8254ef2751e1b7502107a9c6afe05ea1e2efd4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 12:00:11 2011 -0700

    it is multi_host not multi_gateway

 nova/network/api.py     |    6 ++++--
 nova/network/manager.py |    5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 01b9d211e606ee0be221b27edae8aab1d35096ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 11:51:46 2011 -0700

    First round of changes for ha-flatdhcp.
    
    * added 'host' column to fixed_ips to allow associating with a host
    * added 'multi_host' column to network for multi_host possibility
    * moved extra db access from linux_net to manager
    * added host parameter to network calls

 bin/nova-manage                                    |    2 +-
 nova/db/api.py                                     |   19 +++--
 nova/db/sqlalchemy/api.py                          |   29 ++++++--
 .../migrate_repo/versions/032_ha_network.py        |   37 ++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/exception.py                                  |    5 ++
 nova/network/api.py                                |   13 +++-
 nova/network/linux_net.py                          |   15 ++--
 nova/network/manager.py                            |   73 ++++++++++++++------
 9 files changed, 144 insertions(+), 50 deletions(-)

commit b02b1d78245634f81a27d0ba0a6e29024495c162
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jul 5 14:36:52 2011 +0000

    Updated the plugin to return the actual enabled status instead of just 'true' or 'false'
    .

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit f9b6c84842cbb494d09de9debaee2ee37d49815c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jul 5 08:32:04 2011 -0400

    UML doesnt do vnc as well

 nova/virt/libvirt/connection.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53b0fb01a1d6cb301068fb494dacee203c805bd8
Merge: e01848e d77526e
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jul 5 17:17:25 2011 +0900

    fixed a bug which prevents suspend/resume after block-migration

commit 8061565d41119695046d08604d7e46a90d7ea500
Merge: 1732c37 dae701b
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 23:51:43 2011 +0400

    Merge diverged braches.

commit 1732c373aa21fb7493b8fb50dd64bdf9425bf70b
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 23:48:05 2011 +0400

    Gracefull shutdown of nova-api.

 Authors      |    1 +
 bin/nova-api |   14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

commit 0834f3d64b2cc37407c24a9b717e218d758adf79
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 4 15:14:36 2011 -0400

    properly displays addresses in each network, not just public/private; adding addresses attribute to server entities

 nova/api/openstack/__init__.py           |   11 +--
 nova/api/openstack/ips.py                |   79 +++++++++++++----
 nova/api/openstack/servers.py            |   31 ++++---
 nova/api/openstack/views/addresses.py    |   38 ++++++--
 nova/api/openstack/views/servers.py      |   13 ++-
 nova/db/sqlalchemy/api.py                |   23 +++--
 nova/tests/api/openstack/test_servers.py |  139 +++++++++++++++++++++++++++---
 7 files changed, 272 insertions(+), 62 deletions(-)

commit dae701b125747de544baca22b369a52f1ad3551e
Author: Nickolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 21:03:01 2011 +0400

    Gracefull shutdown of nova-api.

 bin/nova-api |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit cb4e9afc4648e341cc14416a1d31d6459b9d9a61
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 4 17:22:08 2011 +0100

    Removing import of nova.test added to nova/__init.py__ as problem turned out to be somewhere else (not in nova source code tree)

 nova/__init__.py |    1 -
 1 file changed, 1 deletion(-)

commit 33ee3015e28e23e2d875d6467215fd7e0071f7e4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 4 17:02:50 2011 +0100

    Fixing weird error while running tests.
    Fix required patching nova/tests/___init__.py explictly importing nova.test

 nova/__init__.py          |    1 +
 nova/tests/test_xenapi.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 7307f17edeb284a6b2da076ffa16b2ef5c82a4f4
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jul 4 15:41:37 2011 +0000

    Added missing extension file and tests. Also modified the get_host_list() docstring to be more accurate about the return value.

 nova/api/openstack/contrib/hosts.py |  112 +++++++++++++++++++++++++++++++++++
 nova/scheduler/zone_manager.py      |    5 +-
 nova/tests/test_hosts.py            |  101 +++++++++++++++++++++++++++++++
 3 files changed, 216 insertions(+), 2 deletions(-)

commit 7c270b077ac916375dfbaeb5aea2a15387debe89
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 4 17:31:24 2011 +0200

    Silence warning in case tests.sqlite doesn't exist

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b8b96769bfc49e75d2eee3ae561e4e9ee7615473
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Mon Jul 4 13:53:17 2011 +0900

    Fix boot from volume failure for network block devices.
    
    This patch looks up the device_path and swithes between 'block' and
    'network' when creating libvirt.xml.

 nova/virt/libvirt.xml.template  |    6 +++++-
 nova/virt/libvirt/connection.py |   11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

commit 4227264153e06d576387f76b267f3d35ff17f391
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Sat Jul 2 01:28:13 2011 +0400

    Improvements to nova-manage: network list now includes vlan and projectID, added servers list filtered by zone if needed

 bin/nova-manage |   43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

commit 723e5076a414b52e716f5a5cac7667c5b09a36d3
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 20:39:56 2011 +0000

    removed unneeded old commented code

 nova/virt/xenapi/vmops.py |   16 ----------------
 1 file changed, 16 deletions(-)

commit 2dc2a5f66dc039ff1755981374f4065d048bcc26
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 20:33:00 2011 +0000

    removed more stray debug output

 nova/api/openstack/auth.py |    1 -
 1 file changed, 1 deletion(-)

commit 49c8202f43b9f606d9bd0a362b5805be98460326
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:53:06 2011 +0000

    removed debugging output

 nova/api/openstack/wsgi.py |    1 -
 1 file changed, 1 deletion(-)

commit 9740c0d777d8a908f3f4f192c7d01c18cf822485
Merge: 42dabbc 6843421
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:44:30 2011 +0000

    after trunk merge

commit 42dabbc86e3af49215ced275d76d241b4daf8bdc
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:44:10 2011 +0000

    Updated unit tests

 nova/compute/api.py                                |    2 +-
 nova/virt/xenapi/vmops.py                          |   26 ++++++++++-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |   45 +++++++++++++++++---
 3 files changed, 65 insertions(+), 8 deletions(-)

commit a9b0dbb8dcd708a46af58f61bab39b0bc9e8a6e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 1 12:03:27 2011 -0700

    remove logging statement

 nova/api/openstack/images.py |    1 -
 1 file changed, 1 deletion(-)

commit 42ef4e0adb7b0ec939f40d5356d4a3d2d03dec9f
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jul 1 12:32:26 2011 -0600

    Found some additional fixed_ip. entries in the Intance model contest that needed to be updated

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 401bbecb4fbb819d2b1daa3ee1bebcd6460742a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 1 11:12:13 2011 -0700

    use url parse instead of manually splitting

 nova/api/openstack/images.py |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

commit f09ca2b453f40f992697015d555a779e9bbe4b7b
Merge: f4753fb 6843421
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 1 19:06:18 2011 +0100

    Merge trunk
    Fixing docstrings

commit 3a65ea2f29ca169779cbd09acf4f7ac50314c969
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jul 1 11:14:30 2011 -0600

    Changed fixed_ip.network to be fixed_ips.network, which is the correct DB field

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6843421be9cdef1fc12d3480889bdcfd96821e1b
Merge: 666b3c3 2d1d6b3
Author: John Tran <jhtran@att.com>
Date:   Fri Jul 1 15:47:33 2011 +0000

    Added the GroupId param to any pertinent security_group methods that support it in the official AWS API.

commit 666b3c3286c109a5fdb19ddcbc9a69298a93c78d
Merge: b69eaef 79cefb4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 1 15:41:25 2011 +0000

    Removes 'import IPy' introduced in recent commit

commit 79cefb47c00636d26b1736b65a3f801ab8258e36
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 1 11:20:04 2011 -0400

    removing IPy import

 nova/tests/test_iptables_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72bdbc314ac311e8c831410bc4f9c8935bf9d5e8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 08:09:19 2011 -0700

    trunk merge

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b69eaefcccc682a270a66ce33b9083ba40a1a71f
Merge: 7d54463 73a4b04
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 1 15:07:08 2011 +0000

    Fixed the case where an exception was thrown when trying to get a list of flavors via the api yet there were no flavors to list.
    
    hand tested :)

commit 3cab7a61e130bc66ce96d6ff7e4e54741409b614
Merge: 81716e8 7d54463
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:53:20 2011 -0700

    fix up tests

commit 81716e8142fac86e779514997335999df4375a34
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:38:17 2011 -0700

    tweak

 nova/tests/test_exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e789dd29c48ee8ad2b10eeb9ff24725f0e696bed
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:31:17 2011 -0700

    review fixes

 nova/exception.py            |    4 ++--
 nova/notifier/api.py         |   14 +++++---------
 nova/tests/test_exception.py |    7 ++++++-
 3 files changed, 13 insertions(+), 12 deletions(-)

commit fb6aba61ef03032c31196bd58c68fa7b7d4c2769
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 14:26:05 2011 +0000

    completed api changes. still need plugin changes

 nova/compute/api.py             |   13 ++++---------
 nova/compute/manager.py         |   12 ++++--------
 nova/virt/driver.py             |    4 ++++
 nova/virt/fake.py               |    4 ++++
 nova/virt/hyperv.py             |    4 ++++
 nova/virt/libvirt/connection.py |    4 ++++
 nova/virt/vmwareapi_conn.py     |    4 ++++
 nova/virt/xenapi/vmops.py       |   18 ++++++++++++++++++
 nova/virt/xenapi_conn.py        |    4 ++++
 9 files changed, 50 insertions(+), 17 deletions(-)

commit 7d544631f0c767727c5a48627617d995f8890ae6
Merge: b602ecb e73a43a
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jul 1 13:56:01 2011 +0000

    Update the fixed_ip_disassociate_all_by_timeout in nova.db.api so that it supports Postgres.
    Fixes casting errors on postgres with this function.

commit 7ca20797496947c0bdd60e77b4962fd360e01f55
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 13:44:12 2011 +0000

    after trunk merge

 nova/api/openstack/auth.py     |    1 +
 nova/api/openstack/wsgi.py     |    1 +
 nova/compute/api.py            |   10 ++++++++++
 nova/compute/manager.py        |   10 ++++++++++
 nova/scheduler/api.py          |    5 +++++
 nova/scheduler/manager.py      |    4 ++++
 nova/scheduler/zone_manager.py |   15 ++++++++++++++-
 7 files changed, 45 insertions(+), 1 deletion(-)

commit b602ecb52130f9585a5c49217d259a4e3d24fda8
Merge: 6aac05b 6b4b715
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jul 1 13:10:59 2011 +0000

    Fixes MANIFEST.in so that migrate_repo/versions/*.sql files are now included in tarball

commit 6b4b715c63eef7a8c6ae24079086a03ed91c2071
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jul 1 14:04:56 2011 +0200

    Include migrate_repo/versions/*.sql in tarball

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 6aac05b23f45753473e841b36464c8317509cef9
Merge: 93ef6f6 90dcf88
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jul 1 09:25:03 2011 +0000

    Ensure auto-delete is false on Topic Queues.

commit 2d1d6b3e5c3957490c7cb49b38e72ca3baf9f8b0
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 30 17:52:33 2011 -0700

    refactored the security_group tests a bit and broke up a few of them into smaller tests

 nova/tests/test_cloud.py |   44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

commit 90dcf88e48ceaa627eb56c90c2f483aac19a9b3a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 30 17:52:04 2011 -0700

    Reverses the self.auto_delete = True that was added to TopicPublisher
    in the bugfix for lp804063.  That bugfix should have only added auto_delete = True to FanoutPublisher to match the previous change to FanoutConsumer.
    
    TopicConsumer isn't exclusive or auto_delete, so TopicPublisher has to still match.

 nova/rpc.py |    1 -
 1 file changed, 1 deletion(-)

commit 7142aa734c1e77a6efacac5bff918b44240b7a1a
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 30 16:49:03 2011 -0500

    Merge from trunk

 0 files changed

commit 93ef6f6cf8e4c7902f6533758f800577e0770dcb
Merge: f00e338 9a29506
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jun 30 21:15:56 2011 +0000

    Added 'self.auto_delete = True' to the two Publisher subclasses that lacked that setting.

commit 9a29506efde938a465f50a67218400049ae3a1af
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jun 30 20:51:59 2011 +0000

    Added the '--fixes' tag to link to bug.

commit ae21a37373d89dec36d97fd6bb1e22a1ad085895
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jun 30 20:50:31 2011 +0000

    Added self.auto_delete = True to the Publisher subclasses that did not have that set.

 nova/rpc.py |    2 ++
 1 file changed, 2 insertions(+)

commit f00e338a0080a2ccc9c56cd15124ff7e810da165
Merge: c7ee39c 1e4e261
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 30 20:47:11 2011 +0000

    added multi-nic support

commit 1e4e2613f126cdb9bf9808ac7af45fe95f109cdc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 30 15:03:42 2011 -0500

    osapi test_servers fixed_ip -> fixed_ips

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bad24563babf34668a4a2fcbd883c3e2c6fee5f2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 30 14:42:51 2011 -0500

    updated osapi 1.0 addresses view to work with multiple fixed ips

 nova/api/openstack/views/addresses.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit fa8f7421f48a3bd1f6b01b2ff3cc754c24e0a424
Merge: 46c321d c7ee39c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 30 14:20:59 2011 -0500

    trunk merge with migration renumbering

commit c7ee39c3d00fdc799850b308fefd08f482edb5e5
Merge: 88a0459 5b634ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 30 18:40:43 2011 +0000

    Allows subdirectory tests to run even if sqlite database doesn't exist.

commit 302d5ad4caaef4f02f475c2e9abd782ac630beb8
Author: Joseph Suh <jsuh@isi.edu>
Date:   Thu Jun 30 14:24:27 2011 -0400

    fix bug 800759

 nova/scheduler/zone_manager.py |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

commit 88a045916b6ead2f368b166a563eac45d1305035
Merge: bf09a9e 6243f71
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 30 18:23:06 2011 +0000

    Child Zone Weight adjustment available when adding Child Zones.

commit 6243f715c9bab947fc18501aecc4b15b7e3ff93c
Merge: e06542e bf09a9e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 30 11:11:03 2011 -0700

    trunk merge

commit e06542ed504847efbff8c59905c75ef99c512ecc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 30 11:02:57 2011 -0700

    blah

 nova/compute/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 73a4b0496e1973d3d8af699d0d0d50829ef026c3
Merge: c12861f bf09a9e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 13:55:15 2011 -0400

    merge trunk

commit 1daec75e3fcf125c9cb83d83f12f1c48b0cd1ca9
Merge: 386e2a2 bf09a9e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:49:54 2011 -0400

    merged trunk

commit bf09a9e63f33c4cd9a65a9b2464f0049625ac024
Merge: 1a76e74 c1e7997
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 30 15:45:56 2011 +0000

    Windows instances will often take a few minutes setting up the image on first boot and then reboot. We should be more patient for those systems as well check if the domid changes so we can send agent requests to the current domid.

commit 1a76e74740eb447ab57690c270c3089659513e1d
Merge: 0c2cbcc 10df5ac
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Jun 30 15:37:58 2011 +0000

    Theese changes eliminate dependancy between hostname and ec2-id.
    As I understand, there already were no such dependancy, but still we had confusing names in code.
    Also I added more sophisticated generation of default hostname to give user possibility to set the custom one.

commit 386e2a28f2d92dea30a726722b49e97e1c7ebba7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:29:45 2011 -0400

    updated images

 nova/api/openstack/views/images.py      |   17 ++++---
 nova/tests/api/openstack/test_images.py |   78 ++++++-------------------------
 2 files changed, 24 insertions(+), 71 deletions(-)

commit 5f772ea10c22549a7149f608cfc2ff932878d6fe
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:18:19 2011 -0400

    updated servers

 nova/api/openstack/views/servers.py      |   17 ++++++++++-------
 nova/tests/api/openstack/test_servers.py |   16 ++--------------
 2 files changed, 12 insertions(+), 21 deletions(-)

commit 8133b9af105f7924f03b710b30cf4f0acb52f143
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 10:29:31 2011 -0400

    refactored flavors viewbuilder

 nova/api/openstack/views/flavors.py      |   15 ++++++++++-----
 nova/tests/api/openstack/test_flavors.py |   30 +++++-------------------------
 2 files changed, 15 insertions(+), 30 deletions(-)

commit 0ce8407b0c17d0d28aaf41d1b3b5d4b1a9de99d4
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 30 10:12:10 2011 -0400

    fixes lp:803615

commit 639717b1eadb769f1d77a4ddcdb6618da4defbea
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 30 10:06:06 2011 -0400

    added FlavorRef exception handling on create instance

 nova/api/openstack/create_instance_helper.py |    4 ++++
 1 file changed, 4 insertions(+)

commit c12861f6068ea18156ff9c395ed40791585032d7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 09:28:21 2011 -0400

    refactored instance type code

 nova/api/openstack/flavors.py            |    5 +----
 nova/db/sqlalchemy/api.py                |    6 ++----
 nova/tests/api/openstack/test_flavors.py |   14 ++++++--------
 3 files changed, 9 insertions(+), 16 deletions(-)

commit 0c2cbccfb596f57008c87aa4dc2210eca92a4c8f
Merge: edfacac d1c5b8c
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 30 13:25:41 2011 +0000

    Update the ec2 get_metadata handler so it works with the most recent version of the compute API get_all call which now returns a list if there is only a single record.

commit edfacac605f6887d1b093c8c79a143d28e2083d9
Merge: d77526e 26d8486
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 30 13:18:11 2011 +0000

    - add metadata container to /images/detail and /images/<id> responses
    - update xml serialization to encode image entities properly

commit 26d8486a168c1a9b88bd0025cf0106e0b0ce3be4
Merge: c4cf8a8 d77526e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 30 08:46:33 2011 -0400

    merging trunk

commit 10df5ac36dbc4f6883833cbe25ad58b4629561fa
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Jun 30 15:43:18 2011 +0400

    PEP8 fix.

 nova/tests/test_compute.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d697627408897e9103663970c1615cf0f9a7a05
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 30 08:55:56 2011 +0200

    Adapt flash socket policy branch to new nova/wsgi.py refactoring

 nova/wsgi.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit cb1f9e011c9b358786ace2b1a9d8a40c49228f6a
Merge: dcf8c73 d77526e
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 30 08:32:24 2011 +0200

    Merge trunk and resolve bin/nova-vncproxy conflict

commit fbe296a7ab3bf1b9ee2bf765d13b5675ff4d6295
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 20:02:30 2011 -0700

    clean up

 nova/api/openstack/wsgi.py |    1 -
 nova/compute/manager.py    |    1 -
 nova/scheduler/driver.py   |    5 -----
 3 files changed, 7 deletions(-)

commit d1c5b8c9a5c54a7000d21451ff4649b1a772dfad
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 29 22:50:39 2011 -0400

    Update the ec2 get_metadata handler so it works with the most recent
    version of the compute API get_all call which now returns a list if
    there is only a single record.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 76a0aca9351f0888a75ec743369e488b7cc6dba4
Merge: d17171b d77526e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:36:53 2011 -0700

    trunk merge

commit d17171b4277337388b372459571d9f3904798bca
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:19:40 2011 -0700

    pep8

 nova/tests/test_exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 002b389aa90059c1c1986d4c1a3fbcd38527b4b4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:11:27 2011 -0700

    pep8

 nova/tests/test_exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 799919fe59d4a4faed1ce4effd9705173671e4da
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:10:11 2011 -0700

    done and done

 nova/exception.py            |    3 ++-
 nova/tests/test_exception.py |   58 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

commit e73a43ae34a49258cc6d752970d52d5614c1d1a9
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 29 22:01:28 2011 -0400

    Update the fixed_ip_disassociate_all_by_timeout in nova.db.api so that it supports Postgres.
    Fixes casting errors on postgres with this function.

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1c5e0144d26d114fefbe338a21cb2300afcb1af7
Merge: 9d6b905 fd7bd88
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 18:30:15 2011 -0700

    phew ... working

commit d77526e357fe3764107d4d5fda768b69b52fb015
Merge: 17d08b9 7555aca
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 23:02:53 2011 +0000

    compute_api.get_all should be able to recurse zones (bug 744217).
    Also, allow to build more than one instance at once with zone_aware_scheduler types.
    Other cleanups with regards to zone aware scheduler...

commit 81ea3d5fc47bed84c5f4bf722b02dfa58792e19e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 29 18:26:51 2011 -0400

    Updated v1.1 links in flavors to represent the curret spec

 nova/api/openstack/views/flavors.py      |    2 --
 nova/tests/api/openstack/test_flavors.py |   10 ----------
 2 files changed, 12 deletions(-)

commit 7555aca28a5ab1ba4dd1be04a91bf6347eaac84f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 15:22:56 2011 -0700

    fix issue of recurse_zones not being converted to bool properly
    add bool_from_str util call
    add test for bool_from_str
    slight rework of min/max_count check

 nova/api/openstack/create_instance_helper.py |   10 ++--------
 nova/api/openstack/servers.py                |    3 +--
 nova/tests/test_utils.py                     |   13 +++++++++++++
 nova/utils.py                                |   11 +++++++++++
 4 files changed, 27 insertions(+), 10 deletions(-)

commit 46c321d044d6a2db44a22466624a1e7dc71d5935
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 17:19:47 2011 -0500

    fixed incorrect assumption that nullable defaults to false

 .../migrate_repo/versions/029_multi_nic.py         |    6 +++---
 nova/db/sqlalchemy/models.py                       |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

commit c49b1a8124fe63292d7c1191c094cc5921dbfaa9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 17:17:33 2011 -0500

    removed port_id from virtual interfaces and set network_id to nullable

 .../migrate_repo/versions/029_multi_nic.py         |    9 ++-------
 nova/db/sqlalchemy/models.py                       |    5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

commit 7623b91391e9c03beb81f30563e40e71bb94313b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 17:06:58 2011 -0500

    changes a few instance refs

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 51f64e0073229f3bfe7ac3594170a372b51c1fd8
Merge: fedd1a5 17d08b9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 16:44:42 2011 -0500

    merged trunk

commit c1e799795e9634f4b56aaeb76c4a9553da3846e2
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 29 21:39:43 2011 +0000

    Rename one use of timeout to expiration to make the purpose clearer

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fedd1a582ff1fd09bdfe2dafc6c220bf799ec770
Merge: 89756b8 4f3ef1a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 16:39:05 2011 -0500

    pulled in koelkers test changes

commit 4f3ef1a568caecb26b57c757316a3cdfda20cc31
Merge: 8e09478 89756b8
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jun 29 14:42:32 2011 -0500

    merge with trey

commit 8e09478b8de752909f5937668b44d7f67d7719ed
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 29 14:36:15 2011 -0500

    major reactor of the network tests for multi-nic

 nova/tests/network/__init__.py |   67 -------------
 nova/tests/network/base.py     |  144 --------------------------
 nova/tests/test_network.py     |  217 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 210 insertions(+), 218 deletions(-)

commit 097e25f69a3ce4fe29addf93e4f92fa861aa54dc
Merge: 851802e 17d08b9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 12:26:04 2011 -0700

    Merged trunk

commit 17d08b9644080265f6feb4d55825de8e4049c991
Merge: e10daec 74c222b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 29 19:24:32 2011 +0000

    Fixes Bug #803563 by changing how nova passes options in to glance. Before, if limit or marker were not set, we would pass limit=0 and marker=0 in to glance. However, marker is supposed to be an image id. With this change, if limit or marker are not set, they are simply not passed into glance. Glance is free then to choose the default behavior.

commit 851802e772095b646a7570bf0cc0c6d32be4643c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 12:23:26 2011 -0700

    Fixed indentation issues
    Fixed min/max_count checking issues
    Fixed a wrongly log message when zone aware scheduler finds no suitable hosts

 nova/api/openstack/create_instance_helper.py |   11 +++++++++--
 nova/api/openstack/servers.py                |   12 ++++++------
 nova/compute/api.py                          |   13 +++++++------
 nova/scheduler/zone_aware_scheduler.py       |    2 +-
 4 files changed, 23 insertions(+), 15 deletions(-)

commit 85522bba82a4139a89915bba99865a50fd9b8f58
Merge: 04dcf46 74c222b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 29 19:17:00 2011 +0000

    Fixes Bug #803563 by changing how nova passes options in to glance. Before, if limit or marker were not set, we would pass limit=0 and marker=0 in to glance. However, marker is supposed to be an image id. With this change, if limit or marker are not set, they are simply not passed into glance. Glance is free then to choose the default behavior.

commit e10daec4f6ea77c7544f5ad1123b3d82e0a2989e
Merge: fd7bd88 45e5ae2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 19:03:48 2011 +0000

    Sets 'exclusive=True' on Fanout amqp queues.  We create the queues with uuids, so the consumer should have exclusive access and they should get removed when done (service stop).  exclusive implies auto_delete.  Fixes lp:803165

commit 74c222b6b4042053cc8c2d0038f37b3f8ee8b9fc
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 29 14:52:56 2011 -0400

    don't pass zero in to glance image service if no limit or marker are present

 nova/api/openstack/common.py            |   37 ++++++++++++++-----------------
 nova/api/openstack/images.py            |   12 +++++-----
 nova/tests/api/openstack/test_common.py |   12 +++++++---
 nova/tests/api/openstack/test_images.py |   20 ++++++++---------
 4 files changed, 42 insertions(+), 39 deletions(-)

commit 89756b879e7094876697a2380e56c26796d50878
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 13:17:22 2011 -0500

    more incorrect list type casting in create_network

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b3923858d84fa3228ee59d5cbea8f0ce004e26f6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 13:13:47 2011 -0500

    removed the list type cast in create_network on the NETADDR projects

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bd3dd9c95aef72f5e16e166af5b0ab16d39365b5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 13:04:04 2011 -0500

    renumbered migrations again

 .../migrate_repo/versions/028_multi_nic.py         |  130 --------------------
 .../029_fk_fixed_ips_virtual_interface_id.py       |   56 ---------
 .../migrate_repo/versions/029_multi_nic.py         |  130 ++++++++++++++++++++
 .../migrate_repo/versions/029_sqlite_downgrade.sql |   48 --------
 .../migrate_repo/versions/029_sqlite_update.sql    |   48 --------
 .../030_fk_fixed_ips_virtual_interface_id.py       |   56 +++++++++
 .../migrate_repo/versions/030_sqlite_downgrade.sql |   48 ++++++++
 .../migrate_repo/versions/030_sqlite_upgrade.sql   |   48 ++++++++
 8 files changed, 282 insertions(+), 282 deletions(-)

commit 5b634ef5ed8bfd0acf81291a2f80eb7975738c36
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 29 11:00:37 2011 -0700

    Make sure test setup is run for subdirectories

 nova/tests/api/__init__.py           |   19 +++++++++++++++++++
 nova/tests/api/openstack/__init__.py |    3 +++
 nova/tests/image/__init__.py         |    3 +++
 nova/tests/integrated/__init__.py    |    2 ++
 nova/tests/scheduler/__init__.py     |   19 +++++++++++++++++++
 5 files changed, 46 insertions(+)

commit 772a2ce2b980859d440440acb539e6e4ee42a36d
Merge: f22b45d 0bfa9aa
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 12:58:10 2011 -0500

    merged trunk, fixed the floating_ip fixed_ip exception stupidity

commit 9d6b905a6a069c6d44915ffa13ba0c7cfa794f97
Merge: 8bd2005 4a3ef43
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 10:47:30 2011 -0700

    trunk merge

commit fd7bd882049cc971300d22b2c7ad6d97db2e4cc0
Merge: 5caef3c 698bb2e
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 29 17:21:32 2011 +0000

    "nova-manage vm list" was still referencing the old "image_id" column, which was renamed to "image_ref" at revision 1144.
    
    Additionally, the command was printing out an raw object reference instead of an instance type name, and columns were misaligned.
    
    While I was at it, I also fixed a pylint-reported potential "undefined name" error due to use of an uninitialized "e" in an exception block.

commit 5caef3c92798436230e80fa5796efc7f2f00d168
Merge: 463766f 0ca902c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 29 17:04:02 2011 +0000

    Implement backup with rotation and expose this functionality in the OS API.

commit 5686488517f702bd4ba714edeea89ea1993ac220
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 29 09:49:49 2011 -0700

    Allow a port name in the server ref for image create

 nova/api/openstack/images.py            |   11 ++++++++---
 nova/tests/api/openstack/test_images.py |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

commit 45e5ae28377abc0eefd2e71ef553380b25283c48
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 09:49:19 2011 -0700

    Fanout queues use unique queue names, so the consumer should have exclusive access.  This means that they also get auto deleted when we're done with them, so they're not left around on a service restart.  Fixes lp:803165

 nova/rpc.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 848fd99f378976f99fa883fec85f30c4e9f46bca
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 17:38:02 2011 +0100

    pep8 fix

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 291df3a09a9970ad9ab0b236c93afe4d2a46920e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 09:29:07 2011 -0700

    removed extra stubout, switched to isinstance and catching explicit exception

 nova/compute/api.py                               |    2 +-
 nova/scheduler/zone_aware_scheduler.py            |    2 +-
 nova/tests/scheduler/test_zone_aware_scheduler.py |   10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)

commit 0b65c0130789be0d445153b7370ec60fab62b58e
Merge: fcf1a6d 463766f
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 17:23:10 2011 +0100

    get latest branch

commit 463766fbffff00e333ded0123bc1bc45513db061
Merge: 4a3ef43 c6e220a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 29 16:18:55 2011 +0000

    Deprecate -r for run_tests.sh and adds -n, switching the default back to recreate.

commit 68b313077578870908ebcc5b668df67ce921929a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 29 16:08:34 2011 +0000

    check_domid_changes is superfluous right now since it's only used when timeout is used. So simplify code a little bit

 nova/virt/xenapi/vmops.py |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 6af4a9ded53efe4ca5c3aad1f3a621cc73513fb0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 08:30:21 2011 -0700

    updated pip-requires for novaclient

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2de973b5d57c8a4a79b94dcbcf6d6299f5c83e3c
Merge: 37e86a2 4a3ef43
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 08:29:35 2011 -0700

    Merged trunk

commit de4a165a9d817b0422bcbeda8d59516d839745c8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 08:29:13 2011 -0700

    pip requires

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fcf1a6d8f62a39d64fcf4d9f3629cefda73718f0
Merge: 3794d88 4a3ef43
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 16:18:33 2011 +0100

    adopt merge

commit 3794d8889ed933fc776d7541ef25e2c9583a6cf6
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 16:17:33 2011 +0100

    clean up logging for iso SR search

 nova/virt/xenapi/vm_utils.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 8bd200505ada97780d3a63927cfadcded456b30d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 08:14:43 2011 -0700

    moved to wrap_exception approach

 nova/compute/manager.py |   20 ++++++++++----------
 nova/exception.py       |    6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

commit 9476c540b2bbdb3ce77cd0acb68639f1f5ed2f72
Merge: c16f972 4a3ef43
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 29 15:09:29 2011 +0000

    Merge with trunk

commit 698bb2e090988723e58f67b92bb38a9f7f2e49e1
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 29 16:52:55 2011 +0200

    Fix 'undefined name 'e'' pylint error

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c6e220af60079bd2e3f1a8991052b108692a1696
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 29 07:47:51 2011 -0700

    change the default to recreate the db but allow -n for faster tests

 run_tests.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit fc40fa75a59d253859a559d1b8c336ebe7864b69
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 29 16:45:46 2011 +0200

    Fix nova-manage vm list

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4a3ef4367db23e8495e9c1dc4a49b5c66a6c763e
Merge: 014c646 7b6ded9
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 29 14:24:17 2011 +0000

    Adding files for building an rpm for xenserver xenapi plugins.

commit 47ba396d19f40563ee1b810b98ec74aa1b0b3b53
Merge: 625816f 014c646
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 06:24:09 2011 -0700

    moved migration again & trunk merge

commit c8d27dd68d449df77106c9cdf45b63c25fcb18ca
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 14:07:59 2011 +0400

    Brought back that encode under condition.

 nova/compute/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 90556a857d0c3187115f401a637cd4ae1134ce05
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 13:37:24 2011 +0400

    Add test for hostname generation.

 nova/tests/test_compute.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit d1adc2d969570049921370450e942e349deed840
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 13:17:16 2011 +0400

    Remove unnessesary (and possibly failing) encoding.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 04dcf46f1f0414b450a1151fa438ec19a35d0fc8
Merge: 83742f0 834b174
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 29 04:28:29 2011 +0000

    Fix for bug 803186 that fixes the ability for nova-api to run from a source checkout.

commit a0f968235332e5400d507bbafa99bc0728aa8479
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 28 21:04:50 2011 -0700

    moved to wrap_exception decorator

 nova/compute/manager.py |    7 ++++++-
 nova/exception.py       |    8 +++++++-
 nova/notifier/api.py    |   26 --------------------------
 nova/rpc.py             |    8 --------
 4 files changed, 13 insertions(+), 36 deletions(-)

commit 0ca902cb90ea824ef199601b65dbc52e6c713079
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 18:50:17 2011 -0500

    Review feedback

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a4e986cd69f932b61d2f13a24d8d4d4ec154527
Merge: d59e576 014c646
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 18:13:23 2011 -0500

    Merged trunk

commit 014c646ad36c0e790006a9832660d9ecd0c5b370
Merge: 9ae4fbd 834b174
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 22:43:32 2011 +0000

    Put possible_topdir back in nova-api.

commit 834b1741b4cd5e42393a8947a5c1fea80c625ee2
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 17:26:08 2011 -0500

    Use milestone cut.

 bin/nova-api                                       |    6 ++++++
 .../versions/027_add_provider_firewall_rules.py    |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

commit d59e576dfeccdbd7ee82ea2803b57e24dcba2c22
Merge: d0ff8a7 9ae4fbd
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 17:05:41 2011 -0500

    Merged trunk

commit d0ff8a737111e9155fd59816afa5c4fc2b34bb4c
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 16:54:25 2011 -0500

    Let glance handle sorting.

 nova/compute/manager.py |    5 -----
 1 file changed, 5 deletions(-)

commit c4cf8a85b1ce1f995bf0039b15032853d6adf4dd
Merge: 2ba8378 9ae4fbd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 28 17:42:21 2011 -0400

    merging trunk

commit 2916aa40f6dc0b06217ff7d3750ecdd3bb03e4fd
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 16:03:41 2011 -0500

    Review feedback.

 nova/api/openstack/images.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 9ae4fbdef0a5f4c925c7e3d546edea06e608e39b
Merge: 0bfa9aa 498f2d6
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 20:53:45 2011 +0000

    This adds system usage notifications using the notifications framework.
    These are designed to feed an external billing or similar system that subscribes to the nova feed and does the analysis.

commit 498f2d671573fc19d551516f7ead5da8d052ee18
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 20:37:05 2011 +0000

    Refactored usage generation

 bin/instance-usage-audit |   16 ++--------
 nova/compute/manager.py  |   77 ++++++----------------------------------------
 nova/utils.py            |   16 ++++++++++
 3 files changed, 28 insertions(+), 81 deletions(-)

commit 72ec15baa1f1672f9ff001e6127060889dd2bc4c
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:26:00 2011 -0500

    pep8

 .../versions/027_add_provider_firewall_rules.py    |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 292ffb2710288ef417849c70d804bf949704412e
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:25:08 2011 -0500

    remove zombie file

commit dffe6f2f2289ffa91dc7ee8ef6e193033084064d
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:20:24 2011 -0500

    remove unecessary cast to list

 nova/network/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 18274d533edbbf3873e10dfa5d2b73334de2ae42
Merge: 7775f6f f22b45d
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 28 15:17:58 2011 -0500

    merge with trey

commit ec1afee8399818db2ba11952a61c924da73f57a0
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 15:17:23 2011 -0500

    OOPS

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ee2eb1f712a87e73832618be6b79f74301d74a41
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 14:58:34 2011 -0500

    Whoops.

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ec574986212b694bfed8109545b4b4dc578ec8f4
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 14:49:40 2011 -0500

    Review feedback.

 nova/compute/manager.py |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit f22b45dd7b149248be2eacf36b2c7428b3c71efc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 28 11:20:02 2011 -0500

    skipping another libvirt test

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit 24835b0348a9a6d8bd4e40107990d1abb41538c2
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 16:08:27 2011 +0000

    Fix merge issue in compute unittest.

 nova/tests/test_compute.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 83742f0812ddda1ead29ae7ea28454255858cfc3
Merge: 8185703 4871803
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jun 28 16:05:20 2011 +0000

    Merge diablo-2 development work

commit 2ba837877344bc791d7361f622be288c1870ffda
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 28 11:59:46 2011 -0400

    adding unicode support to image metadata

 nova/api/openstack/image_metadata.py            |   11 +++++++----
 nova/tests/api/openstack/test_image_metadata.py |    8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

commit c69fc237f3628d579a35af1f7bf3fbb4adeb81b7
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:59:44 2011 +0000

    Fix thinko in previous fix :P

 nova/compute/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 37e86a230720921488ae19fc2ca92667e8be4485
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:53:13 2011 -0700

    change variable names to remove future conflict with sandy's zone-offsets branch

 nova/scheduler/zone_aware_scheduler.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 66b2fef4b294c7a351cc5815632da520c6ee811b
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:50:07 2011 +0000

    Fix yet more merge-skew.

 nova/compute/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 7775f6f5c154577fc9ecc1688916c37256c93cff
Merge: 06bc61d 80e71c5
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 28 10:49:58 2011 -0500

    merge with trey

commit 48718038058b5f9a44ad2e4066bbaed5037cb7f4
Merge: 8185703 0bfa9aa
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Jun 28 17:32:59 2011 +0200

    Merge diablo-2 development from trunk (rev1221)

commit 0bfa9aad9c1f74ca962351d90265e5fb56156841
Merge: c400af0 18ef175
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Jun 28 15:32:02 2011 +0000

    This branch allows LdapDriver to reconnect to LDAP server if connection is lost.

commit 4c1d05d27f207e71546f20c4e603839afc232b5a
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:21:08 2011 +0000

    Fix issues due to renming of imange_id attrib.

 bin/instance-usage-audit |    2 +-
 nova/compute/manager.py  |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

commit c400af0d27f28cd0b56f94cd2640893f3cb698e7
Merge: 53b0674 4ec4ec7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 28 15:13:52 2011 +0000

    Re-worked some of the WSGI and WSGIService code to make launching WSGI services easier, less error prone, and more testable. Added tests for WSGI server, new WSGI loader, and modified integration tests where needed.

commit b497b7b95124fa52259637d0fc1a67f4ff625b0c
Merge: e611d32 53b0674
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:12:56 2011 -0700

    Merged trunk

commit e611d3210911bfb6276da495d0b3943d2ce1b511
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:12:08 2011 -0700

    update a test docstring to make it clear we're testing multiple instance builds

 nova/tests/scheduler/test_zone_aware_scheduler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9653ee5cfae198355610ff40f0820eb9071a0deb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:08:13 2011 -0700

    log formatting typo
    pep8 fixes

 nova/scheduler/zone_aware_scheduler.py            |    3 ++-
 nova/tests/scheduler/test_zone_aware_scheduler.py |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 18ef175d766794c8a1a9b3e8c5d6b4f18232696c
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Jun 28 18:52:22 2011 +0400

    Prevent test case from ruining other tests. Make it work in earlier python versions.

 nova/tests/test_auth.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 4ec4ec7e4008adabf051651e3c55137c9954139f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 28 10:43:25 2011 -0400

    pep8 fix

 nova/utils.py |    1 -
 1 file changed, 1 deletion(-)

commit f6390090ff48258078113b2e6d9dd5fbf49bea3a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 28 10:39:04 2011 -0400

    I accidently the whole unittest2

 nova/tests/test_service.py |    1 -
 nova/tests/test_wsgi.py    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 53b067431a4484ff243546f99c938b76f8f67972
Merge: f192f6f 69c475f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jun 28 13:04:19 2011 +0000

    Adds support for "extra specs", additional capability requirements associated with instance types.
    
    The instance_type dictionary now has a new extra_specs field.
    
    Adds a new table to the database: InstanceTypeExtraSpecs. This is modeled on the existing InstanceMetadata table, except that it is associated with additional capability requirements of instance types rather than generic metadata for instances.
    
    The InstanceTypeFilter has been modified to check for extra specs.
    
    This will ultimately be needed for supporting heterogeneous instances: we'll annotate the instance types with info about whether GPUs are present, so users will be able to request something like a "cg1.4xlarge".
    
    Includes api support as an extension for querying and modifying this info.

commit 4c98425ba7a53c8b966317444abe2d4f7b6556d8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 28 05:51:40 2011 -0700

    refactoring to compute from scheduler

 nova/notifier/api.py     |   39 +++++++++++++++++++++++++++++++++++++++
 nova/rpc.py              |    9 ++-------
 nova/scheduler/driver.py |   10 ++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)

commit ff195162d97f4a1ffaa6127f92cca102705b023b
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jun 28 16:46:50 2011 +0400

    remove network to project bind

 bin/nova-manage         |    5 ++---
 nova/network/manager.py |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

commit 3aa556c96e2e79795327922a4a4ec4b308064a09
Merge: 6ca1845 f192f6f
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:44:29 2011 +0100

    resync with trunk.

commit 6ca1845582334d69474f5f9d661177e77cd769fe
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:34:17 2011 +0100

    Add test for spawn from an ISO.

 nova/tests/glance/stubs.py |    6 ++++++
 nova/tests/test_xenapi.py  |    6 ++++++
 2 files changed, 12 insertions(+)

commit 8878f6433cebcac963ed8789200f38a5ac4dfddd
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:33:12 2011 +0100

    Add fake SR with ISO content type.

 nova/virt/xenapi/fake.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 32b06d654922e08a53c6a4fc49fd2ad40e7a5d20
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:32:23 2011 +0100

    Revise key used to identify the SR used to store ISO images streamed from Glance.

 nova/virt/xenapi/vm_utils.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 6965da1d8599934c8259f6a5414b7a044971a403
Merge: e2c66d0 f192f6f
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 10:23:00 2011 +0000

    remerged trunk

commit e2c66d0e96467d510d01a5c5f60a56e8252dce5b
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 09:08:35 2011 +0000

    Fix pep8 nits in audit script

 bin/instance-usage-audit |   53 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

commit 4b8bcf30f934ea91290b7fe41536ba06ee832b3f
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 08:57:05 2011 +0000

    Re-merging code for generating system-usages to get around bzr merge braindeadness.

 bin/instance-usage-audit       |  127 ++++++++++++++++++++++++++++++++++++++++
 nova/compute/manager.py        |   94 +++++++++++++++++++++++++++++
 nova/db/api.py                 |    5 ++
 nova/db/sqlalchemy/api.py      |   18 ++++++
 nova/notifier/test_notifier.py |   28 +++++++++
 nova/tests/test_compute.py     |   77 ++++++++++++++++++++++++
 6 files changed, 349 insertions(+)

commit 62ce69c1c63df818a2a6f1be6cdad33cbe6ef796
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 27 20:21:45 2011 -0700

    getting started

 nova/rpc.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit f192f6f0d3f28f0d629a2a97ef6faec85ba24b2e
Merge: 2cc5d89 7c4f83b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jun 28 00:23:19 2011 +0000

    Added floating IP support in OS API

commit 2cc5d8916b8827faba416a0e317b106afa453ae7
Merge: 89b4f93 9978d65
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 23:27:58 2011 +0000

    This speeds up multiple runs of tests to start up much faster because it only runs db migrations if the test db doesn't exist.  It also adds the -r/--recreate-db option to run_tests.sh to delete the tests db so it will be recreated.

commit 80e71c50e88cb5552b7f700c8946e14b915eea11
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 17:49:07 2011 -0500

    small formatting change

 nova/db/sqlalchemy/api.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 73c49dd3497f46953d7fa9ac3f5caebcafa02023
Author: John Tran <jhtran@att.com>
Date:   Mon Jun 27 15:30:56 2011 -0700

    breaking up into individual tests for security_groups

 nova/tests/test_cloud.py |   41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

commit 89b4f93600d3fe137b9ebe565630f532da367dd9
Merge: 8a8c013 3d4ec00
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 22:18:08 2011 +0000

    Proposing this because it is a critical fix before milestone.  Suggestions on testing it are welcome.

commit c293506c435222d8154618ffda89108d3f1ef692
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jun 27 15:17:19 2011 -0700

    logging fixes

 nova/scheduler/zone_aware_scheduler.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit b699b9abd235eb611bc1d59b923f1ed83f96cfff
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 17:07:21 2011 -0500

    removed unneded mac parameter to lease and release fixed ip functions

 bin/nova-dhcpbridge        |    8 ++------
 nova/network/manager.py    |   10 ++++------
 nova/tests/network/base.py |    4 ++--
 3 files changed, 8 insertions(+), 14 deletions(-)

commit dc90a10e399310c5a2781970874ea0e747f62670
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jun 27 15:05:37 2011 -0700

    Made _issue_novaclient_command() behave better.
    Fixed a bunch of tests.

 nova/scheduler/api.py                             |   49 +++++++++++++++------
 nova/scheduler/zone_aware_scheduler.py            |    4 +-
 nova/tests/scheduler/test_least_cost_scheduler.py |   11 ++---
 nova/tests/scheduler/test_scheduler.py            |    4 +-
 nova/tests/scheduler/test_zone_aware_scheduler.py |   35 +++++++--------
 5 files changed, 60 insertions(+), 43 deletions(-)

commit 883992df19441544deb9aa5f60f2a77ab1f46567
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 27 16:50:17 2011 -0500

    Review feedback.

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 06bc61dbe63182bfc3d95de0c7330ccdc1210379
Merge: 42f9777 0a2c2e0
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Jun 27 16:49:33 2011 -0500

    merge with trey

commit 0a2c2e0975c3037372b47b09a7f547eb197ef7d7
Merge: e2a734a 8a8c013
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 16:48:03 2011 -0500

    trunk merge, getting fierce..

commit 9d31fb19fed87b8fd44aeaaf71361f25f5bea9a6
Merge: 9855acc 8a8c013
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 16:08:48 2011 -0400

    Merged trunk.

commit 9855acc214a02d5181a0d8a735e57a89146127db
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 15:49:24 2011 -0400

    Added nova.version to utils.py

 nova/utils.py |    1 +
 1 file changed, 1 insertion(+)

commit 43713a2e45862219c538ede60363053d36bb0f1b
Author: Arvind Somy <asomya@cisco.com>
Date:   Mon Jun 27 14:41:07 2011 -0400

    - Modified NOTE in vm_util.py
    - Changed gettext line to nova default in guest_tool.py

 nova/virt/vmwareapi/vm_util.py |    2 +-
 tools/esx/guest_tool.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b74a01924511a46f0cb0279163349a8a68000cc4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 27 13:51:30 2011 -0400

    renaming tests

 nova/tests/api/openstack/test_image_metadata.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3d4ec00de0458533d5e8d5eac9d686dd6b626e49
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 10:51:05 2011 -0700

    make sure basic filters are setup on instance restart

 nova/virt/libvirt/connection.py |    1 +
 1 file changed, 1 insertion(+)

commit e2a734a19584a1d46b85e28e427320b4cd1a840c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 12:32:57 2011 -0500

    typo

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7c4f83bc8f119ff4486f913bd3e5ef7eff5b338f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Jun 27 20:36:53 2011 +0400

    changed extension alias to os-floating-ips

 nova/api/openstack/contrib/floating_ips.py         |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

commit b245dfd693107318c90d1af4fdf057ea1a5fc5c2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:17:37 2011 -0700

    missed the bin line

 tools/nova-debug |    1 +
 1 file changed, 1 insertion(+)

commit 7b6ded922adc26f26dd208d5de1763b708866cea
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 27 12:10:47 2011 -0400

    Updating license to ASL 2.0

 .../rpmbuild/SPECS/openstack-xen-plugins.spec      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9513dba163c8a746aabda3ceb25b6976b59005f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:07:49 2011 -0700

    update nova.sh

 contrib/nova.sh |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

commit 7230c384d1373e8718bc7fd2fd86b1e805a0573e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:05:05 2011 -0700

    make nova-debug work with new style instances

 tools/nova-debug |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 998b5ba2c709054c535583195ba489454e384f41
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 27 12:04:44 2011 -0400

    Changed package name to openstack-xen-plugins per dprince's suggestion.
    All the files in /etc/xapi.d/plugins must be executable.
    Added dependency on parted.
    Renamed build.sh to build-rpm.sh.

 plugins/xenserver/xenapi/contrib/build-rpm.sh      |   20 +++++++++++
 plugins/xenserver/xenapi/contrib/build.sh          |   20 -----------
 .../rpmbuild/SPECS/nova-xenapi-plugins.spec        |   36 --------------------
 .../rpmbuild/SPECS/openstack-xen-plugins.spec      |   36 ++++++++++++++++++++
 4 files changed, 56 insertions(+), 56 deletions(-)

commit 6d1ce4a46a9684ac718bfc19dc8a362fbc9a9641
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:02:22 2011 -0700

    remove extra stuff from clean vlans

 tools/clean-vlans |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c16f97249e4f0626f8b8d4a7af070201641770b8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 27 15:54:43 2011 +0000

    Clarify help verbiage

 nova/virt/xenapi/vmops.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8df250af09b6319d5dc70d42469121f04401548f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 27 11:29:29 2011 -0400

    making key in images metadata xml serialization test null as well

 nova/api/openstack/image_metadata.py            |    2 +-
 nova/tests/api/openstack/test_image_metadata.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 7746fffe58e91eadf6597b13e166f6a3e5894c53
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 27 11:27:25 2011 -0400

    making image metadata key in xml serialization test unicode

 nova/tests/api/openstack/test_image_metadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5fe1839feb2d837a03a916a9af564d941d0c320
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 27 11:26:37 2011 -0400

    extracting images metadata xml serialization tests into specific class; adding unicode image metadata value test

 nova/tests/api/openstack/test_image_metadata.py |  242 +++++++++++++----------
 1 file changed, 133 insertions(+), 109 deletions(-)

commit cbd648c467f299c4f45b720e8c909ff11334f8f0
Merge: 661b318 8a8c013
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 27 15:13:37 2011 +0000

    Merge with trunk

commit 8d2d02d59fac8a63673ee01dab857f0a5fe4c600
Merge: b86b14a ad19a9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 08:07:02 2011 -0700

    merged blamar's simpler test

commit 0a3b50d7b754af26b68f81617cab9aa588484362
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Jun 27 16:03:14 2011 +0100

    Pulled changes, passed the unit tests.

 .../versions/027_add_provider_firewall_rules.py    |    3 +--
 nova/virt/xenapi/vmops.py                          |    5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

commit d7844ecbf5dff67d22beaaff90f0bfa3acb4362a
Merge: 8189496 8a8c013
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Jun 27 15:22:15 2011 +0100

    Pulled trunk, merged boot from ISO changes.

commit ad19a9e762f735a33af710fb8bded3a086266587
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 09:58:17 2011 -0400

    Removed now un-needed fake_connection

 nova/tests/test_metadata.py |    1 +
 nova/wsgi.py                |   29 -----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

commit d1b904d5b7d4a277adc156d8ab576b37b7e190fc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 09:56:31 2011 -0400

    Use webob to test WSGI app

 nova/tests/test_metadata.py |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

commit f4753fbcc0f84bf1f6e117e5f983ccffd3a5f93e
Merge: 044cbc6 8a8c013
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 27 14:42:36 2011 +0100

    Merge trunk

commit 75dd73b1246904fd11bf9b566bf2319d3e6bada5
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Jun 27 17:05:35 2011 +0400

    fixed pep style

 nova/db/sqlalchemy/api.py                          |    6 +++---
 .../api/openstack/contrib/test_floating_ips.py     |    9 +++------
 nova/tests/api/openstack/fakes.py                  |    2 --
 3 files changed, 6 insertions(+), 11 deletions(-)

commit ef1f4d33fa5763ea602c2fc1098a4b230b86e82b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Jun 27 16:33:01 2011 +0400

    review issues fixed

 nova/api/openstack/contrib/floating_ips.py         |   20 ++++++++++----------
 nova/db/sqlalchemy/api.py                          |    8 ++++----
 nova/exception.py                                  |    4 ++--
 nova/network/api.py                                |    4 ++--
 .../api/openstack/contrib/test_floating_ips.py     |   12 ++++++------
 5 files changed, 24 insertions(+), 24 deletions(-)

commit 02c0bf3b242395e63baf582b1f9c279eef4282d6
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jun 27 20:21:40 2011 +0900

    sqlalchmey/migration: resolved version conflict

 .../versions/027_add_root_device_name.py           |   47 --------------------
 .../versions/028_add_root_device_name.py           |   47 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)

commit 1de9cd60ab20a2ea942b994abbcb36c3c9393906
Merge: ce3b1ff 8a8c013
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jun 27 20:20:42 2011 +0900

    merge with trunk

commit 21cbac8334a37f15595088bc0c99f8f04451f1a7
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 27 00:20:53 2011 -0400

    Adding files for building an rpm for xenserver xenapi plugins.

 plugins/xenserver/xenapi/contrib/build.sh          |   20 +++++++++++
 .../rpmbuild/SPECS/nova-xenapi-plugins.spec        |   36 ++++++++++++++++++++
 2 files changed, 56 insertions(+)

commit 69c475fb9bb6eaa67880bc08f2b2479b84b16113
Merge: 0f5e793 8a8c013
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sun Jun 26 20:02:18 2011 -0400

    Upstream merge
    
    Moved instance type extra specs tests to extensions directory.
    
    Added os- prefix to extra specs API alias.
    
    Pegged pep8 venv version to 0.6.1

commit a92b1e6cb04fe76dd072a2189f17a72357f3f4eb
Merge: 9bd5afb 8a8c013
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Jun 26 18:07:57 2011 -0400

    merging trunk; adding error handling around image xml serialization

commit 9bd5afb3246abecaa25beaabac12f28da35887e5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Jun 26 17:32:19 2011 -0400

    adding xml serialization test of zero images

 nova/tests/api/openstack/test_images.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit b86b14ac5a96332beedf10ca8da5787adfc6c308
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:52:26 2011 -0700

    pep8

 nova/tests/test_metadata.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit a8f485d148f2184253fcbd7ccdfa9de9bb0bb735
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:50:39 2011 -0700

    add metadata tests

 nova/tests/test_metadata.py |   82 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

commit 1c677ad263f72583748074d01f6dbd384c411c11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:47:54 2011 -0700

    add fake connection object to wsgi app

 nova/wsgi.py |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 14a63fa2c7de79fe173771fd98e448650387e924
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:29:14 2011 -0700

    add support to list security groups

 nova/api/ec2/cloud.py                  |    5 ++++-
 nova/api/ec2/metadatarequesthandler.py |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 9978d656d262a95e17a60a2c137664b315f8191a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:26:38 2011 -0700

    only create the db if it doesn't exist, add an option -r to run_tests.py to delete it

 nova/tests/__init__.py |    2 +-
 run_tests.py           |    7 +++----
 run_tests.sh           |    7 +++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

commit 8a8c013cd4513b07e936125a23188e7608f40d58
Merge: 4db84dc e253cd3
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Sat Jun 25 19:38:07 2011 +0000

    Fix for bug #788265.
    Remove created_at, updated_at and deleted_at from instance_type dict returned by methods in sqlalchemy API.

commit e253cd3cf01d29106daff1592a7c629307b449ff
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Sat Jun 25 14:04:40 2011 +0400

    PEP8 fix

 nova/utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0f5e7930b48ddd48a803ff5afd25f980df2e31b6
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat Jun 25 00:22:59 2011 -0400

    pep8

 nova/db/sqlalchemy/api.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit af4e663dee05c907d7ccddc3bb929ff114e876cc
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat Jun 25 00:05:38 2011 -0400

    Updated _dict_with_extra_specs docstring

 nova/db/sqlalchemy/api.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 706bfc7e3f1cb1d5c56e988abf264c71c54ac0ce
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 23:50:12 2011 -0400

    Renamed _inst_type_query_to_dict -> _dict_with_extra_specs.
    
    pep8 version is no longer explicitly specified in pip-requires

 nova/db/sqlalchemy/api.py |   16 ++++++++--------
 tools/pip-requires        |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

commit f4807e61f42cbacbd7d15a10aa0ff6b9e6695d75
Merge: 101fcf7 4db84dc
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 23:13:01 2011 -0400

    Merged from trunk

commit 4db84dc78ae6660dbced7e9382ae5c441a135908
Merge: e6f3ce3 51d93c5
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 25 02:30:47 2011 +0000

    Add api methods to delete provider firewall rules.

commit e6f3ce3541d3ce380c00dda3b878a652fc31f2fc
Merge: 9f5a604 35e922a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sat Jun 25 02:16:20 2011 +0000

    This small change restores single quotes and double quotes as they were before in the filter expression for retrieving the PIF (physical interface) xenapi should use for creating VLAN interfaces.
    
    I'm not sure why they were altered, possibly because of coding style conventions, but unfortunately xenapi does not accept single quotes for separating filter expression tokens.

commit 9f5a604e24b259a76dfc0db6e090433667b6f050
Merge: 543a57a 31e3aed
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Jun 25 02:10:27 2011 +0000

    Remove the unnecessary insertion of whitespace.  This happens to be enough
    to make this patch apply on recent versions of XenServer / Xen Cloud Platform.

commit 543a57a3d0215089310b2094b0267bd762e2bc00
Merge: 1b08d1b c2a0f15
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sat Jun 25 01:54:28 2011 +0000

    Removes the usage of the IPy module in favor of the netaddr module.

commit 1b08d1b3a505788a52e709bf762e679ce8cc9077
Merge: 654350a 92b0307
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Jun 25 01:47:52 2011 +0000

    - update glance image fixtures with expected checksum attribute
    - ensure checksum attribute is handled properly in image service

commit fd3da28b567a66a31f2833a3c00d0b6ccf55eed8
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 04:47:06 2011 +0400

    mailmap

 .mailmap |    2 ++
 Authors  |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 584615837f949b4d9d2a99880d03539789467f2c
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 04:45:15 2011 +0400

    mailmap

 .mailmap |    2 ++
 Authors  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit ce3399b8220376cafef7e54534ce54096837b1fc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 24 18:29:01 2011 -0500

    configure number of attempts to create unique mac address

 nova/network/manager.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit da453fff9112a68ed81aebeb8f25305e91c3d426
Merge: 537117e 5e4d90b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:13:53 2011 +0400

    merged

commit 537117eb9e42f6d32f387485a76435c0485c3d6e
Merge: 62018b1 654350a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:12:54 2011 +0400

    trunk merged. conflicts resolved

commit 5e4d90b33ddb993294232eea168a768486ba0bf4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 03:05:09 2011 +0400

    added disassociate method to tests

 nova/api/openstack/contrib/floating_ips.py         |   12 +++++----
 nova/db/api.py                                     |    2 ++
 nova/db/sqlalchemy/api.py                          |    2 ++
 nova/exception.py                                  |    2 ++
 .../api/openstack/contrib/test_floating_ips.py     |   28 +++++++++++++++-----
 5 files changed, 34 insertions(+), 12 deletions(-)

commit 62018b1abaa007f8f530ba08d74413c59e2814cb
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:03:17 2011 +0400

    fixes

 Authors |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a770864d308242bfcfa8dadb210595785d8fa71f
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:42:27 2011 +0400

    tests

 nova/api/openstack/contrib/floating_ips.py         |   14 ++++++----
 .../api/openstack/contrib/test_floating_ips.py     |   29 ++++++++++++--------
 2 files changed, 27 insertions(+), 16 deletions(-)

commit 707c64ba5cb86ae3fc72d7bdc64070d9e562d96b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 17:19:32 2011 -0500

    PEP8 cleanup.

 .../versions/027_add_provider_firewall_rules.py    |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit cd54be394d9b0807b68579b4630bf4c48738c506
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 24 17:15:29 2011 -0500

    parenthesis issue in the migration

 .../migrate_repo/versions/028_multi_nic.py         |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ff173245f0284f5f24cdfbe92704785a85dd1cb9
Merge: 310f731 91cf150
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:14:00 2011 +0400

    merge

commit 310f731b2422a11a2afab45b2f14a78a78733f6b
Merge: cbd0622 ee82eb5
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:12:24 2011 +0400

    some tests and refactoring

commit 53569eec72e998d92d930226503841ac09a2e1df
Merge: 3b85d80 77e92b8
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 17:11:44 2011 -0500

    Trunk merge fixes.

commit 77e92b84c04855350157a532ba3abc2e8485f6ae
Merge: 3b85d80 654350a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 24 22:08:45 2011 +0000

    Merging trunk

commit 91cf150ac2acdc742f56cc03a67dbee833525bce
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 01:47:25 2011 +0400

    implement list test

 .../api/openstack/contrib/test_floating_ips.py     |   37 ++++++++++++++------
 1 file changed, 27 insertions(+), 10 deletions(-)

commit cbd0622ffbd021d404270be8b35b3e4839dd0ea0
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 00:33:40 2011 +0400

    some tests

 Authors                                            |    2 +-
 .../api/openstack/contrib/test_floating_ips.py     |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

commit ee82eb5916cd87ee984d00a07759d7c7648c6976
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 00:30:22 2011 +0400

    fix tests for extensions

 .../api/openstack/contrib/test_floating_ips.py     |   33 +++++++++++++-------
 nova/tests/api/openstack/fakes.py                  |   10 ++----
 2 files changed, 24 insertions(+), 19 deletions(-)

commit 3b85d8080ee06436873bd2e4d8f358e4686da1bf
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:18:05 2011 -0500

    Fixed snapshot logic.

 nova/compute/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a1b9aea9d12eaa32f869e5a4a59b01788e6c836d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:04:34 2011 -0500

    PEP8 cleanup.

 nova/compute/api.py     |    2 +-
 nova/compute/manager.py |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 594d5c7a98f2b4e6ea2d866f10c67cbdaa88ce0c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:03:01 2011 -0500

    Refactored backup rotate.

 nova/api/openstack/images.py            |   20 +++++++++-----
 nova/compute/api.py                     |   33 ++++++++++++++---------
 nova/compute/manager.py                 |   29 +++++++++++++-------
 nova/exception.py                       |    4 +++
 nova/tests/api/openstack/fakes.py       |    5 ++--
 nova/tests/api/openstack/test_images.py |   45 ++++++++++++++++++++++---------
 6 files changed, 93 insertions(+), 43 deletions(-)

commit 153621b9f3a4480b544de5ccd2a96bf4d63adbc9
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 24 23:57:10 2011 +0400

    conflict resolved

 .../api/openstack/contrib/test_floating_ips.py     |    4 ----
 1 file changed, 4 deletions(-)

commit 09d439cd74290a6b2532376afc94d2c8e23cdda6
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 24 23:55:18 2011 +0400

    stub tests

 Authors                                            |    2 +-
 nova/api/openstack/contrib/floating_ips.py         |    1 +
 .../api/openstack/contrib/test_floating_ips.py     |   47 +++++++++++---------
 3 files changed, 28 insertions(+), 22 deletions(-)

commit 4c3993ebcee2cf1abe24a9065822c88bbcb0df55
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 23:31:21 2011 +0400

    add stubs for flating api os api testing

 .../api/openstack/contrib/test_floating_ips.py     |   43 +++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

commit 4d3c1959edfbdd364a19e59aecd1579d136adade
Merge: c221654 c5745c0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 21:35:06 2011 +0400

    merge with kirill

commit c5745c0cb61bb6ab375a1e52d5e203a7a0a76366
Author: Kirill Shileev <kshileev@gmail.com>
Date:   Fri Jun 24 20:59:32 2011 +0400

    associate diassociate untested, first attept to test

 nova/api/openstack/contrib/floating_ips.py         |   27 +++++++++++++---
 .../api/openstack/contrib/test_floating_ips.py     |   34 +++++++++++++++-----
 2 files changed, 48 insertions(+), 13 deletions(-)

commit 1d3960e3b76e3f75c68f919278a2a227e1f96e48
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 11:56:15 2011 -0500

    Pep8 fix

 nova/api/openstack/images.py |    1 -
 1 file changed, 1 deletion(-)

commit cbf9f1bef113d54be57e2bb9a79990226afcd90f
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 11:55:43 2011 -0500

    Adding tests for backup no rotation, invalid image type

 nova/api/openstack/images.py            |    6 +++++-
 nova/tests/api/openstack/test_images.py |   29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 8ec448d2bcf4afce7d0486d9cf6b07e0e30bd6be
Author: Arvind Somya asomya@cisco.com <>
Date:   Fri Jun 24 12:22:14 2011 -0400

    Fixed the default arguments to None instead of an empty list.

 tools/esx/guest_tool.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 03db1b862f38fa864316530c0a0b22ef74f25c81
Author: Arvind Somya asomya@cisco.com <>
Date:   Fri Jun 24 12:15:13 2011 -0400

    Fixing PEP8 compliance issues.

 nova/virt/vmwareapi/network_utils.py |   11 ++++++-----
 nova/virt/vmwareapi/vm_util.py       |    5 +++--
 nova/virt/vmwareapi/vmops.py         |    8 +++++---
 tools/esx/guest_tool.py              |    6 ++++--
 4 files changed, 18 insertions(+), 12 deletions(-)

commit 4a32c971893a22a6451eed7e618291ad86c24510
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 10:50:48 2011 -0500

    Trailing whitespace

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c941234c86fc02cf652f2e91ee958260d83fc4d7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 10:50:09 2011 -0500

    Adding tests for snapshot no-name and backup no-name

 nova/tests/api/openstack/fakes.py       |    9 ++++
 nova/tests/api/openstack/test_images.py |   88 ++++++++++++++++++++++---------
 2 files changed, 72 insertions(+), 25 deletions(-)

commit 101fcf7488f4f2b42102da0533c5d97c8f53dd49
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 10:52:59 2011 -0400

    Edited the host filter test case for extra specs

 nova/scheduler/host_filter.py            |    4 ++--
 nova/tests/scheduler/test_host_filter.py |   16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit 4c46c44d7c1458ccaa3919110de12dfceef406c1
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 10:37:43 2011 -0400

    Removed an import

 nova/api/openstack/__init__.py |    1 -
 1 file changed, 1 deletion(-)

commit 7e61291fe56bc26d07f75f4bfe276114a2ad8c44
Merge: e6dcd9b 654350a
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 09:54:18 2011 -0400

    Merged from trunk

commit a1c5726a9e0095de88c9d10c09999b2dcdb6211e
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 16:07:33 2011 +0400

    Remove extra debug line.

 nova/compute/api.py |    1 -
 1 file changed, 1 deletion(-)

commit e67156851ae761c747a96d3728b60d0678d76a35
Merge: d4fc1d7 654350a
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 16:01:51 2011 +0400

    Merged with trunk

commit 58cc475649276a8722113960bf3f4d21d6513ca2
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:55:06 2011 +0400

    Add reconnect test.

 nova/auth/fakeldap.py   |   24 ++++++++++++++++++++++++
 nova/tests/test_auth.py |    9 +++++++++
 2 files changed, 33 insertions(+)

commit 60e520bca98d5c4b7ba4f2cc7465982392fc3855
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:26:15 2011 +0400

    Use simple_bind_s instead of bind_s

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 178ddd56da98f5baf5e9d232bdab8d5565e7e98b
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:20:24 2011 +0400

    Add reconnect on server fail to LDAP driver.

 nova/auth/ldapdriver.py |   39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

commit ce3b1ffec9bab02e2988b69e7e361d76e56ec002
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jun 24 19:08:26 2011 +0900

    ec2/cloud: typo

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c0a750757b2b6121bb04c6355a01cb31967c15e2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jun 24 19:08:26 2011 +0900

    image/s3: typo

 nova/image/s3.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d97120f40b68870bebec0c41b13784a6cd1ddd92
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jun 24 00:30:58 2011 -0700

    same typo i made before!

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95b9a83473dad5a2c60e146c0428b2c16d234232
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jun 24 00:26:55 2011 -0700

    on 2nd run through filter_hosts, we've already accounted for the topic
    memory needs converted to Bytes from MB

 nova/scheduler/zone_aware_scheduler.py |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit 4307daa9848060aad4b714394f314e5b6e823208
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 23:38:32 2011 -0700

    LeastCostScheduler wasn't checking for topic cost functions correctly.
    Added support so that --least_cost_scheduler_cost_functions only needs to have method names specified, instead of the full blown version with module and class name.  Still works the old way, too.

 nova/scheduler/least_cost.py |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 108314eac2f3c91be68c525902ce31e3abab4ecd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 23:05:12 2011 -0700

    requested_mem typo

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 56bbeaa4881979af281ded41b897ad87697f331a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 23:00:15 2011 -0700

    more typos

 nova/scheduler/zone_aware_scheduler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9ededda0bdc990a4e6823f5076aa8b9e2de43c7e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 22:55:45 2011 -0700

    typo in least cost scheduler

 nova/scheduler/least_cost.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d4fc1d77a4b7c668453042b83e34da76ee3c3818
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 09:54:38 2011 +0400

    Unwind last commit, force anyjson to use our serialization methods.

 bin/nova-manage           |    8 ++++----
 nova/compute/api.py       |    1 +
 nova/db/sqlalchemy/api.py |   15 +++------------
 nova/utils.py             |    9 +++++++++
 4 files changed, 17 insertions(+), 16 deletions(-)

commit 72d478b3ac12033928a53d51aa9c0ffbdfc9907f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 22:48:44 2011 -0700

    debug logging of number of instances to build in scheduler

 nova/scheduler/zone_aware_scheduler.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 2c303bcc8f47aaa5cdeee0ee91e3f4b434176f15
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 22:45:58 2011 -0700

    missed passing in min/max_count into the create/create_all_at_once calls

 nova/api/openstack/create_instance_helper.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit e6dcd9b4008feb9a053edcd7c6f6020772a03c59
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 01:44:22 2011 -0400

    Dealing with cases where extra_specs wasn't defined

 nova/scheduler/host_filter.py  |    4 ++++
 nova/tests/test_host_filter.py |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 48f3bccc3372023c35a75671e25e9089dd4ed836
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 01:34:47 2011 -0400

    pep8 fixes

 nova/api/openstack/contrib/flavorextraspecs.py |    1 -
 nova/scheduler/host_filter.py                  |   24 ++++++++++++++++++++++--
 nova/tests/scheduler/test_host_filter.py       |   24 +++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 4 deletions(-)

commit 52319f7e4e55e78f4fdd9c76b3ab593322edc875
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 01:02:28 2011 -0400

    Renamed from flavor_extra_specs to extra_specs

 nova/api/openstack/contrib/flavorextraspecs.py     |    2 +-
 .../api/openstack/test_flavors_extra_specs.py      |   22 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 4a0fcd6c1d5540c4bec29ef2585987300654c8b7
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 01:01:30 2011 -0400

    All tests passing

 nova/api/openstack/contrib/flavorextraspecs.py     |   15 +++---
 .../api/openstack/test_flavors_extra_specs.py      |   53 ++++++++------------
 2 files changed, 30 insertions(+), 38 deletions(-)

commit 65ec0ce423e211215d82001778560dcaa92866a1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 21:59:54 2011 -0700

    missed passing an argument to consume_resources

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a9dc4adc343aa9cf8c21cef741b3bfe409fc41e
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 24 00:45:53 2011 -0400

    Committing some broken code in advance of trying a different strategy for specifying args to extensions.ResoruceExtensions, using parent

 nova/api/openstack/contrib/flavorextraspecs.py     |   21 +++++++------
 .../api/openstack/test_flavors_extra_specs.py      |   33 +++++++++-----------
 2 files changed, 27 insertions(+), 27 deletions(-)

commit 188dd9117318cc4f5ebe0be9d19b9737a43ce68b
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 23 23:42:44 2011 -0400

    Starting to transition instance type extra specs API to an extension API

 nova/api/openstack/__init__.py                     |    5 -
 nova/api/openstack/contrib/flavorextraspecs.py     |  123 ++++++++++++++++++++
 nova/api/openstack/flavor_extra_specs.py           |  102 ----------------
 .../api/openstack/test_flavors_extra_specs.py      |   20 +++-
 4 files changed, 139 insertions(+), 111 deletions(-)

commit 7f578a0f657c076bf97c33dca15f1c78bd11b607
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 23 22:55:51 2011 -0400

    Now automatically populates the instance_type dict with extra_specs upon being retrieved from the database.

 nova/db/api.py                                |    1 -
 nova/db/sqlalchemy/api.py                     |   26 +++++++++--
 nova/tests/test_instance_types_extra_specs.py |   59 +++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 5 deletions(-)

commit d75e776815f2fc7710ba9d937985787b49a9947f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 22:21:10 2011 -0400

    pep8

 nova/tests/api/openstack/test_flavors.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 655a783d5a0ef2ddadcf119793cd34513a45fe27
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 23 21:31:00 2011 -0400

    Created Bootstrapper to handle Nova bootstrapping logic.

 bin/nova-api    |    5 +++--
 nova/service.py |   36 +-----------------------------------
 nova/utils.py   |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 37 deletions(-)

commit a715174d343c7fd2ed687f561f267343a1370c97
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:56:31 2011 -0500

    alter test, alter some debug statements

 nova/network/manager.py     |    8 ++++----
 nova/tests/test_adminapi.py |    9 ---------
 2 files changed, 4 insertions(+), 13 deletions(-)

commit adc6e0ca99e34820ac8e2f64b8b6965458e5355c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:44:25 2011 -0500

    altered some tests

 nova/tests/test_adminapi.py |    7 ++++++-
 nova/tests/test_libvirt.py  |    6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

commit 9df94a774f6f784563e87c3d1a864256c1f34eee
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:13:39 2011 -0500

    freakin migration numbering

 .../migrate_repo/versions/027_multi_nic.py         |  130 --------------------
 .../028_fk_fixed_ips_virtual_interface_id.py       |   56 ---------
 .../migrate_repo/versions/028_multi_nic.py         |  130 ++++++++++++++++++++
 .../migrate_repo/versions/028_sqlite_downgrade.sql |   48 --------
 .../migrate_repo/versions/028_sqlite_upgrade.sql   |   48 --------
 .../029_fk_fixed_ips_virtual_interface_id.py       |   56 +++++++++
 .../migrate_repo/versions/029_sqlite_downgrade.sql |   48 ++++++++
 .../migrate_repo/versions/029_sqlite_update.sql    |   48 ++++++++
 8 files changed, 282 insertions(+), 282 deletions(-)

commit 5b5cc6f42ef5cca33bbca65ef66e53862cf69f07
Merge: c33fc28 654350a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:10:30 2011 -0500

    trunk merge

commit 129da3c5206443acc117b33b440a05b064fd711e
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 23 15:57:57 2011 -0700

    removing erroneous block, must've been a copy and paste fat finger

 nova/tests/test_cloud.py |    7 -------
 1 file changed, 7 deletions(-)

commit 5004736930c0c9619ba3efd48910a47fd58e0921
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 23 15:42:57 2011 -0700

    specify keyword, or direct_api proxy method blows up

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c33fc283c4f75b4de745484b53a818795ad80d96
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 17:39:40 2011 -0500

    updated the way vifs/fixed_ips are deallocated and their relationships, altered lease/release fixed_ip

 nova/db/sqlalchemy/api.py    |    5 -----
 nova/db/sqlalchemy/models.py |    3 +++
 nova/network/manager.py      |   26 +++++++++++---------------
 3 files changed, 14 insertions(+), 20 deletions(-)

commit a045cd5fdd00b3e52f46181017077146abe8df9f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:54:28 2011 -0500

    Fixed syntax errors.

 nova/compute/manager.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 654350a1cf93e8ecf8d38f07802e0c3ed7039562
Merge: 006cbeb 203f3f8
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 21:44:29 2011 +0000

    This adds a way to create global firewall blocks that apply to all instances in your nova installation.
    
    The mechanism for managing these rules is very similar to how security group rules are managed except there is only ever one instance of the provider rule table, as opposed to multiple security group tables.  Each instance will simply jump into the provider firewall table as one of its first actions (before security groups, so these rules cannot be overridden on a per-user basis).
    
    Most of the changes are straightforward if you understand how security groups work.  There are a few small logging and variable name changes as well.
    
    Right now this only exposes the creation of provider firewall rules.  If we agree this is the best path forward I will quickly be adding a list and destroy method and updating nova-adminclient.

commit 006cbeb5f145ea0e8ccf51163f4611d784876160
Merge: a44f7df 2ee267b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 21:38:10 2011 +0000

    Accept a full serverRef to OSAPI POST /images (snapshot)

commit 2d0d1e179dd8870967ebf00a82fbc7d21bed6116
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:28:59 2011 -0500

    Cast rotation to int.

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e3c1a6742b16add04d76631b9dbd4f2ef016e0b3
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:19:08 2011 -0500

    PEP8 cleanup.

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2028222a5ed47dc82b49f51969d237c4eece50e7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:17:54 2011 -0500

    Fixed filter property and added logging.

 nova/compute/manager.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit c2cc453a6912bc37e2e9a9c5f5a3c2830b61f5be
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 16:55:45 2011 -0400

    added tests

 nova/tests/api/openstack/test_flavors.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit c2216547d0c55e32a4f8203129f4604f4ba004c7
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 00:39:37 2011 +0400

    Implemented view and added tests

 nova/api/openstack/contrib/floating_ips.py         |   57 ++++++++++++--------
 nova/network/api.py                                |    2 +-
 nova/tests/api/openstack/contrib/__init__.py       |   15 ++++++
 .../api/openstack/contrib/test_floating_ips.py     |   47 ++++++++++++++++
 4 files changed, 98 insertions(+), 23 deletions(-)

commit 63a9216ecbaab20fc7dfb82afb9fe0e2f3fbded4
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 15:35:26 2011 -0500

    Adding missing import.

 nova/compute/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 980ac0e981de248f9d687b2dd91ea93f5ebdae6a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 16:10:26 2011 -0400

    Fixed issue with zero flavors returning HTTP 500

 nova/api/openstack/flavors.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a44f7dfa3af8dc8c605ff52ed536dae8f9ee23bb
Merge: df8448f 7398819
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 20:08:10 2011 +0000

    Adding dict with single 'meta' key to /imgages/<id>/meta/<key> GET and PUT

commit 1b5cde761bd699f6fec207f4b1b41d8c63ea1ec7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 15:48:49 2011 -0400

    fixing 500 error on v1.0 images xml

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f6964aadc5b073152d221bb0a4e899c2b17d174c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 23 14:27:13 2011 -0500

    Small refactoring around getting params

 nova/api/openstack/images.py |   33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

commit 51d93c5b1722bef9783cd7572c1464a084ece0aa
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:52:58 2011 -0400

    libvirt test for deleting provider firewall rules.

 nova/tests/test_libvirt.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 9a6e9a1af9359fb4a9261f59f57113f252f0d6e9
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:45:37 2011 -0400

    Make firewall rules tests idempotent, move IPy=>netaddr, add deltete test.

 nova/api/ec2/admin.py       |    2 +-
 nova/tests/test_adminapi.py |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

commit f43832dff403405889dffc30824c0c3316335246
Merge: 0a6aeac 6e2ebfa
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:34:42 2011 -0400

    Merge provider-fw-rules-list.

commit 85c8b60a67897ea2a37e305d901d1637bdae5e8d
Merge: d5206c7 df8448f
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 23 11:32:27 2011 -0700

    merge from trunk

commit d5206c7f41c435fd39c1bb9c0fd7ec53c9685f43
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 23 11:31:22 2011 -0700

    altho security_group authorize & revoke tests already exist in test_api, adding some direct ec2 api method tests.   added group_id param support to the pertinent security group methods

 nova/api/ec2/cloud.py    |   78 ++++++++++++++++++++++++++++++++++------------
 nova/tests/test_cloud.py |   71 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 20 deletions(-)

commit 6e2ebfa1dc29e50f74f1b337d1b5349bc3c78cdc
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:16:11 2011 -0400

    Make sure there are actually rules to test against.

 nova/tests/test_adminapi.py |    1 +
 1 file changed, 1 insertion(+)

commit ac4baa5990c45a6a521a1786e680426ba617c65a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:13:27 2011 -0400

    Add test for listing provider firewall rules.

 nova/tests/test_adminapi.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit ef140fe4bd190e4419a523f2a1a3bad5e867e2cf
Merge: d1b6ebb 203f3f8
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:07:00 2011 -0400

    Merge provider-fw-rules.

commit 203f3f85b6d66735f52013cbe5a736ef82d7a083
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:59:26 2011 -0400

    pep8: remove newline at end of file.

 nova/tests/test_adminapi.py |    1 -
 1 file changed, 1 deletion(-)

commit 1a3fb4332401e5fb3b5b090034ecf4fdf47246cf
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:54:45 2011 -0400

    Add admin api test case (like cloud test case) with a test for fw rules.

 nova/tests/test_adminapi.py |   90 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

commit 02085b96528b66b322f5c1ce5281d0284f9cbe40
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:28:13 2011 -0400

    Move migration to newer version.

 .../versions/023_add_provider_firewall_rules.py    |   75 --------------------
 .../versions/027_add_provider_firewall_rules.py    |   75 ++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)

commit ce2996a7530f1f2032f88a7c639ed479535add5c
Merge: 64f7ebf df8448f
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:01:18 2011 -0400

    Merge Trunk.

commit 16b858d804c3df473617c776a7cb74ea284b8f3a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 09:43:27 2011 -0700

    an int() was missed being removed from UUID changes when zone rerouting kicks in

 nova/scheduler/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b186f7ae1515b8296f5fdb7f86b67c07973bb463
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 12:41:57 2011 -0400

    fixing 500 on None metadata value

 nova/api/openstack/image_metadata.py            |    2 +-
 nova/tests/api/openstack/test_image_metadata.py |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

commit 8feaa2394cd4c4d9709568c7d294fa0a75f790bc
Merge: 9044733 ca9384e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 12:36:36 2011 -0400

    proper xml serialization for images

commit df8448f9f63c9f610c23cf092c14f4eb8547fe46
Merge: ca9384e dca372d
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 23 15:57:55 2011 +0000

    "nova-manage checks if user is member of proj, prior to adding role for that project"

commit 9044733fb0aff698875080caf1ffd9e44470ec0e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 10:53:09 2011 -0400

    adding metadata container to /images/detail and /images/<id> calls

 nova/api/openstack/views/images.py      |    3 +++
 nova/tests/api/openstack/test_images.py |   45 ++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 10 deletions(-)

commit ca9384eb5505e0e0a2540ec78f041bddce31995a
Merge: 6d6720e 548ac15
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 14:47:51 2011 +0000

    Add xml serialization for all /images/<id>/meta and /images/<id>/meta/<key> responses

commit 625816f16486a329ae0fb61c92fdf7915669923c
Merge: a37ed35 6d6720e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 23 07:22:22 2011 -0700

    trunk merge and migration bump

commit b637dee5a5c48f86f6b8b12b3b374344b4ffc5b7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:15:20 2011 -0700

    handle errors for listing an instance by IP address

 nova/compute/api.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 2690e31bbd8c515771ca69a0a73e9ff5761a9079
Merge: 186598a 2059a68
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 23 10:06:44 2011 -0400

    Merged markwash's fixes.

commit 82e7bb113cdf0297d69ed863a2ba66bad46bece9
Merge: 37758df e241f53
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:03:42 2011 -0700

    Merged list-zone-recurse

commit e241f5301621e66360bb884193884f9f98bc8832
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:02:49 2011 -0700

    str_GET is a property

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 044cbc632ead87762796f999d5c9dc41e899156b
Merge: e67802f 6d6720e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jun 23 15:01:57 2011 +0100

    Merge trunk

commit e67802fb8681159461c997ca8ef7644817047305
Merge: e722689 7cb4d31
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jun 23 15:00:59 2011 +0100

    Merge trunk
    Addressing Sandy's comments

commit c2a0f15457ec49e95de0a2e7cd6c8b60e81a4994
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jun 23 09:57:22 2011 -0400

    Fixed typo

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b120fe30c0a9999b7ba85e07a262e672a1c8ed2
Merge: a2cf08c 6d6720e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jun 23 09:54:54 2011 -0400

    Merge trunk:

commit 37758dfe6a2b963d6acfdf9fe886167e42e4ec52
Merge: 575ea19 6d6720e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 06:53:21 2011 -0700

    Merged trunk

commit 575ea1963bef8c76597ef3a6541c5d0c13635b17
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 06:52:19 2011 -0700

    minor fixups

 nova/scheduler/host_filter.py          |    4 +---
 nova/scheduler/zone_aware_scheduler.py |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 07404e266a4a6b690c62624a9a5e47d60cab7d5b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 06:33:25 2011 -0700

    fixes for recurse_zones and None instances with compute's get_all

 nova/api/openstack/servers.py |    3 +--
 nova/compute/api.py           |    6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 1aa7e746d5918f2a664da1937183b66fe31f6bd4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 05:35:04 2011 -0700

    typo

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b9a861d72f1a98510dd4b68e547b434388ab9a64
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 05:20:50 2011 -0700

    add support for compute_api.get_all() recursing zones for more than just reservation_id

 nova/api/openstack/servers.py |   13 ++++++--
 nova/compute/api.py           |   66 +++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 34 deletions(-)

commit dcf8c73ac0230f39414d2e76e3bf0aec1984fd28
Merge: 3d1c846 6d6720e
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 23 13:38:42 2011 +0200

    Merge trunk

commit 3d1c8463d80932ddbe677ea1b8aee357642018a8
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 23 13:34:01 2011 +0200

    Change so that the flash socket policy server is using eventlet instead of twisted and is running in the same process as the main vnx proxy

 bin/nova-vncproxy |   32 +++++++++++++-------------------
 nova/wsgi.py      |   18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 19 deletions(-)

commit 8a884121e6a7c5f03f51266632bb671603c9c9a0
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:01 2011 +0900

    ec2/cloud: address review.
    
    - eliminated commented out lines in create_image()
    - added time out to create_image()
    ,

 nova/api/ec2/cloud.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit fd577b786c3a929300ae744858b57ccfed4fb2fc
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:01 2011 +0900

    compute/api: an unit test for _update_{image_}bdm
    
    an unit test for _update_image_block_device_mapping()
    and _update_block_device_mapping()

 nova/tests/test_compute.py |  111 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

commit c13bb7c3bf2400c45d1b93141e67916c81296e38
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:01 2011 +0900

    ec2/cloud: unit tests for parser/formatter of block device mapping
    
    This patch adds several unit tests for private functions
    in ec2/cloud.py. Which are used to parse/format block device mapping.
    _parse_block_device_mapping(), _format_block_device_mapping()
    and _format_mappings()

 nova/tests/test_bdm.py |  233 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 233 insertions(+)

commit c5761c6e983e539e5bb24ae6c0f3ea88faea676f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:01 2011 +0900

    ec2/cloud: an unit test for _format_instance_bdm()

 nova/tests/test_cloud.py |  206 +++++++++++++++++++++++++++-------------------
 1 file changed, 120 insertions(+), 86 deletions(-)

commit 8e3da07f2af1fb4c0d5fcb58cb6747afaa6b76d8
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:00 2011 +0900

    ec2utils: an unit test for mapping_prepend_dev()

 nova/tests/test_api.py |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit 4b5fdb2ee109960be6b3ff1fa8068ab3ec428283
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:00 2011 +0900

    ec2: bundle block device mapping
    
    device name in block device mapping of bundle
    doesn't necessary carry "/dev/".
    So prepend it before processing.

 nova/api/ec2/cloud.py |   25 +++++++++++++++----------
 nova/compute/api.py   |    2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

commit 1c4a3e14a0cef6938c477908d5c3bfe5ddf0e07b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:00 2011 +0900

    ec2utils: introduce helper function to prepend '/dev/' in mappings
    
    Introduce a helper function to prepend /dev/ to device name
    in block device mapping of bundle

 nova/api/ec2/ec2utils.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit c24b30c9a060e50c7bd953a7d68c409416f4f752
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:00 2011 +0900

    volume/api: an unit test for create_snapshot_force()

 nova/tests/test_volume.py |   31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit b3c206594113ea6e9200e600490c6c991ca319d0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 01:22:50 2011 -0700

    Add some resource checking for memory available when scheduling
    Various changes to d-sched to plan for scheduling on different topics, which cleans up some of the resource checking.
    Re-compute weights when building more than 1 instance, accounting for resources that would be consumed.

 nova/scheduler/host_filter.py          |   10 +++-
 nova/scheduler/least_cost.py           |   39 ++++++++-----
 nova/scheduler/zone_aware_scheduler.py |   94 +++++++++++++++++++++++++-------
 3 files changed, 107 insertions(+), 36 deletions(-)

commit 2e2c432e35bf9c283df83de8d76191855d2ce2be
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 23:38:58 2011 -0400

    Returned code to original location

 nova/db/api.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit df44068a801aba373e8896bba235f2abca4e4c8a
Merge: 6afcaba 6d6720e
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 23:34:56 2011 -0400

    Merged from trunk

commit 2059a683e11169a35b35819575926fc6cbc1a3f1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 22 23:27:49 2011 -0400

    run launcher first since it initializes global flags and logging

 bin/nova-api |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6afcabac7442aa2e3944a3fef3d3452c189c1901
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 23:14:39 2011 -0400

    Now passing unit tests

 nova/api/openstack/flavor_extra_specs.py           |   12 +--
 .../api/openstack/test_flavors_extra_specs.py      |   93 +++++++-------------
 2 files changed, 36 insertions(+), 69 deletions(-)

commit a480b926a824766d3367eefed8d6757ad2919e7f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 23:01:41 2011 -0400

    Two tests passing

 .../api/openstack/test_flavors_extra_specs.py      |  161 ++++++++++++++++++++
 1 file changed, 161 insertions(+)

commit cbff29973a3cbbd2997675f117bf62a589ef06a9
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 22:52:42 2011 -0400

    Now stubbing nova.db instead of nova.db.api

 .../api/openstack/test_flavors_extra_specs.py      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 173bb3c54b7ce9874f6bf880a5df8966fd508c38
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 22:43:44 2011 -0400

    Bug fixing

 nova/api/openstack/flavor_extra_specs.py           |    8 ++------
 .../api/openstack/test_flavors_extra_specs.py      |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

commit a9de2c26432b0b6c77e941db0199fd72a54e2d69
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 22:40:00 2011 -0400

    Added flavor extra specs controller

 nova/api/openstack/__init__.py           |    6 ++
 nova/api/openstack/flavor_extra_specs.py |  106 ++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)

commit b4defb29694f3f9397ed5335a003e5592668fbaa
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 22 22:22:56 2011 -0400

    Initial unit test (failing)

 .../api/openstack/test_flavors_extra_specs.py      |   70 ++++++++++++++++++++
 1 file changed, 70 insertions(+)

commit 6d6720e9b7e52461238ece684c9acc7183673bb8
Merge: 2a9549f b0e24d4
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 23 00:47:59 2011 +0000

    This catches the InstanceNotFound exception on create, and ignores it.  This prevents errors in the compute log, and causes the server to not be built (it should only get InstanceNotFound if the server was deleted right after being created).  This is a temporary fix that should be fixed correctly once no-db-messaging stuff is complete.

commit b7684e0d36010050ce8254bbbf4573a6a624fa69
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 23 04:28:42 2011 +0400

    allocate and release implementation

 nova/api/openstack/contrib/floating_ips.py |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit b0e24d4dd2f4918ed1cbf85af4b31fdd09def1f6
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:27:17 2011 -0400

    fixed pep8 issues

 nova/compute/manager.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 0719207009779d0336f4699ba491cecee7a76020
Merge: 3b8ac87 2a9549f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:04:48 2011 -0400

    merge from trunk

commit 3b8ac87afbc1b2bb9371486697e1dd3ff22a4bc5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:03:35 2011 -0400

    image -> instance in comment

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0bb41eff943b9bb5ba197dc137c3afd93c544398
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 17:45:07 2011 -0500

    added virtual_interface_update method

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   15 +++++++++++++++
 2 files changed, 20 insertions(+)

commit 2a9549fcdeeb63c42512bb0e11eb9968560ba836
Merge: 7cb4d31 979a9d2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 22 22:42:49 2011 +0000

    Fixes issues with displaying exceptions regarding flavors in nova-manage

commit 61da39ecfefe441d352e72c99884157c5df8173e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 17:36:09 2011 -0500

    better debug statement around associating floating ips when multiple fixed_ips exist

 nova/compute/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 548ac151cd1c7de5249fdeb651895917e83df488
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 18:22:57 2011 -0400

    pep8 fixes

 nova/api/openstack/image_metadata.py            |    1 -
 nova/tests/api/openstack/test_image_metadata.py |    1 -
 2 files changed, 2 deletions(-)

commit 91c6d50d5945b8f471b2fad753009f8147588c0d
Merge: 1f9cd3e 7cb4d31
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 18:12:53 2011 -0400

    merging trunk

commit 614ab3d0e68a7998d77da1f39d1fe9bd5b080972
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 16:54:44 2011 -0500

    added fixed ip filtering by null virtual interface_id to network get associated fixed ips

 nova/db/sqlalchemy/api.py |    1 +
 1 file changed, 1 insertion(+)

commit 06c9a7454cc310ddcc059d685b43d75c5167a26b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 16:33:06 2011 -0500

    fixed ip gets now have floating IPs correctly loaded

 nova/db/sqlalchemy/api.py |   28 +++++++++++++++++-----------
 nova/network/api.py       |    2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

commit 1f9cd3e7c97034408b5afe3fc3720c48040dea97
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 17:14:58 2011 -0400

    reverting non-xml changes

 nova/api/openstack/image_metadata.py            |    8 ++++----
 nova/tests/api/openstack/test_image_metadata.py |   13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

commit ab2a77d0c6f738fe70b5d5a77fa7f97bf1f1f88b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 22 16:14:01 2011 -0500

    Adding backup rotation

 nova/compute/api.py     |    7 +++----
 nova/compute/manager.py |   40 ++++++++++++++++++++++++++++++++++------
 nova/exception.py       |    4 ++++
 3 files changed, 41 insertions(+), 10 deletions(-)

commit 7398819cc00a078a486b4d2f11846ff32db19a88
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 17:07:26 2011 -0400

    moving image show/update into 'meta' container

 nova/api/openstack/image_metadata.py            |   15 +++++++++----
 nova/tests/api/openstack/test_image_metadata.py |   26 +++++++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

commit 1f99e500a99a4d66639f04f2c723058c4d1dfc1d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 22 13:45:24 2011 -0700

    Check API request for min_count/max_count for number of instances to build

 nova/api/openstack/create_instance_helper.py |    6 ++++++
 nova/api/openstack/servers.py                |    9 +++++----
 nova/compute/api.py                          |   10 +++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

commit d9966726cb8327ed51d8c11bf447e858df663130
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:41:27 2011 -0500

    updated libvirt tests network_info to be correct

 nova/tests/test_libvirt.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 145ee4a958e97759bc4a516bda758b774761a24f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:35:25 2011 -0500

    fixed error

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e63bc400ab7b63db222bd36c71e5c7f05c2e1562
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:23:29 2011 -0500

    skipping more ec2 tests

 nova/tests/test_cloud.py |    1 +
 1 file changed, 1 insertion(+)

commit a97ee223b5c0587ae43711bc60fe6ff3f7dd6952
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:10:02 2011 -0500

    skipping more ec2 tests

 nova/tests/test_cloud.py |    1 +
 1 file changed, 1 insertion(+)

commit 747b257bcfb9e7d80d43b1154008cd3f9628b2c7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 14:59:41 2011 -0500

    skipping more ec2 tests

 nova/tests/test_cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8298746778afb46d7263130c236ff63c5a0119d3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 14:52:46 2011 -0500

    skipping test_run_with_snapshot

 nova/tests/test_cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 570d1fa347808c5b274e560dac62d7baeb20b752
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 14:26:58 2011 -0500

    updated test_cloud to set stub_network to true

 nova/tests/test_cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 979a9d2587584f60bfcad9a65da70df5ba3169be
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 22 15:22:25 2011 -0400

    fixed incorrect exception

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 92b0307879ae0142bc6e0ad78c7c0bbc009c0884
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 15:11:23 2011 -0400

    updating glance image fixtures with checksum attribute; fixing glance image service to use checksum attribute

 nova/image/glance.py                            |    2 +-
 nova/tests/api/openstack/test_image_metadata.py |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 75a87df739effe840e6cb39c976002e99b49c796
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 22 13:31:28 2011 -0500

    Round 1 of backup with rotation.

 nova/compute/api.py     |   32 ++++++++++++++++++++++++++++++--
 nova/compute/manager.py |   20 ++++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

commit 918bbfc61da3541729be44bbfb244f3e0a0c9e13
Merge: c7704f1 7cb4d31
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 10:47:51 2011 -0400

    merge from trunk

commit 13a51049ce5e76fd679b3dee978edce58db21d09
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 22 09:33:46 2011 -0400

    fix some issues with flags and logging

 nova/service.py |   19 ++++++++++++++-----
 nova/utils.py   |   10 ++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

commit 51c20f6f85d76bc14f394221a8836d2aac9a1aea
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Wed Jun 22 12:01:18 2011 +0200

    Add a socket server responding with an allowing flash socket policy for all requests from flash on port 843 to nova-vncproxy

 bin/nova-vncproxy |   23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

commit 97a710fa191b0abd94fef25d7110448c41c4e259
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:55:14 2011 +0900

    api/ec2: an unit test for create image
    
    unit test for ec2 create image.
    This is incomplete as there is no unit test for register image.

 nova/tests/test_cloud.py |   90 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 72 insertions(+), 18 deletions(-)

commit 5276e80c403a2ae87d3c93979289331e286fd2a1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:55:11 2011 +0900

    api/ec2, boot-from-volume: an unit test for describe instances

 nova/test.py             |   12 ++++
 nova/tests/test_cloud.py |  140 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+)

commit c6792450aa745ef003b80999eae3283533a15521
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:55:08 2011 +0900

    unittest: an unit test for ec2 describe image attribute

 nova/tests/test_cloud.py |  141 +++++++++++++++++++++++++++++-----------------
 1 file changed, 88 insertions(+), 53 deletions(-)

commit 1df8275883930c71ea4324b0d43b6508440e1d65
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:55:03 2011 +0900

    test_cloud: an unit test for describe image with block device mapping

 nova/tests/test_cloud.py |  133 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 2 deletions(-)

commit aadb9a0a8a9a0b947643c04f24b623412db7d48d
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:56 2011 +0900

    ec2utils: an unit test for ec2utils.properties_root_defice_name.

 nova/tests/test_api.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit ac9ed64077eaad6b4df91fbf90af7933a6bddd5a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:49 2011 +0900

    unittest, image/s3: unit tests for s3 image handler

 nova/tests/image/test_s3.py |  122 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

commit ec515fa667e2954aa93a6954a541739e6e3aa221
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:49 2011 +0900

    image/s3: factor out _s3_create() for testability
    
    The unittest will come with later changeset.

 nova/image/s3.py |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 776571b38fb898a4dafa80e8f3da34b214c948b8
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:43 2011 +0900

    ec2utils: unit tests for case insensitive true/false conversion

 nova/tests/test_api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 79d97f7232c119496dde1dd2f0534520ab383962
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:39 2011 +0900

    ec2utils: add an unit test for dict_from_dotted_str()

 nova/tests/test_api.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 181ae36fe34edd206c33e3a0b7e10800ced93e97
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:32 2011 +0900

    test_api: unit tests for ec2utils.id_to_ec2_{snap, vol}_id()

 nova/tests/test_api.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d81d75bec04fe19492544e5bf7548dce5a2366ad
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:22 2011 +0900

    api/ec2: make CreateImage pass unit tests

 nova/api/ec2/cloud.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 91cc2d5f974d67d91e1e783aaec105c489a47cce
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:22 2011 +0900

    volume/api: introduce create_snapshot_force()
    
    Introduce create_snapshot_force() which create snapshot even when
    the volume is in in-use. This is needed for CreateImage with no_reboot=true.

 nova/compute/api.py |   24 +++++++++++-------------
 nova/volume/api.py  |   13 +++++++++++--
 2 files changed, 22 insertions(+), 15 deletions(-)

commit 3a83471ec002127a84d319e397ce54e49bd696a1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:53:47 2011 +0900

    api/ec2/image: make block device mapping pass unit tests.
    
    This patch makes pass unit tests which will follow later.

 nova/api/ec2/cloud.py |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

commit 4020e0dab41caf22de629c94cf94f5ea2101faee
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:48:30 2011 +0900

    db/block_device_mapping/api: introduce update_or_create
    
    introduce db.block_device_mapping_udpate_or_create() which
    update the colume if exists. Create new column if not existed.
    This api will be used later for block device mapping tracking.

 nova/db/api.py            |    8 +++++++-
 nova/db/sqlalchemy/api.py |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

commit 96fc985878cd52813aa07a4843e5928031b1501a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:40:06 2011 +0900

    db/migration: resolve version conflict

 .../versions/025_add_root_device_name.py           |   47 --------------------
 .../versions/027_add_root_device_name.py           |   47 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)

commit 6cb927111f07dffdadb9dbcd5852961ab9db222d
Merge: 774e201 7cb4d31
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:39:43 2011 +0900

    merge with trunk

commit 3f2c0521f1c8462380c68d5245b5754867738fa1
Author: John Tran <jhtran@att.com>
Date:   Tue Jun 21 18:14:31 2011 -0700

    ec2 api describe_security_groups allow group_id param , added tests for create/delete security group in test_cloud although also exists in test_api this tests directly the ec2 method.

 nova/api/ec2/cloud.py    |   21 +++++++++++++--------
 nova/tests/test_cloud.py |    9 +++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

commit a37ed35fe6ba3936074bacb5b32d60f05ceb229b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:19:44 2011 -0700

    pip-requires

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d99b17895747959e332e5645aedd0a2ddc0e21da
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:19:01 2011 -0700

    pep8

 nova/compute/api.py                               |    4 ++--
 nova/scheduler/api.py                             |    3 ++-
 nova/scheduler/zone_aware_scheduler.py            |    2 +-
 nova/tests/scheduler/test_zone_aware_scheduler.py |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

commit a1ee8e591e157a23390b1622b9c313da08ae9130
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:11:16 2011 -0700

    fixed zone update

 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 7cb4d3150bf0883944624d46bc458cfd25fa1c9a
Merge: 29e2d55 652ccbd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jun 21 18:42:57 2011 +0000

    Stop trying to set a body for HTTP methods that do not allow it. It renders the unit tests useless (since they're testing a situation that can never arise) and webob 1.0.8 fails if you do this.

commit cd8ace7ed812010feff54829a021038f7e732ce1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 11:20:06 2011 -0700

    fixed local db create

 nova/scheduler/zone_aware_scheduler.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit ba6eb76a2ca16132d1fff4993e461fb7830b06af
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 12:03:01 2011 -0500

    omg stop making new migrations...

 .../migrate_repo/versions/026_multi_nic.py         |  130 --------------------
 .../027_fk_fixed_ips_virtual_interface_id.py       |   56 ---------
 .../migrate_repo/versions/027_multi_nic.py         |  130 ++++++++++++++++++++
 .../migrate_repo/versions/027_sqlite_downgrade.sql |   48 --------
 .../migrate_repo/versions/027_sqlite_upgrade.sql   |   48 --------
 .../028_fk_fixed_ips_virtual_interface_id.py       |   56 +++++++++
 .../migrate_repo/versions/028_sqlite_downgrade.sql |   48 ++++++++
 .../migrate_repo/versions/028_sqlite_upgrade.sql   |   48 ++++++++
 8 files changed, 282 insertions(+), 282 deletions(-)

commit c9c2a1e425425e3322feb08ff759ff583ff32ef0
Merge: 35665d9 29e2d55
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:59:22 2011 -0500

    trunk merge

commit 661b318e725d08a4c5cf13a36d4f4603db6f8530
Merge: d835283 29e2d55
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 21 16:57:32 2011 +0000

    Merge with trunk

commit c7704f1ba57e1ce130875469b4a0ad585e9c296b
Merge: b328e97 29e2d55
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jun 21 12:57:21 2011 -0400

    merge from trunk

commit 35665d9d6a17c7e753dcd3ec5bf6bc68af1fbf0e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:51:08 2011 -0500

    added try except around floating ip get by host in host init

 nova/network/manager.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 29e2d55e9d47dd4abffdb871ee88af9083d022d1
Merge: a62e0f3 f940412
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 21 16:43:10 2011 +0000

    This branch adds support to the xenapi driver for updating the guest agent on creation of a new instance. This ensures that the guest agent is running the latest code before nova starts configuring networking, setting root password or injecting files.

commit 796d3b67dcdb2670714abf9e02b278bd6898358b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:41:53 2011 -0500

    renamed migrations again

 .../migrate_repo/versions/023_multi_nic.py         |  130 --------------------
 .../024_fk_fixed_ips_virtual_interface_id.py       |   56 ---------
 .../migrate_repo/versions/024_sqlite_downgrade.sql |   48 --------
 .../migrate_repo/versions/024_sqlite_upgrade.sql   |   48 --------
 .../migrate_repo/versions/026_multi_nic.py         |  130 ++++++++++++++++++++
 .../027_fk_fixed_ips_virtual_interface_id.py       |   56 +++++++++
 .../migrate_repo/versions/027_sqlite_downgrade.sql |   48 ++++++++
 .../migrate_repo/versions/027_sqlite_upgrade.sql   |   48 ++++++++
 8 files changed, 282 insertions(+), 282 deletions(-)

commit b328e9719a8ea6450f0bb35152b37d6f7869ba95
Merge: 6faecbb a62e0f3
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jun 21 12:33:40 2011 -0400

    merge from trunk

commit 6faecbb9617dfc2da283c7b46be36f512db14287
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jun 21 12:31:33 2011 -0400

    if we get InstanceNotFound error on create, ignore (means it has been deleted before we got the create message)

 nova/compute/manager.py |   92 +++++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

commit 0ebfe3121c9abc00e0cb749dcc0f4b3dc5cbacb6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:09:54 2011 -0500

    some libvirt multi-nic just to get it to work, from tushar

 nova/db/sqlalchemy/api.py       |   10 ++++++----
 nova/network/manager.py         |    2 ++
 nova/virt/libvirt/connection.py |   24 ++++++++++++------------
 nova/virt/libvirt/firewall.py   |    8 ++++----
 nova/virt/libvirt/netutils.py   |   20 +++++++++++++-------
 5 files changed, 37 insertions(+), 27 deletions(-)

commit 186598a819c4e9c4b1b76aad61e7df56cdddd5be
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 12:03:27 2011 -0400

    Removed whitespace.

 bin/nova-direct-api  |    4 ++--
 bin/nova-objectstore |    6 +++---
 bin/nova-vncproxy    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 7c846ea890f3c7143fd5e158931fc415e53a9bf0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 11:50:28 2011 -0400

    Fixed objectstore test.

 nova/service.py                |    4 ++--
 nova/tests/test_objectstore.py |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 42f97776424df69889b369d5fdd17653e5ac887b
Merge: 16c481f 0502a2b
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 21 10:26:56 2011 -0500

    merge with trey

commit 742c21e4e79ce5a26975b31486ded3956a846c55
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 11:25:44 2011 -0400

    Very small alterations, switched from using start() to pass host/port, to just defining them up front in init. Doesn't make sense to set them in start because we can't start more than once any way. Also, unbroke binaries.

 bin/nova-ajax-console-proxy    |    5 +++--
 bin/nova-direct-api            |    7 +++++--
 bin/nova-objectstore           |    7 +++++--
 bin/nova-vncproxy              |    7 +++++--
 nova/service.py                |   13 ++++++++-----
 nova/tests/test_objectstore.py |    4 ++--
 nova/tests/test_wsgi.py        |    5 +++--
 nova/wsgi.py                   |   39 ++++++++++++++++++++++-----------------
 8 files changed, 53 insertions(+), 34 deletions(-)

commit 652ccbd3d255c5c95337d874b9cba10f0ce40ebb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jun 21 16:59:36 2011 +0200

    Bump WebOb requirement to 1.0.8 in pip-requires.

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8a0d287631b5773a9868ae0e3cce6e2aef1ea501
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 10:35:50 2011 -0400

    Oops, I broke --help on nova-api, fixed now.

 nova/service.py |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit afff25800521e7085ddff7e910195ef5a1f98732
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 09:57:40 2011 -0400

    pep8 fix

 nova/tests/test_service.py |    1 +
 1 file changed, 1 insertion(+)

commit 821f597228ed206564931b6693b134d04ef29e42
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 09:46:00 2011 -0400

    Monkey patching 'os' kills multiprocessing's .join() functionality. Also, messed up the name of the eventlet WSGI logger.

 nova/wsgi.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 0e2b3e932d3e5fe00fed1da95e55808391d4832e
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Jun 21 16:55:45 2011 +0400

    Filter out datetime fields from instance_type

 nova/db/sqlalchemy/api.py |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit e01848ed64c4523bb9e375da07e962b5ea1ea6ee
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jun 21 21:10:08 2011 +0900

    erase unnecessary TODO: statement

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c184fa5d03f3f8d7faaff7b583404874de409aa6
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jun 21 20:51:07 2011 +0900

    fixed reviewer's comment. 1. adding dest-instance-dir deleting operation to nova.compute.manager, 2. fix invalid raise statement

 nova/compute/manager.py         |   36 +++++++++++++++++++++++-------------
 nova/exception.py               |    4 ++++
 nova/scheduler/driver.py        |    3 ++-
 nova/tests/test_compute.py      |   17 +++++++++++++----
 nova/tests/test_libvirt.py      |    6 +++---
 nova/virt/libvirt/connection.py |   14 ++++++++++++--
 6 files changed, 57 insertions(+), 23 deletions(-)

commit 35e922a2db9b45314108b35e438e9229bea4b977
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 21 11:39:55 2011 +0100

    fix comment line

 nova/network/xenapi_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 90bfee5c963416c1f807fde4701f0b2755d5021c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jun 21 10:46:29 2011 +0200

    Stop trying to set a body for HTTP methods that do not allow it. It renders the unit tests useless (since they're testing a situation that can never arise) and webob 1.0.8 fails if you do this.

 nova/tests/api/openstack/test_limits.py  |    3 +--
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/api/openstack/test_wsgi.py    |    4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

commit c80dbac0b9563fb7afdc1a9ec3f0a851e2673236
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:54:14 2011 -0400

    log -> logging to keep with convention

 nova/wsgi.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 679b00759ab2f183c3372465baa7daab1abeb25e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:35:45 2011 -0400

    Removed debugging and switched eventlet to monkey patch everything.

 nova/service.py |    1 -
 nova/wsgi.py    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit e821b96feb49492c7b20afaa7ae0be5143dd4879
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:32:31 2011 -0400

    Removed unneeded import.

 bin/nova-api |    1 -
 1 file changed, 1 deletion(-)

commit c17c73b3d0f07046c677711853e1b93768526e47
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:21:33 2011 -0400

    Tests for WSGI/Launcher

 bin/nova-api               |    4 ++--
 nova/service.py            |    4 +---
 nova/tests/test_service.py |   30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

commit 31e3aed4a25e0525797c7fc6cbdce0fa652b3878
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jun 20 20:33:15 2011 -0700

    Remove the unnecessary insertion of whitespace.  This happens to be enough
    to match this patch apply on recent versions of XenServer / Xen Cloud Platform.

 .../etc/xensource/scripts/vif_5.6-fp1.patch        |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 2d74b48984783ae09c2f29bf5c6fa0f81e6d32c2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 17:21:22 2011 -0700

    trunk merge

 nova/compute/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit 0d426ae8d0fe4e697648e58d1791e1c40b78deab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 16:56:59 2011 -0700

    fix lp 798361

 nova/compute/api.py                               |   55 +++++++++++----------
 nova/scheduler/zone_aware_scheduler.py            |   49 +++++++++++-------
 nova/tests/scheduler/test_zone_aware_scheduler.py |    2 +-
 3 files changed, 59 insertions(+), 47 deletions(-)

commit e849aa7112dcf24357d46f39195cfefce828a91a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 19:32:18 2011 -0400

    Removed logging logic from __init__, added concept of Launcher...no tests for it yet.

 bin/nova-api     |   40 +++++++++----------------------
 nova/__init__.py |   10 +-------
 nova/service.py  |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 nova/wsgi.py     |    1 -
 4 files changed, 81 insertions(+), 40 deletions(-)

commit dca372d68ab99126f22c7467af12de30bb4488e4
Author: John Tran <jhtran@att.com>
Date:   Mon Jun 20 15:28:34 2011 -0700

    nova-manage checks if user is member of proj, prior to adding role for that project

 bin/nova-manage |    5 +++++
 1 file changed, 5 insertions(+)

commit db7796b0a42faafff450eedbd7c09609f008c6c7
Merge: 46e0163 d835283
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 21:53:01 2011 +0000

    Merge with parent

commit d835283ee86f31debc8c639b875c808b18e8dff8
Merge: 7620db9 f940412
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 21:31:35 2011 +0000

    Merge with parent

commit f94041278e22acc557dc878bbf3f1b1f70351446
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 21:01:14 2011 +0000

    Other migrations have been merged in before us, so renumber

 .../migrate_repo/versions/024_add_agent_table.py   |   73 --------------------
 .../migrate_repo/versions/026_add_agent_table.py   |   73 ++++++++++++++++++++
 2 files changed, 73 insertions(+), 73 deletions(-)

commit cb059a76b92ca2382c58a86ff828131238969a13
Merge: f9ed8b1 a62e0f3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 20:55:16 2011 +0000

    Merge with trunk

commit 9d6f9b7a5de846cf5ba0d6c38440729c54be8e28
Merge: c178b3c a62e0f3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 14:55:29 2011 -0400

    Merged trunk.

commit c178b3ce44d89b662c5925b7b65aab9c2540cf37
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 14:54:53 2011 -0400

    pep8 fixes

 bin/nova-api                                |    2 --
 nova/tests/integrated/integrated_helpers.py |    1 -
 nova/tests/test_wsgi.py                     |    2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

commit f9ed8b1400e6823c8e09c774f8d274158378cc91
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 18:42:04 2011 +0000

    assert_ -> assertTrue since assert_ is deprecated

 nova/tests/test_xenapi.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 83fd1983072246989a9c37d5cf1682068009e3cf
Merge: f1b009d a62e0f3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 11:19:01 2011 -0700

    added adjust child zone test

commit f1b009d0ff5001a6a48ca1cfb71fa9da7139bc62
Merge: 1acb699 c2a8d0f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 10:22:53 2011 -0700

    tests working again

commit 0502a2b35fb1a4424e7249cb9f39d7fc98bf37b5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:56:15 2011 -0500

    updated the exceptions around virtual interface creation, updated flatDHCP manager comment

 nova/db/sqlalchemy/api.py |    9 ++++++---
 nova/exception.py         |    4 ++++
 nova/network/manager.py   |    7 +++----
 3 files changed, 13 insertions(+), 7 deletions(-)

commit 9873968029e19e9846e04951f841d02c27c9d6ae
Merge: 5f86370 a62e0f3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:36:13 2011 -0500

    more trunks

commit 5f8637007e8f8bdb4f27150c2e4d95f031899301
Merge: 9206e7a c2a8d0f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:23:49 2011 -0500

    another trunk merge

commit a62e0f3e10cae4938ca2fec047268064cab3bff2
Merge: c2a8d0f 56042d3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 20 16:17:35 2011 +0000

    This patch adds support for working with instances by UUID in addition to integer IDs.
    
    The Zone Scheduler routing mechanics were changed slightly so that when an UUID is passed in, it checks to see whether the item is available locally.
    
    If it isn't it re-routes to a child zone.
    
    If it is available locally, it substitutes the UUID with the integer ID and calls the wrapped function. This is the 'trick' allows us to not change any of the virt-layer code-- everything still uses integer IDs locally.

commit 9206e7acd9ec1c6ff3a71c826b8ee26c108d3d3e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:10:16 2011 -0500

    importing sqlalchemy IntegrityError

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 56042d3a60bb76108b21261c3a4dbd8f67d6549c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 20 15:15:49 2011 +0000

    Moving add_uuid migration to 025

 .../versions/024_add_uuid_to_instances.py          |   43 --------------------
 .../versions/025_add_uuid_to_instances.py          |   43 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)

commit b84cb654ac11d0652fb44bb37e9376c2aa9d4dd4
Merge: 869ed36 c2a8d0f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 20 14:58:00 2011 +0000

    Merging trunk, fixing conflicts

commit 260af1f3edb7993a6b6374563ef2b46c7fa700df
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 20 15:55:02 2011 +0100

    Enclosing tokens for xenapi filter in double quotes

 nova/network/xenapi_net.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 1acb699a6fb0ea7a7d84ba4598790d7c9d7abd14
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 07:45:21 2011 -0700

    working commit

 nova/db/sqlalchemy/models.py                      |    4 ++-
 nova/scheduler/api.py                             |    6 ++--
 nova/scheduler/zone_aware_scheduler.py            |   32 +++++++++++++++++++--
 nova/tests/api/openstack/test_zones.py            |   10 +++----
 nova/tests/scheduler/test_zone_aware_scheduler.py |    1 +
 5 files changed, 42 insertions(+), 11 deletions(-)

commit 91050cc49e61b46f55722d8fe7e342c2f8ac926b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 10:39:17 2011 -0400

    Fix objectstore test.

 nova/tests/test_objectstore.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dd870291a32d18d0f62592a73a03b9038ae5c3da
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 10:12:43 2011 -0400

    Cleanup and addition of tests for WSGI server.

 bin/nova-api            |    2 +-
 nova/tests/test_wsgi.py |   21 ++++++++++++++++++---
 nova/utils.py           |    2 --
 nova/wsgi.py            |   18 ++++++++++++------
 tools/pip-requires      |    2 +-
 5 files changed, 32 insertions(+), 13 deletions(-)

commit 7c6728107f94aeff43b36cd52d42734f5e8ae332
Merge: 93d6a1c c2a8d0f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 08:43:29 2011 -0400

    Merged trunk.

commit c2a8d0f1e2e9a25465100128bae4f60b532d16f5
Merge: cf75151 e2fa70f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 20 01:47:20 2011 +0000

    Check that server exists when interacting with /v1.1/servers/<id>/meta resource

commit 93d6a1c727ffa5ac2972a26fc8a1e38edc84684a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 21:29:43 2011 -0400

    No, really. Added tests for WSGI loader.

 nova/tests/test_wsgi.py |   79 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

commit 5a26a6523cfba2fdeaf0abebac8921f2a3322b13
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 21:28:51 2011 -0400

    Added tests for WSGI loader.

 nova/wsgi.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit a6d527646184889863de5ab1082695a29f70988a
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 09:43:34 2011 +0900

    nova.virt.libvirt.connection._live_migration is changed

 nova/compute/manager.py         |   20 +++++++++-----------
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

commit c1b70cc20a17e99fedb0f0a93139424fb89dd9e9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 20:26:47 2011 -0400

    Cleanup.

 nova/service.py                             |   22 +++++++++++++++++++---
 nova/tests/integrated/integrated_helpers.py |    5 ++---
 2 files changed, 21 insertions(+), 6 deletions(-)

commit 48effc910682544af030fdf6082b9ecf4bdd0a66
Merge: 9b52343 cf75151
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 09:20:00 2011 +0900

    merged rev trunk 1198

commit 927aecb0a3ff1fe561b3c96a4fb9b18c8893c3ae
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 20:18:29 2011 -0400

    Introduced Loader concept, for paste decouple.

 bin/nova-api      |    2 +
 nova/exception.py |    8 +++
 nova/service.py   |   38 +++++--------
 nova/wsgi.py      |  161 ++++++++++++++++++++++++++++++-----------------------
 4 files changed, 116 insertions(+), 93 deletions(-)

commit 9b52343f792d83647978c7edbfe700258e3ddae2
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 08:51:25 2011 +0900

    fix pep8 check

 nova/compute/manager.py         |    2 +-
 nova/virt/libvirt/connection.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b03b3145a18f8f4717fdc55ab50dc714516d2c54
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 08:32:34 2011 +0900

    fix comments at nova.virt.libvirt.connection

 nova/virt/libvirt/connection.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 79402ffbaeae18bb4adaa899743a688ef0bcb24b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 18:00:38 2011 -0400

    Cleanup of the cleanup.

 bin/nova-api                                |    6 ++----
 nova/tests/integrated/integrated_helpers.py |    3 ---
 setup.cfg                                   |    3 ---
 3 files changed, 2 insertions(+), 10 deletions(-)

commit 1e047dae71131a0080310990dc6899852d233941
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 16:27:46 2011 -0400

    Further nova-api cleanup.

 bin/nova-api     |   63 ++++++++++++++++++++++++++++++++----------------------
 nova/__init__.py |    1 +
 nova/log.py      |    2 +-
 nova/service.py  |    2 +-
 nova/wsgi.py     |    5 +----
 5 files changed, 41 insertions(+), 32 deletions(-)

commit 95213244fe341b7ec2723b92a5b793e89ee8403f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 14:41:42 2011 -0400

    Cleaned up nova-api binary and logging a bit.

 bin/nova-api     |   32 +++++++++-----------------------
 nova/__init__.py |   12 ++++++++++++
 nova/service.py  |   19 -------------------
 nova/utils.py    |    2 ++
 nova/wsgi.py     |    2 +-
 setup.cfg        |    3 +++
 6 files changed, 27 insertions(+), 43 deletions(-)

commit ea64f883b74fa3c702a3c47d4508a1e7a7f6b40d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 14:09:09 2011 -0400

    Removed debugging, made objectstore tests pass again.

 bin/nova-api                   |    3 ---
 nova/log.py                    |    2 --
 nova/tests/test_objectstore.py |    6 ++++--
 3 files changed, 4 insertions(+), 7 deletions(-)

commit 843644aed6477b4411ec3f07d1a5271df41c9798
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sat Jun 18 23:10:41 2011 -0400

    General cleanup and refactor of a lot of the API/WSGI service code.

 bin/nova-api                                |   18 ++++-
 nova/api/openstack/wsgi.py                  |    4 +-
 nova/log.py                                 |   13 ++++
 nova/service.py                             |   96 ++++++++++-----------------
 nova/test.py                                |   23 -------
 nova/tests/integrated/integrated_helpers.py |   13 ++--
 nova/wsgi.py                                |   63 +++++++++---------
 7 files changed, 104 insertions(+), 126 deletions(-)

commit 869ed360f9354c18cbd61dac0ff050584f96a93d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jun 18 00:12:44 2011 +0000

    Adding tests for is_uuid_like

 nova/tests/test_utils.py |   18 ++++++++++++++++++
 nova/utils.py            |   10 ++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

commit e6d264b3adc8f023512d19c3e6a0fd306795a34c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 23:53:30 2011 +0000

    Using proper UUID format for uuids

 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/scheduler/test_scheduler.py   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit cf751516b6d7381fca5f0678c07baaa0f7fccece
Merge: a854d4e 74be8d2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jun 17 23:52:22 2011 +0000

    Implements a portion of ec2 ebs boot.
    What's implemented
    - block_device_mapping option for run instance with volume
      (ephemeral device and no device isn't supported yet)
    - stop/start instance
    
    TODO:
    - ephemeral device/no device
    - machine image

commit 89ad3e4f219ff5e8f60624560e9a3ce3762040d5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 18:38:35 2011 -0500

    updated fixed ip and floating ip exceptions

 nova/db/sqlalchemy/api.py |   42 +++++++++++++++++++++++++-----------------
 nova/exception.py         |   28 ++++++++++++++--------------
 2 files changed, 39 insertions(+), 31 deletions(-)

commit 74be8d2791a5579725fa07c8403545ede3354b2e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jun 18 08:34:20 2011 +0900

    pep8: white space/blank lines

 nova/compute/api.py      |    2 --
 nova/tests/test_cloud.py |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

commit d20ade1e866d0e48c0724cd50e92fc84e068505a
Merge: 1d815c1 a854d4e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 22:06:48 2011 +0000

    Merging trunk

commit a2f9e4be5ca400b407fbb8aa11dd0888aad21aa1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 16:54:08 2011 -0500

    renamed VirtualInterface exception and extend NovaException

 nova/exception.py       |    5 +++--
 nova/network/manager.py |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit e2fa70fb9d2b6684823328a491e18c0f98184665
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 17:40:48 2011 -0400

    moving instance existance logic down to api layer

 nova/api/openstack/server_metadata.py            |   47 +++++++++++++---------
 nova/db/sqlalchemy/api.py                        |   16 +++++++-
 nova/tests/api/openstack/test_server_metadata.py |    3 +-
 3 files changed, 45 insertions(+), 21 deletions(-)

commit 2e1343dd70a95c62977360eb73839459a666988e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 21:03:12 2011 +0000

    Ensure os_type and architecture get set correctly

 nova/tests/test_xenapi.py |    2 ++
 1 file changed, 2 insertions(+)

commit a854d4e17214269b729777967e028600fdf4ee50
Merge: 2e6c26f a0ab4e7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 17 20:47:23 2011 +0000

    Make EC2 update_instance() only update updatable_fields, rather than all
    fields. Patch courtesy of Vladimir Popovski.

commit 2e6c26fcc8967192e35e0d2b2473bae578eb5b04
Merge: 33434e3 f0b0f4a
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jun 17 20:40:28 2011 +0000

    Fixes two minor bugs (lp795123 and lp795126) in the extension mechanism.  The first bug is that each extension has _check_extension() called twice on it; this is a minor cosmetic problem, but the second is that extensions which flunk _check_extension() are still added.  The proposed fix is to make _check_extensions() return True or False, then make _add_extension() call it from the top and return immediately if _check_extensions() returns False.

commit 33434e33f8f2e8fd809554cefeb3293efb372141
Merge: e17d8a9 64942d9
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 17 20:36:10 2011 +0000

    Fixes a bug where a misleading error message is outputted when there's a sqlalchemy-migrate version conflict.

commit 00eae759e8b3d0d35af513471d7d2d43a18ba215
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 20:34:43 2011 +0000

    Result is already in JSON format from _wait_for_agent

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    1 -
 1 file changed, 1 deletion(-)

commit a0ab4e7f141ccf14caca23f15eed5408079a58d0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 17 22:32:17 2011 +0200

    Fix PEP8

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c3af5e65508fb325a4a8e350c9ed6d84d87e7cd8
Author: Arvind Somy <asomya@cisco.com>
Date:   Fri Jun 17 15:12:01 2011 -0400

    Fix for lp:796834
    
    - Fixes and enhancements to the ESX(i) guest_tool.py script.

 nova/virt/vmwareapi/vm_util.py |    4 ++--
 nova/virt/vmwareapi/vmops.py   |    5 +++-
 tools/esx/guest_tool.py        |   49 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 53 insertions(+), 5 deletions(-)

commit 1ae7a52a9cda5b7e7dad26a4c6d8fd05fb60fb63
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 18:47:57 2011 +0000

    Add new architecture attribute along with os_type

 nova/tests/test_xenapi.py |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit 749eac4d36ff2f7a855044d677f3cde07451f32a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 13:47:28 2011 -0500

    bunch of docstring changes

 nova/compute/api.py                 |    8 +++---
 nova/compute/manager.py             |    5 ++--
 nova/db/api.py                      |   18 ++++++-------
 nova/db/sqlalchemy/api.py           |   47 ++++++++++++++-------------------
 nova/db/sqlalchemy/models.py        |    2 +-
 nova/network/api.py                 |   26 ++++++++++---------
 nova/network/linux_net.py           |    4 +--
 nova/network/manager.py             |   49 +++++++++++++++++++----------------
 nova/test.py                        |    4 +--
 nova/tests/db/fakes.py              |    4 +--
 nova/tests/test_iptables_network.py |    4 +--
 11 files changed, 84 insertions(+), 87 deletions(-)

commit 2ee267b7e463b3f0b7997f5dce91b325610795ab
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 14:35:10 2011 -0400

    adding check for serverRef hostname matching app url

 nova/api/openstack/images.py            |   16 +++++++++++-----
 nova/tests/api/openstack/test_images.py |   15 +++++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

commit faed18358f534ed7a743fcd168d649d06da092ab
Author: Arvind Somy <asomya@cisco.com>
Date:   Fri Jun 17 14:02:24 2011 -0400

    Fix for Bug lp:796813
    
    - Adding support for distributed virtual portgroups on vmware ESX(i)

 Authors                              |    1 +
 nova/virt/vmwareapi/network_utils.py |   29 ++++++++++++++++++++++++-----
 nova/virt/vmwareapi/vm_util.py       |   23 ++++++++++++++++++-----
 nova/virt/vmwareapi/vmops.py         |    7 ++++---
 4 files changed, 47 insertions(+), 13 deletions(-)

commit e17d8a9bb34ff253d40ca7abb81b50944a5dcfca
Merge: 241a235 f4d9da4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jun 17 18:02:19 2011 +0000

    Fix the volumes extension resource to have a proper prefix - /os-volumes

commit 241a2351259416ea8d90ba55153797d7bfc0bdd1
Merge: 063ab59 c5d2369
Author: matt.dietz@rackspace.com <>
Date:   Fri Jun 17 17:57:55 2011 +0000

    Fixes lp797017, which is broken as a result of a fragile method in the xenapi drivers that assumed there would only ever be one VBD attached to an instance.

commit bfbb2b8e04d1cd4b761c67973b173d2ca6f84859
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 13:39:34 2011 -0400

    adding extra image service properties to compute api snapshot; adding instance_ref property

 nova/api/openstack/images.py            |   31 ++++++++++++++++++++++++++++---
 nova/api/openstack/views/images.py      |   30 +++++++++++++-----------------
 nova/compute/api.py                     |    3 ++-
 nova/tests/api/openstack/fakes.py       |    7 ++++---
 nova/tests/api/openstack/test_images.py |   30 ++++++++++++++++++++----------
 5 files changed, 67 insertions(+), 34 deletions(-)

commit c5d23693500448b85c727deac364471743363406
Author: matt.dietz@rackspace.com <>
Date:   Fri Jun 17 12:33:18 2011 -0500

    Missed a pep8 fix

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f0b0f4ad4c6f90b1b3b23e6a048ebda8e62cb254
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jun 17 17:33:00 2011 +0000

    Remove thirdwheel.py and do the test with a now-public ExtensionManager.add_extension()

 nova/api/openstack/extensions.py                  |    4 ++--
 nova/tests/api/openstack/extensions/thirdwheel.py |   24 ---------------------
 nova/tests/api/openstack/test_extensions.py       |    6 ++++++
 3 files changed, 8 insertions(+), 26 deletions(-)

commit 063ab5928d9aedf56a7421b7a4b5a48f34b3babc
Merge: 48556e3 5752ff1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 17:32:48 2011 +0000

    Removes nova/image/local.py (LocalImageService)

commit 716e0f8c9c1ee41551e82154de386dfec653218b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 17:32:45 2011 +0000

    Add some documentation for cmp_version
    Add test cases for cmp_version

 nova/tests/test_xenapi.py |   31 ++++++++++++++++++++++++++-----
 nova/virt/xenapi/vmops.py |    7 +++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

commit 48556e36e1c20659fcc4934380ec755e94250718
Merge: 8e5b4ff ae1d286
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jun 17 17:17:14 2011 +0000

    Increased error message readability for the OpenStack API.

commit 5752ff1a2e9941e8e70bdc4fac54dff414d4a180
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 13:15:49 2011 -0400

    fixing test case

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e5b4ff6d53300ee03e3ef3b39f23d9b448c9471
Merge: 9152140 6ce8a15
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jun 17 17:12:50 2011 +0000

    Updated "get_all_across_zones" in nova/compute/api.py to have "context = context.elevated()", allowing it to be run by non-admin users

commit cbaf1a68c606bc77ac7a9d1ab082ce3e317fcf47
Merge: 7c68bb8 9152140
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 13:12:13 2011 -0400

    merging trunk

commit 16c481fc6c26877f78c75122c316c22cd216e3c3
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 17 11:49:20 2011 -0500

    more words

 doc/source/devref/multinic.rst |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 6ce8a156ea4a40190dd2a71eeba67a101ae7370d
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jun 17 10:07:25 2011 -0600

    Cleaned up some pep8 issues in nova/api/openstack/create_instance_helper.py and nova/api/openstack/__init__.py

 nova/api/openstack/__init__.py               |    3 +--
 nova/api/openstack/create_instance_helper.py |    7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

commit a58afe40765e8c429f5e38def6da721564cde5fd
Merge: 25618ef 556f467
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jun 17 15:54:25 2011 +0000

    Pull-up from trunk

commit 25618efd0286bacf4f02abf2529e3411a3dae216
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jun 17 15:54:11 2011 +0000

    Add a test to ensure invalid extensions don't get added

 nova/tests/api/openstack/extensions/thirdwheel.py |   24 +++++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py       |    7 ++++++
 2 files changed, 31 insertions(+)

commit 9152140e761786f7ac19ceac822a1d091684bc42
Merge: 556f467 2ee3d49
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 17 15:51:01 2011 +0000

    Update xenapi/vm_utils.py so that it calls find_sr instead of get_sr.
    Remove the old get_sr function which by default looked for an SR named 'slices'.

commit 215452cb79e5d006ad57fbe206e886115b864ed0
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 17 10:46:14 2011 -0500

    add vlan diagram and some text

 doc/source/devref/multinic.rst      |   16 ++++++++++------
 doc/source/image_src/multinic_3.odg |  Bin 0 -> 13598 bytes
 doc/source/images/multinic_vlan.png |  Bin 0 -> 58552 bytes
 3 files changed, 10 insertions(+), 6 deletions(-)

commit 81dd4f2b4ff6cbdc596b878946a6ee00c31a2599
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jun 17 09:25:23 2011 -0600

    Added context = context.elevated() to get_all_across_zones

 nova/compute/api.py |    1 +
 1 file changed, 1 insertion(+)

commit e628ce781b7fa54f87eba919f59bccf34bd8faac
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 14:49:54 2011 +0000

    auto load table schema instead of stubbing it out

 .../migrate_repo/versions/024_add_agent_table.py   |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 1d815c177df76eb4f497a67fbdbd58fb170ca880
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 14:48:58 2011 +0000

    Fixed migration per review feedback.

 .../versions/024_add_uuid_to_instances.py          |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 8bd0296224b70e318e208a4570b4acaa599f62c8
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 17 18:26:31 2011 +0400

    Made hostname independent from ec2 id. Add generation of hostnames based on display name.

 nova/api/ec2/cloud.py      |    3 +--
 nova/compute/api.py        |   24 +++++++++++++++++++++---
 nova/compute/manager.py    |    6 +++---
 nova/scheduler/driver.py   |   16 ++++++++--------
 nova/tests/test_compute.py |    2 +-
 5 files changed, 34 insertions(+), 17 deletions(-)

commit 64942d92f3f2b204f55225ab1372507edf543089
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 17 10:17:07 2011 -0400

    Fix for a problem where run_tests.sh would output a seemingly unrelated error message when there was a sqlalchemy-migrate version number conflict

 run_tests.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 971efd1b5568c324c91e826fc347c49ceea3790c
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 17 17:27:06 2011 +0400

    stub api methods

 nova/api/openstack/contrib/floating_ips.py |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 060fd3921e876dcbd594270871ddaeee749259be
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri Jun 17 09:19:55 2011 -0400

    Missed a InstanceTypeMetadata -> InstanceTypeExtraSpecs rename in register_models

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6855066ab0e432d7a77d6beb0fa7bda7e125ae9b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 17 14:20:18 2011 +0200

    Fix unitttest so that it actually fails without the fix

 nova/tests/test_cloud.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 556f467bf0065331cdbb5c5e20fe33dca1239a64
Merge: 1763419 00cb4ef
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 01:21:44 2011 +0000

    Make $my_ip Glance's default host, not localhost.

commit a6687f56e0ebb23d59fc4b4097b5877f57312a95
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 22:31:14 2011 +0000

    We don't check result in caller, so don't set variable to return value

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ff7bf3c379a3c10ab34c50951cad54659433d65
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 22:30:56 2011 +0000

    Remove debugging statement

 nova/virt/xenapi/vmops.py |    1 -
 1 file changed, 1 deletion(-)

commit da09c8fca687d0756cda38c5bd038d677dacd1f3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jun 16 21:27:17 2011 +0000

    Fix lp795123 and lp795126 by making _check_extension() return True or False and checking the result only from the top of _add_extension()

 nova/api/openstack/extensions.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 00cb4efb489cce55aeab7a530012d3615552af89
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 21:21:01 2011 +0000

    Glance host defaults to  rather than localhost

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a51b2ed4ed4840262bd07d5dfc11e33a32e1accd
Merge: d68f6de 1763419
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 16 16:48:20 2011 -0400

    Upstream merge

commit 829319649af615f2b4c51f8ffa9ce9f1a9e50295
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 15:36:29 2011 -0500

    add in dhcp drawing

 doc/source/devref/multinic.rst      |    4 +++-
 doc/source/image_src/multinic_2.odg |  Bin 0 -> 13425 bytes
 doc/source/images/multinic_dhcp.png |  Bin 0 -> 54531 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

commit d68f6de8d8275ec6dd9f231b9b52971f2ad15263
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 16 16:33:29 2011 -0400

    Rename: intance_type_metadata -> instance_type_extra_specs

 nova/db/api.py                                     |   24 ++---
 nova/db/sqlalchemy/api.py                          |   77 +++++++-------
 .../versions/021_add_instance_type_extra_specs.py  |   67 +++++++++++++
 .../versions/021_add_instance_type_metadata.py     |   67 -------------
 nova/db/sqlalchemy/models.py                       |   12 +--
 nova/exception.py                                  |    6 +-
 nova/tests/test_instance_types_extra_specs.py      |  106 ++++++++++++++++++++
 nova/tests/test_instance_types_metadata.py         |  106 --------------------
 8 files changed, 233 insertions(+), 232 deletions(-)

commit c3300c29277423c28c5403d23b4a7f0a960f429d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 16 15:11:02 2011 -0500

    erroneous self in virtual_interface_delete_by_instance() sqlalchemy api

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1763419a3f6b01bb0ef98c700f0f350e756b359c
Merge: 7c58399 b00628c
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 16 20:06:56 2011 +0000

    Fixes a bug where a unit test sometimes fails due to a race condition.

commit 69f346bd9dd5df3df74d18551429db8f310e8d24
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:57:22 2011 -0500

    remove the network-host fromt he flat diagram

 doc/source/image_src/multinic_1.odg |  Bin 12839 -> 12363 bytes
 doc/source/images/multinic_flat.png |  Bin 50924 -> 40871 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

commit cedd8e5fe0189477bc0658990e7d8ba519d85d02
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:44:57 2011 -0500

    add multinic diagram

 doc/source/image_src/multinic_1.odg |  Bin 0 -> 12839 bytes
 doc/source/images/multinic_flat.png |  Bin 0 -> 50924 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

commit c86bfba6e76f749626b2472ed5e3c6eadf9d5529
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:44:17 2011 -0500

    add the actual image

 doc/source/devref/multinic.rst |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit f96eb29e8fca5781bdbcc70e66c48c457ce09601
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 14:42:50 2011 -0500

    Renaming to _build_instance_get

 nova/db/sqlalchemy/api.py |    6 +++---
 nova/scheduler/api.py     |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 728a5f877b2ff0b04260187c25673ddd6bed085b
Merge: 09dc2c3 7c58399
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 16 14:03:40 2011 -0500

    merged trunk

commit 09dc2c32e18692c2e3d3743d126a52dd73cf598d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 16 14:00:14 2011 -0500

    returned two files to their trunk versions, odd that they were altered in the first place

 .../versions/016_make_quotas_key_and_value.py      |    3 ++-
 nova/tests/scheduler/test_zone_aware_scheduler.py  |   16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

commit 83df657360fe32315d6a55488de7dccdffa25c90
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 16 13:56:52 2011 -0500

    Added a new test for confirming failure when no primary VDI is present

 nova/tests/test_xenapi.py    |   18 ++++++++++++++++++
 nova/virt/xenapi/vm_utils.py |    2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 9f62def7b578fc85f85e174a031592a5c4750751
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 16 13:45:55 2011 -0500

    Unit tests pass again

 nova/virt/xenapi/fake.py |    1 +
 1 file changed, 1 insertion(+)

commit 9010195558be896bdf536003e00843019a1077d7
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 13:44:38 2011 -0500

    more doc (and by more I mean like 2 or 3 sentances)

 doc/source/devref/multinic.rst |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit d85aa5344935a9ba5ec5a2081ef08f09f2ceda26
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 18:38:40 2011 +0000

    Fix copyright date

 .../migrate_repo/versions/024_add_agent_table.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bd6993f9e6bf3ef925b0c0f456ddf1622be2b432
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:52:34 2011 +0000

    PEP8 cleanup.

 nova/scheduler/api.py                    |   11 ++++++-----
 nova/tests/api/openstack/test_servers.py |    1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

commit fb5cc193cfbd9f92ba777bdbcdaae045c982b05a
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 16 12:50:55 2011 -0500

    Attempting to retrieve the correct VDI for snapshotting

 nova/virt/xenapi/vm_utils.py |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

commit 9f0a2d8b870f65e0e76b1868a151facc6f2bfda4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:46:13 2011 +0000

    Fixing another test

 nova/tests/scheduler/test_scheduler.py |   32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

commit a89953fa1e4d6940f0016de417163460a0b846fa
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:27:36 2011 +0000

    Fixing test_servers_by_uuid

 nova/compute/api.py                      |    1 -
 nova/scheduler/api.py                    |   10 +++++-----
 nova/tests/api/openstack/test_servers.py |   29 +++++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 10 deletions(-)

commit a1e310aaa9f0ef829e2857c524be140541f3a13d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 16 20:31:09 2011 +0400

    floating_ips extension is loading to api now

 nova/api/openstack/contrib/floating_ips.py |   45 ++++++++++++++++++++++++++--
 nova/network/api.py                        |    5 ++++
 tools/pip-requires                         |    2 +-
 3 files changed, 49 insertions(+), 3 deletions(-)

commit 2a90b44ddd797b7e493bbfbe4de80115c96a9ab4
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 11:27:01 2011 -0500

    initial commit of multinic doc

 doc/source/devref/multinic.rst |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 4ef6b76ff882271ea611c0bba9542760a485c4fb
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 11:07:36 2011 -0500

    generated files should not be in source control

 doc/build/html/.buildinfo |    4 ----
 1 file changed, 4 deletions(-)

commit 277b8897cd93bf9e9c074b7a092ed35f209a83da
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 16:06:05 2011 +0000

    Fixed UUID migration

 .../versions/024_add_uuid_to_instances.py          |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e63dff37b01500a90f60f9c54e45d29d959a207
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 16:03:04 2011 +0000

    Added UUID migration

 .../versions/024_add_uuid_to_instances.py          |   41 ++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit b9c74d0958f02bd8df1f544b6a984877cbd18444
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 15:56:06 2011 +0000

    Clean up docstrings to match HACKING

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5da9e78a3fe5e6da1d01c8e25b5616f20db08aea
Merge: 070cbfe a2ea665
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jun 16 10:54:59 2011 -0500

    merge with trey

commit 70685ba0ed01685f8643c499ca78ef57763ed3b5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 15:02:18 2011 +0000

    Small tweaks

 nova/compute/manager.py      |    1 -
 nova/db/sqlalchemy/models.py |    2 +-
 nova/scheduler/api.py        |   14 ++++++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

commit 513bc408b7328ff37f7374494a695820eaf614fd
Merge: 57932d5 2500997
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 16 17:46:39 2011 +0400

    Merged reldan changes

commit 25009974df913c3e5c071b53a6004ae35e37d26b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Jun 16 17:37:45 2011 +0400

    First implementation of FloatingIpController

 nova/api/openstack/contrib/floating_ips.py |   54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit b10621f5f85cccde3d159afddb78398544d4c32e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Jun 16 17:30:36 2011 +0400

    First implementation of FloatingIpController

 nova/db/api.py            |    3 +++
 nova/db/sqlalchemy/api.py |   23 +++++++++++++++++++++++
 nova/network/api.py       |    4 ++++
 3 files changed, 30 insertions(+)

commit 774e201a04addf95fab2253998967b212588cb0a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 22:18:06 2011 +0900

    compute/api: fix mismerge due to instance creation change

 nova/compute/api.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 7bc76ef403507f6762f782ff4d305cf2718346d5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 22:17:54 2011 +0900

    ec2/cloud.py: fix mismerge

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8da93c0352996ec733f3678b9ca02b72a96498c2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:44:50 2011 +0900

    fix conflict with rebasing.

 .../versions/022_add_root_device_name.py           |   47 --------------------
 .../versions/025_add_root_device_name.py           |   47 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)

commit 46c7e018ee3aed0f0e27ae3544193adb5fa62958
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:25:57 2011 +0900

    api/ec2: support CreateImage

 nova/api/ec2/__init__.py |    1 +
 nova/api/ec2/cloud.py    |  101 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

commit 1a54498af5bc2b81bf8bf6e3b9a4ad4cc2db79e2
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:25:35 2011 +0900

    api/ec2/image: support block device mapping
    
    This patch adds --block-device-mapping support for register image and
    instance creation.

 nova/api/ec2/cloud.py    |  189 +++++++++++++++++++++++++++++++++++++++-------
 nova/api/ec2/ec2utils.py |   19 +++++
 nova/compute/api.py      |   82 +++++++++++++++-----
 nova/compute/manager.py  |   20 ++---
 nova/image/s3.py         |   25 ++++++
 5 files changed, 282 insertions(+), 53 deletions(-)

commit 72730a3ba122a86f736513b9dab886bc4087bdc5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:25:02 2011 +0900

    db/model: add root_device_name column to instances table
    
    The root_device_name column is necessary to support ec2 RootDeviceName.

 .../versions/022_add_root_device_name.py           |   47 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 2 files changed, 49 insertions(+)

commit f0020db55c3c75d40cb690cb0a1b1da06cc36f88
Merge: df63c8e 6d41575
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:24:19 2011 +0900

    ec2utils: consolidate 'vol-%08x' and 'snap-%08x'
    
    By introducing helper functions, consolidate scattered '{vol, snap}-%08x'

commit 6d41575a827dd3517210ed2040c51c9c68b40c35
Merge: 31ae051 0098742
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:23:58 2011 +0900

    api/ec2: check user permission for start/stop instances
    
    This patch adds precise permission check for start/stop instances.

commit df63c8e14da8c93453d4d7485829e38e0db30711
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 20:35:49 2011 +0900

    ec2utils: consolidate 'vol-%08x' and 'snap-%08x'
    
    By introducing helper functions, consolidate scattered '{vol, snap}-%08x'

 nova/api/ec2/__init__.py |    4 ++--
 nova/api/ec2/cloud.py    |   14 ++++++--------
 nova/api/ec2/ec2utils.py |   11 +++++++++++
 nova/tests/test_cloud.py |   16 ++++++++--------
 4 files changed, 27 insertions(+), 18 deletions(-)

commit 009874210e818752d5f206df01313242c728e5f8
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 20:29:10 2011 +0900

    api/ec2: check user permission for start/stop instances
    
    This patch adds precise permission check for start/stop instances.

 nova/api/ec2/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit 220ddb2bd5413ea5fa2bff450f4fb3aba136e909
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 20:29:10 2011 +0900

    api/ec2: check user permission for start/stop instances
    
    This patch adds precise permission check for start/stop instances.

 nova/api/ec2/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit 7c583997df2c243c4bd21f876da4658331efe37d
Merge: abf9680 cc3b74c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 16 01:34:33 2011 +0000

    Adds 'joinedload' statements where they need to be to prevent access of a 'detached' object.

commit abf96804af84327e82d47c9f7078de1c5287cddf
Merge: 57932d5 4b56c18
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 16 01:16:39 2011 +0000

    novaclient changed to support projectID in authentication. Caused some minor issues with distributed scheduler. This fixes them up.

commit 46e016348ff4303310af328fa1af8fab513632c9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 23:11:00 2011 +0000

    Add trailing LF (\n) to password for compatibility with old agents

 nova/virt/xenapi/vmops.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 87d90616df651787f52a59be37457335eb881ed7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 22:57:05 2011 +0000

    Workaround windows agent bugs where some responses have trailing \\r\\n

 nova/virt/xenapi/vmops.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit a2ea6652fce1b75d61b2217676c8447327a2467e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 17:36:07 2011 -0500

    removed commented out shim on Instance class

 nova/db/sqlalchemy/models.py |    7 -------
 1 file changed, 7 deletions(-)

commit 7620db9454dd391ce3080e99cdb8237eaa9a4835
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 22:28:32 2011 +0000

    Windows instances will often take a few minutes setting up the image on first
    boot and then reboot. We should be more patient for those systems as well
    check if the domid changes so we can send agent requests to the current domid

 nova/virt/xenapi/vmops.py |   60 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 11 deletions(-)

commit 357556ce52af91cc4273597c6576bd9da8e5b388
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 22:18:54 2011 +0000

    Split patch off to new branch instead

 nova/virt/xenapi/vmops.py |   60 +++++++++------------------------------------
 1 file changed, 11 insertions(+), 49 deletions(-)

commit 1c26cbc273d7924d01a45f60fbf13db58d29b15f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 21:50:40 2011 +0000

    Add --fixes

commit 96a49e768037a2582c294d51a1cb3a330478507d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 21:50:36 2011 +0000

    First attempt to rewrite reroute_compute

 nova/scheduler/api.py |   82 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 22 deletions(-)

commit e3c2a97049513e4cff1700bd87d780f6e41afc87
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 16:47:27 2011 -0500

    syntax

 nova/db/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ae1d286aa2693a7b9feb9d33eba55f754e052260
Merge: 2a20e38 57932d5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:47:25 2011 -0400

    Merged trunk.

commit a9eb3a0416b465145ddf765da08bd6d94b191595
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 21:46:22 2011 +0000

    Windows instances will often take a few minutes setting up the image on first
    boot and then reboot. We should be more patient for those systems as well
    check if the domid changes so we can send agent requests to the current domid

 nova/virt/xenapi/vmops.py |   60 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 11 deletions(-)

commit cc3b74ce5cf4f5b52daef2368e4470b933f9225f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:36:08 2011 -0400

    Fixed bug.

commit e6eae8d21a7c261dae498f52430dbee60b28840e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:35:31 2011 -0400

    Added metadata joinedloads

 nova/db/sqlalchemy/api.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit d77a1cec6247172cd1be2a4a1b996c37cc33a2f9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 21:12:37 2011 +0000

    Prep-work to begin on reroute_compute

 nova/compute/api.py   |    8 +-------
 nova/scheduler/api.py |   24 +++++++++++++++++++++---
 nova/utils.py         |    8 ++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

commit fe96fb768de04aac6eaf4a44ac6bc4963d9028b7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 16:02:49 2011 -0500

    specify mysql_engine for the virtual_interfaces table in the migration

 .../migrate_repo/versions/023_multi_nic.py         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2a20e38d9f39732dd2f47cedeb9b1e48de767770
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 16:58:55 2011 -0400

    Passed in explanation to 400 messages.

 nova/api/openstack/create_instance_helper.py |   12 ++++++------
 nova/api/openstack/servers.py                |    8 ++++----
 nova/api/openstack/wsgi.py                   |    8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

commit f4d9da4cd6b9fef162d1a69e6b3f50d51744b3de
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 15 16:33:05 2011 -0400

    Fixing case of volumes alias

 nova/api/openstack/contrib/volumes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98ad65c2bf20632c33f2cb99eb613e07575ecd4a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 15 16:15:40 2011 -0400

    The volumes resource extension should be prefixed by its alias - os-volumes

 nova/api/openstack/contrib/volumes.py |    4 ++--
 nova/tests/integrated/api/client.py   |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit edb2c7b518845b194c647f580e644be90984556e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 20:11:34 2011 +0000

    Adding uuid test

 nova/db/sqlalchemy/api.py                |    2 ++
 nova/tests/api/openstack/test_servers.py |   16 ++++++++++++++++
 nova/utils.py                            |    5 +++++
 3 files changed, 23 insertions(+)

commit 161507acc320f64f0581ac3242f08b3e2c258740
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:43:58 2011 +0000

    Pep8 Fixes

 nova/compute/api.py                      |    2 +-
 nova/db/sqlalchemy/api.py                |    1 -
 nova/tests/api/openstack/test_servers.py |    1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

commit a1ca35b6d6f9455f481da71f84fd415cd068ee2a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:36:39 2011 +0000

    Fixing test_servers.py

 nova/tests/api/openstack/test_servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 86e8463319f55f4d7d82ab89d876a00e1c3b5508
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 15 15:35:08 2011 -0400

    pep8

 nova/tests/api/openstack/test_server_metadata.py |    2 ++
 1 file changed, 2 insertions(+)

commit aa726953eb3818b7282044314599bfa3bc22793b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:30:48 2011 +0000

    Fixing private-ips test

 nova/api/openstack/ips.py |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit e35878070ce594d3c9db2f433dcf3f3f1441a497
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 15 15:28:39 2011 -0400

    adding server existence check to server metadata resource

 nova/api/openstack/server_metadata.py            |   15 ++++++-
 nova/tests/api/openstack/test_server_metadata.py |   50 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

commit 211b0eb5385acdfcd7a7da6efda8d7f3fbda3c55
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:17:11 2011 +0000

    Fixing test_create_instance

 nova/compute/api.py                      |    5 +----
 nova/tests/api/openstack/test_servers.py |   10 +++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 7b321f3f90ce08869bb720c3b1720b0c8292deca
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:36:16 2011 -0500

    made the test_xenapi work

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6b3e3f7ec76704d1ffc01fc72b5e18e106548e85
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:33:53 2011 -0500

    test xenapi injected set to True

 nova/tests/test_xenapi.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f59008200d867ed9816406c7bc0f6553b19f0517
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:18:01 2011 -0500

    something else with tests

 nova/tests/test_xenapi.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e12ed8f2631287b29d57ae84682db5a5666b6c67
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:13:42 2011 -0500

    something with tests

 nova/tests/test_xenapi.py |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit fc35242e6eaed6cde29bb24a6804e0514354ccf0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:02:00 2011 -0500

    i dont even care anymore

 nova/tests/test_xenapi.py |   34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

commit f97c63fdc9d50baa0a739ff76665ef06fc6b8617
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:54:32 2011 -0500

    network_info has injected in xenapi tests

 nova/tests/test_xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da5e5106565f4999c1856be9c3230ba1a1505b82
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 17:52:44 2011 +0000

    Adding UUID test

 nova/api/openstack/views/servers.py      |    3 +-
 nova/compute/api.py                      |   21 ++++++++++-
 nova/db/api.py                           |    5 +++
 nova/db/sqlalchemy/api.py                |   60 +++++++++++++++++-------------
 nova/db/sqlalchemy/models.py             |    1 +
 nova/tests/api/openstack/test_servers.py |   28 +++++++++++---
 6 files changed, 85 insertions(+), 33 deletions(-)

commit 7ace517d3909454e4d2d6b48b37a5e6b37f6816d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:47:26 2011 -0500

    network_info passed in test_xenapi, mac_address no longer in instance values dict

 nova/tests/test_xenapi.py |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit 0002eb7affbc0983ee9fc317aa79c1b62dd3d5c3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:30:44 2011 -0500

    added network injected to stub

 nova/tests/db/fakes.py |    1 +
 1 file changed, 1 insertion(+)

commit 59453fe8d56c678495b1caf0cb7faeba6aa87d0f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:25:42 2011 -0500

    added injected to network dict oportion of tuple returned by get_instance_nw_info

 nova/network/manager.py   |    3 ++-
 nova/tests/test_xenapi.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 4b56c18bb4436c6ea76f44d2b266973f5d42817f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 10:21:41 2011 -0700

    don't provision to all child zones

 nova/scheduler/zone_aware_scheduler.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c220bfd9d233ae0b18b5181eeafa2e70c17f7a30
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:13:28 2011 -0500

    network info to _create_vm

 nova/virt/xenapi/vmops.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ab7c45a9be39def2d6cbb74084abc6fa42f593dd
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 02:10:28 2011 +0900

    fix mismerge.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b3e9402579ea395e7ca0f66d0c6ff9996d1b74ad
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:06:30 2011 -0500

    updated xenapi_conn finish_resize arguments

 nova/virt/xenapi_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0f4a09528db17245cc0bc46b1a247ac9376b2936
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:01:24 2011 -0500

    stubbed out get_instance_nw_info for compute_test

 nova/tests/test_compute.py |    1 +
 1 file changed, 1 insertion(+)

commit 79ff4ca91c9b47d1324af3a453406de44c5ce62b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 09:52:02 2011 -0700

    pip novaclient bump

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3b76218e03567312a84d3b3061d3472034166a4
Merge: 31ae051 57932d5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 01:46:24 2011 +0900

    merge with nova trunk

commit 4c54aa28a8c414752d73084e3a4094e5df79b618
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 09:45:22 2011 -0700

    fixed up some little project_id things with new novaclient

 nova/scheduler/zone_aware_scheduler.py |    4 ++--
 tools/pip-requires                     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 2c59140ba50370e069b233aff74bd26a6af4c093
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 11:34:30 2011 -0500

    typo

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d632e9883ef2fecb74b3bfdc62b8871a2c74ff93
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 11:29:07 2011 -0500

    updated finish_resize to accept network_info, updated compute and tests in accordance

 nova/compute/manager.py    |    4 +++-
 nova/tests/network/base.py |    2 +-
 nova/tests/test_xenapi.py  |   17 ++++++++++++++++-
 nova/virt/xenapi/vmops.py  |    4 ++--
 4 files changed, 22 insertions(+), 5 deletions(-)

commit 31ae0515fbf2dd8f931fb53ef08b40fe0206fc92
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 00:48:25 2011 +0900

    _setup_block_device_mapping: raise ApiError when db inconsistency found
    
    Instead of assert, log it and raise ApiError if db inconsistency in
    block_device_mapping table is found.

 nova/compute/manager.py |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit a9800765f7eb8430c67d15953bed202752c2e199
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 00:32:03 2011 +0900

    db/block_device_mapping_get_all_by_instance: don't raise.
    
    Make db.block_device_mapping_get_all_by_instance() not raise,
    but returns empty list when no column found as all users catch notfound
    exception and ignore it.
    Thus ugly 'catch NotFound: pass' is eliminated.

 nova/compute/manager.py   |   79 +++++++++++++++++++++------------------------
 nova/compute/utils.py     |   20 ++++--------
 nova/db/sqlalchemy/api.py |    2 +-
 3 files changed, 45 insertions(+), 56 deletions(-)

commit 187341d714278148f299d131511915b0ca63b521
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 15:21:20 2011 +0000

    Print list of agent builds a bit prettier

 bin/nova-manage |   27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

commit 8ecf36310d35a880a0ee95d4c7fbaf3324646d58
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:41:09 2011 +0000

    PEP8 cleanups

 bin/nova-manage           |    3 ++-
 nova/db/api.py            |    3 ++-
 nova/db/sqlalchemy/api.py |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit d298ba8c1f9fbd47e4d30364e0b1a894c8c5c424
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:34:32 2011 +0000

    Rename to 024 since 023 was added already

 .../migrate_repo/versions/023_add_agent_table.py   |   78 --------------------
 .../migrate_repo/versions/024_add_agent_table.py   |   78 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 78 deletions(-)

commit edcb7399e3d3ec9fb52e836ea0fd46c40aacfa25
Merge: 61f539d 57932d5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:33:52 2011 +0000

    Merge with trunk

commit f48f35183f6bc30c0e053ea9569f5348799ed451
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 23:11:03 2011 +0900

    pep8

 nova/api/ec2/cloud.py                              |    2 +-
 nova/compute/api.py                                |    4 +-
 nova/compute/manager.py                            |    1 -
 nova/compute/utils.py                              |    1 +
 nova/db/api.py                                     |    2 +
 nova/db/sqlalchemy/api.py                          |    5 +++
 .../versions/021_add_block_device_mapping.py       |    6 ++-
 nova/db/sqlalchemy/models.py                       |    4 +-
 nova/tests/test_cloud.py                           |   40 ++++++++++----------
 nova/virt/libvirt/connection.py                    |    5 ++-
 10 files changed, 40 insertions(+), 30 deletions(-)

commit 57932d53e7cc5389b7d53fd8875a684f70e2eb67
Merge: a628691 0066c74
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:01:34 2011 +0000

    The Xen driver supports running instances in PV or HVM modes, but the method it uses to determine which to use is complicated and doesn't work in all cases. The result is that images that need to use HVM mode (such as FreeBSD 64-bit) end up setting a property named 'os' set to 'windows'.
    
    This branch adds checks for a new property called 'vm_mode'. This can be set to 'pv' or 'hvm' and select the appropriate mode. If the property doesn't exist, the existing logic is still used to determine which mode to use.

commit b0fdb4a2326f6e7c92bba80e6b80857ba2a61612
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 22:58:22 2011 +0900

    typo

 nova/api/ec2/cloud.py        |   10 ++++++----
 nova/compute/api.py          |    4 ++--
 nova/compute/manager.py      |   12 ++++++------
 nova/db/api.py               |    2 +-
 nova/db/sqlalchemy/models.py |    4 ++--
 nova/tests/test_cloud.py     |    2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

commit 6e2f79f5452b0a470d5001e9a0428fe90f987ac8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 06:40:42 2011 -0700

    None project_id now default

 nova/scheduler/api.py                  |    5 +++--
 nova/scheduler/zone_aware_scheduler.py |    3 ++-
 nova/scheduler/zone_manager.py         |    3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

commit a628691404b9e28feee59b5927330b8d765c976a
Merge: b22a12b 4d5a73b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 13:31:02 2011 +0000

    Adds code to run_tests.py which:
    
      * Prints the time taken to run each test
      * Prints the 5 slowest tests at the end of the test-run
      * Adds --hide-elapsed option to suppress elapsed time output

commit e722689c7b82bbf895213c2ebf9afaf34f292662
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jun 15 12:31:20 2011 +0100

    Fixing code to ensure unit tests for objectstore, vhd & snapshots pass

 nova/tests/test_xenapi.py    |   12 ++++++++++++
 nova/tests/xenapi/stubs.py   |    2 +-
 nova/virt/xenapi/vm_utils.py |   19 +++++++++++++------
 nova/virt/xenapi/vmops.py    |    6 ++++--
 4 files changed, 30 insertions(+), 9 deletions(-)

commit b3af5e4d5a623cf10828f4724f29dd4475120b70
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 15:08:23 2011 +0900

    ec2utils: minor optimize _try_convert()
    
    don't call lower() twice.

 nova/api/ec2/ec2utils.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c7e8f9ff46758ddbeecd049083bece013301bb59
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 14:47:18 2011 +0900

    block_device_mapping: don't use [] as default argument

 nova/compute/api.py             |    3 ++-
 nova/virt/driver.py             |    2 +-
 nova/virt/fake.py               |    2 +-
 nova/virt/hyperv.py             |    2 +-
 nova/virt/libvirt/connection.py |   12 ++++++++----
 nova/virt/vmwareapi_conn.py     |    2 +-
 nova/virt/xenapi_conn.py        |    2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

commit 06372798edf744ba28612e2bda688ba3b5f30bb3
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 14:41:29 2011 +0900

    api/ec2: make the parameter parser an independent method
    
    Following the review, make the parser of argument items
    an independent method for readability.

 nova/api/ec2/apirequest.py |   91 ++-----------------------------------------
 nova/api/ec2/ec2utils.py   |   93 ++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_api.py     |    2 +-
 3 files changed, 97 insertions(+), 89 deletions(-)

commit 4d5a73bf7cc61d94ac1f29a7566def853d0efb1b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 04:05:37 2011 +0000

    Show only if we have slow tests, elapsed only if test success

 run_tests.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 43dd1ec6089497b6e977c49f9006d03c3e7a4117
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 01:21:11 2011 +0000

    Showing elapsed time is now default

 run_tests.py |    6 +++---
 run_tests.sh |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit e20444542af9136c330d1cf469eb0e065860ded1
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 01:16:53 2011 +0000

    Ensuring pep8 runs even when nose optons are passed

 run_tests.sh |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 2d4fbd7810f2de97ecf6fcbebb8ead0c52626038
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 19:11:12 2011 -0500

    network tests now teardown user

 nova/tests/network/base.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3368a35ff9c06d74ec4b8fdb58d37771fc1a4f0d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 00:08:19 2011 +0000

    Removing seconds unit

 run_tests.py |   20 ++++++--------------
 run_tests.sh |    2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

commit 24fb4fdcfde29312f7a63fe682abcd8b95175716
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 18:59:20 2011 -0500

    network user only set if doesnt exist

 nova/tests/db/fakes.py     |    1 +
 nova/tests/network/base.py |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

commit e0238c30ac5bb4d2090d47608c08e2c208429055
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 18:49:03 2011 -0500

    net base project id now from context, removed incorrect floatnig ip host assignment

 nova/db/api.py             |    4 ++--
 nova/db/sqlalchemy/api.py  |    3 +--
 nova/network/manager.py    |    1 -
 nova/tests/db/fakes.py     |    2 +-
 nova/tests/network/base.py |    7 ++++---
 5 files changed, 8 insertions(+), 9 deletions(-)

commit 9ef64c8ccbcdacfef642b2c203ffcc45b2deaf36
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 17:52:49 2011 -0500

    fixed instance[fixed_ip] in ec2 api, removed fixed_ip shim

 nova/api/ec2/cloud.py        |   18 +++++++++---------
 nova/db/sqlalchemy/models.py |    6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

commit d9d0b416d75cc1c1a4ab03d88cdc8079240566ff
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 17:43:10 2011 -0500

    various test fixes

 nova/network/manager.py |    9 ++++++---
 nova/tests/db/fakes.py  |    7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

commit b22a12b8e265f2ce2cb5496086b1d283f57e9f8f
Merge: 046656b 73303a3
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jun 14 22:21:14 2011 +0000

    Updated so that we use a 'tmp' subdirectory under the Xen SR when staging migrations. Fixes an issue where you would get a 'File exists' error because the directory under 'images' already existed (created via the rsync copy).

commit 25af74fe38c69d538462b4c2192b6cd5441ab5a8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:51:52 2011 -0500

    db fakes silly error fix

 nova/tests/db/fakes.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f4be01dec3cbf5329aee17bf8e3a53d701b47c4a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:42:16 2011 -0500

    debug statements

 nova/tests/db/fakes.py |    1 +
 1 file changed, 1 insertion(+)

commit cf92a8e5b4538d79c529ef9159ce80bd22dd6024
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:34:45 2011 -0500

    updated db fakes

 nova/tests/db/fakes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0066c7451988dcd03a4b7e1e708c4932594ffae1
Merge: e89aad7 046656b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 21:28:08 2011 +0000

    Merge with trunk

commit e45e5038ade65baed7acc9fccfe773e7b7b25236
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:22:51 2011 -0500

    updated db fakes

 nova/tests/db/fakes.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 046656b511a8ea881dcb8df6de6c51caf35486bd
Merge: 2899a38 6d960ff
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 21:21:41 2011 +0000

    Changed requests with malformed bodies to return a HTTP 400 Bad Request instead of a HTTP 500 error.

commit 48dcfe2799d6f3e440edae6cf564c23f0850edc1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:18:45 2011 -0500

    updated db fakes and network base to work with virtual_interface instead of mac_address

 nova/tests/db/fakes.py     |   73 ++++++++++++++++++++++----------------------
 nova/tests/network/base.py |   12 ++++----
 2 files changed, 43 insertions(+), 42 deletions(-)

commit 2899a388ea02d1bbb1fe0ed03ef1686bae907186
Merge: 0a4f73d 0ce3e2a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 21:11:25 2011 +0000

    Phew ... ok, this is the last dist-scheduler merge before we get into serious testing and minor tweaks. The heavy lifting is largely done.
    
    This branch adds an OS API POST /zone/boot command which returns a reservation ID (unlike POST /servers which returns a single instance_id).
    
    This branch requires v2.5 of python-novaclient
    
    Additionally GET /servers can now take an optional reservation_id parameter, which will return all the instances with that reservation ID across all zones.

commit 18eaaa0f859c7efda291f4bd051da1abac6bd19f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:06:28 2011 -0500

    db fakes

 nova/tests/network/base.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c234727fae588713528cef3b76ae2233f61d7ba6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:02:29 2011 -0500

    db fakes

 nova/tests/db/fakes.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 396d645e250628f94bb9375afc7404ba8a9ef4cf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:55:54 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit f56d8d65fce0eccaa47b8b582652ac8bcc35ca95
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:50:56 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 2323ca0b92c07630c3a9891bb02423fed4b274f4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:39:16 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |    1 +
 1 file changed, 1 insertion(+)

commit 9b6cd36a459addb04298b98cfd9900436c53027d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:30:19 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 15adb5083168ceddd9710f432c1a8d1e0457707f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:24:35 2011 -0500

    updated libvirt test

 nova/tests/test_libvirt.py |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

commit c9a0939edd6fefd03eff06ef12c15f3a595b3a12
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:08:50 2011 -0500

    getting the test_host_filter.py file from trunk, mine is jacked somehow

 nova/tests/test_host_filter.py |  102 +++++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 48 deletions(-)

commit 0ce3e2af1b2d48d53c7ae6f59caca745946c6198
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 12:59:16 2011 -0700

    removed extra init calls

 nova/api/openstack/servers.py |    1 -
 nova/api/openstack/zones.py   |    1 -
 2 files changed, 2 deletions(-)

commit 6d960ff50d4cf8e6b2dc59aff0e8dea17498a9f0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 15:51:22 2011 -0400

    fixed HACKING

 nova/api/openstack/wsgi.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0a4f73d83904188c07928e8b6288d0bd467a0f39
Merge: 812fe49 cf66a99
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 19:51:10 2011 +0000

    Changed requests with malformed bodies to return a HTTP 400 Bad Request instead of a HTTP 500 error.

commit 60a89dda55258bd7212e09e2113dca92ebd67a08
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 12:34:10 2011 -0700

    duplicate routes moved to base class

 nova/api/openstack/__init__.py |   54 ++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

commit 30be7f9158e6bdc82957c2b4f25d3228cdd340b3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 14:11:38 2011 -0500

    fixed scary diff from trunk that shouldnt have been there

 nova/tests/test_host_filter.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b331ae15cfaa0bfbe06bb4b1947f12e56033c333
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 11:55:43 2011 -0700

    version passing cleanup

 nova/api/openstack/__init__.py |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

commit a3282ac30255a63f166947a052af0fcda4992621
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 11:40:15 2011 -0700

    refactored out controller base class to use aggregation over inheritance

 nova/api/openstack/create_instance_controller.py |  344 ---------------------
 nova/api/openstack/create_instance_helper.py     |  346 ++++++++++++++++++++++
 nova/api/openstack/servers.py                    |   33 ++-
 nova/api/openstack/zones.py                      |   48 ++-
 nova/tests/api/openstack/test_servers.py         |   14 +-
 5 files changed, 404 insertions(+), 381 deletions(-)

commit 64f7ebff56a1e54b862f53bd0a32c6600c4cc411
Merge: 7a2712e 812fe49
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 14 11:34:33 2011 -0700

    Merge trunk

commit 7a2712ebf74e5565663a6723a992151f71255eff
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 14 11:34:03 2011 -0700

    Move ipy commands to netaddr.

 nova/api/ec2/admin.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3bb80daeaf23a1e3f4cea577d5e9e96da0a1e6cd
Merge: 1f430f7 812fe49
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 13:11:13 2011 -0500

    merged trunk

commit cf66a99314d6420725e32daf6a08404c98239107
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 13:27:28 2011 -0400

    mp fixes

 nova/api/openstack/wsgi.py |    4 ++--
 nova/exception.py          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit e89aad7ca0ba7ab5e9b83fa6fd9cde7fb22924bf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 17:22:33 2011 +0000

    Really PEP8? A tab is inferior to 2 spaces?

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b00628c4767b440fa6123aa1683d88cd33517d21
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jun 14 13:17:13 2011 -0400

    pep8 fix

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b526e39e4cfdb29adbd7b1781afc367cf163b1ce
Merge: b44dfde 812fe49
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jun 14 13:16:05 2011 -0400

    upstream merge

commit b44dfde77b501e7c0d84769cab3b4a1a317c738d
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jun 14 13:14:00 2011 -0400

    Stub out the rpc call in a unit test to avoid a race condition

 nova/tests/test_cloud.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 48621804e7c0158c850b2b6cef09509aa4b57037
Merge: c16e1af 812fe49
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jun 15 01:45:48 2011 +0900

    merged trunk rev 1178

commit f46c9d7c96d591d1fffe2f45aee3e8d437e016bf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jun 14 16:39:37 2011 +0000

    Making timing points stricter, only show slow/sluggish tests in summary

 run_tests.py |   44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

commit e9f6e47a92090a9a7867c2a117ae6cf58db394ac
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 12:36:46 2011 -0400

    Improved errors

 nova/api/openstack/wsgi.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit c16e1af623ef8baa1098510a8a04adb06f2da81b
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jun 15 01:35:54 2011 +0900

    added kernel/ramdisk migrate support

 nova/virt/libvirt/connection.py |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

commit 9806dacb03023d1db22e9cf833845ba8498657a3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 12:02:15 2011 -0400

    Added faults wrapper

 nova/api/openstack/wsgi.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 070cbfeaf4ddc44b75df9b159887d35b36dcb932
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 14 11:01:47 2011 -0500

    remove file that got ressurected

commit 812fe496e2bae701ee7d90d289ff1062c631e14f
Merge: 5823559 f3381ee
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 15:51:11 2011 +0000

    Cleaned up pep8 errors using the current version of pep8 located in pip-requires. This is to remove the cluttered output when using the virtualenv to run pep8 (as you should). This will make development easier until the virtualenv requires the latest version of pep8 (see bug 721867).

commit 1cc98ecfcb529b23fb4cb84964aef2c8b6a2c63f
Merge: 4d42263 1f430f7
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 14 10:47:54 2011 -0500

    merge with trey

commit d97a6ce6c212db4d084d3be06b1f526212f6e9f8
Merge: 70bb949 5823559
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 15:36:46 2011 +0000

    Merge with trunk

commit 70bb9494639ec26f12b71dc22052d3e5b343890f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 15:36:07 2011 +0000

    autoload with the appropriate engine during upgrade/downgrade

 .../versions/023_add_vm_mode_to_instances.py       |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb
Merge: 481c7be 91e34d3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 14 15:44:51 2011 +0100

    Merge trunk
    Adapting code for removing dangling vdis and kernel/ramdisk files to latest changes

commit a3ddb45464204464c93b1deb692414c44ce99376
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 10:16:51 2011 -0400

    Created new exception for handling malformed requests
    Wrote tests
    Raise httpBadRequest on malformed request bodies

 nova/api/openstack/wsgi.py           |   16 +++++++++++++---
 nova/exception.py                    |    4 ++++
 nova/tests/api/openstack/test_api.py |   21 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

commit 5823559b841e75a962bf467b913136f1c7f750a8
Merge: 035e43f 431b9d5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 13:42:46 2011 +0000

    Fixed bug 796619

commit 00071a6e0bd9bf70d7e7afd1656fea39d5149e68
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jun 14 01:21:08 2011 +0000

    Adds --show-elapsed option for run_tests

 run_tests.py |   80 +++++++++++++++++++++++++++++++++++++++++++++-------------
 run_tests.sh |    1 +
 2 files changed, 63 insertions(+), 18 deletions(-)

commit f3381ee03355d8800d229efb7f799df9e6c915e2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 21:14:26 2011 -0400

    pep8

 nova/api/openstack/limits.py                      |    2 +-
 nova/compute/api.py                               |    2 +-
 nova/tests/scheduler/test_host_filter.py          |    8 ++++----
 nova/tests/scheduler/test_least_cost_scheduler.py |    8 ++++----
 nova/tests/scheduler/test_zone_aware_scheduler.py |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

commit 98fb2c9388ea4f4221d7557653a3bd732dbd3f32
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 13 19:57:35 2011 -0400

    Alias of volumes extension should be OS-VOLUMES

 nova/api/openstack/contrib/volumes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63ebc5897ad81e68a44f894a86c3730c040c6b03
Merge: d9c2a71 035e43f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 13 21:48:16 2011 +0000

    Merge with trunk

commit 035e43fbcc39d5664592873629f0689309c102cf
Merge: 1541e9a c2ed916
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 21:16:45 2011 +0000

    Illustrations now added to Distributed Scheduler documentation (and fixed up some formatting)

commit d9c2a7112ba239fb64ecc76ce844caed9146a5dc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 13 20:46:25 2011 +0000

    Load table schema automatically instead of stubbing out

 .../versions/023_add_vm_mode_to_instances.py       |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 1541e9a58be195457906042b31bf1fe68f50667d
Merge: 9eb2b52 bebeaa6
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 13 20:43:12 2011 +0000

    Removed clocksource=jiffies from PV_args.

commit 2f422747cc7ffcbbe952e9a3fb5fd1de6a417901
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jun 13 16:41:31 2011 -0400

    Test now passes even if the rpc call does not complete on time

 nova/tests/test_cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9eb2b52946be78428f6ee565f8b29e6ee9102a8c
Merge: 06591f1 befc7bc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 20:26:10 2011 +0000

    - fixes bug that prevented custom wsgi serialization

commit bebeaa6b0bf69c0a4017d429e79174401df28550
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 13 15:20:43 2011 -0500

    Removed clocksource=jiffies from PV_args.

 nova/tests/test_xenapi.py    |    2 +-
 nova/virt/xenapi/vm_utils.py |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit befc7bcc88547916ab59d5fec5e8dd6e01ccf49f
Merge: 83df6e5 06591f1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 16:00:14 2011 -0400

    merging trunk, fixing pep8

commit 431b9d52f2eb325c8be90d45d102c9e238d02325
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 15:24:02 2011 -0400

    pep8

 nova/tests/test_crypto.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit bdfded59fda6716adbbcf981a45d1ed90aa23f89
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 15:18:55 2011 -0400

    Improved tests

 nova/tests/test_crypto.py |   46 +++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

commit 83df6e50fa90620dd7510e1a06d9128d4de7cb29
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 15:08:00 2011 -0400

    removing unnecessary lines

 nova/api/openstack/wsgi.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit f2ca12fc5ea236bb8940acce80065a3bcbe37d2a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 15:03:26 2011 -0400

    wsgi can now handle dispatching action None more elegantly

 nova/api/openstack/wsgi.py            |   13 ++++++-------
 nova/tests/api/openstack/test_wsgi.py |   13 +++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

commit a2cf08c84bc9c4113911534cfe3d4460b56d4124
Merge: 0c2a7a9 06591f1
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 13 14:11:23 2011 -0400

    Merge trunk

commit 06591f13dcf130d8fb035466bfbe5650acfddb28
Merge: 91e34d3 4881309
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 13 18:06:20 2011 +0000

    This fixes the server_metadata create and update functions that were returning req.body (as a string) instead of body (deserialized body dictionary object).  It also adds checks where appropriate to make sure that body is not empty (and return 400 if it is).  Tests updated/added where appropriate.

commit e7e501a1a77f01247d84fa88275e858a338c6c95
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 10:59:58 2011 -0700

    removed yucky None return types

 nova/api/openstack/create_instance_controller.py |   16 ++++++++++++----
 nova/api/openstack/servers.py                    |   11 +++++++----
 nova/api/openstack/zones.py                      |    8 +++++---
 3 files changed, 24 insertions(+), 11 deletions(-)

commit 7c68bb817224bb608e2d0c92e1b00384ca7284df
Merge: 8cc17d5 91e34d3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 12:54:43 2011 -0400

    merging trunk

commit 276ecb29455acbbf82bbf99ce2b522eba44a0acc
Merge: db3280e 91e34d3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 09:43:41 2011 -0700

    trunk merge

commit db3280e5177df92484bf0a52b5f6ed89dfea63dd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 09:39:58 2011 -0700

    zones image_id/image_href support for 1.0/1.1

 nova/api/openstack/__init__.py                   |    8 ++++----
 nova/api/openstack/create_instance_controller.py |    2 --
 nova/api/openstack/servers.py                    |    2 --
 nova/api/openstack/zones.py                      |   19 +++++++++++--------
 4 files changed, 15 insertions(+), 16 deletions(-)

commit 481c7be1834527053ffea4297230475518f6f8d7
Merge: e68174e 8185703
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 13 16:25:54 2011 +0100

    Merge trunk
    Adapting code to changes in fetch_image

commit 2ee3d49e6c35515b9ef9d78365c3bc0ec9236b4b
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 13 11:06:25 2011 -0400

    Update xenapi/vm_utils.py so that it calls find_sr instead of get_sr.
    Remove the old get_sr function which by default looked for an SR named 'slices'.

 nova/virt/xenapi/vm_utils.py |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

commit 67e11fa809c83f25af9d09eac1bbe1c69a22a311
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 10:10:45 2011 -0400

    fixed bug 796619

 nova/crypto.py            |    3 +-
 nova/tests/test_crypto.py |   69 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

commit 48813099bf88a7314b396d5e04beca9a6fc3ba7c
Merge: bd31a85 91e34d3
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 13 08:54:21 2011 -0400

    merge trunk

commit bd31a85575ce53dfa80f414dd359b3bdb2855292
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 13 08:53:34 2011 -0400

    check for none and empty string, this way empty dicts/lists will be ok

 nova/api/openstack/server_metadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 73303a34652c738064821ede0258a799435c63d1
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Jun 11 22:12:59 2011 -0400

    Updated so that we use a 'tmp' subdirectory under the Xen SR when staging
    migrations. Fixes an issue where you would get a 'File exists' error because
    the directory under 'images' already existed (created via the rsync copy).

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a6aeacfedfd5e666e109b54c5c03908eeb47c31
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 18:38:44 2011 -0400

    fix method chaining in database layer to pass right parameters.

 nova/db/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ed3914eafa7d076fdcc03ee958f77528bcf20603
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 18:03:45 2011 -0400

    Add a method to delete provider firewall rules.

 nova/api/ec2/admin.py     |   12 ++++++++++++
 nova/db/api.py            |   10 ++++++++++
 nova/db/sqlalchemy/api.py |   21 +++++++++++++++++++++
 3 files changed, 43 insertions(+)

commit d1b6ebb4009e13ac2cf2309275a66a634e4f9171
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 16:42:58 2011 -0400

    Add ability to list ip blocks.

 nova/api/ec2/admin.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 27fb2cf245ae87282f3aefdf2ae4740866529101
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 15:14:46 2011 -0400

    pep 8 whitespace fix.

 nova/tests/test_libvirt.py |    1 -
 1 file changed, 1 deletion(-)

commit 90b3f8eb676681afa491c8bac85a45fdc87b099b
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 14:50:21 2011 -0400

    Move migration.

 .../versions/021_add_provider_fw_rules.py          |   75 --------------------
 .../versions/023_add_provider_firewall_rules.py    |   75 ++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)

commit 85bfd9592f8a49d2a730e64f9bf58e395d8965c7
Merge: 0bcb153 91e34d3
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 14:46:08 2011 -0400

    Merge and resolve.

commit 09bd503a9842857480bd4703d27335e83dd30571
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Jun 11 19:48:48 2011 +0900

    block migration feature added

 bin/nova-manage                        |   36 +++++++++-
 nova/compute/manager.py                |   55 +++++++++++---
 nova/db/api.py                         |   21 ------
 nova/db/sqlalchemy/api.py              |   39 ----------
 nova/db/sqlalchemy/models.py           |   16 ++---
 nova/exception.py                      |    5 ++
 nova/scheduler/driver.py               |  120 ++++++++++++++++++++++++-------
 nova/scheduler/manager.py              |   54 +++++++-------
 nova/tests/scheduler/test_scheduler.py |   52 ++++++++++----
 nova/tests/test_compute.py             |    6 +-
 nova/tests/test_libvirt.py             |   90 +++++++++++++++++++++++
 nova/virt/libvirt/connection.py        |  122 ++++++++++++++++++++++++++------
 12 files changed, 449 insertions(+), 167 deletions(-)

commit 0bcb15317fede5c17c77c187e1cd9a68a0c8030c
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 10 22:32:33 2011 -0400

    Reorder firewall rules so the common path is shorter.

 nova/virt/libvirt/firewall.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 91e34d37d2907295e892e96ca2c3039c7fbe14bf
Merge: 8e6fabd 05fecdf
Author: John Tran <jhtran@att.com>
Date:   Sat Jun 11 01:31:10 2011 +0000

    ec2 api method allocate_address ; raises exception.NoFloatingIpsDefined instead of UnknownError when there aren't any floating ips available.

commit 8e6fabd481520b46b47d2f9f9a9c9dfa200f5866
Merge: cf0122f e986887
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 23:28:12 2011 +0000

    in XML Serialization of output, the toprettyxml() call would sometimes return a str() and sometimes unicode(), I've forced encoding to utf-8 to ensure that we always get str().  This fixes the related bug.

commit cf0122fde089e8cf5af94508976d8de053248218
Merge: 69809e7 fbf3f36
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jun 10 23:15:51 2011 +0000

    A recent commit added a couple of directories that don't belong in version control. Remove them again.

commit 8146b92f7d81eada6408f939ef25cb5393650008
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 10 18:39:58 2011 -0400

    adding support for cusom serialization methods

 nova/api/openstack/wsgi.py            |   11 +++++++----
 nova/tests/api/openstack/test_wsgi.py |    8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

commit 1f430f7dd8e8e5af639d91048237048bdf8f21a9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 16:58:35 2011 -0500

    forgot a comma

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 878468db557b4498528d57804a1808388d7993ec
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 16:55:27 2011 -0500

    floating ips can now move around the network hosts

 bin/nova-manage           |   12 ++++++------
 nova/db/sqlalchemy/api.py |    4 +++-
 nova/network/manager.py   |    2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

commit fbf3f36bd2693ea0570af83a8ff68d433230fa80
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jun 10 22:51:57 2011 +0200

    A recent commit added a couple of directories that don't belong in version control. Remove them again.

commit 3a83aaf4f14ac25dee8b5a84779a61ca4633012a
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:49:03 2011 +0400

    'network list' prints project id

 bin/nova-manage |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit cbaa94ac255cde729bae3257da6657a114755224
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 16:43:13 2011 -0400

    got rid of prints for debugging

 nova/api/openstack/wsgi.py |    4 ----
 1 file changed, 4 deletions(-)

commit 8ded8e4bde3825efc8a886aad40d54d0c9d126dc
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:42:44 2011 +0400

    small pep8 fixes

 bin/nova-manage         |    6 +++---
 nova/network/manager.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 92423564aa24124b0144264d6cd1c57c78eaf5dd
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 16:41:14 2011 -0400

    return body correctly as object instead of a string, with tests, also check for empty body on requests that need a body

 nova/api/openstack/server_metadata.py            |   11 ++++++++--
 nova/api/openstack/wsgi.py                       |    4 ++++
 nova/tests/api/openstack/test_server_metadata.py |   25 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

commit 781f3f07ebc3236404e33189e0a76cbb877dff18
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 10 16:35:35 2011 -0400

    adding xml support to /images/<id>/meta resource; moving show/update entities into meta container

 nova/api/openstack/image_metadata.py            |   58 +++++++++++--
 nova/api/openstack/wsgi.py                      |    8 +-
 nova/tests/api/openstack/test_image_metadata.py |  103 +++++++++++++++++++++--
 3 files changed, 155 insertions(+), 14 deletions(-)

commit 8de8ed78c2d3d6ca8342134234e0cc361611de54
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:30:30 2011 +0400

    removed posargs decorator, all methods decorated

 bin/nova-manage |  146 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 126 insertions(+), 20 deletions(-)

commit 69809e7c320cf09069b6ad7c06fe5fbc409af448
Merge: 50c9ebf 361fd76
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 10 20:26:10 2011 +0000

    Allows Nova to talk to multiple Glance APIs (without the need for an external load-balancer). Chooses a random Glance API for each request.

commit a442e9d3fb00b9a39b39586f1d3752b4f96dee8a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 15:01:58 2011 -0500

    forgot a comma

 nova/tests/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b425aa0c49aba5d52250d3b7d0cd282464a32141
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 14:57:02 2011 -0500

    misc argument alterations

 nova/compute/api.py          |    3 +--
 nova/db/sqlalchemy/models.py |   28 ++++++++++++++--------------
 nova/network/manager.py      |    2 +-
 nova/tests/__init__.py       |    6 ++++--
 4 files changed, 20 insertions(+), 19 deletions(-)

commit e986887d513855d5a5fd6ca90998860f67fcb1d3
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 15:28:17 2011 -0400

    force utf-8 encoding on toprettyxml call for XMLDictSerializer

 nova/api/openstack/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05fecdf873a5c02dcb13c841304df872411d4183
Author: John Tran <jhtran@att.com>
Date:   Fri Jun 10 11:10:58 2011 -0700

    added new exception more descriptive of not having available floating addresses avail for allocation

 nova/api/ec2/cloud.py    |    2 +-
 nova/exception.py        |    4 ++++
 nova/tests/test_cloud.py |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

commit 0e7a2042cc5922bb014a77080ec0bdb93bbf575c
Author: John Tran <jhtran@att.com>
Date:   Fri Jun 10 10:28:03 2011 -0700

    raise instance instead of class

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a86523d5ae17b4e5507b14fade0a87c5434f2cac
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 10 17:26:25 2011 +0000

    Fix copyright year

 .../versions/023_add_vm_mode_to_instances.py       |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e763a0ac8981bdbee44c054c6be08b9f1a5d634d
Author: John Tran <jhtran@att.com>
Date:   Fri Jun 10 10:24:24 2011 -0700

    style change

 nova/tests/test_cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit febb7130192afcc77408643b5bba595c784671d3
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 10 16:53:06 2011 +0200

    Only update updateable fields

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8cc17d57a9645c9bed6eebe5d6b3bbc3ffdea13e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 10 10:12:57 2011 -0400

    removing LocalImageService from nova-manage

 bin/nova-manage |   11 -----------
 1 file changed, 11 deletions(-)

commit f9327a8930b68cbeee212c55c687de9dd8029377
Merge: 50c9ebf 3f69522
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 10 17:42:24 2011 +0400

    rebase from trunk

commit 3f69522284833a52373ccf1e1006d9b2f20ccb06
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 10 17:33:54 2011 +0400

    decorators for action methods added

 .bzrignore      |    3 +++
 bin/nova-manage |   37 ++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

commit c2ed9160e9aba986e98a32514cb27ab34be9bf0c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 10 09:48:17 2011 -0300

    source illustrations added & spelling/grammar based on comstud's feedback

 doc/source/devref/distributed_scheduler.rst        |   16 ++++++++++------
 doc/source/devref/zone.rst                         |    4 ++--
 .../image_src/zones_distsched_illustrations.odp    |  Bin 0 -> 182810 bytes
 3 files changed, 12 insertions(+), 8 deletions(-)

commit 1261d1340631206c8d47c6373ebd783e75f389ac
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 10 05:27:05 2011 -0700

    fixed reraise in trap_error

 nova/scheduler/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 810b580cb41b076b083ace1c4670c13b2f16c5a5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 16:19:24 2011 -0700

    forgot some debugging statements

 nova/api/openstack/create_instance_controller.py |    8 --------
 nova/api/openstack/servers.py                    |    3 ---
 nova/compute/api.py                              |    1 -
 nova/image/__init__.py                           |    2 --
 4 files changed, 14 deletions(-)

commit c6ba1bb5035cb1ea4cb2b86ee56797c4dac63983
Merge: 16f0aef 50c9ebf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 16:16:55 2011 -0700

    trunk merge and ec2 tests fixed

commit 61f539dfd3f1f13a775ec837da5646ef16c270d7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 22:06:09 2011 +0000

    Add some docstrings for new agent build DB functions

 nova/db/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit fa0b64b500f3a196044459ba4bf8ed0dea214e92
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 22:04:32 2011 +0000

    Add test for agent update

 nova/compute/manager.py    |   18 ++++++++++++++++++
 nova/tests/test_compute.py |    8 ++++++++
 nova/virt/driver.py        |    4 ++++
 nova/virt/fake.py          |   15 +++++++++++++++
 4 files changed, 45 insertions(+)

commit fdb1e0e788398e1a29d08d6030709280ca93185c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 21:52:05 2011 +0000

    Multiple position dependent formats and internationalization don't work well
    together

 nova/virt/xenapi/vmops.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 361fd763eb0cf3e62e0184dafd0f4a024e1871f5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 21:50:34 2011 +0000

    Adding caveat

 nova/image/glance.py |    4 ++++
 1 file changed, 4 insertions(+)

commit e307bf5dd60dc84587f76d88956499ee1f1013fb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 21:36:20 2011 +0000

    Fixing code per review comments

 nova/flags.py                   |    4 ++--
 nova/image/glance.py            |    7 +++++--
 nova/tests/image/test_glance.py |    9 +--------
 nova/virt/images.py             |   12 ------------
 nova/virt/xenapi/vm_utils.py    |    3 ++-
 5 files changed, 10 insertions(+), 25 deletions(-)

commit 7ae2b21c476099faca0b8279e4b2d8e3df88a9eb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 9 16:31:14 2011 -0500

    removed fixed_ips virtual_interface_id foreignkey constraint from multi_nic migration, and added it as a standalone migration with special sqlite files

 .../migrate_repo/versions/023_multi_nic.py         |   31 ++---------
 .../024_fk_fixed_ips_virtual_interface_id.py       |   56 ++++++++++++++++++++
 .../migrate_repo/versions/024_sqlite_downgrade.sql |   48 +++++++++++++++++
 .../migrate_repo/versions/024_sqlite_upgrade.sql   |   48 +++++++++++++++++
 4 files changed, 157 insertions(+), 26 deletions(-)

commit f732831bf4f0c5581b28322d76fb13a17cd65839
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 20:11:55 2011 +0000

    Record architecture of image for matching to agent build later.
    Add code to automatically update agent running on instance on instance
    creation.

 bin/nova-manage                                    |   45 +++++++++++
 nova/compute/api.py                                |    6 +-
 nova/db/api.py                                     |   23 ++++++
 nova/db/sqlalchemy/api.py                          |   50 +++++++++++++
 .../migrate_repo/versions/023_add_agent_table.py   |   78 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   15 +++-
 nova/virt/xenapi/vmops.py                          |   68 +++++++++++++++++
 7 files changed, 283 insertions(+), 2 deletions(-)

commit 1392d885e650e06937846d536ebb11b91d0adc75
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 20:10:02 2011 +0000

    Add version and agentupdate commands

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

commit d764a483497afc5d029a82db14cc5cc88f45f4c0
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jun 9 19:43:48 2011 +0000

    Add an extension to allow for an addFixedIp action on instances

 nova/api/openstack/contrib/multinic.py |   83 ++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

commit 249279cd7c70a7306ed28a62939477ef94ecbc91
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 9 15:31:10 2011 -0400

    further changes

 nova/api/openstack/notes.txt         |    3 ---
 nova/flags.py                        |    2 +-
 nova/virt/vmwareapi/vmware_images.py |    6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)

commit 16f0aef6706139b5fba9338dfb971fa012eeb52b
Merge: e5fdcc3 dcb0d38
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 11:52:53 2011 -0700

    tests working after merge-3 update

commit 467bda72a05a0fd9fa4d7d417da422eea04de220
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 18:51:21 2011 +0000

    022 migration has already been added, so make ours 023 now

 .../versions/022_add_vm_mode_to_instances.py       |   43 --------------------
 .../versions/023_add_vm_mode_to_instances.py       |   43 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)

commit a16d91ea002e3b45b9e3322d18a425a0fc3a5d03
Merge: f20c73b 50c9ebf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 18:50:41 2011 +0000

    Merge with trunk

commit f53e7d16181e0a7141956d835f71c09d76508c2d
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Thu Jun 9 22:02:01 2011 +0400

    parse options with optparse, options prepended '--'

 bin/nova-manage |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit d5ff85279a8516c0a29882a133c6f6644cbe4b6d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 9 12:05:51 2011 -0500

    renamed migration again

 .../migrate_repo/versions/022_multi_nic.py         |  151 --------------------
 .../migrate_repo/versions/023_multi_nic.py         |  151 ++++++++++++++++++++
 2 files changed, 151 insertions(+), 151 deletions(-)

commit 982f101c4af459820e5358bcfae54dd6b34e828c
Merge: 71ad924 e95703e
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jun 9 16:43:53 2011 +0000

    Pull-up from multi_nic

commit e95703ee9c358f3e0ef35b79735a4848f43fd888
Merge: 71ad924 02f9b1c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 9 11:39:03 2011 -0500

    merged koelkers tests branch

commit 4d422639ca03cbccdc8dd2d9ac1ee363b21909c7
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 9 11:37:46 2011 -0500

    remove file that keeps popping up

commit be9b25b225d2b4c25e1b977e1e4b8166b3dacaf4
Merge: eda8a1a 50c9ebf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 14:43:46 2011 +0000

    Merging trunk

commit eda8a1aaa2cf7cc31c7fda4723849feee3bc6766
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 14:43:24 2011 +0000

    Fixing the tests

 nova/image/glance.py            |   12 ++++++++++--
 nova/tests/image/test_glance.py |   11 ++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

commit 463e0388308760dbf3bf2b3fa901d8076d002f91
Author: John Tran <jhtran@att.com>
Date:   Thu Jun 9 00:01:42 2011 -0700

    matched the inner exception specifically, instead of catching all RemoteError exceptions

 nova/api/ec2/cloud.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 8096ee6c79c608fd84e016d5da7663549a95896f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 03:35:59 2011 +0000

    Support multiple glance-api servers

 nova/flags.py                |    6 ++++--
 nova/image/__init__.py       |    7 ++++++-
 nova/image/glance.py         |   24 +++++++++++++++++-------
 nova/virt/images.py          |    7 +++++--
 nova/virt/xenapi/vm_utils.py |   13 +++++++++----
 5 files changed, 41 insertions(+), 16 deletions(-)

commit 0c2a7a99dc55a7a199ef9c90895da914de2a9856
Merge: 22ffa88 50c9ebf
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jun 8 22:05:09 2011 -0400

    Merged trunk

commit 22ffa88cc7d030e915d3aac051dd540ab6ea70a5
Merge: 0c3c0ef 8ff87c6
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jun 8 22:03:48 2011 -0400

    Fix merge conflict

commit b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 8 17:17:40 2011 -0700

    removing custom exception, instead using NoFloatingIpsDefined

 nova/api/ec2/__init__.py |    6 ------
 1 file changed, 6 deletions(-)

commit 3764be9d65483a9e431b69f37e3516fa20961362
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 8 17:15:35 2011 -0700

    raises exception.NoFloatingIpsDefined instead of UnknownError

 nova/api/ec2/cloud.py    |    8 ++++++--
 nova/tests/test_cloud.py |    3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

commit f20c73bbe395a93c087562966b10ade3c9f32afc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 8 22:28:28 2011 +0000

    Normalize and update database with used vm_mode

 nova/virt/xenapi/vmops.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 70e4d73778d448cb7f122bc0a2a0c43a78fff46a
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 8 15:23:33 2011 -0700

    added a test for allocate_address & added error handling for api instead of returning 'UnknownError', will give information 'AllocateAddressError: NoMoreAddresses

 nova/api/ec2/__init__.py |    6 ++++++
 nova/tests/test_cloud.py |   10 ++++++++++
 2 files changed, 16 insertions(+)

commit 71ad924b1e8bfdefaaac3dd533dc14d83b2ab7bd
Merge: d7925b3 50c9ebf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 14:52:05 2011 -0500

    merged trunk again

commit d7925b3890f651b3f6fd002a45b2add86e388d10
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 14:46:31 2011 -0500

    updated docstring for nova-manage network create

 bin/nova-manage               |    3 +++
 nova/db/api.py                |    4 ++--
 nova/db/sqlalchemy/api.py     |    9 ++++-----
 nova/network/manager.py       |   14 +++++---------
 nova/tests/db/fakes.py        |    6 +++---
 nova/virt/libvirt/netutils.py |    3 +--
 6 files changed, 18 insertions(+), 21 deletions(-)

commit 50c9ebfdc00a87d1a37a11501e5678de89e25a4f
Merge: 356b9bd dcb0d38
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 19:07:26 2011 +0000

    Now forwards create instance requests to child zones.
    Refactored nova.compute.api.create() to support deferred db entry creation.
    
    NOTE: created instances using the ZoneAwareScheduler result in two db entries: one in the parent zone, one in the child zone. This will be fixed in the next branch which will deal with reservation ID's and a new POST /zone/server OS API command. All the other schedulers work as advertised.

commit 356b9bdc0c90d42290147a86c487a2563807d0ec
Merge: d9cb8f7 2494867
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Wed Jun 8 19:01:27 2011 +0000

    MySQL database tables are currently using the MyISAM engine. Created migration script nova/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py to change all current tables to InnoDB.

commit a538fceb8cf6d692db0e3585b99ed10a17197960
Merge: 0438855 405945a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 13:27:00 2011 -0500

    merged trunk again

commit d9cb8f711af21ca4423f6bff9b9f61c7356e7ac7
Merge: 259e725 f786c11
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 8 18:16:10 2011 +0000

    Support for header "X-Auth-Project-Id" in osapi.

commit 259e725ee994fec83c177ca91c02bed8486b37d6
Merge: 405945a b91ff45
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 18:06:26 2011 +0000

    Cleaned up some pylint errors

commit e5fdcc315cc8c3993f0c37078cf4c89cacc34106
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 11:04:41 2011 -0700

    tweaks

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f786c112ce4753dfc1838eecbfc5a20314a5e35d
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 8 21:58:59 2011 +0400

    PEP8 fix.

 nova/tests/api/openstack/test_auth.py |    1 +
 1 file changed, 1 insertion(+)

commit 0438855659d89133e588dd4201956a901ed85787
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 12:41:09 2011 -0500

    removed network_info shims in vmops

 nova/api/ec2/cloud.py                              |    2 +-
 nova/compute/manager.py                            |   16 +-
 nova/db/api.py                                     |   64 +++---
 nova/db/sqlalchemy/api.py                          |  213 ++++++++++----------
 .../migrate_repo/versions/022_multi_nic.py         |   65 +++---
 nova/db/sqlalchemy/models.py                       |   20 +-
 nova/exception.py                                  |   12 +-
 nova/network/linux_net.py                          |    4 +-
 nova/network/manager.py                            |   77 +++----
 nova/virt/xenapi/vmops.py                          |   70 +------
 nova/virt/xenapi_conn.py                           |    4 +-
 11 files changed, 248 insertions(+), 299 deletions(-)

commit 405945ad4801a9e434bcf9292bc01db354a9f2a7
Merge: f83011a d4742cf
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 17:40:20 2011 +0000

    Fix for bug#794239 to allow pep8 in run_tests.sh to use the virtual environment

commit f83011a8046afc7f84dbfc08b3610bc942aefed2
Merge: 8ff87c6 a909743
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 8 17:36:09 2011 +0000

    adding Authorizer key for ImportPublicKey

commit 3da61c0b225f824025f617f0a88f72c00e31b83e
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 21:03:52 2011 +0400

    fix exception type catched

 nova/tests/api/openstack/fakes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a66ae006e0a6103ee6db49ad2b8dc4506969178e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 8 15:45:23 2011 +0000

    Look for vm_mode property on images and use that if it exists to determine if
    image should be run in PV or HVM mode. If it doesn't exist, fall back to
    existing logic

 nova/compute/api.py                                |    6 ++-
 .../versions/022_add_vm_mode_to_instances.py       |   43 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/virt/xenapi/vmops.py                          |   11 +++--
 4 files changed, 57 insertions(+), 4 deletions(-)

commit dcb0d38aa829e1e2492defffaf6ad393b809289b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 08:13:23 2011 -0700

    removed straggler code

 nova/compute/api.py |    5 -----
 1 file changed, 5 deletions(-)

commit ad850e36f06569e22ef4d48be910c2372390f8e9
Merge: 225c8cb 8ff87c6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 07:12:12 2011 -0700

    trunk merge

commit b91ff4561b1c929718dd7a92bb8d8ebc7c841b38
Merge: a605905 8ff87c6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 09:28:04 2011 -0400

    merge trunk

commit a605905c11d8898e8cc15e830c17de3ce8c80fda
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 09:21:38 2011 -0400

    pep8

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb308603a05915aa486a790267b4b3cc9dbdd624
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 08:59:28 2011 -0300

    removed autogen file

 doc/.autogenerated | 3559 ----------------------------------------------------
 1 file changed, 3559 deletions(-)

commit 03ef0d1091cc1b6d9c3049b1d7b8cfae0019631e
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 13:52:02 2011 +0400

    added field NOVA_PROJECT_ID to template for future using

 nova/auth/novarc.template |    1 +
 1 file changed, 1 insertion(+)

commit f93717c7d74b24311c04f66b9e710322510d0ed2
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 13:50:33 2011 +0400

    added tests for X-Auth-Project-Id header

 nova/tests/api/openstack/test_auth.py |   64 +++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

commit 49dcee9ac6a4f78cb021181d5310541d9a42fafd
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 13:49:00 2011 +0400

    fix fake driver for using string project

 nova/tests/api/openstack/fakes.py |    5 +++++
 1 file changed, 5 insertions(+)

commit a90974347dd396990d8e6fadeac15abd07cb19ea
Author: John Tran <jhtran@att.com>
Date:   Tue Jun 7 14:36:40 2011 -0700

    adding Authorizer key for ImportPublicKey

 nova/api/ec2/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit 8ff87c649e13e21ba968ec85a1158230e8cf118d
Merge: 762afdd 641f16a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 21:25:33 2011 +0000

    Cleaned up some of the larger pylint errors. Set to ignore some lines that pylint just couldn't understand.

commit 762afdd426c35d1fc82cb7a17683a50ff21e717e
Merge: 11b9bb6 8f93aa5
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jun 7 21:20:55 2011 +0000

    DRY up the image_state logic. Fix an issue where glance style images (which aren't required to have an 'image_state' property) couldn't be used to run instances on the EC2 controller.

commit 02f9b1c0f9265a644fabcd5d0c5c6071fc65390f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:40:24 2011 -0500

    remove the debuging lines

 nova/network/manager.py |    2 --
 1 file changed, 2 deletions(-)

commit 544d92d19ff074a7585e9d8a8ab8bfc3bc63dacf
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:39:36 2011 -0500

    remove the old stuff

 nova/tests/network/old_base.py      |  153 ---------------------
 nova/tests/old_test_flat_network.py |  166 -----------------------
 nova/tests/old_test_vlan_network.py |  250 -----------------------------------
 3 files changed, 569 deletions(-)

commit 773de46328779125fe6db4b805cbe05f76f5ca96
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:35:39 2011 -0500

    tests all pass

 nova/network/manager.py    |    3 +-
 nova/tests/db/fakes.py     |   78 +++++++++++++++++++++++++++++---------------
 nova/tests/network/base.py |   31 ++++++++++++++----
 nova/tests/test_network.py |    4 +--
 4 files changed, 80 insertions(+), 36 deletions(-)

commit d4742cf8505ff86a4732f8d198fe6cedf260898e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 16:08:25 2011 -0400

    Added virtual environment to PEP8 tests

 run_tests.sh |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 8f93aa59aca5440a4d9668942703bf235379ed59
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jun 7 16:05:03 2011 -0400

    Added test_run_instances_image_status_active to test_cloud.

 nova/tests/test_cloud.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 11b9bb69513686015067a6405f343c1be508a5eb
Merge: 3aad675 aa343c9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 7 19:20:54 2011 +0000

    Add the option to specify a default IPv6 gateway.

commit 641f16a5343ca5d95ea10ec5031a27a7f131c337
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 15:17:34 2011 -0400

    pep8

 nova/api/direct.py |    2 +-
 nova/utils.py      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit b7556544d222741c9bc0d312ae75ab5f84b4cd2d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 14:48:13 2011 -0400

    Removed use of super

 nova/api/openstack/versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 22c71e27cef8131c8432b57d5965bd14e5300428
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 7 15:36:43 2011 -0300

    Added illustrations for Distributed Scheduler and fixed up formatting

 doc/.autogenerated                                 | 3276 ++++++++++++++++++++
 doc/source/devref/distributed_scheduler.rst        |   90 +-
 doc/source/images/costs_weights.png                |  Bin 0 -> 35723 bytes
 doc/source/images/dating_service.png               |  Bin 0 -> 31945 bytes
 doc/source/images/filtering.png                    |  Bin 0 -> 18779 bytes
 doc/source/images/nova.compute.api.create.png      |  Bin 0 -> 50171 bytes
 .../images/nova.compute.api.create_all_at_once.png |  Bin 0 -> 62263 bytes
 doc/source/images/zone_aware_overview.png          |  Bin 0 -> 56142 bytes
 doc/source/images/zone_aware_scheduler.png         |  Bin 0 -> 20902 bytes
 9 files changed, 3329 insertions(+), 37 deletions(-)

commit d920e7f53e59b1def67f7528dd6b6bcf35ba96b4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 14:33:01 2011 -0400

    Disabled pylint complaining about no 'self' parameter in a decorator function

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8d6740fefcac3734021edaf53a40ecb145ccaa3
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jun 7 13:47:40 2011 -0400

    DRY up the image_state logic. Fix an issue where glance style images (which aren't required to have an 'image_state' property) couldn't be used to run instances on the EC2 controller.

 nova/api/ec2/cloud.py |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

commit c680176d11edb46a28ba065f0548e18cbf1297d5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 13:32:53 2011 -0400

    Fixed incorrect error message
    Added missing import
    Fixed Typo (pylint "undefined variable NoneV")

 nova/compute/instance_types.py |    2 +-
 nova/compute/monitor.py        |    1 +
 nova/console/vmrc.py           |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

commit 87c5fce9ac9a64b266aabbeb80bc24dc5e5dafb3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 7 13:32:06 2011 -0400

    removing local image service

 nova/image/fake.py                      |    8 ++
 nova/image/local.py                     |  167 -------------------------------
 nova/tests/api/openstack/fakes.py       |    1 -
 nova/tests/api/openstack/test_images.py |   30 ------
 nova/tests/fake_flags.py                |    2 +-
 nova/tests/test_cloud.py                |   30 +++---
 nova/tests/test_compute.py              |   14 +--
 7 files changed, 31 insertions(+), 221 deletions(-)

commit aa343c994c4738374bd91531ae2e260175690a56
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 7 11:45:25 2011 -0500

    Remove unnecessary docstrings.

 bin/nova-manage |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 7bae412d230171baf1ba7bec7262705404d1ed7f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 7 10:47:14 2011 -0500

    Add the option to specify a default IPv6 gateway.

 bin/nova-manage         |   13 +++++++++----
 nova/network/manager.py |   11 +++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

commit 9ecb75219ca1abb900460883c813d560b0580200
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 10:41:58 2011 -0500

    port the floating over to storing in a list

 nova/tests/db/fakes.py |   66 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 21 deletions(-)

commit 3aad6758c0acc9b05f6f895fb814cced9580b758
Merge: a94992f 8747611
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Jun 7 15:25:59 2011 +0000

    Make libvirt snapshotting work with images that don't have an 'architecture' property.

commit 325d602160cb6a27801777a28d034412ef9ebaeb
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 10:22:41 2011 -0500

    take out the host

 nova/db/sqlalchemy/api.py |    3 +--
 nova/network/manager.py   |    1 -
 nova/tests/db/fakes.py    |    3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

commit 8747611e4bd69b6da204b2c021fd5400c961db1d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 7 10:47:29 2011 -0400

    Removed empty init

 nova/tests/test_libvirt.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 0c3c0ef6e0604e24ab3f2ec25554a867fe64bd45
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jun 7 10:39:30 2011 -0400

    Use IPNetwork rather than IPRange

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f0c4767dc14f950f7d18cc02e16e4d310774435d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 09:56:51 2011 -0400

    Fixed type causing pylint "exception is not callable"
    Added param to fake_instance_create, fake objects should appear like the real object. pylint "No value passed for parameter 'values' in function call"

 nova/tests/test_vmwareapi.py     |    2 +-
 nova/tests/vmwareapi/db_fakes.py |    2 +-
 nova/virt/xenapi/vmops.py        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 225c8cb8843de17abe192b5efc7c0bd9db0b4d75
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 6 19:05:31 2011 -0700

    sanity check

 nova/api/openstack/zones.py            |    1 -
 nova/scheduler/zone_aware_scheduler.py |    1 +
 nova/tests/api/openstack/test_zones.py |    2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

commit a94992f199edd37ae3efd68c618b19c2ebab1a88
Merge: 90d6bf7 81099d6
Author: John Tran <jhtran@att.com>
Date:   Tue Jun 7 01:30:59 2011 +0000

    run_instances will check image for 'available' status before attempting to create a new instance

commit 727317333978ac5cf0fb1cd3f86e49e9868f1e19
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 6 17:58:40 2011 -0700

    fixed up tests after trunk merge

 nova/api/openstack/zones.py            |   13 ++++---------
 nova/compute/api.py                    |   10 +++++-----
 nova/tests/api/openstack/test_zones.py |    3 +++
 3 files changed, 12 insertions(+), 14 deletions(-)

commit 90d6bf769dba648bb17cb2f6588fc1e65e325f37
Merge: 1eb7896 e745c21
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 6 22:35:45 2011 +0000

    Use True/False instead of 1/0 when setting updating 'deleted' column attributes. Fixes casting issues when running nova with Postgres.

commit 81099d63d6ff30b21116f7f0e5c782abadf0ab90
Merge: 5d89721 4d50e84
Author: John Tran <jhtran@att.com>
Date:   Mon Jun 6 14:37:30 2011 -0700

    merged from trunk

commit 4b0b0361ed8d231844344d014412f7b647baae0b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:05:28 2011 -0400

    Remove more stray import IPy

 nova/tests/network/base.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9effe34506c5a23f21b9132ff97a2217b0c99735
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:04:12 2011 -0400

    Dropped requirement for IPy

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit de42ebea7a8d055caeddd40edcdcaa6d64f1548e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:03:50 2011 -0400

    Convert stray import IPy

 nova/tests/test_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e745c21724e5990874a12c4abff53127755185ea
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 6 16:08:58 2011 -0400

    Use True/False instead of 1/0 when setting updating 'deleted' column attributes.Fixes casting issues when running nova with Postgres.

 nova/db/sqlalchemy/api.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 57df676a3302f8d754ef54e415d2fd82a4291f49
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 15:59:39 2011 -0400

    Removed commented code

 nova/api/openstack/extensions.py |    2 --
 1 file changed, 2 deletions(-)

commit 9fca0b2156f1e7f3d007916ef18b2ed9fbc761df
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 6 15:59:20 2011 -0400

    Added test case for snapshoting base image without architecture.

 nova/tests/test_libvirt.py |   92 +++++++++++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 26 deletions(-)

commit 46bd8cbd1358a44534a620408b828ad08eef9cec
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:35:33 2011 -0400

    Remove ipy from virt code and replace with netaddr

 nova/virt/libvirt/connection.py |    3 +--
 nova/virt/libvirt/netutils.py   |   14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

commit b7390c78054f839ac3340d771b9aae0109f5a98e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:34:51 2011 -0400

    Remove ipy from network code and replace with netaddr

 nova/network/linux_net.py       |    4 ++--
 nova/network/manager.py         |   43 +++++++++++++++++++--------------------
 nova/tests/test_flat_network.py |    6 +++---
 nova/tests/test_vlan_network.py |    6 +++---
 4 files changed, 29 insertions(+), 30 deletions(-)

commit 93f61c18134e6b4091114a7126f52d74e0d20df8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:33:35 2011 -0400

    Remove ipy from nova/api/ec2/cloud.py and use netaddr

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e52069015aa3ed0ba130f529ebfb93d53ea6053c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:32:48 2011 -0400

    Remove ipy from nova-manage and use netaddr

 bin/nova-manage |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 1eb789625d15b319f5bc070041a42c03e6c6b08c
Merge: 4d50e84 51f4b67
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 6 19:26:05 2011 +0000

    This branch allows marker and limit parameters to be used on image listing (index and detail) requests.  It parses the parameters from the request, and passes it along to the glance_client, which can now handle these parameters.  Essentially all of the logic for the pagination is handled in glance, we just pass along the correct parameters and do some error checking.

commit 51f4b673d9521f43b2396eeb7d65cd43d1f100b6
Merge: 78611b6 4d50e84
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 6 14:55:04 2011 -0400

    merge from trunk, resolved conflicts

commit 4d50e840c7a9dd30cda0670564ad0135027f2ba5
Merge: ec3d5be eadabab
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jun 6 18:25:54 2011 +0000

    Update the OSAPI images controller to use 'serverRef' for image create requests.

commit ec3d5be6196d6d5a9c279fb53a9805afff45c54d
Merge: 54731d1 2671787
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jun 6 17:25:55 2011 +0000

    Changed the error raise to not be AdminRequired when admin is not, in fact, required.
    
    Cleaned up some documentation while I was there.

commit aac234e8c55486bd1f192527a8c4d6812da939fd
Merge: 0ac076d 0541829
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Jun 6 12:20:08 2011 -0500

    merge with trey

commit 267178748e712098af4e55872029c5883af9a51c
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jun 6 12:42:27 2011 -0400

    Change to a more generic error and update documentation.

 nova/db/sqlalchemy/api.py |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

commit 0ac076dc5986eec1f976002b891c991f52363134
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Jun 6 10:56:04 2011 -0500

    make some of the tests

 nova/network/manager.py             |    1 +
 nova/tests/db/fakes.py              |  119 +++++++++++++++---------
 nova/tests/network/base.py          |   41 ++++++++-
 nova/tests/test_flat_network.py     |   31 -------
 nova/tests/test_iptables_network.py |  166 +++++++++++++++++++++++++++++++++
 nova/tests/test_network.py          |  172 +++++------------------------------
 6 files changed, 305 insertions(+), 225 deletions(-)

commit 14cd6f4f506588006104277132c7bae416381e45
Merge: b45d07d 54731d1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 6 11:54:11 2011 -0400

    Merged trunk.

commit 5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0
Merge: 3d481e5 54731d1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:41:04 2011 -0400

    merge trunk

commit 3d481e551ac81a35cafcd79c2b17d2bd9c8a050f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:39:34 2011 -0400

    Ignore complaining about dynamic definition

 nova/api/direct.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0eb6db6f994963d519f9fe07e3dbc41e0c8079c6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:29:05 2011 -0400

    Removed Duplicate method

 nova/virt/xenapi/fake.py |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit a2f74c2f706bdf45ec36348468b1ba5797fcde87
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:20:25 2011 -0400

    Use super on an old style class

 nova/twistd.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3fb0b8fd8e4ad5911c85fddcb6ef5127fa4cd384
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:00:51 2011 -0400

    Removed extraneous code

 nova/tests/xenapi/stubs.py |   14 --------------
 1 file changed, 14 deletions(-)

commit ec5e5bcd3592dca44d1d71455ccd99e2c7f24d26
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 10:49:29 2011 -0400

    Small pylint fixes

 nova/api/openstack/extensions.py   |    6 ++++--
 nova/api/openstack/views/limits.py |    9 ---------
 nova/tests/xenapi/stubs.py         |    4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

commit 78611b6a002095747ea41e26029cdea5aeb753f7
Merge: 4846ade 54731d1
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 6 09:38:31 2011 -0400

    merge with trunk

commit 9c38da46d121e65707346473e6d51da3a2cf021f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 09:18:13 2011 -0400

    Fixed incorrect exception

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 54731d1b357ae7527f91b01d17664528aa48c61b
Merge: 3101d00 f047047
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Sat Jun 4 00:10:48 2011 +0000

    This branch removes nwfilter rules when instances are terminated to prevent resource leakage and serious eventual performance degradation.  Without this patch, launching instances and restarting nova-compute eventually become very slow.

commit f047047356e91c6227e1e400eea80d2f35c35285
Merge: 9ada213 3101d00
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jun 3 14:43:12 2011 -0700

    merge with trunk

commit 9ada213e500cc3233c048d834791924947545a67
Merge: 5c205bb f903911
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jun 3 14:41:25 2011 -0700

    resolve conflicts with trunk

commit 24948671c2ab09ddd1b5dec0d7b96f4556e3511c
Merge: de7ae78 3101d00
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Fri Jun 3 16:39:48 2011 -0500

    Update migrate script version to 22.

commit 3101d000407aff5b2c1f8f531c08848a9c909865
Merge: 05eb0ab f6aa513
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Fri Jun 3 21:15:53 2011 +0000

    Added 'config list' to nova-manage. This function will output all of the flags and their values.
    
    # ./bin/nova-manage config list
    --storage_availability_zone=nova
    --ca_file=cacert.pem
    --ec2_dmz_host=$my_ip
    --fixed_range=10.0.0.0/8
    --compute_topic=compute
    --dmz_mask=255.255.255.0
    ****SNIP****
    
    I also alphabetized the nova-manage category listing

commit 054182932d89c89a549c0ceddbe9549004ad4cd9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 15:55:09 2011 -0500

    renamed migration

 .../migrate_repo/versions/021_multi_nic.py         |  146 --------------------
 .../migrate_repo/versions/022_multi_nic.py         |  146 ++++++++++++++++++++
 2 files changed, 146 insertions(+), 146 deletions(-)

commit b1fb63713e592f8d7e8406287ce77e345d2ad30f
Merge: cc7aec1 05eb0ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 13:32:42 2011 -0700

    trunk merge after 2b hit

commit 05eb0abdbfcab6c0f96feb8828439204cbdd3960
Merge: 1b7ee03 d7bf3a9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 19:36:09 2011 +0000

    Distributed Scheduler developer docs.

commit 1b7ee03f531fa71ce9afc956e93fa6483616d3c0
Merge: b4ab637 f521426
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 18:35:55 2011 +0000

    Updated to use the '/v1/images' URL when uploading images to glance in the Xen glance plugin. Fixes the issue where snapshots fail to upload correctly.

commit 65e17925fc3dee9180fd0198475e4ffd7be2aa48
Merge: 3db24f7 54c341f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 13:34:54 2011 -0500

    merged trunk again

commit f6aa513024e14975709ef8facf1db6535eefbc44
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Fri Jun 3 13:20:34 2011 -0500

    added 'nova-manage config list' which will list out all of the flags and their values. I also alphabetized the list of available categories

 bin/nova-manage |   33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

commit f521426039e8a9cc5dccc2c7e7e1797cfe778d7e
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 14:14:28 2011 -0400

    Updated to use the '/v1/images' URL when uploading images to glance
    in the Xen glance plugin. Fixes issue where snapshots failed to get uploaded.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b4ab637e63bdf77ce20a8efcf8920738885e18b9
Merge: 54c341f 25c8e93
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jun 3 17:50:47 2011 +0000

    Removed "double requirement" from tools/pip-requires file.

commit 3db24f73cd5772537b9508304f8db8a7bb64f5ca
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 12:48:40 2011 -0500

    merged koelker migration changes, renumbered migration filename

 .../migrate_repo/versions/019_multi_nic.py         |  127 -----------------
 .../migrate_repo/versions/021_multi_nic.py         |  146 ++++++++++++++++++++
 2 files changed, 146 insertions(+), 127 deletions(-)

commit a1ea80431ea46aea5ec67cf152c7a7af5fd5aeac
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 3 21:13:16 2011 +0400

    fix comment

 nova/api/openstack/auth.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 25c8e9318c1ffbf2f2c88d3ed644df9e81b92b04
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jun 3 11:52:20 2011 -0400

    Fixed pip-requires double requirement.

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit eadabab8b70bdc4789615844e2263cbed7aa283c
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 11:34:49 2011 -0400

    Added a test case for XML serialization.

 nova/tests/api/openstack/fakes.py       |    3 ++-
 nova/tests/api/openstack/test_images.py |   33 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

commit 24a90512f20310007f4ca8ab01da8e19a6b5bf6f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jun 3 11:28:49 2011 -0400

    Removed unused and erroneous (yes, it was both) function

 nova/api/ec2/admin.py |    4 ----
 1 file changed, 4 deletions(-)

commit 54c341feff5043a11cfccc6e2eb02b1bf0669348
Merge: 2b8863d a3b8b34
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Fri Jun 3 15:19:22 2011 +0000

    paramiko is not installed into the venv, but is required by smoketests/base.py.  Added paramiko to tools/pip-requires.

commit 2b8863d0da04e4014a33451d27b4b1f210eea7a6
Merge: 94e5bc0 4762aeb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 3 15:11:01 2011 +0000

    Changes all uses of utcnow to use the version in utils.  This is a simple wrapper for datetime.datetime.utcnow that allows us to use fake values for tests.
    
    There are still a few places in the Zone code that is using datetime.now(), I'd prefer to move this to utils.utcnow() as well but I want to chat with sandy first to make sure that there won't be any issues.

commit 5b00ca3ac874d0fff1eb2835cd4219f49d8a169f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jun 3 11:08:43 2011 -0400

    Set pylint to ignore correct lines that it could not determine were correct,
    due to the means by which eventlet.green imported subprocess
    Minimized the number of these lines to ignore

 nova/utils.py |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 94e5bc0c35b7cd7941fd1102651504763d676a5a
Merge: 56c3418 72a4778
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 14:38:35 2011 +0000

    LDAP optimization and fix for one small bug caused huge performance leak.
    Dashboard's benchmarks showed overall x22 boost in page request completion time.

commit 118ad787703f44c9f7ff8e3ea87cf1b396ea6187
Merge: 0ef4a12 56c3418
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 10:32:39 2011 -0400

    Merge w/ trunk.

commit 56c3418d535ebd7299e93dd5dce718aeec64478c
Merge: 0fd5e0c 82e56f5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 3 14:25:59 2011 +0000

    Adds LeastCostScheduler which uses a series of cost functions and associated weights to determine which host to provision to.
    
    Left for future work:
    
    * Handle scheduling of many instances (currently assumes n=1)
    * Handle scheduling of arbitrary resources (currently weigh_hosts only handles instances)
    * Add more cost functions (currently just noop and fill-first)
    * Simulator so we can determine sensible values for cost-function-weights
    
    NOTE: This patch depends on Sandy's dist-scheduler-2a patch.

commit b45d07ded9db7c92e03cea1427413d4dda95d869
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 10:23:38 2011 -0400

    Make libvirt snapshotting work with images that don't have an 'architecture' property.

 nova/virt/libvirt/connection.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 0ef4a127e9539f90ac1d2f2846832ecc48b51e05
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 09:31:43 2011 -0400

    Add serverRef to image metadata serialization list.

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9f21962a9e1e703730fbfae120129618b7a79ca
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jun 3 09:24:46 2011 -0400

    Fixed pylint: no metadata member in models.py

 nova/db/sqlalchemy/models.py |    1 +
 1 file changed, 1 insertion(+)

commit 8739529368cb755d33c3d8c532dd1c5d86f0bf85
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 08:50:30 2011 -0400

    Implement OSAPI v1.1 style image create.

 nova/api/openstack/images.py            |   11 ++++++++-
 nova/tests/api/openstack/fakes.py       |    2 +-
 nova/tests/api/openstack/test_images.py |   41 +++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

commit d7bf3a96e3b28e0a0135e6e24170ffa46c5650c2
Merge: 29eec21 0fd5e0c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 05:24:12 2011 -0700

    trunk merge

commit 29eec21f6752ef2c03412213a74aa12745286c82
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 05:23:43 2011 -0700

    little tweaks

 doc/source/devref/distributed_scheduler.rst |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 72a47784dc09d9b840db146d58ea71f6af30a8ea
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 13:39:22 2011 +0400

    Flush AuthManager's cache before each test.

 nova/tests/test_auth.py |    1 +
 1 file changed, 1 insertion(+)

commit 9ee103a91fe3bed03c3f4c6c1a6e89fa474e1aae
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 12:37:58 2011 +0400

    Fixed FakeLdapDriver, made it call LdapDriver.__init__

 nova/auth/ldapdriver.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 02138e5e2e3eabe1c59bd03dd9488e5d1fdb38bc
Merge: 4d12718 0fd5e0c
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 11:16:10 2011 +0400

    Merged with trunk

commit 0fd5e0ca8b2d6f9c081b9c31cca7e4ad27d5141c
Merge: 33a6e76 c3649ba
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Jun 3 02:36:49 2011 +0000

    This change set adds the ability to create new servers with an href that points to a server image on any glance server (not only the default one configured).  This means you can create a server with imageRef = http://glance1:9292/images/3  and then also create one with imageRef = http://glance2:9292/images/1.  Using the old way of passing in an image_id still works as well, and will use the default configured glance server (imageRef = 3 for instance).
    
    We have tested pretty thoroughly with libvirt and xen.
    
    All tests pass, and we have done full end-to-end testing manually to verify that server creation/deletion is working.

commit a3b8b3467d836463dda806c93756841a52c055d3
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Jun 2 21:18:09 2011 -0500

    added nova_adminclient to tools/pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit c3fd486a99c889b873f35d3b9757f14ef3a905e8
Merge: d7d628d 33a6e76
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Jun 2 21:17:31 2011 -0500

    merged trunk

commit d7d628d58612b94491310a1a03727e1afa9d5ad5
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Jun 2 20:45:36 2011 -0500

    Added paramiko to tools/pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 33a6e766742fdb768defe66d714d5f7a71ee7e5f
Merge: f3e3b4b ae18421
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 3 01:10:45 2011 +0000

    Tests that all exceptions can be raised properly, and fix the couple of instances where they couldn't be constructed due to typos.

commit c3649baebb1b48c7a600d062650a6086496558d9
Merge: 9034bb2 f3e3b4b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jun 2 19:24:09 2011 -0400

    Merge from trunk.

commit b6af3d070a7767182df09e6f3e739675e6dbea89
Merge: eee29c8 f3e3b4b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 2 17:46:16 2011 -0500

    merge trunk... yay...

commit 4762aebe4ddc57d8502ed3b5aec56b613d0ec93b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 14:51:30 2011 -0700

    switch zones to use utcnow

 nova/scheduler/zone_manager.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit b2fb1738db489206557abccb631b13991c31fd4e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 14:23:05 2011 -0700

    make all uses of utcnow use our testable utils.utcnow

 bin/nova-manage                                    |    3 +-
 nova/api/ec2/admin.py                              |    3 +-
 nova/api/ec2/cloud.py                              |    5 ++--
 nova/api/openstack/auth.py                         |    5 ++--
 nova/api/openstack/contrib/__init__.py             |    2 +-
 nova/api/openstack/limits.py                       |    2 +-
 nova/api/openstack/ratelimiting/__init__.py        |    2 +-
 nova/compute/api.py                                |    3 +-
 nova/compute/manager.py                            |    3 +-
 nova/compute/monitor.py                            |    2 +-
 nova/context.py                                    |    1 -
 nova/db/sqlalchemy/api.py                          |   29 ++++++++++----------
 .../versions/016_make_quotas_key_and_value.py      |   10 +++----
 nova/db/sqlalchemy/models.py                       |    9 +++---
 nova/network/manager.py                            |    2 +-
 nova/notifier/api.py                               |    7 ++---
 nova/scheduler/driver.py                           |    3 +-
 nova/scheduler/simple.py                           |   11 ++++----
 nova/test.py                                       |    4 +--
 nova/tests/api/openstack/fakes.py                  |    3 +-
 nova/tests/api/openstack/test_images.py            |    1 -
 nova/tests/api/openstack/test_servers.py           |    8 +++---
 nova/tests/test_compute.py                         |    5 ++--
 nova/tests/test_console.py                         |    2 --
 nova/tests/test_middleware.py                      |    1 -
 nova/tests/test_scheduler.py                       |   16 +++++------
 nova/utils.py                                      |    2 +-
 nova/virt/xenapi/fake.py                           |    4 +--
 nova/volume/api.py                                 |    5 ++--
 nova/volume/manager.py                             |    4 +--
 30 files changed, 69 insertions(+), 88 deletions(-)

commit f3e3b4b0fb1fb948f0fa5042ab854c00a710a6c2
Merge: 8b6de21 28320ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 19:10:47 2011 +0000

    Fix error with % as replacement string.

commit 82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab
Merge: 6f22642 8b6de21
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 2 14:08:19 2011 -0500

    Fixing conflicts

commit ae1842174f4b079c8d84b32ddad4df1b7ff29bec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 12:01:49 2011 -0700

    Tests to assure all exceptions can be raised as well as fixing NotAuthorized

 nova/exception.py       |    4 ++--
 nova/tests/test_misc.py |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

commit 28320ced7afb2c224ab4e1cfb8a607646a2bd2e3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 11:28:41 2011 -0700

    use %% because % is a replacement string character

 nova/auth/novarc.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eee29c8142e530c801d655cf27858297946010ec
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 2 13:21:35 2011 -0500

    some comment docstring modifications

 nova/compute/api.py     |    2 +-
 nova/compute/manager.py |    8 +++++---
 nova/network/api.py     |    6 ++++--
 nova/virt/driver.py     |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

commit 8b6de21b5ed4248998eef7deb57b1bc4f3863276
Merge: 4356179 be2f5e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 17:46:53 2011 +0000

    Makes novarc work properly on a mac and also for zsh in addition to bash. Other shells are not guaranteed to work.

commit 43561799ce54515552f7d14ee7df067c136b490c
Merge: 6b40a91 9fc8e71
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jun 2 17:33:40 2011 +0000

    This adds the ability to publish nova errors to an error queue.

commit be2f5e986e41f8f8d63c0ef7a5c03916c70ba455
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 10:20:26 2011 -0700

    don't use python if readlink is available

 nova/auth/novarc.template |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6b40a9175f55fddc1350b40b995c11cdfc4a8220
Merge: 17de152 ac3348a
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 2 17:20:26 2011 +0000

    Sudo chown the vbd device to the nova user before streaming data to it. This
    resolves an issue where nova-compute required 'root' privs to successfully
    create nodes with connection_type=xenapi.

commit 17de1520f03a2ecad607876e348fb8ec6d60608e
Merge: 78093e8 b39b0e6
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu Jun 2 17:16:06 2011 +0000

    Bugfix #780784. KeyError when creating custom image.

commit 9034bb2fcd5f03df2b25d6114adc4e7d5f3549fe
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 2 13:00:17 2011 -0400

    Remove some of the extra image service calls from the OS API images controller.

 nova/api/openstack/images.py      |    6 ++----
 nova/tests/api/openstack/fakes.py |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 14e075a3f71f21ea1b64cd6214deea9ef3913a71
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 2 11:43:53 2011 -0500

    pep8 fixes

 nova/tests/db/fakes.py          |    6 ++----
 nova/tests/network/base.py      |    5 +----
 nova/tests/test_flat_network.py |    1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

commit 799e847f46391d999174d8c2a88fc6c5c3ab7d5d
Merge: 689fc64 e467ca6
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jun 2 11:35:49 2011 -0500

    merge with trey

commit 689fc641ac86347527d363749788a48b387911c5
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 2 11:14:18 2011 -0500

    make it pass for the demo

 nova/tests/db/fakes.py          |    2 +-
 nova/tests/test_flat_network.py |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

commit 4846ade9909f5c3af8849fa9112ad36b4d18b391
Merge: 7ca707c 9f10270
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 2 12:03:11 2011 -0400

    Merged with Will.

commit 7ca707c1cbfb3164d4b6f706a4e9720e54bcc35f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 2 12:02:16 2011 -0400

    Minor comment formatting changes.

 nova/api/openstack/common.py |    6 +++---
 nova/api/openstack/images.py |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 9f1027069c47ea83e1dfca9bed48b2a403463689
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 2 11:58:17 2011 -0400

    got rid of more test debugging stuff that shouldnt have made it in

 nova/tests/integrated/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 052f08256d2be2dda5ed792be48aa4f97cb93a93
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 2 11:38:20 2011 -0400

    Remove comment about imageRef not being implemented.

 nova/tests/integrated/integrated_helpers.py |    3 ---
 1 file changed, 3 deletions(-)

commit b380e0de4b7c24607c16734a46b3e11d64947b01
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 2 11:12:35 2011 -0400

    Remove a rogue comment.

 nova/image/__init__.py |    1 -
 1 file changed, 1 deletion(-)

commit 983bff090da0f09f944dd4152173a4586866a895
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 2 08:05:46 2011 -0700

    more tests (empty responses)

 nova/tests/api/openstack/test_servers.py |   45 +++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

commit 3fb467e44b5e5715e364c6c616998e54d7f20f92
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 2 07:57:35 2011 -0700

    get_all with reservation id across zone tests

 nova/compute/api.py                      |   16 ----------
 nova/scheduler/api.py                    |    7 -----
 nova/scheduler/driver.py                 |    7 -----
 nova/scheduler/zone_aware_scheduler.py   |    6 ----
 nova/tests/api/openstack/test_servers.py |   50 ++++++++++++++++++++++++++++--
 5 files changed, 47 insertions(+), 39 deletions(-)

commit 4424bac30283a842c6c61b894592c8bab4cb0aa0
Merge: 0e419c0 78093e8
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Jun 2 10:09:18 2011 -0400

    Merge w/ trunk.

commit e28a6e96ec45439ed24a363f27d0421d720add0b
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 2 09:34:01 2011 -0400

    move index and detail functions to v10 controller

 nova/api/openstack/images.py |   48 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit 7b24750057cfef1d0f14b21cb83b1ac9c0869836
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 2 08:53:13 2011 -0400

    got rid of prints

 nova/tests/integrated/test_servers.py |    2 --
 1 file changed, 2 deletions(-)

commit b39b0e66f16d49890189c63fba528734ef476068
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu Jun 2 10:29:58 2011 +0400

    Refactored after review, fixed merge.

 nova/image/fake.py         |    5 +----
 nova/tests/test_libvirt.py |   10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

commit 0e419c00ef9a463acc704f034e4c37929f0ef2eb
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 1 23:37:51 2011 -0400

    image href should be passed through the rebuild pipeline, not the image id.

 nova/api/openstack/servers.py |    3 +--
 nova/compute/api.py           |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

commit 707af42c90d3840c7bd965be53c2a787887c3c46
Merge: 5ded1f2 78093e8
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 23:13:01 2011 -0400

    merge from trunk

commit 5ded1f2c1d0d14b3c04df137f7cc6a0b65e53fda
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 23:11:50 2011 -0400

    got rid of print debugs

 nova/api/openstack/common.py             |    1 -
 nova/api/openstack/servers.py            |    1 -
 nova/tests/api/openstack/test_images.py  |    2 +-
 nova/tests/api/openstack/test_servers.py |    1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

commit 4fb46873ef4332c6570d3ac5559557745056dee6
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 23:09:37 2011 -0400

    cleanup based on waldon's comments, also caught a few other issues

 nova/api/openstack/common.py             |   18 +--
 nova/api/openstack/images.py             |    8 +-
 nova/api/openstack/servers.py            |    1 +
 nova/tests/api/openstack/fakes.py        |   25 +----
 nova/tests/api/openstack/test_common.py  |  180 +++++++++++++-----------------
 nova/tests/api/openstack/test_images.py  |   33 ++++--
 nova/tests/api/openstack/test_servers.py |    1 +
 nova/tests/integrated/test_servers.py    |    3 +
 8 files changed, 115 insertions(+), 154 deletions(-)

commit 8ee41f679bd72af6aab098f9d9735e342b281635
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 1 18:55:41 2011 -0700

    missed a couple chars

 nova/auth/novarc.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 970415346b356f03f9d6152bfd4744b94bb59bbd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 18:17:04 2011 -0700

    Little cleanups

 nova/api/openstack/views/servers.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit d31ad6211956e69644894490ce37f6c3e8ea5e6e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:53:45 2011 -0700

    pep8 and all that

 nova/api/openstack/create_instance_controller.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:49:49 2011 -0700

    tests all passing again

 nova/api/openstack/create_instance_controller.py |    5 +++--
 nova/api/openstack/servers.py                    |    1 -
 nova/compute/api.py                              |    1 -
 nova/scheduler/api.py                            |    5 +----
 nova/tests/test_scheduler.py                     |    8 +-------
 5 files changed, 5 insertions(+), 15 deletions(-)

commit cf464dc7f2093ea3d1f831915ce22f54f0d1c90a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:35:49 2011 -0700

    list --reservation now works across zones

 nova/api/openstack/create_instance_controller.py |    2 --
 nova/api/openstack/views/servers.py              |   12 +++++++++---
 nova/compute/api.py                              |   22 ++++++++++++++++++++--
 nova/scheduler/api.py                            |    8 +++++---
 4 files changed, 34 insertions(+), 10 deletions(-)

commit ef1f5b3aadde2fedb4b2d197af0f1c0f07375714
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 1 16:51:26 2011 -0700

    fix novarc to work on mac and zsh

 nova/auth/novarc.template |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5c187a17216b76d730c3dcf983f905d2b5ce1bd9
Merge: 2c1dd72 78093e8
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jun 1 19:44:01 2011 -0400

    Merge trunk.

commit 5d89721f5fa3212146749236c666f0e584c8590f
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 1 16:27:51 2011 -0700

    merged, with trunk, fixed the test failure, and split the test into 3 as per peer review.

 nova/tests/test_cloud.py |   45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

commit 78093e8101d1981fc1fbafc963023bc70ad6b3b6
Merge: 1f61272 ced7900
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 1 23:26:18 2011 +0000

    Fixes nova-manage bug.  When a nova-network host has allocated floating ips *AND* some associated, the nova-manage floating list <host> would throw exception because was expecting hash with 'ec2_id' key , however, the obj returned is a sqlalchemy obj and the attr we need is 'hostname'.

commit 4af6826713e34eed5755956ecc6969dd5c79afdc
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 18:12:21 2011 -0500

    start the flat network

 nova/tests/test_flat_network.py |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit 2f758e520a473faa977d709ae3e46eac45e99b26
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 18:11:59 2011 -0500

    more testing fun

 nova/tests/db/fakes.py     |   52 ++++++++++++++++++++++++++++++++++----------
 nova/tests/network/base.py |   46 ++++++++++++++++++++++++++++++++-------
 2 files changed, 78 insertions(+), 20 deletions(-)

commit ced79009e6555eb75f3862184834a883d37b2062
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 1 16:01:41 2011 -0700

    fixed as per peer review to make more consistent

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5e800a901f0ec051715dbd0f917975f898406860
Merge: a0cffc4 1f61272
Author: John Tran <jhtran@att.com>
Date:   Wed Jun 1 15:54:45 2011 -0700

    merged from trunk

commit 1f612729f9cb7da1c01395e77856da2ba9576c32
Merge: 44eb0d4 95f103f
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 22:46:01 2011 +0000

    Implement the v1.1 style resize action with support for flavorRef.

commit 44eb0d42eead1318aefe3ea9b830ed896457613c
Merge: b1c8373 ad964ef
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 20:55:53 2011 +0000

    Updates to the 018_rename_server_management_url migration to avoid adding and dropping a column. Just simply rename the column.

commit b1c8373077715626bb732def7342a0bcc8b530bc
Merge: 591689f d77aa58
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 1 20:21:20 2011 +0000

    Support SSL AMQP connections.

commit e467ca61f02d8a0adc50578db1d4ae969a1143f4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 1 15:01:47 2011 -0500

    small fixes

 nova/compute/api.py       |   17 +++++++++++++++++
 nova/compute/manager.py   |    8 ++++++++
 nova/db/sqlalchemy/api.py |    7 +++++++
 nova/network/api.py       |   30 +++++++++++++++++++++++-------
 nova/network/manager.py   |   15 +++++++++++++--
 5 files changed, 68 insertions(+), 9 deletions(-)

commit d77aa5862762bc6efda46d92940143a1b9cbccf5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 1 14:46:05 2011 -0500

    Allow SSL AMQP connections.

 nova/flags.py |    1 +
 nova/rpc.py   |    1 +
 2 files changed, 2 insertions(+)

commit b05dcdc69387ecd54e40063e66355961d39b4430
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 12:39:31 2011 -0700

    reservation id's properly forwarded to child zones on create

 nova/api/openstack/create_instance_controller.py |   30 ++++++++++++++++++++++
 nova/scheduler/zone_aware_scheduler.py           |    6 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)

commit b5cc7cb35cecd0c1c4a9e56e4c21bcdb4e3d2ecd
Merge: 8846f93 591689f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 15:38:17 2011 -0400

    merge from trunk

commit 8846f9334b3b39c87e97c7afc7643a399a00e823
Merge: 1525760 893a211
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 15:28:34 2011 -0400

    fix pep8 issue from merge

commit 0708b01f628502947d7c2d128565cff2d97ac5b5
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:14:25 2011 -0500

    coose the network_manager based on instance variable

 nova/tests/network/base.py |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

commit 433ddaaa345f8484046501bf2765bfc06480e6fd
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:10:48 2011 -0500

    fix the syntax

 nova/tests/db/fakes.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bfa26c60f38ea8b10b4362c447c9c123419884ce
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:09:26 2011 -0500

    forgot a comma

 nova/tests/db/fakes.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 591689f94859e5d7992d21f8dcdd6121baffac75
Merge: 893a211 c80fede
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 19:00:43 2011 +0000

    This just fixes a bunch of pep8 issues that have been lingering around for a while and bothering me :)

commit 15257606e5346f0bf9a67145e5d4df7ba57c386a
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 14:58:17 2011 -0400

    touch ups

 nova/image/glance.py                    |   12 ++++++------
 nova/tests/api/openstack/test_common.py |    3 +--
 nova/tests/integrated/test_servers.py   |    9 ++++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

commit ad964ef8934a14329a9100946bed26bcf37b1d52
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 14:56:06 2011 -0400

    Updates to the 018_rename_server_management_url to avoid adding and dropping
    a column. Just simply rename the column.

 .../versions/018_rename_server_management_url.py   |   29 ++++----------------
 1 file changed, 5 insertions(+), 24 deletions(-)

commit 3bf3255f91aab28aa6915a2836dad77f17312e03
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 11:52:33 2011 -0700

    basic reservation id support to GET /servers

 nova/api/openstack/servers.py |   34 +++++-----------------------------
 nova/api/openstack/zones.py   |    1 -
 2 files changed, 5 insertions(+), 30 deletions(-)

commit 893a211d351a9e7b5cff1584a13ee7ea1842412f
Merge: a1e7f08 a79f01f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 1 18:35:57 2011 +0000

    - move osapi-specific wsgi code from nova/wsgi.py to nova/api/openstack/wsgi.py
    - refactor wsgi modules to use more object-oriented approach to wsgi request handling:
        - Resource object steps up to original Controller position
        - Resource coordinates deserialization, dispatch to controller, serialization
        - serialization and deserialization broken down to be more testable/flexible
    
    - this will definitely help fixing current serialization-related bugs
    - this paves the way for schema validation to be implemented elegantly

commit 82f3c16304ab881326b84f59bccfd74b676f9796
Merge: 3fa4ece a1e7f08
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 14:34:22 2011 -0400

    merge from trunk

commit 0482e6aa7a1a097c2b65f0ebe959845df262d30e
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:43:42 2011 -0500

    make the stubs

 nova/tests/network/base.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 447f65ade139803a1376a12c5a27f90419080eb2
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:41:45 2011 -0500

    use the host

 nova/tests/db/fakes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cbfaf0bb04dd190a63e8c1f74dc3f1be077b607c
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:38:41 2011 -0500

    da stubs

 nova/tests/db/fakes.py |  150 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 123 insertions(+), 27 deletions(-)

commit 1a62d0a546e15b1e4e9dbc06b0bc422734594fdb
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 1 11:38:10 2011 -0400

    Bumped migration number

 .../versions/019_add_instance_type_metadata.py     |   67 --------------------
 .../versions/021_add_instance_type_metadata.py     |   67 ++++++++++++++++++++
 2 files changed, 67 insertions(+), 67 deletions(-)

commit 51873ae4ad70333c450bf1e5f57bba0ef9bcfd36
Merge: 69a4974 a1e7f08
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 1 11:37:47 2011 -0400

    Merged from trunk

commit c80fedead72456c18c3a0e63348e1a4d40c7e7c5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:58:17 2011 -0400

    updates to keep things looking better

 nova/compute/api.py                                |    7 +++++--
 .../versions/016_make_quotas_key_and_value.py      |    3 ++-
 nova/scheduler/host_filter.py                      |    3 ++-
 nova/tests/api/openstack/test_servers.py           |    3 +--
 nova/tests/integrated/test_servers.py              |    9 ++++++---
 nova/tests/test_host_filter.py                     |    7 +++++--
 nova/tests/test_zone_aware_scheduler.py            |   16 ++++++++++------
 7 files changed, 31 insertions(+), 17 deletions(-)

commit 2be52c6f7eaa95e484758158be95933a162514e8
Merge: 8b716bc a1e7f08
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:40:56 2011 -0400

    merge from trunk

commit 8b716bc23ac4e5e5398db9557757621fccb08204
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:37:54 2011 -0400

    fix pep8 issues

 nova/compute/api.py                                |    3 +--
 .../versions/016_make_quotas_key_and_value.py      |    3 +--
 nova/scheduler/host_filter.py                      |    3 +--
 nova/tests/api/openstack/test_servers.py           |    3 +--
 nova/tests/integrated/test_servers.py              |    9 +++------
 nova/tests/test_host_filter.py                     |   14 +++++---------
 nova/tests/test_zone_aware_scheduler.py            |   10 +++-------
 tools/install_venv.py                              |    2 +-
 8 files changed, 16 insertions(+), 31 deletions(-)

commit 4d1271821f782d4e11934d69b4ffe3aced6072eb
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 1 18:34:54 2011 +0400

    PEP8 fix.

 nova/auth/ldapdriver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a26e21040681fd6db5a6ae862ca18ee17689854c
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 1 18:32:49 2011 +0400

    Moved memcached driver import to the top of modules.

 nova/auth/ldapdriver.py |   10 ++++++----
 nova/auth/manager.py    |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

commit 3fa4ece45eea12f0923c55d87130c668bafd2751
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:31:53 2011 -0400

    fix pep8 issues

 nova/api/openstack/common.py             |    4 ++--
 nova/tests/api/openstack/fakes.py        |   13 ++++++++-----
 nova/tests/api/openstack/test_common.py  |    6 +++---
 nova/tests/api/openstack/test_images.py  |   16 +++++++---------
 nova/tests/api/openstack/test_servers.py |    3 +--
 nova/tests/integrated/test_servers.py    |    9 +++------
 6 files changed, 24 insertions(+), 27 deletions(-)

commit 9fc8e71f1b201adc0a5e49ac3a94e22bf47596fb
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 1 10:17:00 2011 -0400

    pep8 fixes

 nova/log.py                 |    2 +-
 nova/tests/test_notifier.py |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit a1e7f0884126fbc52e5295688f44fe9ebbea5873
Merge: 8185703 5976b50
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 14:01:22 2011 +0000

    Cleanup instances_path in the test_libvirt test_spawn_with_network_info test. Fixes issue where the nova/tests/instance-00000001/ is left in the nova source tree when running run_test.sh -N.

commit b8f2f8d63608d76af41fd218dddb955bdc656354
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:00:15 2011 -0400

    fix filtering tests

 nova/api/openstack/images.py            |    8 ++++++--
 nova/image/glance.py                    |    4 ++--
 nova/tests/api/openstack/test_images.py |   30 ++++++++++++++++++++----------
 3 files changed, 28 insertions(+), 14 deletions(-)

commit 16bd0ff62dccda5eba800b2762437d5e86faaafd
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 09:20:15 2011 -0400

    Renamed migration to 020.

 .../migrate_repo/versions/019_rename_image_ids.py  |   40 --------------------
 .../migrate_repo/versions/021_rename_image_ids.py  |   40 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

commit 778d9a4c268c68844ffb2d3cd63ef074e75c0a67
Merge: 6b47877 8185703
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jun 1 09:07:44 2011 -0400

    Merge w/ trunk.

commit 5b45d5477cfff946ada581676db54fb254be6522
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 1 16:40:19 2011 +0400

    osapi: added support for header X-Auth-Project-Id

 nova/api/openstack/auth.py |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit db68508e1468e9d2d3469f2ea6a9ec577d1190bc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 05:36:41 2011 -0700

    added /zones/boot reservation id tests

 nova/tests/api/openstack/test_servers.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 81857037710d2bab23d151184912c194edf9018d
Merge: a8113ae 2bd6e55
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Jun 1 07:26:40 2011 +0000

    Adds hooks for applying ovs flows when vifs are created and destroyed for XenServer instances.

commit 6b47877565f78b33f17f34e10092835ec0a41218
Merge: 770c0a5 a8113ae
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 31 23:16:22 2011 -0400

    Merge w/ trunk.

commit a8113ae0dcc15171d138f6333203d0d16a24c8ea
Merge: 4c0e72a 81f40ed
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 1 01:10:47 2011 +0000

    Logs the exception if metadata fails and returns a 500 with an error message to the client.

commit 6f22642e792e9c861c23266672f8d939cd9dd060
Merge: 5922b5d 70f4438
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 1 00:54:33 2011 +0000

    Fixing a bunch of conflicts

commit 37ad81c6fe5cc3799d301f326b5bf231e5b468dc
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 18:16:30 2011 -0500

    add new base

 nova/tests/network/base.py |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit 8797933e5977b289ccc1a626ed60c10b8527f99b
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 18:16:06 2011 -0500

    refator existing fakes, and start stubbing out the network for the new manager tests

 nova/tests/db/fakes.py |  142 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 114 insertions(+), 28 deletions(-)

commit 81f40ed1ca284bc9a8ee948ae23fdff93d632cb0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 31 15:50:33 2011 -0700

    pep8

 nova/api/ec2/metadatarequesthandler.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit de7ae78561641bab3ba2d5783ec64acf67e96fb3
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:59:30 2011 -0500

    Incremented version of migration script to reflect changes in trunk.

 nova.egg-info/PKG-INFO             |   10 -
 nova.egg-info/SOURCES.txt          |  641 ------------------------------------
 nova.egg-info/dependency_links.txt |    1 -
 nova.egg-info/top_level.txt        |    1 -
 4 files changed, 653 deletions(-)

commit beb6bf93d0bab5b50c6f0af90758e21cc68187ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 14:56:04 2011 -0700

    basic zone-boot test in place

 nova/api/openstack/create_instance_controller.py |    3 ++-
 nova/api/openstack/servers.py                    |    4 ----
 nova/api/openstack/zones.py                      |    1 +
 nova/tests/api/openstack/test_servers.py         |   27 ++++++++++++++++++++--
 4 files changed, 28 insertions(+), 7 deletions(-)

commit 2ff20fdde84ea80d910b6a16e83135fca1aabafa
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:53:30 2011 -0500

    Incremented version of migration script to reflect changes in trunk.

 dist/nova-2011.3-py2.6.egg |  Bin 1563180 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 61bc343bccc4a327c573c9a6276ba642e445e6aa
Merge: abeef6b 4c0e72a
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:50:56 2011 -0500

    Incremented version of migration script to reflect changes in trunk.

commit b0c43e57ad6a7e5be8a749e70da39b7f7ba547bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 31 14:49:47 2011 -0700

    switch to using webob exception

 nova/api/ec2/metadatarequesthandler.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit abeef6b6942b05469daceac4f95ac75f5b23fda5
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:41:32 2011 -0500

    Added new snapshots table to InnoDB migrations.

 .../versions/020_set_engine_mysql_innodb.py        |    1 +
 1 file changed, 1 insertion(+)

commit 4c0e72a6278d6b21cd00bd695099ad24858c288a
Merge: 70f4438 75ec3d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 31 21:41:19 2011 +0000

    Adds a few more status messages to error states on image register for the ec2 api.  This will hopefully provide users of the ec2 api with a little more info if their registration fails.

commit 75cf63108befbc4dbc7f61c36862a43defb90654
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:28:43 2011 -0500

    Cleaned up bug introduced after fixing pep8 errors.

 .../versions/020_set_engine_mysql_innodb.py        |    7 -------
 1 file changed, 7 deletions(-)

commit 5922b5dc166476adf550abbbacc21e4585e53a37
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 31 21:23:36 2011 +0000

    Fixing Scheduler Tests

 nova/tests/scheduler/test_scheduler.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2010bd7f8c200a95496cc47e395a21fc9f4e278e
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:23:17 2011 -0500

    Cleaned up bug introduced after fixing ^Cp8 errors.

 .../versions/020_set_engine_mysql_innodb.py        |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 70f4438fa88ec2a16a21228052f56ddc31a19484
Merge: 3812bb4 6d44d4f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 21:16:41 2011 +0000

    Basic hook-up to HostFilter and fixed up the passing of InstanceType spec to the scheduler.

commit 138808a2d728a7c8dc182813fafa282f72c30eae
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 16:00:05 2011 -0500

    make the old tests still pass

 nova/tests/old_test_flat_network.py |    2 +-
 nova/tests/old_test_vlan_network.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 90578c0f93a9d5d7537b705128dc2fdc7be26a76
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 15:53:54 2011 -0500

    rename da stuffs

 nova/tests/network/base.py     |  153 ----------------------------------------
 nova/tests/network/old_base.py |  153 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 153 deletions(-)

commit 94ba0ce19b7c1bbb9ebd4f4fc6f0b03b4a0860f9
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 15:52:57 2011 -0500

    rename da stuffs

 nova/tests/old_test_flat_network.py |  166 +++++++++++++++++++++++
 nova/tests/old_test_vlan_network.py |  250 +++++++++++++++++++++++++++++++++++
 nova/tests/test_flat_network.py     |  166 -----------------------
 nova/tests/test_vlan_network.py     |  250 -----------------------------------
 4 files changed, 416 insertions(+), 416 deletions(-)

commit b4845fa52affacf76ae1668079f1cc7dfa1b4004
Merge: 1b610e2 3812bb4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 31 20:49:49 2011 +0000

    Resolving conflict and finish test_images

commit 59499f125a0cdb260b6b34ee737debe9fd86cbfb
Merge: f16f55a eb32a13
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 16:44:44 2011 -0400

    merge

commit f16f55a08038c78200a490055183104fc6a9348d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 16:43:25 2011 -0400

    added tests for image detail requests

 nova/tests/api/openstack/test_images.py |   56 +++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 6 deletions(-)

commit eb32a136c9c05fe1191a1da03c84f293c2de8c0b
Merge: b8bcc71 3812bb4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 31 16:40:38 2011 -0400

    Merged trunk.

commit b8bcc715fccbd1e3ae82f508e7d4334414818d35
Merge: f668339 0b7104a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 31 16:30:09 2011 -0400

    Merged trunk and fixed conflicts.

commit 2c1dd72060fccbe7f32a6aa08c1ce67476806680
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:28:46 2011 -0400

    Whitespace cleanups.

 nova/virt/libvirt/firewall.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3812bb4c7e6fcee4c87c1225d9c725db08527018
Merge: 0b7104a 4581839
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue May 31 20:27:53 2011 +0000

    added pause/suspend implementation to nova.virt.libvirt_conn

commit eca6c3098144c1bf917725d906a50141a5aaef4e
Merge: 4d7dbdc 0b7104a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:20:35 2011 -0400

    Merge Trunk.

commit 4d7dbdc96e30afbd19ab525e9667f6e3aaaafbe9
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:20:07 2011 -0400

    Change version number of migration.

 .../versions/019_add_provider_fw_rules.py          |   75 --------------------
 .../versions/021_add_provider_fw_rules.py          |   75 ++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)

commit 0b7104a8c6b2b2e3fed4a09b239439964aeb2774
Merge: 026a331 7beafb1
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 31 20:15:52 2011 +0000

    Update the rebuild_instance function in the compute manager so that it accepts the arguments that our current compute API sends.
    
    Fixes to the SQLAlchmeny API such that metadata is saved on an instance_update. Added integration test to ensure that instance metadata is updated on a rebuild.

commit f2da479b8988cd55d39e89935b10e0b348df43c9
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 31 23:36:49 2011 +0400

    Moved everything from thread-local storage to class attributes

 nova/auth/ldapdriver.py |   38 +++++++++++---------------------------
 nova/auth/manager.py    |   14 +++-----------
 2 files changed, 14 insertions(+), 38 deletions(-)

commit 026a331f9e1dd73baa38294d18948dcc37b5ff5c
Merge: ed92971 b9b16ca
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 31 19:36:12 2011 +0000

    Added the filtering of image queries with image metadata. This is exposing the filtering functionality recently added to Glance. Attempting to filter using the local image service will be ignored.

commit ed929717b7720918be630475e7d4791548e1dc7e
Merge: 2ae01f6 c229d6e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue May 31 19:01:03 2011 +0000

    This enables us to create a new volume from a snapshot with the EC2 api.

commit 7beafb1aafac97e6dfc28108062785465cc8f577
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 31 14:38:12 2011 -0400

    Use a new instance_metadata_delete_all DB api call to delete existing
    metadata when updating a server.

 nova/db/sqlalchemy/api.py |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit f668339effa089360c1989082c83afc35489f71e
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 14:21:15 2011 -0400

    added tests for GlanceImageService

 nova/tests/api/openstack/fakes.py       |   38 +++++++++++++++--
 nova/tests/api/openstack/test_images.py |   68 +++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 3 deletions(-)

commit 2ae01f6f426e774107c60b87ad40efa1e4413bf6
Merge: f903911 4960dac
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue May 31 18:11:01 2011 +0000

    Add vnc_keymap flag, enable setting keymap for vnc console and fix bug #782611.

commit add164c45db31baf8f12c3e5dede140c51a2e498
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 14:10:29 2011 -0400

    Add refresh_provider_fw_rules to virt/driver.py#ComputeDriver so virtualization
    drivers other than libvirt will raise NotImplemented.

 nova/virt/driver.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 4960dac9dd099a7b8402bef1807f15cb8c43dd30
Merge: 1d34d40 46f12e01
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Jun 1 02:45:26 2011 +0900

    Rebased to trunk rev 1120.

commit 6d44d4f8c98266a14cd304b0c1a87c7cece34206
Merge: ceb6eee f903911
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 10:39:56 2011 -0700

    trunk merge

commit 1eee07811f9fb5fd29192b17610a6b2d2e6c3578
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 13:34:33 2011 -0400

    added get_pagination_params function in common with tests, allow fake and local image services to accept filters, markers, and limits (but ignore them for now)

 nova/api/openstack/common.py            |   31 +++++++++++++++++++++
 nova/api/openstack/images.py            |   25 +++++++++++++++--
 nova/image/fake.py                      |    4 +--
 nova/image/glance.py                    |   10 ++++---
 nova/image/local.py                     |    4 +--
 nova/tests/api/openstack/fakes.py       |    5 ++--
 nova/tests/api/openstack/test_common.py |   46 +++++++++++++++++++++++++++++++
 nova/tests/image/test_glance.py         |    2 +-
 8 files changed, 113 insertions(+), 14 deletions(-)

commit ac308fd922ff89416bf148c8bbed2aa1f1b85b86
Merge: 7184eb3 80b861e
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 12:01:32 2011 -0500

    Merge branch 'bzr/multi_nic' into multi_nic

commit 14b6bb455e94e150925677a17c5ccbcf86696dee
Merge: e16ac0d f903911
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:51:24 2011 -0500

    Cleaned up text conflict.

commit 7184eb32a45c23de3d7296dce611ee4dde190231
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 11:51:03 2011 -0500

    pep8 fixed

 nova/tests/test_host_filter.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 36c93967577578936bd99a5c9cf344390509e484
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 11:46:06 2011 -0500

    pep8 fixes

 nova/db/sqlalchemy/api.py                          |    3 +-
 .../versions/016_make_quotas_key_and_value.py      |    3 +-
 nova/scheduler/host_filter.py                      |    3 +-
 nova/test.py                                       |    2 +-
 nova/tests/__init__.py                             |    2 +-
 nova/tests/api/openstack/test_servers.py           |    3 +-
 nova/tests/test_host_filter.py                     |   29 +++++++-------------
 nova/tests/test_virt.py                            |    9 +++---
 nova/tests/test_xenapi.py                          |    2 ++
 nova/tests/test_zone_aware_scheduler.py            |   10 ++-----
 tools/install_venv.py                              |    2 +-
 11 files changed, 28 insertions(+), 40 deletions(-)

commit e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:43:38 2011 -0500

    Cleaned up text conflict.

 Authors |    5 +++++
 1 file changed, 5 insertions(+)

commit 770c0a5ecd2e19318e5b581de1f23e4e1d3f5f9d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 31 12:37:36 2011 -0400

    removing semicolon

 nova/api/openstack/views/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 51247c01f8ec3b89657c130935d039ae9fa776b0
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:35:13 2011 -0500

    Cleaned up text conflict.

 .../versions/020_set_engine_mysql_innodb.py        |    7 +++++++
 1 file changed, 7 insertions(+)

commit 6085115befa0c93aa97371557fa1cb88aa401db3
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 11:33:34 2011 -0500

    skip the vlam test, not sure why it doesn't work

 nova/network/manager.py   |    3 ++-
 nova/tests/test_xenapi.py |    7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit b6e9072a89396aaf1ab616671fd427ec059a2daa
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:31:35 2011 -0500

    Cleaned up pep8 errors.

 Authors                                            |    1 -
 .../versions/020_set_engine_mysql_innodb.py        |   17 ++++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

commit f903911a078f4356b91cb7d0965456612b26698c
Merge: 46f12e01 05c21ed
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 16:31:32 2011 +0000

    Fixed the APIError typo

commit 6bf9bd5f785ed4fc1ca576e5b729e75fc0a3aa27
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:25:38 2011 -0500

    MySQL database tables are currently using the MyISAM engine. Created migration script nova/db/sqlalchemy/migrate_repo/versions/020_set_engine_mysql_innodb.py to change all current tables to InnoDB.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 0f7ac8903dd05d3477bad014c269470d395c879a
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:20:40 2011 -0500

    MySQL database tables are currently using the MyISAM engine. Created migration script nova/db/sqlalchemy/migrate_repo/versions/020_set_engine_mysql_innodb.py to change all current tables to InnoDB.

 .../versions/019_set_engine_mysql_innodb.py        |   57 --------------------
 .../versions/020_set_engine_mysql_innodb.py        |   57 ++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)

commit 099c29549a70cb88a6266a5e4145f855e1862d99
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 31 11:58:15 2011 -0400

    Handle the case when a v1.0 api tries to list servers that contain image hrefs.

 nova/api/openstack/servers.py       |   12 ++++++++++--
 nova/api/openstack/views/servers.py |    6 +++++-
 nova/exception.py                   |    7 ++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

commit 05c21ed52da0a9505000505120c70dffd6e730e2
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 21:04:01 2011 +0530

    Added myself to Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 1adb96550640a65a723635f2dc98e4595f95fd52
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 08:26:11 2011 -0700

    edits based on ed's feedback

 doc/source/devref/distributed_scheduler.rst |   85 ++++++++++++++-------------
 1 file changed, 45 insertions(+), 40 deletions(-)

commit 95f103f276f6eb7decd6ebd17ff4ac106bc7222f
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 31 11:17:35 2011 -0400

    More specific error messages for resize requests.

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2bd6e5561339a6755709461dab9aa6cad4a1cf81
Author: Cory Wright <corywright@gmail.com>
Date:   Tue May 31 09:51:20 2011 -0400

    pep8 fixes

 .../xensource/scripts/ovs_configure_base_flows.py  |   11 ++++++-----
 .../xensource/scripts/ovs_configure_vif_flows.py   |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 6120fca7ff665ead049c4a26b63e73d7e2a372fd
Merge: a027d88 46f12e01
Author: Cory Wright <corywright@gmail.com>
Date:   Tue May 31 09:40:01 2011 -0400

    merge trunk

commit fccc653376ec03e2f8d4e91449a18d62cd87902f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 06:29:38 2011 -0700

    tests passing again

 nova/api/openstack/create_instance_controller.py |   31 +++++++++-------------
 nova/api/openstack/servers.py                    |   27 ++++++++++++++-----
 nova/api/openstack/zones.py                      |   12 ++++++---
 nova/tests/api/openstack/test_servers.py         |    4 ++-
 4 files changed, 44 insertions(+), 30 deletions(-)

commit d6cd02a07ab3b66a53689fb8edbf55db03b4bff2
Author: Dan Prince <dprince@redhat.com>
Date:   Tue May 31 08:20:40 2011 -0400

    Actually remove the _action_resize code from the base Servers controller.
    The V11 and V10 controllers implement these now.

 nova/api/openstack/servers.py |   13 -------------
 1 file changed, 13 deletions(-)

commit 5f211664ac90805a45daa74532ce48b6b5549213
Merge: 0b9ede2 46f12e01
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 08:16:11 2011 -0400

    merge from trunk

commit 46f12e016e862803a3bfd81a4b8c615cae42cb38
Merge: e338ec0 9f42084
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue May 31 11:56:04 2011 +0000

    This adds a volume snapshot support with the EC2 api.

commit be9113bc5c08cbafb7af9f83bd61f318d1ba6145
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 09:49:06 2011 +0530

    Fixed the typo of APIError with ApiError

 nova/virt/vmwareapi/vmops.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e338ec0e568e352d67f8b2da168a716288967da6
Merge: 4a01acc 28b19b9
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Tue May 31 04:15:45 2011 +0000

    nova/auth/novarc.template: Changed NOVA_KEY_DIR to allow symlink support

commit 4f8c995bbeca903319bcc1f314b25be0150eea2f
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 30 22:47:10 2011 -0400

    Updated compute api and manager to support image_refs in rebuild.

 nova/compute/api.py     |    4 ++--
 nova/compute/manager.py |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 544ec189a7fddc4b4491774b62071a4884e8e895
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 16:18:11 2011 -0700

    zone-boot working

 nova/api/openstack/create_instance_controller.py |   15 +++++++++++++++
 nova/api/openstack/servers.py                    |   15 ---------------
 nova/api/openstack/zones.py                      |   12 +++++++++---
 3 files changed, 24 insertions(+), 18 deletions(-)

commit 318e307c268bb554d24ba441b2484790f2a08798
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 15:38:45 2011 -0700

    regular boot working again

 nova/api/openstack/create_instance_controller.py |  291 ++++++++++++++++++++++
 1 file changed, 291 insertions(+)

commit d428a8e4f9dc5291cae105e13a02e993cca19350
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 15:38:29 2011 -0700

    regular boot working again

 nova/api/openstack/__init__.py |    7 +-
 nova/api/openstack/common.py   |    3 +-
 nova/api/openstack/servers.py  |  233 ++--------------------------------------
 nova/api/openstack/zones.py    |   22 +++-
 nova/compute/api.py            |   20 ++--
 5 files changed, 47 insertions(+), 238 deletions(-)

commit c9b4bf8f3eb3bdb51b51b98b6f283415229c2e0e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 11:02:55 2011 -0700

    first pass at reservation id support

 nova/api/openstack/zones.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 2155f2b1ab22c6183ab5266e16a675f1469fca50
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 30 11:29:55 2011 -0400

    Updates so that 'name' can be updated when doing a OS API v1.1 rebuild.
    Fixed issue where metadata wasn't getting deleted when an empty dict was
    POST'd on a rebuild.

 nova/api/openstack/servers.py         |   10 +++--
 nova/compute/api.py                   |   13 +++---
 nova/db/sqlalchemy/api.py             |   17 ++++++--
 nova/tests/integrated/test_servers.py |   72 +++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 12 deletions(-)

commit 0cf5316131aecbac5e843282e2e2eb2acd3fc9e3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 05:03:45 2011 -0700

    first cut complete

 doc/source/devref/distributed_scheduler.rst |   41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit b85e089f807249eacc66172e56a1a69d450fafba
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon May 30 11:30:22 2011 +0400

    project_id moved to be last

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4c1fd8a303a8eb1287fd83b04bd767171221d117
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon May 30 11:25:21 2011 +0400

    add support for keyword arguments

 bin/nova-manage |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 45818393a20a56d5e0aab23f3c78e430e0c1167a
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon May 30 14:17:00 2011 +0900

    fixed nova.virt.libvirt_conn.resume() method - removing try-catch

 nova/virt/libvirt_conn.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 5101aa300b087bf57f22cb128649679e8b11051d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 00:45:15 2011 -0300

    reservation_id's done

 doc/source/devref/distributed_scheduler.rst |    9 +++++++++
 1 file changed, 9 insertions(+)

commit c3c2c1a63c126f046457d0d61306ebe9c46af700
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 00:00:28 2011 -0300

    basic flow done

 doc/source/devref/distributed_scheduler.rst |  105 ++++-----------------------
 1 file changed, 13 insertions(+), 92 deletions(-)

commit 5aa54545486ffe9d9988761576f497de9a957d47
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun May 29 23:42:46 2011 -0300

    lots more

 doc/source/devref/distributed_scheduler.rst |   44 +++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

commit c9926b12f4c554d9a21c6e77fc657e54a2dd4888
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun May 29 18:01:46 2011 -0700

    starting

 doc/source/devref/distributed_scheduler.rst |  164 +++++++++++++++++++++++++++
 1 file changed, 164 insertions(+)

commit 4171160aa24d2e055da8b33c90c77c5b75c26fd9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sun May 29 22:45:58 2011 +0900

    boot-from-volume: some comments and NOTE(user name)

 nova/api/ec2/apirequest.py |    6 ++++++
 nova/api/ec2/cloud.py      |    1 +
 nova/compute/api.py        |    1 +
 3 files changed, 8 insertions(+)

commit 833481d796db557dddde6b4b9e75b7cf518b88fa
Author: Dan Prince <dprince@redhat.com>
Date:   Sun May 29 07:51:44 2011 -0400

    Use metadata variable when calling _metadata_refs.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 394b37f8c944fbd3ca683d7752cd751bc69cce51
Author: Dan Prince <dprince@redhat.com>
Date:   Sun May 29 00:00:02 2011 -0400

    Implement the v1.1 style resize action with support for flavorRef.

 nova/api/openstack/servers.py            |   32 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |   19 ++++++++++++++++++
 2 files changed, 51 insertions(+)

commit ccf522daaca0d4136c072c1905dd9fbaa1dfb2e9
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 28 23:12:07 2011 -0400

    Fixes to the SQLAlchmeny API such that metadata is saved on an instance_update.
    Added integration test to test that instance metadata is updated on a rebuild.

 nova/db/sqlalchemy/api.py             |   22 ++++++++++++---------
 nova/tests/integrated/api/client.py   |   10 ++++++++--
 nova/tests/integrated/test_servers.py |   34 +++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 11 deletions(-)

commit a9278909cbb6d5ea9283231dbd6efc67b812abff
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 28 23:10:42 2011 -0400

    Update the rebuild_instance function in the compute manager so that it
    accepts the arguments that our current compute API sends.

 nova/compute/manager.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 5976b50299b31292d578dcdd8576607e175fca44
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 28 21:10:57 2011 -0400

    Cleanup instances_path in test_libvirt test_spawn_with_network_info test.

 nova/tests/test_libvirt.py |    3 +++
 1 file changed, 3 insertions(+)

commit 29387999d6befc29dddfb7dfd5d543607676e106
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 28 14:18:25 2011 -0400

    Added missing nova import to image/__init__.py.

 nova/image/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit b0636780291fc6531d89a69e164e82203414a875
Author: Dan Prince <dprince@redhat.com>
Date:   Sat May 28 07:49:31 2011 -0400

    Another image_id location in hyperv.

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ce5728a0d800374a76cacf935daf2c032f1c33d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 28 06:25:04 2011 -0400

    Fixing nova.tests.api.openstack.fakes.stub_out_image_service. It now stubs
    out the get_image_service and get_default_image_service functions.
    Also some pep8 whitespace fixes.

 .../migrate_repo/versions/019_rename_image_ids.py  |    3 ++-
 nova/tests/api/openstack/fakes.py                  |   11 +++++++----
 nova/tests/api/openstack/test_servers.py           |   10 +---------
 nova/tests/glance/stubs.py                         |    2 +-
 nova/virt/vmwareapi/vmware_images.py               |    6 +++---
 5 files changed, 14 insertions(+), 18 deletions(-)

commit bceac9e68021959c8711a0be4ed7ac13352a4623
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 28 06:04:19 2011 -0400

    Fixing xen and vmware tests by correctly mocking glance client.

 nova/tests/glance/stubs.py |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 1fced8f7a527f25abde457cfcf056a9a082a79c3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 28 04:29:35 2011 -0400

    Fixing integration tests by correctly stubbing image service.

 nova/tests/integrated/integrated_helpers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit e75bbc348c713775af11293fc6e5e05667279234
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 28 02:18:48 2011 -0400

    More image_id to image_ref stuff. Also fixed tests in test_servers.

 nova/api/openstack/servers.py            |    2 +-
 nova/api/openstack/views/servers.py      |    8 ++++----
 nova/tests/api/openstack/test_servers.py |   16 +++++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

commit 4a01acc3e8d1ad0d1424472703a88a96002ba56f
Merge: 8cc6e2a 132d057
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 21:15:49 2011 +0000

    When encrypting passwords in xenapi's SimpleDH(), we shouldn't send a final newline to openssl, as it'll use that as encryption data.  However, we do need to make sure there's a newline on the end when we write the base64 string for decoding..  Made these changes and updated the test.

commit 8cc6e2a372c61961f0f5ea40523cafaba240446c
Merge: a7c36f6 2e4fca0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 27 20:55:49 2011 +0000

    Fixes the bug introduced by rpc-multicall that caused some test_service.py tests to fail by pip-requiring a later version of mox

commit 132d0579a11b5f3b0be930e5a9369205cb282e35
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 20:48:57 2011 +0000

    added \n is not needed with -A

 nova/virt/xenapi/vmops.py |    2 --
 1 file changed, 2 deletions(-)

commit 2e4fca0b2a8dc4295d14a337ffa2771fab857420
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 27 16:31:18 2011 -0400

    now pip-requires mox version 0.5.3

 tools/pip-requires |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit cb42d3ec2c358a1666fde06d4252d1d76baeffff
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 20:29:48 2011 +0000

    added -A back in to pass to openssl

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 80b861ecdbb3a8919befaf855ab12be3b15c55b1
Merge: cee7b20 03a179e
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 15:01:03 2011 -0500

    merge with dietz

commit 5115c9f4d934806003b410c51d213bc2c6749e6c
Merge: 03a179e 03a179e
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 15:01:03 2011 -0500

    merge with dietz

commit 03a179ed2e75f00d4321bf6835d163f581f3a193
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri May 27 14:59:04 2011 -0500

    XenAPI tests pass

 nova/network/manager.py    |    2 +-
 nova/tests/glance/stubs.py |    4 ++--
 nova/tests/test_cloud.py   |    1 +
 nova/tests/test_xenapi.py  |   28 +++++++++++++++++++---------
 nova/virt/xenapi/vmops.py  |    1 +
 5 files changed, 24 insertions(+), 12 deletions(-)

commit 1af3ac5f60bb9a4ad201f0bd84a355235be2f354
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 19:50:57 2011 +0000

    fixed so all the new encryption tests pass.. including data with newlines and so forth

 nova/virt/xenapi/vmops.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit c26be56d63a9d263ea8632514be03607713c754d
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 27 15:48:40 2011 -0400

    Glance client updates for xenapi and vmware API to work with image refs.

 nova/image/__init__.py               |   42 ++++++++++++++++++++++++++--------
 nova/tests/glance/stubs.py           |   12 ++++++----
 nova/tests/test_vmwareapi.py         |    5 ++--
 nova/tests/test_xenapi.py            |   29 +++++++++++------------
 nova/tests/vmwareapi/db_fakes.py     |    2 +-
 nova/virt/vmwareapi/vmops.py         |   12 +++++-----
 nova/virt/vmwareapi/vmware_images.py |   16 ++++++-------
 nova/virt/xenapi/vm_utils.py         |   14 +++++++-----
 nova/virt/xenapi/vmops.py            |    2 +-
 9 files changed, 78 insertions(+), 56 deletions(-)

commit 90280230c0ceebcea7db80c6a05ae0cef5599bc1
Merge: a92f2bc 60a2917
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 19:42:57 2011 +0000

    Merged lp:~rackspace-titan/nova/lp788979

commit cee7b20044a9387fcfa62f3d90af003e65a48e45
Author: Jason Kölker <jason@koelker.net>
Date:   Fri May 27 13:33:17 2011 -0500

    get the right args

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 69a49743d733459e532a47e6b588045fe65a6145
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 14:29:23 2011 -0400

    Fixing pep8 problems

 nova/db/api.py                             |    9 ++++++---
 nova/db/sqlalchemy/api.py                  |   18 ++++++++++--------
 nova/exception.py                          |    2 +-
 nova/tests/test_instance_types_metadata.py |   16 ++++++++--------
 4 files changed, 25 insertions(+), 20 deletions(-)

commit 19e4a081509217ec04d92ae092917d590cbd8f30
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 14:20:08 2011 -0400

    Modified instance_type_create to take metadata

 nova/db/sqlalchemy/api.py                  |   15 +++++++++++++++
 nova/tests/test_instance_types_metadata.py |   23 +++++++----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

commit bbdb8ed7148d08b790e0adf0d291fc3fbe0ae361
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:54:19 2011 -0400

    Added test for instance type metadata create

 nova/tests/test_instance_types_metadata.py |   40 ++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

commit 737dba049f6c0532be4dc80f91e7c1866d536b6c
Merge: fbda409 ec3693a
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 12:45:59 2011 -0500

    merge with trey

commit aa18d32cf20c0bfbbc81ddf234ac59ecf310ccb0
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:44:40 2011 -0400

    Added test for instance type metadata update

 nova/db/sqlalchemy/api.py                  |    2 +-
 nova/tests/test_instance_types_metadata.py |   22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

commit 842bb180f04d8b1fbacbca77171f11bfe3d68cdd
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:39:37 2011 -0400

    Added delete instance metadata unit test

 nova/tests/test_instance_types_metadata.py |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit a28590d77474f7a43d704385cc3815f2c879f397
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:29:51 2011 -0400

    Added a unit test

 nova/tests/test_instance_types_metadata.py |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit de0122eaae70c92db47f9457b162cc48c5d5f755
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:10:19 2011 -0400

    Adding test code

 nova/tests/test_instance_types_metadata.py |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

commit 556ccd9b0d9c7809395b7720e5dcfb6af514f69f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:03:57 2011 -0400

    Changed metadata to meta to avoid sqlalchemy collision

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65c26759fa8607f89614a6c90a55172805359538
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 27 13:03:36 2011 -0400

    Adding accessor methods for instance type metadata

 nova/db/api.py            |   17 ++++++++++++
 nova/db/sqlalchemy/api.py |   63 +++++++++++++++++++++++++++++++++++++++++++++
 nova/exception.py         |    5 ++++
 3 files changed, 85 insertions(+)

commit 60a291747eeded09ade608088eae47fdb300a56b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 10:41:12 2011 -0400

    remove errant print statement

 nova/tests/test_xenapi.py |    1 -
 1 file changed, 1 deletion(-)

commit f6d847cd867c09319f9fc451c09dc7322542e26b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 10:40:50 2011 -0400

    prevent encryption from adding newlines on long messages

 nova/tests/test_xenapi.py |    4 ++++
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit ceb6eee5ddbbd202af80ae32795bbf53d2e9ef49
Merge: 3f91187 a7c36f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 07:31:29 2011 -0700

    trunk merge

commit 28b19b9e20100236f98e04cc43bcf106768ff2bb
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Fri May 27 15:28:10 2011 +0100

    nova/auth/novarc.template: Changed NOVA_KEY_DIR to allow symlink support

 nova/auth/novarc.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3f911877a2a9facdf153f173b3fb76a18e44a2ac
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 07:24:02 2011 -0700

    docstrings again and import ordering

 nova/compute/api.py                    |   30 ++++++++++--------------------
 nova/scheduler/host_filter.py          |   18 ++++++------------
 nova/scheduler/zone_aware_scheduler.py |   20 +++++++-------------
 3 files changed, 23 insertions(+), 45 deletions(-)

commit 107b15d2dd7d554d9cca177343ab45c51029d484
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 10:15:33 2011 -0400

    fix encryption handling of newlines again and restructure the code a bit

 nova/tests/test_xenapi.py |   22 ++++++++++++++++++----
 nova/virt/xenapi/vmops.py |   24 +++++++-----------------
 2 files changed, 25 insertions(+), 21 deletions(-)

commit e5d89198b188b9ae62ff0ac2bd72fd321f541713
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 27 09:43:10 2011 -0400

    Libvirt updates for image_ref.

 nova/virt/libvirt/connection.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3100caf770269ef4a1289cecead26ac0349b17ac
Merge: 299cadb a7c36f6
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 27 09:18:02 2011 -0400

    Merge w/ trunk.

commit 299cadb9ce2e2600b18e2befbed967ca2941256d
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 27 08:15:56 2011 -0400

    Commit the migration script.

 .../migrate_repo/versions/019_rename_image_ids.py  |   39 ++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit bd19bd2edd612dfea09e4230c59422e59c6de181
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 05:01:42 2011 -0700

    fixed docstrings and general tidying

 nova/compute/api.py                    |   39 +++++++++++++++---------------
 nova/scheduler/host_filter.py          |   41 ++++++++++++++++++++------------
 nova/scheduler/zone_aware_scheduler.py |   33 +++++++++++++++----------
 3 files changed, 67 insertions(+), 46 deletions(-)

commit 34bd57c380c348fa9c60cf6b3371352da6e8853c
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri May 27 16:03:56 2011 +0900

    remove _take_action_to_instance

 nova/virt/libvirt_conn.py |   13 -------------
 1 file changed, 13 deletions(-)

commit a92f2bcbbaa40458e81bad3f6cb21288161322f9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 06:56:50 2011 +0000

    fix calls to openssl properly now.  Only append \n to stdin when decoding.  Updated the test slightly, also.

 nova/tests/test_xenapi.py |    1 +
 nova/virt/xenapi/vmops.py |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

commit ca5a91b3fe6eaa1c2d2b85cb5a11d2bb36e7a436
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri May 27 15:14:16 2011 +0900

    fixed read_only check

 nova/virt/libvirt_conn.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit c229d6e32f5275b2eb10e760f89a52dc31635c47
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 14:13:17 2011 +0900

    Fix pep8 errors.

 nova/api/ec2/cloud.py     |    7 ++++---
 nova/tests/test_volume.py |   10 ++++++----
 nova/volume/api.py        |    3 ++-
 nova/volume/driver.py     |    4 ++--
 nova/volume/manager.py    |    5 +++--
 5 files changed, 17 insertions(+), 12 deletions(-)

commit fc2219047af26e2ba30f180581313fab5ce5a579
Merge: d380729 9f42084
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:50:20 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit 9f42084531631dff299b906abf1b7f66b3176325
Merge: 8b4c91b a7c36f6
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:37:39 2011 +0900

    Merge trunk

commit 8b4c91b9f2c28e4809659f199affddbd66482dbb
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:36:59 2011 +0900

    Fix pep8 violations.

 nova/api/ec2/cloud.py                              |   13 +++++++++----
 .../versions/019_add_volume_snapshot_support.py    |    3 +--
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/tests/test_volume.py                          |    5 +++--
 nova/volume/driver.py                              |    6 +++---
 nova/volume/manager.py                             |    3 ++-
 6 files changed, 19 insertions(+), 12 deletions(-)

commit 6b0ed0cb61838d01b15df26fc32df0de90f1cfbe
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:20:45 2011 +0900

    Fix a description of 'snapshot_name_template'.

 nova/db/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d49944698224225a860560ff559a3679e0dd8493
Merge: 25104b5 a7c36f6
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:29:21 2011 +0900

    Merge from nova trunk

commit 25104b5e8570003f82ee1b4d2e5678715cdcc551
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:11:30 2011 +0900

    unittest: make unit tests happy
    
    various fixes to make unit tests pass.

 nova/virt/fake.py     |    4 ++++
 nova/volume/driver.py |    8 ++++++++
 2 files changed, 12 insertions(+)

commit 402ccd6d7c68697a3feb454c42207251fb08a64c
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:11:06 2011 +0900

    unittest: tests for boot from volume and stop/start instances

 nova/tests/test_cloud.py   |  322 ++++++++++++++++++++++++++++++++++++++++++--
 nova/tests/test_compute.py |   15 +++
 2 files changed, 327 insertions(+), 10 deletions(-)

commit ab938bf376efe7a93b54e4ca595d3102d04b0080
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:10:24 2011 +0900

    compute: implement ec2 stop/start instances
    
    This patch implements ec2 stop/start instances with block device mapping
    support.

 nova/api/ec2/cloud.py     |   34 ++++++++++++++++++++++----------
 nova/compute/api.py       |   39 ++++++++++++++++++++++++++++++++++++
 nova/compute/manager.py   |   48 ++++++++++++++++++++++++++++++++++++++-------
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   18 +++++++++++++++++
 nova/scheduler/simple.py  |    8 +++++++-
 6 files changed, 134 insertions(+), 18 deletions(-)

commit 945d566c10877aeaf4d75bc26e161ba3a5f9c4b9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:10:03 2011 +0900

    compute, virt: support boot-from-volume without ephemeral device and no device
    
    This patch implements basic ebs boot support.
    ephemeral device/no device isn't supported yet.

 nova/compute/api.py            |   54 ++++++++++++++++------
 nova/compute/manager.py        |   96 ++++++++++++++++++++++++++++++++++++++--
 nova/compute/utils.py          |   34 ++++++++++++++
 nova/virt/driver.py            |    2 +-
 nova/virt/fake.py              |    2 +-
 nova/virt/hyperv.py            |    2 +-
 nova/virt/libvirt.xml.template |    9 ++++
 nova/virt/libvirt_conn.py      |   69 +++++++++++++++++++++--------
 nova/virt/vmwareapi_conn.py    |    2 +-
 nova/virt/xenapi_conn.py       |    2 +-
 nova/volume/api.py             |   10 +++++
 11 files changed, 243 insertions(+), 39 deletions(-)

commit 79779eae788dee00af8523a1f6a0fb9dce07a68e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:09:20 2011 +0900

    db: add a table for block device mapping
    
    This patch adds a new table for block device mapping and helper APIs
    for it.

 nova/db/api.py                                     |   28 +++++++
 nova/db/sqlalchemy/api.py                          |   56 +++++++++++++
 .../versions/021_add_block_device_mapping.py       |   85 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   40 +++++++++
 4 files changed, 209 insertions(+)

commit d9732fa7cbadd8c3d0ed8dbcf24d920f38129fbc
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:08:18 2011 +0900

    volume/api: allow volume clone from snapshot without size
    
    ec2 ebs boot accepts volume-clone from snapshots without size specified.
    In that case original snapshot size is used.
    So teach it to volume api create()

 nova/volume/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 42272241d24e120398f741e9c8fa7d810b921209
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:08:02 2011 +0900

    api/ec2: parse ec2 block device mapping and pass it down to compute api
    
    teach ec2 api block device mapping.

 nova/api/ec2/cloud.py |   20 +++++++++++++++++++-
 nova/compute/api.py   |    2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

commit 9c3411c13936438964cc8a21b031c819edbd0ed1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:07:45 2011 +0900

    teach ec2 parser multi dot-separted argument
    
    nova.api.ec2.apirequest.APIRequest knows only single dot-separated
    arguments.
    EBS boot uses multi dot-separeted arguments like
    BlockDeviceMapping.1.DeviceName=snap-id
    This patch teaches the parser those argument as the preparetion for ebs boot
    support.

 nova/api/ec2/apirequest.py |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit b802f28c0b24a04e7c12f44d18e90792ce9ee13b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:07:24 2011 +0900

    api/ec2: make ec2 api accept true/false
    
    ec2 block device mapping api uses 'true'/'false', not 'True'/'False'.
    So teach ec2 api parser case insensitive true/false conversion.

 nova/api/ec2/apirequest.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a7c36f68793a7db454d344187d4596ebecc8ade0
Merge: 1a82826 103bcae
Author: termie <code@term.ie>
Date:   Fri May 27 01:11:00 2011 +0000

    Adds the ability to make a call that returns multiple times (a call returning a generator). This is also based on the work in rpc-improvements + a bunch of fixes Vish and I worked through to get all the tests to pass so the code is a bit all over the place.
    
    The functionality is being added to support Vish's work on removing worker access to the database, this allows us to write multi-phase actions that yield state updates as they progress, letting the frontend update the db.

commit 103bcae9f172dfee64e7b9235807bcfe1a8aefb3
Author: termie <code@term.ie>
Date:   Thu May 26 17:06:52 2011 -0700

    fix a minor bug unrelated to this change

 nova/rpc.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit ec3693a67baeb4e363d1b2f9f5a01c1032707495
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 26 18:13:04 2011 -0500

    updated the way allocate_for_instance and deallocate_for_instance handle kwargs

 nova/network/api.py     |    2 ++
 nova/network/manager.py |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 2819681b762fe8a23f3af68f1c1cbed0a113c08e
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 18:14:38 2011 -0400

    Rename instances.image_id to instances.image_ref.

 nova/api/ec2/cloud.py         |    6 +++---
 nova/compute/api.py           |    2 +-
 nova/compute/manager.py       |    2 +-
 nova/db/sqlalchemy/api.py     |    2 +-
 nova/db/sqlalchemy/models.py  |    4 ++--
 nova/tests/test_cloud.py      |    6 +++---
 nova/tests/test_compute.py    |    2 +-
 nova/virt/libvirt/firewall.py |    4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

commit d7e0b45a9bc415e87beee32f10c8d6bdff9819ed
Author: termie <code@term.ie>
Date:   Thu May 26 15:08:53 2011 -0700

    changes per review

 nova/rpc.py                |   17 ++++++++++-------
 nova/service.py            |   17 ++++++++---------
 nova/tests/test_rpc.py     |   12 +++---------
 nova/tests/test_service.py |    6 ++++--
 4 files changed, 25 insertions(+), 27 deletions(-)

commit fbda409b8c803f0ef46bc2e239beacd1a2697a11
Merge: 7422146 a380edb
Author: Jason Koelker <jason@koelker.net>
Date:   Thu May 26 16:38:33 2011 -0500

    merge with dietz

commit 7422146ec666f5d3ad3452361489270516ee6084
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 16:36:49 2011 -0500

    stub out passing the network

 nova/tests/test_xenapi.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a380edb3c1ae988406c6a79272ae5e07cda5856c
Merge: 924d7a8 e621f9c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 26 16:33:53 2011 -0500

    Merge from koelker

commit 924d7a88aa9e6d81e20babc0f1d780b3e916300a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 26 16:30:47 2011 -0500

    Virt tests passing while assuming the old style single nics

 nova/db/api.py            |    7 ++++
 nova/db/sqlalchemy/api.py |   13 ++++++++
 nova/test.py              |    4 +--
 nova/tests/__init__.py    |    4 +++
 nova/tests/test_virt.py   |   78 ++++++++++++++++++++++++++++-----------------
 nova/virt/libvirt_conn.py |   29 ++++++++++++++---
 6 files changed, 98 insertions(+), 37 deletions(-)

commit a79f01fcea81bb6be233a65670c6a79af8534a10
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 17:27:48 2011 -0400

    adding TODOs per dabo's review

 nova/api/openstack/wsgi.py |    2 ++
 1 file changed, 2 insertions(+)

commit 1fd3f5a6edf911dc84e11130bc2c590567d780c3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 17:05:55 2011 -0400

    Fixes from Ed Leafe's review suggestions.

 nova/api/ec2/admin.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit a027d887b7c18e27fed951c5ed22bf5dd097c560
Merge: 613aee2 1a82826
Author: Cory Wright <corywright@gmail.com>
Date:   Thu May 26 16:58:40 2011 -0400

    merge trunk

commit 613aee2dd146957cb0c040d7a7a1a661b487efbc
Author: Cory Wright <corywright@gmail.com>
Date:   Thu May 26 16:58:06 2011 -0400

    move udev file so it follows the xen-backend.rules

 .../etc/udev/rules.d/openvswitch-nova.rules        |    3 ---
 .../etc/udev/rules.d/xen-openvswitch-nova.rules    |    3 +++
 .../xensource/scripts/ovs_configure_vif_flows.py   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 1a82826742c6512278c3f562bb75119aefff4b71
Merge: 146e3a7 fc27a0a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 20:55:53 2011 +0000

    Essentially adds support for wiring up a swap disk when building.
    
    Modifies the glance plugin to check for a swap.vhd.  Glance's download_vhd will now return a list of dictionaries describing VHDs found in the image.  All returns from _fetch_image calls in xenapi have been modified accordingly.
    
    One can now build a .ova for glance that contains an image.vhd and a swap.vhd files.
    
    When a VM is created, it'll iterate through the list and create VBDs for all of the VDIs found.
    
    Added a test for this, too, which required a slight fix to xenapi's fake.py.

commit fc27a0ac4f907282a669e2c9f3e128890907f236
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 20:21:40 2011 +0000

    add a comment when calling glance:download_vhd so it's clear what is returned

 nova/virt/xenapi/vm_utils.py |    4 ++++
 1 file changed, 4 insertions(+)

commit e621f9c63e3ba676c3ce33ca227b96c5d6b68afa
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 15:17:20 2011 -0500

    make the fakes be the correct

 nova/tests/db/fakes.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 48f2a7a152f1edd8df0267c0455e14871e083b84
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 15:03:30 2011 -0500

    skip vmware tests, since they need to be updated for multi-nic by someone who knows the backend

 nova/tests/test_vmwareapi.py |  528 ++++++++++++++++++++++--------------------
 1 file changed, 276 insertions(+), 252 deletions(-)

commit 9e22f51c80cc5f7f5ea60b5b8bb779779a19667c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 20:01:09 2011 +0000

    put back the hidden assert check i accidentally removed from glance plugin

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 ++
 1 file changed, 2 insertions(+)

commit 04785db717492c8ba7c2d184924b3773ec944f4c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 19:37:51 2011 +0000

    fix image_path in glance plugin

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4d8995813d070530f1b6aa4a8d07758cd7d74ec2
Merge: 8996420 146e3a7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 19:30:23 2011 +0000

    Merged trunk

commit f7c87c704571dab364905dbf11c3a1ef6919be20
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 14:27:47 2011 -0500

    skip the network tests for now

 nova/tests/network/base.py      |    2 ++
 nova/tests/test_flat_network.py |    5 +++++
 nova/tests/test_vlan_network.py |    8 ++++++++
 3 files changed, 15 insertions(+)

commit 899642030dd60541153ccee810d082816f92dd49
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 19:27:27 2011 +0000

    Change the return from glance to be a list of dictionaries describing VDIs
    Fix the rest of the code to account for this
    Add a test for swap

 nova/tests/test_xenapi.py                          |   23 +++++
 nova/tests/xenapi/stubs.py                         |   23 ++++-
 nova/virt/xenapi/fake.py                           |    5 +-
 nova/virt/xenapi/vm_utils.py                       |   49 ++++++----
 nova/virt/xenapi/vmops.py                          |   52 ++++++-----
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   97 +++++++++++++-------
 6 files changed, 168 insertions(+), 81 deletions(-)

commit 3264c18fffa26b1288fc253f2526d9a78fdc9dd4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 15:01:24 2011 -0400

    cleaning up getattr calls with default param

 nova/api/openstack/wsgi.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

commit cc7aec17929414c58bbfdde609930e66e6f17028
Merge: c0cc56e cc51542
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 12:00:15 2011 -0700

    branch 2a merge (including trunk)

commit cc51542911e4a34df75bd23a4a71a395e906e681
Merge: 788893e 146e3a7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:52:42 2011 -0700

    trunk merge

commit c0cc56e3b7f00bc57316acfd92f2ceba4fc2be30
Merge: 9a9dc80 788893e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:47:37 2011 -0700

    remerged with 2a

commit 9a9dc80bcb47db5864b0c35fe1dd1a636b0a933e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:34:53 2011 -0700

    tests pass and pep8'ed

 nova/compute/api.py           |   30 +++++++++++++++---------------
 nova/scheduler/api.py         |    4 ++--
 nova/scheduler/host_filter.py |    4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

commit 2d834fa19078c645e3c36001b5dd34fb8e708f0a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 14:09:59 2011 -0400

    review fixups

 nova/api/openstack/wsgi.py            |   27 ++++++++++++++++-----------
 nova/tests/api/openstack/test_wsgi.py |    2 +-
 nova/wsgi.py                          |    4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

commit b9b16ca71d4bbb9782482bdf5d848bb5b787732f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 26 13:59:25 2011 -0400

    Expanded tests

 nova/tests/api/openstack/test_images.py |  122 +++++++++++++++++++++++++++++--
 1 file changed, 116 insertions(+), 6 deletions(-)

commit 146e3a7a4f38e17dfbdac12860cffa057c936ed4
Merge: db18a79 61a4dd1
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu May 26 17:55:52 2011 +0000

    In vmwareapi_net.py removed the code that defines the flag 'vlan_interface' and added code to set default value for the flag 'vlan_interface' to 'vmnic0'. This will now avoid flag re-definition issue.

commit 788893ef2a17a4fda5e907f048a94f3ed0435bbc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 10:53:48 2011 -0700

    missed a driver reference

 nova/compute/api.py           |    2 +-
 nova/scheduler/host_filter.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 75ec3d77d3fa4078bbe7d647377f987d87d97651
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu May 26 10:30:27 2011 -0700

    exceptions are logged via the raise, so just log an error message

 nova/image/s3.py |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit ff75e808eef06a72c0198fe976c19c60256c6b74
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu May 26 10:28:22 2011 -0700

    log upload errors

 nova/image/s3.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 7c0564baf72cbb5c3693ab72c72684a5c6b333c5
Author: John Tran <jhtran@att.com>
Date:   Thu May 26 10:22:45 2011 -0700

    instance obj returned is not a hash, instead is sqlalchemy obj and hostname attr is what the logic is looking for

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f726587dea5f06ac673cee0ecdefdc81118ab59a
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 11:54:45 2011 -0500

    we don't need the mac or the host anymore

 nova/tests/network/base.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 168d4556365fafcb34e9536f7f932d4da24b30a6
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 12:48:07 2011 -0400

    Test tweaks.

 nova/tests/test_libvirt.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 87c702f9560165d78bd66a45eecc4ae49443229d
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 11:21:13 2011 -0500

    instances don't need a mac_address to be created anymore

 nova/tests/test_volume.py |    1 -
 1 file changed, 1 deletion(-)

commit 93bfea42bdd594030c8ae046f87291ff184ef3f6
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 12:09:04 2011 -0400

    Make a cleaner log message and use [] instead of . to get database fields.

 nova/tests/test_libvirt.py    |    5 +----
 nova/virt/libvirt/firewall.py |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

commit 94db3e261614bdc790090252d78490a58b127aff
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 11:07:35 2011 -0500

    use the skip decorator rather than comment out

 nova/tests/test_cloud.py |   76 ++++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

commit 308d9f0ba185c8cfc3ff28b744bd684c2aa7e775
Merge: 2c16eb3 db18a79
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 12:06:54 2011 -0400

    merging trunk

commit a60cad6a27d67f519236392df808ed6d3d94f5fb
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 26 11:03:36 2011 -0500

    Adding some pluralization

 nova/tests/test_virt.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit a5c9f44295df4054e9afb135aaa76c5e34cc3624
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:53:25 2011 -0400

    Double quotes are ugly #3.

 nova/virt/libvirt/firewall.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ba530da9d1cee43243900f16ee5354d6374e995f
Merge: d1f0b9c 8464533
Author: Jason Koelker <jason@koelker.net>
Date:   Thu May 26 10:46:20 2011 -0500

    merge with dietz

commit 459864dc0a05e6a0db642e9cb80ceade7b000ce8
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:45:46 2011 -0400

    fix typo introduced during merge conflict resolution.

 nova/virt/libvirt/firewall.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dfd6e6e3a46c2fbbb4e771d38396348c9659a0bd
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:44:18 2011 -0400

    Remove spurious newline at end of file.

 nova/virt/libvirt/connection.py |    1 -
 1 file changed, 1 deletion(-)

commit a8f2a6444f4198db5fd5f05f7d2ae94e953a0fa2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:40:08 2011 -0400

    Move migration to fix ordering.

 .../versions/014_add_provider_fw_rules.py          |   75 --------------------
 .../versions/019_add_provider_fw_rules.py          |   75 ++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)

commit b114b618e4ce112589773cbe63daf0ee70b900be
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:39:03 2011 -0400

    remove dead/duplicate code.

 nova/db/sqlalchemy/api.py |    4 ----
 1 file changed, 4 deletions(-)

commit ace6c5f82810c9984fc3e0bb24a9c37c00e8ac39
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:36:45 2011 -0400

    Double quotes are ugly #2.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0be9e06c09c1d08802a8963e34090b5fcedb19be
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:35:58 2011 -0400

    Double quotes are ugly.

 nova/api/ec2/admin.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit eb90339f094da74eafcc6555907e247e25a8902b
Merge: 2278f28 db18a79
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:30:07 2011 -0400

    Merge trunk.

commit bc176751de7f55d22d1bb04552bbff9c496979ed
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 08:28:57 2011 -0700

    refactoring compute.api.create()

 nova/compute/api.py                    |  193 +++++++++++++++++++-------------
 nova/scheduler/driver.py               |    7 ++
 nova/scheduler/manager.py              |    4 +
 nova/scheduler/zone_aware_scheduler.py |    6 +
 4 files changed, 135 insertions(+), 75 deletions(-)

commit 995a65ac42b4e36679ad0708a227139cdd3bc06e
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 11:21:28 2011 -0400

    Fix test_cloud tests.

 nova/api/ec2/cloud.py    |    2 +-
 nova/tests/test_cloud.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit f37d94428dd0b56632958d5d3a6930531a51cd44
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 26 10:54:46 2011 -0400

    Restricted image filtering by name and status only

 nova/api/openstack/images.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 131d5bcae4e5f0ab48369e2979f16468bd0900a4
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 10:34:17 2011 -0400

    Switch the run_instances call in the EC2 back to 'image_id'. Incoming
    requests use 'imageId' so we shouldn't modify this for image HREF's.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6b0334ecbec8067f97ec936d7969738681a0e7e6
Merge: 7816727 db18a79
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 10:32:58 2011 -0400

    Merge w/ trunk.

commit ac3348ae282b218a941b33a2d17b7d5ddaeebab6
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 09:16:02 2011 -0400

    Switching back to chown. I'm fine w/ setfacl too but nova already has 'chown'
    via sudoers so this seems reasonable for now.

 nova/virt/xenapi/vm_utils.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit a021b43b7d45f8cc803721002a0b2e7d9ea9a06d
Merge: 9d2513e db18a79
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 26 09:05:14 2011 -0400

    Merge w/ trunk.

commit 87717c33ae78201a24c0f5a3416ae4b0080e4668
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu May 26 20:49:14 2011 +0900

    replace double quatation to single quatation at nova.virt.libvirt_conn

 nova/virt/libvirt_conn.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit ce5c7287e06cb7ce1d1a41354a5d6ea073d308d0
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu May 26 20:31:50 2011 +0900

    remove unnecessary import inspect at nova.virt.libvirt_conn

 nova/virt/libvirt_conn.py |    1 -
 1 file changed, 1 deletion(-)

commit 34d660128b8fa935dc1a1d5b0b22e8177135d3a8
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu May 26 19:46:11 2011 +0900

    creating _take_action_to_instance to nova.virt.libvirt_conn.py

 nova/virt/libvirt_conn.py |   43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

commit 61a4dd17be5d89e8aac62d6783310cb5ddb6ee60
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu May 26 10:36:52 2011 +0530

    Instead of redefining the flag 'vlan_interface', just setting a default value (vmnic0) in vmwareapi_net.py

 nova/network/vmwareapi_net.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 781672793c5fb774c5d9d291798775db471233b2
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 25 19:57:04 2011 -0400

    Renamed image_ref variables to image_href. Since the convention is that x_ref
    vars may imply that they are db objects.

 nova/api/ec2/cloud.py                       |    2 +-
 nova/api/openstack/servers.py               |   14 +++++++-------
 nova/api/openstack/views/servers.py         |    8 ++++----
 nova/compute/api.py                         |    6 +++---
 nova/exception.py                           |    2 +-
 nova/image/__init__.py                      |   26 +++++++++++++-------------
 nova/tests/api/openstack/test_servers.py    |   26 +++++++++++++-------------
 nova/tests/integrated/integrated_helpers.py |    8 ++++----
 nova/tests/test_cloud.py                    |    4 ++--
 nova/tests/test_compute.py                  |    6 +++---
 nova/tests/test_quota.py                    |   10 +++++-----
 nova/virt/images.py                         |    4 ++--
 nova/virt/libvirt_conn.py                   |    6 +++---
 13 files changed, 61 insertions(+), 61 deletions(-)

commit 846453302c0c5b66ac11a5ab93972ec9b1dea91f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 25 17:49:38 2011 -0500

    Added test skipper class

 nova/compute/manager.py   |    7 ++++---
 nova/db/sqlalchemy/api.py |    2 +-
 nova/test.py              |   16 ++++++++++++++++
 nova/tests/test_quota.py  |    1 +
 nova/tests/test_virt.py   |    2 ++
 5 files changed, 24 insertions(+), 4 deletions(-)

commit feb04f0117450bcd6e8f4966f4487575073be41c
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    change the behavior of calling a multicall

 nova/rpc.py            |    8 +++++---
 nova/tests/test_rpc.py |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

commit a05e8e7587e42633e8459fd050eee3a4da247330
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    move consumerset killing into stop

 nova/service.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit b3506a471bbce063d72aead211f45d693bda7853
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    don't put connection back in pool

 nova/service.py |    1 -
 1 file changed, 1 deletion(-)

commit f56df190ee888ae731740e7e949fb6f0c012d687
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    replace removed import

 nova/tests/test_cloud.py |    1 +
 1 file changed, 1 insertion(+)

commit 7755bbfc7b16248dab23bfab479d09501519290f
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    cleanups

 nova/tests/test_rpc.py |   47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

commit c7fe7e5e28b9f4bb999c8309f56953f6609cbc57
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:49 2011 -0700

    cleanup the code for merging

 nova/fakerabbit.py       |    4 ---
 nova/rpc.py              |   78 +++++++++++++++++++++-------------------------
 nova/service.py          |   23 ++++++--------
 nova/test.py             |    2 +-
 nova/tests/test_cloud.py |    3 --
 nova/tests/test_rpc.py   |    1 -
 run_tests.py             |    1 -
 7 files changed, 46 insertions(+), 66 deletions(-)

commit 9334d41c6fe638a3119327702094695cfbd38271
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:25 2011 -0700

    make sure that using multicall on a call with a single result still functions

 nova/rpc.py            |    4 ++--
 nova/tests/test_rpc.py |   29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

commit c9b21b0619891c069251c568e4d89be791af56c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 25 15:42:24 2011 -0700

    lots of fixes for rpc and extra imports

 nova/fakerabbit.py                          |   12 +++--
 nova/rpc.py                                 |   68 ++++++++++-----------------
 nova/service.py                             |    9 ++--
 nova/test.py                                |    8 ++--
 nova/tests/integrated/integrated_helpers.py |    5 +-
 5 files changed, 45 insertions(+), 57 deletions(-)

commit e3a88390fd62308cde3d4c597d653c8dc245bed4
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    don't need to use a separate connection

 nova/rpc.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 64b13a2aad676d2310947e3bf8b9e3dde6b763e7
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    almost everything working with fake_rabbit

 nova/rpc.py              |   16 +++++++++++++++-
 nova/service.py          |   22 ++++++++++++++++------
 nova/test.py             |    1 +
 nova/tests/test_cloud.py |    4 ++--
 run_tests.py             |    1 +
 5 files changed, 35 insertions(+), 9 deletions(-)

commit 51e8eeb9b3a23f811bcbf52d9700d94c5c8b15e4
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    bring back commits lost in merge

 nova/rpc.py            |  107 ++++++++++++++++++++++++++++--------------------
 nova/tests/test_rpc.py |   19 +++++++++
 2 files changed, 82 insertions(+), 44 deletions(-)

commit b193b97054f11664a72cd53547f355d1c9044f88
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    connection pool tests and make the pool LIFO

 nova/rpc.py            |    8 +++++++-
 nova/tests/test_rpc.py |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

commit 11d3672ad655c39265e5d2477a30db3a12adc65c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    Add rpc_conn_pool_size flag for the new connection pool

 nova/rpc.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 5f3adfc3110ed8095cdac43cc651aa46087c5490
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    Always create Service consumers no matter if report_interval is 0
    Fix tests to handle how Service loads Consumers now

 nova/service.py            |   46 ++++++++++++++++++-----------------
 nova/tests/test_service.py |   57 +++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 75 insertions(+), 28 deletions(-)

commit 8f2557dcd3e3d88c0eabb63bcce90ced79347ae4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    catch greenlet.GreenletExit when shutting service down

 nova/rpc.py     |    2 +-
 nova/service.py |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 90e30806a2e0c235612eb09792656cd861997f84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 25 15:42:24 2011 -0700

    fix consumers to actually be deleted and clean up cloud test

 nova/fakerabbit.py       |   13 +++++++++----
 nova/rpc.py              |   13 ++++++++++---
 nova/service.py          |    8 +++-----
 nova/tests/test_cloud.py |   26 ++++++++++----------------
 4 files changed, 32 insertions(+), 28 deletions(-)

commit f2c2a593c828fc86e298d3eb31672a09b498c41f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    fakerabbit's declare_consumer should support more than 1 consumer.  also: make fakerabbit Backend.consume be an iterator like it should be..

 nova/fakerabbit.py |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit d0be426d4e7bbfb1ecb3f078c71c1e176da441a5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    convert fanout_cast to ConnectionPool

 nova/rpc.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e1a47584cc63136280cf3ca9ef02da3efc1dff7f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    pep8 and comment fixes

 nova/rpc.py     |   25 ++++++++++++++++---------
 nova/service.py |    1 -
 2 files changed, 16 insertions(+), 10 deletions(-)

commit b44c1fe9561ee8754137d2700bab295f20a4032b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    Add a connection pool for rpc cast/call
    Use the same rabbit connection for all topic listening and wait to be notified vs doing a 0.1 second poll for each.

 nova/rpc.py     |   96 +++++++++++++++++++++++++++++++++++++++++--------------
 nova/service.py |   21 ++++++------
 2 files changed, 84 insertions(+), 33 deletions(-)

commit 7622e854ef68fbdbfc531690cf74916301956c8e
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    add commented out unworking code for yield-based returns

 nova/rpc.py |    5 +++++
 1 file changed, 5 insertions(+)

commit d46c9fffe4fab8f55483c73d3e6ef12116de9bc5
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    make the test more expicit

 nova/tests/test_rpc.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit fdd27860724cd57db6df059a97e98289f88ce6ac
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    add support to rpc for multicall

 nova/rpc.py            |   99 +++++++++++++++++++++++++++++++++++-------------
 nova/tests/test_rpc.py |   17 +++++++++
 2 files changed, 90 insertions(+), 26 deletions(-)

commit d1f0b9c65ec85ae134727069d0d8a96e42b4388a
Merge: 199c6d9 b3b2863
Author: Jason Koelker <jason@koelker.net>
Date:   Wed May 25 17:15:31 2011 -0500

    merge with dietz

commit b3b2863a8f76f87a601d0b9fe7cc523ca718310a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 25 16:37:39 2011 -0500

    Fixing divergence

 nova/compute/manager.py   |    7 ++++---
 nova/db/sqlalchemy/api.py |    2 +-
 nova/test.py              |    9 +++++++++
 nova/tests/test_quota.py  |    1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

commit 719dfcd62cec0f89b6e86b202f84ea79f448d4c7
Merge: c440aec db18a79
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 17:36:51 2011 -0400

    Merged trunk

commit c440aecaaacf3caa8683234022bc10836d232971
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 17:28:10 2011 -0400

    Added params to local and base image service

 nova/image/local.py   |    4 ++--
 nova/image/service.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit db18a792414240cbdb1221d0e79e8a63313f103e
Merge: ec0e674 60d78fb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 21:16:01 2011 +0000

    Fixed the mistyped line referred to in bug 787023

commit 60d78fb3962e5bdd5f642a8982f53656bda20314
Merge: 9d118de ec0e674
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 16:58:40 2011 -0400

    Merged trunk and resolved conflicts

commit 775566067a1f764baec5036357ad47a57316da03
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 16:58:12 2011 -0400

    Fixed a typo

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 199c6d9259ee1ce22cb4b3403d92620af7c5869f
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 15:55:27 2011 -0500

    make the test work

 nova/network/manager.py  |    1 +
 nova/tests/test_quota.py |   16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

commit fe77c55b7643bd9bd3bd988f7f759dde8af09cae
Merge: 818c242 ec0e674
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu May 26 00:51:14 2011 +0400

    Merged with trunk

commit ec0e674ce1a8539143e9b99deb8cc62b9d42d6b2
Merge: 9ec9a8b aebbb90
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 25 20:35:16 2011 +0000

    Several changes designed to bring the openstack api 1.1 closer to spec
    - add ram limits to the nova compute quotas
    - enable injected file limits and injected file size limits to be overridden in the quota database table
    - expose quota limits as absolute limits in the openstack api 1.1 limits resource
    - add support for controlling 'unlimited' quotas to nova-manage

commit 9ec9a8b39db2d65b7ce8d74f994cb32c49a56df8
Merge: a2505ee bd0b4b8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 20:31:05 2011 +0000

    During the API create call, the API would kick off a build and then loop in a greenthread waiting for the scheduler to pick a host for the instance.  After API would see a host was picked, it would cast to the compute node's set_admin_password method.
    
    The API server really should not have to do this.  The password to set should be pushed along with the build request, instead.  The compute node can then set the password after it detects the instance has booted.  This removes a greenthread from the API server, a loop that constantly checks the DB for the host, and finally a cast to the compute node.

commit 660d1802a6c202465af585a059930113de5ae646
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 13:20:34 2011 -0700

    starting breakdown of nova.compute.api.create()

 nova/compute/api.py   |   67 +++++++++++++++++++++++++++++++++++++++++++------
 nova/scheduler/api.py |    7 ++++++
 2 files changed, 67 insertions(+), 7 deletions(-)

commit bd0b4b87da9e960042c3d0caf00370ef526ce8b7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 20:10:25 2011 +0000

    fix test.  instance is not updated in DB with admin password in the API anymore

 nova/tests/api/openstack/test_servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit da40229d86399583be3bd73c979e7237c40bb760
Merge: 5a95b69 a2505ee
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 16:02:09 2011 -0400

    Merged upstream

commit aebbb90f84e8793040c7dd75eb67ae4914186301
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 25 15:51:47 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_limits.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5a95b6923a7ca37d292edc0aceb5e4b34a1ccbaf
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 15:48:03 2011 -0400

    Initial tests

 nova/tests/test_instance_types_metadata.py |   62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

commit f2507b3cb77538c1434fea485c4861c11ef3f48b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 19:05:20 2011 +0000

    fix forever looping on a password reset API call

 nova/compute/manager.py |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit b933f90faecaddf7281455f4824577b586e07f0c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 17:55:51 2011 +0000

    updating admin_pass moved down to compute where the password is actually reset.  only update if it succeeds.

 nova/api/openstack/servers.py |    1 -
 nova/virt/xenapi/vmops.py     |    3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit de8a8e608ddc5e909c60933cc9cadc7cf71501ae
Merge: ed582a8 a2505ee
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 17:02:45 2011 +0000

    merged trunk

commit ed582a8b86f81140affd88805ba9989b591577cd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 17:01:20 2011 +0000

    change install_ref.admin_password to instance_ref.admin_pass to match the DB

 nova/compute/manager.py   |    2 +-
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1f9c53c0018b9c8968c396f2a51d4ac81a4b66cd
Merge: 26842cb a2505ee
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 16:57:44 2011 +0000

    Merged trunk

commit 1e8c46904471fe3cfae8805dcd8f9b64bdb5abac
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:36:17 2011 -0500

    remove my print

 nova/tests/test_cloud.py |    1 -
 1 file changed, 1 deletion(-)

commit 912aa4288e27d517b2d2ff17564b94009aeeec2b
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:34:29 2011 -0500

    we're getting a list of tuples now'

 nova/tests/test_cloud.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 7aadbbc673ed21748f4b371d9e5a1f80f6884b9b
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:31:16 2011 -0500

    we have a list of tuples, not a list of dicts

 nova/compute/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6141221d01026ce277d34ae329767139178b1ea0
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 12:29:23 2011 -0400

    pep8 fixes

 .../versions/019_add_instance_type_metadata.py     |    5 ++---
 nova/db/sqlalchemy/models.py                       |   14 ++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

commit d9a4713133f4d864dd584fd3ce044b025ee53820
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:24:44 2011 -0500

    return the result of the function

 nova/network/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e4bf97ba29e8e5858f37cedb34e20ccd8e210bae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 12:24:27 2011 -0400

    Updated tests to use mox
    pep8

 nova/api/openstack/images.py            |    2 +-
 nova/tests/api/openstack/test_images.py |   14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

commit 7aa62856ebff4242b123f5e0888276237176d066
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 12:19:52 2011 -0400

    InstanceTypesMetadata is now registered

 nova/db/sqlalchemy/models.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 929544f9c9acdb1f5979d2e1458aef4045308028
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:16:12 2011 -0500

    make some changes to the manager so dupe keywords don't get passed
    
    import ipv6 module instead of utils for to_global

 nova/network/manager.py  |   37 ++++++++++++++++++-------------------
 nova/tests/test_cloud.py |    6 ++++--
 2 files changed, 22 insertions(+), 21 deletions(-)

commit 354b2303e684e50cccb28f7b8af13b19a27e0415
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 12:15:58 2011 -0400

    Fixing the InstanceTypesMetadata table definition

 nova/db/sqlalchemy/models.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 537c5aea298a6c09b3329185c2d0eed77a0a21bd
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 25 12:09:53 2011 -0400

    try out mox for testing image request filters

 nova/tests/api/openstack/test_images.py |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit f694bc15b921cd4affa5b5b63ed0eb9073516b44
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 12:07:40 2011 -0400

    Adding the migrate code to add the new table

 .../versions/019_add_instance_type_metadata.py     |   68 ++++++++++++++++++++
 1 file changed, 68 insertions(+)

commit f6f98f1fe905443eacbfb036f1b6ff6c6f5d5261
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 09:00:13 2011 -0700

    dist-sched-2a merge

 nova/api/openstack/zones.py |    3 ---
 1 file changed, 3 deletions(-)

commit a2505ee554052ee591d1a79c2329c50b31a43dc4
Merge: e82ef12 99bab1b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 25 15:58:17 2011 +0000

    Created new libvirt directory, moved libvirt_conn.py to libvirt/connection.py, moved libvirt templates, broke out firewall and network utilities.

commit ffc997579166748b8c0f38c310ae5fca4dd57f96
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 10:51:55 2011 -0500

    make the column name correct

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e82ef1255631b2b2d4b209eb112b320f24f6d3f2
Merge: 6f3f188 7387af3
Author: Ed Leafe <ed@leafe.com>
Date:   Wed May 25 15:45:53 2011 +0000

    The code for getting an opaque reference to an instance assumed that there was a reference to an instance obj available when raising an exception. I changed this from raising an InstanceNotFound exception to a NotFound, as this is more appropriate for the failure, and doesn't require an instance ID.

commit 9d842298d9e771b7b25ecd94c3e2437c65d00beb
Merge: f4cc59f 30b6d5e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:42:58 2011 -0700

    merge against 2a

commit 30b6d5e2722d1c92115f668b405dc7eed9cc27b2
Merge: 714fe83 6f3f188
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:22:51 2011 -0700

    trunk merge

commit 0b9ede226674b253f638b78cdce5fa40b2991701
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 25 11:21:46 2011 -0400

    simplified the limiting differences for different versions of the API

 nova/api/openstack/images.py |   30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

commit f4cc59f0d4344deecea59a7276a50d446f1ea2cd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:17:50 2011 -0700

    New tests added

 nova/api/openstack/servers.py           |    2 -
 nova/api/openstack/zones.py             |    1 -
 nova/exception.py                       |    2 +-
 nova/scheduler/zone_aware_scheduler.py  |  177 ++++++++++++++++---------------
 nova/tests/test_zone_aware_scheduler.py |  143 +++++++++++++++++++++++++
 5 files changed, 237 insertions(+), 88 deletions(-)

commit 7387af3ab5a310f7c427f0257e531871f62f398d
Author: Ed Leafe <ed@leafe.com>
Date:   Wed May 25 14:57:52 2011 +0000

    Changed the exception type to not require an instance ID

 nova/virt/xenapi/vmops.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6365f4141715c6806d40698add59c294613bc063
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed May 25 09:35:35 2011 -0400

    Added model for InstanceTypeMetadata

 nova/db/sqlalchemy/models.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 3d9569147cee2eaa94fc49c55b40f70a72171ebe
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 09:33:51 2011 -0400

    Added test

 nova/tests/api/openstack/test_images.py |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit d380729b162c8d6120279db74327e61a4942e28f
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 18:02:07 2011 +0900

    Avoid wildcard import.

 .../versions/020_add_snapshot_id_to_volumes.py     |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f3125b3012da7b6429e4e551060498e665c4596e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 17:51:30 2011 +0900

    Add unittests for cloning volumes.

 nova/tests/test_cloud.py  |   19 +++++++++++++++++++
 nova/tests/test_volume.py |   20 +++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

commit c3b9bd18aa3e9dcc12d53aa38c6e0ddb85329209
Merge: 2adf372 6f3f188
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed May 25 17:09:42 2011 +0900

    merged recent trunk

commit 2adf37233cb1b145bcb95e20bec53ea186558265
Merge: 8c66d79 02b9759
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed May 25 17:03:14 2011 +0900

    merged recent trunk

commit 7139cf1f0cfe9241a1710e5b7c621db569a2fc2d
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 16:37:52 2011 +0900

    Make snapshot_id=None a default value in VolumeManager:create_volume().  It is not a regular case to create a volume from a snapshot.

 nova/volume/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 46ddecc177830ea0ccef82e84d72c48261450b40
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 25 03:29:16 2011 -0400

    Don't need to import json.

 nova/tests/test_notifier.py |    2 --
 1 file changed, 2 deletions(-)

commit 17abaeafaf3fed2847e4377a16b47771eb663304
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 16:27:28 2011 +0900

    Fix wrong call of the volume api create()

 nova/api/openstack/contrib/volumes.py |    2 +-
 nova/tests/test_quota.py              |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit c5278be5e8e77e6af14e2ba8005ab1874194b77a
Merge: 6559576 e1795bd
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 25 03:18:00 2011 -0400

    Merge from trunk.

commit 6f010bd28983c0d7cc956a52934b1b6460ef3955
Merge: aedd8c4 c5dbee8
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 15:57:58 2011 +0900

    Merge lp:~yamahata/nova/volume-clone

commit aedd8c460f546bb2b27298c86443a94104a2d9db
Merge: c97f254 c04a59f
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 15:46:19 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit 9b9f2c40d847e5be3972f51a897332874d704f1e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 04:48:00 2011 +0000

    pep8 fix in nova/compute/api.py

 nova/compute/api.py |    1 -
 1 file changed, 1 deletion(-)

commit e0aa1369d8050f023fee1e60b276d44a6298feb9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 21:09:43 2011 -0700

    instead of the API spawning a greenthread to wait for a host to be picked,
    the instance to boot, etc for setting the admin password...  let's push the admin password down to the scheduler so that compute can just take care of setting the password as a part of the build process.

 nova/api/openstack/servers.py |    5 ++---
 nova/compute/api.py           |   22 ++++++++++------------
 nova/compute/manager.py       |    1 +
 nova/virt/xenapi/vmops.py     |    8 ++++++++
 4 files changed, 21 insertions(+), 15 deletions(-)

commit a33970f17abb0fed47cd03d48a25709d987b5c25
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 18:09:25 2011 -0700

    tests working again

 nova/scheduler/zone_aware_scheduler.py  |    2 +-
 nova/tests/api/openstack/test_zones.py  |    4 ++++
 nova/tests/test_zone_aware_scheduler.py |    3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

commit 6f3f188e4ca9136f293ecf4b9813a7615c7a5929
Merge: 4108c32 1756c41
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 24 23:10:40 2011 +0000

    eventlet.spawn_n() expects the function and arguments, but it expects the arguments unpacked since it uses *args.

commit 1756c41b96b83c8de21e313a2f2435f1d8b8421d
Merge: d4ac3a3 4108c32
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 24 22:51:29 2011 +0000

    Merge with trunk

commit d4ac3a309b23875312014abaf3fb8f84d373825a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 24 22:49:42 2011 +0000

    Don't pass a tuple since spawn_n will get the arguments with *args anyway

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 26842cba90bd5637bd6aa185b300102ff257d9f1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 22:39:16 2011 +0000

    move devices back

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4108c32a5e30d9ee4367e433471fbf2a5bf15ed2
Merge: 3f84a2d bd01256
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 24 22:31:11 2011 +0000

    Using the root-password subcommand of the nova client results in the password being changed for the instance specified, but to a different unknown password. The patch changes nova to use the password specified in the API call.

commit 3f84a2dfb500a19f44db4c06f22c42e54ce7da2a
Merge: 781ed70 0acbf6d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 22:25:40 2011 +0000

    Pretty simple.  We call openssl to encrypt the admin password, but the recent changes around this code forgot to strip the newline off the read from stdout.

commit 0acbf6d77f02ca0fa3a11e29a55bbb617c33a816
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 22:13:59 2011 +0000

    DHSimple's decrypt needs to append \n when writing to stdin

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 36a3b9dc172a109e1f17dbc531a574ebf9e37453
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 21:41:44 2011 +0000

    need to strip newline from openssl stdout data

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c8cefef4804ee9f67e4c4d4861e5af667577697
Merge: f41f8d2 2b0af0c
Author: Jason Koelker <jason@koelker.net>
Date:   Tue May 24 16:40:24 2011 -0500

    merge with trey

commit f41f8d2be5239dd9d2810bfaf6f432c713907c7f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 16:25:04 2011 -0500

    work on

 nova/tests/test_virt.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 2b0af0ccf792dd2f0420fd8eaa6bc8be8a8671bf
Merge: d3c6f77 781ed70
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue May 24 16:21:47 2011 -0500

    merge trunk

commit d3c6f77f287f8078606ca7fc99a8121cadb76fd4
Merge: 08a2288 330b3fe
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue May 24 16:19:46 2011 -0500

    moved auto assign floating ip functionality from compute manager to network manager

commit 4ee88c529760fcf2a20a3721f7c189a5067ea498
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:59:08 2011 -0500

    create a mac address entry and blindly use the first network

 nova/tests/test_virt.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f2aca8fe4b1ddb611b9b2c73619dcdeeb3603445
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:56:49 2011 -0500

    create a mac address entry and blindly use the first network

 nova/tests/test_virt.py |    1 -
 1 file changed, 1 deletion(-)

commit 67dd7e73dfeea462a515357d665bc19a4217dec5
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:56:03 2011 -0500

    create a mac address entry and blindly use the first network

 nova/tests/test_virt.py |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit 2cdad3733a6c00a8ba9246f16509f612e22e148c
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:53:09 2011 -0500

    need to return the ref

 nova/db/sqlalchemy/api.py |    1 +
 1 file changed, 1 insertion(+)

commit f488576ae27f8eb96a04022d0ecd11a28bd15116
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 24 16:44:28 2011 -0400

    Added filtering on image properties

 nova/api/openstack/images.py            |   23 +++++++++++++++++++++--
 nova/image/fake.py                      |    4 ++--
 nova/image/glance.py                    |    8 ++++----
 nova/tests/api/openstack/fakes.py       |    4 ++--
 nova/tests/api/openstack/test_images.py |    9 +++++++++
 nova/tests/image/test_glance.py         |    2 +-
 6 files changed, 39 insertions(+), 11 deletions(-)

commit 781ed70a4035fe507e2e1e83dcd5262c81792b5a
Merge: 16ad120 6be4938
Author: termie <code@term.ie>
Date:   Tue May 24 20:40:59 2011 +0000

    Fixes a bug related to incorrect reparsing of flags and prevents many extra reparses.

commit a75fc4caeff808d97c37b0215f1a594f99220b2c
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:30:35 2011 -0500

    no use mac

 nova/tests/test_scheduler.py |    1 -
 1 file changed, 1 deletion(-)

commit 19754871dcce1e42f90aa5e38914780b7ce50faa
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:27:25 2011 -0500

    comment out the direct cloud case

 nova/tests/test_direct.py |   43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

commit 6be49381fc1c232e99de3e9774fb6c3e5b685fcf
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    make fake_flags set defaults instead of runtime values

 bin/nova-dhcpbridge      |    7 +++++++
 nova/tests/fake_flags.py |   28 ++++++++++++++--------------
 nova/tests/real_flags.py |   26 --------------------------
 3 files changed, 21 insertions(+), 40 deletions(-)

commit d8e1f0b6b3ab7a8549773910815b1d2a5d1b8f2f
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    add a test from vish and fix the issues

 nova/flags.py            |    1 +
 nova/tests/test_flags.py |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

commit 999d1a4edb1f6992e3bb85e7a45ebd735e8cdb42
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    Properly reparse flags when adding dynamic flags

 nova/flags.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b7a6fe7b49d692ee825fd92629c5ffdeac345531
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:17:38 2011 -0500

    no use mac

 nova/tests/test_console.py |    1 -
 1 file changed, 1 deletion(-)

commit 909000277de6a77de37a4d60c7d5c6c6b0de607b
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:11:54 2011 -0500

    instances don't have mac's anymore and address is now plural

 nova/tests/test_compute.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit bed6e707247c297771661fd8bac7b939b0d9bbcb
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:09:34 2011 -0500

    let the fake driver accept the network info

 nova/virt/fake.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 44a1078604911e963ba819a9e5e64e05b812585f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 14:38:32 2011 -0500

    Comment out the 2 tests that require the instance to contain mac/ip

 nova/tests/test_cloud.py |   76 ++++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

commit f3d7ec3fd2b2b987ae1118a6ae96874e8bbfdac5
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 24 15:16:07 2011 -0400

    initial use of limited_by_marker

 nova/api/openstack/images.py |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 48a3ec6e55f029578d5dc8ef7fe2e9fbe0de1b81
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 12:05:46 2011 -0700

    more fix up

 nova/api/openstack/servers.py          |    1 -
 nova/api/openstack/zones.py            |    2 +-
 nova/compute/api.py                    |    1 -
 nova/scheduler/api.py                  |    4 ----
 nova/scheduler/zone_aware_scheduler.py |   41 +++++++++++++++++++-------------
 nova/service.py                        |    2 --
 6 files changed, 26 insertions(+), 25 deletions(-)

commit a117f2212b2259c4a6658d1634f46e9c862cfea1
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 13:22:11 2011 -0500

    many tests pass now

 nova/db/sqlalchemy/api.py |   13 +++++++++----
 nova/network/manager.py   |   16 ++++++++--------
 nova/tests/test_cloud.py  |   26 +++++++++++++++++++-------
 3 files changed, 36 insertions(+), 19 deletions(-)

commit 416f6eef591390e6a53d9aae71ca8fd65a098129
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 13:21:53 2011 -0500

    its a dict, not a class

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1f8ef6907a5e1c1f88b0fc9f28084dbc8014274f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 12:43:25 2011 -0500

    we don't get the network in a tuples anymore

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a0cffc4de8ba4b15958e320308477d42287858e7
Author: John Tran <jhtran@att.com>
Date:   Tue May 24 09:43:52 2011 -0700

    specified image_id keyword in exception arg

 nova/api/ec2/cloud.py    |    2 +-
 nova/tests/test_cloud.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 16ad120a23552f962a6f68f8cab7aca45a430c48
Merge: 8eebc3c 107eedf
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Tue May 24 16:36:04 2011 +0000

    When adding a keypair with ec2 API that already exists, give a friendly error and no traceback in nova-api

commit 8e7c3121fab4b5a87c2efe865f3c06b1bd267cbc
Author: John Tran <jhtran@att.com>
Date:   Tue May 24 08:59:02 2011 -0700

    added imageid string to exception, per peer review

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8eebc3c701bdbbdb1e03a133c66109048fec909f
Merge: e1795bd bd1bd43
Author: Anne Gentle <anne@openstack.org>
Date:   Tue May 24 14:56:20 2011 +0000

    Fixes some minor doc issues - misspelled flags in zones doc and also adds zones doc to an index for easier findability

commit b8fd215635b850bb9c0309fd7e8e723a78250c32
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 07:36:32 2011 -0700

    removed most of debugging code

 nova/api/openstack/servers.py          |    2 +-
 nova/rpc.py                            |    1 -
 nova/scheduler/manager.py              |    3 +--
 nova/scheduler/zone_aware_scheduler.py |   24 +++++++-----------------
 4 files changed, 9 insertions(+), 21 deletions(-)

commit 6e271a42258b439e8fed55c922792b632e062b63
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 24 10:27:26 2011 -0400

    Fixing docstring.

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 81894967d8b6920f7cf1b64636a7c4f531e81bde
Merge: 11a7736 e1795bd
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue May 24 15:04:58 2011 +0100

    Synchronise with Diablo development.

commit 884b6d3ed74c5a5f766e405ac2178066314fb6d3
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 24 09:51:21 2011 -0400

    make _make_fixture respect name passed in

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 374dc10e07647a54ce76688231e782703896daaa
Merge: fe30e4f e49bb59
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:49:02 2011 -0700

    zone1 merge

commit fe30e4f8d6f757b03b22b821878aee22a35e1161
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:46:09 2011 -0700

    sending calls

 nova/scheduler/zone_aware_scheduler.py |   45 +++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 18 deletions(-)

commit e49bb59db9e9e40eb9941b51403f87b95671752a
Merge: 758d60c 9a2c944
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:45:22 2011 -0700

    accepting calls

commit 84209a3f02f35c16de0614fa81685b242784bf20
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 24 05:26:04 2011 -0400

    Fixing _get_kernel_ramdisk_from_image to use the correct image service.

 nova/api/openstack/servers.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit 51b3d877c53d9c79dbbea21ed4d4abd0a1b91bf8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 24 04:08:10 2011 -0400

    Fixing year of copyright.

 nova/image/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 758d60ccede696c1ef52488c90da7b80b807dedf
Merge: 5d5aad9 0ed4106
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 22:32:15 2011 -0700

    merge

commit 9a2c944be8e7187a12bfd363a2a74325403e00d8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 22:30:01 2011 -0700

    select partially going through

 nova/scheduler/api.py                  |    4 ++--
 nova/scheduler/manager.py              |    4 ++++
 nova/scheduler/zone_aware_scheduler.py |    6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

commit 162bb909238515265572541834d6d2999e0c4dc3
Merge: f49024c e1795bd
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 22:48:17 2011 -0400

    merge from trunk

commit f49024c437f2680a18eb702f2975de2955b98889
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 22:47:44 2011 -0400

    make image_ref and image_id usage more consistant, eliminate redundancy in compute_api.create() call

 nova/api/ec2/cloud.py         |    2 +-
 nova/api/openstack/servers.py |    3 +--
 nova/compute/api.py           |    9 ++++-----
 nova/tests/test_cloud.py      |    4 ++--
 nova/tests/test_compute.py    |    6 +++---
 nova/tests/test_quota.py      |   10 +++++-----
 6 files changed, 16 insertions(+), 18 deletions(-)

commit a5efbca08a6b057290622ba5938f87d2e44be3eb
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 21:55:15 2011 -0400

    take out irrelevant TODO

 nova/compute/api.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 72b173279657f16492280923d562d4dcb705d724
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 18:46:04 2011 -0500

    blah

 nova/network/api.py      |    2 ++
 nova/network/manager.py  |   15 ++++++++-------
 nova/tests/test_cloud.py |    3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

commit 65091eb4b9718c35fdcb3d3d070dffcc4fb820a3
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 18:20:18 2011 -0500

    uhhh yea

 nova/db/sqlalchemy/api.py |    2 +-
 nova/network/api.py       |   15 ++---
 nova/network/manager.py   |  133 ++++++++++++++++++++++-----------------------
 nova/tests/test_cloud.py  |   15 +++--
 4 files changed, 82 insertions(+), 83 deletions(-)

commit 5d5aad97c3c12ca304cc2b9eb46cf7f25d996b4a
Merge: 1017b3f c61ed06
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 16:19:51 2011 -0700

    local tweaks

commit 0ed410621b3c2d621aa3fa52ca7ac46c6a5f0b70
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 16:19:12 2011 -0700

    getting closer to working select call

 nova/api/openstack/servers.py          |    3 +++
 nova/api/openstack/zones.py            |    6 +-----
 nova/compute/api.py                    |   18 ++++++++++--------
 nova/flags.py                          |    2 ++
 nova/scheduler/api.py                  |    5 +++++
 nova/scheduler/manager.py              |    4 +++-
 nova/scheduler/zone_aware_scheduler.py |   17 +++++++++++++++--
 7 files changed, 39 insertions(+), 16 deletions(-)

commit 038ce7e16ee7ee1afc86ded260c1aa0d40d1e1ad
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 22:52:56 2011 +0000

    swap should use device 1 and rescue use device 2

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7a521f49f6daf0a0a37a9ef98ff1ea8813f04a6f
Author: John Tran <jhtran@att.com>
Date:   Mon May 23 14:54:11 2011 -0700

    merged from trunk

 nova/tests/test_cloud.py |   51 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

commit 42c209d90f491d19b3aabc70f8dafc33b76cf20d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 16:51:28 2011 -0500

    fix tests, have glance plugin return json encoded string of vdi uuids

 nova/tests/xenapi/stubs.py                         |   11 +++++++++--
 nova/virt/xenapi/vm_utils.py                       |    6 +++++-
 nova/virt/xenapi/vmops.py                          |    4 ++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    6 +++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

commit a4c648a190e3f93b95aaa694f263125147f95633
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 16:34:37 2011 -0500

    make sure to get a results, not the query

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1816b3e6a99da512aeb51822e90d40f30b443014
Merge: 0a3da15 e1795bd
Author: John Tran <jhtran@att.com>
Date:   Mon May 23 14:27:56 2011 -0700

    merged from trunk

commit bac28418b7b92aa2654fad39d0240a85aa637488
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 23 17:25:59 2011 -0400

    Removing code duplication between parse_image_ref and get_image service.
    Made parse_image_ref private.

 nova/image/__init__.py |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

commit 107eedf06ba6d27e65169302bd51a391e6e104f7
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon May 23 22:15:41 2011 +0100

    Changed ec2 api dupe key exception log handler info->debug

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63dbfeb2cb5b834a0cb4dd23c30522f540ac539b
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Mon May 23 22:15:10 2011 +0100

    Added test case for attempting to create a duplicate keypair

 nova/tests/test_api.py |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit fe92b867a876086636c4d84a103876b1568a74bc
Merge: b6a4f6a 4d1fe95
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 23 16:49:35 2011 -0400

    Removing debug print line

commit b6a4f6aa5b2a97a6a7d79c40c1a3160abc1def39
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 23 16:47:25 2011 -0400

    Renaming service_image_id vars to image_id to reduce confusion.
    Also some minor cleanup.

 nova/api/openstack/images.py             |   11 ++++-------
 nova/api/openstack/servers.py            |    5 ++---
 nova/api/openstack/views/servers.py      |    8 ++++----
 nova/compute/api.py                      |    4 ++--
 nova/tests/api/openstack/test_servers.py |    1 -
 nova/utils.py                            |    2 --
 nova/virt/images.py                      |    8 ++++----
 nova/virt/libvirt_conn.py                |   10 +++++-----
 8 files changed, 21 insertions(+), 28 deletions(-)

commit 94766fac0f5fdb3c7847b1129a8f05948a97f887
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 20:42:54 2011 +0000

    cleanup and fixes

 nova/virt/xenapi/vm_utils.py                       |   18 +++++----
 nova/virt/xenapi/vmops.py                          |   40 ++++++++++++--------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   12 ++++--
 3 files changed, 42 insertions(+), 28 deletions(-)

commit 4d1fe953bbfb810f56224b9faae4c10d0d8dfac0
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 16:38:30 2011 -0400

    got rid of print statement

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit ffac2aa8162ba5111a01b495d9dd7e43bfda4af4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 14:38:37 2011 -0500

    initial fudging in of swap disk

 nova/tests/xenapi/stubs.py                         |    2 +-
 nova/virt/xenapi/vm_utils.py                       |   18 +++++++++++------
 nova/virt/xenapi/vmops.py                          |   21 ++++++++++++--------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   12 ++++++++---
 4 files changed, 35 insertions(+), 18 deletions(-)

commit f22fe4c1f3a44d8f43bcdd8f109083dac2e5ebce
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 14:34:04 2011 -0500

    make the test_servers pass by removing the address tests for 1.1, bug filed

 nova/tests/api/openstack/test_servers.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 262fe4bab6f99a7be83d47fbb8582d5cdc75779e
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:51:53 2011 -0500

    port the current create_networks over to the new network scheme

 nova/tests/__init__.py |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit 76ddebd1f0848803215eb8f33961e52bced5f058
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:43:26 2011 -0500

    need to have the complete table def since sqlalchemy/sqlite won't reload the model

 .../migrate_repo/versions/015_multi_nic.py         |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 950e830df8f6e1628739424809a71b1e6a91866a
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:38:33 2011 -0500

    must have the class defined before referencing it

 nova/db/sqlalchemy/models.py |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 15a02b247436ba71c4f64a8ac8d79b32cc8883f1
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:06:55 2011 -0500

    make the migration run with tests

 .../migrate_repo/versions/015_multi_nic.py         |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 714fe839580d4858417592608e4bf95ac26cf5d1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 10:39:50 2011 -0700

    get rid of all mention of drivers ... it's filter only now

 nova/exception.py              |    5 +--
 nova/scheduler/host_filter.py  |   55 ++++++++++++------------
 nova/tests/test_host_filter.py |   93 +++++++++++++++++++---------------------
 3 files changed, 75 insertions(+), 78 deletions(-)

commit 57acd948d8d1584262f9e7fc1845be57ab8f2ffd
Merge: 67a9b67 e1795bd
Author: Cory Wright <corywright@gmail.com>
Date:   Mon May 23 11:39:39 2011 -0400

    merge trunk

commit e1795bd73c71a20290bc988c410e0cc30afe6bd8
Merge: 4f8f5cb fd8b9eb
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Mon May 23 15:36:18 2011 +0000

    Fixes euca-attach-volume for iscsi using Xenserver
    
    Minor changes required to xenapi functions to get correct format for volume-id, iscsi-host, etc.

commit efad5e4f1475c77e0dadadc6fad8cf3ca485fd32
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 10:35:48 2011 -0500

    fix typo

 .../migrate_repo/versions/015_multi_nic.py         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9d118de526c3b4b190b543c0bd838df6ce175d1c
Merge: fd85e72 2a9774a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 23 11:23:40 2011 -0400

    merge branch lp:~rackspace-titan/nova/ram-limits

commit fd85e72a4cd05d7298c253d2ae32502c83482623
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 23 11:10:40 2011 -0400

    Added test

 nova/tests/api/openstack/test_limits.py |   51 +++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

commit bd1bd43690d4ef08a1465a3ff574e4c50d6cc7c9
Author: Anne Gentle <anne@openstack.org>
Date:   Mon May 23 09:39:15 2011 -0500

    Fixes missing space

 doc/source/runnova/managing.users.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d72815193d64b9dcce974888bef05a18689c0504
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 23 10:37:28 2011 -0400

    Fixed mistyped line

 nova/api/openstack/views/limits.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d34d40ec9530a80d333b4884ac58776ca9dafea
Merge: d44299b 4f8f5cb
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Mon May 23 23:35:06 2011 +0900

    Rebased to trunk rev 1101.

commit c34d13c500510563c959db134fbe861d41a4c34d
Merge: 1c315d2 4f8f5cb
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 10:28:42 2011 -0400

    merge from trunk

commit 1c315d233128f1013d1ec02c78acb36821f6c63d
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 10:28:04 2011 -0400

    moved utils functions into nova/image/

 bin/nova-manage                          |    3 +-
 nova/api/openstack/image_metadata.py     |    3 +-
 nova/api/openstack/images.py             |    9 ++--
 nova/api/openstack/servers.py            |   10 ++--
 nova/compute/api.py                      |    7 ++-
 nova/image/__init__.py                   |   77 ++++++++++++++++++++++++++++++
 nova/image/s3.py                         |    3 +-
 nova/tests/api/openstack/test_servers.py |    1 +
 nova/utils.py                            |   49 -------------------
 nova/virt/images.py                      |    3 +-
 nova/virt/libvirt_conn.py                |    6 ++-
 11 files changed, 107 insertions(+), 64 deletions(-)

commit bf0491ec2ee1d24de0e5f3a1d10f9ab45f639f2a
Merge: 40f15a6 4f8f5cb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 05:30:44 2011 -0700

    Trunk merge

commit 4f8f5cb40f831c49af11cd801e1766fd6f0956c3
Merge: 0cc4a1c 732eb41
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun May 22 15:41:23 2011 +0000

    Fix bug #744150 by starting nova-api on an unused port.

commit 58c18901ab27219248e64175f2745502499dc265
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun May 22 03:16:16 2011 -0400

    Removing utils.is_int()

 nova/api/openstack/views/servers.py |    2 +-
 nova/utils.py                       |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

commit 57a405d630176ab6cb2b8e37ac123fa91d9f089b
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sat May 21 13:00:22 2011 +0100

    Added myself to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 968523ff49fc9d5aed7182b4084b2d7ec9f567ba
Author: Dave Walker (Daviey) <Dave.Walker@canonical.com>
Date:   Sat May 21 13:00:06 2011 +0100

    When adding a keypair that already exists, give a friendly error and no traceback in nova-api.

 nova/api/ec2/__init__.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 0cc4a1c8de961d8c4c212c28ff008082184da5dd
Merge: 286afa5 1faf772
Author: Andrey Brindeyev <abrindeyev@griddynamics.com>
Date:   Sat May 21 07:00:58 2011 +0000

    --dhcp-lease-max=150 by default. This prevents >150 instances in one network.

commit f1983479ae8d2483bdb73a494c9043f82928f189
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 21 02:34:27 2011 -0400

    Minor cleanup

 nova/api/openstack/images.py  |    3 +--
 nova/api/openstack/servers.py |    4 ++--
 nova/image/fake.py            |    2 +-
 nova/virt/libvirt_conn.py     |    1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

commit 4a184103fef7b1209ecfe3a6aadeccb8fc08fa31
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 21 02:04:29 2011 -0400

    No reason to modify the way file names are generated for kernel and ramdisk,
    since the kernel_id and ramdisk_id is still guaranteed to be ints.

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 286afa5e4f1861f7b33ebaa0c94099caf631c6b5
Merge: a1f5e27 a615702
Author: paul@openstack.org <>
Date:   Fri May 20 22:46:00 2011 +0000

    found a typo in the xenserver glance plugin that doesn't work with glance trunk. Also modified the image url to fetch from /v1/image/X instead of /image/X as that returned a 300.

commit a615702773ded561f01a270ad8bc04c60391bd51
Author: paul@openstack.org <>
Date:   Fri May 20 16:45:19 2011 -0500

    fixing glance plugin bug and setting the plugin to use /v1 of the glance api

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 67a9b67788a6abc73dc61d99e401918d83314c82
Merge: 0850945 a1f5e27
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 20 21:30:39 2011 +0000

    merge trunk

commit 0850945efd0c5d7341590acd109572b9caf89e18
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 20 21:30:04 2011 +0000

    move init start position to 96 to allow openvswitch time to fully start

 .../networking/etc/init.d/openvswitch-nova         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1f5e27b281c912c1e3a1a1ddd41555bd663f1ed
Merge: 2af86be bab9c88
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri May 20 21:21:37 2011 +0000

    Include data files for public key tests in the tarball.

commit 2c16eb37822b3ebdb14ac36df26362636d0f5078
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 16:36:10 2011 -0400

    minor cleanup

 nova/api/openstack/images.py          |    3 ---
 nova/api/openstack/servers.py         |    3 ---
 nova/tests/api/openstack/test_wsgi.py |    1 -
 3 files changed, 7 deletions(-)

commit 2af86be1a7c8ec0630215d9f0db1b127e9eb8a65
Merge: 3793c37 f8e8085
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri May 20 19:30:57 2011 +0000

    Makes sure vlan creation locks so we don't race and fail to create a vlan.

commit 84e9a7076a9098db1bd2647c3f056766bc7cee88
Merge: 3fc3b75 3793c37
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 15:29:23 2011 -0400

    merging trunk

commit bab9c88d4c09f366c13cf98024a2763d434c1ac4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri May 20 21:21:04 2011 +0200

    Include data files for public key tests in the tarball.

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 3398cd091df6122451afb3f67487707bba753770
Merge: 91e685e 3793c37
Author: Anne Gentle <anne@openstack.org>
Date:   Fri May 20 14:07:02 2011 -0500

    Merged with trunk

commit 3fc3b7537cc1af2783829a2caaca272e83d6d3e8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 14:42:19 2011 -0400

    renaming resource_factory to create_resource

 nova/api/openstack/__init__.py          |   34 +++++++++++++++----------------
 nova/api/openstack/accounts.py          |    2 +-
 nova/api/openstack/backup_schedules.py  |    2 +-
 nova/api/openstack/consoles.py          |    2 +-
 nova/api/openstack/flavors.py           |    2 +-
 nova/api/openstack/image_metadata.py    |    2 +-
 nova/api/openstack/images.py            |    2 +-
 nova/api/openstack/ips.py               |    2 +-
 nova/api/openstack/limits.py            |    2 +-
 nova/api/openstack/server_metadata.py   |    2 +-
 nova/api/openstack/servers.py           |    2 +-
 nova/api/openstack/shared_ip_groups.py  |    2 +-
 nova/api/openstack/users.py             |    2 +-
 nova/api/openstack/zones.py             |    2 +-
 nova/tests/api/openstack/test_limits.py |    4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

commit 7ed71092d513bc621be539e612e6b4e66849b888
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 14:22:58 2011 -0400

    combined the exception catching to eliminate duplication

 nova/api/openstack/images.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit f8e808504249aaa7a5278f6c91f7d300ba6dc8f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri May 20 11:21:52 2011 -0700

    synchronize vlan creation

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit 3793c37d5d665cd473599c7196403d3f74ce551c
Merge: f4d4d3a 6eaaf31
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri May 20 17:36:14 2011 +0000

    print information about nova-manage project problems

commit 355ef9c0a65cfb4bac1f21f39e149d77a27bd6a4
Merge: f1da26e f4d4d3a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 12:43:02 2011 -0400

    merge from trunk

commit 5c205bb5ef1565db4e52af538cf0d6b73cbeda37
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 09:09:03 2011 -0700

    fix comments

 nova/tests/test_virt.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 0bb2d0085e1fb3ba22a408f405f4539aa07b226c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 08:59:07 2011 -0700

    make nwfilter mock more 'realistic' by having it remember which
    filters have been defined

 nova/tests/test_virt.py   |   56 +++++++++++++++++++++++++++++++++++++--------
 nova/virt/libvirt_conn.py |   17 +++++++-------
 2 files changed, 55 insertions(+), 18 deletions(-)

commit f1da26ec9af6f6adffb7b6bfdc64f9702db93b56
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 11:50:00 2011 -0400

    fix pep8 issue

 nova/api/openstack/images.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0f191404fee42b9225f364af12242812798ff08a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 11:42:38 2011 -0400

    fixed silly issue with variable needing to be named 'id' for the url mapper, also caught new exception type where needed

 nova/api/openstack/images.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit f4d4d3a160416ebb4021837d300b299bb6ff75a6
Merge: 3230525 821ee03
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 20 15:41:16 2011 +0000

    This is the groundwork for the upcoming distributed scheduler changes. Nothing is actually wired up here, so it shouldn't break any existing code (and all tests pass).
    
    The goals were to:
    
    1. Define the basic distributed scheduler communication mechanism:
       a. call_zone_method - how each zone can communicate with its children
    
       b. encrypted child-blobs - how child zones an securely and statelessly report back weight and build-plan info
    
    2. Put in hooks for advanced-filtering (hard-requirements, capabilities) as well as preferences (least-cost-scheduling)
    
    3. Create a base set of dist-scheduler tests that we can extend as we add more functionality.
    
    Next up will be to:
    
    1. Add in a filtering driver
    
    2. Add in a cost-scheduler driver

commit 821ee03cedebf0cd1c98817d034aec0cd079f7bc
Merge: 3c39c23 3230525
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 20 10:31:23 2011 -0500

    Merging trunk

commit 323052599bad7ade7abaeaac824d30a428e7cfa2
Merge: 95b2c5e b2db989
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 15:15:21 2011 +0000

    Get rid of old virt/images.py functions that are no longer needed.  Checked for any loose calls to these functions and found none.  All tests pass for me.

commit 95b2c5eeef36e35441c48e907338c2bb7c8a7192
Merge: ff35d64 6404e2b
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 20 15:11:12 2011 +0000

    Update OSAPI v1.1 extensions so that it supports RequestExtensions. ResponseExtensions were removed since the new RequestExtension covers both use cases. This branch also removes some of the odd serialization code in the RequestExtensionController that converted dictionary objects into webob objects. RequestExtension handlers should now always return proper webob objects.

commit 1faf77248409bac4226822d48cfdd6213be5e24c
Author: Andrey Brindeyev <abrindeyev@griddynamics.com>
Date:   Fri May 20 17:57:04 2011 +0400

    Addressing bug #785763. Usual default for maximum number of DHCP leases in dnsmasq is 150. This prevents instances to obtain IP addresses from DHCP in case we have more than 150 in our network. Adding myself to Authors.

 Authors                   |    1 +
 nova/network/linux_net.py |    2 ++
 2 files changed, 3 insertions(+)

commit 1017b3f6b26da08187e6c81e6182d38badf74b35
Merge: ce37d88 330b3fe
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 06:04:58 2011 -0700

    foo

commit c61ed0605d443551087c54406b39e00273a6750d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 06:03:43 2011 -0700

    syntax errors

 nova/scheduler/zone_aware_scheduler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 27a0d56d921caa700f4aa84fb177c471071f2ddd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 05:02:34 2011 -0700

    temp fixes

 nova/api/openstack/servers.py          |    2 +-
 nova/scheduler/zone_aware_scheduler.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 6eaaf3183c02df38a6258ad8223bd02d1613e2e5
Merge: 15bd066 ff35d64
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri May 20 13:29:54 2011 +0400

    Merge and conflict resolving

commit 1aadd5e961a6f1983454f5f49f077f0be0d6cba8
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri May 20 12:53:49 2011 +0400

    added support for reserving certain network for certain project

 bin/nova-manage         |    7 ++++---
 nova/network/manager.py |    2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

commit e16b2d22dc4e6e24c3bf5150a0830661933aad29
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri May 20 04:14:02 2011 -0400

    Fixed some tests.

 nova/api/openstack/common.py                |   28 ---------------------------
 nova/api/openstack/servers.py               |    6 +++---
 nova/exception.py                           |    4 ++++
 nova/flags.py                               |    3 ---
 nova/image/fake.py                          |   12 ++++++++++++
 nova/tests/api/openstack/test_servers.py    |   14 +++++++++-----
 nova/tests/integrated/integrated_helpers.py |    7 ++++++-
 nova/tests/test_quota.py                    |    8 ++++----
 nova/utils.py                               |   16 +++++++--------
 9 files changed, 45 insertions(+), 53 deletions(-)

commit adf2ea5f1c76cc8bdbfbc11442512406cf6d9243
Merge: 74bae1b ff35d64
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 00:32:14 2011 -0700

    merge with trunk

commit ff35d64de0228ed0ce7f0e617289d4423935fa3d
Merge: b6d45a7 cbe89f1
Author: John Tran <jhtran@att.com>
Date:   Fri May 20 06:51:29 2011 +0000

    Added an EC2 API endpoint that'll allow import of public key. Prior, api only allowed generation of new keys.

commit b6d45a7eda26847922377ace4c7f7fbc3a7f72e3
Merge: cbaefce e7662bf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 06:34:43 2011 +0000

    This fix ensures that kpartx -d is called in the event that tune2fs fails during key injection, as it does when trying to inject a key into a windows instance.  Bug #760921 is a symptom of this issue, as if kpartx -d is not called then partitions remain mapped that prevent the underlying nbd from being reused.
    
    Couldn't think of a good way to regression test for this - any ideas?

commit cbaefce5bc8285fbe8af33e9e4ea2358601f02ad
Merge: 7eda696 d96699b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri May 20 06:18:50 2011 +0000

    Add new flag 'max_kernel_ramdisk_size' to specify a maximum size of kernel or ramdisk so we don't copy large files to dom0 and fill up /boot/guest

commit 7eda6968748b26b60a0949fcdc8b92b495f6e319
Merge: 0fdb7bb 34c1b0b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri May 20 06:03:33 2011 +0000

    The XenAPI driver uses openssl as part of the nova-agent implementation to set the password for root. It uses a temporary file insecurely and unnecessarily. Change the code to write the password directly to stdin of the openssl process instead.

commit 0fdb7bb4778fb6507d7a1c968e36dde68ad817d3
Merge: 330b3fe 57b89ef
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Fri May 20 05:51:21 2011 +0000

    The tools/* directory is now included in pep8 runs. Added an opt-out system for excluding files/dirs from pep8 (using GLOBIGNORE).

commit 2a9774a061dacba85e254e3d46bc52e8caa8e7af
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 20 00:33:12 2011 -0400

    fill out the absolute limit tests for limits v1.0 controller

 nova/tests/api/openstack/test_limits.py |   23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

commit 1c485a515b299551c44bd4411d82be1cccf5f4bd
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 20 00:24:35 2011 -0400

    add absolute limits support to 1.0 api as well

 nova/api/openstack/views/limits.py      |   44 ++++++++++++++-----------------
 nova/tests/api/openstack/test_limits.py |   31 ++++++++++++++++------
 2 files changed, 43 insertions(+), 32 deletions(-)

commit 732eb413cc404ba4c1ad5a2581c5efb864874d3b
Merge: 4ab6962 330b3fe
Author: Justin SB <justin@fathomdb.com>
Date:   Thu May 19 21:03:15 2011 -0700

    Merged with trunk

commit b2db9895c271825d1a58ade9c6de85ac90f760a7
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 22:56:23 2011 -0400

    fixed pep8 issue

 nova/virt/images.py |    1 +
 1 file changed, 1 insertion(+)

commit 4481191470826a14c783ff63b14bec7654de6079
Merge: 09b795b 330b3fe
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 22:55:26 2011 -0400

    merge from trunk

commit a1869741689817168c75046f2f81ee9761956cbc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 18:05:38 2011 -0400

    Fail early if requested imageRef does not exist when creating a server.

 nova/api/openstack/servers.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 74bae1b1e2b298ef8425f7cb1aefd3826db40147
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu May 19 13:50:11 2011 -0700

    Separate out tests for when unfilter is called from iptables vs. nwfilter
    driver.  Re: lp783705

 nova/tests/test_virt.py   |   65 ++++++++++++++++++++++++++++++++-------------
 nova/virt/libvirt_conn.py |   22 +++++++--------
 2 files changed, 58 insertions(+), 29 deletions(-)

commit 99bab1b99bf4388a0dba89300c4fb71095681276
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu May 19 16:25:57 2011 -0400

    Moved back templates and fixed pep8 issue. Template move was due to breaking packaging with template moves. That will need to happen in a later merge.

 MANIFEST.in                            |    3 +-
 nova/virt/cpuinfo.xml.template         |    9 +++
 nova/virt/libvirt.xml.template         |  122 ++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py        |    5 +-
 nova/virt/libvirt/cpuinfo.xml.template |    9 ---
 nova/virt/libvirt/libvirt.xml.template |  122 --------------------------------
 nova/virt/libvirt/netutils.py          |    4 +-
 7 files changed, 137 insertions(+), 137 deletions(-)

commit 68426df2287c24efc3d327d12371911ac29d117e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 19 16:16:06 2011 -0400

    further refactoring of wsgi module; adding documentation and tests

 nova/api/direct.py                       |    4 +-
 nova/api/openstack/accounts.py           |    2 +-
 nova/api/openstack/backup_schedules.py   |    4 +-
 nova/api/openstack/consoles.py           |    2 +-
 nova/api/openstack/extensions.py         |    8 +-
 nova/api/openstack/faults.py             |   12 +-
 nova/api/openstack/flavors.py            |    2 +-
 nova/api/openstack/image_metadata.py     |    2 +-
 nova/api/openstack/images.py             |    4 +-
 nova/api/openstack/ips.py                |    4 +-
 nova/api/openstack/limits.py             |    4 +-
 nova/api/openstack/server_metadata.py    |    2 +-
 nova/api/openstack/servers.py            |   11 +-
 nova/api/openstack/users.py              |    2 +-
 nova/api/openstack/versions.py           |    5 +-
 nova/api/openstack/wsgi.py               |  301 +++++++++++++++++++-----------
 nova/api/openstack/zones.py              |    4 +-
 nova/tests/api/openstack/test_servers.py |   50 ++---
 nova/tests/api/openstack/test_wsgi.py    |  104 ++++++++---
 19 files changed, 331 insertions(+), 196 deletions(-)

commit 44d90bd1f77f9b2297879263f74567c502944ba4
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 19 16:10:56 2011 -0400

    don't give instance quota errors with negative values

 nova/compute/api.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit afa8bb371a3e9f3e770107acabd341334b8d4847
Merge: 2b70b10 330b3fe
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu May 19 16:04:37 2011 -0400

    Merged trunk and resolved horrible horrible conflicts.

commit e0d43f39aeee0d62741ed40de9045bfde3fd20d8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 16:03:10 2011 -0400

    No reason to hash ramdisk_id and kernel_id. They are ints.

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ce37d88a91c016fdb7f29a9178fb0b08a6a8f1b2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 19 11:17:20 2011 -0700

    temp

 nova/api/openstack/servers.py          |    2 +-
 nova/scheduler/zone_aware_scheduler.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 10816023a71cca189fb77a1989e3dd542a0e9c25
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 19 14:08:15 2011 -0400

    waldon's naming feedback

 bin/nova-manage                         |    2 +-
 nova/api/openstack/limits.py            |    2 +-
 nova/db/api.py                          |    2 +-
 nova/quota.py                           |   64 ++++++++++++++++---------------
 nova/tests/api/openstack/test_limits.py |    5 ++-
 5 files changed, 39 insertions(+), 36 deletions(-)

commit 91e685e359281bce8e1ede12a7698072fddc36ef
Author: Anne Gentle <anne@openstack.org>
Date:   Thu May 19 12:17:55 2011 -0500

    Fixing role names to match code

 doc/source/man/novamanage.rst         |    4 ++--
 doc/source/runnova/managing.users.rst |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 3c39c230324a54e3e467f563d2233022e6fb4b7d
Merge: d44a472 330b3fe
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 19 11:01:56 2011 -0500

    Merging trunk

commit 08a22883fd5bf58b5b74645d1b2065a0be8c733b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 19 10:40:49 2011 -0500

    updated the hypervisors and ec2 api to support receiving lists from pluralized mac_addresses and fixed_ips

 nova/api/ec2/cloud.py          |    2 +-
 nova/db/sqlalchemy/api.py      |   20 +++++++++-----------
 nova/db/sqlalchemy/models.py   |    3 +++
 nova/network/manager.py        |    1 -
 nova/virt/hyperv.py            |    7 ++++++-
 nova/virt/vmwareapi/vm_util.py |    6 +++++-
 nova/virt/vmwareapi/vmops.py   |   14 ++++++++++----
 7 files changed, 34 insertions(+), 19 deletions(-)

commit d6fab80027e5fdb9a8d3e56044c399a7a80b2464
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 11:29:23 2011 -0400

    fname should have been root_fname

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dea0d808da06578d5125904eee72e5edd80f8e12
Merge: beea654 19e21e4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 10:54:56 2011 -0400

    minor cleanup, plus had to merge because of diverged-branches issue

commit beea6545804dc17661eea83b373d74d14cf07c32
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 10:52:23 2011 -0400

    Minor cleanup

 nova/api/openstack/images.py |    8 +++-----
 nova/virt/libvirt_conn.py    |   12 +++---------
 2 files changed, 6 insertions(+), 14 deletions(-)

commit 19e21e4a75dd34b05cfefc2ed5535297077ff97c
Merge: 64e9aa6 330b3fe
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 09:40:34 2011 -0400

    merge from trunk

commit c04a59fefbcbd0e5e21cbc8c70eb3147785cf22d
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 22:06:18 2011 +0900

    Fix comments.

 nova/db/api.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a4cc51b78ae5e08227bef7a4be52953776a3e947
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:49:15 2011 +0900

    Add a unitest to test EC2 snapshot APIs.

 nova/tests/test_cloud.py |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

commit 0b698186b56af6580633dedd7916df2897945f29
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:31:14 2011 +0900

    Avoid wildcard import.

 .../versions/019_add_volume_snapshot_support.py    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5a3bd10a2ada4ab1287b115051578b7b27bba6bc
Merge: aa39313 330b3fe
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:29:27 2011 +0900

    Merge trunk

commit 330b3febe9970a0358cbc145ea88faeb3da121d5
Merge: 92db39b 7b8f6ac
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 19 00:46:05 2011 +0000

    Simple change to sort the list of controllers/methods before printing to make it easier to read

commit 0aefdc6da92b8db8b15a3e8a0bef8fc5c4b46450
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed May 18 20:33:52 2011 -0400

    missed the new wsgi test file

 nova/tests/api/openstack/test_wsgi.py |  248 +++++++++++++++++++++++++++++++++
 1 file changed, 248 insertions(+)

commit cfd58f5d58152e42ea9c131dc60427af5ef2118e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed May 18 20:33:25 2011 -0400

    removing controller/serializer code from wsgi.py; updating other code to use new modules

 nova/api/direct.py                                |   12 +-
 nova/api/openstack/common.py                      |    7 -
 nova/api/openstack/consoles.py                    |    3 +-
 nova/api/openstack/contrib/volumes.py             |   23 +-
 nova/api/openstack/extensions.py                  |   97 ++++----
 nova/api/openstack/faults.py                      |   39 ++--
 nova/api/openstack/image_metadata.py              |    1 -
 nova/api/openstack/images.py                      |   11 +-
 nova/api/openstack/versions.py                    |   44 ++--
 nova/api/openstack/wsgi.py                        |   23 +-
 nova/objectstore/s3server.py                      |    2 +-
 nova/tests/api/openstack/extensions/foxinsocks.py |    4 +-
 nova/tests/api/openstack/test_extensions.py       |    4 +-
 nova/tests/api/test_wsgi.py                       |   54 -----
 nova/wsgi.py                                      |  250 +--------------------
 15 files changed, 147 insertions(+), 427 deletions(-)

commit 563a438df8c36fc351894f1695c4d533bf20f74e
Merge: 79d505c 92db39b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 18 19:30:58 2011 -0400

    merge lp:nova

commit 79d505c015bff1598e8e896f6198d65d90095ba6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 18 19:22:53 2011 -0400

    fixup absolute limits to latest 1.1 spec

 nova/api/openstack/limits.py            |    2 +-
 nova/api/openstack/views/limits.py      |   11 +++--
 nova/compute/api.py                     |    5 +-
 nova/quota.py                           |   30 +++++++-----
 nova/tests/api/openstack/test_limits.py |   10 +++-
 nova/tests/test_quota.py                |   80 ++++++++++++++++++++++++++-----
 6 files changed, 105 insertions(+), 33 deletions(-)

commit 5e722ea7b912f189c0a3b9434e9a38d08095ad00
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed May 18 19:13:22 2011 -0400

    refactoring wsgi to separate controller/serialization/deserialization logic; creating osapi-specific module

 nova/api/openstack/__init__.py           |   43 +++--
 nova/api/openstack/accounts.py           |   33 ++--
 nova/api/openstack/backup_schedules.py   |   27 ++-
 nova/api/openstack/consoles.py           |   26 ++-
 nova/api/openstack/flavors.py            |   34 ++--
 nova/api/openstack/image_metadata.py     |   19 +-
 nova/api/openstack/images.py             |   40 ++--
 nova/api/openstack/ips.py                |   33 ++--
 nova/api/openstack/limits.py             |   50 +++--
 nova/api/openstack/server_metadata.py    |   21 ++-
 nova/api/openstack/servers.py            |  124 +++++++------
 nova/api/openstack/shared_ip_groups.py   |   28 +--
 nova/api/openstack/users.py              |   43 +++--
 nova/api/openstack/wsgi.py               |  291 ++++++++++++++++++++++++++++++
 nova/api/openstack/zones.py              |   33 ++--
 nova/tests/api/openstack/test_limits.py  |    4 +-
 nova/tests/api/openstack/test_servers.py |    2 -
 nova/tests/api/test_wsgi.py              |  135 --------------
 nova/tests/integrated/test_xml.py        |    4 +-
 19 files changed, 624 insertions(+), 366 deletions(-)

commit 64e9aa6daa416662a25eeab0d943b23906695e92
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 18:09:37 2011 -0400

    default to port 80 if it isnt in the href/uri

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c69a1b0d9ef15ecc06217ec2c1ec4d73a755d14b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 17:57:44 2011 -0400

    return dummy id per vishs suggestion

 nova/api/ec2/cloud.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 76c98e277a405127d85cf2c264a20ec3a18e023a
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 17:30:43 2011 -0400

    hackish patch to fix hrefs asking for their metadata in boot (this really shouldnt be in ec2 api?)

 nova/api/ec2/cloud.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 7b8f6ac41a9998dfd7ae48e7bb122cb8ce7ef35b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 18 21:25:35 2011 +0000

    Sort list of controllers/methods before printing

 bin/stack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38ba122d9eb67c699ea0c10eab5961c3b4c25d81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 18 14:23:09 2011 -0700

    use a manual 500 with error text instead of traceback for failure

 nova/api/ec2/metadatarequesthandler.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit ef42fa95197e7b0f73e04322456bbbdedaf3e2b3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 18 14:15:36 2011 -0700

    log any exceptions that get thrown trying to retrieve metadata

 nova/api/ec2/metadatarequesthandler.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c7e0b5d13f16e53036d77c91322d9e000252660f
Merge: 40f15a6 0ca4d2a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 18 14:06:46 2011 -0700

    skeleton of forwarding calls to child zones

commit 2c6c184138b0d8c650496e0e8d033c85a2e2dec1
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 18 20:46:21 2011 +0000

    fix typo in udev rule

 .../etc/udev/rules.d/openvswitch-nova.rules        |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bee87f68c4c222cb22f999ec9860a9427b8ec1d6
Merge: fd2861f 92db39b
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 18 20:40:56 2011 +0000

    merge trunk

commit 62328a6437f238228152f460b1bd53e7254aa89c
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 16:26:42 2011 -0400

    libvirt fixes to use new image_service stuff

 nova/virt/images.py       |    4 ++--
 nova/virt/libvirt_conn.py |   14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

commit d44a4728c23cebd1eaa7615c3b439e44972750cc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 15:14:24 2011 -0500

    On second thought, removing decorator

 nova/api/openstack/zones.py            |   12 +++---------
 nova/tests/api/openstack/test_zones.py |   11 -----------
 2 files changed, 3 insertions(+), 20 deletions(-)

commit 01f7b0aa8de984baa27be50171526696aac48c0c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 14:46:39 2011 -0500

    Adding FlagNotSet exception

 nova/api/openstack/zones.py            |    3 ++-
 nova/exception.py                      |    4 ++++
 nova/tests/api/openstack/test_zones.py |   12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

commit 92db39bdb439f693ed59626d8c58f03e470d31f6
Merge: af4fdb8 62713a9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 18 18:16:23 2011 +0000

    Implements a basic mechanism for pushing notifications out to interested parties. The rationale for implementing notifications this way is that the responsibility for them shouldn't fall to Nova. As such, we simply will be pushing messages to a queue where another worker entirely can be written to push messages around to subscribers.

commit 62713a9485f9441a70526bb5245695338215c7af
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 18 12:55:17 2011 -0500

    Spacing changes

 nova/notifier/api.py             |    1 +
 nova/notifier/log_notifier.py    |    1 +
 nova/notifier/rabbit_notifier.py |    1 +
 3 files changed, 3 insertions(+)

commit 156ebab6599f9500d8b98c7cc1271d2502fa0627
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 18 13:54:51 2011 -0400

    get real absolute limits in openstack api and verify absolute limit responses

 nova/api/openstack/limits.py            |   11 +++-----
 nova/api/openstack/views/limits.py      |   23 +++++++---------
 nova/db/sqlalchemy/api.py               |    4 +--
 nova/tests/api/openstack/test_limits.py |   44 ++++++++++++++++++++++++++++---
 4 files changed, 55 insertions(+), 27 deletions(-)

commit ea49d52c916fb7d2b3d0b9a3cc1d675ec089a195
Merge: 9fb4787 af4fdb8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 18 12:47:16 2011 -0500

    Merge from trunk

commit af4fdb837674106f5957f87a5c5cda040809b29d
Merge: d9a87dd 4d025ef
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 18 17:41:04 2011 +0000

    Added missing xenhost plugin. This was causing warnings to pop up in the compute logs during periodic_task runs. It must have not been bzr add'd when this code was merged.

commit 048dda438c9670998e9c91f6a906373a12ea294d
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 13:03:05 2011 -0400

    fixed bug with compute_api not having actual image_ref to use proper image service

 nova/api/openstack/servers.py |    1 +
 nova/compute/api.py           |    7 ++++---
 nova/image/fake.py            |   22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

commit 6c850d72a658e3e9847500c9333bc72c1c3e427a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 11:58:45 2011 -0500

    Adding xenhost plugin

 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |  183 ++++++++++++++++++++
 1 file changed, 183 insertions(+)

commit bb4f5bb4cb3a56fb066395f74781010d16d658c6
Merge: 88b3fa4 d9a87dd
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 11:56:55 2011 -0500

    Merging trunk

commit 4d025ef1d2b2b97c13d710cb5080b78e246215bc
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 18 11:27:39 2011 -0500

    Added missing xenhost plugin.

 nova/virt/xenapi_conn.py                           |    8 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/xenhost    |  183 ++++++++++++++++++++
 2 files changed, 187 insertions(+), 4 deletions(-)

commit bd0125647a04ab8da7eef934e4a97560c1553551
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 18 15:31:41 2011 +0000

    Fix call to spawn_n() instead. It expects a callable

 nova/api/openstack/servers.py            |    4 +---
 nova/compute/api.py                      |    2 +-
 nova/tests/api/openstack/test_servers.py |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

commit 9407bbfc61f165bca0a854d59dd516193334a4b4
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 11:13:22 2011 -0400

    fix pep8 issues

 nova/api/openstack/images.py             |    3 ++-
 nova/api/openstack/servers.py            |    1 -
 nova/flags.py                            |    2 +-
 nova/tests/api/openstack/test_servers.py |    1 -
 nova/utils.py                            |    3 ++-
 5 files changed, 5 insertions(+), 5 deletions(-)

commit 980ceb71fdc97e92954239b843e7cec60c786a97
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:59:22 2011 -0400

    oops, took out commented out tests in integrated.test_servers and made tests pass again

 nova/image/fake.py                    |    4 ++--
 nova/tests/integrated/test_servers.py |   17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

commit d94d040986e00409ed031b591b39a43edc111e28
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:45:33 2011 -0400

    fixed api.openstack.test_servers tests...again

 nova/api/openstack/servers.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 96c888312fb7a2ba2cc9120282d29128a18342a8
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:41:33 2011 -0400

    fixed QuotaTestCases

 nova/flags.py            |    2 +-
 nova/image/fake.py       |   18 ++++++++++++++----
 nova/tests/test_quota.py |    2 ++
 nova/utils.py            |    4 +---
 4 files changed, 18 insertions(+), 8 deletions(-)

commit 3c36abb43eea4ff7a740278085690aa057aba502
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:16:51 2011 -0400

    fixed ComputeTestCase tests

 nova/utils.py |    1 +
 1 file changed, 1 insertion(+)

commit a9738fe5196cc1ed0715c3d96c692e782e77fec6
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:10:10 2011 -0400

    made ImageControllerWithGlanceServiceTests pass

 nova/api/openstack/images.py  |    2 +-
 nova/api/openstack/servers.py |    7 +++----
 nova/utils.py                 |    3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit d3f67f97d81185158f611c3bc9bd5542a7fed788
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 09:52:37 2011 -0400

    fixed test_servers small tests as well

 nova/tests/api/openstack/test_servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit 375fdc745fc5915098f11585ccd6a91e86747086
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 09:50:18 2011 -0400

    get integrated server_tests passing

 nova/flags.py                               |    3 +++
 nova/image/fake.py                          |    2 +-
 nova/tests/integrated/integrated_helpers.py |    4 +---
 nova/tests/integrated/test_servers.py       |   17 +++++++++--------
 nova/utils.py                               |    5 +++--
 5 files changed, 17 insertions(+), 14 deletions(-)

commit 6c151bfbfeb728d6e38f777640d483c1e344113d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 18 03:51:25 2011 -0400

    Removed all utils.import_object(FLAGS.image_service) and replaced with
    utils.get_default_image_service().

 bin/nova-manage                          |    2 +-
 nova/api/openstack/image_metadata.py     |    2 +-
 nova/api/openstack/images.py             |    5 +--
 nova/api/openstack/servers.py            |   22 +++++------
 nova/api/openstack/views/servers.py      |   10 +++--
 nova/compute/api.py                      |    4 +-
 nova/image/s3.py                         |    4 +-
 nova/tests/api/openstack/test_servers.py |   11 +++---
 nova/utils.py                            |   60 +++++++++++++++---------------
 nova/virt/images.py                      |    2 +-
 nova/virt/libvirt_conn.py                |    2 +-
 11 files changed, 58 insertions(+), 66 deletions(-)

commit d43603e2702f41936a9a85915280b9d773d6c74c
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 17 20:38:18 2011 -0500

    MySQL database tables are using the MyISAM engine. Created migration script to change all current tables to InnoDB, updated version to 019

 .../versions/019_set_engine_mysql_innodb.py        |   57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit 3ff9051c2ae60493d39d7e276c61689ffca2ac8d
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 17 20:38:02 2011 -0500

    MySQL database tables are using the MyISAM engine. Created migration script to change all current tables to InnoDB, updated version to 019

 .../versions/017_set_engine_mysql_innodb.py        |   57 --------------------
 1 file changed, 57 deletions(-)

commit 1b610e28e40c77271191349b6bfaa56c8f522c24
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:53:00 2011 -0500

    Small cleanups

 nova/tests/scheduler/test_host_filter.py          |    7 +++----
 nova/tests/scheduler/test_least_cost_scheduler.py |   10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

commit 967d82669ae07b2add3289e3decad60aea2657d8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:49:21 2011 -0500

    Moving into scheduler subdir and refactoring out common code

 nova/tests/scheduler/test_host_filter.py          |  189 +++++++++++++++++++++
 nova/tests/scheduler/test_least_cost_scheduler.py |  146 ++++++++++++++++
 nova/tests/scheduler/test_zone_aware_scheduler.py |   31 ++++
 3 files changed, 366 insertions(+)

commit 4ba215224e6c75037fd4f20be57d632da5d07469
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:32:56 2011 -0500

    Moving tests into scheduler subdirectory

 nova/scheduler/host_filter.py                     |    5 -
 nova/tests/scheduler/test_scheduler.py            | 1118 +++++++++++++++++++++
 nova/tests/scheduler/test_zone_aware_scheduler.py |  121 +++
 nova/tests/test_host_filter.py                    |  211 ----
 nova/tests/test_least_cost_scheduler.py           |  181 ----
 nova/tests/test_scheduler.py                      | 1118 ---------------------
 nova/tests/test_zone_aware_scheduler.py           |  121 ---
 7 files changed, 1239 insertions(+), 1636 deletions(-)

commit d24f59a251173826817e5f5c53a4f54dfe927f2d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:30:29 2011 -0400

    added is_int function to utils

 nova/utils.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 439787e7588b2409f319f2d86a41a3581cff8861
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:15:31 2011 -0500

    Pep8 fixes

 nova/exception.py                       |    3 +++
 nova/scheduler/least_cost.py            |   30 +++++++++++++++++++++---------
 nova/scheduler/zone_aware_scheduler.py  |   11 ++++++-----
 nova/test.py                            |    5 +++--
 nova/tests/test_least_cost_scheduler.py |   18 +++++++++++-------
 5 files changed, 44 insertions(+), 23 deletions(-)

commit eacb354c159aeb8f428232eb7d678ffb60bb73cd
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:14:35 2011 -0400

    made get_image_service calls in servers.py

 nova/api/openstack/servers.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit dacb4899ea631840fd95ee0bd25d999fbb16b8b4
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:10:11 2011 -0400

    use utils.get_image_service in compute_api

 nova/compute/api.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 5d35b548316eccd5a8454ccf7424ebe60aaf54e6
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:07:44 2011 -0400

    updates to utils methods, initial usage in images.py

 nova/api/openstack/images.py |   14 ++++++--------
 nova/utils.py                |   10 +++++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

commit 41ea2f4babc474cad64d81c9c95cf02e399a0a64
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 18:57:00 2011 -0400

    added util functions to get image service

 nova/utils.py |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

commit d6fbe417d7f8f7540cffe8c941c0591a22483978
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 17:44:08 2011 -0500

    Using import_class to import filter_host driver

 nova/scheduler/host_filter.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit a4035df4d031d3d90f3f7ce938ff0b8305be6773
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 17:27:04 2011 -0500

    Adding fill first cost function

 nova/scheduler/least_cost.py            |   12 +++++++++++
 nova/test.py                            |   16 ++++++++++++---
 nova/tests/test_least_cost_scheduler.py |   33 +++++++++++++++++++++++++++++--
 3 files changed, 56 insertions(+), 5 deletions(-)

commit e6fc2fc58d2c98f4322e92b26b1031ca362c8724
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 15:14:17 2011 -0700

    add more statuses for ec2 image registration

 nova/image/s3.py |   84 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 26 deletions(-)

commit 34c1b0bdc04bd335a49a02b5fbf7f5f76380fe82
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 22:02:08 2011 +0000

    Add --fixes

commit 5c8e843f5ca4c2671b7d71d0fb05888301be2091
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 22:01:08 2011 +0000

    Add --fixes

commit d9a87dd0dcb703a84c5f642c323d7b2ff68410a6
Merge: 0ca4d2a 81e908a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 21:40:25 2011 +0000

    Fixes the naming of the server_management_url in auth and tests.

commit 579bbde235781f43e037410fd6402e4e6ecd534b
Merge: 23bbbfc b66c689
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 16:26:40 2011 -0500

    Merging in Sandy's changes adding Noop Cost Fn with tests

commit 81e908ada0b46aaf43616814e08a51d1cf5f2532
Merge: 3506ae0 0ca4d2a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 13:50:12 2011 -0700

    merged trunk

commit 3506ae02196b0d44e36f915914b98abdc46db37b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 13:49:51 2011 -0700

    move migration 017 to 018

 .../versions/017_rename_server_management_url.py   |   60 --------------------
 .../versions/018_rename_server_management_url.py   |   60 ++++++++++++++++++++
 2 files changed, 60 insertions(+), 60 deletions(-)

commit 6069e6f50b10358c718961ceac9790f56d6692ea
Merge: 0bc5511 7c06d37
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 16:28:14 2011 -0400

    merge ram-limits

commit 0bc5511ccfb4ea97a0ba4c8533ce5d3cd3e6df19
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 16:25:45 2011 -0400

    Removed extra serialization metadata

 nova/api/openstack/limits.py |    3 ---
 1 file changed, 3 deletions(-)

commit 0ca4d2a99c01cc5691b1b15974714ae0aac70802
Merge: 8541290 17e06aa
Author: termie <code@term.ie>
Date:   Tue May 17 20:10:33 2011 +0000

    Docstring cleanup and formatting (nova/network dir). Minor style fixes as well.

commit 40f15a6ffb0d9ae965f9c7c7289654f323f2775f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 13:01:28 2011 -0700

    pep8

 nova/scheduler/zone_aware_scheduler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8541290e7fccc64ea325f4f5d63d5ba9fdd56692
Merge: 97e2a36 2aaeb82
Author: matt.dietz@rackspace.com <>
Date:   Tue May 17 19:50:43 2011 +0000

    Fixes improper attribute naming around instance types that broke Resizes.

commit 7c06d37f952e1f02bf1bb81809330b1b6737c2d5
Merge: 1bc00ba 6fc708b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 15:45:22 2011 -0400

    merge ram-limits

commit 1bc00ba6e7d13ab3533297ecda6c10965776dd8a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 15:36:00 2011 -0400

    support unlimited quotas in nova-manage and flags

 bin/nova-manage |    4 ++++
 nova/quota.py   |   12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

commit 2f23012b79d422b32832396147d308cd062b8d39
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 12:30:39 2011 -0700

    fix test

 nova/tests/api/openstack/fakes.py |    3 +++
 1 file changed, 3 insertions(+)

commit 7ab16489276daa2ec6f51fea6ec24cc0c46a8e14
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 15:14:52 2011 -0400

    Changed builder to match specs and added test

 nova/api/openstack/limits.py            |    9 +++++++--
 nova/api/openstack/views/limits.py      |   24 +++++++++---------------
 nova/tests/api/openstack/test_limits.py |   10 ++++++++--
 3 files changed, 24 insertions(+), 19 deletions(-)

commit 91e96cea27c91190f6205defa1f5a3641a0e0f56
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 12:12:48 2011 -0700

    add migration for proper name

 nova/api/openstack/auth.py                         |    6 +-
 .../versions/017_rename_server_management_url.py   |   60 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 nova/tests/api/openstack/test_auth.py              |    2 +-
 4 files changed, 64 insertions(+), 6 deletions(-)

commit 862097d822b49d79c0a3f2c317ae9cec90d5120e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 18:58:38 2011 +0000

    Update test case to ensure password gets set correctly

 nova/tests/api/openstack/test_servers.py |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

commit 11a36377f81f6f4c6c20e5802aa91e472772fbc9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 11:31:09 2011 -0700

    make token use typo that is in database.  Also fix now -> utcnow and stop using . syntax for dealing with tokens

 nova/api/openstack/auth.py            |   21 ++++++++++-----------
 nova/tests/api/openstack/test_auth.py |    2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

commit 97e2a3610e3cd3dbc539c1486b8ae82475578bb7
Merge: f0e7641 d9eb72b
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 17 18:00:24 2011 +0000

    Added missing metadata join to instance_get calls.

commit 6c27e24a559722a5a82d8883f508a77d281956f5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 17:51:22 2011 +0000

    Avoid using spawn_n to fix LP784132

 nova/api/openstack/servers.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 34b1461fa567f5ffba89b893b8082df050a64a5e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 13:46:15 2011 -0400

    add ram limits to instance quotas

 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    5 +++--
 nova/quota.py             |   26 +++++++++++++++++---------
 3 files changed, 21 insertions(+), 12 deletions(-)

commit f0e764119d7575aaf4cbd2264947fddd1ef7f088
Merge: d159c3d 4dfe3a6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 16:55:21 2011 +0000

    Convert instance_type_ids in the instances table from strings to integers to enable joins with instance_types. This in particular fixes a problem when using postgresql.

commit b312ac2634f530273e599ee48ff2e3a238bbbf4f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 16:46:13 2011 +0000

    Set password to one requested in API call

 nova/api/openstack/servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4dfe3a6b9ae44654b50ea8d65ac18a7a10f5abe3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 12:33:58 2011 -0400

    don't throw type errors on NoneType int conversions

 .../017_make_instance_type_id_an_integer.py        |    1 +
 1 file changed, 1 insertion(+)

commit d159c3d670beb5208542e73445b7c6a3f86d3b53
Merge: 0ac734f ad3f578
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue May 17 16:28:44 2011 +0000

    Added network_info into refresh_security_group_rules
    That fixs https://bugs.launchpad.net/nova/+bug/773308

commit 0ac734f1387510042527c047feca5fa16a0beb3a
Merge: 0946bac 21b84aa
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue May 17 16:15:21 2011 +0000

    Improved error notification in network create

commit f51bd03c9ce5f4248cb6f10e3ed662ae6ba33ebd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 15:49:31 2011 +0000

    Instead of using a temp file with openssl, just write directly to stdin

 nova/virt/xenapi/vmops.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 23bbbfcd3317859d44dba7da7996a978ad922543
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 10:45:19 2011 -0500

    First cut at least cost scheduler

 nova/scheduler/least_cost.py            |   79 +++++++++++++++++++++++++++++++
 nova/tests/test_least_cost_scheduler.py |   39 +++++++++++++++
 2 files changed, 118 insertions(+)

commit 272519ccebc15096c6f93f6aad6e8e8a188ee533
Merge: b00d390 0946bac
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 11:41:58 2011 -0400

    merge lp:nova

commit 6fc708b463e47de560fe388ada0639eb2b2383d5
Merge: b1e14b1 8cf2087
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 11:27:41 2011 -0400

    Implemented builder for absolute limits and updated tests

commit b66c689afc5923702b3d6d27a5c8f12f6749b07d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 07:52:02 2011 -0700

    provision_resource no longer returns value

 nova/scheduler/zone_aware_scheduler.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 84e8893c08cced5f7097b5c90e21a8a06740b3ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 07:49:12 2011 -0700

    provision working correctly now

 nova/scheduler/host_filter.py          |   19 ++++++++++---------
 nova/scheduler/zone_aware_scheduler.py |   26 +++++++++++++++++++++-----
 nova/virt/fake.py                      |    7 ++++---
 3 files changed, 35 insertions(+), 17 deletions(-)

commit 072569cd04a0f5c041b216f9473fc582453efd6e
Merge: 0946bac 9fb4787
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue May 17 14:19:31 2011 +0000

    Re-pull changed notification branch.

commit 2fcc10656222bea6056742ef943c1b82724c0b56
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 17 17:45:48 2011 +0400

    PEP8 fixes.

 nova/auth/ldapdriver.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 57b89ef0ac184acc8ef49097a49c15e1b41d4982
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 17 08:42:57 2011 -0500

    adding --fixes lp:781429

commit e4f8ef67065f1de36ceadf9dd97e07fbe9fc9d83
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 17 17:39:19 2011 +0400

    Fixed mistyped key, caused huge performance leak.

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0e2aba9e9869a66a1c3a6ece0fb08be631daa5bf
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 17 17:38:44 2011 +0400

    Moved memcached connection in AuthManager to thread-local storage.
    Added caching of LDAP connection in thread-local storage.
    Optimized LDAP queries, added similar memcached support to LDAPDriver.
    Add "per-driver-request" caching of LDAP results. (should be per-api-request)

 nova/auth/ldapdriver.py |   93 ++++++++++++++++++++++++++++++++++++++++++-----
 nova/auth/manager.py    |   20 +++++++---
 2 files changed, 98 insertions(+), 15 deletions(-)

commit effa4b37fae0e6fef993ffd2892bb77c0e7245f1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 05:43:06 2011 -0700

    ugh, fixed again

 nova/tests/test_zone_aware_scheduler.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7ed85c9ee57190589efcb22819783d6faf973cc3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 05:27:50 2011 -0700

    tests fixed and pep8'ed

 nova/scheduler/host_filter.py          |   10 +++++++---
 nova/scheduler/manager.py              |    3 ++-
 nova/scheduler/zone_aware_scheduler.py |   11 ++++++++---
 nova/tests/test_host_filter.py         |   11 ++++++-----
 nova/virt/fake.py                      |    2 --
 5 files changed, 23 insertions(+), 14 deletions(-)

commit 6404e2bb02f0736c43ef37292c1143e58903c5db
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 16 23:14:51 2011 -0400

    Update comment on RequestExtension class.

 nova/api/openstack/extensions.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 1edf41561d9c5e4df494486e7ab2f193c8206309
Merge: e72667c 0946bac
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 16 23:09:25 2011 -0400

    Merge w/ trunk.

commit 6bec79c4e1f5999dd69134fe15bd799e0cba9761
Merge: 02bba6a 0946bac
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 16 19:29:44 2011 -0700

    failure conditions are being sent back properly now

commit 67148b1093a7ff880f90a164a6cafa24b89ba951
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 16 20:08:51 2011 -0500

    Added opt-out system for excluding files/dirs from pep8 (using GLOBIGNORE).

 run_tests.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 2b5652b4ec191d3f31ce35684f0dd86f033416c2
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Mon May 16 18:13:08 2011 -0500

    MySQL database tables are using the MyISAM engine. Created migration script to change all current tables to InnoDB.

 .../versions/017_set_engine_mysql_innodb.py        |   57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit e96b904fea71159a43afdd28af9f6a5921af0418
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Mon May 16 18:09:26 2011 -0500

    MySQL database tables are using the MyISAM engine. Created migration script to change all current tables to InnoDB.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit a4ea9ac61568ce5f8300a5ba138f0ac10c79b43c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon May 16 15:59:01 2011 -0700

    fix for lp783705 - remove nwfilters when instance is terminated

 nova/tests/test_virt.py   |   42 ++++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py |   27 +++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 2 deletions(-)

commit 02bba6a8f49b924e9b5b0e69124afd953e8cc3ae
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 16 15:37:25 2011 -0700

    basic call going through

 nova/compute/api.py                    |    7 ++++++-
 nova/scheduler/host_filter.py          |   19 ++++++++++---------
 nova/scheduler/zone_aware_scheduler.py |   32 +++++++++++++++-----------------
 nova/virt/fake.py                      |   24 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 27 deletions(-)

commit d9eb72b3e76bd019b817936caa40c897416394b0
Author: Josh Kearney <josh@jk0.org>
Date:   Mon May 16 17:36:42 2011 -0500

    Added missing metadata join to instance_get calls.

 nova/db/sqlalchemy/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit b00d39083901731a4345c0a0b13ce98f1dfaaf01
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 16 17:58:07 2011 -0400

    add logging to migration and fix migration version

 .../016_make_instance_type_id_an_integer.py        |   61 ------------------
 .../017_make_instance_type_id_an_integer.py        |   67 ++++++++++++++++++++
 2 files changed, 67 insertions(+), 61 deletions(-)

commit 0946bac5fa210dc9172bbd6ab73ffd77495ebe58
Merge: 8d5d0cf b1e14b1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 16 20:51:08 2011 +0000

    Migrate quota schema from hardcoded columns to a key-value approach. The hope is that this change would make it easier to change the quota system without future schema changes. It also adds the concept of quotas that are unlimited.

commit 9fb47870df17e66a2294af7f52eb2dc5845405c0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 15:45:40 2011 -0500

    Conceded :-D

 nova/notifier/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 07ba43fc30f39f6f5122b1ba539c6a669bb35f34
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon May 16 15:41:26 2011 -0500

    updated the mac_address delete function to actually delete the rows, and update fixed_ips

 nova/db/sqlalchemy/api.py |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

commit 8d5d0cfeadb42dec55bd94664a28ddd63b7d51d6
Merge: 799f09b d031368
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Mon May 16 20:39:18 2011 +0000

    Added missing flavorRef and imageRef checks in the os api xml deserialization code along with tests

commit 799f09b01eca9f668b4c139e2a3fa419ed00c142
Merge: 87577ce e7f6997
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 16 20:30:40 2011 +0000

    Fixed minor pylint errors

commit 87577ceb58ff7fa96b992b504559eeb2022ffa41
Merge: 76b0630 3d1cef9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 20:25:28 2011 +0000

    This branch splits out the IPv6 address generation into pluggable backends. A new flag named ipv6_backend specifies which backend to use.
    
    The existing code (which is also the default) is now available as nova.ipv6.rfc2462 while a new backend available as nova.ipv6.account_identifier implements an algorithm that includes an account identifier as part of the address.

commit ea847e600249f1e3b65e04cfaa67014508c26e95
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 15:16:34 2011 -0500

    Merge prop changes

 nova/flags.py                    |    2 +-
 nova/notifier/api.py             |   20 ++++++++++++--------
 nova/notifier/log_notifier.py    |   19 +++++++++----------
 nova/notifier/no_op_notifier.py  |    9 +++------
 nova/notifier/rabbit_notifier.py |   19 ++++++++-----------
 nova/tests/test_notifier.py      |   22 +++++++++++-----------
 6 files changed, 44 insertions(+), 47 deletions(-)

commit 3d1cef9e56d7fac8a1b89861b7443e4ca660e4a8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 20:06:49 2011 +0000

    Reduce indentation to avoid PEP8 failures

 nova/ipv6/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 826e3273c1a6228d1462123228a81ffd34a2d476
Merge: 93d76ba ab4e17a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon May 16 15:01:06 2011 -0500

    merge koelker migration changes

commit 93d76ba4706d1093965bd0690de24ee819cef1a4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon May 16 14:50:26 2011 -0500

    using mac_address from fixed_ip instead of instance

 bin/nova-manage           |    2 +-
 nova/network/linux_net.py |    4 ++--
 nova/network/manager.py   |   29 ++---------------------------
 3 files changed, 5 insertions(+), 30 deletions(-)

commit 428dc895a3495a4800e57162cd7db8d79013a414
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 19:33:18 2011 +0000

    PEP8 cleanups

 nova/ipv6/api.py        |    5 +++--
 nova/tests/test_ipv6.py |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 15ef81b2138afa4fd22e0926fcadf3acfb31f2c5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 18:55:46 2011 +0000

    Use new 3-argument API

 nova/tests/network/base.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8cf2087747ab87fec0e1f7cc3d57ed1fa5065749
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 16 14:50:07 2011 -0400

    add a todo

 nova/api/openstack/limits.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 15bd0664acfeba6322e4c26f04d5f8a5cc4802f5
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 22:40:16 2011 +0400

    style fixing

 bin/nova-manage |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 674acd025bb1c612286484cfcb7e4f0e3d113232
Merge: 1aad930 76b0630
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 18:14:03 2011 +0000

    Merge with trunk

commit e7f699706089919274055fc5c57c276f36d7a301
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 16 14:02:56 2011 -0400

    Removed obsolete method and test

 nova/api/ec2/cloud.py    |    3 ---
 nova/tests/test_cloud.py |   35 -----------------------------------
 2 files changed, 38 deletions(-)

commit 76b0630b77b528a37a37b44d4c456f2c9ebea160
Merge: 8d8076f 9350dc2
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 16 17:15:36 2011 +0000

    renamed test cases in nova/tests/api/openstack/test_servers.py to use a consistent naming convention as used in nova/tests/api/openstack/test_images.py. also fixed a couple of pylint #C0103 errors in test_servers.py.

commit ab4e17aca5b2cbe352c6266ae0b5c3ad7c1c2ed7
Author: Jason Koelker <jason@koelker.net>
Date:   Mon May 16 11:40:42 2011 -0500

    make the migration work like we expect it to

 .../migrate_repo/versions/015_multi_nic.py         |   24 ++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

commit ea3b85bc276c268968c06679bf157fe4b0b4b68f
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 16 11:16:55 2011 -0500

    Fixed all pep8 errors in tools/install_venv.py. All tests pass.

 tools/install_venv.py |  174 +++++++++++++++++++++++++------------------------
 1 file changed, 90 insertions(+), 84 deletions(-)

commit d031368b9bba8c9fca066bc6bbce511581806fa5
Merge: 262dec7 6f547c6
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Mon May 16 11:13:36 2011 -0500

    Merge from trunk

commit 262dec736fa6ef54a1101a0a17671ff2a19cbd95
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Mon May 16 11:12:16 2011 -0500

    Added the imageRef and flavorRef attributes in the xml deserialization

 nova/api/openstack/servers.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit d44299be90bbfcac5f8de1e1264b81fbb0bfa5e2
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue May 17 01:00:16 2011 +0900

    Add vnc_keymap flag and enable setting keymap for vnc console.

 nova/virt/libvirt.xml.template |    2 +-
 nova/virt/libvirt_conn.py      |    1 +
 nova/vnc/__init__.py           |    2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

commit 0d3627f8276b27be35962c2d947a0c8bb8e8fbb6
Merge: a17f3e1 8d8076f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 10:54:02 2011 -0500

    Review changes and merge from trunk

commit 9c5f353d24fa64c150851cff67927c1735d59e8d
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 18:17:15 2011 +0400

    Pep8 cleaning

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6cd2ca0ad4753df2592467da8c3f90d91c62826
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 18:14:09 2011 +0400

    Added response about error in nova-manage project operations

 bin/nova-manage |   43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

commit e2a1258458e121f192d639d2804b3d3efa40495f
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 16 08:26:39 2011 -0500

    Removed tools/clean_vlans and tools/nova-debug from pep8 tests as they are shell scripts

 run_tests.sh |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 93fad121c209af015fc2f359c55ad28bba389941
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 16 08:23:10 2011 -0500

    Added lines to include tools/* (except ajaxterm) in pep8 tests

 run_tests.sh |    2 ++
 1 file changed, 2 insertions(+)

commit aa3931393ef10afb7d9b948d96d9f58fad855757
Merge: 5eb57c6 8d8076f
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Mon May 16 16:30:17 2011 +0900

    Merge trunk

commit 5eb57c6191ac7c8d98539eb3967ceb00f7c55daf
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Mon May 16 16:29:21 2011 +0900

    Add a unit test for snapshot_volume.

 nova/tests/test_volume.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 818c2424a0547882fe6bdfe6613ee66a248d91db
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Sun May 15 15:11:54 2011 +0400

    Define image state during snapshotting.
    Name snapshot to the name provided, not generate.

 nova/compute/api.py       |    5 +++--
 nova/tests/test_virt.py   |   10 ++++++++--
 nova/virt/libvirt_conn.py |    4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

commit f889f6c8a430d6411a81270a68025a27781b09a2
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Sun May 15 14:15:37 2011 +0400

    Unit test for snapshotting (creating custom image).

 nova/image/fake.py      |   33 ++++++++++++++++++++-------
 nova/tests/test_virt.py |   57 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 8 deletions(-)

commit 9350dc2cee8d18e7b68921f5135504b68a25f95d
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Sat May 14 23:00:56 2011 -0500

    fixed a few C0103 errors in test_servers.py

 nova/tests/api/openstack/test_servers.py |   48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit b098428155b36551cfd84d4b2faf87a104d58f27
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Sat May 14 22:47:12 2011 -0500

    renamed test cases to use a consistent naming convention as used in nova/tests/api/openstack/test_images.py

 nova/tests/api/openstack/test_servers.py |   50 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 25 deletions(-)

commit fd2861fdcdae0d7a3f13dac7b54d4d8f106f2b3e
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 21:05:12 2011 +0000

    fix sys.argv requirement

 .../xensource/scripts/ovs_configure_vif_flows.py   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 68e34c790612f3250bd902cc87a0ab9d3d69abfb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 15:36:42 2011 -0500

    first cut at weighted-sum tests

 nova/scheduler/zone_aware_scheduler.py |    2 ++
 1 file changed, 2 insertions(+)

commit 7df7b9ea88a33c24d051b1298ede183a7a84da0e
Merge: bccbe3f 8d8076f
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 19:29:52 2011 +0000

    merge trunk

commit bccbe3f845e9e7661efefbe456bfa56144de8136
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 19:29:10 2011 +0000

    add udev rules and modified ovs_configure_vif_flows.py to work with udev rules

 .../etc/udev/rules.d/openvswitch-nova.rules        |    3 +++
 .../xensource/scripts/ovs_configure_vif_flows.py   |   28 +++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

commit 8d8076ff87e988f40c9ee3a24b7c3963064921bd
Merge: ea5187e 0cf0b89
Author: John Tran <jhtran@att.com>
Date:   Fri May 13 18:15:36 2011 +0000

    Adds proper error handling for images that can't be found and a test for deregister image.

commit ec4e728487c25694200206562afc622932d8e8b7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri May 13 12:51:39 2011 -0500

    added |fixed_ip_get_all_by_mac_address| and |mac_address_get_by_fixed_ip| to db and sqlalchemy APIs

 nova/db/api.py            |   10 ++++++++++
 nova/db/sqlalchemy/api.py |   31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

commit 6d04d6e17f753e0573d37992576dedccccf9db93
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 10:43:43 2011 -0700

    started on integrating HostFilter

 nova/scheduler/host_filter.py          |   18 ++++++++++++++++++
 nova/scheduler/zone_aware_scheduler.py |   16 ++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

commit 8b86fb3a4d9ee3e328232c0051b9daff6838d00d
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Fri May 13 10:26:13 2011 -0700

    Add support for rbd snapshots.

 nova/volume/driver.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 88b3fa4513ed5cfe2befab692dc3371095f99d98
Merge: 9c44918 ea5187e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 12:16:48 2011 -0500

    Merging in trunk

commit ea5187e449fd72b1443d2ac1558c7a2a07e7a39b
Merge: 715d7ae 1330241
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 13 16:59:37 2011 +0000

    I'm assuming that openstack doesnt work with python < 2.6 here (which I read somewhere on the wiki).  This patch will check to make sure python >= 2.6 is installed, and also allow it to work with python 2.7 (and greater in the future).
    
    In order for nova to work with python 2.7, it needs Cheetah 2.4.4, which also works fine in python 2.6 (all tests passed with Cheetah 2.4.4 and python 2.6 for me).

commit b1e14b1451a860871c20e8a5a733e89c72bdccd5
Merge: 81b1cfc 0805521
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 13 12:57:24 2011 -0400

    merge lp:nova

commit 715d7ae9a3dc3804b0bcea0830ebd0f1322e16fe
Merge: 0805521 3f247a6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 13 16:55:18 2011 +0000

    XenAPI was not implemented to allow for multiple simultaneous XenAPI requests.  A single XenAPIConnection (and thus XenAPISession) is used for all queries.  XenAPISession's wait_for_task method would set a self.loop = for looping calls to _poll_task until task completion.  Subsequent (parallel) calls to wait_for_task for another query would overwrite this.  XenAPISession._poll_task was pulled into the XenAPISession.wait_for_task method to avoid having to store self.loop.

commit 3f247a628c954d5d4d97def6e6a2f889ab7ec7e3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 13 16:47:18 2011 +0000

    pep8 fixes

 nova/tests/xenapi/stubs.py |    2 ++
 1 file changed, 2 insertions(+)

commit be83d7317ee55ae0ef436f09f25beef2eccee5a6
Merge: 7dc7650 0805521
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 13 16:45:42 2011 +0000

    Merged trunk

commit aaec8400be701c674bbf89badd59ee9468827ed9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat May 14 01:42:26 2011 +0900

    volume/driver: make unit test, test_volume, pass
    
    fake command executer doesn't return command result.
    Which return None instead of string.
    So add None check to make unit test pass.

 nova/volume/driver.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 0805521c79f934ba54f839be64a2c43ed177612d
Merge: e12c1fb 26ed22e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 16:05:30 2011 +0000

    Make set_admin_password non-blocking to API.

commit 26ed22eac0f5edc5dcca92b55f64bb4aae8aac93
Merge: 60dcc66 e12c1fb
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:27:15 2011 -0500

    Merged trunk.

commit 60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:26:50 2011 -0500

    Review feedback.

 nova/api/openstack/servers.py |    6 ++----
 nova/compute/api.py           |   18 ++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

commit e12c1fb484f7cd6cbd4417a139e91a1b4f743766
Merge: c245537 a84e484
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 15:24:27 2011 +0000

    Lost a flag pulling from another branch. Whoops.

commit c2455378bcdc03ba5c4c9cd010768f0eccf22406
Merge: 0576766 3182024
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 13 15:20:29 2011 +0000

    Update the compute manager so that it breaks out of a loop if set_admin_password is not implemented by the driver. This avoids excessively logging NotImplementedError exceptions.

commit 9c44918e524df52471fd9acdbd37305ba7f74464
Merge: 5502c27 19386db
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 10:17:19 2011 -0500

    Merging in Sandy's changes

commit b4357fef25a0f6a402979d15c1ecbf4abb8643a8
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:04:37 2011 -0500

    Make host timeout configurable.

 nova/compute/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a8941345c97cccb9171e3d1e172f607dc8d17e6a
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 09:47:08 2011 -0500

    Make set_admin_password non-blocking to API.

 nova/api/openstack/servers.py |    6 ++++--
 nova/compute/api.py           |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 4f7cfba4a00f04b7c30c61da2946f183241a7c7f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 13 23:27:35 2011 +0900

    volume/driver: implement basic snapshot
    
    added basic support for snapshot to VolumeDriver base class.
    The implementation is not effective, but works. The effective
    implementation should be done by drived driver class.

 nova/exception.py      |    4 ++++
 nova/volume/driver.py  |   37 +++++++++++++++++++++++++++++++++----
 nova/volume/manager.py |    6 ++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

commit d32aa5e6366249b4d74725b1c697ed4f53dbd2b2
Merge: a7c25a1 0576766
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 14:22:49 2011 +0000

    merge trunk

commit 31820248e8d886d37add963f0709f3658fd6087d
Author: Dan Prince <dprince@redhat.com>
Date:   Fri May 13 10:22:04 2011 -0400

    Update the compute manager so that it breaks out of a loop if
    set_admin_password is not implemented by the driver.

 nova/compute/manager.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit a7c25a19a9a2fdf89fc9ecd3992ded936923af18
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 14:21:55 2011 +0000

    Add init script and sysconfig file for openvswitch-nova

 .../networking/etc/init.d/openvswitch-nova         |   96 ++++++++++++++++++++
 .../networking/etc/sysconfig/openvswitch-nova      |    1 +
 .../xensource/scripts/ovs_configure_base_flows.py  |   35 +++----
 3 files changed, 116 insertions(+), 16 deletions(-)

commit bbbea57cf6ab28c3ad1081041275e0d6d2bbd308
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 13 23:08:57 2011 +0900

    volume/driver: factor out lvm opration
    
    Factor out lvm operation for implementing basic snapshot later.

 nova/volume/driver.py |   62 +++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

commit 321d724df5f0c4ca008da2a08ef279ca18df0733
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 13 23:07:34 2011 +0900

    Authors: add myself to Authers file
    
    add myself to Authers file for later commit.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 19386db034b6144544aaed72aeab7e562f0087bc
Merge: 31b9cb7 0576766
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 06:51:18 2011 -0700

    trunk merge

commit ff08fcb0241145870603e8f225b6e9de2b1910d6
Author: Anne Gentle <anne@openstack.org>
Date:   Fri May 13 08:42:41 2011 -0500

    Adding zones doc into index of devref plus a bug fix for flag spellings

 doc/source/devref/index.rst |    1 +
 doc/source/devref/zone.rst  |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 31b9cb7b78df8d2d6c0d68f08031b5c3abc8a62e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 06:12:18 2011 -0700

    fixup based on Lorin's feedback

 nova/scheduler/zone_aware_scheduler.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit c97f2547760523b5f32a08aa24ed20c742bc6ba3
Merge: 5b670fe 2ecfa05
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 13 21:32:05 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit 2ecfa05337e7eefbf9791188ffa1d57f0e6ecd19
Merge: aad857a 0576766
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 13 21:07:48 2011 +0900

    Merge trunk

commit a84e484d1401d7c82373203b6964c54ab7166dea
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 12 20:05:41 2011 -0700

    added flag lost in migration

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 2ab50d284146a03a2e12536823b9ede81e2f3691
Merge: dbff37b 0576766
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 12 22:36:53 2011 -0400

    merge trunk

commit 35c37d7d74296bf6362ceb675e4f2c2e7b8f994a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 12 18:44:22 2011 -0700

    pep8

 nova/api/openstack/__init__.py          |    2 +-
 nova/tests/api/openstack/test_zones.py  |    3 +-
 nova/tests/test_zone_aware_scheduler.py |  119 +++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 2 deletions(-)

commit 5502c2764bd55a2b9c5012fd01d821ee5882aca2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 12 20:07:54 2011 -0500

    Adding basic tests for call_zone_method

 nova/api/openstack/__init__.py         |    2 +-
 nova/tests/api/openstack/test_zones.py |    3 +-
 nova/tests/test_scheduler.py           |   61 +++++++++++++++++++++++++++++---
 3 files changed, 60 insertions(+), 6 deletions(-)

commit 7377b010a133d5afa1a20e36b3a1dd2914c461b2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 12 18:26:46 2011 -0500

    fixed_ip disassociate now also unsets mac_address_id

 bin/nova-manage                                    |   29 +++++++++------
 nova/auth/manager.py                               |   16 +++++---
 nova/db/api.py                                     |   14 +++++--
 nova/db/sqlalchemy/api.py                          |   39 ++++++++++++--------
 .../migrate_repo/versions/015_multi_nic.py         |   24 +++++++++++-
 nova/db/sqlalchemy/models.py                       |    8 ++--
 nova/network/manager.py                            |   19 +++++++---
 7 files changed, 102 insertions(+), 47 deletions(-)

commit 1aad930383fa425b88e59929aa1698e31978eb62
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 22:19:52 2011 +0000

    Make sure imports are in alphabetical order

 nova/api/ec2/cloud.py      |    2 +-
 nova/db/sqlalchemy/api.py  |    2 +-
 nova/tests/network/base.py |    2 +-
 nova/tests/test_ipv6.py    |    2 +-
 nova/virt/libvirt_conn.py  |    2 +-
 nova/virt/xenapi/vmops.py  |    6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

commit d4a2a5c34ce568b5d67841c55d3034e93a418507
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 12 16:37:35 2011 -0500

    updated previous calls referring to the flags to use the column from the networks table instead

 bin/nova-manage                                    |   11 ++-
 .../migrate_repo/versions/015_mac_address_table.py |   80 -----------------
 .../migrate_repo/versions/015_multi_nic.py         |   95 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/network/linux_net.py                          |    8 +-
 nova/network/manager.py                            |   54 +++++------
 nova/network/vmwareapi_net.py                      |    4 +-
 nova/network/xenapi_net.py                         |    6 +-
 8 files changed, 141 insertions(+), 118 deletions(-)

commit cbe89f150f6c1e209405da6cbba4c3cf9163fd2e
Merge: 7cd6e9f 0576766
Author: John Tran <jhtran@att.com>
Date:   Thu May 12 14:29:41 2011 -0700

    merged from trunk

commit dbff37b9ae0893ce209ff0b8c8893987226bd081
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 12 17:24:38 2011 -0400

    handle instance_type_ids that are NULL during upgrade to integers

 .../016_make_instance_type_id_an_integer.py        |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7662bfcead8df8cc1fc655af6da15dc47777565
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu May 12 13:42:04 2011 -0700

    fix for lp760921.  Previously, if tune2fs failed, as it does on windows
    hosts, kpartx -d also failed to be called which leaves mapped partitions that
    retain holds on the nbd device.  These holds cause the observed errors.

 nova/virt/disk.py |   50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

commit 7dc76508d38370f3cf68029fae2ffb7749a580b2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 12 20:12:22 2011 +0000

    if a LoopingCall has canceled the loop, break out early instead of sleeping any more than needed

 nova/utils.py |    2 ++
 1 file changed, 2 insertions(+)

commit e0dab6d678867e11e107a9418c7baeb5ac055de7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 12 20:01:32 2011 +0000

    Add a test for parallel builds.  verified this test fails before this fix and succeeds after this fix

 nova/tests/test_xenapi.py  |   23 +++++++++++++++++++++++
 nova/tests/xenapi/stubs.py |    9 +++++++++
 2 files changed, 32 insertions(+)

commit 0cf0b89f57392688c0a443b29408813ccb028c38
Author: John Tran <jhtran@att.com>
Date:   Thu May 12 12:51:03 2011 -0700

    incorporated ImageNotFound instead of NotFound

 nova/api/ec2/cloud.py    |    6 +-----
 nova/tests/test_cloud.py |    6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

commit 71b1ddba52e4901124c47202598433abfe03bedf
Merge: 6dbec94 0576766
Author: John Tran <jhtran@att.com>
Date:   Thu May 12 12:23:31 2011 -0700

    merged from trunk

commit 9c0ffe7281ab6ec0acb3ef007b7c955d83007bd0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 12 14:13:25 2011 -0500

    misc related network manager refactor and cleanup

 nova/compute/manager.py   |    1 +
 nova/db/api.py            |   45 +++--
 nova/db/sqlalchemy/api.py |  255 ++++++++++++++------------
 nova/network/api.py       |   23 +--
 nova/network/manager.py   |  433 +++++++++++++++++++++------------------------
 5 files changed, 371 insertions(+), 386 deletions(-)

commit 0a3da155228228d3f0eeac1efdea1e29eef2f3a0
Author: John Tran <jhtran@att.com>
Date:   Thu May 12 12:04:39 2011 -0700

    changed NotFound exception to ImageNotFound

 nova/api/ec2/cloud.py    |    3 +--
 nova/tests/test_cloud.py |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

commit a17f3e1550be5443ad820f3c7eb47a0b7fa3ce09
Merge: 4d18824 0576766
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 12 13:54:45 2011 -0500

    Merge from trunk

commit e72667cb125f1d970f302bb18f051380fac0711d
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 12 14:52:54 2011 -0400

    Update comment.

 nova/api/openstack/extensions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 27b5de353aee88d37c369bb5b019a746116732c0
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 12 14:45:39 2011 -0400

    Variable renaming.

 nova/tests/api/openstack/extensions/foxinsocks.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 35368792ce554b4a5a9a2d3b69407362823d05b1
Merge: 6d140b6 0576766
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:42:10 2011 +0000

    Merge with trunk

commit 6d140b61cd146613b282c2f1f046c529d3112553
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:41:22 2011 +0000

    Add test suite for IPv6 address generation

 nova/ipv6/api.py        |   11 ++++++---
 nova/tests/test_ipv6.py |   59 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 3 deletions(-)

commit 33466d3ca067b8fec75380a27d5a2a196515bb50
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:40:56 2011 +0000

    Accept and ignore project_id

 nova/ipv6/rfc2462.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e03921c2799acf36083eb13c3134b861bc4732a6
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 12 14:37:15 2011 -0400

    Make it so that ExtensionRequest objects now return proper webob objects.
    This avoids the odd serialization code in the RequestExtensionController
    class which converts JSON dicts to webobs for us.

 nova/api/openstack/extensions.py                  |   11 -----------
 nova/tests/api/openstack/extensions/foxinsocks.py |    6 ++++--
 nova/tests/api/openstack/test_extensions.py       |    3 ++-
 3 files changed, 6 insertions(+), 14 deletions(-)

commit 86952493efb67b64b23766af094aa22deb21307f
Merge: 377b120 0576766
Author: John Tran <jhtran@att.com>
Date:   Thu May 12 11:25:12 2011 -0700

    merged from trunk

commit ce2b13d9fb30c0afbcff97f434d7423cad39b8b9
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 12 12:52:32 2011 -0400

    Remove ResponseExtensions. The new RequestExtension covers both use cases.

 nova/api/openstack/extensions.py                  |   88 ++-------------------
 nova/tests/api/openstack/extensions/foxinsocks.py |   15 ++--
 nova/tests/api/openstack/test_extensions.py       |   75 +++---------------
 3 files changed, 24 insertions(+), 154 deletions(-)

commit 22c33d80ce040f09c9bcd7584cf1165cf769e192
Author: Dan Prince <dprince@redhat.com>
Date:   Thu May 12 10:55:04 2011 -0400

    Initial work on request extensions.

 nova/api/openstack/extensions.py                  |   78 +++++++++++++++++++++
 nova/tests/api/openstack/extensions/foxinsocks.py |    3 +
 nova/tests/api/openstack/test_extensions.py       |   47 ++++++++++++-
 3 files changed, 127 insertions(+), 1 deletion(-)

commit ad3f578a37001957361014c7400dbe2e8ddd0baf
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 12 17:44:07 2011 +0400

    Added network_info into refresh_security_group_rules

 nova/tests/test_virt.py   |   12 +++++++++++-
 nova/virt/libvirt_conn.py |   20 ++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

commit 1330241020d68f941a56ce1cf93e6523884cccc1
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 12 09:19:01 2011 -0400

    fixed pep8 spacing issue

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8392d6c9bb19c0f22cd27260cf1326f0904a47df
Merge: 715a2c5 0576766
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 12 09:18:25 2011 -0400

    merge from trunk

commit 81b1cfc2db7f898263c0c40665769424ca5530ef
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 12 02:27:47 2011 -0400

    rename quota column to 'hard_limit' to make it simpler to avoid collisions with sql keyword 'limit'

 nova/db/sqlalchemy/api.py                          |    6 +++---
 .../versions/016_make_quotas_key_and_value.py      |   14 +++++++-------
 nova/db/sqlalchemy/models.py                       |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

commit fd8b9eb204b77da583f1aee4022920367730823f
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed May 11 17:06:56 2011 -0700

    Fix remote volume code

 nova/virt/xenapi/volume_utils.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 0576766cdf3480ad02159671d2dfc0bdcb154934
Merge: 1d7b698 ffabb10
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed May 11 22:56:57 2011 +0000

    1 Set default paths for nova.conf and api-paste.ini to /etc/nova/
    2 Changed countryName policy because https://bugs.launchpad.net/nova/+bug/724317 still affected.

commit d2b8350a026e0f00eae7cadbacaa15d4b44331af
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 21:04:40 2011 +0000

    Implement IPv6 address generation that includes account identifier

 nova/api/ec2/cloud.py           |    3 ++-
 nova/db/sqlalchemy/api.py       |    3 ++-
 nova/ipv6/account_identifier.py |   45 +++++++++++++++++++++++++++++++++++++++
 nova/ipv6/api.py                |    7 +++---
 nova/virt/libvirt_conn.py       |    3 ++-
 nova/virt/xenapi/vmops.py       |    3 ++-
 6 files changed, 57 insertions(+), 7 deletions(-)

commit facb7a77685164574eecb7faac966c9bc1b4dec9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 12:45:22 2011 -0700

    messing around with the flow of create() and specs

 nova/scheduler/zone_aware_scheduler.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 2aaeb82d5c2587adcad46e4087a3fb0aafdc1bbb
Merge: 6de6da8 5f2bfe5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 14:41:39 2011 -0500

    Merge from trunk

commit 6de6da879c37f0a5983f4c72692db84c3dd10b22
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 14:41:31 2011 -0500

    Redundant line

 nova/tests/test_compute.py |    1 -
 1 file changed, 1 deletion(-)

commit 17e06aa079b2961b7d6ba23f8032d003a2bf8b6a
Author: termie <code@term.ie>
Date:   Wed May 11 14:24:01 2011 -0500

    changes per review

 nova/network/linux_net.py     |    2 --
 nova/network/vmwareapi_net.py |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 8447c6e18e68eeb23175ddafdac1da93c538d734
Author: termie <code@term.ie>
Date:   Wed May 11 14:24:01 2011 -0500

    docstring cleanup, nova/network dir

 nova/network/api.py           |   45 ++++-----
 nova/network/linux_net.py     |  223 +++++++++++++++++++++--------------------
 nova/network/manager.py       |   67 ++++++-------
 nova/network/vmwareapi_net.py |   14 +--
 nova/network/xenapi_net.py    |   18 ++--
 5 files changed, 188 insertions(+), 179 deletions(-)

commit 81a65d46d261cb6998c6d714ca5769a661ad31ab
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 15:17:14 2011 -0400

    make instance.instance_type_id an integer to support joins in postgres

 .../016_make_instance_type_id_an_integer.py        |   61 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +-
 2 files changed, 62 insertions(+), 1 deletion(-)

commit 715a2c599d31d712beea11978c28f1b384edc30e
Merge: 329a409 5f2bfe5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 11 15:16:37 2011 -0400

    merge from trunk and update .mailmap file

commit 03b05ec0a01f9a4eded7485433879b6266b4cff7
Merge: 962d76b 1d7b698
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 19:16:02 2011 +0000

    Merged trunk

commit 2b70b10d01892b955e4b7b031b4fe554a42a14ec
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 14:46:31 2011 -0400

    Updated MANIFEST for template move.

 MANIFEST.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit ec91629806e4711df92686c64dd341480e237f97
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 11:43:58 2011 -0700

    NoValidHost exception test

 nova/scheduler/zone_aware_scheduler.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 1d7b698feefe1634dd4f1f3a1fc30e8480952fd9
Merge: b0ce21e 3b0b69d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 11 18:33:49 2011 +0000

    Fixes an issue with conversion of images that was introduced by exception refactoring.  This makes the exceptions when trying to locate an ec2 id clearer and also adds some tests for the conversion methods.

commit 79466a3a7b67478871f178115d95378643caf29f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 14:32:28 2011 -0400

    oops fixed a docstring

 nova/db/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4d18824aee8598473ba2c05b23466ac7be199dc7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 13:22:55 2011 -0500

    Pep8 stuff

 nova/notifier/api.py             |    2 ++
 nova/notifier/log_notifier.py    |    5 +++--
 nova/notifier/no_op_notifier.py  |    3 +++
 nova/notifier/rabbit_notifier.py |    2 +-
 nova/tests/test_notifier.py      |   16 ++++++++++------
 5 files changed, 19 insertions(+), 9 deletions(-)

commit b0ce21ed8f0be3c84e5f530549860c4916934f4e
Merge: 5f2bfe5 b3c07b0
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed May 11 18:21:25 2011 +0000

    Bluprint URL: https://blueprints.launchpad.net/nova/+spec/improve-pylint-scores/
    
    These changes quiet down 15 of the top 20 pylint offenders when sorted by number (as of Build #882).
    
    Updated all of the sqlalchemy/migrate_repo/versions files, and removed all unused imports as well as replaced the sqlalchemy wildcard import with explicit imports.

commit 3470ed651b837106bf8afe736adfda63ad8d746e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 11:12:31 2011 -0700

    start of zone_aware_scheduler test

 nova/compute/api.py                    |    7 ++++++
 nova/scheduler/api.py                  |   39 ++++++++++++++++++++++++++++++++
 nova/scheduler/zone_aware_scheduler.py |   31 +++++++++++++++----------
 3 files changed, 65 insertions(+), 12 deletions(-)

commit 96f59724eaf57c8eae57b853484137de5fff672c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 13:10:40 2011 -0500

    Moved everything into notifier/api

 nova/notifier/__init__.py   |   61 -----------------------------------
 nova/notifier/api.py        |   75 +++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_notifier.py |   22 +++++++------
 3 files changed, 87 insertions(+), 71 deletions(-)

commit 3b0b69ddc02f57859b351d6d354a12d5955c09f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 11 11:02:01 2011 -0700

    make sure proper exceptions are raised for ec2 id conversion and add tests

 bin/nova-manage          |    2 +-
 nova/api/ec2/cloud.py    |    2 +-
 nova/api/ec2/ec2utils.py |    5 ++++-
 nova/exception.py        |    4 ++++
 nova/tests/test_api.py   |   19 ++++++++++++++++++-
 nova/tests/test_utils.py |    2 +-
 6 files changed, 29 insertions(+), 5 deletions(-)

commit d19d03fcfecfe51b63b1e681d9e94b9996cd9aef
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 14:01:41 2011 -0400

    better function name

 nova/quota.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 93d4d103dde11012090be501eeb20a37f6784ae6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 13:50:24 2011 -0400

    Updated the value of the nova-manager libvirt_type

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit afac61da9bb77cb2b4b0d6e79f47d4579ba9c9fc
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:34:01 2011 -0400

    more filter alignment

 nova/db/sqlalchemy/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b3c07b0473fc1d1de805f7a538189b99873aaab3
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed May 11 12:33:44 2011 -0500

    Removed commented out 'from nova import log as logging' line, per request from Brian Lamar

 .../versions/003_add_label_to_networks.py          |    1 -
 .../versions/006_add_provider_data_to_volumes.py   |    1 -
 .../versions/007_add_ipv6_to_fixed_ips.py          |    1 -
 .../versions/010_add_os_type_to_instances.py       |    1 -
 .../versions/012_add_ipv6_flatmanager.py           |    1 -
 .../versions/013_add_flavors_to_migrations.py      |    1 -
 .../015_add_auto_assign_to_floating_ips.py         |    1 -
 7 files changed, 7 deletions(-)

commit 30341658e5332d3902f7f202bd5c291d00e2f99f
Merge: a13616c 5f2bfe5
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 11 17:26:00 2011 +0000

    merge trunk

commit 44a482081b44d25738549a5a445c4d581f6816ae
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:21:57 2011 -0400

    align filters on query

 nova/db/sqlalchemy/api.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit c1fdb9a2e26b8d2d4f8faa4b7412e8f17ea939e9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:00:06 2011 -0400

    better pylint scores on imports

 .../versions/016_make_quotas_key_and_value.py      |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d4c42ca05bce95dd385a3ab2f661ca19043ba66f
Merge: 3f7cf08 e1dc9cf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:42:51 2011 -0500

    Merge from Dragon

commit 3f7cf0826a4edfd93aac20d677d05153ca072c61
Merge: 2e44fac 5f2bfe5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:41:06 2011 -0500

    Merge from trunk

commit 2e44facea2f7b2c12dec9a14ea3595aadd8a35fc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:40:54 2011 -0500

    Code cleanup

 nova/notifier/__init__.py   |   22 +++++++++++++---------
 nova/tests/test_notifier.py |   12 +++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

commit 46eba25abdb2060ef3b1deb29876f1630894997e
Merge: 95baec4 5f2bfe5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 11:20:50 2011 -0400

    Merged trunk.

commit 962d76b94a8b721a5e6cc7959dfe221c787e7dc6
Merge: 43fa5af 5f2bfe5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 15:13:17 2011 +0000

    Merge from trunk

commit 43fa5afac9e5af74e2e3977a5dafd9640d064cf1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 15:12:12 2011 +0000

    Abstract out IPv6 address generation to pluggable backends

 nova/api/ec2/cloud.py      |    3 ++-
 nova/db/sqlalchemy/api.py  |    5 +++--
 nova/ipv6/__init__.py      |   17 +++++++++++++++++
 nova/ipv6/api.py           |   34 ++++++++++++++++++++++++++++++++++
 nova/ipv6/rfc2462.py       |   42 ++++++++++++++++++++++++++++++++++++++++++
 nova/tests/network/base.py |    8 ++++----
 nova/utils.py              |   20 --------------------
 nova/virt/libvirt_conn.py  |    3 ++-
 nova/virt/xenapi/vmops.py  |    3 ++-
 9 files changed, 106 insertions(+), 29 deletions(-)

commit 95baec46c1512fd2a5a5751a26905036661980fc
Merge: 9bd2d9e 21f18f7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 11:02:49 2011 -0400

    Merged trunk.

commit eb0619c91b4756d355b7a5cd5c1f16d342f14a6b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 06:28:07 2011 -0700

    First cut with tests passing

 nova/api/openstack/__init__.py         |    3 +-
 nova/api/openstack/zones.py            |   48 +++++++++++++++++
 nova/crypto.py                         |   45 ++++++++++++++++
 nova/scheduler/api.py                  |    6 +++
 nova/scheduler/zone_aware_scheduler.py |   88 ++++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_zones.py |   40 +++++++++++++++
 nova/tests/test_crypto.py              |   48 +++++++++++++++++
 7 files changed, 277 insertions(+), 1 deletion(-)

commit ffabb107d858c64261fd56adab9fa57d29ad322f
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed May 11 11:47:38 2011 +0400

    changing Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 1f5313c5417d7417d20a75551d57156f90b6eb64
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 10 22:22:45 2011 -0500

    removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports

 .../sqlalchemy/migrate_repo/versions/001_austin.py |    8 +++-----
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |    7 ++-----
 .../versions/003_add_label_to_networks.py          |    8 ++------
 .../migrate_repo/versions/004_add_zone_tables.py   |    7 ++-----
 .../versions/005_add_instance_metadata.py          |    7 ++-----
 .../versions/006_add_provider_data_to_volumes.py   |    7 ++-----
 .../versions/007_add_ipv6_to_fixed_ips.py          |    8 ++------
 .../versions/008_add_instance_types.py             |    9 ++-------
 .../versions/009_add_instance_migrations.py        |    6 ++----
 .../versions/010_add_os_type_to_instances.py       |    8 ++------
 .../migrate_repo/versions/011_live_migration.py    |    2 +-
 .../versions/012_add_ipv6_flatmanager.py           |    2 ++
 .../versions/013_add_flavors_to_migrations.py      |    4 ++--
 .../014_add_instance_type_id_to_instances.py       |    2 +-
 .../015_add_auto_assign_to_floating_ips.py         |    7 ++-----
 15 files changed, 29 insertions(+), 63 deletions(-)

commit bdc1225c97af653c6702743912f0b5ed251bcac3
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 10 20:22:56 2011 -0500

    removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
    
    	previous pylint score: -55.00/10
    	new pylint score: -1.76/10

 .../migrate_repo/versions/011_live_migration.py    |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 5f2bfe56cf12d8f45ae24a5c9dd0c99e6c4d0310
Merge: 23ad0f6 6991faa
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed May 11 00:56:20 2011 +0000

    Fix for #780276 (run_tests.sh fails test_authors_up_to_date when using git repo)

commit 23ad0f63cde540ad8fe74259926fe9edb75c5b38
Merge: 21f18f7 559bba1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 00:11:27 2011 +0000

    extracted xenserver capability reporting from dabo's dist-scheduler branch and added tests.

commit a5c31944708f7afe75c51ef84f2712df3e8ad416
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 20:10:10 2011 -0400

    migrate back updated_at correctly

 .../versions/016_make_quotas_key_and_value.py      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e1dc9cfb521f21dd0cdd4d9771d78ef5024cebad
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue May 10 23:57:38 2011 +0000

    added in log_notifier for easier debugging

 nova/notifier/log_notifier.py |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

commit 351c07f43c8ee072b0351973db9b5b9bd1656571
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue May 10 23:29:16 2011 +0000

    Add priority based queues to notifications.
    Remove duplicate json encoding in notifier (rpc.cast does encoding... )
    make no_op_notifier  match rabbit one for signature on notify()

 nova/notifier/__init__.py        |    5 ++---
 nova/notifier/no_op_notifier.py  |    2 +-
 nova/notifier/rabbit_notifier.py |    7 ++++---
 nova/tests/test_notifier.py      |   29 +++++++++++++++++++++++------
 4 files changed, 30 insertions(+), 13 deletions(-)

commit 6c4059f20c85e9bc013a340de167151e7b5fa8c4
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Wed May 11 03:24:02 2011 +0400

    Bugfix #780784. KeyError when creating custom image.

 Authors                   |    1 +
 nova/virt/libvirt_conn.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 172ce9f39564eb4d416dae3ce7abafc46af8f695
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 10 17:21:37 2011 -0500

    removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
    
        previous pylint score: -63.75/10
        new pylint score: 2.67/10

 .../versions/012_add_ipv6_flatmanager.py           |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 849c5f10dc15d9c2272d5768748feac1ded6b635
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 10 17:12:09 2011 -0500

    removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
    
      previous pylint score: -75.00/10
      new pylint score: -7.86/10

 .../versions/013_add_flavors_to_migrations.py      |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 5b1616bff43ee67f0307a9e8b2233d1f1ed8472c
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 10 17:00:24 2011 -0500

    removed unused wild card imports, replaced sqlalchemy wildcard import with explicit imports
    
    previous pylint score: 	-32.76/10
    new pylint score:	4.44/10

 .../014_add_instance_type_id_to_instances.py       |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit fa3195b6206cffc26d421db891e1a580a18f0fb0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 16:40:47 2011 -0500

    Better tests

 nova/notifier/__init__.py        |    5 +++++
 nova/notifier/rabbit_notifier.py |    2 +-
 nova/tests/test_notifier.py      |   40 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)

commit 90d7e6771cf28725a6b4296b44e5d078f2ed9544
Merge: 3d756a8 21f18f7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 15:42:08 2011 -0500

    Merge from trunk

commit 3d756a8343845acfead201621a6d658c8ac616fb
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 15:42:00 2011 -0500

    Add example

 nova/notifier/__init__.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 59b593fb70b57864b84677644786d5175b0811be
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 16:38:04 2011 -0400

    give a more informative message if pre-migration assertions fail

 .../versions/016_make_quotas_key_and_value.py      |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 19f5d2a938ffa4c7bcba849766d2450eaecc94eb
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:57:44 2011 -0500

    Whoops

 nova/tests/test_compute.py |    4 ----
 1 file changed, 4 deletions(-)

commit de9b191905803ff8742c3dde4335682d53b01fcd
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 15:54:05 2011 -0400

    fix migration bug

 .../versions/016_make_quotas_key_and_value.py      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 64f9fdc15f744c2646f6f4a519cf0f0df2845239
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:53:03 2011 -0500

    Pep8

 nova/tests/test_compute.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 288030b2b9834ca65e822a770f1b2d052ee27a10
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:40:28 2011 -0500

    Test

 nova/tests/test_compute.py |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit fa21330dfe94c3274102137753e608269dae5f32
Merge: 8c5f008 21f18f7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:35:16 2011 -0500

    Merge from trunk

commit a67c77ce504ad2e15b013ed40421d0d0b823767f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 10 18:55:07 2011 +0000

    remove stubbing of XenAPISession.wait_for_task for xenapi tests as it doesn't need to be faked.  Also removed duplicate code that stubbed xenapi_conn._parse_xmlrpc_value.

 nova/tests/xenapi/stubs.py |   28 ----------------------------
 1 file changed, 28 deletions(-)

commit f0c4bc2ff0182292e667bbcafb349e407596148a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 14:49:47 2011 -0400

    migration bug fixes

 .../versions/016_make_quotas_key_and_value.py      |   34 +++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

commit aa73995f9ba7e4aaaee00ddd0db0b92dcd92dd54
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 10 16:11:59 2011 +0000

    Change xenapi's wait_for_task to handle multiple simultaenous queries to fix lp:766404

 nova/virt/xenapi_conn.py |   86 +++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 46 deletions(-)

commit 6991faaac1eda14bf6162d1a2383e7f9ad6bdeae
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Mon May 9 22:36:01 2011 -0500

    Added GitPython to [install_dir]/tools/pip-requires.

 Authors            |    1 +
 tools/pip-requires |    1 +
 2 files changed, 2 insertions(+)

commit 09b795b8d6f0b925dbd4bcd203f471607c42f368
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 9 19:46:15 2011 -0400

    got rid of unnecessary imports

 nova/virt/images.py |    9 ---------
 1 file changed, 9 deletions(-)

commit 21f18f77e7d729107742fa9157b531ce56f3272a
Merge: 6f547c6 d65d689
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Mon May 9 22:06:38 2011 +0000

    Enable RightAWS style signature checking using server_string without port number, add test cases for authenticate() and a new helper routine, and fix lp753660.

commit 6edd5ef387783c13a66a61717d73542d0769d618
Merge: 4364c3e 6f547c6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 9 16:53:16 2011 -0500

    Merge from trunk

commit 4364c3e4103e41fcb8bb0c2af764c37c1ff4afab
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 9 16:52:52 2011 -0500

    Better message format description

 nova/notifier/__init__.py        |   40 +++++++++++++++++++++++++++++++++++---
 nova/notifier/rabbit_notifier.py |    6 +++---
 2 files changed, 40 insertions(+), 6 deletions(-)

commit 559bba1270378a430cc85abec144c0c574e65294
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 12:57:56 2011 -0700

    unified underscore/dash issue

 nova/scheduler/host_filter.py |    2 +-
 nova/tests/test_xenapi.py     |    2 +-
 nova/virt/xenapi_conn.py      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit d9220c1af021b6c019207e7b9d24e30522bed149
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 9 14:44:39 2011 -0400

    update tests to handle unlimited resources in the db

 nova/tests/test_quota.py |   72 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit a3f8d3c8ee77cd7cf764aec19033ab0c71703515
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 09:10:22 2011 -0700

    pep8

 nova/tests/test_xenapi.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit d087e1d0f0e235de01a8f140815fbe905008cb36
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 09:08:56 2011 -0700

    capabilities flattened and tests fixed

 nova/compute/manager.py        |    1 +
 nova/scheduler/host_filter.py  |   16 ++++++++--------
 nova/tests/test_host_filter.py |   26 +++++++++++++-------------
 nova/tests/test_xenapi.py      |   12 ++++++------
 nova/virt/xenapi_conn.py       |    4 ++--
 5 files changed, 30 insertions(+), 29 deletions(-)

commit 6f547c6977d3a200f3799067c68dafd24144be0d
Merge: d0e9ed0 6425095
Author: Josh Kearney <josh@jk0.org>
Date:   Mon May 9 16:01:48 2011 +0000

    Set root password upon XenServer instance creation.
    
    * Note: Will need to redeploy XenServer plugins.

commit 9a0d0a219d0b2376e70f06a4841b72514f06eb14
Merge: 3c0d31a 02b9759
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 08:47:39 2011 -0700

    trunk merge

commit 1c1a06c3731dd82b331f317ba52edbfe2110a40e
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 9 11:47:33 2011 -0400

    clean up unused functions from virt/images.py

 nova/virt/images.py |   61 ---------------------------------------------------
 1 file changed, 61 deletions(-)

commit d96699bd2fe1bd98f7d81639acab734c225c82ed
Merge: c04b0ca d0e9ed0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 9 15:35:45 2011 +0000

    Merge with trunk

commit d0e9ed0253fa4c950a421f85efb4cea561c2cc8b
Merge: 02b9759 2cfa0ab
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon May 9 15:26:32 2011 +0000

    Removing a rogue try/catch expecting a non-existant exception.TimeoutException that is never raised.

commit 3c0d31a1ae91e30e06f1b33d35915037472b3691
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 08:23:25 2011 -0700

    basic test working

 nova/tests/test_xenapi.py |   40 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi_conn.py  |    4 ++++
 2 files changed, 44 insertions(+)

commit c5dbee818b1a06bf5358c32197c8e15ecf0f660d
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 20:19:35 2011 +0900

    db: fix db versioning

 .../versions/015_add_volume_snapshot_support.py    |   71 --------------------
 .../versions/016_add_snapshot_id_to_volumes.py     |   48 -------------
 .../versions/016_add_volume_snapshot_support.py    |   71 ++++++++++++++++++++
 .../versions/017_add_snapshot_id_to_volumes.py     |   48 +++++++++++++
 4 files changed, 119 insertions(+), 119 deletions(-)

commit db148f108dfc4829e1302a54fe4f57ab81212786
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 19:25:02 2011 +0900

    fix mismerge by 1059

 nova/db/sqlalchemy/api.py |    3 +--
 nova/exception.py         |   65 ++++++---------------------------------------
 nova/volume/driver.py     |    3 +--
 3 files changed, 10 insertions(+), 61 deletions(-)

commit 03c735bb186a44d80a9d595e00e9c06fd8f709cc
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 17:53:25 2011 +0900

    volume/driver: implement basic snapshot/clone
    
    added basic support for snapshot/clone to VolumeDriver.
    The implementation is not effective, but works. The effective
    implementation should be done by drived driver class.

 Authors                |    1 +
 nova/exception.py      |    6 ++++++
 nova/volume/driver.py  |   42 +++++++++++++++++++++++++++++++++++++-----
 nova/volume/manager.py |    6 ++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

commit 389f7c79199d5ad908a72375a7377a1122f36707
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 17:52:26 2011 +0900

    volume/driver: factor out lvm opration
    
    Factor out lvm operation for implementing basic snapshot later.

 nova/volume/driver.py |   62 +++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

commit 02b97593d0b3ee60ab879e5184be742ef3ac1b64
Merge: 621f422 a845a76
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sat May 7 15:36:55 2011 +0000

    Host Filtering for Distributed Scheduler (done before weighing)

commit d65d689539b1219e5107ba332a5d3569937aeb1f
Merge: aaa34f9 621f422
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun May 8 00:19:28 2011 +0900

    Rebased to trunk rev 1057.

commit 621f42274e1fdc2dc0d075c7e7b3508547bb9a96
Merge: 1ebf533 417de9b
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sat May 7 03:06:28 2011 +0000

    Adds coverage-related packages to the tools/pip-requires to allows users to generate coverage reporting when running unit tests with virtulenv.
    
    For example, this will now work:
    
    ./run_tests.sh -V --with-coverage --cover-package=nova

commit 329a409e865d05d753210b4e31b712fcbd22cd38
Merge: b586594 1ebf533
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 21:30:31 2011 -0400

    merge from trunk

commit 65595766706631a5c65193cfc0fa2ac9de1aeffc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri May 6 20:15:06 2011 -0400

    Set publish_errors default to False.

 nova/log.py                 |    2 +-
 nova/tests/test_notifier.py |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 50404512a84971fb895f8f174230a7230b8f9474
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 6 17:37:35 2011 -0400

    convert quota table to key-value

 bin/nova-manage                                    |    5 +-
 nova/db/api.py                                     |   30 ++--
 nova/db/sqlalchemy/api.py                          |   50 ++++--
 .../versions/016_make_quotas_key_and_value.py      |  176 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   18 +-
 nova/quota.py                                      |   44 +++--
 nova/tests/test_quota.py                           |    9 +-
 7 files changed, 277 insertions(+), 55 deletions(-)

commit 1ebf53379769249c56c6249714ae2888195286f2
Merge: 016be4c 500c14d
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 21:01:40 2011 +0000

    Simple fix for this issue.  Tries to raise an exception passing in a variable that doesn't exist, which causes an error.

commit e1cfa28fc9e1194bbd4c9ce9c2f06ea3f6e5548e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 16:48:38 2011 -0400

    Fixed duplicate function

 nova/api/openstack/servers.py |    3 ---
 1 file changed, 3 deletions(-)

commit 6425095be3bd89c48b73b5305afeb2d5d45e434b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:41:36 2011 -0500

    Review feedback

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7860f72c911dd91b69082cb5cdb2e625710526c1
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:19:55 2011 -0500

    Review feedback

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3a7d1422d52f551e870542305ce9bab9e9e6ebad
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 16:13:35 2011 -0400

    Fixed method in flavors

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c336fa339d9038f5430f7ffd82df3a54e67196f
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:06:21 2011 -0500

    Review feedback

 nova/compute/api.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 311c774e1109d6ce0449f0d06346078020ffa4e0
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 14:48:54 2011 -0500

    Review feedback

 nova/compute/api.py                               |   12 ++++++------
 nova/compute/manager.py                           |    4 ++--
 nova/virt/xenapi/vmops.py                         |    4 ++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    2 --
 4 files changed, 10 insertions(+), 12 deletions(-)

commit ff036fb229e7ff1c73d6be395fbb3b2807b9eb53
Merge: 791f8dc 016be4c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 13:48:19 2011 -0500

    Merged trunk

commit 791f8dc895b97caa9395a52113823bde37ae6cfa
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 13:47:47 2011 -0500

    Set root password upon XenServer instance creation.

 nova/compute/api.py                                |   22 +++++++++++--
 nova/compute/manager.py                            |   34 +++++++++++++-------
 nova/tests/api/openstack/test_servers.py           |    6 ++++
 nova/virt/xenapi/vmops.py                          |   16 +++++----
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent  |    1 -
 .../xenapi/etc/xapi.d/plugins/xenstore.py          |    6 ++--
 6 files changed, 60 insertions(+), 25 deletions(-)

commit 417de9b7a695b088c2525470f971455b727c8c38
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Fri May 6 14:23:51 2011 -0400

    Added Python packages needed for coverage reports to virtualenv packages

 tools/pip-requires |    2 ++
 1 file changed, 2 insertions(+)

commit 2946a21f78e4fd2b18bd6eb8c85eb2cc0c764f8a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 14:13:27 2011 -0400

    Added interface functions

 nova/api/ec2/cloud.py              |    2 +-
 nova/api/openstack/servers.py      |   14 ++++++--------
 nova/api/openstack/views/limits.py |    9 +++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

commit 500c14d8a879cb255e159acb69eda17de8f2b047
Merge: 4a0142b 016be4c
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 14:12:33 2011 -0400

    merge from trunk

commit 4a0142bdcd3d15c629ca96ba6d3d7fdaa13ed278
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 14:11:18 2011 -0400

    added test for show_by_name ImageNotFound exception

 nova/tests/api/openstack/test_images.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 595f742763336bb4edeb55f7556ce618bf85481e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 11:04:00 2011 -0700

    tests pass again

 nova/tests/test_compute.py |    9 +++++++++
 nova/virt/hyperv.py        |    1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

commit 016be4ccdfe3f7791021bc717a1445b36cde371f
Merge: 114a55d 6160e3d
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 6 18:01:42 2011 +0000

    Sanitize get_console_output results. See bug #758054

commit a845a769671066a684e38b82c34ded7ded55eed4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 09:06:46 2011 -0700

    revised file docs

 nova/scheduler/host_filter.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 11a7736f32b0f26fb2dc496b495aee682bf1bf18
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri May 6 16:54:57 2011 +0100

    New author in town.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit fe97e74eea29c990038c0dd36012054d34d704ac
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri May 6 15:57:01 2011 +0100

    Changes to allow a VM to boot from  iso image.  A blank HD is also attached with a size corresponding to the instance type.

 nova/virt/xenapi/vm_utils.py |  104 ++++++++++++++++++++++++++++++++++++++++--
 nova/virt/xenapi/vmops.py    |   17 ++++++-
 2 files changed, 116 insertions(+), 5 deletions(-)

commit bbb2bba0f05493ec40c70279b532b26a4a4c235c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 10:48:11 2011 -0400

    Added stub function for a referenced, previously non-existant function

 nova/api/ec2/cloud.py |    3 +++
 1 file changed, 3 insertions(+)

commit 9bd2d9e82d85dd70978397e643be82e9602c1ee1
Merge: b5616a6 114a55d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri May 6 10:37:20 2011 -0400

    Merged trunk.

commit fa9eeb65533d897f6e81067986dc614582fb310a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 07:19:57 2011 -0700

    grabbed from dist-sched branch

 nova/compute/manager.py   |   17 +++++++++++
 nova/virt/hyperv.py       |    9 ++++++
 nova/virt/libvirt_conn.py |    8 ++++++
 nova/virt/xenapi_conn.py  |   69 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+)

commit c02ba694e9c5793980f0678c616fac16687f7407
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 10:02:21 2011 -0400

    Explicitly casted a str to a str to please pylint

 nova/tests/test_virt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8919644dfd91ea83654aa34d41680523af27234
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 09:26:40 2011 -0400

    Removed incorrect, unreachable code

 nova/tests/db/fakes.py |    1 -
 1 file changed, 1 deletion(-)

commit 21b84aae209a8e02910293f3adc60048e6ef9ce5
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 23:25:15 2011 -0700

    spacing fix

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 315b1ebdccdbe1d99111cfed71f0de6791f6cd7c
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 23:23:09 2011 -0700

    pep8 fix

 bin/nova-manage |    1 -
 1 file changed, 1 deletion(-)

commit d3c89daed971151bec57f66b279876bf926998c6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 22:44:08 2011 -0700

    Improved error notification in network create

 bin/nova-manage |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

commit 6160e3dbdf0dcc736fb650d025da89b269edbf59
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 6 09:13:46 2011 +0400

    Add two whitespaces to conform PEP8.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3ee0507ddc6bb7e15834144acc47c354396fbc70
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 5 23:14:46 2011 -0400

    Publish errors via nova.notifier

 nova/log.py                 |    9 +++++++++
 nova/tests/test_notifier.py |   21 +++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

commit 57fbc3f748389410bad29a82e685e0af2ee26646
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 6 06:50:48 2011 +0400

    Added myself to Authors file.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit a5e7d039ec9ee9528186fa011021da00d809e683
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 18:09:11 2011 -0700

    terminology: no more plug-ins or queries. They are host filters and drivers.

 nova/exception.py              |    5 +-
 nova/scheduler/host_filter.py  |  286 ++++++++++++++++++++++++++++++++++++++++
 nova/scheduler/query.py        |  276 --------------------------------------
 nova/tests/test_host_filter.py |  208 +++++++++++++++++++++++++++++
 nova/tests/test_query.py       |  206 -----------------------------
 5 files changed, 497 insertions(+), 484 deletions(-)

commit 5a3e8eea45bc11978112e3fed93768a1daf71530
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 5 16:29:31 2011 -0400

    Added interface function to ViewBilder

 nova/api/openstack/flavors.py |    3 +++
 1 file changed, 3 insertions(+)

commit 8d3f20e776af0fe174474a9fe8ee02eabe64053b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 5 15:56:04 2011 -0400

    Added interfaces to server controller

 nova/api/openstack/servers.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 900e446a41a930b2585950e711948d6e45f37bdd
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 5 15:38:45 2011 -0400

    added self to authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 92294ab9b63ecac5baff3c01582faaba63e3b0b1
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 5 15:37:53 2011 -0400

    fixed issue with non-existent variable being passed to ImageNotFound exception

 nova/image/local.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2cfa0ab48e981e31484287936fbc738d6073f473
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 5 15:35:34 2011 -0400

    removing rogue TimeoutException

 nova/api/openstack/servers.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 9797bda1baacf5d90d6ce678c20396bacb513e37
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 10:50:59 2011 -0700

    merge prop fixes

 nova/exception.py        |    4 ----
 nova/scheduler/query.py  |   37 ++++++++++++++++++++++++-------------
 nova/tests/test_query.py |   43 +++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 65 insertions(+), 19 deletions(-)

commit 310a43e6cccb151a5bcbeca8c30c25f229e6578c
Merge: 63bfb59 114a55d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu May 5 10:23:48 2011 -0500

    Merged trunk

commit 27f99a14a381062f87fbbb65d5aaa07914aa82c0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 08:13:22 2011 -0700

    print statements removed

 nova/scheduler/query.py |    2 --
 1 file changed, 2 deletions(-)

commit 51f59b4e86be15d1fac62d3a48ae72e930cf1301
Merge: 37954e6 114a55d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 07:41:26 2011 -0700

    merge with trunk

commit 37954e665b874ac2358921d175b30617f456c007
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 07:35:44 2011 -0700

    flipped service_state in ZoneManager and fixed tests

 nova/scheduler/api.py                  |    8 +++-----
 nova/scheduler/manager.py              |    7 +++----
 nova/scheduler/zone_manager.py         |   20 +++++++++-----------
 nova/tests/api/openstack/test_zones.py |    2 +-
 nova/tests/test_zones.py               |   18 ++++++------------
 5 files changed, 22 insertions(+), 33 deletions(-)

commit 31c7b40b89c076a32d8105219d623320c58b8166
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 06:01:56 2011 -0700

    pep8

 nova/scheduler/query.py  |   43 ++++++++++++++--------------
 nova/tests/test_query.py |   71 +++++++++++++++++++++++-----------------------
 2 files changed, 58 insertions(+), 56 deletions(-)

commit 4b03036214cff2fcaad079f84605737d7f9dc711
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 05:30:58 2011 -0700

    not =

 nova/tests/test_query.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 5a066cf5c2b952371eea753dcd0f95f917d08744
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 05:29:31 2011 -0700

    not =

 nova/scheduler/query.py  |    7 +++++--
 nova/tests/test_query.py |   29 +++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

commit 5f4fc98c9648fd3f124819e0f4a26cb1d2d7f0e8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 04:59:26 2011 -0700

    and or test

 nova/tests/test_query.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit cc18ff47ff41ddefd7a31db5b772d55b2e312e8c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 04:57:25 2011 -0700

    and or test

 nova/scheduler/query.py  |   10 +++++-----
 nova/tests/test_query.py |   26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

commit b5865949d1b690440a268b0cd941b128d74caba7
Merge: 5bd57d7 114a55d
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 5 00:17:57 2011 -0400

    merge from trunk

commit 6ee9c2f2b9a7b359336cfad0c5c6b4e1ef78a0da
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu May 5 07:53:04 2011 +0400

    Removed extra newline after get_console_output in fake virt driver.

 nova/virt/fake.py |    1 -
 1 file changed, 1 deletion(-)

commit 8f1d3ec3719f1c8cd587b653d380365ef0c16f51
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu May 5 07:50:58 2011 +0400

    Moved all reencoding to compute manager to satisfy both Direct API and internal cloud call.

 nova/api/ec2/cloud.py    |    2 +-
 nova/compute/manager.py  |    2 +-
 nova/tests/test_cloud.py |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

commit da286df51e00a9ee8a0450ee8afbce27712151a7
Merge: 36aa631 114a55d
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu May 5 07:04:34 2011 +0400

    Merged with current trunk.

commit 5bd57d70135e599e068a6b66d402ce6c75c250cc
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 4 21:50:54 2011 -0400

    added myself to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit d733eaf6749a5163165119ad164c817c3d7110b4
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Wed May 4 17:29:29 2011 -0500

    Adding a test case to show the xml deserialization failure for imageRef and flavorRef

 nova/tests/api/openstack/test_servers.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 114a55d0243f79db7ea1ef29830a9428dbf1aa33
Merge: cf2dbd1 2e9b830
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 4 22:06:44 2011 +0000

    Fixes for nova-manage vpn list

commit 772fc58644871f7ee0bb880074c89d79871e197a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 4 14:48:23 2011 -0700

    json parser

 nova/scheduler/query.py  |  123 +++++++++++++++++++++++++++++++++++++++-------
 nova/tests/test_query.py |   25 +++++++---
 2 files changed, 124 insertions(+), 24 deletions(-)

commit cf2dbd1fdfd30896c51ebd0753399a92c3055e13
Merge: b211728 1c16765
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed May 4 21:41:28 2011 +0000

    Don't fail the test suite in the absence of VCS history.

commit 1c16765a8378819596c1d5fb6178e2167da9ca52
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed May 4 23:09:06 2011 +0200

    It's ok if there's no commit history. Otherwise the test suite in the tarball will fail.

 nova/tests/test_misc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63bfb59d7c2978edbeac0816bb234d28253facd6
Merge: 04d1985 b211728
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 4 14:51:12 2011 -0500

    Merged trunk

commit ad07b86110b0bcb90f3b71bd423c06a6ff5f922d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 4 06:16:33 2011 -0700

    flavor test

 nova/scheduler/query.py  |    6 +++---
 nova/tests/test_query.py |   44 ++++++++++++++++++++++++++++++++------------
 2 files changed, 35 insertions(+), 15 deletions(-)

commit e171e7511c6b1a2baacf0ab9857643cc1fe82eb3
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue May 3 17:08:04 2011 -0700

    Fix indentation.

 nova/virt/xenapi/volume_utils.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit f50c7260fa0b1dbcfb725bedeb9bb0ed4398f767
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 3 15:02:55 2011 -0700

    tests and better driver loading

 nova/exception.py        |    8 +++++
 nova/scheduler/query.py  |   50 +++++++++++++++-----------
 nova/tests/test_query.py |   89 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 20 deletions(-)

commit 36aa631dfdea4d2041df3a60d1a294f6a80807b7
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 3 22:34:00 2011 +0400

    Add missed hyphen.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b211728a8f771ed950f48dbc8a8a3dc52b7cbd5b
Merge: 95052ac 4cfcafd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 18:18:51 2011 +0000

    Adding OSAPI v1.1 limits resource

commit 95052ace83860ee3bdc5420f3d7f5096f6f4bede
Merge: ce019de 29e9aa1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 3 18:02:19 2011 +0000

    Adding support for server rebuild to v1.0 and v1.1 of the Openstack API

commit 3dc9cbfd4fc04b86742507419cc09e749c6af663
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue May 3 21:16:58 2011 +0400

    reduce policy for countyname

 nova/CA/openssl.cnf.tmpl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2c966851089c5c5267195a96612b4f764b52c09a
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue May 3 21:16:03 2011 +0400

    looking for default flagfile

 nova/utils.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 29e9aa173ea20a7d5cb816ce7478d6c0c2c38b80
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:32:40 2011 -0400

    adding debug log message

 nova/api/openstack/servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 47119b1d1517c1e4b1d8fa5bdc1ace6492343dc7
Merge: 8d9e8ea ce019de
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:29:54 2011 -0400

    merging trunk

commit 4cfcafdd773495e7a1a78eb0a183d23b3527ecb6
Merge: bf889f6 ce019de
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:29:11 2011 -0400

    merging trunk

commit bf889f68e3efbf0ca388912b6c93ef61c5a8e7ad
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:25:19 2011 -0400

    removing class imports

 nova/api/openstack/limits.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 04d1985a31f5f769e3002c9776dd3ee1b1a5ba91
Merge: 0a83ec4 ce019de
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 3 10:18:59 2011 -0500

    Merged trunk

commit 0a83ec414bc722eb77ae7cf4ccafba19c5f0c599
Merge: db26ae5 757709e
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 3 10:18:27 2011 -0500

    Merged trunk

commit c38871690702ad3b6b39845ae33ee71465a8e95c
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 3 11:05:45 2011 +0400

    Moved reencoding logic to compute manager and cloud EC2 API.

 nova/api/ec2/cloud.py     |    2 +-
 nova/compute/manager.py   |    3 ++-
 nova/tests/test_cloud.py  |    3 ++-
 nova/virt/fake.py         |    2 +-
 nova/virt/libvirt_conn.py |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

commit ce019de9ca633218f031077f6317edb373f1ea88
Merge: c069337 2014dcd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue May 3 02:16:25 2011 +0000

    ensure create image conforms to OS API 1.1 spec

commit 64ebfab4cf8279a7ad8ffefebd6bc207aecb3122
Merge: f99c5f6 c069337
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 2 18:07:30 2011 -0400

    merge updates from trunk

commit c069337734e99d5833b5a1814e33ffb1fbb5fff6
Merge: e4538af 2463fc6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 2 21:37:59 2011 +0000

    Added support in the nova openstack api for requests with local hrefs, e.g., "imageRef":"2"
    Previously, it only supported "imageRef":"http://foo.com/images/2".
    The 1.1 api spec defines both approaches.

commit e4538af1a6e4b9796da3f4d7c3484084d3b72463
Merge: 65f05c4 c0d046c
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon May 2 21:26:34 2011 +0000

    Add a flag to allow the user to specify a dnsmasq configuration file for nova-network to use when starting dnsmasq. Currently the command line option is set to "--config-fil=" with nothing specified.  This branch will leave it as it is if the user does not specify a config file, but will utilize the specific file if they do.
    
    If there is a conflict with the options specified on the command line and those in the configuration file, dnsmasq will use the config file (overriding the command line options) if the option is only allowed to be specified once, or it will use both if the option is allowed to be specified multiple times.
    
    I have found this personally useful for adding things such as "domain=" to set the domain hostname on VMs as well as to more finely tune DNS delegation and upstream resolution.

commit 377b120f689edcdad07eaf479dfac1ac7becabd0
Merge: 10db492 65f05c4
Author: John Tran <jhtran@att.com>
Date:   Mon May 2 14:25:38 2011 -0700

    merged from trunk

commit 10db492376a8bb8409e3fb3c33707865ac0f3ee7
Author: John Tran <jhtran@att.com>
Date:   Mon May 2 14:25:21 2011 -0700

    implemented review suggestion EAFP style, and fixed test stub fake_show needs to have image_state = available or other tests will fail

 nova/api/ec2/cloud.py    |   14 +++++++++-----
 nova/tests/test_cloud.py |   35 ++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 22 deletions(-)

commit f99c5f60d202e84f5defb63e771f60d20cf43df9
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 2 16:58:06 2011 -0400

    got rid of extra whitespace

 tools/install_venv.py |    3 ---
 1 file changed, 3 deletions(-)

commit 221a756550a61ee73a05b5b7d88d9c12ef97675b
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 2 16:55:54 2011 -0400

    Update tools/pip-requires and tools/install_venv.py for python2.7 support (works in ubuntu 11.04)

 tools/install_venv.py |   12 ++++++++++--
 tools/pip-requires    |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 2463fc66e363e13bf955e1ebb9b370f8e901d328
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 2 16:49:20 2011 -0400

    No need to test length of admin password in local href test.

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb
Merge: 89d818c 65f05c4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon May 2 16:27:58 2011 -0400

    merging trunk; resolving conflicts; fixing issue with ApiError test failing since r1043

commit b4b427ce5d7f66245135b9cf57208884b8b556fe
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 2 16:14:41 2011 -0400

    Added support in osapi for requests with local hrefs, e.g., "imageRef":"2"

 nova/api/openstack/common.py             |    9 ++++++++-
 nova/tests/api/openstack/test_servers.py |   28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

commit f6ee353e388a52e338a7f1a27f924a9a0c60f9a1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 2 12:49:10 2011 -0700

    initial pass

 nova/scheduler/query.py |  164 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 164 insertions(+)

commit 65f05c403e852cebeb7b052e36bbd129aedf4d4f
Merge: 46fc9dc 3be272f
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 2 19:26:06 2011 +0000

    Implement get_host_ip_addr in the libvirt compute driver.

commit 89d818c621cf257495ceb07687be04152423086a
Merge: 18388b2 1a25bb4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon May 2 15:23:11 2011 -0400

    merging trunk; resolving conflicts

commit 46fc9dccf2d8666e6b64ad060b1deb4c3c591768
Merge: 1a25bb4 e0e95c3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 2 19:21:40 2011 +0000

    Modified the instance status returned by the OS api to more accurately represent its power state

commit c0d046ccb17c44ca66498d4b50e573c835b3d508
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon May 2 13:19:58 2011 -0600

    Fixed 2 lines to allow pep8 check to pass

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1a25bb43f68c63844b48b5729d4bcf78cdc94b5c
Merge: 05a5177 461b021
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 2 19:17:09 2011 +0000

    Since run_tests.sh utilizes nose to run its tests, the -x, --stop flag works correctly for halting tests on the first failed test. The usage information for run_tests.sh now includes the --stop flag.

commit 05a5177662d914cbd5fac2cefc1966dfa8bc67be
Merge: 42c8e73 41966e6
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 2 19:07:02 2011 +0000

    add support for git checking and a default of failing if the history can't be read

commit 42c8e73994c7d787aef0e2d97ea162ee5a2e1304
Merge: 585a181 c3ab4f0
Author: John Tran <jhtran@att.com>
Date:   Mon May 2 18:04:29 2011 +0000

    ApiError 'code' arg set to None, and will only display a 'code' as part of the str if specified.

commit 585a1819f365018a4536bf7364722965ba994845
Merge: 203e063 30d7b7d
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 17:59:48 2011 +0000

    Fixed: Check for use of IPv6 missing

commit 203e0638b2f6d8712ca1be99d155ffc3ee922689
Merge: 62f9e14 e28ec55
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 17:45:48 2011 +0000

    removed unused method and fixed imports

commit 62f9e140a4a37b88f1100e8d9aada2b20e79fa02
Merge: 757709e b5fb5c8
Author: Anne Gentle <anne@openstack.org>
Date:   Mon May 2 16:36:50 2011 +0000

    Change the links in the sidebar on the docs pages.

commit 3be272f432b4385cf77787416762a360687a36bd
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 2 10:17:51 2011 -0400

    Use my_ip for libvirt version of get_host_ip_addr.

 nova/tests/test_virt.py   |    5 +++++
 nova/virt/libvirt_conn.py |    5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit ad562e2bf7e5ad593f41a5b77e78d0b452d70d0e
Merge: 2ef03c6 757709e
Author: Dan Prince <dprince@redhat.com>
Date:   Mon May 2 10:09:17 2011 -0400

    Merge w/ trunk.

commit e28ec55f91b944346065df737adf063436c53779
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 00:55:54 2011 -0700

    fix typo in import

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ee53b6df23988263ffdc43549756ef59770981c
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 00:45:09 2011 -0700

    removed unused method and fixed imports

 nova/api/openstack/servers.py |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 20:43:06 2011 -0700

    small changes in libvirt tests

 nova/tests/test_virt.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 103ed1e5ca489de0064decc91bccf25dfbadc761
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 12:10:54 2011 -0700

    place ipv6_rules creation under if ip_v6 section

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6db188a3311ed62a24ba7202de2a6101c0d35c93
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 01:01:01 2011 -0700

    Added checking ip_v6 flag and test for it

 nova/tests/test_virt.py   |   21 ++++++++++++++++-----
 nova/virt/libvirt_conn.py |    6 ++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

commit db81474a8b67334d88173ea2d93e57a113d4af06
Merge: 721fafc 757709e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Apr 30 07:16:27 2011 -0400

    merging trunk

commit 721fafcfe0679e21fc4f60ec9fa0cfb5dcc468b1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Apr 30 07:14:20 2011 -0400

    adding view file

 nova/api/openstack/views/limits.py      |  100 +++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_limits.py |   26 ++++----
 2 files changed, 113 insertions(+), 13 deletions(-)

commit 757709eeaed44ac315d4767620636773ac7f8804
Merge: 8bda6dc 475453e
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Apr 30 02:46:29 2011 +0000

    Expose AuthManager.list_projects user filter to nova-manage.
    
        ./bin/nova-manage project list admin
    
    will now only show projects which the user 'admin' is associated with.

commit 8bda6dcab422659f250929008e1840f62b7702fe
Merge: e2d77bf 0fe36c8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Apr 30 02:31:29 2011 +0000

    Final cleanup of nova/exceptions.py in my series of refactoring branches

commit e2d77bf9d45c6370f5dda7176ec13db23666f314
Merge: 9d76e52 dc4beed
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Apr 29 22:06:18 2011 +0000

    Uses memcached to cache roles so that ldap is actually usable.

commit 9d76e52e4ac032973dd75d44e4978e7d42d33d40
Merge: 28f41bf ad077fc
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 29 20:11:19 2011 +0000

    added nova version to usage output of bin/nova-manage for easy identification of installed codebase

commit b5fb5c865c62834790a595b9ece98406b5cf1394
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Apr 29 14:39:13 2011 -0500

    Changing links in sidebar to previous release

 doc/source/_theme/layout.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aaa34f9e4b49db4f1cda4fc259c8f2c0716e3850
Merge: 2318420 28f41bf
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 29 22:25:28 2011 +0900

    Rebased to trunk rev 1035.

commit 28f41bf8bd385ec423d1f5c1ec2798e60832117f
Merge: d0cfae6 ba43fe8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 29 11:26:25 2011 +0000

    converted 1/0 comparison in db to True/False for Postgres cast compatibility

commit e49ef5187491d4143de8d0707595c9fb566d4211
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Apr 29 13:20:31 2011 +0400

    Changed test_cloud and fake virt driver to show out the fix.

 nova/tests/test_cloud.py |    2 +-
 nova/virt/fake.py        |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit ba43fe874a959e677c2d02583d261d8136c9ff8e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 13:37:30 2011 -0700

    converted 1/0 comparison to True/False for Postgres compatibility

 nova/db/sqlalchemy/api.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit ad077fc137cc6a1dfdcd60349560abb94f4cc8eb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 12:49:48 2011 -0700

    pep8

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit ae50200f9a5a72cab7d976e5dd7fda287c54341f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 12:49:07 2011 -0700

    fixed docstring per jsb

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ab13f16af693fc7eee200aadc951c99241f86fa
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 10:26:43 2011 -0700

    added version list command to nova-manage

 bin/nova-manage |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit d0cfae6c5928ddc2763f235800c8c9fa07a2d061
Merge: 523c76b 4695b46
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 28 16:58:03 2011 +0000

    Added more unit-test for multi-nic-nova libvirt

commit 542909e52a6f3f2a9891b710f3755ea7c033a8d0
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Apr 28 14:41:56 2011 +0400

    Sanitize get_console_output in libvirt_conn

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95ee288d3498c478248afdea649eef1aa58fe2f2
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 27 20:33:55 2011 -0700

    added nova version output to usage printout for nova-manage

 bin/nova-manage |    3 +++
 1 file changed, 3 insertions(+)

commit 523c76b9d1c4bb23530f237f3ebaedc5b86a9cc0
Merge: 26d44d1 c95aaaa
Author: jaypipes@gmail.com <>
Date:   Wed Apr 27 22:06:25 2011 +0000

    Make the import of distutils.extra non-mandatory in setup.py. Just print a warning that i18n commands are not available...

commit 0fe36c8ba3e524e490c66011c0787ea8a26dcfee
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Apr 27 14:23:21 2011 -0700

    Correcting exception case

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8e6875e8c9b45a03396d5e4312c4f9136b1dc552
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Apr 27 14:03:05 2011 -0700

    further cleanup of nova/exceptions.py

 nova/api/ec2/cloud.py             |    8 ++--
 nova/api/openstack/accounts.py    |    2 +-
 nova/api/openstack/users.py       |    2 +-
 nova/auth/manager.py              |    6 ++-
 nova/compute/instance_types.py    |   12 +++---
 nova/db/sqlalchemy/api.py         |    4 +-
 nova/exception.py                 |   78 +++++++++++++++++++------------------
 nova/scheduler/driver.py          |    8 ++--
 nova/tests/test_instance_types.py |    6 +--
 nova/tests/test_scheduler.py      |   10 ++---
 nova/virt/libvirt_conn.py         |    3 +-
 nova/wsgi.py                      |    5 +--
 12 files changed, 69 insertions(+), 75 deletions(-)

commit 496d9543f4978a078ca75015e9c25af0aaf1df28
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 27 15:20:46 2011 -0500

    added eagerloading mac adddresses for instance

 nova/db/sqlalchemy/api.py |    9 +++++++++
 nova/network/manager.py   |    7 +++++++
 2 files changed, 16 insertions(+)

commit 4695b46d6bee3f6993b95c88c0df3f324a76bfc1
Merge: a4b7830 26d44d1
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 27 00:51:51 2011 -0700

    merge with trunk and resolve conflicts

commit 461b02122d2bc05ace3664e4a0a81251dd4e9d59
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 27 00:53:07 2011 -0400

    Added myself to authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit e0e95c36f1d2c08c5ab419abdd8867c05d101475
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 27 00:30:33 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_servers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 26d44d12b3dee219002c11d78e3a7bb26fbff62a
Merge: 5ea80e2 64f4032
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 23:01:29 2011 +0000

    Refactoring usage of nova.exception.NotFound

commit 475453e9981d4d71a0639afc176629163abfc818
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 26 18:55:13 2011 -0400

    Let nova-mange limit project list by user.

 bin/nova-manage |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 64f40320a586d28345c38e4079b257e7a130c5db
Merge: a3f16d7 5ea80e2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 15:48:28 2011 -0700

    merging trunk

commit c95aaaaefe11048990021d376dbca6460f19248c
Author: jaypipes@gmail.com <>
Date:   Tue Apr 26 14:17:09 2011 -0700

    Make the import of distutils.extra non-mandatory in setup.py. Just print a warning that i18n commands are not available...

 setup.py |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 10552f691b73f8fe1a91e2ab8dc24b2d69f254c0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Apr 26 13:22:24 2011 -0400

    Updated run_tests.sh usage info to reflect the --stop flag

 run_tests.sh |    1 +
 1 file changed, 1 insertion(+)

commit 7630ae42c0e5ba0b7cb2c1cb10b9019215c36570
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Apr 26 11:25:02 2011 -0400

    Fixed formatting to align with PEP 8

 nova/tests/api/openstack/test_servers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6721d8918820f53288cbdf09ee352e93120439f9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Apr 26 09:45:53 2011 -0400

    Modified instance status for shutoff power state in OS api

 nova/api/openstack/views/servers.py      |    4 ++--
 nova/tests/api/openstack/test_servers.py |   11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

commit 5ea80e2f62e7a35967fc509aef8e7158577a2980
Merge: 08cf0db c2ec205
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 04:26:14 2011 +0000

    Refactoring the usage of nova.exception.Duplicate

commit 231842087b486638b62e906906392ec9c8e88925
Merge: f025b17 08cf0db
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 26 03:58:34 2011 +0900

    Rebased to trunk rev 1030.

commit c3ab4f023e2636e254f940e08da0aded42c0e96b
Author: John Tran <jhtran@att.com>
Date:   Mon Apr 25 12:55:59 2011 -0400

    removed extra newline

 nova/tests/test_exception.py |    1 -
 1 file changed, 1 deletion(-)

commit 6dbec949738443dfcb48679549f5082d728abdff
Merge: 8482d87 08cf0db
Author: John Tran <jhtran@att.com>
Date:   Mon Apr 25 12:36:00 2011 -0400

    merged from trunk

commit 2014dcd674cc18d440b92202558adef1a81e36c3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 25 00:01:19 2011 -0700

    updated tests to reflect serverRef as href (per Ilya Alekseyev) and refactored _build_server from ViewBuilder (per Eldar Nugaev)

 nova/api/openstack/views/images.py      |   20 +++++++++++++++-----
 nova/tests/api/openstack/test_images.py |    8 ++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

commit 08cf0db667b68a6351662b2c550af93624e66d4d
Merge: 7e01d47 ba00a83
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Sat Apr 23 02:46:14 2011 +0000

    Add a test checking spawn() works when network_info is set, which
    currently doesn't.
    The following patch would fix parameter mismatch calling _create_image() from spawn() in
    libvirt_conn.py

commit a13616c2deae4ae90bb69ce87bda28576e194426
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 22 16:35:26 2011 -0400

    removed unused imports and renamed template variables

 .../networking/etc/xensource/scripts/novalib.py    |    1 -
 .../xensource/scripts/ovs_configure_base_flows.py  |    1 -
 .../xensource/scripts/ovs_configure_vif_flows.py   |  107 ++++++++++----------
 3 files changed, 53 insertions(+), 56 deletions(-)

commit a3f16d7efbdc51c75c1a729d9194ee3a66841bab
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:49:37 2011 -0400

    pep8

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95ea08d252b63c9721c79c58785e1a1df98cc3a6
Merge: 8681db3 7e01d47
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:44:24 2011 -0400

    merging trunk

commit b5616a651ce5ab2df0202dec0261ec877e0243ed
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 22 15:26:45 2011 -0400

    Renamed test_virt.py to test_libvirt.py as per suggestion.

 nova/tests/test_libvirt.py |  886 ++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_virt.py    |  886 --------------------------------------------
 2 files changed, 886 insertions(+), 886 deletions(-)

commit c2ec2054a6b42b086580c6647ae0d5d808b4d2c7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:14:36 2011 -0400

    fixing bad merge

 nova/virt/libvirt_conn.py |    4 ----
 1 file changed, 4 deletions(-)

commit b58692d3b69fbfe420a17157a061367ae4b53b23
Merge: 4eac8d2 7e01d47
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 22 14:57:37 2011 -0400

    Merged trunk and fixed simple exception conflict.

commit 74a99b586369c294719c529b2dbd98e25554965d
Merge: 2ed46e1 7e01d47
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 14:35:24 2011 -0400

    merging trunk

commit 7e01d47e887fe96b997ba16013022112d71ea62a
Merge: f2ed04d 7168812
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 18:21:32 2011 +0000

    Refactoring nova.exception.Invalid usage

commit 7168812fdf56280f24dc977c5dd9c7a73959c2a2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 13:30:13 2011 -0400

    adding gettext to setup.py

 setup.py |    2 ++
 1 file changed, 2 insertions(+)

commit f2ed04d5a0034328bb02a1cb81784f8956652052
Merge: 8af2a2d 55aa124
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 17:01:39 2011 +0000

    Use runtime XML instead of VM creation time XML for createXML() call in order to ensure volumes are attached after RebootInstances as a workaround, and fix bug #747922.

commit 4eac8d2c4252eb866e99ef260c0c5d7df1d927d2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 22 12:47:09 2011 -0400

    Created new libvirt directory, moved libvirt_conn.py to libvirt/connection.py, moved libvirt templates, broke out firewall and network utilities.

 nova/tests/test_virt.py                |   47 +-
 nova/virt/connection.py                |    2 +-
 nova/virt/cpuinfo.xml.template         |    9 -
 nova/virt/libvirt.xml.template         |  122 --
 nova/virt/libvirt/connection.py        | 1527 ++++++++++++++++++++++
 nova/virt/libvirt/cpuinfo.xml.template |    9 +
 nova/virt/libvirt/firewall.py          |  630 ++++++++++
 nova/virt/libvirt/libvirt.xml.template |  122 ++
 nova/virt/libvirt/netutils.py          |   95 ++
 nova/virt/libvirt_conn.py              | 2168 --------------------------------
 10 files changed, 2408 insertions(+), 2323 deletions(-)

commit c03e9805328afe1d03fa65ac93d2b91ba04c229e
Merge: 14718af 8af2a2d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Apr 22 10:39:35 2011 -0500

    Merge from trunk

commit 55aa1247e9017a3982397e6d795c8388a35b5386
Merge: 16da096 8af2a2d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sat Apr 23 00:08:13 2011 +0900

    Rebased to trunk rev 1027, and resolved a conflict in nova/virt/libvirt_conn.py

commit f025b1775efb7f39e6355e25e514f01f5d9da9c4
Merge: edc63f9 8af2a2d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 23:58:58 2011 +0900

    Rebased to trunk rev 1027.

commit 8af2a2d720b97ef17565d57a9b8b028d449a9c84
Merge: f72bc1d f710ad1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 14:16:16 2011 +0000

    clarifies error when trying to add duplicate instance_type names or flavorids via nova-manage instance_type

commit 3605aafe25e93f2d913b33a00da509fcd6e1f0df
Merge: bbcc230 f72bc1d
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 22 09:34:15 2011 -0400

    merge trunk

commit edc63f9734a4b053a3b57fd6febe94824c83815f
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 21:35:54 2011 +0900

    Rework completed. Added test cases, changed helper method name, etc.

 nova/auth/authutils.py   |   48 ----------------------------------
 nova/auth/manager.py     |    8 +++---
 nova/tests/test_auth.py  |   64 +++++++++++++++++++++++++++-------------------
 nova/tests/test_utils.py |   25 ++++++++++++++++++
 nova/utils.py            |   30 ++++++++++++++++++++++
 5 files changed, 95 insertions(+), 80 deletions(-)

commit f710ad1e3fff16de696f608986f24bdc8ffc3f6b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:22:23 2011 -0700

    pep8

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 40ef1240c3c7b16528096f60b37811a493c89117
Merge: 1efd359 f72bc1d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:14:11 2011 -0700

    merge trunk, resolved conflict

commit 1efd359644aecbd6262e334e184897b98ef6c9d3
Merge: 63f5aa5 1a814ba
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:11:54 2011 -0700

    merge trunk

commit f72bc1d675e3034882bf901c2fee0491d60ce638
Merge: fdab470 3e3f8e1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 22 07:06:14 2011 +0000

    Abstracted libvirt's lookupByName method into _lookup_by_name.

commit fdab470f28a2cb8ef0c4d174241e5a6dc362a21d
Merge: c028a79 5904cba
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Apr 22 06:46:28 2011 +0000

    Provide option of auto assigning floating ip to each instance. Depend on auto_assign_floating_ip boolean flag value. False by default.

commit dc4beede6bda3b7db5ca5963cc6c48052d2b7c62
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 23:45:02 2011 -0700

    Fixes per review

 nova/auth/manager.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c028a791c8434a3c58ff1c7e0cd02b2f9f5b8417
Merge: 32bb38f c9fb4cd
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Apr 22 06:29:49 2011 +0000

    Restore volume state on migration failure to fix lp742256.

commit 32bb38fad4bd86406d714827743fbfe2e134f53d
Merge: 659ae2c b8683f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Apr 22 04:31:24 2011 +0000

    Fixes cloudpipe to get the proper ip address.
    
    * Changes FLAGS.vpn_image_id to integer
    * Converts to str when comparing because instance['image_id'] is a str
    * Removes unused method from db
    * Converts integer_id to ami when launching
    * Adds docs for setting up interface in cloudpipe image

commit aa0de1bba066682a1892ae2dcd1f92ebdd231f7c
Merge: f5ef0e4 659ae2c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 21 22:15:16 2011 -0400

    merging trunk

commit c9fb4cdf18781a819b410e7e67ae2cf09091a524
Merge: 1ee150c 659ae2c
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Apr 22 09:57:19 2011 +0900

    Merge trunk.

commit 659ae2ce4685034f9979702ca92a361acc23b1b6
Merge: 1b56402 3f2f5d8
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Apr 22 00:16:24 2011 +0000

    Fix bug with content-type and small OpenStack API actions refactor

commit 3f2f5d8944d7c66276628a704a3d2bcdbdd3a2c1
Merge: 5fc608b 1b56402
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Apr 22 03:25:07 2011 +0400

    merge with trunk

commit 35898af95004a79f75403d7a526cef65858da63a
Merge: 0842c63 1b56402
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 18:11:12 2011 -0500

    merge trunk

commit b8683f5d0e9b903f3c7864f5dffe536d6e8ccea3
Merge: 2d82195 1b56402
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 16:01:38 2011 -0700

    merged trunk

commit 1b56402bff72e74d0c058e6aeb2a30de3fc492d2
Merge: 7071e31 25e1e2d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Apr 21 22:59:55 2011 +0000

    -Fixed indent for _get_ip_version
    -Added LoopingCall to destroy as suggested by earlier bug report
    -Standardized all LoopingCall uses to include useful logging and better error handling

commit 7071e31f4f3f32e3ae4ffe7bf374e1172fd58c52
Merge: 72539d1 a474310
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 21 22:56:10 2011 +0000

    Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite.

commit 0842c63324f3daa04becb6114c9d6434743da53b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 17:36:42 2011 -0500

    create network now takes bridge for flat networks

 nova/network/api.py     |   11 +++--------
 nova/network/manager.py |   50 +++++++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

commit 72539d1100c178b4f573196e02e249267871ffa6
Merge: 7bbfc3d ea11033
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Apr 21 22:13:47 2011 +0000

    Adapt DescribeInstances to EC2 API spec.

commit 7bbfc3d771d807cb072325f656a7febf1d38459a
Merge: bec71be 19aaf25
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Apr 21 22:01:25 2011 +0000

    Change response of the EC2 API CreateVolume method to match the API docs for EC2.

commit 18388b26c0e28df103d07ad0cc28fd9bfaab6416
Merge: 6c037c5 bec71be
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Apr 21 16:18:49 2011 -0400

    Merged trunk and fixed api servers conflict.

commit 21ea16a857fe95cec3a3748a519c547f433e982a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 13:17:32 2011 -0700

    pep8

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6c037c5c639249556fcadd871d8af91760b50e90
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Apr 21 16:17:16 2011 -0400

    Fixes and reworkings based on review.

 nova/api/openstack/servers.py |   28 +++++++++-------------------
 nova/compute/api.py           |   11 -----------
 2 files changed, 9 insertions(+), 30 deletions(-)

commit c8bf0d217ba3601dfccff32c56fef1565d90d262
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 13:02:33 2011 -0700

    pep8

 nova/api/openstack/views/images.py      |    1 +
 nova/tests/api/openstack/test_images.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 8681db3aa9104f97a84a3323b102ed10af269888
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 21 15:50:04 2011 -0400

    Addressing exception.NotFound across the project

 nova/api/ec2/__init__.py                 |    4 +-
 nova/api/ec2/cloud.py                    |   11 +-
 nova/api/ec2/ec2utils.py                 |    5 +-
 nova/api/openstack/common.py             |    2 +-
 nova/api/openstack/servers.py            |    6 +-
 nova/auth/dbdriver.py                    |   16 +-
 nova/auth/ldapdriver.py                  |   48 ++---
 nova/auth/manager.py                     |   14 +-
 nova/compute/api.py                      |    8 +-
 nova/compute/manager.py                  |    5 +-
 nova/console/vmrc.py                     |    6 +-
 nova/db/sqlalchemy/api.py                |  131 ++++++--------
 nova/exception.py                        |  291 ++++++++++++++++++++++++++++--
 nova/image/fake.py                       |   10 +-
 nova/image/glance.py                     |   16 +-
 nova/image/local.py                      |   14 +-
 nova/network/vmwareapi_net.py            |    7 +-
 nova/tests/api/openstack/test_flavors.py |    4 +-
 nova/tests/test_scheduler.py             |   20 +-
 nova/tests/test_volume.py                |    2 +-
 nova/utils.py                            |    2 +-
 nova/virt/fake.py                        |    3 +-
 nova/virt/hyperv.py                      |   10 +-
 nova/virt/libvirt_conn.py                |    5 +-
 nova/virt/vmwareapi/fake.py              |    9 +-
 nova/virt/vmwareapi/vmops.py             |   27 +--
 nova/virt/xenapi/vm_utils.py             |    6 +-
 nova/virt/xenapi/vmops.py                |   11 +-
 nova/virt/xenapi/volumeops.py            |    6 +-
 29 files changed, 441 insertions(+), 258 deletions(-)

commit bec71bed9450d13202fdd7f54946e1376b271a2c
Merge: e86d276 ccf9b2c
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 19:46:35 2011 +0000

    fix logging in reboot OpenStack API

commit 7b5fab4382a5c02b1cead94fcd828e46c118c914
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 14:12:39 2011 -0500

    eager loaded mac_address attributes for mac address get functions

 nova/db/sqlalchemy/api.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 14e7200272e70ead7fe973e3cf2b20811ccf8377
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 12:09:36 2011 -0700

    updated image builder and tests for OS API 1.1 compatibility (serverRef)

 nova/api/openstack/views/images.py      |    4 +++-
 nova/tests/api/openstack/test_images.py |   12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

commit 258fd8779ebfe2d895fc2af55412a96c2e770845
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:53:20 2011 -0500

    forgot import

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit bbcc2304167c3331f4c54898200f01fd66c0a20c
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 21 14:53:03 2011 -0400

    change action= to actions=

 .../xensource/scripts/ovs_configure_base_flows.py  |    4 +-
 .../xensource/scripts/ovs_configure_vif_flows.py   |   52 ++++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

commit b5b283e91a0626d14bd7d520b68704a1e77d5603
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:46:37 2011 -0500

    typo

 nova/network/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 42dfb994083449f4d8b395af413ee1a195f3a8ef
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:42:23 2011 -0500

    forgot to save

 nova/compute/api.py |   17 -----------------
 nova/network/api.py |    1 -
 2 files changed, 18 deletions(-)

commit 521b6b36b0927d9c0b674db0e611cdb6f3851a08
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:38:23 2011 -0500

    moved get_network_topic to network.api

 nova/compute/manager.py |   14 --------------
 nova/network/api.py     |   17 +++++++++++++++++
 2 files changed, 17 insertions(+), 14 deletions(-)

commit 5904cba617038600f3d8e7f65c71485abb163927
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 22:23:40 2011 +0400

    style cleaning

 .../015_add_auto_assign_to_floating_ips.py         |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit e86d276ec16862e7aff2de9b02ec4c0d1f976921
Merge: c796920 783cea4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 18:21:31 2011 +0000

    Fixed network_info creation in libvirt driver. Now creating same dict as in xenapi driver.

commit 9cb5c0113d67a306a6c85ed6f6fd7f353cc95c7c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Apr 21 14:12:54 2011 -0400

    Modified instance status for shutdown power state in OS api

 Authors                                  |    1 +
 nova/api/openstack/views/servers.py      |    2 +-
 nova/tests/api/openstack/test_servers.py |   20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

commit f205dcf659697adaae0d85a042ea2ea7ffe5c1c7
Merge: dfcdafd c796920
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 10:29:11 2011 -0700

    rebase trunk

commit f29be40bffd0b4e2b26ce06d81090d5918e84539
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 11:54:20 2011 -0500

    altered imports

 nova/compute/manager.py |    1 -
 nova/network/api.py     |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

commit b93abf52587da04f8079be9be1ed0f9a473a9613
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 11:48:47 2011 -0500

    commit to push for testing

 nova/api/openstack/views/addresses.py              |    5 +-
 nova/compute/api.py                                |   26 ++-
 nova/compute/manager.py                            |   37 ++--
 nova/db/api.py                                     |    9 +-
 nova/db/sqlalchemy/api.py                          |   83 ++++++---
 .../migrate_repo/versions/014_mac_address_table.py |   79 --------
 .../migrate_repo/versions/015_mac_address_table.py |   80 ++++++++
 nova/db/sqlalchemy/models.py                       |    4 +
 nova/network/api.py                                |   38 +++-
 nova/network/manager.py                            |  192 +++++++++++++-------
 nova/virt/xenapi_conn.py                           |    4 +-
 11 files changed, 356 insertions(+), 201 deletions(-)

commit 38daa006211e6a003643e2d7c4acbd667b1e066e
Merge: 891eb82 c796920
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 01:27:24 2011 +0900

    Rebased to trunk rev 1015.

commit 891eb82afacc10795e4ac05a0c8f817645db85c2
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 01:26:59 2011 +0900

    Utility method reworked, etc.

 nova/auth/authutils.py  |   48 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/auth/manager.py    |    4 +++-
 nova/tests/test_auth.py |   24 ++++++++++++++++++++++++
 nova/utils.py           |   24 ------------------------
 4 files changed, 75 insertions(+), 25 deletions(-)

commit c796920198305e101c75bcbf4e027ba9e81975d7
Merge: d598c9c ce8fd6b
Author: termie <code@term.ie>
Date:   Thu Apr 21 15:06:13 2011 +0000

    Docstring cleanup and formatting (nova/image dir). Minor style fixes as well.

commit d598c9cdd08aae388b6c2e4023d6d7cf078f5193
Merge: 2867b23 98b8a80
Author: termie <code@term.ie>
Date:   Thu Apr 21 14:46:24 2011 +0000

    Docstring cleanup and formatting (nova/db dir). Minor style fixes as well.

commit 2867b237787e61f3d88d9d16f6804b4c9ab39762
Merge: 7c4f429 6eacc13
Author: termie <code@term.ie>
Date:   Thu Apr 21 14:41:17 2011 +0000

    Docstring cleanup and formatting (nova dir). Minor style fixes as well.

commit 2d82195d59240ea53d4726879d2a28a5872e58f7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 07:39:49 2011 -0700

    use vpn filter in basic filtering so cloudpipe works with iptables driver

 nova/virt/libvirt_conn.py |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit e6b76ce6886a1404739a972d106248a67df4f02a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 07:35:30 2011 -0700

    use simpler interfaces

 doc/source/devref/interfaces |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit 7c4f429d24543513418bb70d0d656092ec5990db
Merge: 2f8a813 740547f
Author: termie <code@term.ie>
Date:   Thu Apr 21 14:21:15 2011 +0000

    Docstring cleanup and formatting (console). Minor style fixes as well.

commit 2f8a8132bf38f17b5583b0f108672e1bb5de8ed9
Merge: b227052 b26f316
Author: termie <code@term.ie>
Date:   Thu Apr 21 13:56:08 2011 +0000

    Docstring cleanup and formatting (compute). Minor style fixes as well.

commit 9e04c157f744a543092bd6cba0c292cf94313576
Merge: 6c55606 b227052
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 21 09:37:32 2011 -0400

    merge trunk

commit ea11033935192ee26ea6d0d0dad47a0a624b17a0
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Apr 21 15:23:36 2011 +0200

    Add privateIpAddress and ipAddress to EC2 API DescribeInstances response.

 nova/api/ec2/cloud.py |    2 ++
 1 file changed, 2 insertions(+)

commit e1f37b81e805c087947c87a9bc341dd60e7e481c
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 15:49:47 2011 +0400

    style fixing

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba00a83490d6f442688d42f7f58c5f6cc566e1ee
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Thu Apr 21 16:54:59 2011 +0900

    Fix parameter mismatch calling _create_image() from spawn() in
    libvirt_conn.py

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit db1f6a3f2a8d85c82eb3530194e61276e7f54c6a
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Thu Apr 21 16:54:37 2011 +0900

    Add a test checking spawn() works when network_info is set, which
    currently doesn't. The following patch would fix it.

 nova/tests/test_virt.py |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

commit ba9edf8d6d93290d1f1e85bb3a51e3a69e3f0822
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 20 21:06:56 2011 -0700

    put up and down in the right dir

 doc/source/devref/down.sh |    7 +++++++
 doc/source/devref/up.sh   |    7 +++++++
 doc/source/down.sh        |    7 -------
 doc/source/up.sh          |    7 -------
 4 files changed, 14 insertions(+), 14 deletions(-)

commit b22705208133e5ff848b41296c2eec7a7b4e15e6
Merge: 7e345f0 7d8698a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 02:26:09 2011 +0000

    Makes metadata correctly display kernel-id and ramdisk-id.
    
    References from the Database don't support "in".

commit 2217872ff5e8e5b53af0b38064a3cdbc2c783ebb
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 05:22:09 2011 +0400

    pep8 cleaning

 nova/compute/manager.py                            |   47 ++++++++++----------
 .../015_add_auto_assign_to_floating_ips.py         |    1 +
 nova/network/api.py                                |    6 +--
 3 files changed, 28 insertions(+), 26 deletions(-)

commit 783cea4dc4497176b57b7a718a29bde102fb92bc
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 04:31:17 2011 +0400

    style fix

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5fc608bb60dc9c086d8c2c7ac69c0dd6719c061f
Merge: fe23f71 7e345f0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 04:20:19 2011 +0400

    revert changes that doesn't affect the bug

commit 7d8698ad551b756a9dfc7058e6d836de65a64945
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 20 16:21:37 2011 -0700

    in doesn't work properly on instance_ref

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e345f07edc13ad7d56d50b67b089b16d860cb40
Merge: 56f0b9a 8b2ac74
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 21:17:25 2011 +0000

    Another small round of pylint clean-up.

commit 56f0b9af7b5c9173d25304cd7430419ed72077ea
Merge: db26ae5 2ea651d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 20 21:06:17 2011 +0000

    Added an option to run_tests.sh so you can run just pep8. So now you can:
        ./run_tests.sh --just-pep8
    or
        ./run_tests.sh -p

commit 6c55606d92b399503a60c95f0925ff98f208e94b
Merge: 7c53dc7 db26ae5
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 17:01:35 2011 -0400

    merge trunk

commit 2e9b8301e835a97bf250026f98c7729d76be4407
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 20 13:37:21 2011 -0700

    fix display of vpn instance id and add output rule so it can be tested from network host

 bin/nova-manage           |    2 +-
 nova/network/linux_net.py |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

commit 2ea651dad0265807119716046767b85cf769ca05
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 20 16:27:33 2011 -0400

    Exit early if tests fail, before pep8 is run.

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce8fd6b5e3ef0c757c76bbe9db37c696a1d2c11c
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:17 2011 -0700

    more changes per review

 nova/image/local.py   |    5 ++---
 nova/image/service.py |   10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

commit 42b139f740c08cce04d898c4ce7c85030733927f
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:17 2011 -0700

    fixes per review

 nova/image/s3.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8bf11973b0de6a57f18ac48452e3f8b36adac565
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:15 2011 -0700

    docstring cleanup, nova/image dir

 nova/image/fake.py    |    9 ++++---
 nova/image/glance.py  |   70 ++++++++++++++++++++-----------------------------
 nova/image/local.py   |    8 +++---
 nova/image/s3.py      |   43 +++++++++++++++---------------
 nova/image/service.py |   63 ++++++++++++++++++++++----------------------
 5 files changed, 92 insertions(+), 101 deletions(-)

commit db26ae5d02315f171704c209725ba511d76e3614
Merge: 797e31a e288c8a
Author: termie <code@term.ie>
Date:   Wed Apr 20 19:11:14 2011 +0000

    Docstring cleanup and formatting. Minor style fixes as well.

commit 6eacc130af49ced7a1e5ce511c7096dd7563b4b2
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:08:24 2011 -0700

    cleanups per code review

 nova/utils.py |    4 ++--
 nova/wsgi.py  |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

commit f69600e1844898bd48dc8f615c6684044d9aebe0
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:08:22 2011 -0700

    docstring cleanup, nova dir

 nova/context.py      |   10 +++-
 nova/crypto.py       |   61 ++++++++++----------
 nova/exception.py    |   25 +++++----
 nova/fakememcache.py |    4 +-
 nova/flags.py        |   16 ++++--
 nova/log.py          |   49 ++++++++--------
 nova/manager.py      |   34 +++++++----
 nova/quota.py        |   23 ++++----
 nova/rpc.py          |  152 ++++++++++++++++++++++++++++----------------------
 nova/service.py      |   83 +++++++++++++--------------
 nova/test.py         |   50 +++++++++--------
 nova/utils.py        |  147 +++++++++++++++++++++++-------------------------
 nova/version.py      |    6 +-
 nova/wsgi.py         |  144 +++++++++++++++++++++++------------------------
 14 files changed, 422 insertions(+), 382 deletions(-)

commit 740547fcb1aa02c31a362d1be2d4a27b3799e36a
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:06:10 2011 -0700

    fixed indentation

 nova/console/vmrc_manager.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 04fd29085c6ed5fe72378b061b1d7659f110c924
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:06:10 2011 -0700

    docstring cleanup, console

 nova/console/api.py          |   23 ++++++--------
 nova/console/fake.py         |   22 ++++++-------
 nova/console/manager.py      |   17 +++++-----
 nova/console/vmrc.py         |   48 ++++++++++++++--------------
 nova/console/vmrc_manager.py |   72 +++++++++++++++++++-----------------------
 nova/console/xvp.py          |   48 ++++++++++++++--------------
 6 files changed, 108 insertions(+), 122 deletions(-)

commit 98b8a800b16a1e6699b1d4c7ce0e4ab61319be6e
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:00:21 2011 -0700

    docstring cleanup, nova/db dir

 nova/db/api.py       |   61 ++++++++++++++++++++++++++------------------------
 nova/db/base.py      |    8 +++----
 nova/db/migration.py |    2 ++
 3 files changed, 38 insertions(+), 33 deletions(-)

commit 797e31a918aec44830457b4c42f0fcee514a49fc
Merge: 1a814ba d7798b3
Author: termie <code@term.ie>
Date:   Wed Apr 20 18:56:20 2011 +0000

    attempts to make the docstring rules clearer

commit b26f3166554cf5de29fcedee7463bc523786cf72
Author: termie <code@term.ie>
Date:   Wed Apr 20 11:52:19 2011 -0700

    fix typo

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f4cfb9f0e654f26664345a041a62fd93613ef83b
Author: termie <code@term.ie>
Date:   Wed Apr 20 11:52:17 2011 -0700

    docstring cleanup compute manager

 nova/compute/manager.py |  236 +++++++++++++++++++++--------------------------
 1 file changed, 105 insertions(+), 131 deletions(-)

commit 7c53dc7a792dfcda0862178725adbe585c4fed21
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 14:24:29 2011 -0400

    bugfix signature

 .../xensource/scripts/ovs_configure_vif_flows.py   |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 169496af390caa4035db2fefabffd71c95a57fbf
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 14:11:25 2011 -0400

    refactor the way flows are deleted/reset

 .../xensource/scripts/ovs_configure_vif_flows.py   |  143 ++++++++++----------
 1 file changed, 70 insertions(+), 73 deletions(-)

commit fe23f71687e09248feb7542ea97001a496697742
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 22:01:14 2011 +0400

    remove ambiguity in test

 nova/tests/api/test_wsgi.py |    1 -
 1 file changed, 1 deletion(-)

commit 8b2ac745211a567b7c05e31343ada3ef4be85eb4
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 12:56:44 2011 -0500

    Pylinted nova-compute.

 bin/nova-compute |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 584cde68aa36c35c03c29eb4bb09ede5f8c4074e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 12:50:23 2011 -0500

    Pylinted nova-manage

 bin/nova-manage |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 155635faf20d4a1996639baf5d2c10b05734c3df
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:50:03 2011 +0400

    replaced regex to webob.Request.content_type

 nova/wsgi.py |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

commit a4b78306d31e1ef84d5dc9550ef2dcb1ed030fa2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:34:55 2011 +0400

    fix after review: style, improving tests, replacing underscore

 nova/tests/test_virt.py   |   20 ++++++++++++++------
 nova/virt/libvirt_conn.py |   14 +++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

commit e92009ca4756a7016458d10e9564b18cdd369c55
Merge: 5e74b5a 1a814ba
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:08:18 2011 +0400

    merge with trunk

commit 48936f6b8f063cf71fa42b4586d8ba524ed39cc4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 20:37:51 2011 +0400

    fix Request.get_content_type

 nova/api/openstack/servers.py               |   67 +++++++++++----------------
 nova/tests/api/openstack/test_extensions.py |    1 +
 nova/tests/api/openstack/test_servers.py    |    4 ++
 nova/tests/api/test_wsgi.py                 |    7 +++
 nova/wsgi.py                                |   20 +++++---
 5 files changed, 52 insertions(+), 47 deletions(-)

commit bdbfcb49179d32da5fcecd75fb849efe71469b00
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:16:35 2011 -0400

    Reverted bad merge.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bc061d052f0faec69329dca80e5ef41954fbf171
Merge: 13ef491 1a814ba
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 21 00:11:59 2011 +0900

    Rebased to trunk rev 1005.

commit 6c538b870005464b2bab0510b4e98a71d0d24770
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:11:45 2011 -0400

    Removed no longer relevant comment.

 nova/compute/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit e628007bec0e313f252d8dd15d19297f99dc93f8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:09:14 2011 -0400

    Removed TODO we don't need.

 nova/compute/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit bee606e08f5ba96a25d02a9358265db4a59ce5cd
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:06:03 2011 -0400

    Removed _ and replaced with real variable name.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 803d246c35256e0578837226b1a91003e451ab6f
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 18:35:07 2011 +0400

    instance type get approach changed. tests fixed

 nova/tests/test_virt.py   |    4 ++--
 nova/virt/libvirt_conn.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit c963b2bbb6a68a66319bd278cfc12b896ac4540c
Merge: e5e1863 1a814ba
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 10:32:29 2011 -0400

    Merged trunk.

commit f618d1675e49b4cc492a52812e8bb2811ef2fb56
Merge: 90a1f58 1a814ba
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 18:20:27 2011 +0400

    trunk merged

commit 45178fd6da58ff37617e35b5cddaf416ae5cee65
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 17:44:25 2011 +0400

    fix: mark floating ip as auto assigned

 nova/compute/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 19aaf2523b1f157b5f9cad0d625857e98c19002b
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Wed Apr 20 14:12:47 2011 +0200

    Add to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit d992fbbde7c8e5274d80e2fce9c840e7209c78c6
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Wed Apr 20 14:06:23 2011 +0200

    Change response format of CreateVolume to match EC2

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63f5aa5484aa9d61f2ed79caae1c665230a56f35
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Apr 19 15:25:39 2011 -0700

    revamped spacing per Rick Harris suggestion. Added exact error to nova-manage output.

 bin/nova-manage                |    1 +
 nova/compute/instance_types.py |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

commit a46bd9fb6483959e210f25276ff70c76767e509d
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 19 22:13:40 2011 +0000

    only apply ipv6 if the data exists in xenstore

 .../xensource/scripts/ovs_configure_vif_flows.py   |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a474310be8ed4d7a9840412779567abef71406f1
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 19 17:24:01 2011 -0400

    Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite.

 .../014_add_instance_type_id_to_instances.py       |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 41966e6475db5da505947b816670797c0cede029
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Apr 19 15:52:32 2011 -0500

    add support for git checking and a default of failing if the history can't be read

 nova/tests/test_misc.py |   49 +++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

commit 4e11c04a34b3237853c0b4be90ce6362237bcbe0
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 19 20:10:57 2011 +0000

    strip output, str() link local

 .../networking/etc/xensource/scripts/novalib.py    |    2 +-
 .../xensource/scripts/ovs_configure_vif_flows.py   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c987b6ade17af224f07814e584e7b0d2d47383a2
Merge: 1a814ba f5ef0e4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 15:59:24 2011 -0400

    merging lp:~rackspace-titan/nova/exceptions-refactor-invalid

commit 1a814ba56a696ce796ab7707eacc2ee065c448e8
Merge: 994ba6e 0465f92
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 19:31:17 2011 +0000

    Round 1 of pylint cleanup.

commit 0465f9249c0bcca27ad04bf8326bada2449e96c9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 13:29:16 2011 -0500

    Review feedback.

 nova/compute/manager.py |    3 +++
 1 file changed, 3 insertions(+)

commit 994ba6e861aa38976f2e4d655fd71c93117c3d11
Merge: 5f5874b 7080cbe
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 19 17:46:43 2011 +0000

    Implement quotas for the new v1.1 server metadata controller.
    
    Created a new _check_metadata_properties_quota method in the compute API that is used when creating instances and when updating server metadata. In doing so I modified the compute API so that metadata is a dict (not an array) to ensure we are using unique key values for metadata (which is implied by the API specs) and makes more sense with JSON request formats anyway.
    
    Additionally this branch enables and fixes the integration test to create servers with metadata.

commit 66a15373a14e9acc30808d2cf21bd800c64cc012
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 10:31:35 2011 -0700

    fix doc typo

 doc/source/devref/cloudpipe.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ccf9b2ccb41b1e7f946f2b2c21e6f8fbc9bd04e8
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Apr 19 21:25:53 2011 +0400

    fix logging in reboot OpenStack API

 nova/api/openstack/servers.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 4442d8f7017868f64eacc6d8ad94620263b9a9c9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 10:20:56 2011 -0700

    make geninter.sh use the right tmpl file

 nova/CA/geninter.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ed46e198933de00059e8436b970efa0a0de8318
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 13:18:15 2011 -0400

    pep8 fix

 nova/exception.py |    1 -
 1 file changed, 1 deletion(-)

commit 1378b117b7ea2bb05219b5a0e48f4b1ae8cac9ae
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 13:17:21 2011 -0400

    refactoring usage of exception.Duplicate errors

 nova/api/ec2/cloud.py        |    3 +--
 nova/auth/dbdriver.py        |    5 ++---
 nova/auth/ldapdriver.py      |   11 ++++-------
 nova/exception.py            |   39 +++++++++++++++++++++++++++++++++++----
 nova/virt/hyperv.py          |    3 +--
 nova/virt/vmwareapi/vmops.py |    3 +--
 nova/virt/xenapi/vm_utils.py |    3 +--
 nova/virt/xenapi/vmops.py    |    3 +--
 8 files changed, 46 insertions(+), 24 deletions(-)

commit c3a45962a322086e4d7339f980bcf61ee8bd3167
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:38:01 2011 -0700

    rename all versions of image_ec2_id

 nova/api/ec2/cloud.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 3e3f8e1f09d0615e66cc1be0b656d0d8e1d69671
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 12:36:07 2011 -0400

    Abstracted lookupByName calls to _lookup_by_name for centralized error handling.

 nova/virt/libvirt_conn.py |   53 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

commit 2d649fa8928e9682064613f2c984f53f492efbec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:32:33 2011 -0700

    actually use the ec2_id

 nova/cloudpipe/pipelib.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7554ab7da290565ee457b2d42730a2bff2fd7861
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:31:18 2011 -0700

    remove typo

 nova/cloudpipe/pipelib.py |    1 -
 1 file changed, 1 deletion(-)

commit fc43f7433c8b971a7875044a29ed1deb6ca1376f
Merge: 5f5874b f5ef0e4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 12:22:50 2011 -0400

    merging lp:~rackspace-titan/nova/exceptions-refactor-invalid

commit 745351d1e2a98a98de0a5f955385a92c01110684
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:19:52 2011 -0700

    Fixes cloudpipe to get the proper ip address.
    
    * Changes FLAGS.vpn_image_id to integer
    * Converts to str when comparing because instance['image_id'] is a str
    * Removes unused method from db
    * Converts integer_id to ami when launching
    * Adds docs for setting up interface in cloudpipe image

 nova/api/ec2/admin.py     |    2 +-
 nova/api/ec2/cloud.py     |    4 ++--
 nova/cloudpipe/pipelib.py |    2 ++
 nova/compute/manager.py   |    2 +-
 nova/db/api.py            |    5 -----
 nova/db/sqlalchemy/api.py |    9 +--------
 nova/flags.py             |    2 +-
 nova/virt/libvirt_conn.py |    2 +-
 8 files changed, 9 insertions(+), 19 deletions(-)

commit 8b21dd6634cc32c43d0bebf3dede40b4b28c0a78
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:16:45 2011 -0700

    add include file for doc interfaces

 doc/source/devref/interfaces |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit da99e8e6b143cd2051c23f14d4d46602f16f7ba3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:16:25 2011 -0700

    add instructions for setting up interfaces

 doc/source/devref/cloudpipe.rst |    6 ++++++
 1 file changed, 6 insertions(+)

commit 25e1e2d64ad43638ad4231e6e6edd84d96e14bdb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:33:51 2011 -0400

    Merged trunk and fixed small comment.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ad2d97972d63f50500ec8215c7f8f04d87468060
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:29:26 2011 -0400

    Fixed info messages.

 nova/virt/libvirt_conn.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3e31785d86c59dbda62e3a3ba3a1e23452e52562
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:16:46 2011 -0400

    Tweak to destroy loop logic.

 nova/virt/libvirt_conn.py |    5 -----
 1 file changed, 5 deletions(-)

commit 8e98888323d4308640ab5061cdae5ccd4e3ebabf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:09:07 2011 -0400

    Pretty critical spelling error.

 nova/virt/libvirt_conn.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9812ae8d3c113475f8ef5d609874317d0b330425
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:05:37 2011 -0400

    Removed extra calls in exception handling and standardized the way LoopingCalls are done.

 nova/virt/libvirt_conn.py |  186 ++++++++++++++++++++++++---------------------
 1 file changed, 98 insertions(+), 88 deletions(-)

commit f5ef0e4bf39e01b46db241f5766db60059d52df3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 10:55:47 2011 -0400

    one last i18n string

 nova/exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c0eab132cc5fd3ef23d80c959e9917d45a834500
Merge: d9628e8 5f5874b
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 09:44:10 2011 -0500

    Merged trunk.

commit 7b5cf70cc9339028b1be9569e5754b997c7dae83
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:50:53 2011 -0400

    multi-line string spacing

 nova/exception.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4466f775a70162f8a140afbe19a56d7290b014d3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:48:44 2011 -0400

    removing rogue print

 nova/tests/test_localization.py |    1 -
 1 file changed, 1 deletion(-)

commit 9c6cbd448088f5096bba9866d8057300256c6d34
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:48:07 2011 -0400

    moving dynamic i18n to static

 nova/exception.py               |   52 +++++++++++++++++++--------------------
 nova/tests/test_localization.py |    1 +
 nova/virt/vmwareapi/vmops.py    |    2 +-
 3 files changed, 28 insertions(+), 27 deletions(-)

commit 50bd39e0413c2231ebdf9f4c9fb7e58d27624250
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 19 16:57:17 2011 +0400

    refractoring

 nova/compute/manager.py |   50 ++++++++++-------------------------------------
 nova/network/api.py     |   15 ++++++++------
 2 files changed, 19 insertions(+), 46 deletions(-)

commit 5b670fe9bca9103642967bce609853704d0d1b88
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:02:00 2011 +0900

    Add support for cloning a Sheepdog volume.

 nova/volume/driver.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 1c7c53a9f40a88eb9def7ab9d706e7399ad5e65b
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:02:00 2011 +0900

    Add support for cloning a Sheepdog volume.

 nova/volume/driver.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 1018a60e3194e7e283cd89af28efd689623058a8
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:01:25 2011 +0900

    Add support for creating a new volume from a existing snapshot with EC2 API.

 nova/api/ec2/cloud.py                              |   12 ++++-
 .../versions/016_add_snapshot_id_to_volumes.py     |   48 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 nova/volume/api.py                                 |   12 ++++-
 nova/volume/driver.py                              |    4 ++
 nova/volume/manager.py                             |    9 +++-
 6 files changed, 81 insertions(+), 6 deletions(-)

commit 2f3819628b6d3dea13a56ea6e93e02992b2e1f5f
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:01:25 2011 +0900

    Add support for creating a new volume from a existing snapshot with EC2 API.

 nova/api/ec2/cloud.py                              |   12 ++++-
 .../versions/016_add_snapshot_id_to_volumes.py     |   48 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 nova/volume/api.py                                 |   12 ++++-
 nova/volume/driver.py                              |    4 ++
 nova/volume/manager.py                             |    9 +++-
 6 files changed, 81 insertions(+), 6 deletions(-)

commit aad857a18153792d96f300732c3bb5bb16aa02c3
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:50:10 2011 +0900

    Add support for creating a Sheepdog snapshot.

 nova/volume/driver.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit f76f2ee50f2407155a0aaefac3224e6af14e7d26
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:50:10 2011 +0900

    Add support for creating a Sheepdog snapshot.

 nova/volume/driver.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit dcda6be23c3797872c406f58578b05befd378c97
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:48:26 2011 +0900

    Add support for creating a snapshot of a nova volume with euca-create-snapshot.

 nova/api/ec2/__init__.py                           |    6 ++
 nova/api/ec2/cloud.py                              |   52 +++++++++++--
 nova/db/api.py                                     |   39 ++++++++++
 nova/db/sqlalchemy/api.py                          |   77 ++++++++++++++++++++
 .../versions/015_add_volume_snapshot_support.py    |   71 ++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   24 ++++++
 nova/exception.py                                  |    6 ++
 nova/volume/api.py                                 |   44 +++++++++++
 nova/volume/driver.py                              |    8 ++
 nova/volume/manager.py                             |   42 +++++++++++
 10 files changed, 361 insertions(+), 8 deletions(-)

commit 0ba085928c75f2fc27fb03eaa3aaeff6618e8875
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:48:26 2011 +0900

    Add support for creating a snapshot of a nova volume with euca-create-snapshot.

 nova/api/ec2/__init__.py                           |    6 ++
 nova/api/ec2/cloud.py                              |   52 +++++++++++--
 nova/db/api.py                                     |   39 ++++++++++
 nova/db/sqlalchemy/api.py                          |   77 ++++++++++++++++++++
 .../versions/015_add_volume_snapshot_support.py    |   71 ++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   24 ++++++
 nova/exception.py                                  |   50 +++++++++++++
 nova/volume/api.py                                 |   44 +++++++++++
 nova/volume/driver.py                              |    8 ++
 nova/volume/manager.py                             |   42 +++++++++++
 10 files changed, 405 insertions(+), 8 deletions(-)

commit 766b5efdc1a2acd617e395ea125d6df5bf4e0964
Merge: 37ed704 5f5874b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 19 13:54:47 2011 +0400

    trunk merged

commit 2ef03c6a0a8c5705249c3b5be755e0a13ca39332
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 18 22:02:54 2011 -0400

    Implement get_host_ip_addr in the libvirt compute driver.

 nova/tests/test_virt.py   |   12 ++++++++++++
 nova/virt/libvirt_conn.py |    6 ++++++
 2 files changed, 18 insertions(+)

commit 5f5874b0012e77e846ad02c7ce43f10356105f3d
Merge: 049b19c 0d40279
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Apr 19 00:42:57 2011 +0000

    Adding projectname username to the nova-manage project commands to fix a doc bug, plus some edits and elimination of a few doc todos.

commit 049b19ca9954e203804a32aec61a39846019d045
Merge: 230466d 65ca5ba
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Apr 19 00:31:41 2011 +0000

    pep8 fixes

commit 230466d5f4c41168ffc11f9c8c6c501880252367
Merge: d526ce5 9874e9d
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Apr 19 00:26:57 2011 +0000

    Remove zope.interface from the requires file since it is not used anywhere.

commit d526ce5b0b7eb1dc3ee99d7bde6c6544c3da2183
Merge: 52b675d f59f792
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 23:40:03 2011 +0000

    use 'is not None' instead of '!= None'

commit 52b675da69d573529103e405378c5d3028efa99f
Merge: 374f79f c8ca373
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 23:36:04 2011 +0000

    Fix loggin in creation server in OpenStack API 1.0

commit 8c5f00804850c14635ca95d9a0851b4b94247ded
Merge: aacb643 374f79f
Author: matt.dietz@rackspace.com <>
Date:   Mon Apr 18 22:21:32 2011 +0000

    Merge from trunk

commit 374f79f160c3bf7a7ae9bdfe665a152c75ee9437
Merge: 9eb2735 690ace3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Apr 18 22:11:31 2011 +0000

    Support admin password when specified in server create requests.

commit d9628e8ba927074b6e80433de80d745b34acaa28
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Apr 18 17:00:39 2011 -0500

    First round of pylint cleanup.

 nova/compute/manager.py      |    5 -----
 nova/virt/xenapi/fake.py     |    2 +-
 nova/virt/xenapi/vm_utils.py |    9 ++-------
 nova/virt/xenapi/vmops.py    |   10 ++++------
 4 files changed, 7 insertions(+), 19 deletions(-)

commit 690ace3417c717cd8c363ee714e780c2ef06d4ab
Merge: 3e120e5 9eb2735
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Apr 18 17:42:24 2011 -0400

    merge lp:nova and resolve conflicts

commit 9eb273546e1b7b820a8e687fe7027d9db3d9b1d3
Merge: 80bc903 eb20dd5
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 21:21:51 2011 +0000

    Change '== None' to 'is None'

commit 9874e9d8ca6e81000619cefe1a408102dbf257d1
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:55:48 2011 -0500

    remove zope.interface requires

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit f59f792c83c7f18e48903165df8d3dd78f45dd4c
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:53:09 2011 -0500

    use 'is not None' instead of '!= None'

 nova/api/ec2/apirequest.py               |    2 +-
 nova/auth/dbdriver.py                    |    2 +-
 nova/compute/monitor.py                  |    2 +-
 nova/db/sqlalchemy/api.py                |    2 +-
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/utils.py                            |    2 +-
 nova/virt/libvirt_conn.py                |   12 ++++++------
 tools/esx/guest_tool.py                  |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

commit 65ca5ba31f2c5ecea05290390ad66e65543aa83d
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:49:06 2011 -0500

    pep8 fixes

 nova/api/openstack/contrib/volumes.py            |    3 +--
 nova/image/fake.py                               |    3 +--
 nova/tests/api/openstack/test_image_metadata.py  |    6 ++----
 nova/tests/api/openstack/test_server_metadata.py |    3 +--
 nova/tests/api/openstack/test_versions.py        |    6 ++----
 nova/virt/vmwareapi/vim.py                       |    1 +
 6 files changed, 8 insertions(+), 14 deletions(-)

commit eb20dd53832577f94f5f251bd97e866435f6aeb9
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:40:16 2011 -0500

    Change '== None' to 'is None'

 Authors                                  |    1 +
 bin/nova-manage                          |    8 ++++----
 nova/api/ec2/cloud.py                    |    4 ++--
 nova/auth/manager.py                     |    8 ++++----
 nova/compute/api.py                      |    2 +-
 nova/compute/instance_types.py           |    4 ++--
 nova/compute/monitor.py                  |    2 +-
 nova/image/local.py                      |    2 +-
 nova/image/s3.py                         |    2 +-
 nova/log.py                              |    2 +-
 nova/network/xenapi_net.py               |    2 +-
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/test_scheduler.py             |    4 ++--
 nova/virt/libvirt_conn.py                |    4 ++--
 14 files changed, 24 insertions(+), 23 deletions(-)

commit 80bc903ae5bf9f7b29d33113fdf475331370f8b2
Merge: 0384079 73215aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 18 19:01:16 2011 +0000

    Fixes nova-manage image convert when the source directory is the same one that local image service uses.

commit 37ed70429986088226c54ec03acba8335ca38848
Merge: 841d25c 0384079
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 22:02:43 2011 +0400

    trunk merged

commit 841d25c1c9ab840ed39261a3bb234b981d9c337a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 22:02:12 2011 +0400

    pep8 fixed

 .../015_add_auto_assign_to_floating_ips.py         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c134d3c9bfb5a9d789776b243b8d6e4283fb3f80
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 18 13:30:54 2011 -0400

    calc link local

 .../xensource/scripts/ovs_configure_vif_flows.py   |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 9a0d079cfe28d6d8d4e909f68541efda5ad3a3c5
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 21:06:29 2011 +0400

    not performing floating ip operation with auto allocated ips

 nova/compute/manager.py      |    3 ++-
 nova/db/sqlalchemy/api.py    |    2 ++
 nova/db/sqlalchemy/models.py |    1 +
 nova/network/api.py          |    6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

commit 73215aa7fd31e54c84220bb852f98559a63bb17d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 18 09:10:07 2011 -0700

    it is rename not move

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c8ca373cfc71cf62d79ff90957961e9b0aa2ed36
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 19:36:19 2011 +0400

    pep8 fix

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 13ef4912b49158b5a845d0fcba43e1fa5a1c1c00
Merge: 36b9f78 0384079
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 19 00:01:59 2011 +0900

    Rebased to trunk rev 995.

commit 16da09697daa69c9e90b457ee13b31b6f258b3fb
Merge: a407109 0384079
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 19 00:01:45 2011 +0900

    Rebased to trunk rev 995.

commit a626c746f41e670a403d009f4f48a2bc73b65d2e
Merge: e315007 0384079
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 18 10:40:19 2011 -0400

    merge trunk

commit fe2d43472548f7c32a621ab4f245e078d0f46f0b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 18:13:56 2011 +0400

    add fault as response

 nova/api/openstack/servers.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit d1a7cf94f368e0c115bd7680512c582163f5e49e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:32:48 2011 +0400

    Fix logging in openstack api

 nova/api/openstack/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a582afce13286160411a65d4b1b91e69f67ab430
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:31:29 2011 +0400

    Fix logging in openstack api

 nova/api/openstack/common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c49c372ec3e94331eb8a16a0af7c9c9c5e46bba0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:06:18 2011 +0400

    Fix logging in openstack api

 nova/api/openstack/common.py |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 90a1f58796822e7fa392634e2daf767975554d40
Merge: 1e02e15 28568e5
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 15:28:42 2011 +0400

    trunk merged. conflict resolved.

commit 1e02e152aea76d5af30c42708caaee2fb1f05ede
Merge: 519c885 9761e76
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 15:25:44 2011 +0400

    trunk merged. conflict resolved.

commit 03840792687b915d9ffdced12f415b3d093b40b2
Merge: cf7a719 dbb0ff6
Author: termie <code@term.ie>
Date:   Mon Apr 18 05:06:11 2011 +0000

    The change to utils.execute's call style missed this call somehow, this should get libvirt snapshots working again.

commit cf7a7195cabbe3a5ed7e113552ed73adcafb5da4
Merge: 3929267 ba69d58
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Sun Apr 17 21:26:39 2011 +0000

    Fix parameter mismatch calling to_xml() from spawn() in libvirt_conn.py

commit dbb0ff6b7720d4715d26b470f0ee39f27b1e187c
Author: termie <code@term.ie>
Date:   Sat Apr 16 20:23:06 2011 -0700

    move name into main metadata instead of properties

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25d95c9f9ba0000773902186a5838fbe57a25a8c
Author: termie <code@term.ie>
Date:   Sat Apr 16 20:23:06 2011 -0700

    change libvirt snapshot to new style execute

 nova/virt/libvirt_conn.py |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit 3929267d627600d372e4592f43c10e89e88c55e7
Merge: a1db2db b571bf6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sat Apr 16 20:01:23 2011 +0000

    Add additional logging for WSGI and OpenStack API authentication.

commit aacb64391a8d9802365746308f9ece8e73dc9dae
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Apr 15 17:32:15 2011 -0500

    Rename the id

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7080cbe4d5d3e963dac21a51cb7e9819ec03a27b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:36:52 2011 -0400

    Added period to docstring for metadata test.

 nova/tests/integrated/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ac51ace40685666b1ed96d11468e1351ae2e6ee
Merge: ed1725a a1db2db
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:15:36 2011 -0400

    Merged trunk.

commit ed1725a5bc57c7b572604e383ac028f986ad2bfe
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:08:18 2011 -0400

    Empty commit to hopefully regenerate launchpad diff.

commit b571bf6bb329e3bb085987554461c411ef56b330
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:01:17 2011 -0400

    Explicitly tell a user that they need to authenticate against a version root.

 nova/api/openstack/auth.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 394b8ffac5f7361a163b320afdc824fda7ef0406
Merge: cb51075 a1db2db
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 14:57:58 2011 -0400

    Merged trunk.

commit 26680744494514469841f4cca7c5e6362a44b9a0
Merge: 24c2da4 a1db2db
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:51:10 2011 -0400

    merging trunk

commit 876216838843044adba401c1f44f18dd97b0e01d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:33:24 2011 -0400

    adding documentation & error handling

 nova/exception.py |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit ad138a5a50868531f34ba358600f1270588ce80b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:24:17 2011 -0400

    correcting tests; pep8

 nova/api/openstack/servers.py |    3 +-
 nova/exception.py             |   20 +++++++-----
 nova/scheduler/driver.py      |    3 +-
 nova/tests/test_scheduler.py  |   69 +++++++++++++----------------------------
 nova/tests/test_virt.py       |    2 +-
 nova/virt/libvirt_conn.py     |    2 +-
 6 files changed, 39 insertions(+), 60 deletions(-)

commit a1db2db067574ae6188f4d21a14478c1c018fe66
Merge: 6e0dab8 b342b1b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Apr 15 15:58:28 2011 +0000

    Removed the unused self.interfaces_xml variable.

commit 6e0dab845749de8e97a940a3a178b940f4e7a55f
Merge: f551d62 4a8cfa7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Apr 15 15:46:25 2011 +0000

    Only poll for instance states that compute should care about.

commit f551d62a450969af9f5edb9ecfcbbaa096df0aad
Merge: 8d30441 e152c5d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 10:36:14 2011 +0000

    Diablo versioning.

commit e152c5d06a2ba4004b6d2a3c6517c43069d3713f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 11:39:08 2011 +0200

    Diablo versioning

 nova/version.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 36b9f785b4660ab57447d8f456aa4376edc0a789
Merge: b501eb0 8d30441
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 15 13:33:34 2011 +0900

    Rebased to trunk rev 989.

commit a4071098f0da6f23f53135b007bb74ec1a3d9166
Merge: 2d1235e 8d30441
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 15 13:32:39 2011 +0900

    Rebased to trunk rev 989.

commit 8d304410250ddb33d2b2140456096816e0d62410
Merge: 9761e76 b64af9a
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 02:47:01 2011 +0000

    Final versioning for Cactus

commit 4b0785632ba626d34a8a9fae5e0a5c742660e2dc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 14 17:34:09 2011 -0400

    initial roundup of all 'exception.Invalid' cases

 nova/api/openstack/servers.py |    4 +-
 nova/exception.py             |   90 +++++++++++++++++++++++++++++++++++++++--
 nova/network/vmwareapi_net.py |   16 +++-----
 nova/scheduler/driver.py      |   27 ++++---------
 nova/virt/libvirt_conn.py     |   19 ++++-----
 nova/virt/vmwareapi/vmops.py  |   13 +++---
 6 files changed, 116 insertions(+), 53 deletions(-)

commit e315007edc7cbcb287ab928139f059053cc1a165
Merge: f2e9d41 9761e76
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 14 14:36:10 2011 -0400

    merge trunk

commit f2e9d4120ed0495d9c810a0d27d530e280f325c6
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 14 14:35:42 2011 -0400

    set the bridge on each OvsFlow

 .../xensource/scripts/ovs_configure_vif_flows.py   |   30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit e724baee5a76e38bff151148ab8c295f6fdb53dc
Merge: 76e643d 9761e76
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 21:29:40 2011 +0400

    merge with trunk

commit 76e643dc0b6b8b6e2ad499034f4d4491380e91ba
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 21:23:40 2011 +0400

    bugfix

 nova/compute/manager.py |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

commit 1b460de2f881d3cda0fd58bacedc3886020e4ca7
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 17:12:54 2011 +0400

    bugfix

 nova/compute/manager.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit ba69d58d21a6164626835e5dd7f45f75dfca07bd
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Thu Apr 14 21:38:55 2011 +0900

    Fix parameter mismatch calling to_xml() from spawn() in libvirt_conn.py
    
    Insert 'False' between instance and network_info.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c66d79a41044837a0865b1a706dd89e788597d1
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Apr 14 20:57:11 2011 +0900

    add kvm-pause and kvm-suspend

 nova/virt/libvirt_conn.py |   43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

commit 9761e7690ab8f13a76c761ba6055372a0d29eaff
Merge: a9e628b db755b3
Author: jaypipes@gmail.com <>
Date:   Thu Apr 14 09:21:03 2011 +0000

    Rework GlanceImageService._translate_base() to not call BaseImageService._translate_base() otherwise the wrong class attributes are used in properties construction...

commit b501eb0748ba629a4a742431a42af591f94b6b4c
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 10:47:37 2011 +0900

    Updated following to RIck's comments.

 nova/auth/manager.py |   15 ++++++++-------
 nova/utils.py        |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

commit 556306801e7234b3f523c13a5f1f7c9e035f811a
Merge: 32d081f a9e628b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 10:17:38 2011 +0900

    Rebased to trunk rev 987.

commit db755b38609f5c94b70f88057d0b2f0f4964744e
Author: jaypipes@gmail.com <>
Date:   Wed Apr 13 18:32:43 2011 -0400

    Rework GlanceImageService._translate_base() to not call BaseImageService._translate_base() otherwise the wrong class attributes are used in properties construction...

 nova/image/glance.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a9e628ba88a71b4cfae264aeb665e2c65921f176
Merge: 5c9cfbd eda350a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 13 22:03:11 2011 +0000

    Try to be nicer to the DB when destroying a libvirt instance.

commit 6a20cba0ea3c1e9945897ec27646d74d597492d7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 12:01:59 2011 -0700

    pep8

 bin/nova-manage                   |    3 ++-
 nova/tests/test_instance_types.py |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e6879789235150f08b0b0ce55ed2a178353992ef
Merge: 3d72f59 5c9cfbd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 11:51:36 2011 -0700

    merge trunk

commit 3d72f59530b1c974dca498fbca44e5720547fc61
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 11:51:03 2011 -0700

    fixed error message i18n-ization. added test.

 nova/compute/instance_types.py    |    8 ++++----
 nova/tests/test_instance_types.py |   10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

commit eda350a605b5711b8373849f389e3fe472670ca0
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 13 13:35:32 2011 -0500

    Don't hammer on the DB

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit 2d1235ea404d55f1cdf764798d7a071b3b60dc7e
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:38:14 2011 +0900

    Debug code clean up.

 nova/virt/libvirt_conn.py |   91 ++++-----------------------------------------
 1 file changed, 7 insertions(+), 84 deletions(-)

commit 0f812def55b98afbe460892ea7aa3e627ec43be2
Merge: ea07b74 5c9cfbd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:32:52 2011 +0900

    Rebased to trunk rev 986.

commit ea07b74b8b0fd912555b4193f6e29a2dcd86f4b0
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:22:41 2011 +0900

    An ultimate workaround workd... :(

 nova/virt/libvirt_conn.py |   93 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 16 deletions(-)

commit 5c9cfbd4aab55ac755cbfcd24922c2e883bcbe8b
Merge: ff39c82 7206aa7
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Apr 13 17:19:25 2011 +0000

    Zero out volumes during deletion to prevent data leaking between users

commit c04b0caca4a725be390271be30bf8a034aa5ca9d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 13 10:10:40 2011 -0700

    Minor formatting cleanup

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7206aa7af5f7d945ce9dfeff8de786bfd416ab21
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Apr 13 12:03:55 2011 -0500

    jesse@aire.local to mailmap

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit 33ca304f4cd7156c6a183293521ba29bb9e2833e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 13 12:46:51 2011 -0400

    Changed pep8 command line option from --just-pep8 to --pep8.

 run_tests.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 899e6607086f6df9442f588aae4f3c37367e696d
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Apr 13 11:31:28 2011 -0500

    re-add broken code

 nova/volume/driver.py |   10 ++++++++--
 nova/volume/san.py    |   10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit a30104e440e4ec77b30af6faa4b7b70835a57708
Merge: 82549a8 ff39c82
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 13 10:32:39 2011 -0400

    merge trunk

commit b64af9a52d9093c01d9e5df52e7ced877f6ad9a3
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Apr 13 10:33:56 2011 +0200

    Final versioning

 nova/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ff39c824f46513621383a2ebdbc0ff1427fe7d8e
Merge: 6b84c7c 0c7b624
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 13 08:32:06 2011 +0000

    Updates the documentation on creating and using a cloudpipe image.

commit 1ca1e83040cb2899c108415c899eee54c760afe3
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 14:51:26 2011 +0900

    iSCSI/KVM test completed.

 nova/virt/libvirt_conn.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit bc953f37560b7353b9b8c86e8d0bdaa5672d3acd
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue Apr 12 15:20:30 2011 -0700

    Minor fixes

 Authors                          |    1 +
 nova/virt/xenapi/volume_utils.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 6b84c7c935ac1fa7abb82e2a83545ebd4ac4b311
Merge: abaf265 87d758b
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Tue Apr 12 22:12:28 2011 +0000

    Fix RBDDriver in volume manager. discover_volume was raising exception.
    Modified local_path as well.

commit abaf265ca4e83291afac9ba8666423b41b449f28
Merge: 4a8c302 acfa9d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 22:01:39 2011 +0000

    Fixes VMware Connection to inherit from ComputeDriver

commit 4a8c3023f752327b475ada39d7bbcae6bc69890e
Merge: b33c81f 76bb9f4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 21:51:59 2011 +0000

    Fixes s3.py to allow looking up images by name.  Smoketests run unmodified again with this change!

commit 822ec6fe3075bed4479c8e48a984bd4c9622ffe1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Apr 12 16:46:18 2011 -0500

    move from try_execute to _execute

 nova/volume/driver.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit acfa9d4e3ae2185a0d6d9afdddf3e8a2e7f6f398
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 14:43:07 2011 -0700

    Make VMWare Connection inherit from ComputeDriver

 nova/virt/vmwareapi_conn.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 0c7b62428b50ca1264c271f5db2b1c80be7a1696
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 20:33:33 2011 +0000

    add up and down .sh

 doc/source/devref/cloudpipe.rst |   12 ++++++++++++
 doc/source/down.sh              |    7 +++++++
 doc/source/up.sh                |    7 +++++++
 3 files changed, 26 insertions(+)

commit 76bb9f42c6cc39218824332e396dca4a5e6ec351
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 18:43:49 2011 +0000

    fix show_by_name in s3.py and give a helpful error message if image lookup fails

 nova/api/ec2/cloud.py |    5 ++++-
 nova/image/s3.py      |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit e288c8aab3092f8691e190d2a3b9405518dab858
Author: termie <code@term.ie>
Date:   Tue Apr 12 13:08:48 2011 -0500

    remove extra newline

 nova/compute/api.py |    1 -
 1 file changed, 1 deletion(-)

commit baa129773c41f143237db992d90e1c681b3d33f8
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 12 13:47:45 2011 -0400

    dots.

 nova/api/openstack/server_metadata.py |    2 +-
 nova/compute/api.py                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 7b4f593efa834ed87d4b5ed75bd06a2a7257e51f
Merge: a4791a2 aebcd4a
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:42:37 2011 +0900

    Rebased to trunk rev 980.

commit a4791a2d2b4f44c636b7f7694e92bed615309070
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:41:33 2011 +0900

    Rework importing volume_manager.

 nova/virt/libvirt_conn.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 32d081f8f0a50b87f7b5d3f5bab4cf4ba92b1b4d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:11:36 2011 +0900

    Blushed up a little bit.

 nova/auth/manager.py |    2 +-
 nova/utils.py        |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 4a8cfa72377546ff0647d774b6b9edafd03cf894
Merge: 70c7558 b33c81f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 12 11:25:07 2011 -0500

    Merged trunk

commit 70c7558b54b693872af09772ae310d893b334dff
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 12 11:21:29 2011 -0500

    Only warn about rouge instances that compute should know about.

 nova/compute/manager.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit e5e1863349a1842d3f6ca452a59e574c03102ebf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:47:08 2011 -0400

    Added some tests.

 nova/compute/api.py                      |    1 +
 nova/tests/api/openstack/test_servers.py |   38 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

commit 2576c733c05dfd9872423f52319c28a65834ee61
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:13:31 2011 -0400

    Dangerous whitespace mistake! :)

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5de1825e2c1d1cdc63790f61e05b1f8b05ded1b3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:09:31 2011 -0400

    Cleanup after prereq merge.

 nova/compute/api.py |   42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

commit 12ec5f5c0d6a88779780b15b6ef38a016d6aae4a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Apr 12 08:04:55 2011 -0700

    Add new flag 'max_kernel_ramdisk_size' to specify a maximum size of kernel
    or ramdisk so we don't copy large files to dom0 and fill up /boot/guest

 nova/virt/xenapi/vm_utils.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 4893fae4854a9b39c151a806cd7b22c319c87160
Merge: cf3abb4 aebcd4a
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 23:42:18 2011 +0900

    Rebased to trunk rev 980.

commit 3f27e00b98f697b835dde2b592c17072e2ccf517
Merge: cebc981 bb77763
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 10:41:14 2011 -0400

    Merged lp:~rackspace-titan/nova/server_metadata_quotas as a prereq.

commit bb77763d665b113be0793dc1ecbb620dd9c38384
Merge: 7ef28c8 aebcd4a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 10:38:15 2011 -0400

    Merged trunk.

commit b33c81f05ddd5d3ac4e83b796b9675d4f6e56e7d
Merge: aebcd4a 6ac2b25
Author: termie <code@term.ie>
Date:   Tue Apr 12 14:32:03 2011 +0000

    Docstring cleanup and formatting. Minor style fixes as well.

commit 9d2513ea3a6d586e1fe3deae778a02bb089b9a5e
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 12 10:25:07 2011 -0400

    Updated to use setfacl instead of chown.

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit cebc98176926f57016a508d5c59b11f55dfcf2b3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 10:19:37 2011 -0400

    Commit for merge of metadata_quotas preq.

 nova/api/openstack/servers.py            |  103 +++++++++++++++++++++---------
 nova/compute/api.py                      |   20 ++++--
 nova/tests/api/openstack/test_servers.py |    1 +
 3 files changed, 90 insertions(+), 34 deletions(-)

commit 82549a88317bc72867edff8b897dafaa32acb2c2
Merge: fae0e20 aebcd4a
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 12 09:59:02 2011 -0400

    merge trunk

commit ae30b0a83469b15d1986fdbbef4f1dee52d68c17
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:37:06 2011 -0400

    Removed extra call from try/except.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 764862180657dbc16b2d57d3b2027c23b86ea649
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:34:52 2011 -0400

    Reverted some superfluous changes to make MP more concise.

 nova/virt/xenapi/vmops.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 2738e49b48da20ba382d0cdb1afddd369c06e74f
Merge: b2f693f aebcd4a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:24:49 2011 -0400

    Merged trunk.

commit b2f693f63d73e3e51cb3be40b5deae720c773340
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:23:52 2011 -0400

    Reverted some superfluous changes to make MP more concise.

 nova/compute/api.py       |   52 +++++++++++++++++------------------
 nova/compute/manager.py   |   11 ++++----
 nova/virt/libvirt_conn.py |   67 +++++++++------------------------------------
 3 files changed, 45 insertions(+), 85 deletions(-)

commit aebcd4abd574b2edb8f2919cb4c2a77617eb97e9
Merge: 8b54c18 07c1f30
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 12 07:54:19 2011 +0000

    Replace instance ref from compute.api.get_all with one from instance_get. This should ensure it gets fully populated with all the relevant attributes.

commit 8b54c186a7475cb800ac0de81be3478bc795d095
Merge: 0f7ea0f b54b6c2
Author: John Tran <jhtran@att.com>
Date:   Tue Apr 12 07:48:21 2011 +0000

    Add a unit test for terminate_instances.

commit 07c1f30225fb27cbc8e7cfeebc6a73ec67a7f2e5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 12 09:41:42 2011 +0200

    pep8

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 87d758b18836085d73c8b4230cd4812e0aa876aa
Author: Yoshiaki Tamura <yoshi@midokura.jp>
Date:   Tue Apr 12 11:37:51 2011 +0900

    Fix RBDDriver in volume manager. discover_volume was raising exception.
    Modified local_path as well.

 Authors               |    1 +
 nova/volume/driver.py |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

commit fa4aeb9af8d00ecff6620646c142e5ff68e1cd5e
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 12 03:07:22 2011 +0400

    pep8 fixes

 .../015_add_auto_assign_to_floating_ips.py         |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 4a2c973fe5c7cf68ff7f45a4927dc6d2e0a3986b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 12 02:44:44 2011 +0400

    migaration and pep8 fixes

 nova/api/openstack/contrib/volumes.py              |    3 +-
 nova/compute/manager.py                            |    4 +--
 nova/db/api.py                                     |    2 ++
 .../015_add_auto_assign_to_floating_ips.py         |   38 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)

commit 3aae677e5a87858f2195028bd78571c9d10f1615
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 11 21:43:12 2011 +0000

    update documentation on cloudpipe

 doc/source/devref/cloudpipe.rst        |   53 ++++++++++++++++++++++++++++++++
 doc/source/devref/rc.local             |   36 ++++++++++++++++++++++
 doc/source/devref/server.conf.template |   34 ++++++++++++++++++++
 3 files changed, 123 insertions(+)

commit 0f7ea0f97a6079058d90516bf306a002ac7757e7
Merge: b6c66b5 21fd04c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 11 21:01:55 2011 +0000

    Makes genvpn path actually refer to genvpn.sh instead of geninter.sh

commit 952528a65cc73fdf45f3ff2e2bdfaa68ce278a16
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 15:26:44 2011 -0500

    typo

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a1a845de526631ce939f51e0c1585c694e773f6
Merge: b8597ec b6c66b5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 11 16:14:39 2011 -0400

    Merged trunk.

commit 0d40279353be6932a05e614f78e7b23d28177b94
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Apr 11 15:04:00 2011 -0500

    Updating the runnova information and fixing bug 753352

 doc/source/runnova/flags.rst                   |  172 +-----------------------
 doc/source/runnova/index.rst                   |    4 +-
 doc/source/runnova/managing.images.rst         |    7 +-
 doc/source/runnova/managing.instance.types.rst |    2 +
 doc/source/runnova/managingsecurity.rst        |    2 -
 doc/source/runnova/network.vlan.rst            |    5 +-
 doc/source/runnova/nova.manage.rst             |   14 +-
 7 files changed, 19 insertions(+), 187 deletions(-)

commit 2c3c1f58990cfb2c5adbce1981e7636b63462305
Merge: 1845c5d b6c66b5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 14:36:25 2011 -0500

    merge trunk

commit 1845c5df145251f1e90709a91cc02ee5ec787e2f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 14:16:30 2011 -0500

    network manager changes, compute changes, various other

 nova/compute/manager.py                            |   83 +++-----
 nova/db/api.py                                     |    3 +
 nova/db/sqlalchemy/api.py                          |   28 +--
 .../migrate_repo/versions/014_mac_address_table.py |    9 +-
 nova/db/sqlalchemy/models.py                       |    3 +-
 nova/network/api.py                                |    6 -
 nova/network/manager.py                            |  201 ++++++++++++++------
 nova/virt/xenapi/vmops.py                          |   10 +-
 8 files changed, 209 insertions(+), 134 deletions(-)

commit 9ce66a4a09094d2b0403deea77416149aa789f3c
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 11 22:35:09 2011 +0400

    Floating ips auto assignment

 nova/compute/manager.py   |   21 +++++++++++++++++++++
 nova/db/api.py            |    3 +++
 nova/db/sqlalchemy/api.py |   12 ++++++++++++
 3 files changed, 36 insertions(+)

commit 1c13695a2c5e5d14ead3f5459d0b40bb875ecdf6
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 11 14:16:17 2011 -0400

    Sudo chown the vbd device to the nova user before streaming data to it. This
    resolves an issue where nova-compute required 'root' privs to successfully
    create nodes with connection_type=xenapi.

 nova/virt/xenapi/vm_utils.py |    2 ++
 1 file changed, 2 insertions(+)

commit b6975a79e91a531ea7501aeb0dbf6c7c07a6722b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 03:13:58 2011 +0900

    Minor blush ups.

 nova/virt/libvirt_conn.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 7a2f3d6007a1da365a008cca163cf493668a71de
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:32:19 2011 +0900

    A minor blush up.

 nova/virt/libvirt_conn.py |    2 --
 1 file changed, 2 deletions(-)

commit 2295e47b1f85fb199c7e4bf514f6781d7033dd77
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:30:31 2011 +0900

    A minor blush up.

 nova/virt/libvirt_conn.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit b342b1b63a860b9f4abdc28224ab7a6a0f3b00dd
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Apr 11 12:15:22 2011 -0500

    Remove unused self.interfaces_xml

 nova/virt/libvirt_conn.py |    1 -
 1 file changed, 1 deletion(-)

commit d4712321b336c16078e6e9c0735a691d8e6eab55
Merge: 121e829 b6c66b5
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:10:48 2011 +0900

    Rebased to trunk rev 977.

commit 121e829f2b23d9757dfcff6bd3b64b4416447b73
Merge: 92df1dc 25047dd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:09:57 2011 +0900

    Rebase to trunk rev 937.

commit 92df1dc754126895a052bb648c1613201455f714
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:09:29 2011 +0900

    debug tree status checkpoint 2.

 nova/virt/libvirt_conn.py |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

commit 6ac2b25d77ea71be0f9232b5502a75f255a6b2ec
Author: termie <code@term.ie>
Date:   Mon Apr 11 11:34:19 2011 -0500

    docstring cleanup, direct api, part of compute

 nova/api/__init__.py           |    2 -
 nova/api/direct.py             |   90 ++++++++++++++++++++++++++++++-
 nova/compute/api.py            |  115 +++++++++++++++++++++-------------------
 nova/compute/instance_types.py |   35 ++++++------
 4 files changed, 165 insertions(+), 77 deletions(-)

commit b6c66b55af3825fa4f48208071565b0af31c0618
Merge: 729bb7a 0d4fe0d
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 11 16:04:00 2011 +0000

    bzr ignore the top level CA dir that is created when running 'run_tests.sh -N'.

commit 21fd04c34487b97f7d1ed199773cf80e9ab60839
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 11 15:56:36 2011 +0000

    fix reference to genvpn to point to the right shell script

 nova/crypto.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 729bb7a320acf37b3c6994d4dcefbaa9e52693e0
Merge: 8ae129a decdaa3
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 11 15:47:36 2011 +0000

    Set default stateOrProvice to 'supplied' in openssl.cnf.tmpl.
    
    This resolves a stateOrProvince printable string UTF8 mismatch on
    RHEL 6 and Fedora 14 (using openssl-1.0.0-4.el6.x86_64 or
    openssl-1.0.0d-1.fc14.x86_64).
    
    Fixes x509 certificate generation on Fedora 14 and Redhat 6.

commit fae0e20a945abe5d0c235c38310c66cc756c485f
Merge: 545e87b 8ae129a
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 11 14:56:42 2011 +0000

    merge trunk

commit 8ae129ace401a1493cd953d3f4b9ecc22d74a70f
Merge: 2e75a8c 0cf2a52
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Apr 11 14:48:00 2011 +0000

    This branch fixes https://bugs.launchpad.net/bugs/751231.
    
    In bug description, nova.compute.manager._poll_instance_states should ignore 'migrating' instances.
    so I modified  nova.compute.manager._poll_instance_states to do it.

commit 5752838917237e7b86a64117f46c71d1c2a356f3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Apr 11 16:18:18 2011 +0200

    Replace instance ref from compute.api.get_all with one from instance_get. This should ensure it gets fully populated with all the relevant attributes.

 nova/api/ec2/cloud.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 2e75a8c008b4ba0b5510d57e4a202124b3549a31
Merge: 25047dd f59f8e8
Author: Justin SB <justin@fathomdb.com>
Date:   Mon Apr 11 14:17:29 2011 +0000

    When using libvirt, remove the persistent domain definition when we call destroy, so that behavior on destroy is as it was when we were using transient instances.
    
    Fixes bug #755666: libvirt instance definitions not removed

commit cf3abb4ae08f594e7346eba45544c429057c83f1
Merge: 3eb00eb 25047dd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Mon Apr 11 23:00:53 2011 +0900

    Rebased to trunk rev 973.

commit 25047dd2a121ea9c8e7a8ded970aa5a7254bbfc5
Merge: 50f3f75 79ebe16
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 11 09:27:14 2011 +0000

    Currently terminating an instance will hang in a loop, this allows for deletion of instances when using a libvirt backend. Also I couldn't help add a debug log where an exception is caught and ignored.

commit a3a5bd3b6fb83ae64c8566a012073b54745eccb7
Merge: e892dee 50f3f75
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Apr 10 14:34:25 2011 -0700

    merge trunk

commit 50f3f759468fa549b686dcef98633946163588e6
Merge: 1617d27 5632baa
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Apr 10 16:57:32 2011 +0000

    resolved lazy_match conflict between bin/nova-manage instance and instance_type by moving instance subcommand under vm command. documented vm command in man page. removed unused instance_id from vm list subcommand.

commit f59f8e8fcbde6f0d8d4c19b00bfc5f4141287772
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 12:57:32 2011 -0700

    Ooops - redefining the _ variable seems like a _really_ bad idea

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c6923ec603288e1d46fdb80e874c8e71361442f5
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 12:41:30 2011 -0700

    Handle the case when the machine is already SHUTOFF

 nova/virt/libvirt_conn.py |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit be386ee614777212da2a14ebd8211f4b3d90ce66
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 12:33:24 2011 -0700

    Split logic on shutdown and undefine, so that even if the machine is already shutdown we will be able to proceed

 nova/virt/libvirt_conn.py |   53 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 13 deletions(-)

commit a572b49e376cd6da4265c2807eaed8f0a2daf954
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 11:57:14 2011 -0700

    Remove the XML definition when we destroy a machine

 nova/virt/libvirt_conn.py |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit e4f7f5cacad59153045bbbae49278298b206e8d3
Merge: c47c545 1617d27
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 02:50:22 2011 +0900

    Rebased to trunk rev 971

commit c47c545b293d5b73f46ff18ace2f4b9db61a771f
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 02:49:38 2011 +0900

    debug tree status checkpoint.

 nova/virt/libvirt_conn.py |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

commit 3eb00eb2f82f0e907ecd47167510149cc853c548
Merge: 8c4fa0f 1617d27
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 01:25:26 2011 +0900

    Reabased to trunk rev 971.

commit 79ebe165f255037b0d5eaad7afe81b51cf85ed63
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sat Apr 9 11:08:47 2011 -0400

    Fixed log message gaffe.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5aab609b24140622b87db970243641ec382b214e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 15:24:09 2011 -0700

    pylintage

 nova/volume/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7f04c6f5165ea96f22ec17bdbe7a3f2a7595edb1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 15:23:17 2011 -0700

    typo - need to get nova-volumes working on this machine :-/

 nova/volume/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit df4c269a338a9b983488ce4d5b86c829a92d471b
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 15:17:52 2011 -0700

    dd needs a count to succeed, and remove unused/non-working special case for size 0

 nova/volume/driver.py |   11 +++--------
 nova/volume/san.py    |   10 ++--------
 2 files changed, 5 insertions(+), 16 deletions(-)

commit 1617d27020e45ab587ef75a8e74d76dfe82df861
Merge: c3ac72d 5deb479
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 8 22:02:50 2011 +0000

    There is a race condition when a VDI is mounted and the device node is created. Sometimes (depending on the configuration of the Linux distribution) nova loses the race and will try to open the block device before it has been created in /dev.
    
    This change will poll waiting on the device node to be created before attempting to use it.

commit 2800f931e134e7d6b316bb4d7f7118162c301ca9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 14:53:54 2011 -0700

    zero out volumes on delete using dd

 nova/volume/driver.py |    5 +++++
 1 file changed, 5 insertions(+)

commit c3ac72d555d4b123b6cc95a1a71dd236cde9d3c2
Merge: d36a324 dd212c8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 21:48:31 2011 +0000

    Added RST file on using Zones.

commit d3de6cd1b2997e495a000b998b321346e2a75306
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Fri Apr 8 14:46:26 2011 -0700

    Fixes euca-attach-volume for iscsi using Xenserver
    
    Minor changes required to xenapi functions to get
    correct format for volume-id, iscsi-host, etc.

 nova/virt/xenapi/volume_utils.py |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

commit 5632baa79da2164457f75a240c5c497027c49fca
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 14:36:27 2011 -0700

    pep8

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e56e6694ec3fe337b891d6bd23b89d8c44335efe
Merge: 11b7610 d36a324
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 14:35:30 2011 -0700

    merge trunk

commit d36a324b97d014fe5407451556534acca5022113
Merge: 2a14bc0 a52a28a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 20:52:39 2011 +0000

    removes log command from nova-manage as it no longer worked in multi-log setup

commit a1c40feb0cd592829b63df1cf19109bc322f81a7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 8 15:54:17 2011 -0400

    Added error message to exception logging.

 nova/virt/libvirt_conn.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 5ea0991db9526969f100f3361661731aaf4d24d5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 8 15:22:15 2011 -0400

    Fixes bug which hangs nova-compute when terminating an instance when using libvirt backend.

 nova/virt/libvirt_conn.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit dd212c8d1c2155582e819d00055c297e00291bd0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 15:45:42 2011 -0300

    missing 'to'

 doc/source/devref/zone.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5deb4796bc26d98eeea94065c5098f7ce30ac2af
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Apr 8 11:21:36 2011 -0700

    Short circuit non-existant device during unit tests. It won't ever be created
    because of the stubs used during the unit tests

 nova/virt/xenapi/vm_utils.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 2a14bc00c0abd1e2d0349ace99db7aa922b5f574
Merge: 9b449fc d137ffd
Author: John Tran <jhtran@att.com>
Date:   Fri Apr 8 18:02:55 2011 +0000

    Added a patch for python eventlet, when using install_venv.py (see FAQ # 1485)

commit 0cf2a52218fbb801a35e5dd73e146c6c37e218e2
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Apr 9 02:39:18 2011 +0900

    fixed LOG level and log message phrase

 nova/compute/manager.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 9da9d9c8d5f763ec18c1286bf10f33ae67c84ced
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 13:45:19 2011 -0300

    merge prop tweaks 2

 doc/source/devref/zone.rst |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit decdaa30acb15e088eb6a0ca3ebc8ea6f377cbfe
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 8 12:22:09 2011 -0400

    Set default stateOrProvice to 'supplied' in openssl.cnf.tmpl.
    
    This resolves a stateOrProvince printable string UTF8 mismatch on
    RHEL 6 and Fedora 14 (using openssl-1.0.0-4.el6.x86_64 or
    openssl-1.0.0d-1.fc14.x86_64).
    
    Fixes x509 certificate generation on Fedora 14 and Redhat 6.

 nova/CA/openssl.cnf.tmpl |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 9b449fc8a69cee6629156ada64bf8bff28f19349
Merge: 34c25b9 44eefb1
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Apr 8 16:08:56 2011 +0000

    This branch fixes https://bugs.launchpad.net/nova/+bug/751242.
    
    According to the above URL, the solution is 'migrating' instances never be terminated.
    To do this, nova.compute.api.delete() should be modified.

commit 34c25b9dd7988878e3660a8c5dffdcbb79fe932b
Merge: 13d55f9 479c95b
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 8 16:01:24 2011 +0000

    Ignore errors when deleting the default route in the ensure_bridge function.

commit 0d4fe0ddf20b36042cb73bdd8f1f40fa9832bd28
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 8 09:50:16 2011 -0400

    bzr ignore the CA dir.

 .bzrignore |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit 845d32660eb18b8a402519d382392232f79f2990
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 10:04:38 2011 -0300

    merge prop tweaks

 doc/source/devref/zone.rst |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 13d55f9b297740689b99d3c33c154c269a48121a
Merge: a145213 2e7c4c7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 8 11:53:52 2011 +0000

    Import translations from Launchpad.

commit d7f0c23b0a398b35442be7e053539d7d7e230122
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 08:50:45 2011 -0300

    added Zones doc

 doc/source/devref/zone.rst |  128 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

commit a1452132e87991d924d59b68cebc3ecdce545dcb
Merge: 94e35cb 7badb6c
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 8 09:17:29 2011 +0000

    Update the describe_image_attribute and modify_image_attribute functions
    in the EC2 API so they use the top level 'is_public' attribute of image
    objects. This brings these functions in line with the base image service.
    
    Added missing EC2 API unit tests for describing and modifying image attributes.

commit 2e7c4c744dd37358d79b03d52e8a59ab6eb9e197
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 8 10:42:01 2011 +0200

    Import from lp:~nova-core/nova/translations

 po/ast.po   | 2614 +++++++++++++++++++++++++---------------
 po/cs.po    | 2659 +++++++++++++++++++++++++---------------
 po/da.po    | 2610 ++++++++++++++++++++++++---------------
 po/de.po    | 2706 ++++++++++++++++++++++++++---------------
 po/es.po    | 3866 +++++++++++++++++++++++++++++++++++++---------------------
 po/it.po    | 2789 ++++++++++++++++++++++++++----------------
 po/ja.po    | 3886 ++++++++++++++++++++++++++++++++++++++---------------------
 po/pt_BR.po | 3147 ++++++++++++++++++++++++++++++-----------------
 po/ru.po    | 2993 ++++++++++++++++++++++++++++-----------------
 po/uk.po    | 2745 ++++++++++++++++++++++++++---------------
 po/zh_CN.po | 2997 ++++++++++++++++++++++++++++-----------------
 11 files changed, 21163 insertions(+), 11849 deletions(-)

commit 94e35cb15f487ab313c403e023ce84b320ab480c
Merge: 428bc56 f2928ba
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 08:04:57 2011 +0000

    corrects incorrect openstack api responses for metadata (numeric/string conversion issue) and image format status (not uppercase)

commit 428bc567872e2668e774681a58902610af11aacd
Merge: 4d8594c d8ab404
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 8 07:58:48 2011 +0000

    Implement a mechanism to enforce a configurable quota limit for image metadata (properties) within the OS API image metadata controller.

commit 7badb6c0278c8cc51fc3e870fd3810ea3706f494
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 23:39:29 2011 -0400

    Update the describe_image_attribute and modify_image_attribute functions
    in the ec2 API so they use the top level 'is_public' attribute of
    image objects. This brings these functions in line with the base image
    service.
    
    Added missing EC2 unit tests on describing and modifying image attributes.

 nova/api/ec2/cloud.py    |    4 ++--
 nova/tests/test_cloud.py |   31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

commit 479c95b8e855c5f07b75883a1f55b4657e886a92
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 21:44:41 2011 -0400

    Ignore errors when deleting the default route in the ensure_bridge function.

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a52a28ab946c326e4299d883132400dcca0d03d9
Merge: 254834b 4d8594c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 18:05:10 2011 -0700

    merge trunk

commit 254834b864808b33ced23784048f14fa1bcf7489
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 18:04:42 2011 -0700

    removed log command from nova-manage. no longer applicable with multiple logfiles.

 bin/nova-manage |   10 ----------
 1 file changed, 10 deletions(-)

commit e892deef8ba1f6c424dd8fa3fc6330d09245c89e
Merge: 86ffed4 4d8594c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 17:59:10 2011 -0700

    merge trunk

commit 86ffed4e988025023b570b9e6e87f89b6075c7b0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 17:38:24 2011 -0700

    reminde admins of --purge option

 bin/nova-manage |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4d8594cd7e36983cb55908ab8bfebe8aa3a40ff1
Merge: df0e479 b0ad20c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Apr 8 00:32:34 2011 +0000

    Fixes issues with describe instances due to improperly set metadata.
    
     * Removes image['properties']['type']
     * Uses image['container_format'] to key display of type and create ec2 ids.
     * Defaults to 'ami' if container_format cannot be deduced. This allows
       bare images to show up in describe instances and be launched even though they
       are not officially in 'ami' format.
     * Changes nova-manage register to set proper container format
     * Fixes tests
     * Fixes _do_get_kernel_and_ramdisk in openstack api to only try to get them if it is a true 'ami'
     * Replaces 'owner_id' with 'project_id' since that is expected by glance code
     * Moves the filtering scheme to base image service so all services filter the same way

commit df0e479e204ba5e4c2b01f59a2e7249bd780572e
Merge: 25abb70 0c5f70c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 23:52:48 2011 +0000

    Keep guest instances when libvirt host restarts

commit b0ad20c796bd25dad0538ab85b1a56f421e16039
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 16:42:33 2011 -0700

    fix tests from moving access check into update and delete

 nova/image/local.py             |    5 ++++-
 nova/tests/image/test_glance.py |    8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

commit dde00815914c88f6f0254e222373e1ee5f3381b6
Merge: 7b2a40c 25abb70
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 7 16:08:55 2011 -0700

    Merge from trunk

commit 7b2a40ccff4fabe7bd0cdf4e0f55c60bc5827ac3
Merge: c649c8d 8f31937
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 7 16:08:15 2011 -0700

    Merge with lp:nova

commit 25abb7036d96f41b3161fc8bd3df575c32493e67
Merge: a20a304 e165716
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Apr 7 23:04:43 2011 +0000

    Added support for listing addresses of a server in the openstack api.
    Now you can GET
     * /servers/1/ips
     * /servers/1/ips/public
     * /servers/1/ips/private
    Supports v1.0 json and xml.
    Added corresponding tests.

commit 0c5f70c0bcf9395fb25a231057d997b075d04fda
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 16:00:55 2011 -0700

    Log libvirt errcode on exception

 nova/virt/libvirt_conn.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit a20a304edfe2a4fba437a9cf6bc8146cc59f42ef
Merge: 8f31937 003e8d8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Apr 7 22:58:02 2011 +0000

    This fixes how the metadata and addresses collections are serialized in xml responses.

commit 52478e039b094861e7d783b7995b9cafa68e32b9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 15:56:16 2011 -0700

    Fix to correct libvirt error code when the domain is not found

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be1cc1aee1a07f08d052628647ee23938a634dcf
Merge: cd279be 8f31937
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 15:54:14 2011 -0700

    merged trunk

commit b54be0e29cdcd91e3d106fb587b89c39ca3a0bff
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 15:52:27 2011 -0700

    Removed commented-out old 'delete instance on SHUTOFF' code

 nova/compute/manager.py   |    6 ------
 nova/virt/libvirt_conn.py |    8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)

commit 8f319370c0c294991f936a4ae81214d3c7e22206
Merge: 9616fba 8da3e6c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 22:12:42 2011 +0000

    Automatically add the metadata address to the network host.  This allows guests to ARP for the address properly.
    
    I also uncovered an issue with moving the gateway.  Apparently specifying route add 0.0.0.0 doesn't actually work, you have use route add 'default'.  I also added a line to specifically delete the old gateway since it doesn't always automatically get deleted.

commit 3c67f142e5587641e45fcf05d98fddffa0d67d9f
Merge: 59b460e 9616fba
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 15:09:48 2011 -0700

    merged trunk and resolved conflict

commit 59b460e98c5b8f718a654539c5788e8775126dfd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 15:08:29 2011 -0700

    slight typo

 bin/nova-manage |    1 -
 1 file changed, 1 deletion(-)

commit a1572a4f234bdeda1d25250de62b5892d8f47891
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 15:00:35 2011 -0700

    clarified nova-manage instance_type create error output on duplicate flavorid

 bin/nova-manage                |   10 +++++++---
 nova/compute/instance_types.py |    4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

commit 9616fba3e13567b1e84d951857eaf0463161fdbe
Merge: 8445096 b5310d5
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Apr 7 21:48:29 2011 +0000

    This branch is a patch for fixing below issue.
    > Bug #746821: live_migration failing due to network filter not found  Link a bug report

commit b5310d58d418f123b2d5d2953d6b4082a70120cd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Apr 8 06:32:53 2011 +0900

    fix pep8 violation

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 84450962fd78915b0358341f3985e56a235ec602
Merge: 7a73a06 c7fd470
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 21:08:16 2011 +0000

    Update instances table to use instance_type_id instead of the old instance_type column which represented the name (ex: m1.small) of an instance type.
    
    This allows the various subsystems to cleanly reference instance types by their IDs instead of using the name as the key and provides a clean way to do the outer join to the instance types table in several SQL queries.
    
    Updated the instance_types module so that all methods now return instance_type dictionaries for consistency.
    
    Updated the Openstack API so that flavor ID is returned correctly.

commit c7fd470d7ff0df4b23664b6599e5ae5acdb21511
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 15:52:14 2011 -0400

    Drop extra 'None' arg from dict.get call.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99e8335e9b07b1cbf9c28cda2dfb2496d955c72c
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 15:43:51 2011 -0400

    Some i18n fixes to instance_types.

 nova/compute/instance_types.py |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 7a73a06bca40dbd0f005b466f3824170cdc64f4d
Merge: c9b58d3 404feb5
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Apr 7 19:30:52 2011 +0000

    Renamed computeFault back to cloudServersFault in an effort to maintain consistency with the 1.0 API spec. We can look into distinguishing the two in the next release. Held off for now to avoid potential regression.

commit c9b58d39044166bf5a03991e33a5302e1cd5cce9
Merge: e05e08f 9f57f78
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 19:12:27 2011 +0000

    adds a timeout on session.login_with_password()

commit 9ddac97eeda704ecdd6161880abe840541eba166
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 15:09:10 2011 -0400

    Drop unneeded Fkey on InstanceTypes.id.

 nova/db/sqlalchemy/models.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e05e08f213edde516611586b1a893b34c8abb41e
Merge: d3b9c21 07113a8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Apr 7 19:04:32 2011 +0000

    Bypass a potential security vulnerability by not setting shell=True in xenstore.py, using johannes.erdfelt's patch.

commit 404feb59a829e24e026f793a362e54aad1aaa03f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Apr 7 13:55:42 2011 -0500

    Renamed computeFault to cloudServersFault

 nova/api/openstack/faults.py         |    2 +-
 nova/tests/api/openstack/test_api.py |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit d3b9c215ac6e5d2690a2f991e3bd83b0f386b935
Merge: a782dad 560d36e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 7 18:35:02 2011 +0000

    fixed the way ip6 address were retrieved/returned in _get_network_info in nova/virt/xenapi/vmops

commit da1bfe96e614bd8d0d65442f6b797b002fe268cd
Merge: 3bb6e62 a782dad
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Apr 7 14:28:53 2011 -0400

    Merge w/ trunk.

commit 11b76108dbd8a540da151141f5208de9358cf38b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 11:25:44 2011 -0700

    added -manage vm [list|live-migration] to man page

 doc/source/man/novamanage.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce5e102d0097f1b3f2322dc0d1ac1d0e5dea7f0a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 11:22:31 2011 -0700

    removed unused instance parameter from vm list ... as it is unused. added parameters to docstring for vm list.

 bin/nova-manage               |    8 ++++++--
 doc/source/man/novamanage.rst |   10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

commit fcf358cacd8f993faaf64310307956686a7d330b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 11:12:14 2011 -0700

    moved -manage instance list command to -manage vm list to avoid lazy match conflict with instance_types

 bin/nova-manage |   85 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 45 deletions(-)

commit 003e8d8191dcf5ed91b48537cee7e661f094897e
Merge: 40c9230 a782dad
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Apr 7 14:08:04 2011 -0400

    Merge from trunk

commit 8da3e6c19b97ab7cd08e69fb0df114653c0b90db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 10:37:40 2011 -0700

    Simplify by always adding to loopback

 nova/network/linux_net.py |    5 ++---
 nova/network/manager.py   |    4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

commit a782dad0d1effeaebdfb59ad87b88b42c93991ed
Merge: 7bd99e3 8c37816
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 17:30:01 2011 +0000

    Remove <addressSet> and <item> from AllocateAddress response, and fix bug #751176.

commit 2278f2886d369af285f914a7b5883d3a7a5727cc
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Apr 7 13:22:03 2011 -0400

    remove unused code.

 nova/tests/test_virt.py |    6 ------
 1 file changed, 6 deletions(-)

commit fb31d50e89bec43b6d8490d970f04d6341ef4859
Merge: 2b79fa8 7bd99e3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Apr 7 13:17:13 2011 -0400

    Merge trunk.

commit 9f57f78efab4a31bfe29e2edab1e86eedf4352fd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 11:59:40 2011 -0300

    better error message

 nova/virt/xenapi_conn.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8c4fa0f16ac170662e113edfdc0f8d3c8863f082
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 23:48:00 2011 +0900

    Blush up a bit.

 nova/auth/manager.py |   14 +++++++-------
 nova/utils.py        |    8 +++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

commit 8c3781608836b18d210dca82697b828b79c0f4ec
Merge: 7702aff 7bd99e3
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 22:51:48 2011 +0900

    Rebased to trunk rev 949.

commit 9b24c399c5689a1492b96dcd6725590c2a97c6e3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 10:42:29 2011 -0300

    pep8

 nova/virt/xenapi_conn.py |    1 +
 1 file changed, 1 insertion(+)

commit 7cf0deda8f7ab410005c556779353d599c8e8a63
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 10:34:14 2011 -0300

    adds timeout to login_with_password

 nova/virt/xenapi_conn.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 2b79fa82872c55368167fc7433cb28a2369f5191
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Apr 7 01:42:49 2011 -0400

    test provider fw rules at the virt/ipteables layer.
    lowercase protocol names in admin api to match what the firewall driver expects.
    add provider fw rule chain in iptables6 as well.
    fix a couple of small typos and copy-paste errors.

 nova/api/ec2/admin.py     |    6 ++---
 nova/tests/test_virt.py   |   65 ++++++++++++++++++++++++++++++++++++++++++++-
 nova/virt/libvirt_conn.py |   23 +++++++++-------
 3 files changed, 80 insertions(+), 14 deletions(-)

commit 2bc0e744162276048ddd9c1a1eeacbd647cda6f4
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Apr 7 13:32:19 2011 +0900

    fixed based on reviewer's comment - 1. erase unnecessary blank line, 2. adding LOG.debug

 nova/virt/libvirt_conn.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 92d710ea738502f0ab4ec69bc6b12042f814be41
Merge: 8decff0 7bd99e3
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 13:10:10 2011 +0900

    Rebased to trunk rev 949.

commit d7e8d91d6bc4954f2d256f57e34444b5bd170ab0
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Apr 7 13:08:14 2011 +0900

    fixed based on reviewer's comment - 'locals() should be off from _()

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1ee150c449e630c6409798399eccb577c8273c70
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Apr 7 12:35:45 2011 +0900

    Make description of volume_id more generic.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4c1c0b8357e2cffd5f9a2a1240439e1871f845f2
Author: John Tran <jhtran@att.com>
Date:   Wed Apr 6 19:43:58 2011 -0700

    add the tests

 nova/tests/test_exception.py |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 8decff01ad8ee7e8f7d4103a727321b162280cbe
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 11:42:02 2011 +0900

    pep8 cleanup.

 nova/auth/manager.py |    2 +-
 nova/utils.py        |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 430975c2f7e354838a26cd81e59b5c0423a2c8fe
Author: John Tran <jhtran@att.com>
Date:   Wed Apr 6 19:13:18 2011 -0700

    ApiError code should default to None, and will only display a code if one exists.  Prior was output an 'ApiError: ApiError: error message' string, which is confusing

 nova/exception.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 655eb8fbd21376e694f8134e42f10ddbc1aafb0e
Author: John Tran <jhtran@att.com>
Date:   Wed Apr 6 18:22:03 2011 -0700

    ec2 api run_instances checks for image status must be 'available'.  Overhauled test_run_instances for working set of test assertions

 nova/api/ec2/cloud.py    |   10 +++++++-
 nova/tests/test_cloud.py |   62 ++++++++++++++++++++++++----------------------
 2 files changed, 41 insertions(+), 31 deletions(-)

commit 3831008b4e8aeec08b58afb49e40428ad5ece5b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 6 16:10:08 2011 -0700

    if we delete the old route when we move it we don't need to check for exists

 nova/network/linux_net.py |    9 ++++-----
 nova/network/manager.py   |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

commit f2928ba331234f53e3051cf0ea1a5492593bedf1
Merge: dc8b3cb 7bd99e3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 6 15:55:55 2011 -0700

    merged trunk

commit dc8b3cb3fa124755ed3e5282b2d11a811f1db2d5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 6 15:39:44 2011 -0700

    removed comment on API compliance

 nova/api/openstack/views/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 14833117f19a3a1789c99a519b12bf9c61faec07
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 18:17:43 2011 -0400

    Added an option to run_tests.sh so you can run just pep8. So now you can:
        ./run_tests.sh --just-pep8
    or
        ./run_tests.sh -p

 run_tests.sh |   27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

commit 040428cc35aa046de4bcf744c95b7c507df94550
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 6 14:53:35 2011 -0700

    Add automatic metadata ip to network host on start.  Also fix race where gw is readded twice

 nova/network/linux_net.py |   13 ++++++++++++-
 nova/network/manager.py   |    3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

commit e16571671e4baab50521870ec64e4ab954c7d165
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:50:11 2011 -0400

    Controllers now inherit from nova.api.openstack.common.OpenstackController.

 nova/api/openstack/ips.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b8597ec9f1cc4336487181d8f024010fa3aa7fd1
Merge: a64e2d9 7bd99e3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 6 17:39:10 2011 -0400

    Merged trunk.

commit 492a900a110a63af4ba7ec6d1ef8a23043f9afbc
Merge: 5534113 40c9230
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:28:13 2011 -0400

    Merge from trunk

commit 40c923061f86f1046f64bb4b58c088c0b3a5c952
Merge: 3c48749 7bd99e3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:26:50 2011 -0400

    Merge from trunk

commit 7bd99e33796f1e90b6f8b0b9caa122c541f99015
Merge: 19efb86 5530504
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Apr 6 21:21:59 2011 +0000

    Support providing an XML namespace on the XML output from the OpenStack API

commit 5530504c1415391bf039fc72605af59c5d7066a9
Merge: 168fdb0 19efb86
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Apr 6 14:02:16 2011 -0700

    Merged with trunk, fixed up test that wasn't checking namespace

commit 5534113f65cc578dcdf93432981b836bf4e3dfaf
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 16:12:32 2011 -0400

    Added support for listing addresses of a server in the openstack api.
    Now you can GET
     * /servers/1/ips
     * /servers/1/ips/public
     * /servers/1/ips/private
    Supports v1.0 json and xml.
    Added corresponding tests.

 nova/api/openstack/__init__.py           |    6 +++
 nova/api/openstack/ips.py                |   71 +++++++++++++++++++++++++++
 nova/api/openstack/servers.py            |    9 ----
 nova/api/openstack/views/addresses.py    |   10 +++-
 nova/tests/api/openstack/test_servers.py |   78 ++++++++++++++++++++++++++++++
 5 files changed, 163 insertions(+), 11 deletions(-)

commit cd279bec6391ef40d278f377f0039b507b14904b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 6 12:58:57 2011 -0700

    check visibility on delete and update

 nova/image/glance.py |    4 ++++
 nova/image/local.py  |    6 +++++-
 nova/image/s3.py     |    4 ----
 3 files changed, 9 insertions(+), 5 deletions(-)

commit 7ef28c854fa386ee1aa64aaa22c3ef026094f40a
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Apr 6 15:42:24 2011 -0400

    YADU (Yet Another Docstring Update).

 nova/compute/api.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 19efb8675f8b7b40ced6f1749c4817d35d25b19a
Merge: 134b1b4 0a8ca1b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 19:41:35 2011 +0000

    Make sure ca_folder is created before chdir()ing into it.

commit b7f6deae7e3439c9e12bb54fcd18d9b06d5c1dce
Merge: affb632 134b1b4
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Apr 6 15:36:58 2011 -0400

    Merge w/ trunk.

commit 560d36e7ad87ca7e8f8619e146ed4965f33dd391
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 13:43:02 2011 -0500

    another syntax error

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c649c8d5febab7d0dfa329bc5d78f0147383c5ee
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 6 11:36:08 2011 -0700

    Use a more descriptive name for the flag to make it easier to understand
    the purpose

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cb51075ceeb17d43bd53617a3dc8a561e7608722
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 6 14:31:54 2011 -0400

    Added logging statements for generic WSGI and specific OpenStack API requests.

 nova/api/openstack/auth.py |   17 ++++++++++++++++-
 nova/wsgi.py               |    5 +++++
 2 files changed, 21 insertions(+), 1 deletion(-)

commit d3fec5c2c3de2d3a1ef0fd1fd809ff248b6df5a8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 13:31:51 2011 -0500

    syntax error

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 07113a8ff0210bce81de5ef8a948cc0ff32d6623
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 6 13:27:43 2011 -0500

    Incorprate johannes.erdfelt's patch

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |   35 +++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

commit d5c077131e00f41a38fa03fdbea46aa4351f95b5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 13:05:39 2011 -0500

    updated check_vm_record in test_xenapi to check the gateway6 correctly

 nova/tests/test_xenapi.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c18bf716f08e6b9fbdc259755cf172b5a6cf096a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 12:52:25 2011 -0500

    updated get_network_info in libvirt_conn to correctly insert ip6s and gateway6 into the network info, also small style fixes

 nova/virt/libvirt_conn.py |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit 3e120e52fcb8fca1b97b496c618c3b9e2b459598
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Apr 6 13:42:04 2011 -0400

    add docstrings

 nova/api/openstack/servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit e46d78218eec77f8502579496ee0922ce401e84a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 12:33:07 2011 -0500

    updated _prepare_injectables() to use info[gateway6] instead of looking inside the ip6 address dict for the gateway6 information

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01051c71c8f405e9f40a088509d09f171aea1c7d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 02:07:19 2011 +0900

    Enable RightAWS style signing on server_string without port number portion.

 nova/auth/manager.py |    9 +++++++++
 nova/utils.py        |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)

commit 481a77134a4e0e1d668fa488d7c5b1d7e1bc5429
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 11:15:35 2011 -0500

    modified behavior of inject_network_info and reset_network related to a vm_ref not being passed in

 nova/virt/xenapi/vmops.py |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

commit 0a8ca1bb7f123718ae48bb842b1c532b07f03890
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 18:10:42 2011 +0200

    Create ca_folder if it does not already exist.

 nova/crypto.py |    2 ++
 1 file changed, 2 insertions(+)

commit dbeab47bbdeceab0bef896c9d7646ae346c9dd3a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 6 09:05:12 2011 -0700

    Wait for device node to be created after mounting image VDI

 nova/virt/xenapi/vm_utils.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit e68174e419e105e174ce9f8b221e0ef201fa1990
Merge: 574980c c0a8904
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Apr 6 14:28:05 2011 +0100

    Improved unit tests
    Fixed docstring formatting
    
    Merged with trunk

commit 134b1b4caa9df1cbba54b09625696e4f60147e05
Merge: 2899076 37fc533
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 13:06:43 2011 +0000

    Only create ca_path directory if it does not already exist.

commit 37fc53350b029e2eecaea78207f8769072c30d9f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 14:41:26 2011 +0200

    Added bug reference

commit d99a40d0a34a0d7ec05dcaa188a58535f0e41953
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 14:05:12 2011 +0200

    Only create ca_path directory if it does not already exist.

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5ec86befbce742738011e256987688fc6d87fa3d
Merge: d7013c9 2899076
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 13:15:23 2011 +0200

    Merge trunk

commit 2899076039c936062a1173545c36858187c1fafc
Merge: 94ccd2f 6c8c454
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 06:53:53 2011 +0000

    Make "setup.py install" much more thorough. It now installs tools/ into /usr/share/nova and makes sure api-paste.conf lands in /etc/nova rather than /etc.

commit 44eefb1eefda5e42a286ee1aa689c1c93e72aae4
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Apr 6 14:44:19 2011 +0900

    fixed based on reviwer's comment

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dfcdafde2dc202aa3325cd1cea8d809f56fdde57
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Apr 5 19:21:05 2011 -0700

    return image create response as image dict

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d137ffdc2fb4e0298a6fb177df9e6a8299320301
Author: John Tran <jhtran@att.com>
Date:   Tue Apr 5 18:35:15 2011 -0700

    Add a patch for python eventlet, when using install_venv.py (see FAQ # 1485)

 tools/eventlet-patch  |   24 ++++++++++++++++++++++++
 tools/install_venv.py |    6 ++++++
 2 files changed, 30 insertions(+)

commit 26d2a6ca8939156e8957e31dd17906070283ff24
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 20:07:46 2011 -0400

    Undo use of $ in chain name where not needed.

 nova/virt/libvirt_conn.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 2b7da3f2e9fa45f9bfca03bb6bcb713dcb6c58fe
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 20:03:29 2011 -0400

    Testing for iptables manager changes.

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   75 --------------------
 .../versions/014_add_provider_fw_rules.py          |   75 ++++++++++++++++++++
 nova/tests/test_network.py                         |   30 ++++++++
 3 files changed, 105 insertions(+), 75 deletions(-)

commit cd4748abfdc5014aac1d867c2ede261060375e2e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 19:31:12 2011 -0400

    Don't double-apply provider fw rules in NWFilter and Iptables.
    Don't create provider fw rules for each instance, use a chain and jump to it.
    Fix docstrings.

 nova/network/linux_net.py |    7 ++
 nova/virt/connection.py   |    1 -
 nova/virt/libvirt_conn.py |  184 ++++++++++++++++++++++++++-------------------
 3 files changed, 112 insertions(+), 80 deletions(-)

commit a254fd9b63c48f64a62fd38df3a2caae81ce63c7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Apr 5 18:29:53 2011 -0500

    typo

 nova/virt/xenapi/vmops.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 36857e5091234940e3ac68d154c019fbd5d28af5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:58:19 2011 -0700

    remove -None for user roles

 nova/auth/manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 75082c44cdc0319c56805b5558927760636eaf4b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:49:43 2011 -0700

    pep8

 nova/image/glance.py |    1 +
 1 file changed, 1 insertion(+)

commit 5f414311fb581ba612cf152f3ec9983d5f39c2e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:45:01 2011 -0700

    fallback to status if image_state is not set

 nova/api/ec2/cloud.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 8eff0a91bbc475d8559b39fb81e1a62beda841f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:35:17 2011 -0700

    update and fix tests

 nova/image/local.py                      |    1 +
 nova/image/s3.py                         |   13 +++++++++++++
 nova/tests/api/openstack/test_servers.py |   16 +++++++---------
 3 files changed, 21 insertions(+), 9 deletions(-)

commit 56eb682a169c20a9a8275b3b9bfd423f0d562cbc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:01:33 2011 -0700

    unite the filtering done by glance client and s3

 bin/nova-manage       |   14 ++++++--------
 nova/api/ec2/cloud.py |    2 +-
 nova/image/glance.py  |   28 ----------------------------
 nova/image/local.py   |    4 +++-
 nova/image/s3.py      |   45 +++------------------------------------------
 nova/image/service.py |   27 +++++++++++++++++++++++++++
 6 files changed, 40 insertions(+), 80 deletions(-)

commit 3c487493de2a0f827780d54080797bfe70183ba6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Apr 5 17:49:38 2011 -0400

    Removing naughty semicolon.

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 092ac0dbaf5a5cd374004e5add4ba62c4b8aada4
Merge: e6505fd 94ccd2f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Apr 5 17:48:38 2011 -0400

    Merge from trunk

commit 7ab8478e312faabcbe2b2ef00c4b0a5cad2af11d
Merge: 1654afa 94ccd2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 14:44:39 2011 -0700

    merged trunk

commit 1afcf5511d4cfa70dd17113c9253594fbd5b7aa1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:53:59 2011 -0400

    remove extraneous empty lines

 nova/tests/api/openstack/test_servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 7ed00acea541dc4cf3b70ecf923b649e9ee7ae11
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:46:44 2011 -0400

    move error handling down into get_password function

 nova/api/openstack/servers.py |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit b59f7e2b9ed0f08ac033cd839a6996a1931ccec6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:30:30 2011 -0400

    refactor to handle invalid adminPass

 nova/api/openstack/servers.py            |   11 ++++++-----
 nova/tests/api/openstack/test_servers.py |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

commit 4a8a08790803d574ecd1dce4b3765cbce7e1043a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 12:56:25 2011 -0700

    fixed comment

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b66535602eae6b2f91cc5573798cd837e63f8ecc
Merge: e0ba729 94ccd2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 12:55:57 2011 -0700

    merged trunk

commit 2468743697faf81851bef1cafba95337dbd57153
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 15:55:49 2011 -0400

    add support for specifying adminPass for JSON only in openstack api 1.1

 nova/api/openstack/servers.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit a7a1f4dfda3751bb1f0f5c875e0799f1905259bd
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 15:44:41 2011 -0400

    add tests for adminPass on server create

 nova/tests/api/openstack/test_servers.py |   46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

commit 29b7a087efc64965e079733fe62e552fac70d13a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 15:17:37 2011 -0400

    Fix a giant batch of copypasta.

 nova/compute/manager.py   |    1 +
 nova/virt/libvirt_conn.py |    5 +++++
 2 files changed, 6 insertions(+)

commit dc887ab39641039817cdddce062bd398e69d07e5
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 15:17:17 2011 -0400

    Remove file leftover from conflict.

 nova/adminclient.py.THIS |  451 ----------------------------------------------
 1 file changed, 451 deletions(-)

commit 24c2da40549e882be716e1897fd81aef8f172e53
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 5 14:47:06 2011 -0400

    adding support for OSAPI v1.1 limits resource

 nova/api/openstack/__init__.py          |    9 ++-
 nova/api/openstack/limits.py            |   26 +++++--
 nova/tests/api/openstack/test_limits.py |  121 +++++++++++++++++++++++++++----
 3 files changed, 131 insertions(+), 25 deletions(-)

commit 94ccd2f4a1c42a8574fe65972650428130ae850d
Merge: 4eb3bbd 4e8ade8
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 5 17:52:45 2011 +0000

    Moved 'name' from <imageId> to <imageLocation>, corrected <imageType> and fixes bug # 750482.

commit 4eb3bbdee4952c9f198c52ba509800f408df9b6b
Merge: 2ba10bc f1f8e00
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Apr 5 17:42:38 2011 +0000

    This branch contains the fix for lp:749973. VNC is assumed that is default for all in libvirt which LXC does not support yet.
    
    Regards
    chuck

commit 3bb6e627fd99a307825f88ff8882e974bcf1b365
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 5 13:02:42 2011 -0400

    Remove comments.

 .../014_add_instance_type_id_to_instances.py       |    2 --
 1 file changed, 2 deletions(-)

commit 2ba10bc869a716086fcdc5da91c43e67644ee58c
Merge: c0a8904 d7013c9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 16:47:39 2011 +0000

    Separate CA/ dir into code and state.

commit 28568e51ab4eb84e66e7d15adc9648220684ab84
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 5 20:40:52 2011 +0400

    removed blank lines for pep8 fix

 nova/virt/libvirt_conn.py |    2 --
 1 file changed, 2 deletions(-)

commit 519c885a4e3622417cd78655a211a2f23033d610
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 5 19:42:09 2011 +0400

    pep8 fixed

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e6505fd78cc28a5e91ec6fbf55e2e8de07679c7c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Apr 5 10:56:24 2011 -0400

    Fixed the addresses and metadata collections in xml responses.
    Added corresponding tests.

 nova/api/openstack/servers.py            |    7 ++++++
 nova/tests/api/openstack/test_servers.py |   36 ++++++++++++++++++++++++++++++
 nova/wsgi.py                             |   18 +++++++++++++++
 3 files changed, 61 insertions(+)

commit f1f8e00dc420bbc78b8d143c56375afc721c4c7d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Apr 5 10:17:29 2011 -0400

    Dont configure vnc if we are using lxc

 nova/virt/libvirt_conn.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6c8c454826263b334eb674c9ab1c8d62e5fd491f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 14:55:19 2011 +0200

    Help paste_config_file find the api config now that we moved it.

 nova/wsgi.py |    1 +
 1 file changed, 1 insertion(+)

commit 362b298906b6d577ab9421a0f0747469a9c21099
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 14:54:49 2011 +0200

    Add bug reference

commit 669c0214ec77127ca7efe4d1e347ccaf2c2ae8b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 14:54:11 2011 +0200

    Move api-paste.ini into a nova/ subdir of etc/

 etc/api-paste.ini      |  101 ------------------------------------------------
 etc/nova/api-paste.ini |  101 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 101 deletions(-)

commit 7285694cb83ed618bea0d8c9170b725dd5566a27
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 14:53:56 2011 +0200

    Add a find_data_files method to setup.py. Use it to get tools/ installed under /usr/(local/)/share/nova

 setup.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit affb632be0c0054a7b0a4858c6e0a585cc1afd0d
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 5 08:49:44 2011 -0400

    Nits.

 nova/api/openstack/server_metadata.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 3e5ade1d5ba6a35d74993b8acd8b4495160d8813
Merge: e90b0cf c0a8904
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 5 08:43:44 2011 -0400

    Merge w/ trunk.

commit d8ab404fd74facd181eaaee7cbc78b39a82afd1c
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 5 08:26:16 2011 -0400

    Add missing underscore.

 nova/api/openstack/image_metadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b8d1966d364a80260ad566ae369e49c3bab85cf
Merge: 7f98416 c0a8904
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Apr 5 08:24:46 2011 -0400

    Merge w/ trunk.

commit ca2ce6dc4a96c7bded2c30c258b7becaee5a1ed7
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:39:22 2011 +0900

    fix bug lp751242

 nova/compute/api.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 4d1f60df049e11623df7d6174eda19e5e27d004e
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:20:32 2011 +0900

    fix bug lp751231

 nova/compute/manager.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit d7013c9617d0740976a78ba87b1214c2b15ee702
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 13:16:12 2011 +0200

    Automatically create CA state dir, and make sure the CA scripts look for the templates in the right places.

 nova/CA/geninter.sh   |    2 +-
 nova/CA/genrootca.sh  |    3 ++-
 nova/api/ec2/cloud.py |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

commit 2b3aea4be35f370c68ac3c24ab15d4851aa28e94
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:10:10 2011 +0900

    fix bug 746821

 nova/tests/test_virt.py   |    3 ++-
 nova/virt/libvirt_conn.py |   38 +++++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 12 deletions(-)

commit 7702affdbf09127e3e7cdfafcb6382673914438e
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 5 18:43:11 2011 +0900

    Remove <addressSet> and <item> from AllocateAddress response, and fix bug #751176.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ff23dd2a3b86c816da04eddc903de0c8c3141954
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 11:42:14 2011 +0200

    Allow CA code and state to be separated, and make sure CA code gets installed by setup.py install.

 CA/.gitignore               |   11 ------
 CA/geninter.sh              |   39 -------------------
 CA/genrootca.sh             |   29 --------------
 CA/genvpn.sh                |   36 -----------------
 CA/openssl.cnf.tmpl         |   90 -------------------------------------------
 CA/projects/.gitignore      |    1 -
 CA/reqs/.gitignore          |    1 -
 MANIFEST.in                 |    2 +-
 nova/CA/.gitignore          |   11 ++++++
 nova/CA/geninter.sh         |   39 +++++++++++++++++++
 nova/CA/genrootca.sh        |   29 ++++++++++++++
 nova/CA/genvpn.sh           |   36 +++++++++++++++++
 nova/CA/openssl.cnf.tmpl    |   90 +++++++++++++++++++++++++++++++++++++++++++
 nova/CA/projects/.gitignore |    1 +
 nova/CA/reqs/.gitignore     |    1 +
 nova/api/ec2/cloud.py       |    8 +++-
 nova/crypto.py              |   10 ++++-
 17 files changed, 223 insertions(+), 211 deletions(-)

commit 4e8ade85ec5f8dcd7c76bb06de5cd1f90d54d2a4
Merge: 95fe202 c0a8904
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 5 11:40:35 2011 +0900

    Rebased to trunk 942.

commit c0a8904508edb0687b588d40a7bd181d0393884f
Merge: 08417c4 d923224
Author: John Tran <jhtran@att.com>
Date:   Tue Apr 5 02:31:02 2011 +0000

    fix bug lp:682888 - DescribeImages has no unit tests.

commit a18fece993c21f2ae1cbb44d8a0dea92d58d3b44
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 4 22:16:53 2011 -0400

    Correct variable name.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit da346dac037a46582d569180915010f4c4e2cd50
Merge: 2ee9070 08417c4
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Apr 4 21:12:57 2011 -0400

    Merge trunk.

commit b152aca6900ec9770abeac24281a452b3a41ac5c
Merge: 38b4cd9 08417c4
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 4 20:29:02 2011 -0400

    Merge w/ trunk.

commit 868288b9705ea765b5515fd0ac9e0858f37239d0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 16:07:39 2011 -0700

    correct test for numeric/string metadata value conversion

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a6c283f00d67a5172d8271d7e48bd58484ac6b96
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 16:00:59 2011 -0700

    openstack api metadata responses must be strings

 nova/api/openstack/views/servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5c67809e4b9a1546c48316ea52676dfeba8f1a75
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 15:58:41 2011 -0700

    openstack api requires uppercase image format status responses

 nova/api/openstack/views/images.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 545e87bccac95fecf8f86429bd890ed294819487
Merge: a4e1db0 08417c4
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 4 20:41:14 2011 +0000

    merge trunk

commit 38b4cd9e68d7e1c262b08474b277573440ec3e87
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Apr 4 16:17:04 2011 -0400

    Refactor so that instances.instance_type is now instances.instance_type_id.
    
    Update the Openstack API to return the correct flavor_id.

 bin/nova-manage                                    |    2 +-
 nova/api/ec2/cloud.py                              |    7 +-
 nova/api/openstack/servers.py                      |    6 +-
 nova/api/openstack/views/servers.py                |    4 +-
 nova/compute/api.py                                |   18 ++--
 nova/compute/instance_types.py                     |   46 ++++++-----
 nova/db/api.py                                     |    5 ++
 nova/db/sqlalchemy/api.py                          |   22 +++++
 .../014_add_instance_type_id_to_instances.py       |   86 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   11 ++-
 nova/tests/api/openstack/test_servers.py           |   24 +++---
 nova/tests/db/fakes.py                             |   22 +++--
 nova/tests/test_compute.py                         |   18 ++--
 nova/tests/test_console.py                         |    2 +-
 nova/tests/test_instance_types.py                  |    6 +-
 nova/tests/test_quota.py                           |   17 ++--
 nova/tests/test_scheduler.py                       |    2 +-
 nova/tests/test_virt.py                            |    2 +-
 nova/tests/test_volume.py                          |    2 +-
 nova/tests/test_xenapi.py                          |   12 +--
 nova/virt/libvirt_conn.py                          |   22 ++---
 nova/virt/xenapi/vm_utils.py                       |    8 +-
 nova/virt/xenapi/vmops.py                          |    8 +-
 23 files changed, 256 insertions(+), 96 deletions(-)

commit 5e74b5a5f121c9f0be2c529b76878615812d9483
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 23:43:26 2011 +0400

    splitting test_get_nic_for_xml into two functions

 nova/tests/test_virt.py   |   23 ++++++++++++-----------
 nova/virt/libvirt_conn.py |    2 --
 2 files changed, 12 insertions(+), 13 deletions(-)

commit 08417c48c223ad1b698ab1d00686a967b6a2dc0a
Merge: fe49861 350aaa8
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 19:37:46 2011 +0000

    Network injection check fixed in libvirt driver.

commit a64e2d9db1c7ba83424a5d0c377a3180026d5401
Merge: e057d7f fe49861
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Apr 4 15:24:34 2011 -0400

    merging trunk

commit e057d7fd01def4db0c77b962fea925177de9a91f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Apr 4 15:20:09 2011 -0400

    fixing log message

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 350aaa819c8f97e0bcbd9e4d0f6f0da41784b630
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 22:39:39 2011 +0400

    working with network_ref like with mapping

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 917f7aafbfa0a797687d10a600a218517f9b75e0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 22:22:27 2011 +0400

    add test for NWFilterFirewall

 nova/tests/test_virt.py   |   19 +++++++++++---
 nova/virt/libvirt_conn.py |   60 ++++++++++++++++++++++++++++-----------------
 2 files changed, 53 insertions(+), 26 deletions(-)

commit fe49861eafaddd2f276d67e426e9f12cb25a51d8
Merge: c7dd09c ce5ad4a
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Apr 4 18:05:15 2011 +0000

    Removed adminclient.py and added reference to the new nova-adminclient project in tools/pip-requires.

commit c7dd09c56b746e0b293b1778b5287d245ada2389
Merge: a26be4c 4a0c061
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Apr 4 17:56:19 2011 +0000

    Don't prefix adminPass with the first 4 chars of the instance name.

commit a26be4c1197f9bc455163471884cac8ec28e82bc
Merge: 63eaa25 c29dc77
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 4 17:48:47 2011 +0000

    Declares the flag for vncproxy_topic in compute.api

commit 63eaa25ce8402a44bd7f335fa37c49956a085e2c
Merge: e773f39 b39a0ea
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Apr 4 17:41:58 2011 +0000

    Fixes bug 741246.  Ed Leafe's inject_file method for the agent plugin was mistakenly never committed after having to fix commits under wrong email address.  vmops makes calls to this (previously) missing method.

commit e773f3927cf3fc1262ee1a90b7d60fbb3f42e675
Merge: 6ee6f21 59d46ad
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 4 17:38:09 2011 +0000

    Attempt to circumvent errors in the API from improper/malformed responses from image service.

commit 6ee6f211f2b76fb4d2f007be7adeb88edc68c917
Merge: 0ec4352 fc53de5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 17:17:36 2011 +0000

    fixes incorrect case of OpenStack API status response

commit d7053efa810aa3d20ef7cd089429c6d96f451a7d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 21:05:38 2011 +0400

    Fixed network_info creating.

 nova/tests/test_virt.py   |    6 ++++--
 nova/virt/libvirt_conn.py |    5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 95fe2026e869e2da29196f8bf3e48ae2a2560e46
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 5 02:04:58 2011 +0900

    Moved 'name' property from <imageId> to <imageLocation>, corrected <imageType> and fixes bug # 750482.

 nova/api/ec2/cloud.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit fc53de592fb903f8a7e3741fa98d03140aca9066
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 09:45:26 2011 -0700

    corrected capitalization of openstack api status and added tests

 nova/api/openstack/views/servers.py      |   24 ++++++++++++------------
 nova/tests/api/openstack/test_servers.py |    2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

commit 35d7a74ee8ddf21c94991f6f433f8024872d16d0
Merge: 80549a0 0ec4352
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 19:39:00 2011 +0400

    libvirt_con log fix

commit 59d46ada05f47bf477427b932a47c1cf1d91811e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 4 11:19:20 2011 -0400

    Ensure no errors for improper responses from image service.

 nova/api/openstack/views/images.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 871836ed8609ee5178f983a33ba4b431f16bd647
Merge: 5c74862 0ec4352
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 08:15:51 2011 -0700

    merge trunk

commit bd64c4f6bebb50528b87bf6e3f64d7d1cba053df
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 4 10:59:44 2011 -0400

    Fixes error which occurs when no name is specified for an image.

 nova/api/openstack/views/images.py      |    2 +-
 nova/tests/api/openstack/test_images.py |   57 +++++++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)

commit 80549a0085e7c3a90b117b4c9df5a77b4ecd0843
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 18:33:50 2011 +0400

    improving tests

 nova/tests/test_virt.py   |   76 ++++++++++++++++++++++++++++++++-------------
 nova/virt/libvirt_conn.py |   44 +++++++++++++-------------
 2 files changed, 75 insertions(+), 45 deletions(-)

commit ec30c42b3b4532743c8353c5e9fa04ae00803db3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 18:31:35 2011 +0400

    network injection check fixed

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ec4352046939785b3ffa390e6d8264ce4d99f98
Merge: 0ec596a 5d71e18
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 4 12:12:14 2011 +0000

    Only define 'VIMMessagePlugin' class if suds can be loaded.

commit 0ec596adb5b703b6a61064dc50811bf8fa5512cf
Merge: 78cebec 0ac8474
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Apr 4 09:26:53 2011 +0000

    Make euca-get-ajax-console work with Euca2ools 1.3

commit 0ac84747b7f25e44c2c8f6a574ba660609d4a0e7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Apr 4 11:16:50 2011 +0200

    Add bug reference.

commit c1120caaa8c8ed8902b5634da56b2bd5478662e1
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Mon Apr 4 10:25:58 2011 +0900

    Use keyword arguments.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8969cb1f22a7760dc7e17c578a686f088b1a8d89
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun Apr 3 22:50:38 2011 +0400

    add multi_nic_test

 nova/tests/test_virt.py   |   14 ++++++++++++--
 nova/virt/libvirt_conn.py |    3 +--
 2 files changed, 13 insertions(+), 4 deletions(-)

commit 74d9a325a452fb927e5edddca3f1b7edd35d1496
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun Apr 3 21:18:35 2011 +0400

    added preparing_xml test

 nova/tests/test_virt.py   |   41 +++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py |   24 +++++++-----------------
 2 files changed, 48 insertions(+), 17 deletions(-)

commit a8d186d212ffbc628fc2b2672eca1e0557c57414
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun Apr 3 03:45:33 2011 +0400

    split up to_xml to creation xml_info and filling the template

 nova/tests/test_virt.py   |   20 ++++++--------------
 nova/virt/libvirt_conn.py |   12 +++++++-----
 2 files changed, 13 insertions(+), 19 deletions(-)

commit a4e1db03a2c61648588d9adb703a385f49d82fc0
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 20:26:59 2011 +0000

    use novalib for vif_rules.py, fix OvsFlow class

 .../xensource/scripts/ovs_configure_vif_flows.py   |    2 +-
 .../networking/etc/xensource/scripts/vif_rules.py  |   25 +++++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

commit 74b9f240c7e8c62e68011691488be9e63758e980
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 19:54:55 2011 +0000

    extract execute methods to a library for reuse

 .../networking/etc/xensource/scripts/novalib.py    |   41 ++++++++++++++++++++
 .../xensource/scripts/ovs_configure_base_flows.py  |   21 +++-------
 .../xensource/scripts/ovs_configure_vif_flows.py   |   30 +++++---------
 3 files changed, 57 insertions(+), 35 deletions(-)

commit dcb94be18b1f8b3591d7304208b64a296cdd71f6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 1 14:16:17 2011 -0400

    Poller needs to check for BUILDING not NOSTATE now, since we're being more explict about what is going on.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 78cebece92abc63490595178caa6aaf09fab1545
Merge: 84dd5b0 ec3b3d6
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 18:02:29 2011 +0000

    Add checking if the floating_ip is allocated or not before appending to result array in DescribeAddresses.

commit 84dd5b0c94a8fdf3ec906c49de89331a0cb88444
Merge: b09e6b7 007992e
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 17:43:12 2011 +0000

    Added synchronize_session parameter to a query in fixed_ip_disassociate_all_by_timeout() and fix #735974.

commit ec3b3d6ae97cddce490c2cbeed2f8f9241704ed1
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sat Apr 2 01:44:12 2011 +0900

    Made the fix simpler.

 nova/api/ec2/cloud.py |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

commit d98c61d21f3a60e3368cc723fc6764c66b8176b4
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sat Apr 2 01:05:50 2011 +0900

    Add checking if the floating_ip is allocated or not before appending to result array.

 nova/api/ec2/cloud.py |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit 007992e57c064c90e6a09f8dac070d3b56dc72a0
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sat Apr 2 00:28:32 2011 +0900

    Added updated_at field to update statement according to Jay's comment.

 nova/db/sqlalchemy/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 367581e63d4eb0018db293034dc1b096d2584720
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 15:28:21 2011 +0000

    change bridge

 .../xensource/scripts/ovs_configure_vif_flows.py   |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0865cc59c1a525d21937224b7ff1ff61ce43f4b1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Apr 1 17:10:06 2011 +0200

    Add euca2ools import

 tools/euca-get-ajax-console |    1 +
 1 file changed, 1 insertion(+)

commit 98f9e841f2a27e8e513dd833c164863b2aa993e3
Merge: 4626744 b09e6b7
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 23:54:55 2011 +0900

    Rebased to trunk 930.

commit 4626744b12b299c7259973b07ff824bba8a54a49
Merge: 0834763 de1b0dc
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 23:54:29 2011 +0900

    Rebased to trunk 726.

commit d7c51db418d554094c341639a0540ecfec8ddb19
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 14:43:04 2011 +0000

    lots of updates to ovs scripts

 .../xensource/scripts/ovs_configure_base_flows.py  |   26 ++--
 .../xensource/scripts/ovs_configure_vif_flows.py   |  139 ++++++++++----------
 .../networking/etc/xensource/scripts/vif_rules.py  |    2 +-
 3 files changed, 80 insertions(+), 87 deletions(-)

commit b56c406429e4748f52ba8215beb4076165c6640d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Apr 1 11:23:05 2011 +0200

    Make euca-get-ajax-console work with Euca2ools 1.3

 tools/euca-get-ajax-console |    5 +++++
 1 file changed, 5 insertions(+)

commit 519b7f73e4d939a244b9fd71bba47af7ae5f9a9c
Merge: afc15dc b09e6b7
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 31 23:21:27 2011 +0000

    merge trunk

commit 5d71e187dc6eddab19ecdc0feb97e41263e09a84
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 17:19:59 2011 -0400

    Hopefully absolved us of the suds issue?

 nova/virt/vmwareapi/vim.py |   47 +++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

commit b09e6b7d7a6fb2966d6d215588ed45bd6003f345
Merge: f01c0b1 82224b6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 31 20:57:39 2011 +0000

    Removes excessive logging message in the event of a rabbitmq failure.
    
    Pro: logs stay under control
    Con: in the event of a non-comm failure, the exception will get eaten.

commit f01c0b1e575f990164cf80b8897860dd30791ddb
Merge: 230aad2 f06dbc0
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 31 20:47:05 2011 +0000

    Add a change password action to /servers in openstack api v1.1, and associated tests.

commit 7688cbb07ffcfd6446dc9ede60fb9eb610809c1d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 16:46:08 2011 -0400

    Removal of instance_set_state from driver code, it shouldnt be there, but instead should be in the compute manager.

 nova/compute/manager.py   |   15 ++++-----------
 nova/virt/libvirt_conn.py |    4 ++--
 nova/virt/xenapi/vmops.py |   26 ++++++++++----------------
 3 files changed, 16 insertions(+), 29 deletions(-)

commit 4a0c0618f7e0554a474fb1462badadbe66ead4f8
Merge: 032acaa 230aad2
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 15:35:11 2011 -0500

    Merged trunk

commit 032acaab1fd9a3823e203ddaf9c50857acd25ac7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 15:32:31 2011 -0500

    Don't include first 4 chars of instance name in adminPass

 nova/api/openstack/servers.py            |    3 +--
 nova/tests/api/openstack/test_servers.py |    6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

commit 230aad2378618538db5fe32c90b145af7c1f2f4d
Merge: 1bc1c1b 62b5283
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 19:56:21 2011 +0000

    Friendlier error message if there are no compute nodes are available.

commit f06dbc06847a3f949ce5fb7407e15782a7dc11e3
Merge: a11c115 1bc1c1b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 31 15:45:36 2011 -0400

    merge lp:nova

commit 7803ee8c196f2890cd6e0bb383e79782b1248289
Merge: 3725a44 f37edcb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:44:36 2011 -0400

    Merged waldon.

commit f37edcb18d27585ce6a2074a5f35eb7a84454dcf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:41:18 2011 -0400

    Adding explanation keyword to HTTPConflict

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3725a443a6cd7b7be7027611bc0198dd15bff90d
Merge: bcc6d6d 29396c4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:40:59 2011 -0400

    Merged waldon.

commit 1654afaabba498ab690c07ccc6de858783dc1742
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 31 12:38:05 2011 -0700

    makes sure s3 filtering works even without metadata set properly

 nova/image/s3.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit bcc6d6dd98740b9d39d6a7f855491d0cb8fc2da1
Merge: 6e6288d 600dc80
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:38:00 2011 -0400

    Merged waldon.

commit 29396c4c739b6b0a26a1b24beb86aa2e7e2bc474
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:37:44 2011 -0400

    Didn't run my code. Syntax error :(

 nova/api/openstack/views/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e6288d6d42bc17508b5df9781c7f04104f34fb2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:37:38 2011 -0400

    Now using the new power state instead of string.

 nova/compute/manager.py |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 600dc802e3775ea6b4b940e03c82e8b8ac40191c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:34:33 2011 -0400

    adding servers view mapping for BUILDING power state

 nova/api/openstack/views/servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit 82224b6681750819a4ee0d8b081823863cb0523c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 31 12:31:35 2011 -0700

    removes excessive logging on rabbitmq failure

 nova/rpc.py |    2 --
 1 file changed, 2 deletions(-)

commit 62b52833cc28d203c648585feceb1de3be9eed25
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 14:29:16 2011 -0500

    Review feedback

 nova/scheduler/chance.py |    4 ++--
 nova/scheduler/simple.py |   12 +++++++++---
 nova/scheduler/zone.py   |    5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

commit 1bc1c1b65013803b918ce5e05a638dd95ece7f7b
Merge: de1b0dc 45bb2fb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 19:22:05 2011 +0000

    Friendlier error message if there are no compute nodes are available.

commit fc5d44d785c61b019ca60fa8dc3d4adbcf189c0c
Merge: 46e90b5 59e8112
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 14:43:15 2011 -0400

    Merged with Waldon.

commit 46e90b5d28b682b668c441f0550b8c53e16321bb
Merge: 8e079f7 2d80066
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 14:42:24 2011 -0400

    Better error handling for spawn and destroy in libvirt.

commit 59e8112994e293fa1155b703abcc3e33d7cfc6c7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 14:35:25 2011 -0400

    pep8

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1ecd9b3d00f002799a9eab92f0179dcbea8b8c37
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 14:15:42 2011 -0400

    adding 'building' power state; testing for 409 from OSAPI when rebuild requested on server being rebuild

 nova/api/openstack/servers.py            |   15 ++++++++--
 nova/compute/api.py                      |    6 ++++
 nova/compute/power_state.py              |   21 +++++++------
 nova/exception.py                        |    4 +++
 nova/tests/api/openstack/test_servers.py |   48 ++++++++++++++++++++++++++++--
 5 files changed, 81 insertions(+), 13 deletions(-)

commit 45bb2fb1f74c21e9ef8b65f6c4e22965e2c94fbd
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 13:08:49 2011 -0500

    More friendly error message

 nova/scheduler/chance.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b39a0eabd507f804300c1741b768cf3c2584393d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Mar 31 09:01:01 2011 -0700

    need to support python2.4, so can't use uuid module

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit de1b0dcf585bdfe2cefa1a7ec561a53ac8c515b8
Merge: eda2757 7d86a9e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 31 14:52:19 2011 +0000

    If the floating ip address is not allocated or is allocated to another project, then the user trying to associate the floating ip address to an instance should get a proper error message.

commit 8e079f75e6391a3fc181fce7b6d03919b9625737
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 10:45:53 2011 -0400

    Update state between delete and spawn.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d800666df9cb16e90a47c10dc7d5d7a800088d4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 10:18:44 2011 -0400

    adding metadata support for v1.1

 nova/compute/api.py                      |   59 ++++++++++++++++--------------
 nova/tests/api/openstack/test_servers.py |    2 +-
 2 files changed, 33 insertions(+), 28 deletions(-)

commit 158d434b9ec3018909f2f90a1808e27e28e4f704
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 09:49:03 2011 -0400

    Rebuild improvements.

 nova/compute/manager.py |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit e90b0cf99cda9b93e93db88fbb2204a1bfcd3897
Merge: 176d98a eda2757
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 31 09:29:07 2011 -0400

    Merge w/ trunk.

commit 7f98416fdba59c4305f88a30a457bbf6c68ef372
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 31 09:20:47 2011 -0400

    Limit image metadata to the configured metadata quota for a project.

 nova/api/openstack/image_metadata.py            |   12 +++++++
 nova/tests/api/openstack/test_image_metadata.py |   39 +++++++++++++++++++++++
 2 files changed, 51 insertions(+)

commit b5f0d2c22ce48d06dc502f7790ed48fdf007d7f6
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 31 17:39:00 2011 +0900

    Add volume.API.remove_from_compute instead of compute.API.remove_volume.

 nova/compute/api.py     |    7 -------
 nova/compute/manager.py |   12 +++++-------
 nova/volume/api.py      |    7 +++++++
 3 files changed, 12 insertions(+), 14 deletions(-)

commit 083476364f816b70736903b2411965538af75ce7
Merge: 951ec0d eda2757
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 31 16:00:51 2011 +0900

    Rebased to trunk rev 925.

commit ce5ad4acbc81c8c444d7b6a02400d6bc0ef6b233
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Mar 30 20:33:56 2011 -0700

    Removed adminclient and referred to pypi nova_adminclient module

 nova/adminclient.py      |  473 ----------------------------------------------
 smoketests/test_admin.py |    2 +-
 tools/pip-requires       |    1 +
 3 files changed, 2 insertions(+), 474 deletions(-)

commit 451fec4edb8a8dca0311aeb4c050a7b1d5304386
Merge: e5b0f39 eda2757
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 31 10:18:59 2011 +0900

    Merge trunk.

commit 7d86a9e478c92ac9f79039c4592c6355c91b8b61
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 30 15:10:55 2011 -0700

    fixed review comment for i18n string multiple replacement strings need to use dictionary format

 nova/network/api.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit bb1c49bc324956241383add85297510842d4464c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 30 15:00:47 2011 -0700

    fixed review comment for i18n string multiple replacement strings need to use dictionary format

 nova/network/api.py |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit eda275741f5865a1bf58d0176b36d4d99bfeb015
Merge: 11eb778 047af2c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 30 21:03:30 2011 +0000

    Add obviously-missing method that prevents an Hyper-V compute node from even
    starting up

commit 11eb77870630dca9399070cd8c3d16f6e2bbce53
Merge: d4ebb55 2eadc55
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 20:49:38 2011 +0000

    Avoid any hard dependencies in nova.virt.vmwareapi.vim.

commit b8173ba9fe80045665064208e66f46cca75fd3ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 13:48:07 2011 -0700

    review cleanup

 bin/nova-manage       |    3 ++-
 nova/api/ec2/cloud.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit d4ebb5504b6bc4214c4c431c86163144afc38e66
Merge: 79915a7 de9091a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 30 20:43:34 2011 +0000

    Handles situation where Connection._instances doesn't exist (ie. production)

commit cf89dea62e777bb3052f3a178e38d0b665c1983d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 30 13:38:10 2011 -0700

    localize NotImplementedError()

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1e9cc02d3cb63c9431921064aac23327198d4b8c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 30 13:36:03 2011 -0700

    Change '"%s" % e' to 'e'.

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit ba5715b46d82498ed30aa146294850a134022617
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 30 13:32:13 2011 -0700

    Fix for LP Bug #745152

 nova/network/api.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit d2a04502d0dc374b6d61d42b92e2ea3d50114b39
Merge: e1d4ea7 cee0e90
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 16:25:49 2011 -0400

    Merged waldon.

commit cee0e90c058c3e50a3388eb4960afeb21b441f6a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 30 16:17:07 2011 -0400

    adding initial v1.1 rebuild action support

 nova/api/openstack/servers.py            |   24 +++++++++--
 nova/compute/api.py                      |    7 +++-
 nova/tests/api/openstack/test_servers.py |   64 ++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 5 deletions(-)

commit a1992ba586acc7545a7edb37130727e19e4d1065
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 30 13:13:04 2011 -0700

    Add ed leafe's code for the inject_file agent plugin method that somehow got lost (fixes bug 741246).
    Update TimeoutError string for i18n

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   79 +++++++++++++++++++--
 1 file changed, 75 insertions(+), 4 deletions(-)

commit b54b6c200092054e38af1fa1e5885fe915e53149
Author: John Tran <jhtran@att.com>
Date:   Wed Mar 30 13:10:11 2011 -0700

    submitting a unit test for terminate_instance

 Authors                  |    1 +
 nova/tests/test_cloud.py |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

commit 176d98aa179b174c4e4a5621f723ef7b9145e3cb
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 30 15:47:12 2011 -0400

    Update docstrings and spacing.

 nova/api/openstack/server_metadata.py            |    4 +---
 nova/compute/api.py                              |    6 +-----
 nova/tests/api/openstack/test_server_metadata.py |   22 +++++++++++-----------
 3 files changed, 13 insertions(+), 19 deletions(-)

commit c29dc77c6f42c5a345ee6b510a373236d7988440
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 12:46:22 2011 -0700

    fixed ordering and spacing

 nova/compute/api.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8482d87e3fe380704fac121240ebd29b9057283c
Author: John Tran <jhtran@att.com>
Date:   Wed Mar 30 12:44:22 2011 -0700

    removed trailing whitespace

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 655906ee7be1d906033bde7887293e6d61bae3d6
Author: John Tran <jhtran@att.com>
Date:   Wed Mar 30 12:37:56 2011 -0700

    updated per code review, replaced NotFound with exception.NotFound

 nova/tests/test_cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e1d4ea7bcb69ae5d47b612eec19f2eafcc903e55
Merge: e52cdaa d224b05
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 15:34:46 2011 -0400

    Merged Waldon's API code.

commit 1703592992ebdd5bbf19952f79f05022a4cdc849
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 12:34:10 2011 -0700

    remove all references to image_type and change nova-manage upload to set container format more intelligently

 bin/nova-manage                                 |   27 ++++++++++++-----------
 nova/api/openstack/servers.py                   |    2 +-
 nova/image/fake.py                              |    6 ++---
 nova/image/s3.py                                |    1 -
 nova/tests/api/openstack/test_image_metadata.py |    2 --
 nova/virt/libvirt_conn.py                       |    1 -
 6 files changed, 18 insertions(+), 21 deletions(-)

commit e52cdaa75ac4b5c9ea37a8a8c9b1f02e8d0f638f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 15:33:52 2011 -0400

    Rough implementation of rebuild_instance in compute manager.

 nova/compute/manager.py |   36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

commit d224b0509273ca8a92c5c2b9abca69038835935c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 30 15:10:40 2011 -0400

    adding v1.0 support for rebuild; adding compute api rebuild support

 nova/api/openstack/servers.py            |   19 ++++++++++++++++---
 nova/compute/api.py                      |    9 +++++++++
 nova/tests/api/openstack/test_servers.py |   27 +++++++++++++++++++++++----
 3 files changed, 48 insertions(+), 7 deletions(-)

commit 323eb60884cf8736448d997068d32f252d22e7f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 12:05:25 2011 -0700

    Key type values in ec2_api off of container format

 nova/api/ec2/cloud.py |   44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

commit 2eadc55dbd66af7b5adb3c21fe9cc91cd04b0f8b
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 13:56:02 2011 -0500

    Whoops

 nova/virt/vmwareapi_conn.py |    1 +
 1 file changed, 1 insertion(+)

commit be4be55bf03c907f46e76fffe3457743915d734a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 13:50:02 2011 -0500

    Handle in vim.py

 nova/virt/vmwareapi/vim.py  |   15 +++++++++++----
 nova/virt/vmwareapi_conn.py |   10 ----------
 2 files changed, 11 insertions(+), 14 deletions(-)

commit 168fdb09f369287f3ec8c19ef73915280ff79d20
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 11:15:16 2011 -0700

    Refixed unit test to check XML ns

 nova/tests/api/openstack/test_faults.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 79bcd94f95d83830c5eb90ed841194b102e8601f
Merge: d2aa73e 79915a7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 11:09:57 2011 -0700

    Merged with trunk (after faults change to return correct content-type)

commit 79915a797e8485307d432ac9155d6e777b16dce7
Merge: f77c58c b1589b5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 17:53:46 2011 +0000

    OpenStack API faults have been changed to now return the appropriated Content-Type header.

commit d2aa73efed6f4eb731c4fe8dca3f4ceb5b36caeb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 10:49:09 2011 -0700

    More tests that were checking for no-namespace

 nova/tests/api/openstack/test_faults.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit ee709d39e6c66ec4aad722fb20951ae9d714f259
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 10:41:22 2011 -0700

    Some tests actually tested for the lack of a namespace :-)

 nova/api/openstack/extensions.py        |    3 ++-
 nova/api/openstack/faults.py            |    5 +++--
 nova/api/openstack/images.py            |    3 ---
 nova/tests/api/openstack/test_images.py |   16 +++++++++++-----
 4 files changed, 16 insertions(+), 11 deletions(-)

commit 82759db16019509b9ca77fb7d86015d29c598f70
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 30 13:34:45 2011 -0400

    pep8 fixes.

 nova/tests/api/openstack/test_server_metadata.py |    3 +++
 1 file changed, 3 insertions(+)

commit 8ae5857d293ee6c0d277b4a770c7382741868a2e
Merge: 00fad85 f77c58c
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 30 13:33:52 2011 -0400

    Merge w/ trunk.

commit 23776e5b2bdb73df10be590b589c34788c28023a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 12:28:09 2011 -0500

    Avoid hard dependencies

 nova/virt/vmwareapi_conn.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 00fad85ac9cacf71f069ec6b9c9c7e974a9d9edd
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 30 13:18:47 2011 -0400

    Implement quotas for the new v1.1 server metadata controller.
    Modified the compute API so that metadata is a dict (not an array) to
    ensure we are using unique key values for metadata. This is isn't explicit
    in the SPECs but it is implied by the new v1.1 spec since PUT requests
    modify individual items.
    
    Re-enabled the metadata integration test.

 nova/api/openstack/server_metadata.py            |   30 ++++++--
 nova/api/openstack/servers.py                    |   12 +--
 nova/compute/api.py                              |   52 +++++++------
 nova/db/sqlalchemy/api.py                        |    5 +-
 nova/tests/api/openstack/test_server_metadata.py |   38 ++++++++++
 nova/tests/integrated/test_servers.py            |   88 +++++++++++-----------
 6 files changed, 139 insertions(+), 86 deletions(-)

commit 12505c6bae61e72b6c75ac647323c3ec15997df1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 10:05:06 2011 -0700

    Add XML namespaces to the OpenStack API

 nova/api/openstack/accounts.py         |    5 ++-
 nova/api/openstack/backup_schedules.py |    4 +--
 nova/api/openstack/common.py           |   11 +++++++
 nova/api/openstack/consoles.py         |    4 +--
 nova/api/openstack/extensions.py       |    7 ++--
 nova/api/openstack/flavors.py          |    7 ++--
 nova/api/openstack/image_metadata.py   |    3 +-
 nova/api/openstack/images.py           |    5 ++-
 nova/api/openstack/limits.py           |    4 +--
 nova/api/openstack/server_metadata.py  |    3 +-
 nova/api/openstack/servers.py          |    5 ++-
 nova/api/openstack/shared_ip_groups.py |    4 +--
 nova/api/openstack/users.py            |    3 +-
 nova/api/openstack/zones.py            |    6 ++--
 nova/tests/integrated/test_xml.py      |   56 ++++++++++++++++++++++++++++++++
 nova/wsgi.py                           |    8 ++---
 16 files changed, 103 insertions(+), 32 deletions(-)

commit 8a56ff7268b936a0b559e9a548cb587ff6aa5907
Merge: 9686b3a f77c58c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 09:17:46 2011 -0700

    Merged with trunk

commit 4ab6962fb7461573119297aa3508f7df8c6efa42
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 09:08:36 2011 -0700

    Fixed mis-merge: OS API version still has to be v1.1

 nova/tests/integrated/integrated_helpers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 131b7da40946b12bae59ebcc8f1c3d66d0cb5cff
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 09:04:29 2011 -0700

    Store socket_info as a dictionary rather than an array

 nova/service.py                             |   14 +++++++-------
 nova/tests/integrated/integrated_helpers.py |    2 +-
 nova/wsgi.py                                |    7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

commit 172f0cdc98164179d657213d47f625829594fc3d
Merge: 062301f f77c58c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 08:57:37 2011 -0700

    Merged with trunk

commit 951ec0d0fb2711e5d5ef4d6e9e78fe74d6c62360
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 31 00:45:59 2011 +0900

    Added synchronize_session parameter to a query in fixed_ip_disassociate_all_by_timeout() and fix #735974.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f77c58ce317f9674671a1b44563ef3645533c815
Merge: c88f1f5 6f274d0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 30 15:37:48 2011 +0000

    Key was converted through str() even if None, resulting in "None" being
    added to authorized_keys when no key was specified.

commit de9091a74107827b8f7157d6b89c2fb5dcf92dd2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 30 08:29:17 2011 -0700

    queues properly reconnect if rabbitmq is restarted

 nova/rpc.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit c88f1f58f65c80cec8a19cd6e7d821357e86d0e6
Merge: eaeaea0 a070b88
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 30 15:10:37 2011 +0000

    Moving server update adminPass support to be v1.0-specific
    OS API servers update tests actually assert and pass now
    Enforcing server name being a string of length > 0

commit eaeaea0b5fb063124c04e05a30f9160890e8c4f9
Merge: 0e17f86 343b969
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 30 15:06:46 2011 +0000

    Adding Content-Type code to openstack.api.versions.Versions wsgi.Application

commit 0e17f86bc315322d5221f2b6fec205bcb656c474
Merge: 2c71dea a2d0718
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 15:02:55 2011 +0000

    Fixes metadata for ec2_api to specify owner_id so that it filters properly.

commit 2c71deadc3ee9327cd9cd54771ef495d344aa7e9
Merge: 56b5bcf 60685ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 13:51:21 2011 +0000

    Makes the image decryption code use the per-project private key to decrpyt uploaded images if use_project_ca is set.  This allows the decryption code to work properly when we are using a different ca per project.

commit b1589b5f034db95b1d18910e27cae516258a4311
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 09:39:35 2011 -0400

    exception -> Fault

 nova/tests/api/openstack/test_faults.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d713fbde58258053a5c55c8d748eb544e55a1adc
Merge: 2af6fb2 56b5bcf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 09:38:09 2011 -0400

    Merged trunk.

commit 6f274d0a5818633b072e432ba7182650f0d30001
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 30 15:28:21 2011 +0200

    Do not push 'None' to authorized_keys when no key is specified

 nova/virt/libvirt_conn.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 047af2c506374aa44bb896a7df0cb5813bf3a123
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 30 15:02:59 2011 +0200

    Add missing method that prevent HyperV compute nodes from starting up

 nova/virt/hyperv.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 56b5bcf86f1bee60a4b727414cca1ac5e714d09a
Merge: f459510 620c2da
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 30 12:22:27 2011 +0000

    TopicAdapterConsumer uses a different callback model than TopicConsumer.  This patch updates the console proxy to use this pattern.
    
    Without this patch, nova-ajax-console proxy will generate an error every time an auth token is cast to it, and hence it won't work.

commit 574980cf15f63c08d4d7d6ac4a406149cfb8bcaf
Merge: 5350028 f459510
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 30 10:41:25 2011 +0100

    merge trunk

commit f4595104348a3dbfdb5d28c1f5114b51c479db52
Merge: cda715b 3a39fb7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 06:43:44 2011 +0000

    Uses the proc filesystem to check the volume size in volume smoketests so that it works with a very limited busybox image.

commit 08e8d6e97508727f9e5f066a568526e05895fb3a
Merge: 7aa0102 cda715b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 23:12:39 2011 -0700

    merged trunk

commit cda715bf86373d47ad2f2f6655ad26e77f264868
Merge: 971be24 7856df8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 30 05:59:13 2011 +0000

    The VNC Proxy is an OpenStack component that allows users of Nova to access
    their instances through a websocket enabled browser (like Google Chrome).
    
    A VNC Connection works like so:
    
    * User connects over an api and gets a url like http://ip:port/?token=xyz
    * User pastes url in browser
    * Browser connects to VNC Proxy though a websocket enabled client like noVNC
    * VNC Proxy authorizes users token, maps the token to a host and port of an
      instance's VNC server
    * VNC Proxy initiates connection to VNC server, and continues proxying until
      the session ends
    
    For more info see vncconsole.rst

commit 7aa0102b2d451ffa87a095ac4471a65260aff3fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:55:16 2011 -0700

    make sure that flag is there in compute api

 nova/compute/api.py |    1 +
 1 file changed, 1 insertion(+)

commit 7856df88b22e6ff3bd0f124e3d71f130e3e9c205
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:41:15 2011 -0700

    fix localization for multiple replacement strings

 nova/vnc/auth.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 3e9bafd4f05a4bda29c30460bf3e3428a03f8218
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:37:19 2011 -0700

    fix doc to refer to nova-vncproxy

 doc/source/runnova/vncconsole.rst |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 971be24dd38b576f4cf89a2c7d8856593b93c29d
Merge: e5f1080 9397766
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 02:46:57 2011 +0000

    Support for volumes in the OpenStack API
    
    Two new endpoints: /volumes and /servers/<id>/volume_attachments

commit 9397766990b00167071bca6392096abfb93af982
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 19:11:12 2011 -0700

    Deepcopy the images, because the string formatting transforms them in-place

 nova/image/fake.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit f4b9e95bd143d46cd4939a3ea31de10a3e66fd90
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 19:10:23 2011 -0700

    name, created_at, updated_at are required.
    
    I think some of the other image services might also break because of this, but that's a different issue...

 nova/image/fake.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 93b43cfcaeffa93b2f8ce50f473840c77be532c9
Merge: 2315682 e5f1080
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 19:09:42 2011 -0700

    Merged with trunk

commit 2315682856f420ff0b781bead142e1aff82071a4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:16:09 2011 -0700

    "Incubator" is no more.  Long live "contrib"

 nova/api/openstack/contrib/__init__.py |    2 +-
 nova/api/openstack/extensions.py       |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 4c16db6ad330b0c3a1bdde098bbdcf958fc23bdf
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:13:04 2011 -0700

    Rename MockImageService -> FakeImageService

 nova/image/fake.py                          |    4 ++--
 nova/tests/integrated/integrated_helpers.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit be8bf22f90e322823cb3cf4963f5c7313ef727ec
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:08:36 2011 -0700

    Removed unused super_verbose argument left over from previous code

 nova/api/openstack/extensions.py |    2 --
 1 file changed, 2 deletions(-)

commit 9c8300c98239c181cc66740bf18717f0488a0743
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:08:17 2011 -0700

    Renamed incubator => contrib

 nova/api/openstack/contrib/__init__.py   |   22 ++
 nova/api/openstack/contrib/volumes.py    |  336 ++++++++++++++++++++++++++++++
 nova/api/openstack/extensions.py         |    4 +-
 nova/api/openstack/incubator/__init__.py |   22 --
 nova/api/openstack/incubator/volumes.py  |  336 ------------------------------
 5 files changed, 360 insertions(+), 360 deletions(-)

commit f0cd8a993d235fddbfb9478b69a77f4ed32f6dff
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:35:24 2011 -0700

    Wipe out the bad docstring on get_console_pool_info

 nova/virt/driver.py |    8 --------
 1 file changed, 8 deletions(-)

commit 60685eabcde99140f36e1ffbd16dbbbacc87baff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 17:23:09 2011 -0700

    use project key for decrypting images

 nova/image/s3.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 86914566436d778cdae2244cb9b277e25e21cb21
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:22:20 2011 -0700

    Fix a docstring

 nova/api/openstack/incubator/volumes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d3c31df757f65da7b29aaed1fb4d6e2b29126a0
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:17:20 2011 -0700

    Found a better (?) docstring from get_console_pool_info

 nova/virt/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 27b92e509c71a8b79dc6240aecdf598bf9d608f1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:13:40 2011 -0700

    Change volume so that it returns attachments in the same format as is used for the attachment object

 nova/api/openstack/incubator/volumes.py |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

commit ded3416d48980c32eb20f95665f281ffc2927517
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:10:40 2011 -0700

    Removed commented-out EC2 code from volumes.py

 nova/api/openstack/incubator/volumes.py |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

commit d92322400c31f1cad933da5117b24376d60a5798
Author: John Tran <jhtran@att.com>
Date:   Tue Mar 29 17:07:59 2011 -0700

    adding unit tests for describe_images

 Authors                  |    1 +
 nova/tests/test_cloud.py |   31 ++++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

commit 399056300a0be228ec4c56587ec0d9c0d09d927c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 16:54:37 2011 -0700

    Fix unit test to reflect fact that instance is no longer deleted, just marked SHUTOFF

 nova/tests/test_compute.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5e6c69bc7a7e5ddaa1bf0fa83f64da116343dba8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 16:35:39 2011 -0700

    Narrowly focused bugfix - don't lose libvirt instances on host reboot or if they crash

 nova/compute/manager.py   |   14 ++++++-----
 nova/virt/libvirt_conn.py |   59 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 55 insertions(+), 18 deletions(-)

commit 620c2dabfa8d92dbf250c078dda71d3ec11c6d8c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 16:13:09 2011 -0700

    fix for lp742650

 bin/nova-ajax-console-proxy |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 11d258e1d8a4a78a699aa564b5f8139bf0b73db2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 15:52:04 2011 -0700

    Added missing blank line at end of multiline docstring

 nova/api/openstack/extensions.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 034a841cbac8e73c55e9525df7360a068fe9d892
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 15:43:38 2011 -0700

    pep8 fixes

 nova/api/openstack/incubator/volumes.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit e86f58261ee6acb8705106d3de61be0de488d94b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 15:37:45 2011 -0700

    Reverted extension loading tweaks

 nova/api/openstack/extensions.py                   |  116 +++----
 nova/api/openstack/incubator/__init__.py           |    4 +-
 nova/api/openstack/incubator/volumes.py            |  355 ++++++++++++++++++++
 nova/api/openstack/incubator/volumes/__init__.py   |   18 -
 .../incubator/volumes/volume_attachments.py        |  184 ----------
 nova/api/openstack/incubator/volumes/volumes.py    |  161 ---------
 .../api/openstack/incubator/volumes/volumes_ext.py |   55 ---
 nova/tests/api/openstack/extensions/foxinsocks.py  |   98 ++++++
 .../openstack/extensions/foxinsocks/__init__.py    |   19 --
 .../openstack/extensions/foxinsocks/foxinsocks.py  |   98 ------
 10 files changed, 505 insertions(+), 603 deletions(-)

commit a2d0718c20e45d39e3f2d46edb715a064f650e81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 15:37:32 2011 -0700

    conversion of properties should set owner as owner_id not owner

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9513458c3e50fac5f40e76757b45ab15b67e8f00
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 15:34:25 2011 -0700

    add nova-vncproxy to setup.py

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit 93a7a7b94a0d9e4100abb3a4309a3546ab532535
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 15:22:16 2011 -0700

    clarify test

 nova/tests/test_compute.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3cdc2a90f0a7a066a231b0590aeb3d51d8ec699a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 14:58:10 2011 -0700

    add line

 nova/vnc/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit f5c072de1edddc4ddab89be8146a81d361397c45
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 14:53:38 2011 -0700

    incorporate feedback from termie

 bin/nova-vncproxy                 |    4 ++--
 doc/source/runnova/vncconsole.rst |    2 +-
 nova/api/openstack/servers.py     |    2 +-
 nova/virt/libvirt_conn.py         |    2 --
 nova/vnc/__init__.py              |    2 --
 nova/vnc/auth.py                  |    4 ++--
 nova/vnc/proxy.py                 |    4 ++--
 7 files changed, 8 insertions(+), 12 deletions(-)

commit e5f108058f9b085571330dff3c3e3e3e57d2e5ed
Merge: 6e0a1b9 07076b1
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 29 21:46:56 2011 +0000

    Make dnsmasq_interface configurable.

commit 6e0a1b93fd95958336e8ed4c8f6f6343218290d2
Merge: c7555d6 8cfc3d5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 21:07:20 2011 +0000

    Stop nova-manage from reporting an error every time.  Apparently except: catches sys.exit(0).

commit 8cdad1ab8343eb038f119a92e28d77c731b61793
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:59:46 2011 -0700

    add comment

 nova/compute/api.py |    1 +
 1 file changed, 1 insertion(+)

commit 2c533ca5a4cd74907b3238ec65ab29c4f686dfcc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:55:01 2011 -0700

    switch cast to a call

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 817572265871fd2cfd1252dd0cffb167f0e2ccdb
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:49:49 2011 -0700

    move functions around

 nova/vnc/auth.py |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit cc7ba9a7a4ed8a38f217ad7f33fc33254f80ead7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:47:47 2011 -0700

    move flags per termie's feedback

 nova/flags.py             |   10 ----------
 nova/virt/libvirt_conn.py |    1 +
 nova/vnc/__init__.py      |   35 +++++++++++++++++++++++++++++++++++
 nova/vnc/auth.py          |    3 ++-
 4 files changed, 38 insertions(+), 11 deletions(-)

commit 3987547248e07719dbc63752100b695ef0be1a9c
Author: John Tran <jhtran@att.com>
Date:   Tue Mar 29 13:44:38 2011 -0700

    initial unit test for describe images

 nova/tests/test_cloud.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 8cfc3d5e6b033a99fc47b3df8ac7e798d107240a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 13:43:03 2011 -0700

    don't print the error message on sys.exit(0)

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee00cb8057eac328c98dd9c040ffa324f11a87be
Author: John Tran <jhtran@att.com>
Date:   Tue Mar 29 13:43:00 2011 -0700

    added blank lines in between functions & removed the test_describe_images (was meant for a diff bug lp682888)

 nova/tests/test_cloud.py |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

commit 07076b1b9caf7f11c74686d546161994e2e2d691
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 29 15:32:44 2011 -0500

    Make Dnsmasq_interface configurable

 bin/nova-dhcpbridge |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit dbef49203985b4eea82912d010df7204ec68586c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:32:03 2011 -0700

    fix flag names

 nova/compute/api.py            |    4 ++--
 nova/flags.py                  |    6 +++---
 nova/virt/libvirt.xml.template |    4 ++--
 nova/virt/libvirt_conn.py      |    2 +-
 nova/vnc/auth.py               |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

commit c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732
Merge: cdb0063 b161ae9
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Mar 29 20:14:29 2011 +0000

    Now checking that exists at least one network marked injected (libvirt and xenapi)

commit cdb006321436de92d790ca97c668c0b725da5d2b
Merge: ee21213 05a6542
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 20:08:11 2011 +0000

    This branch adds support for linux containers (LXC) to nova. It uses the libvirt LXC driver to start and stop the instance.

commit 3e9b5977137c430d218ec8c00e286b691ea8367d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 12:54:35 2011 -0700

    use manager pattern for auth token proxy

 bin/nova-vnc-proxy                |   96 ----------------------------------
 bin/nova-vncproxy                 |  101 ++++++++++++++++++++++++++++++++++++
 doc/source/runnova/vncconsole.rst |    6 +--
 nova/flags.py                     |    2 +-
 nova/vnc/auth.py                  |  103 ++++++++++++++++++++++---------------
 nova/vnc/proxy.py                 |    3 +-
 6 files changed, 168 insertions(+), 143 deletions(-)

commit 05a654211ab902cbb5b1b345dd3285efb1c6bf71
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 15:48:02 2011 -0400

    Style fixes

 nova/tests/test_virt.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b161ae983edbd9e8c302907e8951075546eafc48
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Mar 29 23:30:06 2011 +0400

    style fix

 nova/virt/libvirt_conn.py    |    4 ++--
 nova/virt/xenapi/vm_utils.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit ee212133d32b1ec249c9d47f00581820f0c627c6
Merge: 11944d5 07d985f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 19:22:28 2011 +0000

    Glance used to return None when a date field wasn't set, now it returns ''.
    Glance used to return dates in format "%Y-%m-%dT%H:%M:%S", now it returns "%Y-%m-%dT%H:%M:%S.%f".
    
    Fixed to allow for all cases.

commit 8f4176f289142e48d4a2c584ad1ce270dfa53d82
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 14:56:46 2011 -0400

    Fix up docstring

 nova/virt/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2af6fb2a4d3659e9882a6f6d1c8e71bc8f040aba
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 14:56:18 2011 -0400

    Added content_type to OSAPI faults.

 nova/api/openstack/faults.py            |    1 +
 nova/tests/api/openstack/test_faults.py |  122 ++++++++++++++++++++++++++-----
 2 files changed, 103 insertions(+), 20 deletions(-)

commit d7798b3b383b32576f79e281a220266b65702b1e
Author: termie <code@term.ie>
Date:   Tue Mar 29 11:15:16 2011 -0700

    accidentally dropped a sentence

 HACKING |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3b8aa1fed7cd6d1deb580eec0af283947060c04d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Mar 29 21:26:17 2011 +0400

    Added checks that exists at least one network marked inhected in libvirt and xenapi

 nova/virt/libvirt_conn.py    |    5 ++++-
 nova/virt/xenapi/vm_utils.py |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 11944d59a8c04ba48832a8bb4dc1f63c3a0ef27f
Merge: 6719b9c 2f89d55
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 16:51:44 2011 +0000

    Adds support for versioned requests on /images through the OpenStack API.

commit 2f89d5541aa11b8654b197ffe24d3fd13e945da6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 12:12:26 2011 -0400

    Import order.

 nova/api/openstack/images.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 07d985f8db30863bb9171e14fccbdb51d7b35f11
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 12:06:52 2011 -0400

    Switch string concat style.

 nova/image/glance.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 343b969f7d790282b7b76bcb23b9d0d578d716b9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 12:04:43 2011 -0400

    adding xml test case

 nova/tests/api/openstack/test_versions.py |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit d1ef69edb8da18c5c7e56b6006e22022d55d6664
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 11:41:33 2011 -0400

    adding code to explicitly set the content-type in versions controller; updating test

 nova/api/openstack/versions.py            |   10 ++++++++--
 nova/tests/api/openstack/test_versions.py |    2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

commit 6a2ba2e2a132d554f180b5e39b8dfdb939e30c76
Merge: c4c9c0e 6719b9c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 11:26:41 2011 -0400

    Merged trunk.

commit 6719b9cb8794f69b719976a8b30af189a2273d02
Merge: 1d84aac 73f05da
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 29 15:23:15 2011 +0000

    Added VLAN networking support for XenAPI

commit a070b8861ccc01b485b109855f44a36cd6ebdbd6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 11:16:42 2011 -0400

    pep8

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f624d2e35dab0d87a289a346999c0cb01ed0aa55
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 11:11:57 2011 -0400

    adding server name validation to create method; adding tests

 nova/api/openstack/servers.py            |   36 ++++++++++------
 nova/tests/api/openstack/test_servers.py |   68 ++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 14 deletions(-)

commit a11c1154a6ae9d311bf4ebd8d04bc4208a17e2e7
Merge: c512bae 1d84aac
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 29 10:54:46 2011 -0400

    merge lp:nova

commit c512bae72859b8583731886011e8f9a4310d69f8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 29 10:53:44 2011 -0400

    use informative error messages

 nova/api/openstack/servers.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 793de5cef9fb539a4fb3ba976d83adde38a589c1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 10:40:35 2011 -0400

    adding more tests; making name checks more robust

 nova/api/openstack/servers.py            |   11 +++++++++--
 nova/tests/api/openstack/test_servers.py |   26 +++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

commit afc15dc67dcf932ccbd8c5760bef1689d0f29c5c
Merge: f8a3dbd 1d84aac
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 29 14:22:46 2011 +0000

    merge trunk

commit beec33e8dbffbe3ea02eccec4952705698db377a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 10:01:54 2011 -0400

    Fix pep8 error

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c4c9c0e5b70305ac06494bde35fcd18fdf60798e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 09:51:02 2011 -0400

    Tweaking docstrings just in case.

 nova/api/openstack/images.py       |    3 +--
 nova/api/openstack/views/images.py |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit ad6735df0de8676768353516eee4af62af2c993c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 08:56:42 2011 -0400

    Catch the error that mount might through a bit better

 nova/virt/disk.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f62a7e3482d1d8dea79469bc6f74aed215d283a8
Merge: 0e81c41 1d84aac
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 06:51:30 2011 -0400

    Merge trunk

commit 73f05da6400fe7f4324cf98c7d0706fb68a62870
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 29 11:20:16 2011 +0100

    sorted pep8 errors that were introduced during previous fixes

 nova/virt/xenapi/vmops.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ffc6c27520a613ce0436e1a30d19f2d868fb88a3
Merge: cd81e06 1d84aac
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 29 11:10:28 2011 +0100

    merge trunk

commit 5c74862a08a82b7db3e11fbcbec63293ea903e00
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 28 23:11:42 2011 -0700

    make all openstack status uppercase

 nova/api/openstack/views/servers.py      |    4 ++--
 nova/tests/api/openstack/test_servers.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit e5b0f3921331b5c0acbe321b00e2a9fa8d27be4e
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Tue Mar 29 10:40:48 2011 +0900

    Add remove_volume to compute API.

 nova/compute/api.py     |    7 +++++++
 nova/compute/manager.py |   26 ++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

commit 0e81c4175cad97359e848c993efd9a91eb981174
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 21:22:53 2011 -0400

    Pass along the nbd flags although we dont support it just yet

 nova/virt/disk.py         |   13 ++++++++-----
 nova/virt/libvirt_conn.py |    5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

commit 1b67237d05e7103dc6b2beadd5782466682a136b
Author: John Tran <jhtran@att.com>
Date:   Mon Mar 28 18:19:56 2011 -0700

    cleaned up var name

 nova/tests/test_cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 00afedaec5c6544bf9ff982d5f9d8e7b6b2a4b19
Author: John Tran <jhtran@att.com>
Date:   Mon Mar 28 18:16:55 2011 -0700

    made changes per code review: 1) removed import of image from objectstore 2) changed to comments instaed of triple quotes.

 nova/tests/test_cloud.py |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 1d84aac3b13106aa3aa193a315e3d64751a47d7d
Merge: e025ede f67b18b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 00:55:27 2011 +0000

    Displays an error message to the user if an exception is raised.  This is vital because if logfile is set, the exception shows up in the log and the user has no idea something went wrong.

commit 699f82e7e14146feb272d61a98b89ad53c93bf08
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:11:16 2011 -0700

    Yet more docstring fixes

 nova/virt/driver.py |    2 ++
 1 file changed, 2 insertions(+)

commit 55b801db77b9d631e746e79bd84a7866d1877fb2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:09:39 2011 -0700

    More style changes

 nova/api/openstack/extensions.py |   35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

commit 10acd84b0173b172dfa52e3779ba7b13b62bde76
Merge: 76ecbcb e025ede
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Tue Mar 29 09:04:33 2011 +0900

    Merge trunk.

commit 012a5878737f8648e99c9ae9b84d3a86ee86131d
Merge: 87bc3bc e025ede
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:04:14 2011 -0700

    Merged with trunk

commit 87bc3bca7904135656ed3a99efc19952be95dcbf
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:54:17 2011 -0700

    Multi-line comments should end in a blankline

 .../incubator/volumes/volume_attachments.py        |    4 +++-
 nova/image/fake.py                                 |    4 +++-
 nova/tests/integrated/api/client.py                |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

commit 3a39fb7b09dfee3c971ae4adaeff4717f4839f8a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 28 16:50:33 2011 -0700

    add note per review

 smoketests/test_sysadmin.py |    1 +
 1 file changed, 1 insertion(+)

commit 276c153f44734e78cae25deb9fc9e79a604c6219
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:42:28 2011 -0700

    More fixes to keep the stylebot happy

 nova/tests/integrated/api/client.py         |    2 +-
 nova/tests/integrated/integrated_helpers.py |   20 ++++++++++----------
 nova/tests/integrated/test_extensions.py    |    2 +-
 nova/tests/integrated/test_login.py         |    8 ++++----
 nova/tests/integrated/test_servers.py       |   16 ++++++++--------
 nova/tests/integrated/test_volumes.py       |   18 +++++++++---------
 nova/virt/driver.py                         |    2 +-
 nova/volume/driver.py                       |    2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

commit a6e8c83196cb4b2d8a292a99cb1feb22ed9b21db
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:36:25 2011 -0700

    Cleaned up images/fake.py, including move to Duplicate exception

 .../incubator/volumes/volume_attachments.py        |   30 ++++++++++----------
 nova/api/openstack/incubator/volumes/volumes.py    |   18 ++++++------
 .../api/openstack/incubator/volumes/volumes_ext.py |    4 +--
 nova/compute/manager.py                            |    2 +-
 nova/image/fake.py                                 |   29 ++++++++-----------
 5 files changed, 39 insertions(+), 44 deletions(-)

commit 57a4864e30df604612a347ba069ccc8499b04f1f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:30:31 2011 -0700

    Code cleanup to keep the termie-bot happy

 nova/api/openstack/extensions.py |  131 +++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 81 deletions(-)

commit f67b18b61297b4cb0d641695de01e52fd37ddd1c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 28 16:27:33 2011 -0700

    displays an error message if a command fails, so that the user knows something went wrong

 bin/nova-manage |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 233fd092018ace16f0b9caaca55f4e2107c41fe2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 28 15:46:01 2011 -0700

    Fixes volume smoketests to work with ami-tty

 smoketests/test_sysadmin.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 94092e3d896732fa1a97627f0fa504c3af70b3c5
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 28 15:38:09 2011 -0700

    address some of termie's recommendations

 bin/nova-vnc-proxy            |    3 +++
 nova/api/openstack/servers.py |    4 ++--
 nova/compute/api.py           |    2 +-
 nova/tests/test_compute.py    |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

commit abdd9a5078bef240fac91085f4af2da3f86e0b4e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 28 15:30:25 2011 -0700

    add period, test github

 bin/nova-vnc-proxy |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f460d75ae355ee76b6c51d884162f00076140716
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 17:45:48 2011 -0400

    pep8

 nova/api/openstack/servers.py            |    3 +--
 nova/tests/api/openstack/test_servers.py |    5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

commit c439309fddb7e6ebc14ab6b82ac9960f459c5aed
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 17:40:45 2011 -0400

    osapi servers update tests actually assert now; enforcing server name being a string of length > 0; moving server update adminPass support to be v1.0-specific

 nova/api/openstack/servers.py            |   30 ++++++++++++++++++++------
 nova/tests/api/openstack/test_servers.py |   34 ++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 16 deletions(-)

commit e025ede777b0ee6652e035dfde467037f0485de2
Merge: 848c821 4714f26
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 21:25:40 2011 +0000

    Moving shared_ip_groups controller to APIRouterV10
    Replacing all shared_ip_groups contoller code with HTTPNotImplemented
    Adding shared_ip_groups testing

commit cd81e06c19893b44568a8cef37a1de30b726e236
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:25:11 2011 +0100

    fix docstrings

 nova/virt/xenapi/vmops.py |   61 ++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

commit 4738400abc226bd7231760054eae3ef0e8f9c252
Merge: 6efd9dc 848c821
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:23:14 2011 -0400

    Merged trunk.

commit 6efd9dc30870008750c9754de4672d3eea656cce
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:15:54 2011 -0400

    Updated docstrings to satisfy.

 nova/api/openstack/views/images.py |   35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

commit 45e3deee1581580bed56d1bdfaaf9f4814fe7963
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:13:37 2011 -0400

    Updated docstrings to satisfy.

 nova/api/openstack/images.py |   40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

commit 30ad1f72b2e71fa81b71f88b2abd9a23a1d2ed10
Merge: c1ed5fc 848c821
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:04:52 2011 +0100

    merge trunk

commit f8a3dbd75fab24fa46ffd5b54f7ea53e00a05471
Merge: ab1bf7c 848c821
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 28 21:01:05 2011 +0000

    merge trunk

commit ab1bf7c0c12e205cd17b80be31226055cc90ef20
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 28 21:00:44 2011 +0000

    minor fix and comment

 .../xensource/scripts/ovs_configure_vif_flows.py   |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c1ed5fc3dfeecef281df45cd2e6779fa21c63bf5
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:00:17 2011 +0100

    style fixes

 nova/network/xenapi_net.py |    6 ++++--
 nova/tests/fake_utils.py   |   14 ++++++++++----
 nova/tests/test_xenapi.py  |   28 +++++++---------------------
 nova/virt/xenapi/fake.py   |   28 ++++++++++++++--------------
 4 files changed, 35 insertions(+), 41 deletions(-)

commit 4714f26ec97535425a16f50da54560314d124e17
Merge: 14337b0 848c821
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 16:57:35 2011 -0400

    merging trunk

commit 633917f56200cc11ef26717b8305ef0ccbe76569
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 16:42:09 2011 -0400

    Made param descriptions sphinx compatible.

 nova/api/openstack/images.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 848c8212a4c9c53f0e2a6b4154fb9504b95db060
Merge: 616d4dc 7040ead
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 20:30:56 2011 +0000

    Toss an __init__ in the test extensions dir. This gets it included in the tarball.
    
    Make extensions code ignore modules whose name starts with '_'.
    
    Warn if an extension doesn't define a class or factory by the right name.

commit 7040eadcc7e86d063c5c69391dedafa181711913
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 22:21:18 2011 +0200

    pep8

 nova/api/openstack/extensions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dbbceaebec3ca2a729582f9851f718b2b7c3f3b9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 15:57:18 2011 -0400

    Fix up libvirt.xml.template

 nova/virt/libvirt.xml.template |  138 ++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 70 deletions(-)

commit 616d4dc27d960c2c5a95fb5121d69151cc3638f9
Merge: 782b5c3 9fdf996
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Mar 28 19:32:14 2011 +0000

    This fixes EC2 API so that it returns image displayName and description properly.

commit c6a9bade80d44c0576f30608d33a1e5cbcd577e0
Merge: 9ce24af ddbb00f
Author: John Tran <jhtran@att.com>
Date:   Mon Mar 28 12:24:36 2011 -0700

    merged from trunk

commit 782b5c3554008a44da2ea1a45db6b69ff5735e9e
Merge: ddbb00f b6df504
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 19:20:53 2011 +0000

    Moving backup_schedule route out of base router to OS API v1.0
    All controller methods return HTTPNotImplemented to prevent further confusion
    Correcting tests that referred to incorrect url

commit 78a9ec232cde1172fa4c639ebdcbf88967bf8e9c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 15:10:34 2011 -0400

    Fixed superfluous parentheses around locals().

 nova/image/glance.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 9fdf9967234d8553c3548ad03fc3b2691285fa7d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Mar 28 11:56:19 2011 -0700

    Added image name and description mapping to ec2 api

 nova/api/ec2/cloud.py |    2 ++
 1 file changed, 2 insertions(+)

commit bb7ed6cb9cf625b675a666866a7f9fb762ca6bd2
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:47:25 2011 -0400

    use self.flags in virt test

 nova/tests/test_virt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ddbb00fc3c3a2fe74234298a206d2e6a91513a33
Merge: 191a208 ceb8cd1
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Mar 28 18:45:56 2011 +0000

    Fixed DescribeUser in the ec2 admin client to return None instead of an empty UserInfo object.

commit 14718afef1cc79b4d41f490be677caf3e4191e2b
Merge: cff74a7 c3c86f9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 28 13:43:17 2011 -0500

    Merge from trunk and resolving conflicts

commit dea3af64186ff204de7d5ca9852af267e648823e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 20:36:07 2011 +0200

    Remove now useless try/except block.

 nova/api/openstack/extensions.py |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

commit c8e708af1789fda97674fb4c3904d86de8473a7e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:32:03 2011 -0400

    Dont make the test fail

 nova/tests/test_virt.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b6df504c33cfa0fe02e31962578b77d841e1e6d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 14:31:12 2011 -0400

    backup_schedule tests corrected; controller moved to APIRouterV10; making controller fully HTTPNotImplemented

 nova/api/openstack/__init__.py           |   10 +++++-----
 nova/api/openstack/backup_schedules.py   |    6 +++++-
 nova/tests/api/openstack/test_servers.py |   22 ++++++++++++++++------
 3 files changed, 26 insertions(+), 12 deletions(-)

commit 9ce24afab007a9b5144c8c8a8f2fcc4157ba34d7
Author: John Tran <jhtran@att.com>
Date:   Mon Mar 28 11:29:23 2011 -0700

    when image_id provided cannot be found, returns more informative error message.

 nova/api/ec2/cloud.py    |    6 +++++-
 nova/tests/test_cloud.py |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

commit 191a2086d94dfb34c43738ec9b702763354f314a
Merge: ad45419 1e4024b
Author: termie <code@term.ie>
Date:   Mon Mar 28 18:21:17 2011 +0000

    Adds support for snapshotting (to a new image) in the libvirt code.

commit 5a6a3e73b5e771e54a3c9b852f7946cf87582c27
Merge: 63747d3 ad45419
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 14:11:15 2011 -0400

    merge lp:nova

commit e44ce1a95baddd4f6d511d8be253167436395cb2
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:07:33 2011 -0400

    More pep8 corrections

 nova/tests/test_virt.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 14337b0a31c8f04d8044e234eb295b41a9a9c5ce
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 14:02:53 2011 -0400

    adding shared_ip_groups testing; replacing all shared_ip_groups contoller code with HTTPNotImplemented; moving shared_ip_groups controller to APIRouterV10

 nova/api/openstack/__init__.py                    |    8 +++---
 nova/api/openstack/shared_ip_groups.py            |    6 ++---
 nova/tests/api/openstack/test_shared_ip_groups.py |   30 ++++++++++++++++++---
 3 files changed, 34 insertions(+), 10 deletions(-)

commit f29d17dde27e407dc0b03548f0fee88b6dfbe5c5
Merge: de07a64 ad45419
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:50:27 2011 -0400

    Merged trunk.

commit 63747d35929a1df0a29792f41657b4821c5787a3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:50:24 2011 -0400

    pep8 whitespace

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c61085ea9612be24e9975ac3fba456874b89f08
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:49:51 2011 -0400

    Add more unit tests for lxc

 nova/tests/test_virt.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit de07a6409d575af5db748bdbfa2cc57881136d66
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:47:18 2011 -0400

    Decided to not break old format so this should work with the way Glance used to work and the way glace works now..The best of both worlds?

 nova/image/glance.py            |   12 ++++++++++--
 nova/tests/image/test_glance.py |   27 +++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

commit 1e4024b72218a07d1e535878337547cf16406dd8
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:47:11 2011 -0700

    update glance params per review

 nova/virt/libvirt_conn.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit dbf14e9b6cc337233ef95b03fd1c2fdba8ebf8a7
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:47:08 2011 -0700

    add snapshot support for libvirt

 nova/virt/libvirt_conn.py |   71 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 6 deletions(-)

commit 36e1510e4ad4a83bb062cdd82dc91d4ea15d1c5e
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:46:02 2011 -0700

    HACKING update for docstrings

 HACKING |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 5350028b64125eda3082425a7a676b547a6ab934
Merge: a92b6d0 c3c86f9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 18:45:59 2011 +0100

    merge trunk

commit 805cb3609379827d1643785be83f75b69b602d74
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:44:33 2011 -0400

    Fix libvirt merge mistake

 nova/virt/libvirt.xml.template |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit ea9176177e5bddf6b70b200967bee0f3717a5e8a
Merge: 8922630 ad45419
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:41:07 2011 -0400

    Merge trunk

commit 71347f2e9d6195a25cabff782c7058bed006e286
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:40:16 2011 -0400

    lock down requirements for change password

 nova/api/openstack/servers.py            |    2 ++
 nova/tests/api/openstack/test_servers.py |   27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

commit adc283348aa3a948f9fd7a246b99cf05774f6145
Merge: 5ecafa7 c3c86f9
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 18:38:13 2011 +0100

    merge trunk

commit ad45419e78deadbcfaca0a182fc038f9d289d4ec
Merge: c3c86f9 dbd4eeb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:37:47 2011 +0000

    Changed TopicConsumer to TopicAdapterConsumer in bin/nova-ajax-console-proxy to allow it to start up once again.

commit 5977a511ed202fcf396e7c60d713eb5329d6883b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:30:15 2011 -0400

    style changes

 nova/api/openstack/servers.py            |   12 ++++++------
 nova/tests/api/openstack/test_servers.py |    5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

commit e043561a8d5dc0c3183ec7e3a5a44f2aa306d2fd
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:20:46 2011 -0400

    Removed iso8601 dep from pip-requires

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit ba3bf6a57154fd94ae4279a8e53467f65cd4585f
Merge: 56b4dd3 c3c86f9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:19:16 2011 -0400

    Merged trunk.

commit 56b4dd3929448585c15c8d11c5fe1569ce21ea7d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:18:47 2011 -0400

    Removed extra dependency as per suggestion, although it fixes the issue much better IMO, we should be safe sticking with using the format from python's isoformat()

 nova/image/glance.py            |    5 ++---
 nova/tests/image/test_glance.py |   26 +-------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

commit c3c86f994413792cf582df86cf5e16f788005bed
Merge: c60e531 5a80f8b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:15:59 2011 +0000

    Assume that if we don't find a VM for an instance in the DB, and the DB state is NOSTATE, that the db instance is in the process of being spawned, and don't mark it SHUTOFF.
    
    Fix for bug#744056

commit 7eedf3f69ca1bbd1f44252fa01fb4f2676735eb2
Merge: 5789077 ed12a2c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 28 12:13:20 2011 -0500

    merge with trunk

commit 23bed216dbbd512e733ecf6065105b2d20703531
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:04:02 2011 -0400

    Added MUCH more flexiable iso8601 parser dep for added stability.

 nova/image/glance.py                    |    8 ++--
 nova/tests/api/openstack/test_images.py |   69 -------------------------------
 nova/tests/image/test_glance.py         |   50 ++++++++++++++++++++++
 tools/pip-requires                      |    1 +
 4 files changed, 54 insertions(+), 74 deletions(-)

commit 5a80f8b3d5ae3be774b0b3e1dbc89c9830273eaa
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 10:00:33 2011 -0700

    Fix formatting of TODO and NOTE - should be a space after the #

 nova/compute/manager.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 3825bf7d9c78008d04168368f1567d8bc1067ac6
Merge: dd62c6a 8501cd9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 12:58:21 2011 -0400

    merge lp:nova

commit c60e53132899b1661d121c6502b050080deae4ce
Merge: 1c6d6f4 0138c72
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:57:04 2011 +0000

    Mixins for tests confuse pylint no end, and aren't necessary... you can stop the base-class from being run as a test by prefixing the class name with an underscore

commit 1c6d6f44219386b6e371edb7a13b16e76a8fb1c5
Merge: 8501cd9 b2f7f3e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:46:16 2011 +0000

    Merged the two periodic_tasks functions, that snuck in due to parallel merges in compute.manager

commit 062301faf57d1e07b5068ae90c91c8c7da460e1f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 09:28:18 2011 -0700

    Start up nova-api service on an unused port if 0 is specified.  Fixes bug 744150

 nova/service.py                             |    6 ++++++
 nova/tests/integrated/integrated_helpers.py |    3 ++-
 nova/tests/integrated/test_login.py         |    1 +
 nova/wsgi.py                                |    2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

commit 4aad5721bff628ef8b34e0c536e0e2415f2b63f4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 11:16:59 2011 -0400

    Removed 'is not None' to do more general truth-checking. Added rather verbose testing.

 nova/image/glance.py                    |    2 +-
 nova/tests/api/openstack/test_images.py |   69 +++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

commit 0138c728549a9e565f695e33e1090b52541cd59d
Merge: aecd4eb 8501cd9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 08:05:28 2011 -0700

    Merged with trunk

commit 5ecafa72a62742089ce0bfe8ffe70bcf3b21f7f7
Merge: 184fa82 8501cd9
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 16:02:54 2011 +0100

    merge trunk

commit a92b6d01c1b0ff5a3b6a79fd974ca993421c9574
Merge: 381354b 8501cd9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 15:58:06 2011 +0100

    merge trunk, fixed conflicts

commit dbd4eebd7905ae950187dbafeba450f9706e609a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 10:31:51 2011 -0400

    TopicConsumer -> TopicAdapterConsumer

 bin/nova-ajax-console-proxy |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8922630e70e97b52e363a861c76fe4a01b8418ff
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 09:37:05 2011 -0400

    Fix typo in libvirt xml template

 nova/virt/libvirt.xml.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9786a19ec0bc5176cc01b56d473a977b85800977
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 15:34:20 2011 +0200

    Spell "warn" correctly.

 nova/api/openstack/extensions.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit add207150a68b312614604281ca079164304110d
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Mar 28 07:33:57 2011 -0600

    Updated Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 3b284176505d255d08f07858d9dc881ddf95ece8
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Mar 28 07:31:37 2011 -0600

    Removed extraneous white space

 nova/network/linux_net.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit d25968ab494f65ed90981e440169e31a7488befe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 15:21:53 2011 +0200

    Add friendlier message if an extension fails to include a correctly named class or factory.

 nova/api/openstack/extensions.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 381354babab58688458b2a6cdc463eb0a0fee461
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 13:11:45 2011 +0100

    addressed reviewers' concerns

 nova/tests/test_xenapi.py                          |   35 +++++++++++---------
 nova/tests/xenapi/stubs.py                         |    6 ++--
 nova/virt/xenapi/vm_utils.py                       |   18 ++++++----
 nova/virt/xenapi_conn.py                           |    7 ++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    1 +
 5 files changed, 38 insertions(+), 29 deletions(-)

commit 184fa8239d54d20ff294cdb019d07989ed3d6c4d
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 12:08:43 2011 +0100

    addressed termies review (third round)

 nova/tests/db/fakes.py    |   63 +++++++++++++++++++++------------------------
 nova/tests/test_xenapi.py |   26 +++++++++----------
 nova/virt/xenapi/fake.py  |    2 +-
 nova/virt/xenapi/vmops.py |    3 ++-
 4 files changed, 46 insertions(+), 48 deletions(-)

commit df946c08acba6fe1234b13f04d3c46c3973647c2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 11:52:28 2011 +0100

    addressed termie's review (second round)

 nova/network/xenapi_net.py |   14 ++--
 nova/tests/test_xenapi.py  |    2 +-
 nova/virt/xenapi/fake.py   |  156 +++++++++++++++++++++-----------------------
 nova/virt/xenapi/vmops.py  |    2 +-
 4 files changed, 82 insertions(+), 92 deletions(-)

commit 7cdc3add34b109e3f956f785b60a5aa5cf273e53
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 12:24:41 2011 +0200

    Do not load extensions that start with a "_"

 nova/api/openstack/extensions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8957914ad9dd7691b2a43d977d845e00f7dd48c4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 10:54:29 2011 +0100

    addressed termies review (first round)

 nova/network/xenapi_net.py        |   26 +++----
 nova/tests/db/fakes.py            |    8 +-
 nova/tests/fake_utils.py          |   11 +--
 nova/tests/fake_utils.py.moved    |  106 --------------------------
 nova/tests/test_xenapi.py         |   37 +++++----
 nova/virt/xenapi/network_utils.py |    2 +-
 nova/virt/xenapi/vmops.py         |  149 +++++++++++++++++++++----------------
 7 files changed, 125 insertions(+), 214 deletions(-)

commit 408de4bd5fe436e1829f4b916f0f20042e48eacc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 01:08:50 2011 -0700

    Clarified note about scope of the _poll_instance_states function

 nova/compute/manager.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7ed45fe61416213a4fbfba7e45a765e43b933e16
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 01:05:20 2011 -0700

    Fixed some format strings

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b648f3499626874327d8f1b087a578afe903d010
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:44:13 2011 -0700

    pep8 fixes

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c8969dbdd429c0b4c4f1211bd90311cabec8dd0d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:41:55 2011 -0700

    Assume that if we don't find a VM for an instance in the DB, and the DB state is NOSTATE, that the db instance is in the process of being spawned.
    
    Fix for bug744056

 nova/compute/manager.py |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

commit b2f7f3e05d18168b3310184aa9a3a6f11c57c154
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:32:48 2011 -0700

    pep8 fixes

 nova/compute/manager.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 684865d0b95a14f23e9187a6c3a404b5e8ed61ef
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:31:28 2011 -0700

    Added poll_rescued_instances to virt driver base class

 nova/virt/driver.py |    4 ++++
 1 file changed, 4 insertions(+)

commit b6824009d9767f951373fb1b92c7cb2de83b0d97
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:30:13 2011 -0700

    There were two periodic_tasks functions, due to parallel merges in compute.manager.

 nova/compute/manager.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 76ecbcb7cbb5a47069c3cadc61772c47fd97843f
Merge: 91458f2 8501cd9
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Mon Mar 28 14:11:14 2011 +0900

    Merge trunk.

commit a1accc23427347205f7f6c49402a4f366e5256b6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 27 19:38:20 2011 -0700

    pep8 fixes

 nova/tests/integrated/api/client.py         |    2 +-
 nova/tests/integrated/integrated_helpers.py |   85 ++++++++-------------------
 2 files changed, 26 insertions(+), 61 deletions(-)

commit b3f8e9fb546c621946563af0908e43cb01c50431
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 27 18:48:32 2011 -0700

    Bunch of style fixes

 nova/api/openstack/common.py                       |    1 +
 nova/api/openstack/extensions.py                   |    2 +-
 .../incubator/volumes/volume_attachments.py        |   21 ++++++++++----------
 nova/api/openstack/incubator/volumes/volumes.py    |   13 ++++++------
 nova/compute/manager.py                            |    2 +-
 nova/image/fake.py                                 |    1 +
 nova/tests/integrated/api/client.py                |    4 +++-
 nova/tests/integrated/integrated_helpers.py        |   12 +++++------
 nova/tests/integrated/test_extensions.py           |    1 +
 nova/tests/integrated/test_servers.py              |   15 +++++++-------
 nova/tests/integrated/test_volumes.py              |    7 ++++---
 nova/virt/driver.py                                |   13 ++++++------
 12 files changed, 49 insertions(+), 43 deletions(-)

commit cb8a13e3751cc12f7157094d094c7a26d6f583f0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 27 15:30:47 2011 -0400

    Fix utils checking

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ddc34085d32851a6c0d3d84f589865dc99fb5745
Merge: 12581e7 8501cd9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 27 15:30:22 2011 -0400

    Merge trunk

commit 8501cd94e3929918fdbfe0ca489304449f2f7fe3
Merge: 9cfaabe c4167bd
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sun Mar 27 17:15:47 2011 +0000

    use_ipv6 now passing to interfaces.template as first level variable in libvirt_conn

commit a78c1bd3e862700dbab68cc5011197270abd4b38
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 21:46:14 2011 -0400

    Replaced import of an object with module import as per suggestion.

 nova/tests/api/openstack/test_images.py |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 9cfaabec414e0a4e8b198d074f3012eff79be5ce
Merge: ed12a2c 5120ad4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Mar 26 01:21:01 2011 +0000

    Updates to the newest version of nova.sh, which includes:
     * Installing new python dependencies
     * Allows for use of interfaces other than eth0
     * Adds a run_detached mode for automated testing

commit 5936449d99b852897fddbbb140465db0ad9a330c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 25 17:48:59 2011 -0700

    Now that it's an extension, it has to be v1.1.  Also fixed up all the things that changed in v1.1

 nova/api/openstack/__init__.py              |    2 --
 nova/api/openstack/common.py                |    5 ++++
 nova/tests/integrated/integrated_helpers.py |   21 +++++++++----
 nova/tests/integrated/test_extensions.py    |   43 +++++++++++++++++++++++++++
 nova/tests/integrated/test_servers.py       |   16 +++++-----
 nova/tests/integrated/test_volumes.py       |    6 ++++
 6 files changed, 78 insertions(+), 15 deletions(-)

commit 82d6fb2144a5411e96dc71a482d33be4990f7cab
Merge: 129e020 9a1a2c1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 23:43:21 2011 +0000

    merge trunk
    addressing Trey's comments

commit cd1bac4deff367131d43f87cdfbc3b6b34bbdc1e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 25 16:39:43 2011 -0700

    Initial extensification of volumes

 nova/api/openstack/__init__.py                     |   10 --
 nova/api/openstack/extensions.py                   |  151 +++++++++++++---
 nova/api/openstack/incubator/__init__.py           |   20 +++
 nova/api/openstack/incubator/volumes/__init__.py   |   18 ++
 .../incubator/volumes/volume_attachments.py        |  181 ++++++++++++++++++++
 nova/api/openstack/incubator/volumes/volumes.py    |  160 +++++++++++++++++
 .../api/openstack/incubator/volumes/volumes_ext.py |   55 ++++++
 nova/api/openstack/volume_attachments.py           |  181 --------------------
 nova/api/openstack/volumes.py                      |  160 -----------------
 nova/tests/api/openstack/extensions/foxinsocks.py  |   98 -----------
 .../openstack/extensions/foxinsocks/__init__.py    |   19 ++
 .../openstack/extensions/foxinsocks/foxinsocks.py  |   98 +++++++++++
 12 files changed, 682 insertions(+), 469 deletions(-)

commit 2d07440385f18e08cbf833f11a7d356ba430fabc
Merge: d98b212 ed12a2c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 25 14:59:01 2011 -0700

    Merged with trunk, resolved conflicts & code-flicts

commit 51c07f77686473bc73c700aacc7baeecf278a948
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 16:57:21 2011 -0400

    Removed print.

 nova/tests/api/openstack/test_images.py |    1 -
 1 file changed, 1 deletion(-)

commit c400024de45073ccc23a6738c78518365a511562
Author: John Tran <jhtran@att.com>
Date:   Fri Mar 25 13:17:51 2011 -0700

    added a simple test for describe_images with mock for detail funciton

 Authors                  |    1 +
 nova/tests/test_cloud.py |   10 ++++++++++
 2 files changed, 11 insertions(+)

commit 12581e79bd914fdb2adb2f5a8e1e4db21bdbcd2d
Merge: c8fb0c5 ed12a2c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 16:06:38 2011 -0400

    merged trunk

commit f841cff4ad993230b3a7ab4c1786bb788f6bd891
Merge: 4c510d5 ed12a2c
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 25 19:46:52 2011 +0000

    merge trunk

commit dd62c6acaea77004a11e8c5b751976f9f4037670
Merge: 48c04eb 2233c1a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 25 14:53:30 2011 -0400

    merge lp:nova

commit ed12a2cd2beef77d1c7e9d16771e766aa068530d
Merge: 2233c1a 8087514
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 18:36:54 2011 +0000

    Adding links container to openstack api v1.1 servers entities.

commit 3e581285132d124265fa9f549d8c942cc11ee402
Merge: ba7d498 2233c1a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 14:09:55 2011 -0400

    Merged trunk.

commit af8aa36ca07c5e51016df68c0acc7449378fac2f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 25 18:23:36 2011 +0100

    Add license and copyright to nova/tests/api/openstack/extensions/__init__.py

 nova/tests/api/openstack/extensions/__init__.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 2e106e3c88bc518cbb43faa8f398b7481ee3d255
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Mar 25 10:56:36 2011 -0600

    Fixed a typo on line 677 where there was no space between % and FLAGS

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5120ad458f011ec32d7e49af64319254d120b306
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 25 09:40:59 2011 -0700

    fix typos

 contrib/nova.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e6192a67bdc81a74945f230e833006836e94c81b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 25 09:23:10 2011 -0700

    updated nova.sh

 contrib/nova.sh |   35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

commit 52f2479aac7b2fc84c23dba9f337cbfcde6e06e2
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Mar 25 10:17:51 2011 -0600

    Added a flag to allow a user to specify a dnsmasq_config_file is they would like to fine tune the dnsmasq settings

 nova/network/linux_net.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 2233c1aea7c5780a0de86d0360630e713ff36deb
Merge: 26f9152 b674534
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 25 16:12:09 2011 +0000

    disk_format is now an ImageService property. Adds tests to prevent regression.

commit ba7d498d22c069d67eb1913b579cba108876150d
Merge: a662a02 26f9152
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:43:44 2011 -0400

    Merged trunk.

commit a662a0286ac13ac6925d6a206e0cee415527379e
Merge: da5076d dab4c0f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:12:28 2011 -0400

    Merged trunk.

commit 8087514003c9fe1c290aa83bf138d0cce7bc3959
Merge: 52da63c 26f9152
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 11:11:03 2011 -0400

    merging trunk

commit 4c510d588d4a67a549f5a544f7fa64f97c0022c7
Merge: 4183eab 162af7b
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 25 15:10:56 2011 +0000

    merge trunk

commit da5076d9d865232f0f607d036f0ec7e838238771
Merge: 3d06c63 e26e360
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:10:54 2011 -0400

    Merged trunk and fixed broken/conflicted tests.

commit 26f9152d1393950323f0e641cad5a2f8e4458756
Merge: dab4c0f b28f991
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 15:10:21 2011 +0000

    - add a "links" container to versions entities for Openstack API v1.1
    - add testing for the openstack api versions resource and create a view builder

commit 52da63c50cf248abb0753c675d5b96c0cbe0e842
Merge: 596e0b3 dab4c0f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 11:01:51 2011 -0400

    merging trunk

commit dab4c0fbf057063602cb7069adfa0565a711d936
Merge: 48c9b4e 9a1a2c1
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Mar 25 15:00:45 2011 +0000

    This is basic network injection for XenServer, and includes:
    
    o  Modification of the /etc/network/interfaces file within the image using code taken from and now shared with libvirt_conn.  This is for compatibility with legacy Linux images without a guest agent.
    
    o  Setting of xenstore keys before instance boot, intended for the XenServer Windows agent.  The agent will use these to configure the network at boot-time.
    
    This change does not implement live reconfiguration, which is on another blueprint:
    
    https://blueprints.launchpad.net/nova/+spec/xs-inject-networking
    
    It does include template code to detect the presence of agents and avoid modifying the filesystem if they are injection-capable.

commit 596e0b37f1e72330a99bcfbf0805bc70e8b49991
Merge: 6c29d4a 48c9b4e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:56:53 2011 -0400

    merging trunk

commit 48c9b4e14ad1b03e9cf3db068123c04ce1db01ce
Merge: 162af7b 51e8841
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 14:56:33 2011 +0000

    Implement image metadata controller for the v1.1 OS API.
    
    Uses image 'properties' to store and retrieve image metadata.

commit 6c29d4a09574fd230a5fe3b0bbfa615fe18b328c
Merge: 3b8f1f5 162af7b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:55:07 2011 -0400

    merging trunk

commit c4167bd6174838d1df3c77094a22b19e592e88c1
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Mar 25 17:46:28 2011 +0300

    Changed use_ipv6 passing to interfaces.template

 nova/virt/libvirt_conn.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit b28f991d4636529c46076bf14db4a98f2cde56df
Merge: 0236c12 162af7b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:36:37 2011 -0400

    merging trunk, resolving conflicts

commit 162af7b79631b151f03bb46773a1448e6c051325
Merge: 0215ca7 fbb8291
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 14:21:03 2011 +0000

    Add a "links" container to flavors entities for Openstack API v1.1.

commit ec524aae3224a806fa41f6ae6c2975a1ba124f15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 25 15:18:57 2011 +0100

    Toss an __init__ in the test extensions dir. This gets it included in the tarball.

 0 files changed

commit 51e8841b7cd818e5a3e0fa6bf023561b0160717d
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 10:07:42 2011 -0400

    Use metadata = image.get('properties', {}).

 nova/api/openstack/image_metadata.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 129e020b3a0712404de28386b19a652d7db8fae8
Merge: ed31352 0215ca7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 13:41:11 2011 +0000

    merge trunk

commit c8fb0c5a16852afc98349edf89bb31afac166749
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 09:39:20 2011 -0400

    Revert dom check

 nova/virt/libvirt_conn.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9a1a2c174984ef873c80bf7aea307b393552f3a9
Merge: 73df3e0 0215ca7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 13:38:57 2011 +0000

    merge trunk

commit f533c441c0062d05c7c361208016e56ca8f5e9df
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 09:28:36 2011 -0400

    Fix unit tests w/ latest trunk merge.

 nova/tests/api/openstack/test_image_metadata.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0236c12d37dc100ee6a5f1a40d6a6d33e86695a8
Merge: f5b2167 0215ca7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 09:11:13 2011 -0400

    merging trunk and resolving conflicts

commit d9acbc2b1588f59e2c8e62b4ee0a78ec87acd5d2
Merge: def058a 0215ca7
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 09:00:47 2011 -0400

    Merge in server metadata from trunk.

commit def058a7acc143ee774389f014676fed749c66f6
Merge: a312deb e26e360
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 08:57:42 2011 -0400

    Merge w/ trunk.

commit 6ce4f9c6ae00138184e79cdcfb6f78fc3474580e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:52:54 2011 -0400

    Fix up destroy container

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d8b55294702b531a570b279fb29db8d4ea104d3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:52:18 2011 -0400

    Fix up templating

 nova/virt/libvirt.xml.template |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 0215ca743bb96caf4ccb3c8c4fbb1b680d747d57
Merge: e26e360 064954a
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 25 12:51:35 2011 +0000

    Implement metadata resource for Openstack API v1.1. Includes:
          -GET /servers/id/meta
          -POST /servers/id/meta
          -GET /servers/id/meta/key
          -PUT /servers/id/meta/key
          -DELETE /servers/id/meta/key

commit 47b54662c17c7af0bca9cf96dc5d4a498706fe8b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:37:47 2011 -0400

    Dont always assume qemu

 nova/virt/libvirt_conn.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9632db75d229eac16970af1dfabbb047c2b71a4e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:20:56 2011 -0400

    Removed partition from setup_container

 nova/virt/disk.py         |    4 ++--
 nova/virt/libvirt_conn.py |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

commit e4d796734c9195deb3ee3a15feb1a59f13a8f7f2
Merge: da159d1 e26e360
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:17:57 2011 -0400

    Merge trunk

commit b6745341ec06cb0a0de7963f6b4606f4ad6f8c89
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 23:49:14 2011 -0500

    pep8 fix

 nova/tests/api/openstack/test_servers.py |    2 --
 1 file changed, 2 deletions(-)

commit ccf4727ca16d7a67c6a35950ab378ab4615dbdad
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 25 04:41:47 2011 +0000

    disk_format is now an ImageService property

 nova/api/openstack/servers.py            |   34 +++++++++++-------
 nova/tests/api/openstack/test_servers.py |   57 ++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 13 deletions(-)

commit 91458f29f8b04407471d9d94a5ad165817f72a43
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Mar 25 11:47:17 2011 +0900

    Restore volume state on migration failure.

 nova/compute/manager.py   |   19 +++++++++++++++++--
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

commit 12f651fe42af16be67cf67d2d6217e183958114e
Merge: 3b4150c d83ec9a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 19:43:09 2011 -0700

    Merge remote branch 'nova/vnc_console' into vnc_console
    
    Conflicts:
    	nova/virt/libvirt_conn.py

commit 3b4150caa10786e8312abc11666214a9c3243389
Merge: e722803 e26e360
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 19:17:17 2011 -0700

    merge trunk, add unit test

commit ed3135232829794cfbb5a47765f5d078ba9216cf
Merge: 6fcaacd e26e360
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 02:04:13 2011 +0000

    merge trunk

commit 6e0fe0d799ec5b5c2279750b8fba1bb1527ede3c
Merge: 9701f6a e26e360
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:52:18 2011 +0000

    merge trunk
    addressing reviewer's comments

commit e722803067e6386e98f29aa867d4cf98ce6e0cc2
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 18:38:28 2011 -0700

    clarify comment

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b30d5aa17c86bf1487945d8f2b2878644f79999e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 18:37:23 2011 -0700

    add documentation

 doc/source/runnova/vncconsole.rst |   76 +++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

commit 9701f6a7817fbe945dc19134960401ffcd37292f
Merge: 8728108 c53e565
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:34:14 2011 +0000

    Empty commit?

commit 73df3e0cd54dc3b5409fba7b38ada6ee07bd911d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:23:33 2011 +0000

    minor pep8 fix in db/fakes.py

 nova/tests/db/fakes.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit e26e360106c2aeb468be90de609caaf03e1dab43
Merge: fcae955 40f5bcd
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Mar 25 01:05:56 2011 +0000

    Support for markers for pagination as defined in the 1.1 spec.

commit 06c0eff8ec7eef33933da9bd8adbf7b70a977889
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 17:44:27 2011 -0700

    add hook for osapi

 nova/api/ec2/cloud.py         |    1 +
 nova/api/openstack/servers.py |   10 ++++++++++
 nova/vnc/auth.py              |    4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

commit b4f682a03678699404d2bac259c955bbc434f36a
Merge: 7eb5825 fcae955
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 00:25:06 2011 +0000

    merge trunk

commit fcae955c1521910ade1175a99c7def85e4df36b2
Merge: 3d17bd5 e3dfae1
Author: termie <code@term.ie>
Date:   Fri Mar 25 00:17:09 2011 +0000

    Ports the Tornado version of an S3 server to eventlet and wsgi, first step in deprecating the twistd-based objectstore.
    
    This is a trivial implementation, never meant for production, it exists to provide an s3-look-alike objectstore for use when developing/testing things related to the amazon APIs (eucatools, etc), any production deployment would be expected to use Swift + an S3 interface.
    
    In later patches I expect to be able to remove the old objectstore code entirely.

commit 7eb58256a8819be0dd3b93efab03b8190e6afb01
Merge: 08d4002 cc0108d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 00:16:53 2011 +0000

    Merged with trunk
    Updated net injection for xenapi reflecting recent changes for libvirt

commit 40f5bcda259557de9f077a3aa55f9a80072eb9bb
Merge: 5a9b134 3d17bd5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 20:06:23 2011 -0400

    Merge from trunk

commit 3d17bd5e44d0bb020e3ff819f401a8498e022418
Merge: 54a3b3d 678fd69
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Mar 25 00:05:54 2011 +0000

    Fix lp741415 by splitting arguments of _execute in the iSCSI driver.

commit f2f08a5b0309876bb312c9124e75bd89331c4816
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 17:04:55 2011 -0700

    make everything work with trunk again

 nova/api/ec2/cloud.py     |    2 +-
 nova/virt/libvirt_conn.py |    2 +-
 nova/vnc/auth.py          |   20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

commit 54a3b3d75640d1759a53cae24c8d2d38ad3f9148
Merge: 4e179b4 5a9b134
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 23:46:05 2011 +0000

    Support for markers for pagination as defined in the 1.1 spec.

commit e3dfae1bba0e4f9ff5d64ff5fadb43485e494453
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:31 2011 -0700

    add descriptive docstring

 nova/objectstore/s3server.py |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

commit 9da833ff9298a00ba33ca67885a7a663a3b9e35f
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:31 2011 -0700

    don't require integrated tests to recycle connections

 nova/tests/integrated/integrated_helpers.py |   42 ---------------------------
 nova/tests/integrated/test_login.py         |    6 ++--
 2 files changed, 3 insertions(+), 45 deletions(-)

commit bab306061618e911971c4f7275824df60d1b42fd
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:30 2011 -0700

    remove twisted objectstore

 nova/objectstore/bucket.py     |  180 ---------------
 nova/objectstore/handler.py    |  478 ----------------------------------------
 nova/objectstore/image.py      |  296 -------------------------
 nova/objectstore/stored.py     |   63 ------
 nova/tests/test_cloud.py       |   49 +---
 nova/tests/test_objectstore.py |    2 -
 6 files changed, 3 insertions(+), 1065 deletions(-)

commit 2b243dbb2e12a7f510a7c6c01298884fa8927c12
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:30 2011 -0700

    port the objectstore tests to the new tests

 nova/objectstore/bucket.py     |    3 +-
 nova/objectstore/s3server.py   |   35 +++---
 nova/test.py                   |    1 -
 nova/tests/test_objectstore.py |  247 +++++++---------------------------------
 4 files changed, 64 insertions(+), 222 deletions(-)

commit 0deaa854d1854c0edaf2b8ba903ee79638c7b2d0
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:28 2011 -0700

    update test base class to monkey patch wsgi

 nova/test.py |   37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

commit acad7a627b92ffffb6bc76d9d72640e1d43f7e26
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:35 2011 -0700

    rename objectstore tests

 nova/tests/objectstore_unittest.py |  315 ------------------------------------
 nova/tests/test_objectstore.py     |  315 ++++++++++++++++++++++++++++++++++++
 2 files changed, 315 insertions(+), 315 deletions(-)

commit d7835f81c46d880d5ba8e67cdcdc9d0bc977f86e
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:35 2011 -0700

    port s3server to eventlet/wsgi

 bin/nova-objectstore         |   15 +++---
 nova/objectstore/s3server.py |  105 +++++++++++++++++++++++++++++-------------
 2 files changed, 81 insertions(+), 39 deletions(-)

commit 47592e504cca5c4b36868412720ca1ff443de4d8
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:34 2011 -0700

    add s3server, pre-modifications

 nova/objectstore/s3server.py |  255 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 255 insertions(+)

commit 5a9b13465822bb214f9e9cc9afff929664cbd1c7
Merge: 74c226c 4e179b4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 19:34:52 2011 -0400

    Merge from trunk

commit 1ca149a00788253a025b02602c5f0d317d6652a9
Merge: b01742d 4e179b4
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 16:03:25 2011 -0700

    merge trunk

commit 3d06c636537374557ee6ff77b7c0bc7718eafcdb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 18:59:11 2011 -0400

    Added detail keywork and i18n as per suggestions.

 nova/api/openstack/images.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit b01742ddb5bfec7e89ccc4cee17800614a0fce3c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 15:55:29 2011 -0700

    incorporate feedback from termie

 bin/nova-vnc-proxy             |    5 +-
 nova/compute/api.py            |   15 ++--
 nova/compute/manager.py        |    2 +-
 nova/flags.py                  |    4 +-
 nova/virt/libvirt.xml.template |    4 +-
 nova/virt/libvirt_conn.py      |    3 +-
 nova/vnc/auth.py               |   22 +++---
 nova/vnc/proxy.py              |   15 ++--
 tools/euca-get-vnc-console     |  163 ----------------------------------------
 9 files changed, 36 insertions(+), 197 deletions(-)

commit 064954a297a5f7c199d3949d6951f6b414b4504a
Merge: f51e2f3 4e179b4
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 18:47:36 2011 -0400

    Merge w/ trunk resolving conflicts.

commit 4e179b4fa9ab35dc50486e7f42e1dc6d06b74c81
Merge: cc0108d b7150a4
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Mar 24 22:43:46 2011 +0000

    Implementation of blueprint hypervisor-vmware-vsphere-support.  (Link to blueprint: https://blueprints.launchpad.net/nova/+spec/hypervisor-vmware-vsphere-support)
    
    Adds support for hypervisor vmware ESX/ESXi server in OpenStack (Nova).
    
    Key features included are,
    1) Support for FLAT and VLAN networking model
    2) Support for Guest console access through VMware vmrc
    3) Integrated with Glance service for image storage and retrival
    
    
    Documentation: A readme file at "doc/source/vmwareapi_readme.rst" encapsulates configuration/installation instructions required to use this module/feature.

commit 71bd388a6c04df68e4392dbb7354cc8b14f596fe
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 15:41:02 2011 -0700

    fix typo

 nova/virt/libvirt.xml.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 08d40029973d9ca97477393531296502a407debe
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 22:39:39 2011 +0000

    Addressing Trey's comments.
    Removed disk_get_injectables, using _get_network_info's return value.

 nova/virt/disk.py            |   37 -------------------------------
 nova/virt/libvirt_conn.py    |   31 +++++++++++++++++++++++++-
 nova/virt/xenapi/vm_utils.py |   49 +++++++++++++++++++++++++++++++++++++++---
 nova/virt/xenapi/vmops.py    |   10 +++++----
 nova/virt/xenapi_conn.py     |    2 +-
 5 files changed, 83 insertions(+), 46 deletions(-)

commit cc0108d8e2328a9511333d9322e5631416672f03
Merge: 8c76aa7 77c62a6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 22:35:31 2011 +0000

    Adds serverId to OpenStack API image detail per related_image blueprint

commit 74c226c564d5357b8b09edc67cc0bdfec6b8d871
Merge: a6174e6 f186c8e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 18:32:00 2011 -0400

    Merge from trunk

commit 8c76aa7cd509c32367d2a9b8223d1d332098755a
Merge: f186c8e 72c5735
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 22:31:39 2011 +0000

    Fix for bug #740947
    Executing parted with sudo in _write_partition (vm_utils.py)

commit f186c8ecc21cbcddf6e1e94053d6e250717852cb
Merge: f8d1d6d e5069f2
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 22:26:47 2011 +0000

    Implement API extensions for the Openstack API. Based on the Openstack 1.1 API the following types of extensions are supported:
    
    -Top level resources (extension)
    -Action extensions (add an extra action to a core nova controller)
    -Response extensions (inject data into response from core nova controllers)
    
    To add an extension simply drop an extension file into the configured osapi_extensions_path (which defaults to /var/lib/nova/extensions).
    
    See nova/tests/api/openstack/extensions/foxinsocks.py for an example Extension.

commit 77c62a6730b3e36a828d733236efcfa697103b6b
Merge: 4793991 f8d1d6d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 21:50:27 2011 +0000

    Merging trunk

commit f8d1d6da8daac5169948d504560ee8c1b4c0df3c
Merge: aeb0f59 3426a92
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 21:29:32 2011 +0000

    Adds unit test coverage for XenAPI Rescue & Unrescue.

commit aeb0f59b71ad6f3a8eb5d649e23a22838937242f
Merge: 823df3b c3b9844
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 21:26:11 2011 +0000

    libvirt driver multi_nic support. In this phase libvirt can work with and without multi_nic support, as in multi_nic support for xenapi: https://code.launchpad.net/~tr3buchet/nova/xs_multi_nic/+merge/53458

commit 4793991cdfa171839ddbc40e513b9625a1c89bbe
Merge: 07af0c9 ab99744
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 21:13:55 2011 +0000

    Merging trunk

commit 3426a9296c6f7d249a9c57ba9e614045ffe2f3c7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 16:11:48 2011 -0500

    Review feedback

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4dd38d7f729e09d0b3718c21ae716d11b8a5faee
Merge: a07854e 823df3b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 15:56:53 2011 -0500

    Merged trunk

commit 823df3b0ee7e7eb35e5864bfa235e686819df13e
Merge: a0ea76b c5cbec2
Author: termie <code@term.ie>
Date:   Thu Mar 24 20:45:59 2011 +0000

    Additions to the Direct API:
    
     * Add an example of a versioned api
     * Add some more docs to direct.py
     * Add Limited, an API limiting/versioning wrapper
     * Improve the formatting of the stack tool
     * Add support for volume and network services to the direct api

commit a07854e38eda33fda9bc3523d8dd85caae594ea0
Merge: b5b2423 a0ea76b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 15:38:26 2011 -0500

    Merged trunk

commit a6174e64b541560989c305b50787c96fb5890679
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 16:31:04 2011 -0400

    Added test_get_servers_with_bad_limit, test_get_servers_with_bad_offset and
    test_get_servers_with_bad_marker.

 nova/tests/api/openstack/test_servers.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit c5cbec20d2785d3060d57b55a264fbf936709500
Author: termie <code@term.ie>
Date:   Thu Mar 24 13:20:15 2011 -0700

    pep8 cleanups

 bin/nova-direct-api       |    1 -
 nova/api/direct.py        |    3 ++-
 nova/api/ec2/cloud.py     |    4 +++-
 nova/tests/test_direct.py |    1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

commit c50e6c3879109d2e2e0c2f6b9c42195e9559993d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 16:18:50 2011 -0400

    Added test_get_servers_with_limit_and_marker to test pagination with marker
    and limit request params.

 nova/tests/api/openstack/test_servers.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit c3b98443263de944aa54ae4948330b6cfb9a02a6
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 23:00:16 2011 +0300

    style and spacing  fixed

 nova/utils.py             |    2 +-
 nova/virt/libvirt_conn.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 4a6db815b01c71076bae96c155396e5adbe8af90
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    better error handling and serialization

 nova/api/direct.py        |    9 ++++++---
 nova/tests/test_direct.py |   12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

commit a1bde64e91a8b76fd0e69c3bdfc51e4e85adf6f0
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    add some more docs and make it more obvious which parts are examples

 bin/nova-direct-api |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit a7863c026819a9369cecaa42778a10ab54e798ba
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    add an example of a versioned api

 bin/nova-direct-api |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 5c03ade2ee82350d845c8306d5aab9eda3073137
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    add some more docs to direct.py

 nova/api/direct.py |    4 ++++
 1 file changed, 4 insertions(+)

commit ef5c9e11595a00de468783adbb60cfbc2cbbf13d
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    add Limited, an API limiting/versioning wrapper

 bin/nova-direct-api |    7 +++++++
 nova/api/direct.py  |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

commit ac44b8a9c5ed6a761793e1fa997768bd00a6c2da
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    improve the formatting of the stack tool

 bin/stack |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit c7ccbd7a16a546cbd0717427772691ce7d8b4da6
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    support volume and network in the direct api

 bin/nova-direct-api       |    9 +++++++--
 nova/api/ec2/cloud.py     |   20 +++++++++++---------
 nova/compute/api.py       |    9 +++++----
 nova/tests/test_direct.py |   14 ++++++++++++--
 nova/volume/api.py        |    3 ++-
 5 files changed, 37 insertions(+), 18 deletions(-)

commit a312deba033b0e9d9ceea0eae675572ab556010d
Merge: a69f6ef a0ea76b
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 15:36:22 2011 -0400

    Merge w/ trunk.

commit f51e2f3091f19823a5ad5ec7039cc1d18ce041e6
Merge: 6254069 a0ea76b
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 15:35:41 2011 -0400

    Merge w/ trunk.

commit d98b212ebb49990fbe053be5f45014d3466589ce
Merge: 10ddb27 0d42b30
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 12:26:40 2011 -0700

    Merged with trunk, fix problem with behaviour of (fake) virt driver when instance doesn't reach scheduling.
    
    There's an odd issue I can't track down where if I start the networking service then later tests fail.  If I don't start the networking service, a created instance never reaches the compute service, which isn't actualy a problem, except then destroy fails.
    
    I documented the expected behaviour (per libvirt) for when the instance isn't found and destroy is called - I believe this to be the correct behaviour anyway.  I also fixed up fake.

commit a0ea76b26a7725efb2fc4a811dff66b4f8bff6b7
Merge: 0d42b30 18eee85
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 19:22:05 2011 +0000

    In this branch we are forwarding incoming requests to child zones when the requested resource is not found in the current zone.
    
    For example: If 'nova pause 123' is issued against Zone 1, but instance 123 does not live in Zone 1, the call will be forwarded to all child zones hoping someone can deal with it.
    
    NOTE: This currently only works with OpenStack API requests and routing checks are only being done against Compute/instance_id checks.
    Specifically:
    * servers.get/pause/unpause/diagnostics/suspend/resume/rescue/unrescue/delete
    * servers.create is pending for distributed scheduler
    * servers.get_all will get added early in Diablo.
    
    What I've been doing for testing:
    1. Set up a Nova deployment in a VM (Zone0)
    2. Clone the VM and set --zone_name=zone1 (and change all the IP addresses to the new address in nova.conf, glance.conf and novarc)
    3. Set --enable_zone_routing=true on all zones
    4. use the --connection_type=fake driver for compute to keep things easy
    5. Add Zone1 as a child of Zone0 (nova zone-add)
    
    (make sure the instance id's are different in each zone)
    
    Example of calls being sent to child zones:
    http://paste.openstack.org/show/964/

commit 18eee851d86451737102bacca777c93d3eb66bb3
Merge: 1a7f2e4 0d42b30
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 12:04:24 2011 -0700

    trunk merge

commit 0d42b309ac723d18e6795210bc8d8ca6d295de23
Merge: f743e53 3c0fcc4
Author: termie <code@term.ie>
Date:   Thu Mar 24 18:51:38 2011 +0000

    Fixes a bug that was causing tests to fail on OS X by ensuring that greenthread sleep is called during retry loops.

commit b5b2423df78b1c4f7ad81db25e96cf68726653b5
Merge: e976f5b f743e53
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 13:36:43 2011 -0500

    Merged trunk

commit f743e5374d58ab2c45702932da7b702ebb060817
Merge: ecd5aab 038a629
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 18:25:53 2011 +0000

    Fix some errors that pylint found in nova/api/openstack/servers.py
    
    This was meant more as a test that pylint is actually being helpful now (it is), but these are real errors.

commit ecd5aab3709ff1d2a38131f74b1a1b3dac2dd343
Merge: 0797161 ceccffa
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 24 18:17:40 2011 +0000

    Fix api logging to show proper path and controller:action.

commit e976f5b3e6b02b4bb8c4144368b4c4e097df8b8c
Merge: 5774357 0797161
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 13:10:22 2011 -0500

    Merged trunk

commit 0797161b89531cc8d5fe29c208723f39bcbd8046
Merge: a1cb79c e81622a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 18:09:13 2011 +0000

    Pylint 'Undefined variable' E0602 error fixes.

commit a1cb79c044d3ac36ed8f780a5e38ea716e532b74
Merge: 5b1abbb 97e8f30
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Thu Mar 24 18:02:04 2011 +0000

    Made service_get_all()'s disabled parameter default to None. Pass False for enabled services; True for disabled services. Calls to this method have been updated to remain consistent.

commit 038a629cb7cb61a58838c3fc91a204ca2892dbed
Merge: a1e2959 5b1abbb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:59:25 2011 -0700

    Merged with trunk

commit e5069f27cd9e6551a6b035d6fff1b02a6bf0b492
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 13:56:25 2011 -0400

    Reconcile tests with latest trunk merges.

 etc/api-paste.ini                                 |    2 +-
 nova/tests/api/openstack/extensions/foxinsocks.py |    4 ++--
 nova/tests/api/openstack/test_extensions.py       |   13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

commit e81622a6f878f758dc1c17b3a092eccbfef4881c
Merge: bec2215 b45f4c2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 13:53:54 2011 -0400

    Merged trunk and resolved conflict in nova/db/sqlalchemy/api.py

commit 5b1abbb34c0a35d7d6d142ae9afd2cde74b1782e
Merge: b45f4c2 16372d3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 17:52:21 2011 +0000

    Don't try to parse the empty string as a datetime

commit 6254069cdf0262e128bfa877f0c56e5aeba2b4c2
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 24 13:52:20 2011 -0400

    change names for consistency with existing db api

 nova/compute/api.py                              |    6 +++---
 nova/db/api.py                                   |   14 +++++++-------
 nova/db/sqlalchemy/api.py                        |   10 +++++-----
 nova/tests/api/openstack/test_server_metadata.py |   18 +++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

commit 10ddb27053135e977c318ad08495b9f75b63d764
Merge: a10f719 b45f4c2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:51:15 2011 -0700

    Merged with trunk

commit a10f719cdbc666171d8923ae1fd65bac3d6ebda7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:49:19 2011 -0700

    Forgot one set of flags

 nova/tests/integrated/test_servers.py |    5 -----
 1 file changed, 5 deletions(-)

commit 1ad0faf980ac89e904a246f1dfeddf51a21fd740
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 13:48:04 2011 -0400

    Paginated results should not include the item starting at marker.
    Improved implementation of common.limited_by_marker as suggested by Matt Dietz.
    Added flag osapi_max_limit.

 nova/api/openstack/common.py             |   28 ++++++++++++++++------------
 nova/flags.py                            |    2 ++
 nova/tests/api/openstack/test_servers.py |    3 +--
 3 files changed, 19 insertions(+), 14 deletions(-)

commit b45f4c2f8b5537b758dad7d62dc73e7be216f516
Merge: ab99744 d966b19
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 17:33:01 2011 +0000

    Detect if user is running the default Lucid version of libvirt, and give a nicer error message

commit 6e434be0506b11780aa791e1c40de1d4ca4fb9ef
Merge: 1218487 ab99744
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 13:27:41 2011 -0400

    Merge w/ trunk.

commit 12184874da4369891b2eae49982623fc6c9315e3
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 13:26:57 2011 -0400

    Updated to use new APIRouterV11 class in tests.

 nova/tests/api/openstack/test_extensions.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit ab997441766f3d7454706ea9d630958287f53f01
Merge: 809cbdb 107c3f7
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 17:16:54 2011 +0000

    Fix lp741514 by declaring libvirt_type in nova-manage.

commit a69f6ef093805d74832a9dd531e55dd614dfa71c
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 12:57:49 2011 -0400

    Docstring fixes.

 nova/api/openstack/image_metadata.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d91102e1ce73b5b2e1f5fbcc380814f1673cefa3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 24 12:46:41 2011 -0400

    get image metadata tests working after the datetime interface change in image services

 nova/tests/api/openstack/fakes.py               |    8 ++++++--
 nova/tests/api/openstack/test_image_metadata.py |    8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

commit fbb8291263ae49521bbe02aa7f75c000c7f2db8d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 12:46:39 2011 -0400

    adding versioned controllers

 nova/api/openstack/__init__.py |   11 ++++++++---
 nova/api/openstack/flavors.py  |   17 ++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

commit b7150a461ab2aaee3c0a0f7e2b6588ddd4324b52
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Mar 24 16:38:31 2011 +0000

    Addressed issues raised by Rick Harris' review

 nova/network/vmwareapi_net.py          |   14 +-
 nova/tests/test_vmwareapi.py           |   50 ++++++-
 nova/virt/vmwareapi/error_util.py      |    8 +-
 nova/virt/vmwareapi/fake.py            |   77 ++++-------
 nova/virt/vmwareapi/io_util.py         |    4 +-
 nova/virt/vmwareapi/network_utils.py   |  227 ++++++++++++++++----------------
 nova/virt/vmwareapi/read_write_util.py |    8 +-
 nova/virt/vmwareapi/vim.py             |    4 +-
 nova/virt/vmwareapi/vim_util.py        |   11 +-
 nova/virt/vmwareapi/vm_util.py         |   10 +-
 nova/virt/vmwareapi/vmops.py           |    8 +-
 nova/virt/vmwareapi_conn.py            |   26 +++-
 12 files changed, 243 insertions(+), 204 deletions(-)

commit 7baaace446c441fdd699018912ef7604265000ce
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 16:36:37 2011 +0000

    Stubbing out utils.execute for migrate tests

 nova/tests/test_xenapi.py |    1 +
 1 file changed, 1 insertion(+)

commit 809cbdb96ff3173a85465ad60770bc7032ac0aae
Merge: c53e565 964dbe0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 16:26:44 2011 +0000

    Aggregates capabilities from Compute, Network, Volume to the ZoneManager in Scheduler.

commit 672fed6371052ca82fe5383581a86297bc85fe8b
Merge: ff2d6dc c53e565
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 12:24:40 2011 -0400

    Merge w/ trunk.

commit ab6b3cbc8e6addb00b17601eb1bae47b429d273f
Merge: 1abd4e6 c53e565
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 12:21:46 2011 -0400

    merged trunk r864

commit f5b2167c3a18097a0de0c5b26a63baad7c1904a1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 12:16:06 2011 -0400

    removing old Versions application and correcting fakes to use new controller

 nova/api/openstack/__init__.py    |   18 ------------------
 nova/tests/api/openstack/fakes.py |    2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

commit f900a3354e8a4d9925d1a28780942eee12efe91e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 12:15:33 2011 -0400

    Renamed __image and __compute to better describe their purposes. Use os.path.join to create href as per suggestion. Added base get_builder as per pychecker suggestion.

 nova/api/openstack/images.py       |   24 ++++++++++++++----------
 nova/api/openstack/views/images.py |    4 +++-
 2 files changed, 17 insertions(+), 11 deletions(-)

commit e30c4157323a58318fbdccbe335fa905154e169d
Merge: f4dee61 c53e565
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 12:09:43 2011 -0400

    Merge w/ trunk.

commit 4ea9fc435e35129b28d0012234355630710289cf
Merge: acb7a73 c53e565
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 12:04:58 2011 -0400

    Merge from trunk

commit e16555e69c25b70d94a964a7a8b725d7bd64dad5
Merge: aa41830 c53e565
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 11:48:29 2011 -0400

    merging trunk r864

commit 03e0f0796c00f2fc5121948eae23dd443af064f6
Merge: fa582b2 c53e565
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 18:40:14 2011 +0300

    trunk merged. conflicts resolved

commit 5774357b365e1db624cdd2a9abed9828b27e3314
Merge: cf70a1a c53e565
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 10:32:09 2011 -0500

    Merged trunk

commit 6fcaacdbca90b7c15a4f0649765cd3b538463fd7
Merge: 8c2561b c53e565
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 15:31:45 2011 +0000

    merge trunk

commit ae8caf09d5b5f3ac861acc3a309b462357b4063b
Merge: d805281 c53e565
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 15:30:37 2011 +0000

    merge trunk

commit cf70a1a76dfa0456ea6230eaa014fa98e7ddd464
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 10:30:09 2011 -0500

    Small refactor

 nova/utils.py             |    7 ++-----
 nova/virt/xenapi/vmops.py |   18 +++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

commit fa6b969a2a7c9252aaebc4a56d82f9b04e46910c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 10:34:34 2011 -0400

    Merged trunk and fixed tests.

 nova/tests/api/openstack/test_images.py |   40 ++++++++++++++-----------------
 1 file changed, 18 insertions(+), 22 deletions(-)

commit 96e8ef1049848563b60e457ab88adfb37b2dc473
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 10:25:36 2011 -0400

    Couple of pep8 fixes.

 nova/tests/api/openstack/test_image_metadata.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fa582b2e10e43bbb81e0e5c3baf4560300711271
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 17:24:44 2011 +0300

    pep8 clearing

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b8f1f54136a67ba4c306e47b25b686328ec23b5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 10:15:50 2011 -0400

    making servers.generate_href more robust

 nova/api/openstack/views/servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 656c1d14ac51ce2af697e00ce72b9580fd3f8c3a
Merge: b49ac33 c53e565
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 24 10:10:54 2011 -0400

    Merge w/ trunk.

commit 23ca6a5e90ed5efd40ec3a33a2201a5a3a68cd30
Merge: db6aaa6 2434138
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 10:06:25 2011 -0400

    merging trunk r863

commit c53e56576ead57815f3542a7faa797e5d0135e0c
Merge: 2434138 7acf48d
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 24 14:02:17 2011 +0000

    Fixes lp740322: cannot run test_localization in isolation

commit 4e5b511b422501167161c3bbe4dd755c0370c93f
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 16:53:32 2011 +0300

    couple of bugs fixed

 nova/tests/test_virt.py   |    3 +-
 nova/virt/libvirt_conn.py |   75 +++++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 28 deletions(-)

commit cb9d575c55677bbfcf3dc62c47d7608e07a139ea
Merge: 572b6d3 2434138
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 09:13:36 2011 -0400

    Merged trunk.

commit da159d18b56af44f93cbf2c5e80b6aa3c98d5187
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 09:12:24 2011 -0400

    Dont use popen in dettaching the lxc loop

 nova/virt/disk.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1378db7ac86b69b8a966448b63415b2136b6b5bc
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 09:07:57 2011 -0400

    Fix up formatting of libvirt.xml.template

 nova/virt/libvirt.xml.template |  132 ++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

commit 1a7f2e4b817ec7d57d9ae396c34e6103ef972226
Merge: f640d32 2434138
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 05:10:01 2011 -0700

    trunk merge

commit f640d32bd8698fc2c30b2ca0454672d691f9b296
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 05:02:54 2011 -0700

    fix based on sirp's comments

 nova/scheduler/api.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 83b25c2c8214462ab7f6b6ba76efdfba8c1de937
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 04:37:21 2011 -0700

    Grrr... because we're not recycling the API yet, we have to configure flags the first time it's called.

 nova/tests/integrated/integrated_helpers.py |    7 +++++--
 nova/tests/integrated/test_volumes.py       |    1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 18351d0b9a8159de0ec17b075f4f11ff73469397
Merge: a19d643 2434138
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 07:29:07 2011 -0400

    Merge trunk

commit 8728108512052d24d363d149307fafa993e323a5
Merge: 90085fd 2434138
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 11:06:17 2011 +0000

    merge trunk

commit bebc9504bb34934147705512413267d1ae4af170
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 04:02:31 2011 -0700

    Fake out network service as well, otherwise we can't terminate the instance in test_servers now that we've started a compute service

 nova/tests/integrated/integrated_helpers.py |   17 ++++++++++++++---
 nova/tests/integrated/test_login.py         |    1 -
 nova/tests/integrated/test_servers.py       |    7 ++++---
 nova/tests/integrated/test_volumes.py       |   11 ++++++-----
 nova/virt/fake.py                           |    8 ++++++++
 5 files changed, 32 insertions(+), 12 deletions(-)

commit 8c2561b427368e2f5cd11024206502d8d6fd97db
Merge: 2e8902c 2434138
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 10:57:52 2011 +0000

    merge trunk

commit d8052812cb5b9d3d3578c0e6651e56b4313d5f85
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 10:32:22 2011 +0000

    Sorted out a problem occurred with units tests for VM migration

 nova/tests/test_xenapi.py |    1 +
 1 file changed, 1 insertion(+)

commit d49219f8b6dd626b868b99bee8a22c4ac5495af1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 03:28:59 2011 -0700

    pep8 fixes

 nova/api/openstack/__init__.py           |    1 +
 nova/api/openstack/volume_attachments.py |   10 +++++-----
 nova/tests/integrated/api/client.py      |    2 +-
 nova/tests/integrated/test_volumes.py    |    4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

commit 230d07e9002371bdb0030c9199df35fc6360a0a2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 03:26:32 2011 -0700

    Test for attach / detach (and associated fixes)

 nova/api/openstack/__init__.py              |    2 +-
 nova/api/openstack/volume_attachments.py    |   77 ++++++----
 nova/tests/integrated/api/client.py         |   15 ++
 nova/tests/integrated/integrated_helpers.py |   49 ++++++
 nova/tests/integrated/test_login.py         |   12 +-
 nova/tests/integrated/test_servers.py       |   37 +----
 nova/tests/integrated/test_volumes.py       |  215 +++++++++++++++++++++++----
 nova/volume/driver.py                       |   12 +-
 8 files changed, 312 insertions(+), 107 deletions(-)

commit 2434138bbc73a8dbaee44c66cb7bed9f1fa40b2b
Merge: 08fd701 03257f7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 10:01:22 2011 +0000

    Pass a fake timing source to live_migration_pre in every test that expectes it to fail, shaving off a whole minute of test run time.

commit 03257f78a8006e1e8e7e080af85163427cee7c5c
Merge: 7ae8f55 86b3cc9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 10:52:41 2011 +0100

    Merge trunk

commit a3dee96483cb416cb1605cb6975135ea09bd12b6
Merge: f0a44da 08fd701
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 09:38:12 2011 +0000

    merge trunk

commit 08fd7016db5b0e435b8d9728345739afcf3cb152
Merge: 86b3cc9 40a6ded
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 09:21:51 2011 +0000

    Poll instance states periodically, so that we can detect when something changes 'behind the scenes'.
    
    Beginnings of work on Bug #661214 and Bug #661260.

commit 40a6ded37544dcfe44ba9d3ef247339122c93b43
Merge: 3cde42a 86b3cc9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:56:06 2011 -0700

    Merged with conflict and resolved conflict (with my own patch, no less)

commit 699adb4311fdd86525fae022f4119401fd1c0168
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:37:14 2011 -0700

    Added simple nova volume tests

 nova/api/openstack/volume_attachments.py    |    2 +-
 nova/api/openstack/volumes.py               |    4 +-
 nova/tests/integrated/api/client.py         |   15 +++
 nova/tests/integrated/integrated_helpers.py |   17 +++-
 nova/tests/integrated/test_volumes.py       |  137 +++++++++++++++++++++++++++
 nova/volume/driver.py                       |   67 +++++++++++++
 6 files changed, 238 insertions(+), 4 deletions(-)

commit 694c2cfd2afdc0ed293f205890bda977968dc079
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:13:20 2011 -0700

    Created simple test case for server creation, so that we can have something to attach to...

 .bzrignore                                  |    3 +
 nova/image/fake.py                          |  109 ++++++++++++++
 nova/tests/integrated/integrated_helpers.py |   22 +++
 nova/tests/integrated/test_servers.py       |  218 +++++++++++++++++++++++++++
 4 files changed, 352 insertions(+)

commit 143a8387fcbec34fd919e322a3fed7e9505c8a7c
Merge: 1894937 86b3cc9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:05:13 2011 -0700

    Merged with trunk

commit 1894937e1ef6769a5f76c0a382931480e2547ce8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:03:41 2011 -0700

    Added volume_attachments

 .bzrignore                               |    2 +
 nova/api/openstack/__init__.py           |    6 ++
 nova/api/openstack/volume_attachments.py |  154 ++++++++++++++++++++++++++++++
 nova/api/openstack/volumes.py            |   60 ++++++------
 4 files changed, 192 insertions(+), 30 deletions(-)

commit 107c3f75d91dcb7aadf3136e964d1feb6c505dc7
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 16:21:50 2011 +0900

    Declare libvirt_type to avoid AttributeError in live_migration

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit d83ec9a667f7b9787a6ad9d7af78069f6d0f2cda
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 00:10:28 2011 -0700

    minor tweak from termie feedback

 bin/nova-vnc-proxy |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 86b3cc94bc672fda7925a247c3b7c2f85be2c5b5
Merge: 6eef7ff f52a2a8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 06:21:19 2011 +0000

    Added a mechanism for versioned controllers for openstack api versions 1.0/1.1.
    Create servers in the 1.1 api now supports imageRef/flavorRef instead of imageId/flavorId.

commit f52a2a8a440b303e5289815ab4f6c2d24bfdc59f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:41:38 2011 -0400

    Fixed the docstring for common.get_id_from_href

 nova/api/openstack/common.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 61c930606d71ed7cd5e08c238c7f297294a42f82
Merge: dcb5ddd 6eef7ff
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:39:57 2011 -0400

    Merge from trunk

commit dcb5ddd117c713d60f06ce335d5484ef0242c02d
Merge: 0d677a9 6912b0e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:08:17 2011 -0400

    Merge from trunk

commit 6eef7ff7a809fa1c5856614d54b580082fe5806c
Merge: e9d0208 a822941
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 04:36:23 2011 +0000

    better logging of exceptions

commit 97ac70c45b78dcffeeb53f7408c42e3e240ca6d7
Merge: 2f6aff3 e9d0208
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:18:32 2011 -0500

    Merged trunk

commit 2f6aff324009be63ad2368295d5af01dcd040c4d
Merge: 90ce503 af22892
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:16:46 2011 -0500

    Merged trunk

commit e9d02084b69e4eb5be1c88b014a59f63ef4a9046
Merge: af22892 3796b5a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 24 04:14:36 2011 +0000

    Fix issues with certificate updating & whitespace removal

commit af22892a2b1dc413f7d11c2f6efe2f820e3257ed
Merge: 20d77ea 10e61af
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 04:10:57 2011 +0000

    Offers the ability to run a periodic_task that sweeps through rescued instances older than 24 hours and forcibly unrescues them.
    
    Flag added: rescue_timeout (default is 0 - disabled)

commit 90ce5030c29274e63d45b34ec1e50b0078c63b2f
Merge: 373fd12 20d77ea
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:09:51 2011 -0500

    Merged trunk

commit 10e61af8a23c126c15fcfcf25156d32facf19ec2
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 22:55:04 2011 -0500

    Added hyperv stub

 nova/virt/hyperv.py |    3 +++
 1 file changed, 3 insertions(+)

commit 16372d3bc0181a57958ce185e89f1f21126b9e77
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 20:21:44 2011 -0700

    Don't try to parse a datetime if it is the empty string (or None)

 nova/image/glance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 678fd691f9809184b10db42e263a69e63b027ee7
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 11:54:08 2011 +0900

    Remove a blank line.

 nova/volume/driver.py |    1 -
 1 file changed, 1 deletion(-)

commit 3cde42aaac50e32f2c8fcd4493c40a2eaf1a0d4d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:15:41 2011 -0700

    pep8 fix

 nova/virt/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7da101fcf40319a3011048832c70fbedf5c1c81
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 11:09:15 2011 +0900

    Split arguments of _execute in the iSCSI driver.

 nova/volume/driver.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit f0a44da43c804d689e8174957f35dbe2f857acdc
Merge: 52bd70d 20d77ea
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 02:04:57 2011 +0000

    merge trunk

commit 31940b550e49c23ba29c71a0e0593a6d14331516
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:02:20 2011 -0700

    Added revert_resize to base class

 nova/virt/driver.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 52bd70d500e7e82acea55c8d23c3fd1d66555cc0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 02:01:46 2011 +0000

    Addressing Rick Clark's comments.

 nova/tests/db/fakes.py       |    4 +-
 nova/tests/fake_utils.py     |   16 +++---
 nova/tests/test_xenapi.py    |    4 +-
 nova/tests/xenapi/stubs.py   |    4 +-
 nova/virt/disk.py            |    9 +--
 nova/virt/xenapi/fake.py     |    1 -
 nova/virt/xenapi/vm_utils.py |  125 ++++++++++++++++++++++--------------------
 nova/virt/xenapi/vmops.py    |    1 -
 nova/virt/xenapi_conn.py     |   20 +++----
 9 files changed, 95 insertions(+), 89 deletions(-)

commit 21f3fc7cecb4c2f0657bb6bc78098910dca2e6b7
Merge: 3c29581 0759158
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:00:25 2011 -0700

    Merged with lp:nova, fixed conflicts

commit 20d77ea69bde623cf50531647d9d20ffc7e4bc88
Merge: 0759158 8f7d6b9
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 24 01:51:34 2011 +0000

    boto_v6 module is imported if the flag "use_ipv6" is set to True

commit 3c295817f91eb7c76a64d157ff4a938c85075a36
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 18:50:30 2011 -0700

    pep8 fixes, backported some important fixes that didn't make it over from my testing system :-(

 nova/compute/manager.py     |    2 +-
 nova/compute/power_state.py |    2 +-
 nova/virt/driver.py         |    9 ++++-----
 nova/virt/libvirt_conn.py   |    2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

commit 61b52830cdce9ac5ec75d744f07764e535bcae35
Merge: 6912b0e 85ad729
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 17:23:04 2011 -0700

    Merge branch 'vnc_console' of git://github.com/sleepsonthefloor/nova into vnc_console
    
    Conflicts:
    	nova/virt/libvirt_conn.py

commit 0759158d08f3f98456ae094fd9d94d36b98216a5
Merge: 6912b0e 8fa54f5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 00:20:03 2011 +0000

    Move all types of locking into utils.synchronize decorator.
    
    Convert all uses of semaphores to use this decorator.

commit 8fa54f515ebb271a69ac32d293257dcb7ed5ef90
Merge: 06815cb 6912b0e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 00:51:08 2011 +0100

    Merge trunk

commit 7a93455f41e5198fdce8aa1b3091efd956e1c186
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 16:49:50 2011 -0700

    Doh!  Missed two places which were importing the old driver location

 nova/virt/connection.py   |    2 +-
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e19b12f668fb6cd693df6834f8895fb5487953d7
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 18:34:47 2011 -0500

    Review feedback

 nova/compute/manager.py   |    2 +-
 nova/virt/xenapi/vmops.py |   30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

commit 85ad729e4448bb4211b79e325cef897fc4e2b0bb
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 16:11:50 2011 -0700

    make missing noVNC error condition a bit more fool-proof

 bin/nova-vnc-proxy |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 3b381792c2cce1e43f68e39f2fc9c73ba2760024
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 15:55:37 2011 -0700

    clean some pep8 issues

 nova/vnc/proxy.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e0289dd26821545a6ef2ca91eb2dba7c11c2cc9f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 15:53:46 2011 -0700

    general cleanup, use whitelist for webserver security

 bin/nova-vnc-proxy             |   22 ++++++++++++++++++----
 nova/flags.py                  |    2 +-
 nova/virt/libvirt.xml.template |    2 +-
 nova/virt/libvirt_conn.py      |    2 +-
 nova/vnc/auth.py               |   34 ++++++++++++++++++++++------------
 nova/vnc/proxy.py              |   28 +++++++++++++++++++++++++---
 6 files changed, 68 insertions(+), 22 deletions(-)

commit a12b6f0a0808fba5541723a537118447b55b69ad
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 17:15:41 2011 -0500

    Better method name

 nova/utils.py             |    6 +++---
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 5170e8b5dd96cf8c7bb91e84203cfaebb099af46
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 00:56:56 2011 +0300

    small fix

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b3a8c70304672abe9b461c6cfeed3e8b517ca0b6
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 16:56:54 2011 -0500

    Added docstring

 nova/utils.py |    1 +
 1 file changed, 1 insertion(+)

commit 6912b0e1efd6ba3814d3b29beef236bfe4da52ea
Merge: b8af352 98b4f09
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 21:46:29 2011 +0000

    Updates the previously merged xs_migration functionality to allow upsizing of the RAM and disk quotas for a XenServer instance.

commit b8af3522a731c64118882d7a6024f50f21407d50
Merge: 6afe9f0 e1b9db2
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 23 21:42:15 2011 +0000

    Fix lp735636 by standardizing the format of image timestamp properties as datetime objects.
    
    So far, only glance supports returning image create, update, and delete timestamps. And only the openstack api reports those dates. Thus, the fixes were confined to those two modules.

commit 95fa499f1a7718694e37a747a6a5a0e309ce877d
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 00:36:07 2011 +0300

    migration gateway_v6 to network_info

 nova/tests/test_virt.py   |    3 ++-
 nova/utils.py             |   14 +++++++-----
 nova/virt/libvirt_conn.py |   53 +++++++--------------------------------------
 3 files changed, 19 insertions(+), 51 deletions(-)

commit 98b4f0924257dcfa12e4881950472e983f08ef1d
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 21:04:42 2011 +0000

    merge prop fixes

 nova/compute/api.py        |   10 +++++++---
 nova/tests/test_compute.py |   14 +++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

commit 0d677a9b63ed9b4612379494bf8a58af1c090331
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 23 16:51:30 2011 -0400

    Should not call super __init__ twice in APIRouter

 nova/api/openstack/__init__.py |    2 --
 1 file changed, 2 deletions(-)

commit 3c0fcc47be08ac4f3d508fd46f3b95036899aaad
Author: termie <code@term.ie>
Date:   Wed Mar 23 13:39:01 2011 -0700

    fix utils.execute retries for osx
    
    also some minor misc cleanups

 nova/network/linux_net.py |   13 ++++++-------
 nova/tests/test_volume.py |    4 ++--
 nova/utils.py             |    9 +++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

commit d966b1989224b8ba7bf580a3f3f8fc0f04b9a566
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 13:34:56 2011 -0700

    Keep the fallback code - we may want to do better version checking in future

 nova/virt/libvirt_conn.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 05c4257545fb598222cb472d59d9b8be7ba9535a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 13:29:29 2011 -0700

    Give the user a nicer error message if they're using the Lucid libvirt

 nova/virt/libvirt_conn.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 83e519b734078d8214fa0dc1d518607c7c0b244a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 15:21:18 2011 -0500

    Only run periodic task when rescue_timeout is greater than 0

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a291e68fef876080d7984a1d7192e939808596bf
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:55:33 2011 -0500

    Fixed some typos

 nova/virt/xenapi/vmops.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 0218a11bb1d5275d5b99c98aea1edba0f45f56e2
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:48:26 2011 +0000

    Forgot extraneous module import again

 nova/api/openstack/views/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 2d267a00b40d6ecd99a89926f7d7f84b03efb226
Merge: abb764f 6afe9f0
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:47:06 2011 -0500

    Merged trunk

commit 8eab4f6ecaf51221b335e76d9e532a1f159c2f2d
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:44:32 2011 +0000

    Forgot extraneous module import

 nova/api/openstack/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit abb764f51385a0b811b23379d78f7db027d4cca5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:41:35 2011 -0500

    Automatically unrescue instances after a given timeout

 nova/compute/manager.py   |   12 +++++-
 nova/utils.py             |    7 ++++
 nova/virt/libvirt_conn.py |    4 ++
 nova/virt/xenapi/vmops.py |   95 +++++++++++++++++++++++++++++++++------------
 nova/virt/xenapi_conn.py  |    4 ++
 5 files changed, 96 insertions(+), 26 deletions(-)

commit 964dbe0ee380877e21465647f0e57d28f7897d98
Merge: 05e6f82 6afe9f0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 23 12:31:49 2011 -0700

    trunk merge

commit 05e6f82aa971606f7d33fb1de8f2c1c170d030de
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 23 12:31:15 2011 -0700

    indenting cleanup

 nova/api/openstack/zones.py |    5 ++---
 nova/compute/manager.py     |    2 +-
 nova/flags.py               |    2 +-
 nova/manager.py             |    5 ++++-
 nova/rpc.py                 |    4 ++--
 nova/scheduler/api.py       |    2 +-
 nova/tests/test_zones.py    |    2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

commit db6aaa666dc1deaeead7f32fd22a4f6b2d40ed25
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 23 15:17:34 2011 -0400

    fixing some dictionary get calls

 nova/api/openstack/views/servers.py |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 5a5c7d22e7a00c9a3b34f8c08db70b644eee2d92
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:16:03 2011 +0000

    Unit test cleanup

 nova/api/openstack/views/servers.py |    5 +++--
 nova/compute/api.py                 |    2 +-
 nova/db/sqlalchemy/api.py           |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

commit 514e748e3000f97a9d1c03ba3b5ab6faff79abfd
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 22:08:22 2011 +0300

    one more minor fix

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1aa576ee43cdf6520df6b5c8429f8d426bafc72a
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:59:24 2011 +0000

    Moving the migration yet again

 .../versions/012_add_flavors_to_migrations.py      |   50 --------------------
 .../versions/013_add_flavors_to_migrations.py      |   50 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)

commit f127928d7216d5d2f16f237877275a1b2096da96
Merge: c3d4768 6afe9f0
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:58:08 2011 +0000

    Merge from trunk

commit 683fcb5da6e742e2b9f1750939dc6a17776d59de
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:56:24 2011 +0300

    xml template fixed

 nova/virt/libvirt.xml.template |    2 +-
 nova/virt/libvirt_conn.py      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c3d47689a762bfa4aa38c7d4700bb1969d37d1d1
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:56:23 2011 +0000

    merge prop changes

 nova/api/openstack/views/servers.py |    9 +++------
 nova/compute/api.py                 |   13 ++++++++++++-
 nova/compute/manager.py             |    8 ++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

commit a8a345630bd90a74bae00e11dbaf013c60dc7d84
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:44:58 2011 +0300

    pep8 fixed

 nova/virt/libvirt_conn.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 7181c4fc17084f2112107ea2b6b18fe3f69904ab
Merge: f5dada1 916bec7
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:24:19 2011 +0300

    trunk merged

commit 7cd6e9f1cf62ff5628ae4680aa66ada676c8c288
Author: John Tran <jhtran@att.com>
Date:   Wed Mar 23 11:16:22 2011 -0700

    added myself to authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit cd6a6195c029125e43a98d7eedc035fa1e87a893
Merge: ea92a88 6afe9f0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 23 14:10:20 2011 -0400

    Merge from trunk.

commit ea92a88b727814698dbc4ebf5dc705677d636445
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 23 14:05:21 2011 -0400

    Using super to call parent _setup_routes in APIRouter subclasses.

 nova/api/openstack/__init__.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bec2215dcec1af5e30393a8e2970a9a949856c7c
Merge: 327938f 6afe9f0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 14:04:53 2011 -0400

    Merged trunk.

commit b49ac333df4de61ca632666cca85f6e9baf788b0
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 23 13:04:44 2011 -0400

    pep8 fix.

 nova/api/openstack/__init__.py |    1 +
 1 file changed, 1 insertion(+)

commit 1f90c7c6555e042cda1371a22c9891713a3f6430
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 23 13:01:59 2011 -0400

    Implement v1.1 image metadata.

 nova/api/openstack/__init__.py                  |    6 +-
 nova/api/openstack/image_metadata.py            |   95 +++++++++++++
 nova/tests/api/openstack/test_image_metadata.py |  166 +++++++++++++++++++++++
 3 files changed, 266 insertions(+), 1 deletion(-)

commit 6afe9f0576532b90ef2d5891f06b8bd04401db5b
Merge: 916bec7 3362be7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 16:36:54 2011 +0000

    This branch contains the fix for bug #740929
    It makes sure cidr_v6 is not null before building the 'ip6s' key in the network info dictionary.
    This way utils.to_global_ipv6 does not fail because of cidr==None.

commit f5dada1e0193f9fff89735f169aafffbac1cbd4a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 19:22:51 2011 +0300

    review comments fixed

 nova/virt/interfaces.template |    4 ++++
 nova/virt/libvirt_conn.py     |   45 +++++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

commit 48c04eb35fae704913e9ed05868d1334ee5458fa
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 23 12:17:48 2011 -0400

    add changePassword action to os api v1.1

 nova/api/openstack/servers.py            |   13 +++++++++
 nova/tests/api/openstack/test_servers.py |   46 ++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

commit 572b6d30c809af6e117d96de9a5a2d845c1eeda0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 11:52:43 2011 -0400

    Testing of XML and JSON for show(), and conformance to API spec for JSON.

 nova/api/openstack/images.py            |    6 +-
 nova/tests/api/openstack/test_images.py |  159 ++++++++++++++++++++++++++-----
 2 files changed, 138 insertions(+), 27 deletions(-)

commit e9800364853078115cfb205bae263c3a55410b02
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 11:04:20 2011 -0400

    Fixed tests.

 nova/tests/api/openstack/fakes.py       |    4 ++--
 nova/tests/api/openstack/test_images.py |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 151d9b4a80b3f4b194722f7b5b7e916a22e463f2
Merge: ff9e29e 916bec7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 09:55:05 2011 -0400

    Merged trunk.

commit ff9e29e3ef56ec8b28f28d328ca010ce25f0c7b0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 09:47:22 2011 -0400

    Removed some un-needed code, and started adding tests for show(), which I forgot\!

 nova/api/openstack/images.py            |   37 ++++++++++---------
 nova/tests/api/openstack/test_images.py |   61 +++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 17 deletions(-)

commit 327938fd67bb033597945bdabddaa155ae4bced6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 09:19:15 2011 -0400

    id -> instance_id

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3362be7e9f2feda33e14ab4fb7c6f70277df1cf5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 12:53:10 2011 +0000

    Checking whether cidr_v6 is not null before populating ipv6 key in network info map (VMOps._get_network_info)

 nova/virt/xenapi/vmops.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 72c5735e1f77c764fc96e063ea848bac8e1ab810
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 12:39:14 2011 +0000

    Executing parted with sudo in _write_partition

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 916bec73fd9b0c8e138aa44d9923071de6572b7f
Merge: 9e9ebb7 e827b8d
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Mar 23 11:21:20 2011 +0000

    We update update_ra method to synchronize, in order to prevent crash when we request multiple instance at once.

commit b8c943bc5115e310f1263e275b707d142a372fdb
Merge: 25f0743 9e9ebb7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 11:12:46 2011 +0000

    merged with trunk
    Updated xenapi network injection for IPv6
    Updated unit tests

commit 90085fdc93a9e466b90048069ef5d446ca7d3ddf
Merge: 24568d8 9e9ebb7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:35:23 2011 +0000

    merge trunk

commit 2e8902cc1285523f693c39d74a3d05f69e105172
Merge: f0bb48f 9e9ebb7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:34:54 2011 +0000

    merge trunk

commit f0bb48fc2f2e7d9326c51b4b57e73e0258930909
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:34:34 2011 +0000

    removed excess debug line

 nova/virt/xenapi/network_utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 5cdf8f63fb2dbccea0152d17f00bf80352f8fa1a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 02:33:11 2011 -0700

    more progress

 bin/nova-vnc-proxy |   14 +++++++++++---
 nova/vnc/auth.py   |   35 +++++++++++++++++++++++++++--------
 nova/vnc/proxy.py  |   11 +++++------
 3 files changed, 43 insertions(+), 17 deletions(-)

commit e2f085eae874012784e53416f6e6213dcfde4859
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 02:06:16 2011 -0700

    use the nova Server object

 bin/nova-vnc-proxy |   18 +++++-------------
 nova/vnc/proxy.py  |    2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

commit 9c75878e5f6f1b90695e725d7bc8e6e9002cabbb
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 01:57:38 2011 -0700

    separating out components of vnc console

 bin/nova-vnc-proxy |  177 ++++++++--------------------------------------------
 nova/vnc/auth.py   |   83 ++++++++++++++++++++++++
 nova/vnc/proxy.py  |  111 ++++++++++++++++++++++++++++++++
 3 files changed, 220 insertions(+), 151 deletions(-)

commit 02db94dc33d72182201fd78651e5e5e82ab411c2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 01:22:11 2011 -0700

    Earlier versions of the python libvirt binding had getVersion in the libvirt namespace, not on the connection object.  Check both.

 nova/virt/libvirt_conn.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit a822941d1fbfcfff7d52e2e42f2a50cb8aca6f0d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 01:02:13 2011 -0700

    Report the exception (happens when can't import libvirt)

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 07af0c9653863575600986158b89ff6afa48996e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:30:01 2011 +0000

    Use subset_dict

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9902daf888ad369eb38e381d255eebda76aab106
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:27:04 2011 +0000

    Removing dead code

 nova/tests/api/openstack/fakes.py |    8 --------
 1 file changed, 8 deletions(-)

commit 3aba77c34a507bf8b7cae0ff87cf18a75bed11a8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:18:01 2011 +0000

    Touching up comment

 nova/image/glance.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e6d8c6774b8e2c78e4397e1548b9717fc8577dd5
Merge: 07c9626 9e9ebb7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:02:52 2011 +0000

    Merging trunk

commit 07c9626d91c217ad63e866d41b49db672887022e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:59:26 2011 +0000

    Pep8 fixes

 nova/image/glance.py                    |    2 +-
 nova/tests/api/openstack/test_images.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 32e1c38ef9539be6f914adc69f30e409b159a9e6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:55:28 2011 +0000

    Adding tests for owned and non-existent images

 nova/api/openstack/images.py            |    8 ++++++--
 nova/tests/api/openstack/test_images.py |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

commit dfa1e6eec0da81d5eedd303ef32442dc5c2a09d7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:26:36 2011 +0000

    More small cleanups

 nova/tests/api/openstack/test_images.py |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 9e9ebb70183eb0466eef148ebb837440bd1de256
Merge: 1133072 846b099
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 06:26:05 2011 +0000

    Fix for #740742 - format describe_instance_output correctly to prevent errors in dashboard.
    
    Without this change, it is not possible to properly select instance types when launching instances with the OS dashboard.

commit 1f02ec1df57acfd06b2c241d1d9c18b936509b3c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:20:24 2011 +0000

    Cleaning up make_image_fixutres

 nova/tests/api/openstack/test_images.py |   72 +++++++++++--------------------
 1 file changed, 24 insertions(+), 48 deletions(-)

commit 7b9888df2d2ab4cb1c706ffb16c3c650cb8ad61a
Merge: b76b61d 1133072
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 23:14:13 2011 -0700

    Merged with lp:nova

commit ac475d05e6807804a74bca665563c7260523a733
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:00:04 2011 +0000

    Small cleanup of openstack/images.py

 nova/api/openstack/images.py |   38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

commit b69a63c5d7458610b6e8931b4955c0b5b2b468f5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:58:52 2011 -0700

    Fixed up the new location of driver.py

 nova/virt/driver.py      |    5 ++++-
 nova/virt/fake.py        |    2 +-
 nova/virt/hyperv.py      |    2 +-
 nova/virt/xenapi_conn.py |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

commit 846b09925da07c2858052143d5fff4766a782cf1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 22:54:34 2011 -0700

    Fix for lp740742 - format describe_instance_output correctly to prevent
    errors in dashboard

 nova/api/ec2/admin.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8c566c6375b9f759f33a363a8b68e4711aded5be
Merge: 95a32b4 1133072
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:53:08 2011 -0700

    Merged with lp:nova

commit a7c9ad393f72b49515a445504a5bc87f8a26932c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 05:50:53 2011 +0000

    Filtering images by user_id now

 nova/compute/api.py                     |    3 +-
 nova/image/glance.py                    |   46 +++++++++++++++-
 nova/image/local.py                     |    9 ++-
 nova/tests/api/openstack/test_images.py |   91 +++++++++++++++----------------
 nova/utils.py                           |    6 ++
 5 files changed, 101 insertions(+), 54 deletions(-)

commit 95a32b4ae8d418576799fb9dd5d34e73728d7a1f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:50:45 2011 -0700

    Clarified my "Yuk" comment

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 52c2bb5e7fadf12aae96d895d374990fd4990e29
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:49:22 2011 -0700

    Cleaned up comment about virsh domain.info() return format

 nova/virt/libvirt_conn.py |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit a4d78e44d7ca35a6cca4454667cab743409fd95a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:45:15 2011 -0700

    Added space in between # and TODO in #TODO

 nova/compute/manager.py     |    2 +-
 nova/compute/power_state.py |    2 +-
 nova/utils.py               |    2 +-
 nova/virt/hyperv.py         |    2 +-
 nova/virt/xenapi/vmops.py   |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

commit a0432e417a13fd9579c40bdd54f0201b06470f45
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:42:12 2011 -0700

    Added note about the advantages of using a type vs using a set of global constants

 nova/compute/power_state.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 19da125805eedbfcfd202abac4a90c57e6c538c4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:38:37 2011 -0700

    Filled out the base-driver contract, so it's not a false-promise

 nova/compute/driver.py  |   38 --------
 nova/compute/manager.py |    3 +-
 nova/virt/driver.py     |  228 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 230 insertions(+), 39 deletions(-)

commit 1133072e884a306d9ac2262af08a9ef209574ffb
Merge: bc541bc 0dc2140
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 23 05:29:32 2011 +0000

    Enable flat manager support for ipv6.

commit bc541bc8b2890882cfd0ca6a1ba12571e9035665
Merge: 844443c 37d7c83
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Mar 23 05:25:52 2011 +0000

    Adding a talk bubble to the nova.openstack.org site that points readers to the 2011.1 site and the docs.openstack.org site - similar to the swift.openstack.org site. I believe it helps people see more sites are available, plus they can get to the Bexar site if they want to. Going forward it'll be nice to use this talk bubble to point people to the trunk site from released sites.

commit 844443cb46447ac45c175d861c3b1071c865299f
Merge: 5c8bdbe 0cff0a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 23 05:22:18 2011 +0000

    Correctly imports greenthread in libvirt_conn.py.  It is used by live_migrate().

commit c8e8b44ef27e49b3986659ee0cb6bd77b38430d8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:01:39 2011 -0700

    Forgot this in the rename of check_instance -> check_isinstance

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5c8bdbe2a93d96bfa1d7066d13016453d4ee9866
Merge: 83e2424 f1acc3d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 05:01:17 2011 +0000

    Test the login behavior of the OpenStack API.  Uncovered bug732866

commit 974b6502bb9e933955f6ea9acb6e6c47ce8d8588
Merge: 209da18 83e2424
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 21:54:43 2011 -0700

    trunk merge

commit 365b98f4d52740ef85f8a8f098a32e441d7ac168
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 21:42:17 2011 -0700

    Renamed check_instance -> check_isinstance to make intent clearer

 nova/utils.py           |    2 +-
 nova/virt/connection.py |    2 +-
 nova/virt/fake.py       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 3796b5a8fc2baa9a35ebbc721735f22e952e6aa3
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Mar 23 00:31:50 2011 -0400

    Fix some crypto strangeness (\n in file_name field of certificates, wrong IMPL method for certificate_update).

 nova/crypto.py |    3 ++-
 nova/db/api.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9686b3a296c53486a64a949ae2f7430e25df2dcb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 21:18:31 2011 -0700

    Added note agreeing with Brian Lamar that the namespace doesn't belong in wsgi

 nova/wsgi.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 0dc2140d645d94d585fa8e3e5d189cd776574d28
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Wed Mar 23 13:14:54 2011 +0900

    Fix to avoid db migration failure in virtualenv

 .../versions/012_add_ipv6_flatmanager.py           |    3 +++
 1 file changed, 3 insertions(+)

commit 45d28dfb035b4e219845d44e00073d70211e8175
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 21:14:26 2011 -0700

    Fixed up unit tests and direct api that was also calling _serialize (naughty!)

 nova/api/direct.py                      |    4 +++-
 nova/tests/api/openstack/test_limits.py |   16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

commit 83e2424e1c2721dd0ba42ca279de80b6c881ec21
Merge: cb90319 4b8ed5a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Mar 23 04:11:06 2011 +0000

    Fix the describe_vpns admin api call.
    
    Firstly, use the correct mechanism for mapping ec2 ids from instance ids.
    
    Secondly, if a vpn doesn't have an ip/port assignment from the project, don't try utils.vpn_ping, as it will raise an exception.

commit 209da18033a49062bbcfaf7739db5959be87b142
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 20:36:49 2011 -0700

    pep8 and fixed up zone-list

 nova/api/openstack/servers.py  |    2 --
 nova/api/openstack/zones.py    |   18 +++++++-----------
 nova/db/api.py                 |    4 ----
 nova/scheduler/api.py          |   24 ++++++++++++++++++++----
 nova/scheduler/zone_manager.py |    5 +++--
 nova/tests/test_scheduler.py   |   40 +++++++++++++++++++++++-----------------
 6 files changed, 53 insertions(+), 40 deletions(-)

commit 5c31b423ba5b5347aac62559c4e5c0a02f264213
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 16:59:03 2011 -0700

    Support setting the xmlns intelligently

 nova/wsgi.py |   27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

commit 65e8e24b794203de5496182dd089f5512e7313b4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 23:56:52 2011 +0000

    get_all cleanup

 nova/compute/api.py |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

commit 7d97f700811468303c21159454db64e84f71a2a0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 23:49:24 2011 +0000

    Refactored out _safe_translate code

 nova/api/openstack/images.py |   44 ++++++++++++++++++++++--------------------
 nova/compute/api.py          |   10 ++++++----
 2 files changed, 29 insertions(+), 25 deletions(-)

commit 92f076c981343e09c240533acf49a6fdd0384555
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 16:39:04 2011 -0700

    Set XML namespace when returning XML

 nova/wsgi.py |    3 +++
 1 file changed, 3 insertions(+)

commit cb9031903a0d93fcf242254f545aca2fdeb23f32
Merge: c67f240 5b1422a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Mar 22 21:41:41 2011 +0000

    Fix for LP Bug #704300

commit c67f240b14eb83f52c506f041c261554faac5c3e
Merge: e40d692 d06bce4
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 21:07:10 2011 +0000

    Fix a typo in the ec2 admin api.

commit d06bce4b64b57551a722688a4038a4eaffa34278
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 16:34:02 2011 -0400

    typo fix.

 nova/api/ec2/admin.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8176eda3f31973a8718b98f35e202ff61c48bbc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:34:00 2011 +0000

    Pep8 fix

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0b62dbec751313efdbd71322df1374ce00488810
Merge: 789fcb4 e40d692
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:29:04 2011 +0000

    Merging trunk

commit 8048fb9902d80c6a14786f89e672ebff8407d0dd
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 13:28:19 2011 -0700

    make executable

 0 files changed

commit 789fcb46915dce5fa533357ac462040ec6aa8968
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:26:45 2011 +0000

    Adding BASE_IMAGE_ATTRS to ImageService

 nova/api/openstack/images.py            |   57 ++++++++++----------
 nova/image/glance.py                    |   87 ++++++-------------------------
 nova/image/service.py                   |   61 +++++++++++++++++++++-
 nova/tests/api/openstack/test_images.py |   12 ++---
 nova/utils.py                           |   36 +++++++++++++
 5 files changed, 145 insertions(+), 108 deletions(-)

commit 4ba57654ca03d687da3b994c127665c7118ab9a5
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 13:26:23 2011 -0700

    intermediate progress on vnc-nova integration.  checking in to show vish.

 nova/flags.py                  |    4 ++++
 nova/virt/libvirt.xml.template |    4 +++-
 nova/virt/libvirt_conn.py      |    2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

commit 00787af795023b6f2104b33b206356442072996e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 13:25:53 2011 -0700

    add in eventlet version of vnc proxy

 bin/nova-vnc-proxy |  203 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)

commit ca37b31d64f9c5cf32ca7e6015176ef36e702dce
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 22 16:04:27 2011 -0400

    Updating doc strings in accordance with PEP 257. Fixing order of imports in
    common.py.

 nova/api/openstack/__init__.py      |    4 ++--
 nova/api/openstack/common.py        |   16 +++++++++++-----
 nova/api/openstack/views/servers.py |   22 ++++++++++++----------
 3 files changed, 25 insertions(+), 17 deletions(-)

commit aa4183064e15033ce2cc35773e86809b5f8224fd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 14:34:46 2011 -0400

    one more copyright fix

 nova/tests/api/openstack/test_versions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7acf48d86e7089e0627d0d80eca53efbd5e0dc7c
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:28:34 2011 +0000

    pep8 stupidness

 nova/tests/test_localization.py |    1 +
 1 file changed, 1 insertion(+)

commit 8792383dfbd630388e6a51a76910e73203a3793f
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:24:00 2011 +0000

    Tweak

 nova/api/openstack/views/servers.py                |    4 ++++
 .../versions/012_add_flavors_to_migrations.py      |    1 +
 nova/tests/test_localization.py                    |    1 +
 3 files changed, 6 insertions(+)

commit 186fab6781265b2dc92cb6049c11b390cb38b969
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 14:09:23 2011 -0400

    fixing copyright

 nova/api/openstack/versions.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 4c76bcc12954734d19afcb5e4519e35c23e39d6d
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:04:09 2011 +0000

    tweak

 nova/virt/xenapi/vmops.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 3b3889a19c4efa8dc917f772613543780f361df3
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:55:40 2011 +0000

    tweak

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 116c0d52d21ebd6ed55a61467aac5d8c06a4b086
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:46:17 2011 +0000

    Merge stuff

 nova/api/openstack/servers.py       |    4 ++--
 nova/api/openstack/views/servers.py |    5 +++--
 nova/compute/api.py                 |    8 ++++----
 nova/db/sqlalchemy/api.py           |    4 ++--
 nova/virt/xenapi/vmops.py           |    4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

commit 2a38aa7583be37ece6c42ba9307c2db0232dbed3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 10:37:56 2011 -0700

    Whoops

 nova/api/openstack/servers.py |    5 +++--
 nova/scheduler/api.py         |    3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 97e8f300af824145c8b92949ccbdfe81c0d7ca95
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Tue Mar 22 12:33:34 2011 -0500

    Changed default for disabled on service_get_all to None. Changed calls to service_get_all so that the results should still be as they previously were.

 bin/nova-manage           |    2 +-
 nova/api/ec2/admin.py     |    2 +-
 nova/api/ec2/cloud.py     |    4 ++--
 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |   13 ++++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

commit 493e87976b7eb273f4115d46c91ad73671abb796
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 22 13:18:08 2011 -0400

    Now using urlparse to parse a url to grab id out of it.

 nova/api/openstack/common.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 793648a8b5c5964b03a153a12ec65d1e0a9b3baa
Merge: f806165 e648698
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:02:44 2011 +0000

    Merge from bugfix branch

commit f8061657030aaeeac50de1a5e01e147cd2fe7a58
Merge: 9351bd5 e40d692
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:02:33 2011 +0000

    Resolved conflicts

commit e648698bd171357228881a10d76e7853938e8feb
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:00:36 2011 +0000

    Fix

 nova/tests/test_localization.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 06815cb729d8687403fc736ae6125c26867f42b3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 17:13:48 2011 +0100

    Remove unused global semaphore.

 nova/utils.py |    1 -
 1 file changed, 1 deletion(-)

commit c52501cf6dc6244ab9adadd23c579ac90cf49e5b
Merge: b53a75d e40d692
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 22 16:06:28 2011 +0000

    Addressed reviewer's comments
    
    Adapted unit tests to updated code
    
    Merged with trunk

commit f4dee61638db068c03edd7fe0ab3488ac4670d89
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 22 11:56:07 2011 -0400

    pep8 fix.

 nova/api/openstack/servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 7ae8f5563c42d7c5dc67047dd9c42e982281d80b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:53:43 2011 +0100

    Apparantly a more common problem than first thought.

 nova/compute/manager.py    |    8 ++++++--
 nova/tests/test_compute.py |   14 +++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

commit 4e33ab9fc16d580fbcf57da8e6e2228ad27cc1af
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 22 11:46:00 2011 -0400

    Adding more docstrings. image_id and instance_type fields of an instance will
    always exist, so no reason to check if keys exist.

 nova/api/openstack/__init__.py      |    4 ++++
 nova/api/openstack/views/servers.py |   25 ++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

commit a235ee2166981bd935f830e50b1bbb4d72fbc343
Merge: 94ef3c0 e40d692
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 22 11:44:33 2011 -0400

    Merge w/ trunk.

commit 3c7de6db490a8482f6d1fb5fefc750050cb1e269
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:42:37 2011 +0100

    Pass a fake timing source to test_ensure_filtering_rules_for_instance_timeout, shaving off 30 seconds of test run time.

 nova/tests/test_virt.py   |   15 ++++++++++++++-
 nova/virt/libvirt_conn.py |   10 +++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

commit b2bdeb82024b1a015ccb2ad14606d6e9ccf80aa8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:29:37 2011 +0100

    pep8

 nova/tests/test_misc.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 373fd121d1973970491d9157163e60de70bfa257
Merge: 8db9e35 e40d692
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 22 10:28:10 2011 -0500

    Merged trunk

commit 9aac55b650e9f39c5771d4683e51af5eac6204bb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:24:03 2011 +0100

    Add a test for leaked semaphores.

 nova/tests/test_misc.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit d2494199df440809bbfbc55868b0dd57053868ed
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:23:47 2011 +0100

    Remove checks in _cache_image tests that were too implementation specific.

 nova/tests/test_virt.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b82d548d0357f73ff446f5bf24e27fbefd98e4b3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:58:31 2011 -0400

    adding view builder tests

 nova/api/openstack/views/versions.py      |    4 +++-
 nova/tests/api/openstack/test_versions.py |   36 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

commit b718ec133a5ed64abca2c01232986bc3dfeae3c0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 15:50:34 2011 +0100

    Add correct bug fixing metadata.

commit 94ef3c04a56427af5b4f3d0405c21d780ac8ff07
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 22 10:48:37 2011 -0400

    When updating or creating set 'delete = 0'. (thus reactivating a deleted row)
    Filter by 'deleted' on delete.

 nova/db/sqlalchemy/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit ea44238e8ad8249aa7da311ca9c704741feac362
Merge: 35bd58b e40d692
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:29:24 2011 -0400

    merging trunk r843

commit 1abd4e6d592fb41d86fa32c3f77fd0e0a43ca5d3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:23:33 2011 -0400

    making Controller._get_flavors is_detail a keyword argument

 nova/api/openstack/flavors.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 41c9026c17dbbabef1108fb70d5b9af9b3544a76
Merge: c2cf224 e40d692
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:18:27 2011 -0400

    merging trunk r843

commit de2ecf115ff0baf43fa530807997513c728ffdaf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 15:16:08 2011 +0100

    Fix locking problem in security group refresh code.

 nova/virt/libvirt_conn.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 7bcf91f87666e21225b0eb42746e3f1417bab6fa
Merge: 0845d70 e40d692
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:11:42 2011 -0400

    merging trunk r843

commit 7aa027b2005ff24f7308e1ec23eddb44bf352628
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 22 10:01:18 2011 -0400

    Add unit test and code updates to ensure that a PUT requests to
    create/update server metadata only contain a single key.

 nova/api/openstack/server_metadata.py            |    3 +++
 nova/tests/api/openstack/test_server_metadata.py |   11 +++++++++++
 2 files changed, 14 insertions(+)

commit 3ae9a489667ed6f4b03a19d5e14bec8e1d4eb20d
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 22 09:52:59 2011 -0400

    Add call to unset all stubs.

 nova/tests/api/openstack/test_server_metadata.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 804083b6ba811834c0bf9d5e2edcdf0130d7d1ce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:50:53 2011 +0100

    IptablesManager.semaphore is no more.

 nova/network/linux_net.py |   37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

commit 01e7e598d0eb4aab9c3e7f69926a2875cdf22136
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:39:35 2011 +0100

    Get rid of IptablesManager's explicit semaphore.

 nova/network/linux_net.py |    4 ----
 nova/virt/libvirt_conn.py |   11 ++++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

commit 116e5a0b13f3da174137bbff0a5b9b0202caa4a4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:37:02 2011 +0100

    Add --fixes lp: metadata.

commit 62f9cc7cee30332143bf4e6e54fd21335db3c8da
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:36:32 2011 +0100

    Convert _cache_image to use utils.synchronized decorator. Disable its test case, since I think it is no longer needed with the tests for synchronized.

 nova/tests/test_virt.py   |    2 +-
 nova/virt/libvirt_conn.py |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

commit 60a3aa86db1d0e1ea2f680c9587881e45fa99336
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:14:47 2011 +0100

    Make synchronized decorator not leak semaphores, at the expense of not being truly thread safe (but safe enough for Eventlet style green threads).

 nova/network/linux_net.py |    2 +-
 nova/tests/test_misc.py   |    1 -
 nova/utils.py             |   18 +++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

commit 25f0743f813a59c464bc117da9ec1931ed30bbf3
Merge: e5e4408 e40d692
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 22 12:36:53 2011 +0000

    merge trunk

commit e827b8dbae1faef2cc070c7e26395979571bcd46
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Mar 22 20:27:51 2011 +0900

    Wrap update_ra in utils.synchronized.

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit 24568d8f9a78a57d483e23e1ff8a9c26472ce44b
Merge: b390c93 e40d692
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 22 09:54:56 2011 +0000

    Merge trunk

commit d1860ce5d26fbbadb2310e8225e924879cde9a6c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 10:35:43 2011 +0100

    Make synchronized support both external (file based) locks as well as internal (semaphore based) locks. Attempt to make it native thread safe at the expense of never cleaning up semaphores.

 nova/tests/test_misc.py |   34 ++++++++++++++++++++++--
 nova/utils.py           |   67 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 92 insertions(+), 9 deletions(-)

commit d722b43e19720d8dc3c92c706f1315c731ffd75a
Merge: 9b96e7f e40d692
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Mar 22 12:07:56 2011 +0300

    merge with trunk

commit 4b8ed5afd1fd3e616eda0015f9bf16c7097f5476
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 03:13:12 2011 -0400

    vpn changes

 nova/api/ec2/admin.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit 65482f5d9513c3dda64171d0460001e299be9673
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:51:14 2011 -0700

    added zone routing flag test

 nova/tests/test_scheduler.py |    1 +
 1 file changed, 1 insertion(+)

commit e74482f30c602530313faf15e0d429acefee7bde
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:47:58 2011 -0700

    routing test coverage

 nova/tests/test_scheduler.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 8303d0f280a7bfbc5c5fb128465549b03badc1f1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:41:41 2011 -0700

    routing test coverage

 nova/scheduler/api.py        |   18 +++----
 nova/tests/test_scheduler.py |  121 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 105 insertions(+), 34 deletions(-)

commit e40d692c55a02fa686e83bd87eca29a3cfa3d15e
Merge: 1fd48e0 6a893ea
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Mar 22 02:21:42 2011 +0000

    xenapi support for multi_nic. This is a phase of multi_nic which allows xenapi to work as is and with multi_nic. The other virt driver(s) need to be updated with the same support.

commit 380731ce71e8909615da6138bb7d5e7226e375ac
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 18:56:59 2011 -0700

    better comments. First redirect test

 nova/tests/test_scheduler.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 08d06d1219a00b90ae211fb44fc7e33ba71c7a76
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 18:16:35 2011 -0700

    better comments. First redirect test

 nova/scheduler/api.py        |   49 +++++++++++++++++++++--------
 nova/tests/test_scheduler.py |   70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 12 deletions(-)

commit 8db9e359d85cbf8e9afab2260759543b1717c3f9
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 17:56:30 2011 -0500

    Remove _get_vm_opaque_ref() calls in rescue/unrescue

 nova/virt/xenapi/vmops.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7cc28482a4ebeeb5dfa44c9e1c37bb135c1c66be
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 17:00:08 2011 -0500

    Remove dupe'd code

 nova/virt/xenapi/vmops.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 1fd48e08afc161b1cb076d3002a8298d71363e16
Merge: d3242b1 b54f3e1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 21:41:23 2011 +0000

    Wrap update_dhcp in utils.synchronized.

commit a105fd449a0b91cde3ab86cc552705dfe50e3f6d
Author: John Tran <jhtran@att.com>
Date:   Mon Mar 21 14:35:19 2011 -0700

    if fingerprint data not provided, added logic to calculate it using the pub key.

 nova/api/ec2/cloud.py                   |   15 +++++++++++++--
 nova/tests/public_key/dummy.fingerprint |    1 +
 nova/tests/public_key/dummy.pub         |    1 +
 nova/tests/test_cloud.py                |   32 ++++++++++++++++++++++++-------
 4 files changed, 40 insertions(+), 9 deletions(-)

commit e1b9db2ac1af8f38084f9794a430e0292f110ed6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:23:36 2011 -0400

    get rid of another datetime alias

 nova/tests/image/test_glance.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 0cff0a13bac3539a46b3b932bfd016df7f190196
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 21 14:20:13 2011 -0700

    import greenthread in libvirt

 nova/virt/libvirt_conn.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d3b8df422e58a5489c4e4462f372a6b06b2a08c9
Merge: 39783f3 d3242b1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:10:34 2011 -0400

    merge lp:nova

commit 39783f386a473ed28c786bb72a29e8403503c40c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:09:53 2011 -0400

    make bcwaldon happy

 nova/api/openstack/images.py            |    2 +-
 nova/image/glance.py                    |    6 +++---
 nova/tests/api/openstack/test_images.py |    4 ++--
 nova/tests/image/test_glance.py         |    8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

commit 414c615a3ac2e61f312f8383f764114e7d782de1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:40:26 2011 -0400

    fix licenses

 nova/tests/image/__init__.py    |    3 +--
 nova/tests/image/test_glance.py |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 27ae9700739bd6a1e6f9db90e407f450ff3e770b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:35:38 2011 -0400

    added licenses

 nova/tests/image/__init__.py    |   17 +++++++++++++++++
 nova/tests/image/test_glance.py |   19 +++++++++++++++++++
 2 files changed, 36 insertions(+)

commit d3242b17036a78c66959918b5db0d77ee8b720bf
Merge: 246b146 6d6d0f6
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 21 20:31:51 2011 +0000

    wrap and log errors getting image ids from local image store

commit 7d18347c4e1423838574172b3de23bd5921190b1
Merge: 5d06af5 246b146
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:15:39 2011 -0400

    merge lp:nova

commit 6c10ceb0f6f6d642426a57bc18b858acb5c8f2ee
Merge: fe1f675 fb8b063
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 15:54:19 2011 -0400

    Merge w/ trunk.

commit 59cb754cc37635f79fc26d4596699705143f4544
Merge: 85f50cf 246b146
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 15:23:11 2011 -0400

    merging trunk

commit 8f7d6b9da89e7154a79ad7d20681d0cb47e042b7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 21 12:21:24 2011 -0700

    Fix for LP Bug #739641

 smoketests/base.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 85f50cf496e2c193ddc715f3019b4a4769ab5bd9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 15:14:24 2011 -0400

    pep8; various fixes

 nova/api/openstack/servers.py            |    1 +
 nova/api/openstack/views/servers.py      |    5 ++---
 nova/tests/api/openstack/test_servers.py |   17 +++++++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

commit 246b146a46474266d7568b5df5cef8864cdaaa6b
Merge: fb8b063 b3bb847
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 18:46:59 2011 +0000

    Provide more useful exception messages when unable to load the virtual driver.

commit fe1f675dda0aa024a05f6f7a5e8f695932d46ccc
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 14:25:36 2011 -0400

    Added Gabe to Authors file. He helped code this up too.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit ffd2bc759af4f53019838bf20a4f016a566fbbd6
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 13:21:26 2011 -0500

    Added XenAPI rescue unit tests

 nova/tests/test_xenapi.py  |   12 ++++++++++++
 nova/tests/xenapi/stubs.py |   19 +++++++++++++++++++
 nova/virt/xenapi/vmops.py  |   11 ++++++++---
 3 files changed, 39 insertions(+), 3 deletions(-)

commit 6a893eabc83f4561025a9a655b0aabb2d3e1b3a7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 21 13:19:20 2011 -0500

    added an enumerate to track device in vmops.create_vifs()

 nova/virt/xenapi/vmops.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b1def6b2b104a143b7491cef9a01babe9ab3e75d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 11:07:19 2011 -0700

    pep8

 nova/scheduler/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit fb8b0636d02e3663485d4c386a362c7d5ef35041
Merge: 5562c3f 53bc1a0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 18:07:19 2011 +0000

    Openstack api 1.0 flavors resource now implemented to match the spec

commit 7976fb08d89a8e8b6bf8c276a50e30ae11584ce3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 11:01:34 2011 -0700

    more robust extraction of arguments

 nova/scheduler/api.py |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit ff2d6dc656c03b8aeab5e50c5d39ca9dcde9b9b1
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 14:00:39 2011 -0400

    Updated comment per the extension naming convention we actually use.

 nova/api/openstack/extensions.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fbd94f236adaa906fcc9c90de94e491e3d75653b
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 13:59:26 2011 -0400

    Added copyright header.

 nova/tests/api/openstack/extensions/foxinsocks.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit f988df6c6f29d6c885d44c6768297aaf489faf34
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 13:58:39 2011 -0400

    Fix pep8 issues in nova/api/openstack/extensions.py.

 nova/api/openstack/extensions.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 012c94e5304b9e00477409b92bf73f4316b19260
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 13:56:55 2011 -0400

    Fix limit unit tests (reconciles w/ trunk changes).

 nova/tests/api/openstack/test_extensions.py |    2 --
 1 file changed, 2 deletions(-)

commit 5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2
Merge: cf84d5b 3754a7b
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Mon Mar 21 17:51:27 2011 +0000

    Changed fixed_range (CIDR) to be required in the nova-manage command; changed default num_networks to 1.

commit 9538957691c6c68955cbfcc7bd728110b85470af
Merge: 41c0970 cf84d5b
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 21 13:46:08 2011 -0400

    Merge w/ trunk.

commit 53bc1a077746d5a72addf0f25fa8f25c8dce1990
Merge: 58f66ff cf84d5b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 13:44:53 2011 -0400

    merging trunk r837

commit aa8cf7e06e11eb31b7a3c3dbb213350a49307ebe
Merge: 101c2d9 6980263
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 10:19:58 2011 -0700

    zones3 and trunk merge

commit b3bb847e3dc20611c4a975d3c772256700b2d018
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 10:41:03 2011 -0500

    Added space

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6980263b8c31c8c8fc83e236b20950201c206e8c
Merge: 8f0b60f cf84d5b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 07:54:06 2011 -0700

    trunk merge

commit 8f0b60f598c28b2f558f3ecdaa2f9604926393e6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 07:49:58 2011 -0700

    remove scheduler.api.API. naming changes.

 nova/api/openstack/zones.py            |    4 +--
 nova/manager.py                        |    2 +-
 nova/rpc.py                            |    2 +-
 nova/scheduler/api.py                  |   43 ++++++++++++++------------------
 nova/tests/api/openstack/test_zones.py |    8 +++---
 5 files changed, 27 insertions(+), 32 deletions(-)

commit 3754a7b6f4cf0e9c60a140348b4cdb9c8acde062
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Mon Mar 21 09:17:12 2011 -0500

    Changed error to TypeError so that we get the arguments list.

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 665e155339b8c4498e39e783710d869dcfc94238
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Mon Mar 21 09:06:42 2011 -0500

    Added my name to Authors
    Added I18n for network create string

 Authors         |    1 +
 bin/nova-manage |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9b96e7f737e0901da793586a8cdbe17c2cf713c7
Merge: 79845f8 cf84d5b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Mar 21 17:05:22 2011 +0300

    merge with trunk

commit b53a75d4d6f860504abe33f635159bb71760cc3b
Merge: dde9245 cf84d5b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 11:51:58 2011 +0000

    merge trunk

commit b390c93917d060ebd6072ad58337c31c5e57da57
Merge: 0fbd0e7 cf84d5b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 09:50:39 2011 +0000

    merge trunk

commit e5e4408cb4701372057137deef52111969b16956
Merge: 745ade6 cf84d5b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 09:50:09 2011 +0000

    merge trunk

commit b54f3e17d1ec57efc4e9b3a95d443fbae52f0711
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 10:03:57 2011 +0100

    Add bug metadata

commit 9192e80d1161814e7b14946a5bd5787e9a8cf31d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 09:49:32 2011 +0100

    Wrap update_dhcp in utils.synchronized.

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit cf84d5bc465823f9342a0a300176a3cf96fbb925
Merge: 01d4d7a bdbdc3f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 21 05:46:27 2011 +0000

    fixes nova-manage instance_type compatibility with postgres db

commit 01d4d7ade4ed0a6f7d6c93799457db5f758ed6df
Merge: aa52249 7b7033b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 20 21:27:14 2011 +0000

    Tell PyLint not to complain about the "_" function

commit aa522497e2d438f30a8ecf2e93908226d900bd86
Merge: 3e255ad 98b0fd5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 20 19:17:05 2011 +0000

    Make smoketests' exit code reveal whether they were succesful.
    
    Adjust volume tests to check the exact size of the block device, instead of a rounded-off size of the resulting filesystem.
    
    Make proxy.sh work with both variants of netcat.

commit 98b0fd564ca86a7b38bca149b28a837c8aa2d1e8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 20 20:06:22 2011 +0100

    pep8

 nova/tests/api/openstack/test_servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 049e895beaf862ee0af89a9c465220f1fc44b404
Merge: 4b18488 3e255ad
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 20 20:04:51 2011 +0100

    Merge trunk

commit a19d643af217d4aa40e48f4e9a75205af51b96dc
Merge: b9480c9 3e255ad
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 20 10:51:44 2011 -0400

    Merge trunk

commit 3e255ad1bc685c0d39631540e664bde49e0670db
Merge: c983f80 d658913
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sat Mar 19 13:51:26 2011 +0000

    Added run_instances method to the connection.py of the contrib/boto_v6/ec2 which would return ReservationV6 object instead of Reservation in order to access attribute dns_name_v6 of an instance.

commit bdbdc3fc49e3885df6dbfe75badab35f5fd15c8d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 23:10:14 2011 -0700

    cleanup another inconsistent use of 1 for True in nova-manage

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3fe673108602e27cca132209e87369fa8bf1323
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 18 19:46:04 2011 -0700

    Changed Copyright to NTT for newly added files for flatmanager ipv6

 .../versions/012_add_ipv6_flatmanager.py           |    2 +-
 nova/tests/network/__init__.py                     |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

commit 4183eabb7ca46735ab6b87b1469ff089c4f19cb4
Merge: f835c01 c983f80
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 18 20:36:33 2011 -0400

    merge trunk

commit f835c01f41fdba5791190b9275775ae7fcfcafc6
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 18 20:35:44 2011 -0400

    * committing ovs scripts

 .../xensource/scripts/ovs_configure_base_flows.py  |   68 +++++++
 .../xensource/scripts/ovs_configure_vif_flows.py   |  194 ++++++++++++++++++++
 .../networking/etc/xensource/scripts/vif_rules.py  |    9 +-
 3 files changed, 267 insertions(+), 4 deletions(-)

commit 157b4d67ae2cfb7cda6cf145a5803ff83b848075
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 16:50:08 2011 -0700

    fix nova-manage instance_type list for postgres compatibility

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3113a9c523a37c777164b7d1216e1df61bd3f825
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 16:28:53 2011 -0700

    fixed migration instance_types migration to support postgres correctly

 .../versions/008_add_instance_types.py             |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ac66fde6d787742e9d5d6af9ebfe3302d9375073
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Mar 18 17:22:13 2011 -0500

    comment more descriptive

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9351bd5538ea0fc0a77c4dee13406ac7a71ca1ae
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 18 17:01:44 2011 -0500

    Seriously?

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d6589138bd06e19851594e62fc515b964596bf61
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 18 14:34:37 2011 -0700

    Fixed netadmin smoketests for ipv6

 contrib/boto_v6/ec2/connection.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 9eed0c7fde080e68b56843c9f3e8846d4168f089
Merge: 8437d94 c983f80
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 18 15:42:41 2011 -0500

    Merged trunk

commit 8437d947a6e94baf7aa53746ffd34aa5c0f521d9
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 18 15:34:50 2011 -0500

    Better errors when virt driver isn't loaded

 nova/compute/manager.py                            |   12 ++++++++++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +--
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 5d06af5d9fe2849f48902a8351ca0fdaa51b8e00
Merge: 2f4c180 c983f80
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 18 16:17:20 2011 -0400

    merge lp:nova

commit 2f4c1802c7e482a447d348f049ff429b3d1a640c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 18 16:06:43 2011 -0400

    fix date formatting in images controller show

 nova/api/openstack/images.py            |    6 ++++
 nova/tests/api/openstack/fakes.py       |   20 ++++++++++----
 nova/tests/api/openstack/test_images.py |   46 +++++++++++++++----------------
 3 files changed, 43 insertions(+), 29 deletions(-)

commit 101c2d910ccae0c8df99625c1c2d54134f8c6971
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:28:34 2011 -0700

    huh

commit feb5c82e29303285d3f914c37116a59538fec28f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:23:57 2011 -0700

    fix ups

 nova/api/openstack/servers.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 92347b7980506e3bcab827838a24a328c183ed4b
Merge: a005220 c983f80
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 12:18:59 2011 -0700

    merge trunk

commit a0052203c7cc957677293e53ea7c0191d0493ea8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 12:18:15 2011 -0700

    uses True/False instead of 1/0 for Postgres compatibility

 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 15a40f842cb8a4362fbd82e36e3df4af7ab46a84
Author: John Tran <jhtran@att.com>
Date:   Fri Mar 18 12:17:40 2011 -0700

    cleaned up tests stubs that were accidentally checked in

 nova/tests/test_cloud.py |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 37f2c3036890f9bbfd88a369dfd590744256aaf9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:00:35 2011 -0700

    works again. woo hoo

 nova/scheduler/api.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 5a9d2eb44ced0affe143e6274c9c9326f1c2d7da
Author: John Tran <jhtran@att.com>
Date:   Fri Mar 18 11:49:11 2011 -0700

    created api endpoint to allow uploading of public key

 nova/api/ec2/cloud.py    |   12 ++++++++++++
 nova/tests/test_cloud.py |   16 ++++++++++++++++
 2 files changed, 28 insertions(+)

commit 705020cc4acded862633aa5e02d5bb46c88dbc51
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 11:46:27 2011 -0700

    api decorator

 nova/api/openstack/servers.py |    2 ++
 nova/scheduler/api.py         |   37 +++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)

commit c983f80c60b2c5714926a664d45d3fcd6bcf0438
Merge: 7e299ec 48a1423
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 18:07:24 2011 +0000

    Cleanup of FakeAuthManager

commit 7e299ece0600e19d062bb28867e0809c48ac12a0
Merge: c3c68f8 204ec96
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 17:58:38 2011 +0000

    Replaced all pylint "disable-msg=" with "disable=" and "enable-msg=" with "enable=".

commit c3c68f856c9e959ad6732f7ef4157f0b47cf1b15
Merge: b238bfe dba79cd
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 18 17:52:23 2011 +0000

    Change cloud.id_to_ec2_id to ec2utils.id_to_ec2_id. Fixes EC2 API error handling when invalid instances and volume names are specified.

commit 48a1423081355b49340aa1a4a37361654d9c0d87
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 10:24:06 2011 -0700

    A few more single-letter variable names bite the dust

 nova/tests/api/openstack/test_auth.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit b238bfeece00560220a7f7fa37159b05ad984472
Merge: b57d396 3628f50
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 17:16:14 2011 +0000

    Re-implementation (or just implementation in many cases) of Limits in the OpenStack API. Limits is now available through /limits and the concept of a limit has been extended to include arbitrary regex / http verb combinations along with correct XML/JSON serialization. Tests included.

commit ee09125e31a3afe64f0a9540a88fdb5febd7ddd4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 10:14:42 2011 -0700

    Avoid single-letter variable names

 nova/tests/api/openstack/fakes.py |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

commit 4f5dc6314f9dd7bb136a38fa07b109eb2e12734d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 10:06:36 2011 -0700

    auth_data is a list now (thanks Rick!)

 nova/tests/api/openstack/fakes.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 79845f889556dd0cb979bab215cfc80b1551610d
Merge: 6e1a9d5 abe147f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Mar 18 19:37:00 2011 +0300

    merge with trunk

commit b57d396be90539a0b11d40b611210a9df65229d9
Merge: abe147f ccad7a5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 16:21:38 2011 +0000

    Mark instance metadata as deleted when we delete the instance

commit ef33d6bde27276fb4c93ed6bbcb972977f03a370
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 09:21:08 2011 -0700

    results

 nova/api/openstack/servers.py |    2 +-
 nova/scheduler/api.py         |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 12ffa884c07b55c982a1ad60a94e72c955db81c3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 09:02:36 2011 -0700

    fixed up novaclient usage to include managers

 nova/scheduler/api.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit dba79cdf18f20f1e4e0758ae19b33de94881e440
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 18 11:12:44 2011 -0400

    Added test case.

 nova/tests/test_api.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 0c779999a36186ae58343e169db6f2e71c9a3200
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Fri Mar 18 20:39:17 2011 +0530

    Minor fixes to replace occurances of "VI" by "VIM" in 2 comments.

 nova/virt/vmwareapi/error_util.py |    2 +-
 nova/virt/vmwareapi/vim.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 930d7bf1987c1b270ec0e456f982efb70527ed15
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 07:47:23 2011 -0700

    whoopsy2

 nova/scheduler/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 047bff904817838279199a7099023b505e35343f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 07:43:42 2011 -0700

    whoopsy

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70e8b431334989ad067f0a5543aea408b7186c5c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 10:34:08 2011 -0400

    Fixed 'Undefined variable' errors generated by pylint (E0602).

 nova/api/openstack/accounts.py                     |    7 ++++---
 nova/compute/api.py                                |    2 +-
 nova/db/sqlalchemy/api.py                          |    5 +++--
 .../versions/008_add_instance_types.py             |    2 --
 nova/virt/fake.py                                  |    2 +-
 nova/virt/libvirt_conn.py                          |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

commit b9480c99adbb7b4849812fa16118712b24de1820
Merge: b0e3b8e abe147f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 18 10:13:17 2011 -0400

    Merged trunk

commit a50deeb264ff721584d5b0a6ace749d8e2c44842
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 18 10:10:46 2011 -0400

    Change cloud.id_to_ec2_id to ec2utils.id_to_ec2_id. Fixes EC2 API error
    handling when invalid instances and volume names are specified.

 nova/api/ec2/__init__.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 204ec967ee46079fb95a18fcfb1167ff57458015
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 09:56:38 2011 -0400

    enable-msg -> enable

 nova/auth/fakeldap.py              |    2 +-
 nova/tests/objectstore_unittest.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6e9a95fe81c389c672b5150d64749b274975f7bc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 09:56:05 2011 -0400

    disable-msg -> disable

 bin/nova-ajax-console-proxy        |    2 +-
 bin/nova-api                       |    2 +-
 bin/nova-direct-api                |    2 +-
 bin/nova-instancemonitor           |    2 +-
 bin/nova-objectstore               |    2 +-
 nova/auth/fakeldap.py              |    8 ++++----
 nova/auth/ldapdriver.py            |    2 +-
 nova/auth/manager.py               |    2 +-
 nova/compute/manager.py            |    4 ++--
 nova/db/api.py                     |    2 +-
 nova/db/base.py                    |    2 +-
 nova/db/sqlalchemy/api.py          |    2 +-
 nova/network/linux_net.py          |    6 +++---
 nova/network/manager.py            |    4 ++--
 nova/objectstore/handler.py        |   14 +++++++-------
 nova/rpc.py                        |    6 +++---
 nova/service.py                    |    2 +-
 nova/tests/api/test_wsgi.py        |    2 +-
 nova/tests/hyperv_unittest.py      |    2 +-
 nova/tests/objectstore_unittest.py |    8 ++++----
 nova/tests/test_api.py             |    2 +-
 nova/tests/test_middleware.py      |    4 ++--
 po/nova.pot                        |   10 +++++-----
 tools/euca-get-ajax-console        |    2 +-
 24 files changed, 47 insertions(+), 47 deletions(-)

commit 0bc393bd1a0b722b08a2834873a8a825b86035c2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 06:38:02 2011 -0700

    enable_zone_routing flag

 nova/compute/api.py   |   20 ++++++++---------
 nova/scheduler/api.py |   60 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 51 insertions(+), 29 deletions(-)

commit 4b18488223d2c51958855456cb4f5877f331aaa1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 13:17:40 2011 +0100

    PEP-8

 smoketests/base.py          |    1 -
 smoketests/run_tests.py     |    1 +
 smoketests/test_sysadmin.py |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 6e632e9ef2907f0b00d3026379af03abe5024bc7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 13:14:37 2011 +0100

    Make flag parsing work again.

 smoketests/run_tests.py |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit c57908241e68a3f2a9f5eb4ee0fff6207962023d
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Fri Mar 18 17:20:46 2011 +0530

    Using eventlets greenthreads for optimized image processing.
    Fixed minor issues and style related nits.

 nova/tests/test_vmwareapi.py           |    2 +-
 nova/virt/vmwareapi/fake.py            |    4 +-
 nova/virt/vmwareapi/io_util.py         |  168 ++++++++++++++++++++++++++++++++
 nova/virt/vmwareapi/read_write_util.py |   48 +++++++--
 nova/virt/vmwareapi/vmops.py           |   17 ++--
 nova/virt/vmwareapi/vmware_images.py   |   81 ++++++++++++---
 nova/virt/vmwareapi_conn.py            |    2 +-
 7 files changed, 293 insertions(+), 29 deletions(-)

commit aa0d218e53afeb4403f0be2cf5251acb5efafc04
Merge: 9eb64af ccbc8f6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 12:35:00 2011 +0100

    Merge lp:~anso/nova/smoketests_fixes

commit 745ade6a7759915eefe39eedc9be7e526df32547
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 10:36:57 2011 +0000

    Fixed issue arisen from recent feature update (utils.execute)

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9eb64af0d7182f19fd7eda75371e202022f79891
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 11:27:38 2011 +0100

    Make proxy.sh work with both openbsd and traditional variants of netcat.

 smoketests/proxy.sh |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 9608ef7d49dd5181f45bd458cea676f79116c39f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 11:06:58 2011 +0100

    Query the size of the block device, not the size of the filesystem.

 smoketests/sysadmin_smoketests.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 0fbd0e70b4699bb4a34792e14fd11c5b57636fde
Merge: 0174d58 abe147f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 09:53:28 2011 +0000

    merge trunk

commit 0174d584708f2e9b7fa02a27eeb707892eb213ec
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 08:31:21 2011 +0000

    Ensuring kernel/ramdisk files are always removed in case of failures

 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |   30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

commit dde92454697b23a02abd573feeea13fec0bd8a9a
Merge: d1958f6 abe147f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 08:01:07 2011 +0000

    merge trunk

commit afa7df8e906ca27b361749bb9c29d3af09d0a0af
Merge: 1b42adc abe147f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 07:41:33 2011 +0000

    merge trunk

commit 1abcdbea89e69013c193d2eb0b4b7a0bc2e2fa58
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 18 02:14:36 2011 -0400

    Implement metadata resource for Openstack API v1.1. Includes:
        -GET /servers/id/meta
        -POST /servers/id/meta
        -GET /servers/id/meta/key
        -PUT /servers/id/meta/key
        -DELETE /servers/id/meta/key

 nova/api/openstack/__init__.py                   |    5 +
 nova/api/openstack/server_metadata.py            |   75 +++++++++++
 nova/compute/api.py                              |   15 +++
 nova/db/api.py                                   |   18 +++
 nova/db/sqlalchemy/api.py                        |   60 +++++++++
 nova/tests/api/openstack/test_server_metadata.py |  150 ++++++++++++++++++++++
 6 files changed, 323 insertions(+)

commit abe147f756f13d4f968aa075d709e5c6643d310a
Merge: e27dc11 e2d66aa
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Mar 18 05:11:06 2011 +0000

    Make "ApiError" the default error code for ApiError instances, rather than "Unknown."
    
    Note Dashoard's error handling code:
    
            except boto.exception.BotoServerError, e:
                if e.status == 400 and e.error_code == 'ApiError':
                    raise NovaApiError(e)
                elif e.status == 401:
                    raise NovaUnauthorizedError()
                elif e.status == 503:
                    raise NovaUnavailableError(e)
                raise NovaServerError(e)
    
    So an error_code of 'Unknown' will raise an ugly exception.
    
    This change also makes the euca errors a bit prettier:
    
    > euca-attach-volume -i i-1 vol-2 -d /dev/vdb
    > ApiError: ApiError: Volume status must be available
    
    
    Rather than:
    
    > euca-attach-volume -i i-1 vol-2 -d /dev/vdb
    > Unknown: Unknown: Volume status must be available
    
    Though the reiteration of the error code is still a bit ugly.

commit e27dc1168c8061c43b3cc64cc10e8a31a37ba39e
Merge: ca5d2ee 4940654
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 18 05:01:24 2011 +0000

    When changing the project manager, if the new manager is not yet a project member, be sure to make them be a project member.

commit ca5d2ee26ac611b7f2e323790d876342e2ae1c31
Merge: d6e6ba0 79ed4a6
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 18 04:50:49 2011 +0000

    Make the rpc cast/call debug calls show what topic they are sending to.  This aides in debuugging.

commit c28ec048a56a3ead96dc7528ca50865945d40646
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 00:19:53 2011 -0400

    Final touches and bug/pep8 fixes.

 nova/api/openstack/__init__.py     |    1 -
 nova/api/openstack/images.py       |   35 ++++++++++++++++++-----------------
 nova/api/openstack/servers.py      |    1 +
 nova/api/openstack/views/images.py |    4 ++--
 4 files changed, 21 insertions(+), 20 deletions(-)

commit acb7a7355055e04b9bb05fbba5f6590e57d681fa
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Mar 18 00:18:55 2011 -0400

    Support for markers for pagination as defined in the 1.1 spec.

 nova/api/openstack/common.py             |   28 ++++++++++++++++++++++++++++
 nova/api/openstack/servers.py            |    8 +++++++-
 nova/tests/api/openstack/test_servers.py |    7 +++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

commit 48a80b1c21a6d638c32e2f8ab562057ee7592fdd
Merge: fce6b6f d6e6ba0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 00:06:22 2011 -0400

    Merged trunk.

commit fce6b6f8f39378f5f31b8aa432922374c744544e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 00:05:58 2011 -0400

    Become compatible with ironcamel and bcwaldon's implementations for standardness.

 nova/api/openstack/images.py       |   31 +++++++++++++++++++++++--------
 nova/api/openstack/views/images.py |   18 +++++++++++++++---
 2 files changed, 38 insertions(+), 11 deletions(-)

commit 0845d7081bc912e7eefa2d98e8c53033d872ef5e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 23:58:23 2011 -0400

    pep8

 nova/api/openstack/views/servers.py      |    2 +-
 nova/tests/api/openstack/test_servers.py |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 0c7d93402885ea6644a5fb3c4e65115b2e5626be
Merge: febbfd4 79f2f90
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 23:34:58 2011 -0400

    Merged dependant branch lp:~rackspace-titan/nova/openstack-api-versioned-controllers

commit febbfd45a0c1dbd16093ab38897e94ddb331e9ea
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 23:34:12 2011 -0400

    Updated naming, removed some prints, and removed some invalid tests.

 nova/api/openstack/__init__.py          |    4 ++--
 nova/api/openstack/images.py            |   20 +++++++++++---------
 nova/api/openstack/views/images.py      |    8 ++++----
 nova/tests/api/openstack/test_images.py |   31 -------------------------------
 4 files changed, 17 insertions(+), 46 deletions(-)

commit 47bec2abb39f76d5b3ea634dbb7012d55d7f99ce
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 23:07:40 2011 -0400

    adding servers container to openstack api v1.1 servers entities

 nova/api/openstack/servers.py            |   11 ++++--
 nova/api/openstack/views/servers.py      |   56 ++++++++++++++++++++++++-----
 nova/tests/api/openstack/test_servers.py |   58 ++++++++++++++++++++++++++++--
 3 files changed, 111 insertions(+), 14 deletions(-)

commit 25199b6b93d17ff7dc192306e44932969846d9b6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 19:55:55 2011 -0700

    decorator more generic now

 nova/scheduler/api.py |    1 +
 1 file changed, 1 insertion(+)

commit af67fba36436feeede4dcc5720e51d2b66c3094a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 22:30:34 2011 -0400

    Images now v1.1 supported...mostly.

 nova/api/openstack/__init__.py          |   11 +-
 nova/api/openstack/images.py            |  214 +++++++++++++------------------
 nova/api/openstack/views/images.py      |   63 +++++++--
 nova/tests/api/openstack/test_images.py |  171 ++++++++++++++++++------
 4 files changed, 285 insertions(+), 174 deletions(-)

commit cc851d0716b5e8a2e76f89d128fde55ffb6ec4dd
Merge: 23efe8d 82a6510
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 19:01:09 2011 -0700

    fixed up bzr mess

commit 51ed0ccf8d841443561a476a03c3446844e1a0a8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 17 18:54:51 2011 -0700

    Fix for LP Bug #737240

 smoketests/sysadmin_smoketests.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 23efe8d14973a7c94de167562340938ba00d043b
Merge: 609a912 abc6c82
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 18:54:16 2011 -0700

    refactored out middleware, now it's a decorator on service.api

commit 59d2a315b87fad6d88a31994546d99d859f1849b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 17 18:26:20 2011 -0700

    Fix for LP Bug #737240

 contrib/boto_v6/ec2/connection.py |   98 +++++++++++++++++++++++++++++++++++++
 smoketests/sysadmin_smoketests.py |   12 ++---
 2 files changed, 104 insertions(+), 6 deletions(-)

commit 79ed4a643df34029391685e13f04e3bfb8afa215
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 17 19:41:16 2011 -0400

    Add topic name to cast/call logs.

 nova/rpc.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4940654f04c50c8593f8e5486fa9e4998f2a3fc7
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 17 19:32:25 2011 -0400

    Changing project manager should make sure that user is a project member.

 nova/auth/dbdriver.py   |    2 ++
 nova/auth/ldapdriver.py |    2 ++
 nova/tests/test_auth.py |    7 +++++++
 3 files changed, 11 insertions(+)

commit 83523c125af0fcdc740373332bd5a2d4f233dd0e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 23:45:35 2011 +0100

    Invert some of the original logic and fix a typo.

 smoketests/base.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 57e3d5abb539031b0d5d40e9033aef43de917fef
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 23:37:34 2011 +0100

    Make the smoketests pep8 compliant (they weren't when I started working on them..)

 smoketests/base.py                |    1 -
 smoketests/sysadmin_smoketests.py |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit d6e6ba0780faa962b35635dbd9f62818a98f5313
Merge: 0d40b15 ca267d0
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 22:24:08 2011 +0000

    Update the Openstack API to handle case where personality is set but null in the request to create a server.

commit 0d40b15dc011324a4ebf7a7c6150cf3e4fd151d9
Merge: 4edbeea cf648ea
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:16:27 2011 +0000

    Fix a couple of things that assume that libvirt == kvm/qemu.

commit 385b513822dff84e2faeb7f1d1b60efdf3d82fab
Author: Josh Kleinpeter <josh@kleinpeter.org>
Date:   Thu Mar 17 15:09:09 2011 -0700

    Made fixed_range a required parameter for nova-manage network create. Changed default num_networks to 1; 1000 seems large.

 bin/nova-manage         |    5 +++--
 nova/network/manager.py |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 4edbeea2e81a7aff271be5e96cc18cb3ea6e5133
Merge: 5726430 afda510
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:06:34 2011 +0000

    Fix a number of place in the volume driver where the argv hadn't been fully split

commit 79f2f90feec74b97d55af058c9bec4177bc47a54
Merge: e138e08 5726430
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 17:31:50 2011 -0400

    Merge from trunk.

commit e2d66aaa670817bda9bf1b494b6a4cfde32b6daf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 17 14:28:03 2011 -0700

    fix for lp712982, and likely a variety of other dashboard error handling
    issues.  This fix simply causes the default error code for ApiError
    to be 'ApiError' rather than 'Unknown', which makes dashboard handle
    the error gracefully, and makes euca error output slightly prettier

 nova/exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf648ea89015818a3ec7c8d6d59b50f8ed3604f7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:23:35 2011 +0100

    Fix mis-merge

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit afda510637577748d311f0779596c6fec17b00fa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:21:55 2011 +0100

    pep8 is hard

 nova/volume/driver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b05bdeaf77ccb91ac59b4a2dde4a6cad94eb22b2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Mar 17 16:17:03 2011 -0500

    syntax error

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a437ea845bd83c8b1da9de81253132cbad6b48b7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Mar 17 16:14:48 2011 -0500

    create vifs before inject network info to remove rxtx_cap from network info (don't need to inject it)

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5726430038ce01f6dc1efba6d1f51a84cadfecf9
Merge: 4b5a775 06c0b81
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:11:58 2011 +0000

    Make utils.execute not overwrite std{in,out,err} args to Popen on retries.
    Make utils.execute reject unknown kwargs.
    
    Add a couple of unit tests for utils.execute.

commit 400ca259f49a741cf2cefd86afcf2494ee0bd446
Merge: 038d99d 88ae795
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Mar 17 15:57:04 2011 -0500

    merged trunk, merged qos, slight refactor regarding merges

commit 4b5a775ae4169faaf5716d362ead66aa443a2748
Merge: 88ae795 8668458
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 20:56:45 2011 +0000

    - general approach for openstack api versioning
    - openstack api version now preserved in request context
    - added view builder classes to handle os api responses
    - added imageRef and flavorRef to os api v1.1 servers
    - modified addresses container structure in os api v1.1 servers

commit 8d5ffa079e768adec969a4e8ab540c24a7faaaa6
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 20:45:18 2011 +0000

    Pep8

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b605b53e4b652e0a3f364d505b5fd7240fd4ea36
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 20:44:15 2011 +0000

    Test changes

 nova/tests/api/openstack/test_servers.py |   22 ++++++++++++----------
 nova/tests/xenapi/stubs.py               |    7 +++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

commit 06c0b81e54adf3fb0635a7cd7679bcdb051e6263
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:43:22 2011 +0100

    pep8

 nova/tests/test_utils.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b331a3df4d921414409ebb7a738d97e34f782102
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:39:55 2011 +0100

    Adjust test cases.

 nova/tests/test_volume.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit f7d5dea09568c6440918264d97ecdbcc316c0ec4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 15:31:48 2011 -0500

    pep8

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8c2af6cdab25c3010b9bb9587fc5072da14d68d
Merge: 25c407b 88ae795
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 15:30:35 2011 -0500

    merge

commit ccad7a5d36d27a1854d12d3e45d1c6099983e56c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 17 13:29:22 2011 -0700

    Mark instance metadata as deleted when we delete the instance

 nova/db/sqlalchemy/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 88ae79505a84736ebdf57ba67c60ff16de5c9e87
Merge: 7220c5b 3cf224b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 17 20:27:23 2011 +0000

    Backfix of bugfix of issue blocking creating servers with metadata

commit 3628f50b4ecd2db0377fd9c158248d3b7e8e98ff
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 16:26:52 2011 -0400

    Better comment for fault. Improved readability of two small sections.

 nova/api/openstack/faults.py            |    5 ++++-
 nova/api/openstack/limits.py            |    2 +-
 nova/tests/api/openstack/test_limits.py |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit 7220c5b9c473270b393f5887e9c0b78776b61190
Merge: aec13f3 192d3ad
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 20:21:42 2011 +0000

    Add support for network QoS (ratelimiting) for XenServer.
    Rate is pulled from the flavor (instance_type) when constructing a vm.

commit 8c6184a3cd55a49dcc01885aa7d78e8c9eba7c14
Merge: c89a477 aec13f3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:21:25 2011 +0100

    Merge with trunk.

commit c89a477aa97bb4d716180cadd889ff98123625e4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:06:55 2011 +0100

    pep8

 nova/virt/libvirt_conn.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d70bbdf43c4cba5a0b9c0ab93ff06031a2604db6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:03:11 2011 +0100

    I suck at merging.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e138e0836922ee0608feefbff5e4e5d03ad14197
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 16:02:37 2011 -0400

    Now returns a 400 for a create server request with invalid hrefs for
    imageRef/flavorRef values. Also added tests.

 nova/api/openstack/common.py             |   12 +++++-
 nova/api/openstack/servers.py            |    5 +--
 nova/tests/api/openstack/test_servers.py |   64 ++++++++++++------------------
 3 files changed, 37 insertions(+), 44 deletions(-)

commit 35bd58bd9dc6441f5620b262d1f65b852f56c67c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 15:43:56 2011 -0400

    moving Versions app out of __init__.py into its own module; adding openstack versions tests; adding links to version entities

 etc/api-paste.ini                         |    2 +-
 nova/api/openstack/__init__.py            |   18 ---------
 nova/api/openstack/versions.py            |   55 ++++++++++++++++++++++++++
 nova/api/openstack/views/versions.py      |   57 +++++++++++++++++++++++++++
 nova/tests/api/openstack/fakes.py         |    3 +-
 nova/tests/api/openstack/test_versions.py |   61 +++++++++++++++++++++++++++++
 6 files changed, 176 insertions(+), 20 deletions(-)

commit 192d3ad7bb9cf49abbca98b0d8e9ae822b204365
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 19:34:45 2011 +0000

    fixed code formatting nit.

 nova/virt/xenapi/vm_utils.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 2f1a1d293915cde6e15c85e0bb43fb21ae26f7b0
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 15:29:54 2011 -0400

    handle create and update requests, and update the base image service documentation to reflect the (defacto) behavior

 nova/image/glance.py            |    7 ++---
 nova/image/service.py           |    4 +--
 nova/tests/image/test_glance.py |   54 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 6 deletions(-)

commit ca267d0e52ed721f1236dc4b6030433fe92d0d51
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 15:27:20 2011 -0400

    Move the check for None personalities into the create method.

 nova/api/openstack/servers.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 25c407b6ade499dd0bdd470e7fd46682c34a98b7
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 19:13:09 2011 +0000

    Get the migration out

 nova/api/openstack/servers.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 4334ca9d6b0ac8a9b2edb1fbcbf0bc4df28b2961
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 15:04:28 2011 -0400

    get api openstack test_images working

 nova/image/glance.py                    |    7 ++++---
 nova/tests/api/openstack/test_images.py |    8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

commit c58faf904e15fce75ad9127de369c2d5efe50eb6
Merge: 7deb9f5 aec13f3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:43:15 2011 +0000

    merge trunk

commit 7deb9f5676f3c3e4f5b7303ab69891ba7bc361b8
Merge: 7649a9a 699abfe
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:42:18 2011 +0000

    Improved exception handling

commit 6d6d0f686a7f8d47263b7ed725bdae0f322b2a4e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 17 11:34:14 2011 -0700

    better implementation of try..except..else

 nova/image/local.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit c2cf224fab65d608be6ccc8143de7e1f28bdb482
Merge: 5a14146 58f66ff
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:29:48 2011 -0400

    merging parent branch lp:~bcwaldon/nova/osapi-flavors-1_1

commit 58f66ff1d20286b4e321f90f60b3abef2d9ba8c6
Merge: f05e4d0 8668458
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:22:02 2011 -0400

    merging parent branch lp:~rackspace-titan/nova/openstack-api-version-split

commit 6e1a9d56729691ff5afff286b5fbf91bca39238c
Merge: 31388f1 0bf00a1
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 21:17:37 2011 +0300

    iptables filter firewall changes merged

commit 4ca99e0cbbf328c6af76fd73ac5c72644422dc57
Merge: 60c7ce6 aec13f3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 17 11:11:56 2011 -0700

    merged trunk

commit 5a141466db962e184ced0a57efb6bfe94ff5a246
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:09:44 2011 -0400

    pep8

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99a3899291ef14149bee0581ad7615e07dfc55c1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:07:25 2011 -0400

    adding serialization_metadata to encode links on flavors

 nova/api/openstack/flavors.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 0bf00a181b3f6ddc0586b0cfb0239f2d0e213cf5
Merge: 1f99a95 31388f1
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 17 21:06:29 2011 +0300

    merge with libvirt_multinic_nova

commit c8e474d04dce462650c2a9f57cbcb106ce3ef0c9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 14:05:08 2011 -0400

    pep8

 nova/tests/image/test_glance.py |    1 +
 1 file changed, 1 insertion(+)

commit 66c237a4d321887830e5282781870525abf00365
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 14:04:31 2011 -0400

    teach glance image server get to handle timestamps

 nova/image/glance.py            |    2 +-
 nova/tests/image/test_glance.py |   30 +++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

commit 1b42adc4d2a09a04ce82f1ec289be7d572a6ba5f
Merge: da64742 aec13f3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:03:50 2011 +0000

    merge trunk

commit 1bfb97e470876f8683c559a19cd14cc3b375b1c2
Merge: 05ca6e2 8668458
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 14:03:18 2011 -0400

    Merge from parent branch lp:~rackspace-titan/nova/openstack-api-version-split

commit da6474283bc926d41d221024a48072b08f45fb3e
Merge: 373562b 699abfe
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:03:18 2011 +0000

    merge trunk

commit 31388f18f8c0ebe3cae58ebd2a46e2bedb376fd4
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 20:56:25 2011 +0300

    fixes for NWFilterFirewall and net injection

 nova/virt/interfaces.template |   18 ++++++-------
 nova/virt/libvirt_conn.py     |   58 ++++++++++++++++++++++++++++-------------
 2 files changed, 49 insertions(+), 27 deletions(-)

commit 866845870f71f08203d0b29e9f35ecd5eec44151
Merge: a48ff16 5473f3a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 13:52:09 2011 -0400

    moving code out of try/except that would never trigger NotFound

commit 3ee835c60d2b43086b1e324501025d1f0221da27
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 13:50:41 2011 -0400

    handle timestamps in glance service detail

 nova/image/glance.py            |    3 ++-
 nova/tests/image/test_glance.py |   27 ++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

commit 1f99a95b8615e55c9828eb36e12b9aaa762470bb
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 17 20:48:22 2011 +0300

    fixed IpTablesFirewal

 nova/virt/libvirt_conn.py |   88 +++++++++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 22 deletions(-)

commit a48ff163dd30c10753666d3542bec640d2ac8da4
Merge: 78542ad aec13f3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 13:42:42 2011 -0400

    Merge from trunk.

commit aec13f3e7edb0425d89f3e779340b1f1b7bb2e36
Merge: 0a08d47 f17fb93
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 17:18:43 2011 +0000

    Fixes lp736343 - Incorrect mapping of instance type id to flavor id in Openstack API

commit 0a08d4728b8d209fd62f994539c982d8fbac3ce5
Merge: e1e9a2e 41619f4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 17:14:34 2011 +0000

    Comparisons to None should not use == or !=.
    
    Stop converting sets to lists before comparing them. They might be in different order after being list()ified.

commit f96dea3da633fc71f16de1bdb95e88249b316e29
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 13:11:40 2011 -0400

    Pep8 error, oddly specific to pep8 v0.5 < x > v0.6

 nova/api/openstack/faults.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e1e9a2eb38dc58c73eae8ae1b6dab69bf2baa868
Merge: 699abfe 1d64d0a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 17:07:24 2011 +0000

    Remove unconditional raise, probably left over from debugging.

commit 3afeb8466fa9f005edc9da182b1e0af6ffb00ade
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 12:05:43 2011 -0500

    Mapping the resize status

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 686e113188aaf8195aed7bea8bf70c21b6bff498
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 12:04:49 2011 -0500

    Mapping the resize status

 nova/api/openstack/servers.py |    8 +++++++-
 nova/compute/manager.py       |    2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

commit d31e0f0ad048fbd0374170ea76968859a4c6df34
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 12:39:09 2011 -0400

    Fixed pep8 violation.

 nova/api/openstack/faults.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c1f7df80d22b718bc96332c2f52354627d11700d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 12:31:16 2011 -0400

    adding comments; removing returns from build_extra; removing unnecessary backslash

 nova/api/openstack/flavors.py       |    2 +-
 nova/api/openstack/views/flavors.py |   26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

commit b135bc23cca1494049dd9978cb18b52f2b4d99c7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 12:30:32 2011 -0400

    refactor to simpler implementation

 nova/image/glance.py |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

commit d6ae8e4c2f6011497b1db23fcbafb23b663f924d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:24:24 2011 -0500

    Foo

 nova/compute/manager.py   |    1 +
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit e79eaca86c4073cc8bc6c59be83d0f1bf5e2cea4
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 12:20:22 2011 -0400

    glance image service show testcases

 nova/image/glance.py            |   14 +++++++++
 nova/tests/image/test_glance.py |   64 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 7 deletions(-)

commit 1ffef31839f3c1f4386d5df834af6d53483c09ed
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:16:59 2011 -0500

    oh come on

 nova/virt/xenapi/vmops.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 4f1f5bb1ed2cbb57e9ba8ea481ae31c0e6acc7bd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:03:07 2011 -0500

    refactoring

 nova/compute/manager.py   |    5 +----
 nova/virt/xenapi/vmops.py |   22 +++++++++++++++++-----
 nova/virt/xenapi_conn.py  |   10 +++++-----
 3 files changed, 23 insertions(+), 14 deletions(-)

commit 41c097000c1eeb4f1532b22f136c383b8174e6cc
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 11:35:32 2011 -0400

    Add tests and code to handle multiple ResponseExtension objects.

 nova/api/openstack/extensions.py                  |   13 ++++++++++++-
 nova/tests/api/openstack/extensions/foxinsocks.py |   17 ++++++++++++++---
 nova/tests/api/openstack/test_extensions.py       |   17 ++++++++++++++++-
 3 files changed, 42 insertions(+), 5 deletions(-)

commit fe486539fa1add1f7c544fc3fceec57e073748fa
Merge: ca50fdd 699abfe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 16:28:48 2011 +0100

    Merge trunk

commit ca50fdd2e013a9016b06a9d0263b980a062d5987
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 16:27:08 2011 +0100

    Just use 'if foo' instead of 'if len(foo)'. It will fail as spectacularly if its not acting on a sequence anyways.

 nova/virt/libvirt_conn.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 720ba5d5c9ad2c24d9f0275fb783f191836a75f3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 18:22:48 2011 +0300

    bugfix

 nova/virt/libvirt_conn.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 1d64d0a3d7f25448361ce54e32bba3de68c7afd1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 16:14:59 2011 +0100

    Remove unconditional raise, probably left over from debugging.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 137bbc37e9fb664d0b97a607b5f69c38df938077
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 11:10:58 2011 -0400

    No need to modify this test case function as well.

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba0160cacac1c7db71eadd6624ee75a014c18378
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 18:06:05 2011 +0300

    refactored: network_info creation extracted to method

 nova/virt/libvirt_conn.py |   74 ++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

commit 66d9c0d51d410998de86508359135a7d978997ef
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 11:05:31 2011 -0400

    Call _create_personality_request_dict within the personalities_null test.

 nova/tests/api/openstack/test_servers.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit aa13754d04c17ae9985017e22ae4f68916bc2781
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 10:03:47 2011 -0500

    Foo

 nova/compute/manager.py   |    1 -
 nova/virt/xenapi/vmops.py |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b0e3b8e58a925ebf52fa741883f757ed2bc4383c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:47:19 2011 -0400

    more pep8 fixes

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8aa9485fe2048ff916d9dd40478ef0b1486077f
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 10:45:46 2011 -0400

    Switch back to 'is not None' for personality_files check. (makes mark happy)

 nova/api/openstack/servers.py            |    1 -
 nova/tests/api/openstack/test_servers.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 4364a158fd31bdfcfa3ae835a2fd9c0f47d3632f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:45:31 2011 -0400

    pep8 fixes

 nova/tests/test_virt.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit cbcda1ec466fd498fb8e9fe47c72b52c2d4b3dde
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Mar 17 20:13:48 2011 +0530

    1) Update few comments where whitespace is missing after '#'
    2) Update document so that copy right notice doesn't appear in generated document
    3) Now using self.flag(...) instead of setting the flags like FLAGS.vmwareapi_username by direct assignment.
    4) Added the missing double quote at the end a string in vim_util.py

 doc/source/vmwareapi_readme.rst      |    1 -
 nova/tests/test_vmwareapi.py         |    6 +++---
 nova/virt/vmwareapi/fake.py          |   24 ++++++++++++------------
 nova/virt/vmwareapi/network_utils.py |   26 +++++++++++++-------------
 nova/virt/vmwareapi/vim.py           |    2 +-
 nova/virt/vmwareapi/vim_util.py      |   20 ++++++++++----------
 6 files changed, 39 insertions(+), 40 deletions(-)

commit dee8a59b5d575a0327464e27115d0d870cde97be
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:43:48 2011 -0400

    more pep8 fixes

 nova/tests/test_virt.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a06203c66af05c96c161b80511f4a6607ffe4905
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:41:55 2011 -0400

    Fix up tests

 nova/tests/test_virt.py |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit abc6c82449dfc46a33dcd8190840e51f44b5b930
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 07:30:22 2011 -0700

    Replaced capability flags with List

 nova/api/openstack/zones.py            |    4 ++--
 nova/flags.py                          |    5 +++--
 nova/tests/api/openstack/test_zones.py |    6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

commit 36285d3acb940c39dc1827699c1e3c0cc9846529
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:22:57 2011 -0400

    Fix more pep8 errors

 nova/tests/test_virt.py |   12 ++++++------
 nova/virt/disk.py       |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

commit abb86555f7417225a72126872beb377268acfdb1
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:16:37 2011 -0400

    Remove me from mailmap

 .mailmap |    1 -
 1 file changed, 1 deletion(-)

commit bc0ef2c7aead759504eedcb4e2ab6d96dba7c266
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:02:40 2011 -0400

    Fix up setup container

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f9efc9deedf60d10308763f579bd8682cd0392b
Merge: a586714 699abfe
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 09:56:56 2011 -0400

    Merged trunk.

commit 732633c93f8d8cf71875d2caf096c9efbcf9dbce
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 17 09:55:41 2011 -0400

    Update the Openstack API to handle case where personality is set but
    null in the request to create a server.

 nova/api/openstack/servers.py            |    5 +++++
 nova/tests/api/openstack/test_servers.py |   13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

commit 27d5cbaf03e532e30de2b6aacbc330391a0d1735
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 14:51:59 2011 +0100

    Make smoketests' exit code reveal whether they were succesful.

 smoketests/admin_smoketests.py          |    2 +-
 smoketests/base.py                      |    9 +++++++--
 smoketests/netadmin_smoketests.py       |    2 +-
 smoketests/public_network_smoketests.py |    2 +-
 smoketests/sysadmin_smoketests.py       |    2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

commit 40c27fc4ad4653155b676079f2e2677d18aee9ef
Merge: 6f72ba3 699abfe
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 06:35:00 2011 -0700

    merge with trunk. moved scheduler_manager into manager. fixed tests

commit 174d8ca2da7e2e53c9105ccc5e5d9a97bc12c0b8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 09:17:42 2011 -0400

    Set nbd to false when mounting the image

 nova/virt/disk.py |    1 +
 1 file changed, 1 insertion(+)

commit cc716f9648355bc3737dd749a35dc327ebda1e6f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 09:15:33 2011 -0400

    Fixed typo when I was trying to add test cases for lxc

 nova/tests/test_virt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6bd017262a5c61d915ede2e58ef2758f1f190ff3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 08:54:05 2011 -0400

    Remove target_partition for setup_container but still hardcode because its
    needed when you inject the keys into the image.

 nova/virt/libvirt_conn.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit c98cead470f33041e928a6f82be801efeb94ccc3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 08:52:52 2011 -0400

    Remove nbd=FLAGS.use_cow_images for destroy container

 nova/virt/disk.py         |    7 +++----
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

commit bb6096c51cde91dccaad0e9f584f2dc26057da1f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 08:49:52 2011 -0400

    Update mailmap

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit c5378e09be3d633b79e4a8c62b51d1e56cdaa67b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 12:58:45 2011 +0100

    Fix a number of place in the volume driver where the argv hadn't been fully split

 nova/volume/driver.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 9ba500c304595dff037da296f26cb13d02bfbc04
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:57:06 2011 -0400

    Fix pep8 errors

 nova/tests/test_virt.py |    2 --
 nova/virt/disk.py       |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 70cd1a51ada85f4724190d2562130172e9495e5e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:53:25 2011 -0400

    Update authors again

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7649a9af1fb04886a25124b92e6ba4f88c1fd0b0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 11:19:03 2011 +0000

    Improved exception handling:
    - catching appropriate errors (OSError, IOError, XenAPI.Failure)
    - reduced size of try blocks
    - moved exception handling code in separate method
    - verifing for appropriate exeception type in unit tests

 nova/tests/test_xenapi.py    |    4 +-
 nova/tests/xenapi/stubs.py   |   16 ++++---
 nova/virt/xenapi/vm_utils.py |   94 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    |   74 +++++++++++++++++----------------
 4 files changed, 96 insertions(+), 92 deletions(-)

commit 7701edd34f1fc9fa26b3dfcc77ff87018622bedc
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:13:31 2011 -0400

    get_console_output is not supported by lxc and libvirt

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit 7f837b1f22922cb968b0ffb42bdb4d56c0d9f3c3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:06:58 2011 -0400

    Update Authors and testsuite

 Authors                 |    1 +
 nova/tests/test_virt.py |   41 ++++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

commit 41619f49ce72d8e85f013c5a5dd248faa8490555
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 11:44:27 2011 +0100

    Comparisons to None should not use == or !=.
    
    Stop converting sets to lists before comparing them. They might be in different order after being list()ified.

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c85e8fc2d61368b15e4deafb4ae3b723777cf2b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 11:37:50 2011 +0100

    Make error message match the check.

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05ca6e24d4a3cf64bbe371f1c9c74088110eba68
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 04:32:24 2011 -0400

    Setting the api verion in the request in the auth middle is no longer needed.
    Also, common.get_api_version is no longer needed.
    As Eric Day noted, having versioned controllers will make that unnecessary.

 nova/api/openstack/auth.py   |    2 --
 nova/api/openstack/common.py |    4 ----
 2 files changed, 6 deletions(-)

commit 59937e9f49b14ee592dd08ef9eb8febdc9a32c51
Merge: 11698a1 5473f3a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 03:41:01 2011 -0400

    moving code out of try/except that would never trigger NotFound

commit 11698a131fe6b99bfd91a977a975b07bcd4c2b2b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 03:21:09 2011 -0400

    Added mechanism for versioned controllers for openstack api versions 1.0/1.1.
    Create servers in the 1.1 api now supports imageRef/flavorRef instead of
    imageId/flavorId.

 etc/api-paste.ini                        |   18 +++++---
 nova/api/openstack/__init__.py           |   29 +++++++++---
 nova/api/openstack/auth.py               |    2 +-
 nova/api/openstack/common.py             |    1 +
 nova/api/openstack/servers.py            |   64 ++++++++++++++++++++++----
 nova/api/openstack/views/addresses.py    |   16 +------
 nova/api/openstack/views/flavors.py      |   18 +-------
 nova/api/openstack/views/images.py       |   18 +-------
 nova/api/openstack/views/servers.py      |   49 +++++++-------------
 nova/tests/api/openstack/fakes.py        |   18 +++++---
 nova/tests/api/openstack/test_auth.py    |    6 +--
 nova/tests/api/openstack/test_servers.py |   73 +++++++++++++++++++++++++++---
 12 files changed, 191 insertions(+), 121 deletions(-)

commit 82a65107ba3e3df8ec52984bb835b71fe4283b4c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:33:32 2011 -0300

    fix up copyright

 nova/api/zone_redirect.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 2f72127478405f5d87a40d799cc04e77e744f35b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:31:06 2011 -0300

    removed dead method

 nova/scheduler/api.py |    4 ----
 1 file changed, 4 deletions(-)

commit fe82fc64ebe616d2ecb0a25c3c32efac9241d7e3
Merge: cfe77c1 609a912
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:28:28 2011 -0300

    pep8

commit 609a912fa8a816c1f47140489dcc1131356cd67c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:26:54 2011 -0700

    pep8

 nova/api/zone_redirect.py |    8 ++++----
 nova/scheduler/api.py     |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 63aa72e4a7922cedcabae5d9c95f8c930b2d7bd2
Merge: a766b41 699abfe
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 02:21:33 2011 +0000

    Remerge trunk.

commit cfe77c1236b68aa96dd85503582e08a07a23f77f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:21:32 2011 -0700

    cleanup

 nova/api/openstack/servers.py |    1 -
 nova/compute/manager.py       |    1 -
 nova/db/api.py                |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

commit a766b4111addad804e47b8be3e6dedb5f80a83c4
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 02:20:18 2011 +0000

    added in network qos support for xenserver.
    Pull qos settings from flavor, use when creating instance.

 nova/api/openstack/servers.py                      |    3 +-
 nova/tests/db/fakes.py                             |   30 ++++++++++++++++----
 nova/tests/test_xenapi.py                          |    8 ++++++
 nova/virt/xenapi/vm_utils.py                       |    9 ++++--
 nova/virt/xenapi/vmops.py                          |    9 ++++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 6 files changed, 49 insertions(+), 12 deletions(-)

commit c9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:04:27 2011 -0700

    moved scheduler API check into db.api decorator

 nova/api/zone_redirect.py |    5 ++++-
 nova/compute/api.py       |   10 ++--------
 nova/compute/manager.py   |    5 +----
 nova/db/api.py            |   35 ++++++++++++++++++++++++++++++++++-
 nova/exception.py         |    4 +++-
 nova/scheduler/api.py     |   23 ++++++-----------------
 6 files changed, 50 insertions(+), 32 deletions(-)

commit fea850245835f867aa4cc741b612445e56e64236
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:52:14 2011 -0400

    Add basic tests for lxc containers.

 nova/tests/test_virt.py |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit c44ab013f5f5a078b27c4965e2e3c4abbfe30c59
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:42:39 2011 -0400

    Revert testsuite changes

 nova/tests/test_virt.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 0e7177ed0307dcf1593fce3d5aa0fc23ca03d4ea
Merge: a21efc6 699abfe
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:40:42 2011 -0400

    MErge trunk

commit a1e2959312b51757653447de3e8c9e92029da6fd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 16:23:31 2011 -0700

    Fix a few of the more obvious non-errors while we're in here

 nova/api/openstack/servers.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 038d99d9fa4354bd617adfa332d69a87a9f7918e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 18:18:07 2011 -0500

    hacks in place

 nova/virt/xenapi/vmops.py |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

commit 703e680aa6d0da1953ec6f8ae3a6aa66dc9fad7e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 16:13:24 2011 -0700

    Fix the errors that pylint was reporting on this file
    
    This was meant more as a test of whether pylint was now returning false-positives.  It looks like the bugs it's reporting are at least partially real.

 nova/api/openstack/servers.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 3c0ae08b71c860383c215fa30c36693fd80f34c2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:58:16 2011 -0500

    foo

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bf2f491f3e7aa5522d306c2182c3d220eb49a55f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:56:48 2011 -0500

    foo

 nova/compute/manager.py   |    5 +++--
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit adb9c0f0d933f8a56e688b89cfa632ce5c9e4888
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 17:48:39 2011 -0500

    commit before monster

 nova/virt/xenapi/vmops.py |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit aecd4eb9d363875cd84be5aa6fdb9afeb500b4f4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 15:44:45 2011 -0700

    Fix __init__ method on unit tests (they take a method_name kwarg)

 nova/tests/api/openstack/test_images.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7b7033bfb31c610b1f0295e6059ed44931dfe450
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 15:28:09 2011 -0700

    Don't warn about C0111 (No docstrings)
    
    While docstrings are great, requiring them is probably going too far.  Let's get pylint useful first by having it not complain too much, then we can have a second stricter PyLint if desired.

 pylintrc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a151fabdb7f3edef8ba17b204fe55c73fc15720a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 15:25:21 2011 -0700

    In order to disable the messages, we have to use disable, not disable-msg.

 pylintrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65b11b3b9c76db2440d480bbc41b72f24bee8afc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 15:11:39 2011 -0700

    Avoid mixins on image tests, keeping pylint much happier

 nova/tests/api/openstack/test_images.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit a7990e0263f2113e3814209118ecb2afc140826e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 15:01:10 2011 -0700

    Use _ trick to hide base test class, thereby avoiding mixins and helping PyLint

 nova/tests/test_auth.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 524eb966045192dd535648929d70cac091d8e24e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:00:22 2011 -0500

    hurr

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8385599f941c5fe886de570b67f5e57e64e96468
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:58:46 2011 -0500

    hurr

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cc2d4728d32d016ef803d0def456cac6e315e8fa
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 17:56:40 2011 -0400

    get started testing

 nova/image/glance.py            |    6 ++++--
 nova/tests/image/test_glance.py |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

commit c7da5632e954c860defc322e971936a8d60eb8fd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:55:58 2011 -0500

    foo

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1aa44c3d8d0a22c5c5bc432d191a15656ad3351d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 14:34:44 2011 -0700

    Don't complain about the _ function being used

 pylintrc |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 0e63a45f40a2069d497878b7c05d00522c3a2774
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:24:38 2011 -0500

    Again

 nova/virt/xenapi/vmops.py |   13 ++++++++-----
 nova/virt/xenapi_conn.py  |    6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

commit 05ccc91bdb3ad47ffecee29d21835ded17f65816
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 17:24:32 2011 -0400

    pep8

 nova/api/openstack/views/flavors.py      |    4 ++--
 nova/tests/api/openstack/test_flavors.py |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit d95187aaf144cb40558f48d584a6bb8e07c6937d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 16 14:13:57 2011 -0700

    converted new lines from CRLF to LF

 .../versions/012_add_ipv6_flatmanager.py           |  302 +++++++++---------
 nova/tests/network/__init__.py                     |   94 +++---
 nova/tests/network/base.py                         |  308 +++++++++----------
 nova/tests/test_flat_network.py                    |  322 ++++++++++----------
 4 files changed, 513 insertions(+), 513 deletions(-)

commit bb606c7ba42fc567f2e9989e0f560783743e5ddd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 16:58:38 2011 -0400

    adding bookmarks links to 1.1 flavor entities

 nova/api/openstack/views/flavors.py      |   13 +++++++-
 nova/tests/api/openstack/test_flavors.py |   50 ++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

commit 007c2802e542bf954f0aa5b589f2adc3a1bfa89a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 15:41:53 2011 -0500

    Reverting

 nova/virt/xenapi/vmops.py |   10 +++-------
 nova/virt/xenapi_conn.py  |    8 ++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

commit 699abfe9e645ddbc854b42725247ab8fcd61517e
Merge: de7707f 0eaf02e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 16 20:36:22 2011 +0000

    Log the use of utils.synchronized.

commit 77a48cdd8a22cc84ed67a6b3d1c3793dd93e44a8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 16:15:56 2011 -0400

    expanding osapi flavors tests; rewriting flavors resource with view builders; adding 1.1 specific links to flavors resources

 nova/api/openstack/flavors.py            |   48 +++++++-------
 nova/api/openstack/views/flavors.py      |   45 ++++++++++++-
 nova/db/sqlalchemy/api.py                |    2 +-
 nova/tests/api/openstack/test_flavors.py |  107 ++++++++++++++++++++++++++++--
 4 files changed, 167 insertions(+), 35 deletions(-)

commit d54c467d28a0527d2f22b2ae39ec9556462cf1a4
Merge: 1d4d0e2 f17fb93
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 19:46:12 2011 +0000

    Merge from bug branch

commit f17fb9370d4af42267837a36c937f213669b0291
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:43:57 2011 -0500

    Dumb

 nova/api/openstack/flavors.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 227957e31d75b24bb8afa078c8d3f2bc447a8215
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 19:40:16 2011 +0000

    Unit test update

 nova/tests/api/openstack/test_flavors.py |    3 +++
 1 file changed, 3 insertions(+)

commit de7707f9707a0166d01d6a7dfce51f34c3c58967
Merge: 6b50c03 19a2f8c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 19:37:00 2011 +0000

    Fix lp727225 by adding support for personality files to the openstack api.
    
    Description:
    
    This merge adds support for personality files to the openstack api. It leverages previous work which added this functionality to the compute api, compute manager, and xen api.

commit 85bae497aa803914d329f2872d343a9982dc370e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:35:04 2011 -0500

    Changes

 nova/api/openstack/flavors.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6b50c033b1a464c6681aae279f0763e135aacf65
Merge: 7dbda7c 157ea09
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 19:26:41 2011 +0000

    fixes bug 735298: start of nova-compute not possible because of wrong xml paths to the //host/cpu section in "virsh capabilities", used in nova/virt/libvirt_conn.py

commit 3459cfb89bd90605e54fd1fb28b8b38089f3e236
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 15:20:08 2011 -0400

    update image service documentation

 nova/image/service.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 19a2f8ce5174fa758de9031d64f1bed0f7c44788
Merge: fc07cae 7dbda7c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 15:16:16 2011 -0400

    merge lp:nova and resolve conflicts

commit 7de1ef791296d547c2691454d5cb5451087cd76b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 12:15:57 2011 -0700

    User ids are strings, and are not necessarily == name.  Also fix so that non-existent user gives a 404, not a 500.

 nova/api/openstack/users.py               |   17 +++++++--
 nova/auth/manager.py                      |   11 +++++-
 nova/tests/api/openstack/fakes.py         |    4 +-
 nova/tests/api/openstack/test_accounts.py |   22 +++++------
 nova/tests/api/openstack/test_auth.py     |    8 ++--
 nova/tests/api/openstack/test_users.py    |   58 +++++++++++++++++++----------
 6 files changed, 79 insertions(+), 41 deletions(-)

commit 1d4d0e26ae6ece5e68417deaa4ddcf4b7757bd37
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:09:14 2011 -0500

    Fudge

 nova/compute/api.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 7dbda7ca270ee5109f307be3d0f1fb7c0336ce21
Merge: 9fa74cd 663c172
Author: jaypipes@gmail.com <>
Date:   Wed Mar 16 19:02:17 2011 +0000

    Keypairs are not required in the OpenStack API; don't require them!
    
    This cleans up some weirdness from the original branch (https://code.launchpad.net/~justin-fathomdb/nova/bug732204/+merge/53359) with justin's LP username in r804.

commit 3f637a9325ffa7b0cc8a2369576b9fc4f2ebf0f5
Merge: 5ca1067 dfd0e8a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 16 18:56:52 2011 +0000

    Merging trunk

commit 9fa74cdae1dcf94586ddb7924c044cb26112b67b
Merge: dfd0e8a 8a41046
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 16 18:56:47 2011 +0000

    Add missing fallback chain for ipv6.

commit 5ca10673e77763706e7b26e30f0212930ad1f929
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 16 18:56:31 2011 +0000

    Typo fix

 nova/image/glance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 157ea09c03148ff4615bae27ca3f276a05620825
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 19:54:15 2011 +0100

    fixed pep8 issue

 nova/virt/libvirt_conn.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ebd452eab95c2f205d3f7419c08c288030c38aba
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:53:49 2011 -0500

    chchchchchanges

 nova/compute/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit af754e3bba9b2ee93147a3533319ac5a5e199f45
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 16 21:51:32 2011 +0300

    libvirt template and libvirt_conn.spawn modified in way that was proposed for xenapi multinic support

 nova/virt/libvirt.xml.template                     |   21 ++--
 nova/virt/libvirt_conn.py                          |  121 ++++++++++++++------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +-
 3 files changed, 101 insertions(+), 44 deletions(-)

commit 663c1726d9a96540b8fd729223fcb34d7cf3cdf7
Author: jaypipes@gmail.com <>
Date:   Wed Mar 16 14:49:25 2011 -0400

    Re-commit r805

 nova/tests/api/openstack/test_servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 7fa96f6292ff7d63621fe024b1ef45b1a1996121
Author: jaypipes@gmail.com <>
Date:   Wed Mar 16 14:49:18 2011 -0400

    Re-commit r804

 nova/tests/api/openstack/test_servers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4d057c9c2df77816ead6f30fa2795148aa8148d3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 11:44:40 2011 -0700

    Refactored ZoneRedirect into ZoneChildHelper so ZoneManager can use this too.

 nova/api/zone_redirect.py      |   79 ++++++++++++++++++++++------------------
 nova/compute/api.py            |    8 +---
 nova/scheduler/api.py          |   40 ++++++++++++++++----
 nova/scheduler/zone_manager.py |    2 +-
 4 files changed, 79 insertions(+), 50 deletions(-)

commit dfd0e8a32ae40043a78c12fb871c11bb9bd0f4c3
Merge: 7dec290 22aad67
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 16 18:42:41 2011 +0000

    Don't generate insecure passwords where it's easy to use urandom instead

commit f05e4d0cec29ed352c6afbe32ab5b12382769711
Merge: 33419a2 5473f3a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 14:40:42 2011 -0400

    merging openstack-api-version-split

commit d8c3ea5e6b594e6285650c5bdac6302b7be295dc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:39:43 2011 -0500

    chchchchchanges

 nova/virt/xenapi/vmops.py |    1 +
 1 file changed, 1 insertion(+)

commit 11e7b6a08d1557a0986b480c032958cd30762f33
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:31:05 2011 -0500

    chchchchchanges

 nova/virt/xenapi/vmops.py |    2 --
 nova/virt/xenapi_conn.py  |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 7dec290a12603200b45832f43755e6d7fa88980e
Merge: ce205ea 0166695
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 16 18:26:41 2011 +0000

    Fixes euca-get-ajax-console returning Unknown Error, by using the correct
    exception in get_open_port() logic. Patch from Tushar Patil.

commit 647f5f0d0283b3852115d821b80a965b0bc92c35
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:24:51 2011 -0500

    chchchchchanges

 nova/virt/xenapi/vmops.py |   19 ++++++++++---------
 nova/virt/xenapi_conn.py  |    3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

commit 7b21275c0c05a9a7dbb23463f2b90623d79645ec
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 14:22:29 2011 -0400

    Revert commit that modified CA/openssl.cnf.tmpl.

 CA/openssl.cnf.tmpl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 804a3136b387530373b030602a112063fa84247d
Merge: f91cd67 ce205ea
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 14:13:37 2011 -0400

    Merge w/ trunk.

commit f91cd67c403d7de54600eea0d91c223af0493788
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 14:09:29 2011 -0400

    Comment update.

 nova/api/openstack/extensions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e2399c434386a31114273f2cf6f14586a25480c2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:06:49 2011 -0500

    Derped again

 nova/virt/xenapi/vmops.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit b2456e983178b97ad94f48c77ef210000d6d6ca4
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 14:03:38 2011 -0400

    Move mapper code into the _action_ext_controllers and _response_ext_controllers
    methods.

 nova/api/openstack/extensions.py                  |   65 +++++++++++----------
 nova/tests/api/openstack/extensions/foxinsocks.py |    2 +-
 nova/tests/api/openstack/test_extensions.py       |    7 ++-
 3 files changed, 39 insertions(+), 35 deletions(-)

commit a31e715617e5af107bc79caeedf0aff41f65fb07
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 12:57:45 2011 -0500

    The geebees

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d418926b514372f0f48922024e600bafcc657fd9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 12:50:11 2011 -0500

    forgot to return network info - teehee

 nova/virt/xenapi/vmops.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 5379f3654e04a0443f3237623f772a17f13e9d90
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 12:44:38 2011 -0500

    refactored, bugfixes

 nova/virt/xenapi/vm_utils.py |    4 +-
 nova/virt/xenapi/vmops.py    |  163 ++++++++++++++++++------------------------
 2 files changed, 72 insertions(+), 95 deletions(-)

commit a04340d1c0ff5c18ad1100b033bafc3d0a571392
Merge: 8374e58 ce205ea
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 17:42:10 2011 +0000

    merge trunk

commit 5473f3a47c1b11c6625960e1ed73c28c7b061fcb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 13:41:00 2011 -0400

    moving code out of try/except that would never trigger NotFound

 nova/api/openstack/servers.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit d1958f61e5573b6a4101564e6e4b1969000eccca
Merge: bb52b51 d36b4d5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 17:14:39 2011 +0000

    merge trunk

commit d99a8d48cf38eb6be01587f9b377f48ff6cd88a2
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 17:09:13 2011 +0000

    Logging statements

 nova/virt/xenapi/vmops.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ce205ea2c92de2a77f2c308a71551040fa2444df
Merge: d36b4d5 8b3e35b
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 17:06:30 2011 +0000

    added new class Instances for managaging instances
    added new method list in class Instances:
    
    # nova-manage instance list
    instance node type state launched image kernel ramdisk project user zone index
    i-00000547 XXXXXXX m1.small running 2011-02-18 08:36:37 ami-a03ndz0q ami-0isqekvw testing berendt None 0
    i-00000548 XXXXXXX m1.small running 2011-02-18 08:37:17 ami-a03ndz0q ami-0isqekvw testing berendt None 1
    i-00000549 XXXXXXX m1.small running 2011-02-18 08:37:52 ami-a03ndz0q ami-0isqekvw testing berendt None 2
    
    # nova-manage instance list ares
    instance   node            type       state      launched            image        kernel       ramdisk       project    user       zone       index
    i-00000c1c ares            m1.tiny    running    2011-02-26 22:51:40 ami-pus9dj84 ami-zhcv0yyx ami-av96fu30  testing    berendt    None       1
    
    extended the method list in class FixedIps to lookup ip addresses assigned to a specified node:
    
    # nova-manage fixed list ares
    network           	IP address     	MAC address      	hostname       	host
    192.168.3.0/24    	192.168.3.6    	02:16:3e:75:d7:9a	i-00000c1c     	ares

commit dee86f53b0d1dccbc69d354b66ca7a4767e81d43
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:54:10 2011 -0500

    tweak

 nova/compute/manager.py   |    1 -
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 9cb503ae9d4112fa464f2284631ad1e24f8f7ce4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:38:40 2011 -0500

    Stuff

 nova/virt/xenapi/vmops.py |    3 +--
 nova/virt/xenapi_conn.py  |    6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

commit f5ad4125d00396a7a3a334eb347aeeb47d8d4989
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 16 22:01:41 2011 +0530

    Removing io_util.py. We now use eventlets library instead.

 nova/virt/vmwareapi/io_util.py |  149 ----------------------------------------
 1 file changed, 149 deletions(-)

commit d1469d1566a67d41cb4de4ff06deaf441e099062
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:26:40 2011 -0500

    Some typos

 nova/compute/api.py                                |    4 +++-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 45ca7b71a8e749cbd9b7729b922190e9aaa53744
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 16 21:54:02 2011 +0530

    * Updated document vmware_readme.rst to mention VLAN networking
    * Corrected docstrings as per pep0257 recommentations.
    * Stream-lined the comments.
    * Updated code with locals() where ever applicable.
    * VIM : It stands for VMware Virtual Infrastructure Methodology. We have used the terminology from VMware.  we have added a question in FAQ inside vmware_readme.rst in doc/source
    * New fake db: vmwareapi fake module uses a different set of fields and hence the structures required are different. Ex: bridge : 'xenbr0' does not hold good for VMware environment and bridge : 'vmnic0' is used instead. Also return values varies, hence went for implementing separate fake db.
    * Now using eventlet library instead and removed io_utils.py from branch.
    * Now using glance.client.Client instead of homegrown code to talk to Glance server to handle images.
    * Corrected all mis-spelled function names and corresponding calls. Yeah, an auto-complete side-effect!

 doc/source/vmwareapi_readme.rst        |    6 +-
 nova/console/vmrc.py                   |   16 ++--
 nova/console/vmrc_manager.py           |   35 +++++--
 nova/network/vmwareapi_net.py          |   36 +++-----
 nova/tests/test_vmwareapi.py           |   28 +++---
 nova/tests/vmwareapi/__init__.py       |    5 +
 nova/tests/vmwareapi/db_fakes.py       |   12 +--
 nova/tests/vmwareapi/stubs.py          |    6 +-
 nova/virt/vmwareapi/__init__.py        |    2 +-
 nova/virt/vmwareapi/error_util.py      |   48 ++++++----
 nova/virt/vmwareapi/fake.py            |  122 +++++++++++++-----------
 nova/virt/vmwareapi/network_utils.py   |   28 +++---
 nova/virt/vmwareapi/read_write_util.py |  145 ++++-------------------------
 nova/virt/vmwareapi/vim.py             |   59 ++++++------
 nova/virt/vmwareapi/vim_util.py        |   45 ++++-----
 nova/virt/vmwareapi/vm_util.py         |   70 +++++++-------
 nova/virt/vmwareapi/vmops.py           |  159 ++++++++++++++++++--------------
 nova/virt/vmwareapi/vmware_images.py   |  109 ++++++++--------------
 nova/virt/vmwareapi_conn.py            |   83 +++++++++--------
 tools/esx/guest_tool.py                |   31 ++++---
 20 files changed, 500 insertions(+), 545 deletions(-)

commit 39b3c3b6216aea32f88e529603a63b643d5940ae
Merge: d714df5 d36b4d5
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 11:05:12 2011 -0400

    Merge w/ trunk.

commit d714df5ed4a6a1d4f1c0f7680c2fbb6a6abb81a5
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 16 11:02:22 2011 -0400

    Implement top level extensions.

 nova/api/openstack/extensions.py                  |   94 +++++++++++++++++++--
 nova/tests/api/openstack/extensions/foxinsocks.py |   70 +++++++++++++++
 nova/tests/api/openstack/extensions/widgets.py    |   54 ------------
 nova/tests/api/openstack/test_extensions.py       |   68 ++++++++++-----
 4 files changed, 204 insertions(+), 82 deletions(-)

commit a586714557e38116b6b4f473aa21ac54ff0223e7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 16 10:10:58 2011 -0400

    Added i18n to error message.

 nova/api/openstack/limits.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8dffae687e78a1fa2a8cf0d321d64ee95a35cc1f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 06:47:27 2011 -0700

    Checks locally before routing

 nova/api/zone_redirect.py |   34 +++++++++++++++-------------------
 nova/scheduler/api.py     |   11 ++++++++---
 2 files changed, 23 insertions(+), 22 deletions(-)

commit a21efc63be6bad3bbde41eb96d6a1752e6d8174d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:26:37 2011 -0400

    Really fix testcase

 nova/tests/test_virt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8f9a5ecb7d3907456b9a77f3321ed09feb5c5f2f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:24:17 2011 -0400

    More execvp fallout

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7fbf061666516705e74592c3660155e86d3da895
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:15:46 2011 -0400

    Fix up testsuite for lxc

 nova/tests/test_virt.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ddeede35a5036aa3c80742fde69468aedbc74892
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 06:09:00 2011 -0700

    Error codes handled properly now

 nova/api/zone_redirect.py |   94 +++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 41 deletions(-)

commit 8374e584ff2466b6a8bd4b9a82b81f5750861e18
Merge: 98f725e d36b4d5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:46:13 2011 +0000

    merge trunk

commit 373562b150824856be2ea32abcb9dd10cd9b553f
Merge: 915fb50 d36b4d5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:44:12 2011 +0000

    Merge trunk

commit bb52b51d0e4f9b297dcc489562f38d1647e10856
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:34:39 2011 +0000

    Adding unit test

 nova/network/manager.py    |    2 ++
 nova/network/xenapi_net.py |    3 ++
 nova/tests/db/fakes.py     |   45 +++++++++++++++++++++++++----
 nova/tests/test_xenapi.py  |   22 +++++++++++++--
 nova/virt/xenapi/fake.py   |   67 ++++++++++++++++++++++++++++++++++++++++----
 nova/virt/xenapi/vmops.py  |    2 +-
 6 files changed, 127 insertions(+), 14 deletions(-)

commit 2e81ce6bb5b1083220e7ae5c17113fd44465ddbf
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Wed Mar 16 21:17:19 2011 +0900

    Fix instance creation fail under use_ipv6=false and FlatManager

 nova/virt/libvirt_conn.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 8964cbecc10885bc6eff08544d62db1747fb14ef
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Wed Mar 16 20:24:20 2011 +0900

    pep8 clean

 .../versions/012_add_ipv6_flatmanager.py           |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit af2cae27930a3983c96a0b1705f828d65d4829cd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 16 12:18:15 2011 +0100

    Fix a couple of things that assume that libvirt == kvm/qemu.

 bin/nova-manage           |    4 +++-
 nova/virt/libvirt_conn.py |   42 +++++++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 16 deletions(-)

commit e2f8c143eab3b43acd9e3658a480f75f435e7d42
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Wed Mar 16 19:51:06 2011 +0900

    Updating gateway_v6 in _on_set_network_host() is not required for FlatManager

 nova/network/manager.py |    5 -----
 1 file changed, 5 deletions(-)

commit ba35831c1f66c424e9495642ba23e9d2742a339e
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 10:58:02 2011 +0100

    added correct path to cpu information (tested on a system with 1 installed cpu package)

 nova/virt/libvirt_conn.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 016669543a1f6d4ffc281637ba98c6b6fe30be82
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 16 10:38:48 2011 +0100

    Fix unknown exception error in euca-get-ajax-console

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b3e35b157c688fd38d5aa0eb10ddef33653003d
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 10:29:04 2011 +0100

    fixed pep8 errors (with version 0.5.0)

 bin/nova-manage |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 20031162372329b40ca90b1bc39cebb4f187cace
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 23:22:17 2011 -0700

    Use integer ids for (fake) users

 nova/tests/api/openstack/fakes.py         |    3 +--
 nova/tests/api/openstack/test_accounts.py |    4 ++--
 nova/tests/api/openstack/test_users.py    |    4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

commit 78542ad1de6476a8962fa0c3b273c4a272410a83
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 16 00:38:47 2011 -0400

    req envirom param 'nova.api.openstack.version' should be 'api.version'

 nova/api/openstack/auth.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 33419a2f84ea6bfbf6ff47fb1f01ef0c21389a54
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 00:22:34 2011 -0400

    pep8 fixes

 nova/tests/api/openstack/test_flavors.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ceb8cd14f968aa063bd6a19999340f77c5603568
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Mar 15 21:04:38 2011 -0700

    Fixed DescribeUser in ec2 admin client

 nova/adminclient.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit 659cb8bd43e2091c61f44dacf21274a677ea3146
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 23:35:44 2011 -0400

    openstack api 1.0 flavors resource now implemented; adding flavors request value testing

 nova/api/openstack/flavors.py            |   12 +++--
 nova/tests/api/openstack/test_flavors.py |   71 +++++++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 5 deletions(-)

commit 7a61965908ebfc076ad3b1d9cdc5773ade50bf75
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 15 20:30:27 2011 -0700

    response working

 nova/api/zone_redirect.py |  100 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

commit be9a218e2e4b01fe19722fb0073731d8ae6a7eea
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 23:13:05 2011 -0400

    Added tests back for RateLimitingMiddleware which now throw correctly serialized
    errors with correct error codes.
    
    Removed some error printing, and simplified some other parts of the code with
    suggestions from teammates.

 nova/api/openstack/faults.py            |   22 +++-
 nova/api/openstack/limits.py            |   25 ++---
 nova/tests/api/openstack/test_limits.py |  172 +++++++++++++++++++++----------
 nova/wsgi.py                            |    1 -
 4 files changed, 148 insertions(+), 72 deletions(-)

commit 0053b776276e9cac617c812931c248be7e49fea2
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 15 23:00:09 2011 -0400

    Add ResponseExtensions.

 nova/api/openstack/extensions.py               |  144 +++++++++++++++++++-----
 nova/tests/api/openstack/extensions/widgets.py |   26 ++++-
 nova/tests/api/openstack/test_extensions.py    |  103 ++++++++++++-----
 3 files changed, 213 insertions(+), 60 deletions(-)

commit 60c7ce60826becb1ebe7f75a0a0d28b2893d70c0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 15 18:54:51 2011 -0700

    revised per code review

 nova/image/local.py                     |   11 +++++++----
 nova/tests/api/openstack/test_images.py |    9 +++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

commit f91d7925761f8204fdd46435ff57d74ae17483cf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 15 18:29:26 2011 -0700

    first pass openstack redirect working

 etc/api-paste.ini             |    5 ++++-
 nova/api/openstack/servers.py |    1 +
 nova/compute/api.py           |    3 ++-
 nova/compute/manager.py       |    6 +++++-
 nova/exception.py             |    6 +++---
 nova/scheduler/api.py         |   13 +++++++++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

commit 6911123fda88c9793a70ea4b03d0352c9c38f938
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 21:26:45 2011 -0400

    Adding newlines for pep8.

 nova/api/openstack/common.py        |    1 +
 nova/api/openstack/views/flavors.py |    1 +
 nova/api/openstack/views/images.py  |    1 +
 3 files changed, 3 insertions(+)

commit 5ba3e21875d3cf3b71082477311902891706eee4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 21:09:26 2011 -0400

    Removed VIM specific stuff and changed copyright from 2010 to 2011.

 nova/api/openstack/limits.py            |    4 +---
 nova/tests/api/openstack/test_limits.py |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

commit 5e45d0ba921566e98817cb9e62e383f84c30c5f6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 20:51:17 2011 -0400

    Limits controller and testing with XML and JSON serialization.

 nova/api/openstack/limits.py                  |   42 +-
 nova/tests/api/openstack/test_limits.py       |  524 +++++++++++++++++++++++++
 nova/tests/api/openstack/test_ratelimiting.py |  387 ------------------
 nova/wsgi.py                                  |    1 +
 4 files changed, 556 insertions(+), 398 deletions(-)

commit c42d79b58eccaebab14274adf09128d890e920f7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 20:37:37 2011 -0400

    adding imageRef and flavorRef attributes to servers serialization metadata

 nova/api/openstack/servers.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 166c58ed33c2858a47e145878a288136c93f65ee
Merge: 5d0ca37 d36b4d5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 17:23:27 2011 -0700

    Merged with trunk (and brian's previous fixes to fake auth)

commit 9650e73db3e18f839f8abf7a47aebb6fbf8c9e36
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 19:10:50 2011 -0500

    Plugin

 nova/virt/xenapi/vmops.py                          |    1 -
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

commit bee1951ac78688e49939aee4e2285ef0ff89adb2
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 19:55:13 2011 -0400

    As suggested by Eric Day:
     * changed request.environ version key to more descriptive 'api.version'
     * removed python3 string formatting
     * added licenses to headers on new files

 nova/api/openstack/auth.py               |    2 +-
 nova/api/openstack/common.py             |    3 +++
 nova/api/openstack/views/addresses.py    |   22 +++++++++++++++++++---
 nova/api/openstack/views/flavors.py      |   23 ++++++++++++++++++++---
 nova/api/openstack/views/images.py       |   23 ++++++++++++++++++++---
 nova/api/openstack/views/servers.py      |   20 +++++++++++++++++++-
 nova/tests/api/openstack/fakes.py        |    4 ++--
 nova/tests/api/openstack/test_servers.py |    4 ++--
 8 files changed, 86 insertions(+), 15 deletions(-)

commit 39e722b58b87297aee770637f6a82ee1f206aecf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 18:51:22 2011 -0500

    Tweak

 nova/virt/xenapi/vmops.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 74987666f89b4d15ffcf17b43b3752135ba08a65
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 18:48:17 2011 -0500

    A few fixes

 nova/compute/manager.py   |    2 +-
 nova/virt/xenapi/vmops.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit fc07caece79e379b6d6f2a3220806af9271e349b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 19:23:46 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f9d4b3b65ff5e96284aa2fc8d84a70cea7f8225a
Merge: e237b4a d36b4d5
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 19:22:51 2011 -0400

    merge lp:nova

commit e237b4a5653384688b16f7fd2c0708eaec4b9ec7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 19:11:21 2011 -0400

    ignore differently-named nodes in personality and metadata parsing

 nova/api/openstack/servers.py            |   10 +-
 nova/tests/api/openstack/test_servers.py |  164 +++++++++++++++++++++---------
 2 files changed, 126 insertions(+), 48 deletions(-)

commit 6d984c3097252f9f97ef10e48be390fdf756b391
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 15 16:08:22 2011 -0700

    wrap errors getting image ids from local image store

 nova/image/local.py                     |   14 ++++++++++++--
 nova/tests/api/openstack/test_images.py |    7 +++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

commit 67c871a257c684de3cb0f1416b1b2b6e9a99fe23
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 17:37:07 2011 -0500

    Moving the migration again

 .../versions/011_add_flavors_to_migrations.py      |   44 --------------------
 .../versions/012_add_flavors_to_migrations.py      |   44 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)

commit d4f859803eeb5a123835a3996ccfc64d35dbcb4b
Merge: 74068a7 cc25d27
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 18:14:38 2011 -0400

    Updating paste config.

commit 70769dbe239c979d97154b88a33cb34d377d1196
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 18:12:46 2011 -0400

    pep8

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3cc78174e023b3f848b9c4b30468d356ee575ea6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 18:11:54 2011 -0400

    internationalization

 nova/api/openstack/servers.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 74068a7b504a95dc8e0339faa04c8c5520417f32
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 18:10:25 2011 -0400

    Per Eric Day's suggest, the verson is not store in the request environ instead
    of the nova.context.

 nova/api/openstack/auth.py               |    4 ++--
 nova/api/openstack/views/addresses.py    |    2 +-
 nova/api/openstack/views/flavors.py      |    2 +-
 nova/api/openstack/views/images.py       |    2 +-
 nova/api/openstack/views/servers.py      |    2 +-
 nova/context.py                          |    7 ++-----
 nova/tests/api/openstack/fakes.py        |    4 +++-
 nova/tests/api/openstack/test_servers.py |   16 ++--------------
 8 files changed, 13 insertions(+), 26 deletions(-)

commit ce61e4b5fdfb68e019b63a254847ef98deba63d6
Merge: e509cd7 d36b4d5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 17:07:21 2011 -0500

    Merge from trunk

commit e9ef6e04786a40d20f8022bec5d23d2e4503ce3a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 17:56:00 2011 -0400

    s/onset_files/injected_files/g

 nova/api/openstack/servers.py            |   16 ++++----
 nova/compute/api.py                      |   22 +++++------
 nova/compute/manager.py                  |    2 +-
 nova/db/sqlalchemy/models.py             |    2 +-
 nova/quota.py                            |   30 +++++++--------
 nova/tests/api/openstack/test_servers.py |   48 ++++++++++++------------
 nova/tests/test_quota.py                 |   60 +++++++++++++++---------------
 nova/virt/xenapi/vmops.py                |   21 ++++++-----
 8 files changed, 101 insertions(+), 100 deletions(-)

commit 1b477c2225816ea8f05595a8812932d516828e01
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 17:47:34 2011 -0400

    pep8 fixes

 nova/api/openstack/limits.py                  |   43 ++++++++++++-------------
 nova/tests/api/openstack/test_ratelimiting.py |   19 +++++------
 2 files changed, 30 insertions(+), 32 deletions(-)

commit 0eaf02efd5fef3f77fced9c1a71c32a6f14f293f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 15 16:21:22 2011 -0500

    Add logging to lock check

 nova/utils.py |    3 +++
 1 file changed, 3 insertions(+)

commit f1acc3d199a1a92b531a3e74ed54a8b2fcdb999c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 13:52:03 2011 -0700

    Now that the fix for 732866, stop working around the bug

 nova/tests/integrated/api/client.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 4b49df7e7232dfd3e187faac52b9eb72773be360
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 16:49:19 2011 -0400

    Major cosmetic changes to limits, but little-to-no functional changes. MUCH better testability now, no more relying on system time to tick by for limit testing.

 etc/api-paste.ini                             |    2 +-
 nova/api/openstack/__init__.py                |    6 +
 nova/api/openstack/faults.py                  |   21 ++
 nova/api/openstack/limits.py                  |  342 +++++++++++++++++++
 nova/tests/api/openstack/__init__.py          |    2 +-
 nova/tests/api/openstack/fakes.py             |   10 +-
 nova/tests/api/openstack/test_adminapi.py     |    1 -
 nova/tests/api/openstack/test_ratelimiting.py |  443 ++++++++++++++++---------
 8 files changed, 669 insertions(+), 158 deletions(-)

commit e1fb1111d04803b7ffd96b67ab37ae49e83e0d28
Merge: e0563f4 d36b4d5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 13:46:04 2011 -0700

    Merged with trunk to get fix for bug 732866

commit 7748d9b604e1bc46dd15b5ef3eca347b3b05fcf8
Merge: 3fb5da9 d36b4d5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 16:23:21 2011 -0400

    Merged trunk

commit da7800d77dbdfd754f6326f37b2b9f566bc07ac4
Merge: 3c10c1e d36b4d5
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 16:21:06 2011 -0400

    Merge trunk

commit cc25d277755f0e103ff09144d1d490536ab9acec
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 15:56:54 2011 -0400

    modifying paste config to support v1.1; adding v1.1 entry in versions resource ( GET /)

 etc/api-paste.ini              |    1 +
 nova/api/openstack/__init__.py |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit be35a1ce58b30d5b20e542b24d66947454d20fc3
Merge: 937c135 568528b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 15:05:43 2011 -0400

    Merge from trunk.

commit d36b4d5f3797521b1c2d13a0d30fe98a0671768e
Merge: 568528b 909b72f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 19:01:27 2011 +0000

    Fixed lp732866 by catching relevant `exception.NotFound` exception. Tests did not uncover this vulnerability due to "incorrect" FakeAuthManager. I say "incorrect" because potentially different implementations (LDAP or Database driven) of AuthManager might return different errors from `get_user_from_access_key`.
    
    Also, removed all references to 'bacon', 'ham', 'herp', and 'derp' and replaced them with hopefully more helpful terms.
    
    Long story short it addresses the immediate issue while throughly ignoring the larger issue, which is correctly testing all implementations of Auth. I find this acceptable as currently the future of auth is in flux.

commit 1d69d499124317aa1a9cf7d4bc54db2ff0bc3be9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 14:33:45 2011 -0400

    refactor onset_files quota checking

 nova/compute/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 937c135ec0c8b557b22ad30c400c75c713f660e1
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 14:31:48 2011 -0400

    Code clean up. Removing _decorate_response methods. Replaced them with more
    explicit methods, _build_image, and _build_flavor.

 nova/api/openstack/views/flavors.py |    6 ------
 nova/api/openstack/views/images.py  |    6 ------
 nova/api/openstack/views/servers.py |   30 ++++++++++++++++--------------
 3 files changed, 16 insertions(+), 26 deletions(-)

commit 22aad6700124411aceed0b2bd3953cbbc48b6130
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 11:24:07 2011 -0700

    Use random.SystemRandom for easy secure randoms, configurable symbol set by default including mixed-case

 nova/utils.py |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

commit 47b751e24651fa7d376e4df03a56430364dd811f
Merge: cda582a 568528b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 14:19:47 2011 -0400

    merge lp:nova

commit 56ff68056254610c4f0eb5cd5c5432a68ed30b2f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 10:42:32 2011 -0700

    Support testing the OpenStack API without key_pairs

 nova/tests/api/openstack/fakes.py        |   11 +++++++++--
 nova/tests/api/openstack/test_servers.py |    9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

commit 98f725e9b2fdf790c13d533ed8dcbb9ef1d61659
Merge: c6e75af 568528b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 15 17:29:51 2011 +0000

    merge trunk

commit c6e75afbe603a869723fd39b1a6df7b979da2aa4
Merge: 7649963 8c2a4a5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 15 17:24:16 2011 +0000

    Fixed bugs in bug fix (plugin call)
    
    Checked for pep8 errors
    
    Tested in several 'live' failure scenarios

commit e161b00349a7478ac9f51f087c9f16cd345bc2d2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 13:23:42 2011 -0400

    adding missing view modules; modifying a couple of servers tests to use enumerate

 nova/api/openstack/views/addresses.py    |   38 +++++++++++++++++++++++++++++
 nova/api/openstack/views/flavors.py      |   39 ++++++++++++++++++++++++++++++
 nova/api/openstack/views/images.py       |   39 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |    8 ++----
 4 files changed, 118 insertions(+), 6 deletions(-)

commit 568528bb0f90302106efbc4a841f05f18bd58357
Merge: 24142b1 62d7d52
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 15 16:41:12 2011 +0000

    just fixing a small typo in nova-manage vm live-migration

commit 10ae2e194e2c429620407ce5be7ce59ac5ccd761
Merge: eab99bb 6f72ba3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 15 09:29:46 2011 -0700

    exception fixup

commit 24142b1198da8560840356afee1896ace2d23d5c
Merge: 2134911 67a8d63
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 15 15:54:55 2011 +0000

    Make Authors check account for tests being run with different os.getcwd() depending on how they're run. Add missing people to Authors.

commit 213491128098c7838a1bdfc9c4a55264380e67cd
Merge: 990f7f0 567e3bc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 15:51:17 2011 +0000

    Removed duplicated tests.
    
    One was a straight copy-and-paste, one was different, but the masked test didn't pass.

commit 990f7f0a837fa2867e54e9e3eb4ce3d848e91847
Merge: 5da32f8 408a259
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 15 15:36:01 2011 +0000

    PEP8 0.5.0 cleanup.

commit 3c10c1ee1bcc3f3aad90e4e28761d1413ab203a9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 09:36:02 2011 -0400

    Really delete the loop

 nova/virt/disk.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit f60c9d0da8171b09bd7971fea52e9e032f98a143
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 08:05:45 2011 -0400

    Add comments about the destroy container function

 nova/virt/disk.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 48d3dd7f9d2633d8955080b6dccc7c97bc8ef7c3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 07:56:26 2011 -0400

    Mount the right device

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7020772a56094ab84df6c8c7d9525494f14c8363
Merge: 743e82c 5da32f8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 07:55:14 2011 -0400

    Merged trunk

commit 8a41046dc7cafb19afb6719866b11681daaa9082
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 15 09:48:21 2011 +0100

    Always put the ipv6 fallback in place. FLAGS.use_ipv6 does not exist yet when the firewall driver is instantiated and the iptables manager takes care not to fiddle with ipv6 if not enabled.

 nova/virt/libvirt_conn.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit a5bf9b4561d8ff0113406a975518b5fd4a4d3bd8
Merge: f72e5b6 5da32f8
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Mar 15 08:45:35 2011 +0100

    merged with trunk and removed conflicts

commit a039e4886532cd8db7a6e752f4dabda221ceb9b7
Merge: ad6f829 5da32f8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 05:43:53 2011 +0000

    Merging trunk

commit e0563f49792441af106c52e662bdada3c7997feb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:43:21 2011 -0700

    Reapplied rename to another file.

 nova/tests/integrated/test_login.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ad6f82909060cd4d1d99a1b1a9f33aa2788d8c94
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 05:37:08 2011 +0000

    serverId returned as int per spec

 nova/api/openstack/images.py            |    4 +-
 nova/image/glance.py                    |   63 ++++++++++++++++++++-----------
 nova/tests/api/openstack/test_images.py |   39 ++++++++++---------
 3 files changed, 64 insertions(+), 42 deletions(-)

commit db8beffc9acd90c748512c1fa9c127d39756232c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:36:30 2011 -0700

    Reapplied rename of Openstack -> OpenStack.  Easier to do it by hand than to ask Bazaar to do it.

 nova/tests/integrated/api/client.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 855da579147709b8070811751b3b3f684f9f78d6
Merge: 2b20306 5da32f8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:29:30 2011 -0700

    Merged with trunk.  Had to hold bazaar's hand as it got lost again.

commit 2b20306fcaddcb6b9bc57fb55b17230d709cd1ce
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:23:38 2011 -0700

    Derive unit test from standard nova.test.TestCase

 nova/tests/integrated/test_login.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 354f5e61c4bfb32ad8c2bc3389678f19db5fdb56
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 00:55:52 2011 -0400

    pep8 fixes

 nova/api/openstack/servers.py       |    3 ---
 nova/api/openstack/views/servers.py |   12 +++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

commit 18cd549ba8d7aa4c688a7f7a5e940acbaaa03acc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 00:49:20 2011 -0400

    adding flavors and images barebones view code; adding flavorRef and imageRef to v1.1 servers

 nova/api/openstack/servers.py            |   13 ++++-----
 nova/api/openstack/views/servers.py      |   42 ++++++++++++++++++++++++++----
 nova/tests/api/openstack/test_servers.py |   32 ++++++++++++++++++++---
 3 files changed, 72 insertions(+), 15 deletions(-)

commit 3cf224b9e676b88d1990b13476095be6ec156e5d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 21:28:42 2011 -0700

    Fixed problem with metadata creation (backported fix)

 nova/db/sqlalchemy/api.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 3d0cde272e3227978c5875c811c93e1e3df692ed
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 21:01:48 2011 -0700

    Clarify the logic in using 32 symbols

 nova/utils.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit c70e3777a488a63062c030e9949e9c16f2269f9c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 14 23:55:44 2011 -0400

    moving addresses views to new module; removing 'Data' from 'DataViewBuilder'

 nova/api/openstack/views/servers.py |   39 +++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

commit da605eb84f7d5de741225ff936447db01690a04f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 20:48:33 2011 -0700

    Don't generate insecure passwords where it's easy to use urandom instead

 nova/console/manager.py |    2 +-
 nova/console/xvp.py     |    4 ----
 nova/utils.py           |   15 ++++++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

commit d5b9391e2911ba2210a045a2af380dfc85d16919
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Mar 14 23:14:59 2011 -0400

    Added a views package and a views.servers module. For representing the response
    object before it is serialized.

 nova/api/openstack/servers.py            |   65 ++++---------------------
 nova/api/openstack/v1_0/servers.py       |    6 ---
 nova/api/openstack/v1_1/servers.py       |    8 ----
 nova/api/openstack/views/servers.py      |   76 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |    6 ++-
 5 files changed, 90 insertions(+), 71 deletions(-)

commit cc0340d7f9d9ab9b082af35df9b486c1e9a5a967
Merge: 5da32f8 a4e9497
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 20:07:06 2011 -0700

    Merge remote branch 'justinsb/bug732204' into bug732204

commit a4e94971b696681a5ced189d8f4263c8f77cc531
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 19:57:30 2011 -0700

    Make key_pair optional with OpenStack API

 nova/api/openstack/servers.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit f0141b1616e1b1fc9e52e33b37cc3a1091c57587
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 14 22:24:34 2011 -0400

    Moved extended resource code into the extensions.py module.

 nova/api/openstack/__init__.py                 |    6 ---
 nova/api/openstack/extensions.py               |   29 ++++++++---
 nova/tests/api/openstack/extensions/widgets.py |   15 ++----
 nova/tests/api/openstack/test_extensions.py    |   66 ++++++++++++------------
 4 files changed, 59 insertions(+), 57 deletions(-)

commit b5a6e343bb6a15e652b3a6924e1809a04a0eb421
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 01:14:58 2011 +0000

    Moving fixtures to a factory

 nova/tests/api/openstack/test_images.py |  109 ++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 38 deletions(-)

commit 743e82c0acac0fda78a55a8bbb65e601c4cb652c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 14 21:14:39 2011 -0400

    Refactor setup contianer/destroy container

 nova/virt/disk.py |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

commit a56a973e9d839df5bcd956126300afd7df4c2fe9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 00:37:13 2011 +0000

    Fixing API per spec, to get unit-tests to pass

 nova/api/openstack/images.py            |  118 ++++++++++++++++++++++++++++---
 nova/image/glance.py                    |   20 +++---
 nova/test.py                            |   26 +++++++
 nova/tests/api/openstack/fakes.py       |   13 ++--
 nova/tests/api/openstack/test_images.py |   93 ++++++++++++------------
 5 files changed, 204 insertions(+), 66 deletions(-)

commit 5da32f8b917d461388d0186af52946a3f7d2c665
Merge: c0ae4a4 29e59a9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 00:26:35 2011 +0000

    Implements basic OpenStack API client, ready to support API tests

commit f689d76634660d9efb245d4e73096107ca6df430
Merge: 1ecc7bb c0ae4a4
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 14 20:07:42 2011 -0400

    Merge trunk

commit c0ae4a4c857679c95b243ff954f513be8434d68d
Merge: 119bbe0 ce57cff
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 23:55:49 2011 +0000

    Fix capitalization of ApiError (it was mistakenly called APIError)

commit 57890776d0d7e9172b1fa056076ce28ae4b34b7b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 17:54:39 2011 -0500

    added migration to repo

 bin/nova-manage                                    |    2 +-
 nova/compute/manager.py                            |    6 +-
 .../migrate_repo/versions/010_mac_address_table.py |   74 ++++++++++++++++++++
 3 files changed, 78 insertions(+), 4 deletions(-)

commit 9dce9ee5fe5a1df018b9a606a3ea35b2dbfc987e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 15:37:29 2011 -0700

    Clarified message when a VM is not running but still in DB

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f135cc4d6069a0b882c8e848d3b6cb292002d10
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 15:37:04 2011 -0700

    Implemented Hyper-V list_instances_detail function.  Needs a cleanup
    by someone that knows the Hyper-V code

 nova/virt/hyperv.py |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit 567e3bc3a7e66896482d83420190a7c4a8df1e5a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 15:17:00 2011 -0700

    So the first of those tests doesn't pass.  Removing as it looks like
    it was meant to be deleted.

 nova/tests/test_compute.py |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

commit 738653b6b4ac744519a050fe50e7c795a7c63579
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 15:11:14 2011 -0700

    Added test and fixed up code so that it works

 nova/compute/manager.py    |   16 +++++++++++-----
 nova/tests/test_compute.py |   21 +++++++++++++++++++++
 nova/virt/fake.py          |    6 +++++-
 3 files changed, 37 insertions(+), 6 deletions(-)

commit 5b1422afe12d4e9b7fdfdc6a61cdcd51962dab4d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 14:43:53 2011 -0700

    Fix for LP Bug #704300

 nova/virt/libvirt_conn.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 1d1e5e38175ff7956b3a28ccc1ce61f700700e8b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 16:38:53 2011 -0500

    fixed keyword arg error

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 54f16ee6012082c1ad9de423698573c5d9b47540
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:38:39 2011 -0700

    pep8

 nova/virt/fake.py         |    1 -
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 5a0d4fbc24e897e4aa861819fd2f861e7dedcb6b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 16:33:01 2011 -0500

    added structure to virt.xenapi.vmops to support network info being passed in

 nova/virt/xenapi/vmops.py |  109 ++++++++++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 47 deletions(-)

commit 7c6aa5eb302637dde0d800f7155235858bbabbeb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:32:15 2011 -0700

    Removed duplicated test, renamed same-named (but non-identical) tests

 nova/tests/test_compute.py |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

commit 915fb5049258cf74a2fb3ae27789987f0757bc91
Merge: 3a4f5de 8c2a4a5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 21:23:27 2011 +0000

    merge trunk

commit 408a2591d60f5d238e60e4be9197ccc7262f2406
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 14 16:21:33 2011 -0500

    PEP8 cleanup

 nova/tests/db/fakes.py       |    4 ++--
 nova/tests/test_xenapi.py    |   11 +++++------
 nova/virt/xenapi/vm_utils.py |    3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

commit af747a5453ce7d8b68af91c7d4e1408f986061fd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 22:18:11 2011 +0100

    Fixes other half of LP#733609

commit c94ec9a5bab6c07b402b68e2f4ff081247a27cda
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:17:58 2011 -0700

    Initial implementation of refresh instance states

 nova/compute/driver.py      |   38 +++++++++++++++++++++++++++++
 nova/compute/manager.py     |   56 ++++++++++++++++++++++++++++++++++++++++++-
 nova/compute/power_state.py |   16 +++++++++----
 nova/utils.py               |    9 +++++++
 nova/virt/connection.py     |    4 +++-
 nova/virt/fake.py           |   36 ++++++++++++++++++++--------
 nova/virt/hyperv.py         |    4 +++-
 nova/virt/libvirt_conn.py   |   24 ++++++++++++++++++-
 nova/virt/xenapi/vmops.py   |   19 +++++++++++++++
 nova/virt/xenapi_conn.py    |    7 +++++-
 10 files changed, 194 insertions(+), 19 deletions(-)

commit 337bda95a9e12d395f838e81e279c875b056aba9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 22:17:14 2011 +0100

    Add missing fallback chain for ipv6.

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit ce57cff740bc7f821bdbb0dd1367c037b6fa1c01
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:02:27 2011 -0700

    The exception is called "ApiError", not "APIError"

 nova/virt/libvirt_conn.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 229c5bc3324d5df39ca959d71a540a806bc5ad3e
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 14 16:58:03 2011 -0400

    Implement action extensions.

 etc/api-paste.ini                              |    5 +-
 nova/api/openstack/__init__.py                 |    1 -
 nova/api/openstack/extensions.py               |  106 ++++++++++++++++++++++++
 nova/tests/api/openstack/extensions/widgets.py |   22 +++++
 nova/tests/api/openstack/test_extensions.py    |   44 +++++++++-
 5 files changed, 174 insertions(+), 4 deletions(-)

commit 119bbe04f3c1de06a8c40502c314f13c89561564
Merge: 8c2a4a5 a8a5a56
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 20:55:47 2011 +0000

    Include cpuinfo.xml.template in tarball.

commit 7fe5052f9e8dbaebce45b44a545be9707f6480a6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Mar 14 20:38:05 2011 +0000

    Adding instance_id as Glance image_property

 nova/compute/api.py                     |    2 +-
 nova/image/glance.py                    |   58 ++++++++++++++++++++++++++++---
 nova/test.py                            |   31 +++++++++++++++++
 nova/tests/api/openstack/fakes.py       |   19 ++++++++--
 nova/tests/api/openstack/test_images.py |   41 ++++++++++++++++++++++
 5 files changed, 144 insertions(+), 7 deletions(-)

commit a8a5a568aac1918fd359dfa886831f2f39501945
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 21:20:55 2011 +0100

    Add fixes metadata

commit f4e7da2d9f7d6793b383c5f187939f19ec849f0a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 21:10:11 2011 +0100

    Include cpuinfo.xml.template in tarball.

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit dc6c58218caf30232f6d4d9a7a44e5d1a338abea
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 12:41:21 2011 -0700

    Merged test_network.py properly. Before I had deleted this file and added again, but this file status should be modified when you see the merged difference

commit 11086de8ac1606e490bccbca6de1befe34c1d980
Merge: 20c0b63 8c2a4a5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 12:09:57 2011 -0700

    removed conflicts and merged with trunk

commit 266ea0bdd1da014a3cf23c7003f7fc932f447d35
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Mar 14 15:02:59 2011 -0400

    Create v1_0 and v1_1 packages for the openstack api. Added a servers module
    to each. Added tests to validate the structure of ip addresses for a 1.1
    request.

 nova/api/openstack/servers.py            |   28 +++++++---------------------
 nova/api/openstack/v1_0/servers.py       |    6 ++++++
 nova/api/openstack/v1_1/servers.py       |    8 ++++++++
 nova/tests/api/openstack/fakes.py        |    1 +
 nova/tests/api/openstack/test_servers.py |   23 +++++++++++++++++++++++
 5 files changed, 45 insertions(+), 21 deletions(-)

commit 093c8200a102891232e2da166830cd59ee133fc4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 13:32:22 2011 -0500

    committing to share

 bin/nova-manage              |    8 ++-
 nova/compute/api.py          |    3 +-
 nova/compute/manager.py      |   12 +++-
 nova/db/api.py               |   39 +++++++++++--
 nova/db/sqlalchemy/api.py    |  131 ++++++++++++++++++++++++++++++++++++++----
 nova/db/sqlalchemy/models.py |   76 +++++++++++++-----------
 nova/exception.py            |    4 ++
 nova/network/api.py          |    6 ++
 nova/network/manager.py      |   61 +++++++++++++++-----
 nova/tests/test_compute.py   |    1 -
 nova/tests/test_quota.py     |    1 -
 nova/tests/test_scheduler.py |    1 -
 nova/tests/test_volume.py    |    1 -
 nova/utils.py                |    8 ---
 14 files changed, 270 insertions(+), 82 deletions(-)

commit 62d7d521273e19d8e700ab301be38830576efa3b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 14 11:27:21 2011 -0700

    small typo in nova-manage vm live-migration

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c2a4a565e718e594a2f42ff84eb4b9017ef15a7
Merge: e787e03 8cf9e23
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Mar 14 18:11:30 2011 +0000

    NTT's live-migration branch, merged with trunk, conflicts resolved, and migrate file renamed.

commit 20c0b63425090621e86f913bba3dcec79dc191c7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 11:08:33 2011 -0700

    Reverted unmodified files

commit 06051ac8660983aae9ea6e72ab9bb1a31ceed9af
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 11:08:00 2011 -0700

    Reverted unmodified files

 tools/ajaxterm/README.txt |  240 ++++++++++++++++++++++-----------------------
 1 file changed, 120 insertions(+), 120 deletions(-)

commit 8cf9e2320b0d7f4c79d910cbac1f5a0db9aa999c
Merge: 0dcd680 7fde254
Author: jaypipes@gmail.com <>
Date:   Mon Mar 14 13:59:41 2011 -0400

    Merge trunk, resolve conflicts, and rename 010_ migrate file to 011_ since another migrate file got into trunk ahead of this...

commit e787e03d944d96cd51f203045179430bb89bb933
Merge: 7fde254 d250d52
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 17:50:33 2011 +0000

    Only include kernel and ramdisk ID in meta-data output if they are actually set.

commit e509cd70e7a2e8a430b2b24af50adcf1ad763564
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 14 17:24:39 2011 +0000

    Test fixes and some typos

 nova/compute/api.py        |    4 ++--
 nova/compute/manager.py    |    2 +-
 nova/db/sqlalchemy/api.py  |    4 ++--
 nova/tests/test_compute.py |   23 +++++------------------
 4 files changed, 10 insertions(+), 23 deletions(-)

commit 1ebae577150ce64d81d102c2e162acfe5a72528b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 12:07:27 2011 -0500

    Test changes

 nova/compute/api.py        |    2 +-
 nova/tests/test_compute.py |   15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

commit 1f763599d733de1ded1074dee828237256eda01d
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 14 16:59:46 2011 +0000

    Migration moved again

 .../versions/010_add_flavors_to_migrations.py      |   44 --------------------
 .../versions/011_add_flavors_to_migrations.py      |   44 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)

commit af5e752e8eb21d0e9192d9acd9e75586bdec3685
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 11:55:55 2011 -0500

    Compute test

 nova/tests/test_compute.py |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

commit 7649963c7bcda67744988d6a65747c8b67d4a0f1
Merge: e2aed10 7fde254
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 16:50:35 2011 +0000

    merge trunk

commit 3a4f5de30362bb32846db69b98cda16eae88ee99
Merge: 4f2d48e 7fde254
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 16:49:46 2011 +0000

    merge trunk

commit 7fde254ec53aeb88301e5592853961b2b9c87ef4
Merge: ab982a0 04838ee
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 15:45:15 2011 +0000

    Make nova-dhcpbridge output lease information in dnsmasq's leasesfile format.

commit 35f90b585711b0d4dc54aeddff79968331263758
Merge: 1c4afe2 ab982a0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 10:16:59 2011 -0500

    Merge from trunk

commit 37d7c83e658e5046c258a9b04622b3ddd91a7e8f
Merge: d45947d ab982a0
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Mar 14 09:54:57 2011 -0500

    Merged my doc changes with trunk

commit e2aed1036c0fb61a2924ffa28d66f87539d43ba1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 14:52:19 2011 +0000

    Fixed pep8 errors

 nova/tests/db/fakes.py       |    2 +-
 nova/tests/test_xenapi.py    |    6 +++---
 nova/virt/xenapi/vm_utils.py |    8 ++++----
 nova/virt/xenapi/vmops.py    |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

commit 68dae00b7b1580c4b816058f748b272fe5e07c64
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 14:49:16 2011 +0000

    Fixed failing tests in test_xenapi

 nova/virt/xenapi/vm_utils.py |    6 +++---
 nova/virt/xenapi/vmops.py    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit d45947d83fa22f98b0889d269d447fabaa764a3c
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Mar 14 09:48:58 2011 -0500

    Fixes link to 2011.1 instad of just to trunk docs

 doc/source/_theme/layout.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab982a009f2ab608a1acbe2d5cc2d0fb6b488b53
Merge: 3fb5da9 65f6648
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Mon Mar 14 14:39:50 2011 +0000

    fixes: 733137

commit 04838ee14d0ac6df0052fba465cdf7f765c66ae5
Merge: c8fc7ed 3fb5da9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 14:21:44 2011 +0100

    Merge trunk

commit c8fc7ed48be84e3b39ab88c8c103fbe52b6718e1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 14:06:10 2011 +0100

    Add a unit test

 nova/network/linux_net.py  |   17 +++++++++++------
 nova/tests/test_network.py |   27 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

commit faaba758a33d9539a9b2b6f4c9a1d49b3caa13f8
Merge: b6ea59a 3fb5da9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 09:56:37 2011 +0000

    Merge trunk (revno #795)

commit 9164b8d224ae6629cdac00248b98fad762bdfc10
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 10:46:26 2011 +0100

    Make utils.execute not overwrite std{in,out,err} args to Popen on retries.
    Make utils.execute reject unknown kwargs.
    
    Add a couple of unit tests for utils.execute.

 nova/tests/test_utils.py |   76 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py            |   25 +++++++++------
 2 files changed, 91 insertions(+), 10 deletions(-)

commit 1ecc7bba9bbd495ba6cec2b45488e779a73ca7dc
Merge: e502ad0 3fb5da9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 13 21:28:20 2011 -0400

    Merge trunk

commit 4f2d48eeffc79333afae829ea31f7eae0549b40a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Mar 13 23:35:30 2011 +0000

    Removed excess LOG.debug line

 nova/tests/test_xenapi.py |    1 -
 1 file changed, 1 deletion(-)

commit 6a06dd65ecc9754565b8368adb3921fb248dd92b
Merge: 7aca22f 3fb5da9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Mar 13 22:49:44 2011 +0000

    merge trunk

commit 2bfa7b29c7882da559041cea771b9243555828fa
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Mar 13 13:51:42 2011 -0400

    The extension name is constructed from the camel cased module_name +
    'Extension'.

 nova/api/openstack/extensions.py               |    9 ++++++++-
 nova/tests/api/openstack/extensions/widgets.py |   14 +++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

commit 7aca22f407915d95c53ee65f4aac79cd4e6ab301
Merge: 3e3da66 7ca1669
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Mar 13 16:36:38 2011 +0000

    Merged with trunk
    
    Fixed testing instrastructure:
     - stubbed out LoopingCall.start
     - unstubbed db.instance_create
     - now using fake context in spawn tests
     - moved fake xenstore ops into fake driver to avoid code duplication
    
    Fixed pep8 errors

commit 3fb5da952e041f88a29ad0b049c52236b84954e9
Merge: 4407791 de1197c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 13 16:14:39 2011 +0000

    Fix instructions for setting up the initial database.

commit de1197cfee200782a5a1d07fb40138d4f103890e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 13 10:49:56 2011 +0100

    Fix instructions for setting up the initial database.

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ae7ab4346d851a8284e004ed8efb44a3d4fc95f2
Merge: a3a3c18 4407791
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Mar 12 12:26:20 2011 -0500

    Merge w/ trunk.

commit 2bf61104426b78c0d5f5eb9492daf728d5b9ec81
Merge: a8fae0e d46ff1b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 11 16:36:39 2011 -0800

    merged with latest trunk and removed unwanted files

commit 87f7356e98dbb4d01305785ed8209f44b525ff2c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Mar 11 19:21:34 2011 -0500

    Removed _translate_keys() functions since it is no longer used.
    Moved private top level functions to bottom of module.

 nova/api/openstack/servers.py |  148 ++++++++++++++++++++---------------------
 1 file changed, 71 insertions(+), 77 deletions(-)

commit 4407791fd26111ff6c383336a659e3b5ece2eefb
Merge: d46ff1b b944cbc
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Mar 12 00:14:53 2011 +0000

    Use a consistent naming scheme for XenAPI variables.

commit b944cbcbf023ca321edcc511354b56aa5b07d438
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 18:03:19 2011 -0600

    oops

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 48196abaf7e9c47bfda3f744e0be9bc242004b72
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 18:00:34 2011 -0600

    Review feedback

 nova/virt/xenapi/vm_utils.py |   56 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    |    8 +++---
 2 files changed, 32 insertions(+), 32 deletions(-)

commit cdd8790426d3eb77712f5a19f99211b12a9ad9c5
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:48:44 2011 -0600

    Review feedback

 nova/virt/xenapi/vm_utils.py     |   10 +++++-----
 nova/virt/xenapi/vmops.py        |    6 +++---
 nova/virt/xenapi/volume_utils.py |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

commit f9706b5080786a4d3e530f3e8bdb69147e9f5086
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:35:37 2011 -0600

    Review feedback

 nova/virt/xenapi/vm_utils.py |   31 ++++++++++++++++---------------
 nova/virt/xenapi/vmops.py    |    6 +++---
 2 files changed, 19 insertions(+), 18 deletions(-)

commit 1c4afe23157233b7081872ccbc6ea5fa1ff0015a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 11 17:30:51 2011 -0600

    Some unit tests

 nova/compute/api.py        |    9 ++++++---
 nova/tests/test_compute.py |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

commit 29e59a96602265c5b5746865db94a3f00b8b5cf5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 15:21:31 2011 -0800

    Change capitalization of Openstack to OpenStack

 nova/tests/integrated/api/client.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit a8fae0e94e0dcadbfc5349813c06466af9c75538
Merge: e891e48 1112a90
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 11 15:15:38 2011 -0800

    fixed conflicts after merging with trunk with 787

commit bacce305a99dff77aa0e24c64cb937514e368ec1
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Mar 11 17:13:56 2011 -0600

    Adding a sidebar element to the nova.openstack.org site to point people to additional versions of the site.

 doc/source/_static/tweaks.css |  147 +++++++++++++++++++++++++++++++++++++++++
 doc/source/_theme/layout.html |   11 ++-
 2 files changed, 157 insertions(+), 1 deletion(-)

commit ab37248cc2e40b06e1d349833da01494a9ca3641
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:13:10 2011 -0600

    oops

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 80bc32659e41f496bb1bfefbdd6ca63de7ff9f98
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:11:25 2011 -0600

    Review feedback

 nova/virt/xenapi/vmops.py |   61 ++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

commit d46ff1b5a9db5655b3c25518008897861ea178d5
Merge: feb9897 b3f5a4d
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 23:05:02 2011 +0000

    Replace raw SQL calls through session.execute() with SQLAlchemy code.

commit da76b3d67b2c2e864025c4ba201b63e1dee2ff1f
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 16:58:18 2011 -0600

    Review feedback

 nova/virt/xenapi/vm_utils.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit b3f5a4d5a8e513fe65a3b1dde9b36fd1388afb67
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 22:55:56 2011 +0000

    Remove vish comment

 nova/db/sqlalchemy/api.py |    2 --
 1 file changed, 2 deletions(-)

commit feb9897d7190132f6d235643115837a6be3cf263
Merge: 2002b09 a9d7127
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 22:54:33 2011 +0000

    Remove race condition when refreshing security groups and destroying instances at the same time.

commit 909b72faa77ba0a2bc787309b95fdfae9bb9ca01
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 11 17:41:10 2011 -0500

    Removed EOL whitespace in accordance with PEP-8.

 nova/tests/api/openstack/test_auth.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5d0ca375e082c702b218c26f24d8009650a319a3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 14:36:31 2011 -0800

    Beginning of cleanup of FakeAuthManager

 nova/tests/api/openstack/fakes.py         |   41 ++++++++++++++++-------------
 nova/tests/api/openstack/test_accounts.py |    4 +--
 nova/tests/api/openstack/test_auth.py     |   14 +++++-----
 nova/tests/api/openstack/test_users.py    |   14 +++++-----
 4 files changed, 38 insertions(+), 35 deletions(-)

commit a9d71273742f440af5687650dd9cd72d827a6bef
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 23:36:28 2011 +0100

    Make the fallback value None instead of False

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ac7fa75c02c885fc9d4dfacba8318aadbdbfceb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 23:34:26 2011 +0100

    Indentation adjustment (cosmetical).

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be9734b03bce871d32e21da2ba341dfa42aa020a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 11 17:19:14 2011 -0500

    Fixed lp732866 by catching relevant `exception.NotFound` exception. Tests did not uncover this vulnerability due to "incorrect" FakeAuthManager. I say "incorrect" because potentially different implementations (LDAP or Database driven) of AuthManager might return different errors from `get_user_from_access_key`.
    
    Also, removed all references to 'bacon', 'ham', 'herp', and 'derp' and replaced them with hopefully more helpful terms.

 nova/api/openstack/auth.py            |    6 +++-
 nova/tests/api/openstack/fakes.py     |    5 ++-
 nova/tests/api/openstack/test_auth.py |   56 ++++++++++++++++++++-------------
 3 files changed, 43 insertions(+), 24 deletions(-)

commit 491a7198a0c921f45d17aef4364379bae9929cbd
Merge: 6365a72 2002b09
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 16:16:29 2011 -0600

    Merged trunk

commit 2002b0920fb4a5ad3403e2243eb19809b3cb631b
Merge: 271692f 0eb3fef
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 22:10:07 2011 +0000

    This change adds the ability to boot Windows and Linux instances in XenServer using different sets of vm-params.
    
    Images in glance should have a property set with a key of `os_type` and a value of either `windows` or `linux`.  Images without `os_type` set default to `linux`.
    
    Linux images boot para-virtualized, while Windows images boot via HVM.

commit 0eb3fefea2dbf53bdc9cc4d6b5f9682a32b346d4
Merge: 9dbf8e3 271692f
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 21:40:51 2011 +0000

    merge trunk

commit 6cd90a95d632d45d1c906d412e3240f730e88b95
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 11 15:35:55 2011 -0600

    New migration

 .../versions/010_add_flavors_to_migrations.py      |   44 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 nova/tests/test_compute.py                         |    2 -
 3 files changed, 46 insertions(+), 2 deletions(-)

commit 271692fd80aaf3a045849ef8a87060e15ab8c69e
Merge: 8aed0d2 0a13001
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri Mar 11 21:19:44 2011 +0000

    Passes net variable as value of keyword argument process_input. Prior to the execvp patch, this was passed positionally.

commit 8aed0d240022ad65a9a06f24e516ff98a01a237f
Merge: 3494373 c5bfab9
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Mar 11 21:09:49 2011 +0000

    Changes the output of status in describe_volumes from showing the user as the owner of the volume to showing the project as the owner.

commit d03b169e2343fc13f37324f0136835ae54f85569
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Mar 11 16:04:54 2011 -0500

    Added support for ips resource: /servers/1/ips
    Refactored implmentation of how the servers response model is generated.

 nova/api/openstack/servers.py |   85 ++++++++++++++++++++++++-----------------
 nova/context.py               |    2 +-
 2 files changed, 50 insertions(+), 37 deletions(-)

commit 9dbf8e31961c2b32945e7f91be7727d9ab0f2c33
Merge: ca781f6 3494373
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 20:14:48 2011 +0000

    merge trunk

commit 34943730a339cb902e49909571c5e83675b1f00d
Merge: 1112a90 c91fc7c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Mar 11 20:09:58 2011 +0000

    Adds in multi-tenant support to openstack api.
    Allows for multiple accounts (projects) with admin api for creating accounts & users.

commit ca781f6dce32096b6c1dd597f6998ee22a81679e
Merge: 694b4bf 1112a90
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 20:03:18 2011 +0000

    merge trunk

commit c91fc7c44c87814d76c1c8bc74b27279fa054cad
Merge: 7e95a65 7ca1669
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Mar 11 19:49:32 2011 +0000

    remerge trunk (again). fix issues caused by changes to deserialization calls on controllers.

commit a3a3c18609e575ae8e9fb73ec48100e862a3fb35
Merge: 7d4eae1 1112a90
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 11 14:37:44 2011 -0500

    Merge w/ trunk.

commit 7d4eae131f2f844f368aa5ff79c68191756775b6
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 11 14:33:12 2011 -0500

    Add config for osapi_extensions_path.
    Update the ExtensionManager so that it loads extensions in the
    osapi_extensions_path.

 CA/openssl.cnf.tmpl                            |    2 +-
 nova/api/openstack/__init__.py                 |    9 ++++---
 nova/api/openstack/extensions.py               |   32 +++++++++++++++++++++++-
 nova/flags.py                                  |    2 ++
 nova/tests/api/openstack/extensions/widgets.py |   27 ++++++++++++++++++++
 nova/tests/api/openstack/test_extensions.py    |   19 ++++++++++++++
 6 files changed, 85 insertions(+), 6 deletions(-)

commit 0a130010c26e4ef9ba5b9917ff47766de7805ab9
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri Mar 11 14:24:03 2011 -0500

    process_input for tee. fixes: 733439

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 195926d0635c0217edccf1cd763425163d3e92e7
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 19:22:31 2011 +0000

    Minor stylistic updates affecting indentation

 nova/db/sqlalchemy/api.py |  132 ++++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

commit 1112a90cf6d1761ec362d19130f61e518406910f
Merge: 7ca1669 b9a479f
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Mar 11 19:19:59 2011 +0000

    Make linux_net ensure_bridge commands that add and remove ip addr's from
    devices/bridges work with with the latest utils.execute method (execvp).

commit b76b61dbec03455824b90c427eb816c15e284013
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 10:32:09 2011 -0800

    Added volume api from previous megapatch

 nova/api/openstack/__init__.py |    6 ++
 nova/api/openstack/volumes.py  |  160 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)

commit e891e48b63065a7218627289a908aece0f6a3730
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 11 10:31:08 2011 -0800

    Made changes to xs-ipv6 code impacted because of addition of flatmanger ipv6 support

 nova/virt/xenapi/vmops.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit a5415e8fc40eaa82761532e5ba83c3800cf9ed78
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Mar 11 12:45:53 2011 -0500

    Need to set version to '1.0' in the nova.context in test code for tests to be
    happy.

 nova/api/openstack/auth.py        |    3 ++-
 nova/tests/api/openstack/fakes.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 14037354fd6d31ee1b0a7d7f3d6c07e34db2ecaf
Merge: cfc7d21 7ca1669
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 17:44:14 2011 +0000

    merge from trunk...

commit cfc7d21b959bc929295868aeb3e84ea56afbfd9c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 17:41:22 2011 +0000

    Discovered literal_column(), which does exactly what I need

 nova/db/sqlalchemy/api.py |   49 ++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 34 deletions(-)

commit 6365a72df7cce1f1495925e517c4e935812f6da5
Merge: 36b5f7d 7ca1669
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 11:22:56 2011 -0600

    Merged trunk

commit 36b5f7d9cf377ce2a4dcdad07e7e14062cd3ec4d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 11:22:23 2011 -0600

    Further vmops cleanup

 nova/virt/xenapi/vmops.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 65f6648f61cb6eeb5cd109fe08ef2ab2f3646c8b
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri Mar 11 12:09:20 2011 -0500

    cast execute commands to str

 .../networking/etc/xensource/scripts/vif_rules.py  |    1 +
 1 file changed, 1 insertion(+)

commit d250d522b5d6c164435fc254223ff9a0f055cf05
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 17:55:28 2011 +0100

    Remove broken test. At least this way, it'll actually fix the problem and be mergable.

 nova/tests/test_cloud.py |   12 ------------
 1 file changed, 12 deletions(-)

commit cd381ae3e1fc4c4e53d3b60272cc8e6ee9fc6352
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Fri Mar 11 20:52:59 2011 +0530

    * Updated the readme file with description about VLAN Manager support & guest console support. Also added the configuration instructions for the features.
    * Added assumptions section to the readme file.

 doc/source/vmwareapi_readme.rst |   95 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 4 deletions(-)

commit 7f28cb611c6bc802ad78242275b18bb0278e43bd
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Fri Mar 11 20:02:21 2011 +0530

    * Modified raise statements to raise nova defined Exceptions.
    * Fixed Console errors and in network utils using HostSystem instead of Datacenter to fetch network list
    * Added support for vmwareapi module in nova/virt/connection.py so that vmware hypervisor is supported by nova
    * Removing self.loop to achieve synchronization

 nova/console/vmrc.py                 |   50 ++++++++++++++++++++++------------
 nova/network/vmwareapi_net.py        |   20 +++++++-------
 nova/virt/connection.py              |    5 +++-
 nova/virt/vmwareapi/fake.py          |   32 ++++++++++++++--------
 nova/virt/vmwareapi/network_utils.py |   11 ++++----
 nova/virt/vmwareapi/vmops.py         |   47 ++++++++++++++++++--------------
 nova/virt/vmwareapi/vmware_images.py |    5 ++--
 nova/virt/vmwareapi_conn.py          |    3 +-
 8 files changed, 104 insertions(+), 69 deletions(-)

commit 5e6e0e4c6d675932b5a42dc5136364007a35de03
Merge: 977fc1b 7ca1669
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 11 11:44:48 2011 +0000

    merge trunk

commit 977fc1be4ea8af93b63975c5538462a776fbe168
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 11 11:42:42 2011 +0000

    Moved vlan_interface flag in network.manager
    removed needless carriage return in vm_ops

 nova/network/linux_net.py  |    5 ++---
 nova/network/manager.py    |    3 +++
 nova/network/xenapi_net.py |    5 -----
 nova/tests/test_xenapi.py  |   12 ++++++++++++
 nova/virt/xenapi/vmops.py  |    3 +--
 5 files changed, 18 insertions(+), 10 deletions(-)

commit 46d1f6a8c888c1f6fdf12cf26df67eada1e8505b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 11:24:22 2011 +0100

    Use self.instances.pop in unfilter_instance to make the check/removal atomic.
    
    Move the semaphore grab outside the for loop in refresh_security_group_rules to avoid reading a value from self.instances, blocking waiting for the semaphore, having the instance be removed in the mean time, and then add its rules back.

 nova/virt/libvirt_conn.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 67a8d635af0a64ad220b163c00b96eadf7daf93f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 09:54:08 2011 +0100

    Make Authors check account for tests being run with different os.getcwd() depending on how they're run. Add missing people to Authors.

 .mailmap                |    1 +
 Authors                 |    1 +
 nova/tests/test_misc.py |   12 +++++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

commit b9a479ffc8e9db0c1888047d7f3df99b3b57b2ec
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 10 21:44:01 2011 -0500

    Make linux_net ensure_bridge commands that add and remove ip addr's from
    devices/bridges work with with the latest utils.execute method (execvp).

 nova/network/linux_net.py |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 76b5871adbb1bfc2e3d2a1151a00fa654c45953d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 10 20:35:37 2011 -0500

    _translate_keys now needs one more argument, the request object.

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c540d6d7fef1da68a42c16ac1f9a44337661bb0d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 10 20:12:58 2011 -0500

    Added version attribute to RequestContext class. Set the version in the
    nova.context object at the middleware level. Prototyped how we can serialize
    ip addresses based on the version.

 nova/api/openstack/auth.py    |    3 ++-
 nova/api/openstack/servers.py |   38 ++++++++++++++++++++++++++------------
 nova/context.py               |    7 +++++--
 3 files changed, 33 insertions(+), 15 deletions(-)

commit 2379fc056d96d56c852e94fe7c3898049a3670bc
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Thu Mar 10 19:26:20 2011 -0500

    execvp: fix params

 .../networking/etc/xensource/scripts/vif_rules.py  |   33 ++++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

commit e1fce3a80e04c75d98e738431ea762e0499351ef
Merge: 4a9f4f4 7ca1669
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 10 17:11:03 2011 -0600

    Merge from trunk

commit cda582a07f1dd52dd9557bff5b9ac52b2ce8f451
Merge: c967679 7ca1669
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 17:41:57 2011 -0500

    merge lp:nova

commit c967679fa8144af57d79d89666ee29a0241d38a9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 17:36:41 2011 -0500

    switch to a more consistent usage of onset_files variable names

 nova/api/openstack/servers.py            |   59 +++++++++++++++++++----------
 nova/compute/api.py                      |   38 ++++++++-----------
 nova/compute/manager.py                  |    2 +-
 nova/quota.py                            |   30 +++++++--------
 nova/tests/api/openstack/test_servers.py |   48 ++++++++++++------------
 nova/tests/test_quota.py                 |   60 +++++++++++++++---------------
 6 files changed, 124 insertions(+), 113 deletions(-)

commit 7e95a65ccec2336176f389d614a85c9e70da374d
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 10 22:33:45 2011 +0000

    re-added a test change I removed thinking it was related to removed code. It wasn't :>

 nova/tests/api/openstack/test_auth.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 694b4bfcbe9f0b74dffbaf93a7da3d6296d28746
Merge: 0365711 7ca1669
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 22:29:20 2011 +0000

    merge trunk

commit 0d3e950ed4b0c8abbd619d4ac8724b4c3ce45bf1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 14:21:36 2011 -0800

    Document known bug numbers by the code which is degraded until the bugs are fixed

 nova/tests/integrated/api/client.py         |    1 +
 nova/tests/integrated/integrated_helpers.py |    6 ++++++
 2 files changed, 7 insertions(+)

commit f251ef70bf83eebce0f851f8a1b052174be1d615
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 10 22:20:51 2011 +0000

    fix minor typo

 nova/tests/api/openstack/test_auth.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be66b329d5b94ffbfb782355ef342eadbaed72a5
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 10 22:14:53 2011 +0000

    Fix a fer nits jaypipes found in review.

 nova/api/openstack/accounts.py            |   18 +++++++++++++++---
 nova/api/openstack/users.py               |    4 ++--
 nova/tests/api/openstack/test_accounts.py |    6 +++---
 nova/tests/api/openstack/test_auth.py     |   15 ++++-----------
 nova/tests/api/openstack/test_users.py    |    2 +-
 5 files changed, 25 insertions(+), 20 deletions(-)

commit 29bc4f5074ca3ada98a25a745077b998b4c5509c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 14:14:01 2011 -0800

    Pep8 / Style

 nova/tests/integrated/test_login.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d6430ecd114daa21c72c3d215daaa94f0e87e62
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 14:12:41 2011 -0800

    Re-removed the code that was deleted upstream but somehow didn't get merged in.  Bizarre!

 nova/tests/integrated/api/client.py |   21 ---------------------
 1 file changed, 21 deletions(-)

commit 4a9f4f4eef4e6fd6ab84ec2e03437144f9ab62f8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 10 16:07:50 2011 -0600

    More resize

 nova/compute/manager.py   |   68 +++++++++++++++++++++++++++++----------------
 nova/virt/xenapi/vmops.py |   13 +++++++--
 nova/virt/xenapi_conn.py  |    9 +++---
 3 files changed, 60 insertions(+), 30 deletions(-)

commit 4e1094acdc56ab85c1b7537a5d0246e163007238
Merge: 9989756 f110e71
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:57:49 2011 -0800

    Merged with upstream

commit f110e718807ea4747a0ff95138c488961257aa7f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:56:24 2011 -0800

    pep8 fun

 nova/tests/integrated/api/client.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 998975651ac2f2df7a3f8af16d62d197f451180f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:53:27 2011 -0800

    Test login.  Uncovered bug732866

 nova/tests/integrated/integrated_helpers.py |  182 +++++++++++++++++++++++++++
 nova/tests/integrated/test_login.py         |   77 ++++++++++++
 2 files changed, 259 insertions(+)

commit 73e291932d68260d21f5ae409e3797f683f277d8
Merge: e7a0b9a f81d925
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:53:10 2011 -0800

    Merge with upstream

commit e7a0b9af31cd93ace12a65d74536ed643c967401
Merge: c177074 6b4beef
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:52:19 2011 -0800

    Merged with upstream

commit f81d925f86670e3ed32d815c219824f627d82bc2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:51:26 2011 -0800

    Better logging, be more careful about when we throw login errors re bug732866

 nova/tests/integrated/api/client.py |   37 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 14 deletions(-)

commit 6b4beef8093b4a7b4d42818567b5afb023af9251
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 12:55:06 2011 -0800

    Don't wrap keys and volumes till they're in the API

 nova/tests/integrated/api/client.py |   21 ---------------------
 1 file changed, 21 deletions(-)

commit 7ca1669603132e3afd14606dda3f95ccbce08a41
Merge: 044b39e 11f2d78
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 20:40:19 2011 +0000

    Add a new IptablesManager that takes care of all uses of iptables.
    
    Port all uses of iptables (in linux_net and libvirt_conn) over to use this new manager.
    
    It wraps all uses of iptables so that each component can maintain its own set of rules without interfering with other components and/or existing system rules.
    
    iptables-restore is an atomic interface to netfilter in the kernel. This means we can make a bunch of changes at a time, minimising the number of calls to iptables.

commit bd06f0ac0d0d3e3c9d7b296c5fe4bb8a0dd44c89
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Mar 10 20:36:36 2011 +0000

    Last un-magiced session.execute() replaced with SQLAlchemy code...

 nova/db/sqlalchemy/api.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 11f2d788fd63c66af0e992f7b75b61273c059bcb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 21:31:47 2011 +0100

    PEP8

 nova/utils.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 8aabc32a69bf47075a3fd8e677d1bd70cbbca339
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 21:13:07 2011 +0100

    Add basic test case.

 nova/tests/test_cloud.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit c177074649055f1da2ca97eb3c07139571d4a664
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 12:10:49 2011 -0800

    Implements basic OpenStack API client, ready to support API tests

 nova/tests/integrated/__init__.py     |   20 +++
 nova/tests/integrated/api/__init__.py |   20 +++
 nova/tests/integrated/api/client.py   |  224 +++++++++++++++++++++++++++++++++
 3 files changed, 264 insertions(+)

commit 6b95c5133452ae26da2cb7f08267aa4cb056e7af
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 10 15:05:04 2011 -0500

    Initial support fo extension resources. Tests.

 nova/api/openstack/__init__.py              |    8 ++-
 nova/api/openstack/extensions.py            |   29 ++++++++++
 nova/tests/api/openstack/test_extensions.py |   83 +++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 1 deletion(-)

commit 03e5b8f7c4e1afc6637774acb3d28100035cd323
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Mar 10 20:04:21 2011 +0000

    Partial revert of one conversion due to phantom magic exception from SQLAlchemy in unrelated code; convert all deletes

 nova/db/sqlalchemy/api.py |   65 ++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 24 deletions(-)

commit 31e239f19e189c0d54c93a6ee9f0addde1f208f6
Merge: 616723f 044b39e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 14:59:43 2011 -0500

    merge lp:nova

commit 616723fe4e7d52b0b8ddafda10fcfe07a87609c8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 14:53:13 2011 -0500

    add docstring

 nova/compute/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 25bbe2afb0be3c79264376dd6a11e2bc97847702
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 10 11:17:34 2011 -0800

    fixed formatting and redundant imports

 nova/api/ec2/cloud.py                              |    6 +++---
 .../versions/007_add_ipv6_flatmanager.py           |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

commit 4ead485ab69ee1e92635857ba73133a9e1d3bbcb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 10 12:06:09 2011 -0600

    Cleaned up vmops

 nova/virt/xenapi/vm_utils.py |   26 +++++------
 nova/virt/xenapi/vmops.py    |  104 +++++++++++++++++++-----------------------
 2 files changed, 61 insertions(+), 69 deletions(-)

commit 036571170c74355a0cf33e0659df64750f48f19a
Merge: 352979b 044b39e
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 17:30:26 2011 +0000

    merge trunk

commit 044b39e6e7fa81b54cb15176db113ddcc06c4a74
Merge: acbc0f5 9822af5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 10 17:00:58 2011 +0000

    initializing instance power state on launch to 0 (fixes EC2 API bug)

commit b361153a160ba1d61ed1d52de419cd27a8b4feda
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Mar 10 16:42:13 2011 +0000

    Correct a misspelling

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b3951f4c2a2473814f0dd1a90f950bef418457ca
Merge: 6175621 acbc0f5
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 11:18:05 2011 -0500

    merge lp:nova

commit 352979bad5e37b868f34f2a506ed546739e8e8bd
Merge: 801212a acbc0f5
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 15:48:47 2011 +0000

    merge trunk

commit 801212a0ff04ddc33719d17b8c8ca847db5b1228
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 15:47:55 2011 +0000

    Use a FLAGS.default_os_type if available

 nova/virt/xenapi/vm_utils.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit acbc0f597f6183fc856f82b07392ddd4a61393f7
Merge: 910b741 b38af11
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 15:44:57 2011 +0000

    Another little bit of fallout from the execvp branch.

commit 3e97dc47221d19b39aba99f6d389d2ec326e72be
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Mar 10 21:07:44 2011 +0530

    Updated the code to detect the exception by fault type.
    SOAP faults are embedded in the SOAP response as a property. Certain faults are sent as a part of the SOAP body as property of missingSet. E.g. NotAuthenticated fault. So we examine the response object for missingSet and try to check the property for fault type.

 nova/console/vmrc.py                 |    2 +-
 nova/virt/vmwareapi/error_util.py    |   82 ++++++++++++++++++++++++++++++++++
 nova/virt/vmwareapi/fake.py          |   13 +++---
 nova/virt/vmwareapi/network_utils.py |   44 ++++++++++++------
 nova/virt/vmwareapi/vim.py           |   69 +++++++++++++---------------
 nova/virt/vmwareapi/vmops.py         |   13 ++++--
 nova/virt/vmwareapi_conn.py          |   23 ++++++----
 7 files changed, 178 insertions(+), 68 deletions(-)

commit b38af111532717cbe9f4bef1d3c3d58e7082c8b9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 16:25:18 2011 +0100

    Another little detail..

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 910b74153372665d0bed0df66bb74c20cc95edf9
Merge: b33b6d1 b64cf73
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 14:59:49 2011 +0000

    Fix a few things that were either missed in the execvp conversion or stuff that was merged after it, but wasn't updated accordingly.

commit b33b6d1a52666973ff710018babf04f6ac6860ab
Merge: 144fa50 f3efbaa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 10 14:49:59 2011 +0000

    Introduces the ZoneManager to the Scheduler which polls the child zones and caches their availability and capabilities.

commit b64cf7352a24d8ced69aa408f7ceadd9da71da14
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 15:47:09 2011 +0100

    One more thing..

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 43b5d68b51c08be100bdf63571a6426bb1c4f863
Merge: fb4785b 144fa50
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 13:59:43 2011 +0000

    merge trunk

commit 1d6b4e8d74825790f2c20ddceae52f88ae094d82
Merge: c887b04 144fa50
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 14:45:19 2011 +0100

    Merge trunk

commit e76aad24ce8a9b1b7de1b2f874c22c9995f3071f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 14:30:17 2011 +0100

    Only include ramdisk and kernel id if they are actually set.

 nova/api/ec2/cloud.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 3b1f1aefdf23873d79be030950150b80f9e41b9a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 13:45:50 2011 +0100

    Add bugfix metadata.

commit 3e3da6619a946db843533fafe33d6280948632fc
Merge: e7626da 144fa50
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 10 11:13:01 2011 +0000

    Merge trunk
    Conflicts solved

commit bd3411f88532619b760aa8f51379db2f9c1cf5d0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 11:59:50 2011 +0100

    More execvp fallout

 nova/objectstore/image.py |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

commit 6601d52bfa501ac1ae266647be19fac2f6792efc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 11:35:42 2011 +0100

    Make nova.image.s3 catch up with the new execute syntax.

 nova/image/s3.py |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

commit e575f5ddd46055f2e491606052493b6d648506f6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 10:16:07 2011 +0100

    Pass argv of dnsmasq and radvd to execute as individual args, not as a list.

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9e77a0c6f6b43494e0eb87a16f33cd566f0746d2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 09:55:45 2011 +0100

    Split dnsmasq and radvd commands into their respective argv's.

 nova/network/linux_net.py |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit 1fa41c5c621f3190c8c2b1c3d885c95b6b627b23
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 09:52:19 2011 +0100

    s/s.getuid()/os.getuid()/

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 61756210fe55edcb2e04275fc2326b5d153651e6
Merge: 5a7a52d 144fa50
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 01:29:23 2011 -0500

    merge lp:nova and add stub image service to quota tests as needed

commit 0dcd68077183c6cce60075a35be36f5c0764925b
Merge: b75ab78 144fa50
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 15:23:13 2011 +0900

    merged to trunk rev781

commit b75ab789194f1ced801b1d68ae8cc54051716414
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 15:16:03 2011 +0900

    fix pep8 check

 nova/tests/test_service.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5a7a52da980d28eff9da7bfda8b4e7241a58d230
Merge: 90f3845 6b40f21
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 00:49:06 2011 -0500

    merge lp:nova

commit 144fa5082108f306595c5314f40d7e87cb577278
Merge: 6b40f21 a83b487
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 05:44:31 2011 +0000

    Modifies S3ImageService to wrap LocalImageService or GlanceImageService.  It now pulls the parts out of s3, decrypts them locally, and sends them to the underlying service.  It includes various fixes for image/glance.py, image/local.py and the tests.
    
    I also uncovered a bug in glance so for the glance backend to work properly, it requires the patch to glance here lp:~vishvananda/glance/fix-update or Glance's Cactus trunk r80.

commit 90f38451e5df4f0ca862401cf898f01ffede6174
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 00:26:25 2011 -0500

    add tests to verify the serialization of adminPass in server creation response

 nova/tests/api/openstack/test_servers.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 6b40f2108e537d9620229760b95a4ced79853626
Merge: 84c769c ecc6bce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 05:04:45 2011 +0000

    Fixes nova.sh to run properly the first time.  We have to get the zip file after nova-api is running.

commit a83b4879f38d11634d405d0efe977d482abdc344
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 05:02:24 2011 +0000

    minor fixes from review

 nova/image/glance.py |    2 +-
 nova/image/s3.py     |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit f01b0a114e2876e97b68903ff02dcb1866a62021
Merge: ec23b8e 84c769c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 04:42:11 2011 +0000

    merged trunk

commit f0bb6d9fc47b92d335c7d7fa238dfd43f0dbdf69
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 13:30:52 2011 +0900

    fixed based on reviewer's comment.

 bin/nova-manage              |    8 ++---
 nova/compute/manager.py      |   22 ++++++------
 nova/db/sqlalchemy/api.py    |    4 +--
 nova/scheduler/driver.py     |   10 +++---
 nova/tests/test_compute.py   |   24 ++++++-------
 nova/tests/test_scheduler.py |    5 +--
 nova/tests/test_service.py   |   77 ++++++++++++++++--------------------------
 nova/tests/test_virt.py      |    6 ++--
 nova/tests/test_volume.py    |    7 ++--
 nova/virt/libvirt_conn.py    |   22 +++++++-----
 nova/volume/driver.py        |    2 +-
 11 files changed, 89 insertions(+), 98 deletions(-)

commit f23924dfe23e9cd08656fa355957fadeee168c3f
Merge: 378e1d0 84c769c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 22:04:29 2011 -0500

    merge lp:nova

commit e502ad0243962aca98cc28bfa5cf69f8cd08991c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 9 21:43:45 2011 -0500

    Moved umount container to disk.py and try to remove loopback when destroying the container

 nova/virt/disk.py         |    8 ++++++++
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

commit 7a5915dc4f575ed08b4e4645286e4efe1cf835e2
Merge: 6cd8df7 84c769c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 9 21:33:01 2011 -0500

    Merged trunk

commit 21937b48fcac81fa108f37f307b1b2e969bb7b4f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Mar 10 00:01:15 2011 +0000

    Replace session.execute() calls performing raw UPDATE statements with SQLAlchemy code, with the exception of fixed_ip_disassociate_all_by_timeout()

 nova/db/sqlalchemy/api.py |   97 +++++++++++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 35 deletions(-)

commit 84c769ce17822eac3788336cbae8f82f03f089cf
Merge: bbe22b9 3e61bf9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 23:45:00 2011 +0000

    Fixes a race condition where multiple greenthreads were attempting to resize a file at the same time.  Adds tests to verify that the image caching call will run concurrently for different files, but will block other greenthreads trying to cache the same file.

commit 9822af58162dc520c4a17646a013560e422efcf9
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 9 14:54:57 2011 -0800

    maybe a int instead ?

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 378e1d07c3a4318af2bf3375b0c98bc28da0d362
Merge: a8d665d bbe22b9
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 17:46:54 2011 -0500

    merge lp:nova

commit a8d665d4511d7f08a4f088fcd9f89a13b3d59bc3
Merge: 355870e 97983b7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 17:46:07 2011 -0500

    merge, resolve conflicts, and update to reflect new standard deserialization function signature

commit bbe22b96a23de6c6480b985038754e5529c1bf7e
Merge: 97983b7 d9f5e34
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 22:39:57 2011 +0000

    Fixes doc build after execvp patch.

commit c887b043ebc65789b0d8471d676ea7725263c4f3
Merge: 4e9c570 97983b7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 9 23:39:12 2011 +0100

    Merge trunk

commit d9f5e34c4eb88c55fcc8b534b798b6d21a973b41
Merge: 5f6a58c 97983b7
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:23:52 2011 -0500

    Merge main

commit 5f6a58c7c2a7359f67bc4e2c2eb6bb9cc0a9ff01
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:22:54 2011 -0500

    execvp: fix docs

 doc/ext/nova_autodoc.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 203e23ebebc73a98dc8e8497fd2b28d3a6bf01da
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 9 14:13:52 2011 -0800

    initializing instance power state on launch to 0 (fixes EC2 API bug)

 nova/compute/api.py |    1 +
 1 file changed, 1 insertion(+)

commit 97983b7725a65482627aa32db1ea0e67ca7b3584
Merge: b5d7065 3f723bc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 9 22:10:24 2011 +0000

    - Content-Type and Accept headers handled properly
    - Content-Type added to responses
    - Query extensions no long cause computeFaults
    - adding wsgi.Request object
    - removing request-specific code from wsgi.Serializer

commit d9c9b084539ca3bdcb58cd037ab6c297bfc28808
Merge: e8554da b5d7065
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:05:19 2011 -0500

    Merge with main

commit b5d7065512a155d5ad23b4f240645f7bee03f7cb
Merge: f93e424 e8554da
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 22:00:12 2011 +0000

    Fixes bug 726359. Passes unit tests.
    
    Changes parameters of utils.execute to utils.execute(*cmd, **kwargs). The kwargs themselves have not changed, other than changing check_exit_code to default to 0. The exit code of the process is now checked against this variable, unless None.

commit 355870e732f11ee21642a9ce0568fa30ef7b16bb
Merge: 95d25ba f93e424
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 16:51:05 2011 -0500

    merge lp:nova, fix conflicts, fix tests

commit fb4785b85c1bef4179140cfb85ce01eca9fb5da5
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 21:46:27 2011 +0000

    fix the copyright notice in migration

 .../versions/010_add_os_type_to_instances.py       |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit e8554da80ac916f168461cb48078488700081c02
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 16:44:48 2011 -0500

    execvp: cleanup.

 nova/crypto.py                                     |    6 +++---
 .../networking/etc/xensource/scripts/vif_rules.py  |   22 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

commit 3e61bf9963d7e98e8152d2eacfc4461d8cda309c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 21:43:35 2011 +0000

    remove the semaphore when there is no one waiting on it

 nova/tests/test_virt.py   |    3 ++-
 nova/virt/libvirt_conn.py |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 95d25ba3f4cd3345355922018295f3789d5ddb7c
Merge: 82c4d63 5662a82
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 16:32:06 2011 -0500

    merge lp:nova and resolve conflicts

commit f93e424c0c722f5607086349787a95517f31d79b
Merge: a7a0012 e44f085
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 21:27:38 2011 +0000

    Hi guys
    
    This branch fixes lp722982 (ability to delete networks with nova-manage) and lp715427 (nova-manage does not check if a network exists before creating it) .
    
    Regards

commit a7a00129b1b91c8b66c73c9342ce541ec16f8570
Merge: 5662a82 a9bd1b4
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 9 21:24:56 2011 +0000

    Update the create server call in the Openstack API so that it generates an 'adminPass' and calls set_admin_password in the compute API. This gets us closer to parity with the Cloud Servers v1.0 spec.

commit 75f7a73735957d5ddf04c7c9a23decf1a6fa7f9f
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 9 14:55:36 2011 -0600

    Added naming scheme comment

 nova/virt/xenapi_conn.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit e3488722b4df10d7f5c8f63ec750523792420a7d
Merge: b238805 5662a82
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 9 14:42:50 2011 -0600

    Merged trunk

commit fc9840bae6200c8f89fb8a3ba0ab45663c872b3c
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 15:33:20 2011 -0500

    execvp passes pep8

 nova/console/xvp.py       |    6 +++---
 nova/crypto.py            |    3 ++-
 nova/network/linux_net.py |   19 ++++++++++++-------
 nova/tests/test_virt.py   |    2 +-
 nova/utils.py             |   19 ++++++++++---------
 nova/volume/driver.py     |    4 ++--
 6 files changed, 30 insertions(+), 23 deletions(-)

commit 75b3b6807329663584f73ffc9b9612838dc04ef2
Merge: c7b5f47 5662a82
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 20:14:12 2011 +0000

    merge trunk

commit 5662a822a013bd0d159c15b990231c4d1f12797f
Merge: 07c6fca 7d31fe9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 9 20:09:53 2011 +0000

    Add a decorator that lets you synchronise actions across multiple binaries. Like, say, ensuring that only one worker manipulates iptables at a time.

commit 3f723bcf54b4d779c66373dc8f69f43923dd586a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 9 15:08:11 2011 -0500

    renaming wsgi.Request.best_match to best_match_content_type; correcting calls to that function in code from trunk

 nova/api/direct.py                 |    2 +-
 nova/api/openstack/__init__.py     |    2 +-
 nova/api/openstack/faults.py       |    2 +-
 nova/api/openstack/servers.py      |    2 +-
 nova/tests/api/openstack/common.py |    1 +
 nova/tests/api/test_wsgi.py        |   18 +++++++++---------
 nova/wsgi.py                       |    4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)

commit 82c4d6309909d6508df0944683ce4d3d7341de10
Merge: 2c733d5 07c6fca
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 15:07:38 2011 -0500

    merge lp:nova

commit 07c6fcab721b780028aefa1062cb9e3e8805a09b
Merge: 52a623a 3f85fc3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 9 19:54:59 2011 +0000

    Fixes bug #729400. Invalid values for offset and limit params in http requests now return a 400 response with a useful message in the body. Also added and updated tests.

commit a9bd1b456332aaf5f6ab9942979485f2192b6f3e
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 9 14:53:44 2011 -0500

    Add password parameter to the set_admin_password call in the compute api.
    Updated servers password to use this parameter.

 nova/api/openstack/servers.py |    3 ++-
 nova/compute/api.py           |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit af894c1f171212e722f5d0b8042e2c205df2aee4
Merge: 80a6dc5 52a623a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 9 13:47:21 2011 -0600

    Merge from trunk

commit 80a6dc5504378ae3d96829d96c02f50b9daa3029
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 9 13:46:05 2011 -0600

    stuff

 nova/compute/api.py     |   15 +++++++++++++--
 nova/compute/manager.py |   17 ++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

commit 2c733d5365b753989b506d82d376d980cd701547
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:38:34 2011 -0500

    rearrange functions and add docstrings

 nova/api/openstack/servers.py |   83 +++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 33 deletions(-)

commit 23369a63f4b74fb64bf57554a3fd8b15e3e2b49c
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 14:31:23 2011 -0500

    Fixes uses of process_input

 nova/utils.py             |    4 ++--
 nova/virt/disk.py         |    4 ++--
 nova/virt/libvirt_conn.py |   11 ++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

commit 7854cf996608c09e753c70c3914746dab22c4e1a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:21:18 2011 -0500

    update authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 5cd52711c869c9a743157b5fb19bb9e445576fa7
Merge: 848aced 52a623a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 9 14:20:26 2011 -0500

    merged trunk r771

commit 3e72c5c9fb3fc429dc1a72290c1b5df8bdcc88fe
Merge: 3999bb3 52a623a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:13:35 2011 -0500

    merge lp:nova

commit 3999bb363501c6587f75255333094c9e61bf1828
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:07:33 2011 -0500

    remove unneeded stubs

 nova/tests/api/openstack/test_servers.py |   22 ----------------------
 1 file changed, 22 deletions(-)

commit 6cd8df74534fcb8db319aa4578220d20aacccbed
Merge: e411a02 52a623a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 9 14:03:00 2011 -0500

    Merge trunk

commit 1166e16d08769222189e31e6de1c6019495fc743
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 13:54:30 2011 -0500

    move my tests into their own testcase

 nova/tests/api/openstack/test_servers.py |  447 ++++++++++++++++--------------
 1 file changed, 243 insertions(+), 204 deletions(-)

commit 52a623a2a991e0e091852f8db0317aae9898cf6c
Merge: f42fda8 4229990
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 9 18:45:10 2011 +0000

    replaced ConnectionFailed with Exception in tools/euca-get-ajax-console
    was not working for me with euca2tools 1.2 (version 2007-10-10, release 31337)

commit e44f085ed464a3397e3bf89a3e5355e538c71a65
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 19:16:26 2011 +0100

    Fixed pep8 issues

 bin/nova-manage           |    5 +++--
 nova/db/api.py            |    7 +++++--
 nova/db/sqlalchemy/api.py |    7 +++++--
 nova/network/manager.py   |    4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

commit 9f1847ca334b3a35130d3f6113808d7b2a949877
Merge: 429fdb1 f42fda8
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Mar 9 18:13:59 2011 +0000

    remerge trunk

commit 429fdb1ee733a62052c67f4e42c62447fc716ec0
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Mar 9 18:10:45 2011 +0000

    removed uneeded  **kw args leftover from removed account-in-url changes.

 nova/api/openstack/backup_schedules.py |    6 ++---
 nova/api/openstack/consoles.py         |   10 ++++----
 nova/api/openstack/flavors.py          |    6 ++---
 nova/api/openstack/images.py           |   12 ++++-----
 nova/api/openstack/servers.py          |   42 ++++++++++++++++----------------
 nova/api/openstack/shared_ip_groups.py |   12 ++++-----
 nova/api/openstack/users.py            |   12 ++++-----
 nova/api/openstack/zones.py            |   12 ++++-----
 8 files changed, 56 insertions(+), 56 deletions(-)

commit 48c8b911899db4db36dfc2e0ddaf3410c3179071
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 19:03:58 2011 +0100

    fixed lp715427

 bin/nova-manage |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit e17876ec002f976572b6ac102dc113024669a45c
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 18:57:53 2011 +0100

    fixed lp715427

 nova/network/manager.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit eadce208c55513ddbab550898e641b8ee55a67ec
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 9 12:32:15 2011 -0500

    Fix spacing.

 nova/api/openstack/servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit 6b38d141b903c6e4d7a3e94f084990a3808803e3
Merge: 1d74816 f42fda8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 12:14:35 2011 -0500

    merge lp:nova and resolve conflicts

commit 1d74816bf705cb672d9d323398b03142297d8bec
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 12:03:17 2011 -0500

    remove superfluous trailing blank line

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit f1dea606a64c9144fb723be0e5b86806891380f8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 11:54:21 2011 -0500

    add override to handle xml deserialization for server instance creation

 nova/api/openstack/servers.py            |   68 +++++++-
 nova/tests/api/openstack/fakes.py        |    2 -
 nova/tests/api/openstack/test_servers.py |  277 ++++++++++++++++++++++++++++++
 3 files changed, 344 insertions(+), 3 deletions(-)

commit 0f45b59ca6f9502a3ae6578e2fca5a7d9575ae5e
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 9 10:37:21 2011 -0500

    Added 'adminPass' to the serialization_metadata.

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70b3ae5507a7ad92b6f35d7157cf260e7f35f8b7
Merge: b3d3366 f42fda8
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 9 09:21:19 2011 -0500

    Merge w/ trunk.

commit c7b5f477f5457278591bbef486237d4ae43a68eb
Merge: e4b176d f42fda8
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 13:48:21 2011 +0000

    merge trunk

commit b6ea59aa3b71732ae65bf87aa59b41a7d25f8ec2
Merge: 748b310 f42fda8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 9 12:52:10 2011 +0000

    Merged with trunk
    Updated exception handling according to spawn refactoring

commit 748b3102320a9de3444b067aa783e8f3d7bc5f5c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 9 11:17:41 2011 +0000

    Fixed pep8 violation in glance plugin

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e269b1e0b9c768b0977be140c48cc5229564177
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 9 11:12:24 2011 +0000

    Added unit tests for ensuring VDI are cleaned up upon spawn failures

 nova/tests/test_xenapi.py  |   30 ++++++++++++++++++++++++++++++
 nova/tests/xenapi/stubs.py |   23 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)

commit 7d31fe9ef316f49379818259a55a84deb5b850cd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 9 10:30:18 2011 +0100

    Stop assuming anything about the order in which the two processes are scheduled.

 nova/tests/test_misc.py |   47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

commit ddeab2da30bb2f74109854d982c6681e78e7a4ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 07:35:58 2011 +0000

    make static method for testing without initializing libvirt

 nova/tests/test_virt.py   |    4 ++--
 nova/virt/libvirt_conn.py |   11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 77da93886be61230dea5a4a4c4de036a57e62550
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 06:56:42 2011 +0000

    tests and semaphore fix for image caching

 nova/tests/test_virt.py   |   66 +++++++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py |   14 +++++++---
 2 files changed, 76 insertions(+), 4 deletions(-)

commit 1d7358e70379607c9cce02307f4336efbd135a5d
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 01:26:53 2011 -0500

    execvp: unit tests pass

 nova/crypto.py |    2 +-
 nova/utils.py  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 1b9ac145de54447f37cdea50ddd1dd028e5f57c1
Merge: 23291a5 a02c0db
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Mar 9 15:26:16 2011 +0900

    merged to trunk rev 769

commit 0a52e9c99e059ff91e71f3756e4875801b7db1dc
Merge: a320b5d f42fda8
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 00:33:35 2011 -0500

    Merge with main

commit a320b5df9f916adf8422ed312306c77570d392c2
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 00:30:05 2011 -0500

    execvp: almost passes tests

 nova/api/ec2/cloud.py        |    2 +-
 nova/network/linux_net.py    |   21 +++++++++++----------
 nova/tests/test_network.py   |    2 +-
 nova/tests/test_virt.py      |   11 ++++++-----
 nova/utils.py                |   19 +++++++++++++------
 nova/virt/libvirt_conn.py    |   11 ++++++-----
 nova/virt/xenapi/vm_utils.py |    6 ++----
 nova/volume/driver.py        |    5 +++--
 8 files changed, 43 insertions(+), 34 deletions(-)

commit f42fda8566383bf0271e5b79e1385c41731639b9
Merge: a02c0db 59fa701
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 9 04:34:25 2011 +0000

    Refactoring nova-api to be a service, so that we can reuse it in unit tests

commit 59fa70102a06dce9f86b9b29825245bc54c01598
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:51:05 2011 -0800

    Added documentation about needed flags

 nova/service.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit e4b176d41cca234082c28ba6d9188745f1d2b98a
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 00:49:56 2011 +0000

    a few fixes for the tests

 .../versions/009_add_os_type_to_instances.py       |   53 --------------------
 .../versions/010_add_os_type_to_instances.py       |   53 ++++++++++++++++++++
 nova/tests/test_xenapi.py                          |    1 +
 nova/virt/xenapi/vmops.py                          |    2 +-
 4 files changed, 55 insertions(+), 54 deletions(-)

commit e8c8fd3f232371625f0924410c4c09c32339b113
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:47:43 2011 -0800

    Renamed FLAG.paste_config -> FLAG.api_paste_config

 nova/service.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a4830f83afd78cdb96dc3e474eb4efc167de7737
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:45:20 2011 -0800

    Sorted imports correctly

 bin/nova-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25549162650581e8d458dcd10b0755741a4e8c74
Merge: b8a0fdc a02c0db
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 00:38:37 2011 +0000

    merge trunk

commit a02c0db7cd72aa3d716116c87cab98b243b5b618
Merge: ca3314b 698398f
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 8 23:45:19 2011 +0000

    Fixes lp730960 - mangled instance creation in virt drivers due to improper merge conflict resolution

commit ca3314b82aa47fe54386d1169481836c07ae8913
Merge: ef86852 c4be1b5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 23:34:46 2011 +0000

    Use disk_format and container_format in place of image type.

commit e7626da8ade4a3d29d441fed1c21c50cbc9928de
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 23:33:17 2011 +0000

    using get_uuid in place of get_record in _get_vm_opaqueref
    changed SessionBase._getter in fake xenapi in order to return HANDLE_INVALID failure when reference is not in DB
    (was NotImplementedException)

 nova/virt/xenapi/fake.py  |   11 ++++++-----
 nova/virt/xenapi/vmops.py |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

commit c4be1b51921b8a81ebc40e1f11d73d409ebebd46
Merge: 6207abe ef86852
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 23:27:03 2011 +0000

    Merging trunk

commit 6207abe3068964c586d06bb0e3740b8bad922dca
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 23:26:33 2011 +0000

    Fixing tests

 nova/tests/glance/stubs.py |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 698398fdc2a05a0930591d3f3d386ad24a322359
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 8 23:24:19 2011 +0000

    Pep8 fixes

 nova/tests/test_xenapi.py  |    2 ++
 nova/tests/xenapi/stubs.py |    1 +
 nova/virt/xenapi/vmops.py  |    2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

commit 7a6833c883a04fd7920bff7367c9e28a35858d8d
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 8 23:17:50 2011 +0000

    Accidentally left some bad data around

 nova/tests/test_xenapi.py |    5 +++++
 1 file changed, 5 insertions(+)

commit ef86852df6cf75b996eeff85c367132fd8be5e23
Merge: b238805 503fe37
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 22:45:06 2011 +0000

    Fix the bug where fakerabbit is doing a sort of prefix matching on the AMQP routing key

commit 15916435b538977bc05201f234952bb7dba5b7b2
Merge: daaa684 b238805
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 22:33:28 2011 +0000

    merge trunk
    
    now using refactored _get_vm_opaqueref

commit dd2f0019297d01fe5d6b3dae4efc72946191be75
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 22:14:25 2011 +0000

    Use disk_format and container_format instead of image type

 nova/api/openstack/servers.py                      |    2 +-
 nova/virt/xenapi/vm_utils.py                       |   18 ++++++++++--------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   14 +++++++++++---
 3 files changed, 22 insertions(+), 12 deletions(-)

commit 81d1afedd137955e9fa9396cec4b0cfa0c2aa9a6
Merge: 1cacedd b238805
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 8 14:42:07 2011 -0600

    Merge from trunk

commit ccbc8f6464ce2da0fd62e154a86b51b1110afb6f
Merge: 5bb77cb b238805
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 12:39:58 2011 -0800

    merged trunk

commit ec23b8e1205e969d449834b02984d01a8daf93dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 20:28:11 2011 +0000

    update manpage

 doc/source/man/novamanage.rst |   30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

commit 23d3be4b6f28359211e29212867157daeac9e142
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 20:25:05 2011 +0000

    update code to work with new container and disk formats from glance

 bin/nova-manage       |   45 ++++++++++++++++++++++++++++++---------------
 nova/api/ec2/cloud.py |    9 ++++++---
 nova/image/s3.py      |    7 ++++++-
 3 files changed, 42 insertions(+), 19 deletions(-)

commit 4517117a71c03526aca8f245a70760c45e5214c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 20:24:48 2011 +0000

    modify nova manage doc

 doc/source/runnova/nova.manage.rst |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 1caceddf431a1ad1ef22235c2206bccf39fde5c5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 8 14:24:01 2011 -0600

    Nits

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a74bf3381ada34f35c43d6f307fbae9abecfb255
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Mar 8 10:30:48 2011 -0800

    abstracted network code in the base class for flat and vlan

 nova/network/manager.py         |    8 +-
 nova/tests/network/__init__.py  |   47 +++++++++
 nova/tests/network/base.py      |  154 +++++++++++++++++++++++++++++
 nova/tests/test_flat_network.py |  147 +++-------------------------
 nova/tests/test_vlan_network.py |  205 +++++++--------------------------------
 5 files changed, 259 insertions(+), 302 deletions(-)

commit d2683e69d1ead8630d1f79d810c5b77960ab30af
Merge: cbc2956 b238805
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Mar 8 18:29:37 2011 +0000

    Remerged trunk. fixed conflict

commit 3d6e5d82e6cf70ae6e11c66d3e8ccadaccf93987
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 18:20:20 2011 +0000

    Removes VDIs from XenServer backend if spawn process fails before vm rec is created.
    
    Fixed pep8 errors.

 nova/virt/xenapi/vm_utils.py                       |  189 ++++++++++++--------
 nova/virt/xenapi/vmops.py                          |  126 +++++++++----
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   15 +-
 3 files changed, 214 insertions(+), 116 deletions(-)

commit e81294b94e3bc8708bd4777b685a7d302594557e
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Mar 8 18:53:20 2011 +0100

    Added ability to remove networks on nova-manage command

 bin/nova-manage           |    6 +++++-
 nova/db/api.py            |    7 +++++++
 nova/db/sqlalchemy/api.py |    7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

commit cbc2956a4e863c1bc952c7cef6045c39d293818d
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Mar 8 17:18:13 2011 +0000

    Remove addition of account to service url.

 nova/api/openstack/__init__.py            |   24 +++------------
 nova/api/openstack/auth.py                |   46 ++++++---------------------
 nova/auth/novarc.template                 |    2 +-
 nova/tests/api/openstack/test_accounts.py |    8 ++---
 nova/tests/api/openstack/test_adminapi.py |    4 +--
 nova/tests/api/openstack/test_auth.py     |    2 +-
 nova/tests/api/openstack/test_flavors.py  |    4 +--
 nova/tests/api/openstack/test_images.py   |    4 +--
 nova/tests/api/openstack/test_servers.py  |   48 ++++++++++++++---------------
 nova/tests/api/openstack/test_users.py    |   10 +++---
 nova/tests/api/openstack/test_zones.py    |   10 +++---
 11 files changed, 59 insertions(+), 103 deletions(-)

commit b238805d2ee9c19d3fb9b4dc43fa404630bdfaab
Merge: 539e049 4e8b6a1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Mar 8 16:55:04 2011 +0000

    refactored up nova/virt/xenapi/vmops _get_vm_opaque_ref()
    no longer inspects the param to check to see if it is an opaque ref
    works better for unittests

commit 539e04925debd351cce05e3d2acf220693f9990f
Merge: bb4e0c9 fbecb23
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Mar 8 16:45:03 2011 +0000

    This fix is an updated version of Todd's lp720157. Adds SignatureVersion checking for Amazon EC2 API requests, and resolves bug #720157.

commit b8a0fdca4df454a4d60df40d06ebd82bcc2ba3da
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 8 14:35:53 2011 +0000

     * pep8 cleanups in migrations
     * a few bugfixes

 .../versions/009_add_os_type_to_instances.py       |    5 +----
 nova/tests/test_xenapi.py                          |    4 ++--
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

commit f53357d32304cd721185704fa0d48454b5627199
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Tue Mar 8 16:33:49 2011 +0530

    Removed stale references to XenAPI.

 nova/tests/test_vmwareapi.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 344304d8599c14fdeb5498e54279b40dc130e259
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Tue Mar 8 15:41:36 2011 +0530

    Moved guest_tool.py from etc/esx directory to tools/esx directory.

 etc/esx/guest_tool.py   |  344 -----------------------------------------------
 tools/esx/guest_tool.py |  344 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 344 insertions(+), 344 deletions(-)

commit c4142835981eb9b2d5a55517d975dbda029986e2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 10:09:34 2011 +0000

    Removed excess comment lines

 nova/network/manager.py    |    1 -
 nova/network/xenapi_net.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 2dd533848668409c7406fa6c434c8783b3d4e110
Merge: db14d92 bb4e0c9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 09:48:00 2011 +0000

    Merge trunk

commit 5fcf84f19c94f96d8f23d8b673ed3f4977f9189d
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:08:13 2011 -0500

    Fix todo comment

 nova/virt/libvirt_conn.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 41f99fca5a20435e3a6dabe1fd1607bf1f3279ac
Merge: cac5881 bb4e0c9
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:04:21 2011 -0500

    Merge from main branch

commit cac5881eaa35f94e004c18dd34ca78014f067976
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:01:41 2011 -0500

    execvp

 nova/crypto.py                                     |   32 +--
 nova/network/linux_net.py                          |  222 ++++++++++----------
 nova/tests/test_network.py                         |   16 +-
 nova/utils.py                                      |   16 +-
 nova/virt/disk.py                                  |   44 ++--
 nova/virt/images.py                                |    5 +-
 nova/virt/libvirt_conn.py                          |   36 ++--
 nova/virt/xenapi/vm_utils.py                       |   11 +-
 nova/volume/driver.py                              |   71 ++++---
 .../networking/etc/xensource/scripts/vif_rules.py  |   91 +++++---
 10 files changed, 296 insertions(+), 248 deletions(-)

commit e411a022c3390a7716601c0a52afc4e448a44a15
Merge: 50d0bcd bb4e0c9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 7 21:42:00 2011 -0500

    Merged trunk

commit 4e8b6a14324ef2d1f550233cbcfc94c6363533d8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 7 18:46:44 2011 -0600

    virt.xenapi.vmops._get_vm_opaque_ref changed vm to vm_ref and ref to obj

 nova/virt/xenapi/vmops.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 5ec9cbcdee3de3868a47ca5ec351a9a2594ceea2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 7 18:05:27 2011 -0600

    virt.xenapi.vmops._get_vm_opaque_ref assumes VM.get_record raises

 nova/virt/xenapi/vmops.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit ecc6bce311ce85b05802cf04dd2b03a3b91d178d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 16:01:43 2011 -0800

    add a delay before grabbing zipfile

 contrib/nova.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e39995def6a2a11cdd430b0e6f603b493be5542b
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 23:51:20 2011 +0000

    Some more refactoring and a tighter unit test

 nova/tests/test_xenapi.py  |   14 ++++++++++----
 nova/tests/xenapi/stubs.py |   15 +++++++++++++--
 nova/virt/xenapi/vmops.py  |   30 ++++++++++++++----------------
 nova/virt/xenapi_conn.py   |    4 ++--
 4 files changed, 39 insertions(+), 24 deletions(-)

commit e69c802aaf40f3b90789aeef8bf3ef5dcbbcb2f3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 15:36:04 2011 -0800

    Moved FLAGS.paste_config to its re-usable location

 bin/nova-api    |   14 +++-----------
 nova/service.py |   10 +++++++---
 2 files changed, 10 insertions(+), 14 deletions(-)

commit be54e37bbd79293ce41f8fa8dfe40022aebb6fff
Merge: 8e0fd37 bb4e0c9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 15:30:58 2011 -0800

    Merged with trunk and fixed conflict.  Sigh.

commit 8e0fd37ddfbe88df296cf45583f0b3e4fa4d7a75
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 15:22:59 2011 -0800

    Converted tabs to spaces in bin/nova-api

 bin/nova-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f0845b7b80081d18ee268b94fe38326f3c5401e
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 23:07:05 2011 +0000

    A few more changes

 nova/tests/test_xenapi.py |    6 ------
 nova/virt/xenapi/vmops.py |   10 +++++-----
 nova/virt/xenapi_conn.py  |    9 +++------
 3 files changed, 8 insertions(+), 17 deletions(-)

commit bb4e0c940f49564c740a1863d110106d9018e8d4
Merge: f5556c7 7a6daa8
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Mar 7 23:02:48 2011 +0000

    Inhibit inclusion of stack traces in the logs UNLESS --verbose has been specified.  This should help keep the logs compact, helping admins find the messages they're interested in (e.g., "Can't connect to MySQL server on '127.0.0.1' (111)") without having to sort through the stack traces, while still allowing developers to see those traces at will.

commit f5556c7f70778a0ac3c0f2283838d98675e845da
Merge: 421cab4 f72366f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Mar 7 22:59:44 2011 +0000

    Addresses bugs 704985 and 705453 by:
    
    1) Adding new nova-api flag --paste_config, the value of which is used in place of the hard-coded "nova-api.conf"
    
    2) Defaulting the new --paste_config to "api-paste.ini"

commit 5c7ee13b058fb954fd9bbc4a3550716b8faa0b97
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 22:50:35 2011 +0000

    And unit tests

 nova/tests/test_xenapi.py  |    5 +++++
 nova/tests/xenapi/stubs.py |    4 ++++
 nova/virt/xenapi_conn.py   |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

commit ede88283729663f11d913cc54bcf8ee08028d98f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 14:42:36 2011 -0800

    A few formatting niceties

 nova/service.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 88c5555e867c730065c18541a35b161eb861b502
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 7 16:40:19 2011 -0600

    First part of the bug fix

 nova/compute/manager.py   |    4 +---
 nova/virt/xenapi/vmops.py |    8 +++++++-
 nova/virt/xenapi_conn.py  |    9 +++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

commit 3fc6b8cbbd1be5baffc300112a0e39a807209c36
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 7 16:34:59 2011 -0600

    virt.xenapi.vmops._get_vm_opaque_ref checks for basestring instance instead of str

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f65867673eff81d649d1a43e895dfae913d83e84
Merge: 861a7f2 421cab4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 14:34:02 2011 -0800

    Merge with trunk, resolve conflicts and refactor

commit 59f73e3180731cec644b590d448e0da74711ae03
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 7 16:11:10 2011 -0600

    virt.xenapi.vmops._get_vm_opaque_ref exception caught properly

 nova/virt/xenapi/vmops.py |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit f79220a1f6a12621463b410d26e31e29a9e6ea3e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 7 15:41:37 2011 -0600

    cleaned up virt.xenapi.vmops._get_vm_opaque_ref. more reliable approach to checking if param is an opaque ref. code is cleaner

 nova/virt/xenapi/vmops.py |   44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

commit 56ee811efd52d0971d7fea4c232a904b3ee78ac6
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Mar 7 22:37:26 2011 +0100

    deleted network_is_associated from nova.db api

 bin/nova-manage           |    4 ++--
 nova/db/api.py            |    5 -----
 nova/db/sqlalchemy/api.py |    9 +--------
 3 files changed, 3 insertions(+), 15 deletions(-)

commit 02e6a17bec06beee5dbffe085073c97281abb586
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 21:30:20 2011 +0000

    move the images_dir out of the way when converting

 bin/nova-manage |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit fd95523689b80f53972c59c3738e6b786a7160ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 21:22:06 2011 +0000

    pep8

 bin/nova-manage          |    1 -
 nova/api/ec2/cloud.py    |    1 -
 nova/api/ec2/ec2utils.py |    1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

commit c944e902aa68d170c0d97a1d50e28fe5e59c572b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 21:20:32 2011 +0000

    rework register commands based on review

 bin/nova-manage |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 0abd5bfecd279272e5fe1b0de04478909cd77010
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Mar 7 22:18:15 2011 +0100

    added network_get_by_cidr method to nova.db api

 bin/nova-manage           |    9 +--------
 nova/db/api.py            |    7 +++++++
 nova/db/sqlalchemy/api.py |   18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

commit 4e9c570fbf8b3987d556da085b61f159f32c16f1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 7 21:59:05 2011 +0100

    Use IptablesManager.semapahore from securitygroups driver to ensure we don't apply half a rule set.

 nova/virt/libvirt_conn.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 7b7abe7e7a25c0cd07c64c34f69ce050c669cfc3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 7 21:54:25 2011 +0100

    Log failed command execution if there are more retry attempts left.

 nova/utils.py |    1 +
 1 file changed, 1 insertion(+)

commit 8c3bc15c96c6a6f1c99d829337921f2645608410
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 7 21:43:31 2011 +0100

    Make iptables rules class __ne__ just be inverted __eq__.

 nova/network/linux_net.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 3f85fc3e03ea9098b44fcb5aa8558ecd3b0f14ff
Merge: bcb18ee 421cab4
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Mar 7 15:26:35 2011 -0500

    Merge from trunk.

commit bcb18ee3d0d095b616c0909c92a151a599d4e17f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Mar 7 15:05:07 2011 -0500

    Invalid values for offset and limit params in http requests now return a 400
    response with a useful message in the body. Also added and updated tests.

 nova/api/openstack/common.py             |   11 +++++++----
 nova/tests/api/openstack/test_common.py  |   20 ++++----------------
 nova/tests/api/openstack/test_servers.py |   28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 20 deletions(-)

commit f72366f007239656d3d5e3fc80cd277758eedf9b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Mar 7 19:33:24 2011 +0000

    Create --paste_config flag defaulting to api-paste.ini and mv etc/nova-api.conf to match

 bin/nova-api      |    7 +++--
 etc/api-paste.ini |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 etc/nova-api.conf |   91 -----------------------------------------------------
 3 files changed, 96 insertions(+), 93 deletions(-)

commit 421cab431253290445608c67c14ec736c3bd2708
Merge: 9610c61 1767aaf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 7 18:30:36 2011 +0000

    Implementation for XenServer migrations. There are several places for optimization but I based the current implementation on the chance scheduler just to be safe. Beyond that, a few features are missing, such as ensuring the IP address is transferred along with the migrated instance. This will be added in a subsequent patch. Finally, everything is implemented through the Openstack API resize hooks, but actual resizing of the instance RAM and hard drive space is not yet implemented.

commit 1767aaf05b831deac0ee0f0e1de75c656d919107
Merge: a775c4e 9610c61
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 17:18:10 2011 +0000

    Merge from trunk

commit a775c4eee279e11268a6cc447aee24c452e4665a
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 17:17:41 2011 +0000

    Merge prop changes and test fixes

 nova/tests/xenapi/stubs.py   |   26 +++++++++++++-------------
 nova/virt/xenapi/vm_utils.py |   30 ++++++++++++------------------
 nova/virt/xenapi/vmops.py    |    4 ++--
 3 files changed, 27 insertions(+), 33 deletions(-)

commit b3d3366b8fd4eaf81bb9e03ad808c1a139e5b5b0
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 7 12:07:23 2011 -0500

    Generate 'adminPass' and call set_password when creating servers.

 nova/api/openstack/servers.py            |   10 +++++++---
 nova/tests/api/openstack/test_servers.py |    8 +++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

commit daaa68415a33c975e3e136f9a02af6f9bf2c3fdb
Merge: 97563d6 9610c61
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 7 17:03:27 2011 +0000

    Merged with current trunk
    
    Updated _get_vm_opaqueref:
    OpaqueRef inspection not performed anymore
    No test-specific code path
    No weird lists for known vm references
    
    merged stubout_db_network_api with stubout_db_instance_api
    
    Unit tests passed
    pep8 errors fixed

commit 4937a1ec17beadb6e1737ac126adf68fd6dbf2c8
Merge: e63cd9d 9610c61
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 7 15:53:54 2011 +0000

    merge trunk

commit f8e8d52c1f1a261417f648d78effcd48c2898ab9
Merge: d940d45 a29596e
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 21:11:27 2011 +0530

    Resolving excess conflicts due to criss-cross in branch history

commit 81fe66bb19d16c387705e144c9941096cc497cf0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 7 15:12:26 2011 +0100

    Make "dhcpbridge init" output correctly formatted leases information.

 bin/nova-dhcpbridge       |    2 +-
 nova/network/linux_net.py |   30 +++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

commit a29596e27b76a0a3f27764cade6fa4bbcf9e70d7
Merge: 12624b5 9610c61
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 19:05:48 2011 +0530

    Rebased to nova revision 761

commit d940d4529b0102b83b98a52754bd897657a3355e
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 18:38:04 2011 +0530

    Fixed some more pep8 errors

 nova/virt/vmwareapi/__init__.py |    1 -
 nova/virt/vmwareapi/vim_util.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 67e63ba87f38ff8242429ffd237816af2eedfd5f
Merge: 7d3b9ca 9610c61
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 18:10:48 2011 +0530

    * Updated readme file with installation of suds-0.4 through easy_install.
    * Removed pass functions
    * Fixed pep8 errors
    * Few bug fixes and other commits
    
    Also rebased this branch to nova revision 761

commit ac681cdddac29b973b107d6ee06f0fc2039a1d7e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Mar 6 19:21:14 2011 -0800

    zipfile needs to be extracted after nova is running

 contrib/nova.sh |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit a5bee00af4d6ec3eed6ed0abd866948f4510f041
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 01:25:01 2011 +0000

    make compute get the new images properly, fix a bunch of tests, and provide conversion commands

 bin/nova-manage              |  131 +++++++++++++++++++++++++++++++++++++++++-
 nova/api/ec2/cloud.py        |   74 +++++++++++++++---------
 nova/api/ec2/ec2utils.py     |    6 +-
 nova/compute/api.py          |    4 +-
 nova/image/glance.py         |   35 +++++++++--
 nova/image/local.py          |   52 +++++++++++++----
 nova/image/s3.py             |   33 +++++++----
 nova/image/service.py        |   18 ++++--
 nova/tests/test_cloud.py     |   16 +++---
 nova/tests/test_compute.py   |   12 ++--
 nova/tests/test_console.py   |    2 +-
 nova/tests/test_quota.py     |   32 ++++++-----
 nova/tests/test_scheduler.py |    4 +-
 nova/tests/test_volume.py    |    2 +-
 nova/virt/images.py          |   25 ++++----
 nova/virt/libvirt_conn.py    |    8 ++-
 16 files changed, 345 insertions(+), 109 deletions(-)

commit aa4b8a557505108341d603659a5456d10d5f9632
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 12:06:39 2011 -0500

    avoid possible string/int comparison problems

 nova/quota.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a7e290df0fe71f75256507f159e955c0d4ab72f6
Merge: 7af17cb 9610c61
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 10:53:42 2011 -0500

    merge lp:nova

commit 7af17cbef6f3e1c5b052133e40e0edbd8ca9ffb3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 10:41:24 2011 -0500

    select cleanups

 nova/api/openstack/servers.py |    2 +-
 nova/quota.py                 |   14 ++++++--------
 nova/virt/xenapi/vmops.py     |    2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

commit fbecb23c5534ccc91aa6f9d3d9e32d9d6189d266
Merge: 0265cf6 9610c61
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Mar 6 22:33:07 2011 +0900

    Merged to trunk rev 760, and fixed comment line indent according to Jay's comment.

commit 9610c61055ab84038becf4af0b63bab9071a900a
Merge: 2280848 831f398
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Mar 5 23:44:24 2011 +0000

    Fix renaming of instance fields using update_instance api method.

commit ceccffaab6fb5fce3b0951b5a8eea65f523e8563
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 4 19:13:27 2011 -0500

    apirequest -> apireq.

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e63cd9d5dc856f81477cf6c0e6c77ed7d1f4d70c
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 4 22:17:53 2011 +0000

     * os_type is no longer `not null`

 .../versions/007_add_os_type_to_instances.py       |   45 ----------------
 .../versions/009_add_os_type_to_instances.py       |   56 ++++++++++++++++++++
 nova/virt/xenapi/vm_utils.py                       |    8 +--
 3 files changed, 60 insertions(+), 49 deletions(-)

commit 10668b87f46a1fb5d039f6e7d7a7a55b89d7602a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 17:04:41 2011 -0500

    respond well if personality attribute is incomplete

 nova/api/openstack/servers.py            |    3 ++
 nova/tests/api/openstack/test_servers.py |   48 ++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 5 deletions(-)

commit 1eed366b7508c0f225b2c9691e1f62a6f88ee3f8
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Mar 4 21:07:03 2011 +0100

    Added initial support to delete networks nova-manage

 bin/nova-manage |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit f3c1c99ca0f6f3164430b33f46772ef8bdc87b70
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 19:54:19 2011 +0000

    move the id wrapping into cloud layer instead of image_service

 nova/api/ec2/cloud.py |   33 ++++++++++++++++++++++++---------
 nova/image/s3.py      |   28 +++++-----------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

commit 1831f31af0ac21ded3535f15777bd5147c615c34
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 4 11:52:18 2011 -0800

    added flatmanager unit testcases and renamed test_network.py to test_vlan_network.py

 nova/tests/test_flat_network.py |  276 +++++++++++++++++++++++++++++
 nova/tests/test_network.py      |  369 --------------------------------------
 nova/tests/test_vlan_network.py |  373 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 649 insertions(+), 369 deletions(-)

commit a38e6c67c37a4d3336cf1dc3717fd5612a474183
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 14:45:31 2011 -0500

    remove xml testing infrastructure since it is not feasible to use at present

 nova/tests/api/openstack/test_servers.py |   31 ------------------------------
 1 file changed, 31 deletions(-)

commit f36b4fe22bcb187d5f426320bbe43fcf3cb1a30a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 14:44:29 2011 -0500

    refactor server tests to support xml and json separately

 nova/tests/api/openstack/test_servers.py |  103 ++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 35 deletions(-)

commit cff74a76e6369989e8006aa9d7c20fde14b31952
Author: matt.dietz@rackspace.com <>
Date:   Fri Mar 4 19:24:55 2011 +0000

    More unit tests and rabbit hooks

 nova/flags.py                    |    3 ++-
 nova/notifier/__init__.py        |   11 ++++++++---
 nova/notifier/no_op_notifier.py  |    2 +-
 nova/notifier/rabbit_notifier.py |   23 ++++++++++++++++++-----
 nova/tests/test_notifier.py      |   29 ++++++++++++++++++++++++-----
 5 files changed, 53 insertions(+), 15 deletions(-)

commit 831f398653cc99253bfeeb232165d3f9c043bd0b
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 4 14:01:25 2011 -0500

    Fix renaming of instance fields using update_instance method.

 nova/api/ec2/apirequest.py |   18 +++++++++++++++++-
 nova/api/ec2/cloud.py      |    4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

commit 7afebad78de462918b89d61f5d8e0cee8bc11068
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 4 13:45:43 2011 -0500

    Fix api logging to show proper path and controller:action.

 nova/api/ec2/__init__.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 44a4d20d4be54dc07875bc4609950d07e2fc4398
Merge: 68d894b 2280848
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 4 17:59:28 2011 +0000

    merged trunk

commit 68d894be2ec3b4eaa14dc5c90143f45f7db1e4b8
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 4 17:48:28 2011 +0000

    * Tests to verify correct vm-params for Windows and Linux instances

 nova/compute/api.py                                |    5 +-
 .../versions/007_add_os_type_to_instances.py       |    4 +-
 nova/tests/db/fakes.py                             |    1 +
 nova/tests/test_xenapi.py                          |   99 +++++++++++++++++---
 nova/virt/xenapi/vm_utils.py                       |   14 +--
 nova/virt/xenapi/vmops.py                          |    8 +-
 6 files changed, 101 insertions(+), 30 deletions(-)

commit 4e98750e0a39b177d6f6523ebf4071f3cebd1a46
Merge: 1d8914f 2280848
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 4 11:20:28 2011 -0600

    Merge from trunk

commit 1d8914fc752f7182f942cdd40f2ba18baedeed0c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 4 11:19:35 2011 -0600

    More fixes

 nova/api/openstack/servers.py |    4 ++--
 nova/compute/api.py           |    8 ++++----
 nova/compute/manager.py       |    2 +-
 nova/tests/xenapi/stubs.py    |    2 +-
 nova/virt/xenapi/vm_utils.py  |   16 ++++++++--------
 nova/virt/xenapi/vmops.py     |   11 ++++++-----
 6 files changed, 22 insertions(+), 21 deletions(-)

commit 26bf996e7edfa741f235284749fdbdd6c11653a7
Merge: 63d799a 2280848
Author: matt.dietz@rackspace.com <>
Date:   Fri Mar 4 16:53:50 2011 +0000

    Merge from trunk

commit 23291a5e1a0134aff5fe030b52d4335a6f2a18d9
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Mar 5 01:07:12 2011 +0900

    delete unnecessary DECLARE

 nova/tests/test_virt.py |    1 -
 1 file changed, 1 deletion(-)

commit 1f0df07baac52379b122a9928200305dd9d2151f
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Mar 5 00:57:08 2011 +0900

    Fixed based on reviewer's comment. Main changes are below.
    1. get_vcpu_total()/get_memory_mb()/get_memory_mb_used() is changed for users who used non-linux environment.
    2. test code added to test_virt.

 contrib/nova.sh           |    1 +
 nova/tests/test_virt.py   |  163 +++++++++++++++++++++++++++++++++++++--------
 nova/virt/libvirt_conn.py |   12 +++-
 3 files changed, 147 insertions(+), 29 deletions(-)

commit 5f251e71de902f9218bb7300cccffb0d66158c61
Merge: abd5779 2280848
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 10:36:54 2011 -0500

    merge lp:nova

commit db14d929cdbdae2f6f3b91b0be960116164f052c
Merge: cb30c80 2280848
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 4 12:43:33 2011 +0000

    merge trunk

commit cb30c80c922a09ccca18645670ea5b1cdc70f1f2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 4 12:31:59 2011 +0000

    fixed wrong local variable name in vmops

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2280848e8477c33f2a903eb7f821dcbcc90ce307
Merge: 458bf96 c363c2a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 4 06:54:52 2011 +0000

    Use %s for instance-delete logging in case instance_id comes through as a string.

commit abd5779068f3b979fc79dec7a68549999c58092d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 01:36:29 2011 -0500

    remove ensure_b64_encoding

 nova/compute/manager.py   |   10 ++--------
 nova/utils.py             |   12 ------------
 nova/virt/xenapi/vmops.py |   10 +++++-----
 3 files changed, 7 insertions(+), 25 deletions(-)

commit 517a571f8905c32efd45f7b3410fb263ad705545
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:58:49 2011 +0000

    add the ec2utils file i forgot

 nova/api/ec2/ec2utils.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit e2c95e198f1982bc50bc95bc61ef3211b17937a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:55:41 2011 +0000

    spawn a greenthread for image registration because it is slow

 nova/image/s3.py |   67 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

commit cf9bc248f0fc318c4a9fb5087f257216312e39d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:21:28 2011 +0000

    fix a couple issues with local, update the glance fake to actually return the same types as the real client, fix the image tests

 nova/image/local.py                     |   12 +++---------
 nova/tests/api/openstack/fakes.py       |    3 ++-
 nova/tests/api/openstack/test_images.py |   15 +++++++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

commit 13307e02258a5a08bedb1ed933a107668aac6457
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:04:49 2011 +0000

    make local image service work

 nova/api/ec2/cloud.py     |    2 +-
 nova/image/local.py       |   64 +++++++++++++++++++++++++++++++--------------
 nova/objectstore/image.py |    3 +--
 3 files changed, 46 insertions(+), 23 deletions(-)

commit bc94ec23100de9f07e04b0348823d4f103a9daa5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 02:49:12 2011 +0000

    use LocalImageServiceByDefault

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a433ddeda77aaa4462694661ecdca71eed6db669
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 02:36:55 2011 +0000

    Replace objectstore images with S3 image service backending to glance or local

 bin/nova-manage                   |    2 +-
 nova/api/ec2/cloud.py             |  127 +++++++++--------
 nova/flags.py                     |    2 +-
 nova/image/glance.py              |   29 ++--
 nova/image/s3.py                  |  280 +++++++++++++++++++++++++++----------
 nova/image/service.py             |    4 +-
 nova/tests/api/openstack/fakes.py |   11 +-
 nova/tests/fake_flags.py          |    1 +
 nova/tests/test_cloud.py          |   22 ++-
 nova/tests/test_compute.py        |    7 +-
 nova/tests/test_direct.py         |    3 +-
 nova/tests/test_quota.py          |    6 +-
 12 files changed, 334 insertions(+), 160 deletions(-)

commit 0265cf6f3f60e1354610064340cc1b21dfa79353
Merge: 6606b4d 458bf96
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 10:47:17 2011 +0900

    Merged to trunk rev 759.

commit 6606b4d438327b5405ef810c26cf801fa64433eb
Merge: 58ac632 90e8072
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 10:46:55 2011 +0900

    Merged trunk rev 758.

commit aa09f87060c1d1885b7a557ff26a3c421ad42df8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 17:31:37 2011 -0800

    remove ra_server from model and fix migration issue while running unit tests

 .../versions/007_add_ipv6_flatmanager.py           |   60 ++++++++++++++++++--
 nova/db/sqlalchemy/models.py                       |    2 -
 2 files changed, 54 insertions(+), 8 deletions(-)

commit 35be7d39866f6ac1017dd94d33d9c01f47a6bc74
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 15:44:01 2011 -0800

    Removed properties added to fixed_ips by xs-ipv6 BP

 nova/db/sqlalchemy/models.py |    3 ---
 nova/network/manager.py      |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

commit 0a9ba675c88ae0b2a18f47524d24075409261658
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 15:39:23 2011 -0800

    altered ra_server name to gateway_v6

 .../versions/007_add_ipv6_flatmanager.py           |   14 ++-
 .../versions/007_add_ipv6_to_fixed_ips.py          |   90 --------------------
 2 files changed, 6 insertions(+), 98 deletions(-)

commit 5cb96217d4b057374ee15ec1d7f29fb8ea17cd12
Merge: 5ae1355 458bf96
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 18:34:06 2011 -0500

    merge lp:nova

commit 5ae13551990be67e3509ddcd10d1872a91634d83
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 18:27:57 2011 -0500

    rename onset_files to personality_files all the way down to compute manager

 nova/api/openstack/servers.py            |   16 +++++++-------
 nova/compute/api.py                      |   10 ++++-----
 nova/compute/manager.py                  |    2 +-
 nova/tests/api/openstack/test_servers.py |   35 +++++++++++++++---------------
 nova/tests/test_quota.py                 |    2 +-
 5 files changed, 33 insertions(+), 32 deletions(-)

commit c5bfab9a0d213cee549371f05e74747cfcd8f998
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Mar 3 23:05:00 2011 +0000

    Changing output of status from showing the user as the owner, to showing the project

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4
Merge: 4c50dde 7ca1669
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Mar 3 23:04:11 2011 +0000

    Merge from trunk

commit e14f524eb92ae07704a2ec7dac0f97c60940a6ab
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 17:49:41 2011 -0500

    enforce personality quotas

 nova/compute/api.py      |   24 +++++++++++++++++
 nova/quota.py            |   27 ++++++++++++-------
 nova/tests/test_quota.py |   66 +++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 101 insertions(+), 16 deletions(-)

commit 417f6ca5c54878a6bea4d545126f93ecb6a043b4
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 22:22:00 2011 +0000

    localize a few error messages.

 nova/api/openstack/accounts.py |    2 +-
 nova/api/openstack/users.py    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 848aced747a60c47d76efcb2147041339df4a628
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 3 17:21:21 2011 -0500

    Refactor wsgi.Serializer away from handling Requests directly; now require Content-Type in all requests; fix tests according to new code

 nova/api/direct.py                       |    2 +-
 nova/api/openstack/__init__.py           |    4 +-
 nova/api/openstack/consoles.py           |    2 +-
 nova/api/openstack/faults.py             |    5 +-
 nova/api/openstack/images.py             |    2 +-
 nova/api/openstack/servers.py            |    9 ++-
 nova/api/openstack/zones.py              |    4 +-
 nova/exception.py                        |    4 ++
 nova/tests/api/openstack/test_servers.py |    1 +
 nova/tests/api/openstack/test_zones.py   |   15 +++--
 nova/tests/api/test_wsgi.py              |   95 +++++++++++++++++------------
 nova/tests/test_direct.py                |    3 +
 nova/wsgi.py                             |   96 ++++++++++++++++++------------
 13 files changed, 152 insertions(+), 90 deletions(-)

commit 9cfe8ff2e8e66952c3202b852a88ee6fca6fb736
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 16:31:01 2011 -0500

    pep8

 nova/api/openstack/servers.py            |    9 +++++----
 nova/tests/api/openstack/test_servers.py |    6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 0e1a458166ad1e89ca0755d88b8efec39855ee5c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 3 13:18:37 2011 -0600

    Renaming my migration yet again

 .../versions/007_add_instance_migrations.py        |   61 --------------------
 .../versions/009_add_instance_migrations.py        |   61 ++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)

commit 05ab132a80877f6600ab3a1d712450e421db5eec
Merge: 953fe68 458bf96
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 3 13:13:15 2011 -0600

    Merge from trunk, conflict resolution and merge prop fixes

commit 5d63dc7af5c911b9d7f2b168c61c8f21065a2f1b
Merge: df0a4d6 458bf96
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 11:09:24 2011 -0800

    Merged with Trunk

commit c363c2aaacb01cbbe8dcdaa4bda2e5d2531ab8e8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 3 18:21:54 2011 +0000

    Use %s in case instance_id came through as a string

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 63d799a5ac6172b73708a183f3d952a2c8b53c2b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 3 11:56:21 2011 -0600

    Basic notifications drivers and tests

 nova/flags.py                    |    3 +++
 nova/notifier/__init__.py        |   19 ++++++++++++++++++
 nova/notifier/no_op_notifier.py  |   19 ++++++++++++++++++
 nova/notifier/rabbit_notifier.py |   24 ++++++++++++++++++++++
 nova/tests/test_notifier.py      |   41 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 106 insertions(+)

commit 6d075754bdd4090342bf4f79c726a52923c311a8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 3 12:45:34 2011 -0500

    adding wsgi.Controller and wsgi.Request testing; fixing format keyword argument exception

 nova/tests/api/test_wsgi.py |  120 ++++++++++++++++++++++++++++++++++++-------
 nova/wsgi.py                |    4 +-
 2 files changed, 105 insertions(+), 19 deletions(-)

commit 458bf9682df0514a7f180f1ab1566bb7846cd281
Merge: 90e8072 cb9d00f
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 17:10:15 2011 +0000

    This fix changes a tag contained in the DescribeKeyPairs response from <keypairsSet> to <keySet> so that Amazon EC2 access libraries which does more strict syntax checking can work with Nova.

commit bc6cc457132b096150dcd9ff2ed2909585a80484
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Mar 4 01:17:05 2011 +0900

    some comments are modified

 nova/db/api.py            |    8 ++++----
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 137a4946785b9460aadb9fe40f2b0e18bd7f6063
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Mar 4 01:09:21 2011 +0900

    Merged to trunk rev 757. Main changes are below.
    1. Rename db table ComputeService -> ComputeNode
    2. nova-manage option instance_type is reserved and we cannot use option instance, so change instance -> vm.

 bin/nova-manage                                    |    4 +--
 nova/db/api.py                                     |   12 ++++-----
 nova/db/sqlalchemy/api.py                          |   26 ++++++++++----------
 .../versions/009_add_live_migration.py             |    8 +++---
 nova/db/sqlalchemy/models.py                       |   10 ++++----
 nova/scheduler/driver.py                           |   10 ++++----
 nova/scheduler/manager.py                          |   14 +++++------
 nova/tests/test_scheduler.py                       |   16 ++++++------
 nova/tests/test_virt.py                            |   22 ++++++++---------
 nova/virt/libvirt_conn.py                          |   10 ++++----
 10 files changed, 66 insertions(+), 66 deletions(-)

commit a62e603e8b1cedd89ca0c71f1cdc928d19c68a4d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 3 11:04:33 2011 -0500

    adding wsgi.Request class to add custom best_match; adding new class to wsgify decorators; replacing all references to webob.Request in non-test code to wsgi.Request

 nova/api/direct.py                          |    4 +--
 nova/api/ec2/__init__.py                    |   14 +++++-----
 nova/api/ec2/metadatarequesthandler.py      |    2 +-
 nova/api/openstack/__init__.py              |    4 +--
 nova/api/openstack/auth.py                  |    4 +--
 nova/api/openstack/common.py                |    2 +-
 nova/api/openstack/faults.py                |    2 +-
 nova/api/openstack/ratelimiting/__init__.py |    4 +--
 nova/wsgi.py                                |   37 +++++++++++++++++++++------
 9 files changed, 47 insertions(+), 26 deletions(-)

commit 9d2ee1b26196efe855d298639561ca69fb96e2cc
Merge: 6797c5a 90e8072
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 15:50:34 2011 +0000

    Remerged trunk, fixed a few conflicts.

commit 6797c5acc47fb5111ef821d6b074cb635692a9fb
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 15:41:45 2011 +0000

    Add in multi-tenant support in openstack api.

 bin/nova-manage                                    |    3 +
 nova/api/openstack/__init__.py                     |   25 ++++
 nova/api/openstack/accounts.py                     |   73 ++++++++++
 nova/api/openstack/auth.py                         |   54 +++++++-
 nova/api/openstack/backup_schedules.py             |    6 +-
 nova/api/openstack/consoles.py                     |   10 +-
 nova/api/openstack/flavors.py                      |    6 +-
 nova/api/openstack/images.py                       |   12 +-
 nova/api/openstack/servers.py                      |   38 +++---
 nova/api/openstack/shared_ip_groups.py             |   12 +-
 nova/api/openstack/users.py                        |   93 +++++++++++++
 nova/api/openstack/zones.py                        |   12 +-
 nova/auth/novarc.template                          |    2 +-
 nova/db/sqlalchemy/api.py                          |    3 +
 nova/tests/api/openstack/fakes.py                  |   82 +++++++++++-
 nova/tests/api/openstack/test_accounts.py          |  123 +++++++++++++++++
 nova/tests/api/openstack/test_adminapi.py          |    6 +-
 nova/tests/api/openstack/test_auth.py              |   17 ++-
 nova/tests/api/openstack/test_flavors.py           |    4 +-
 nova/tests/api/openstack/test_images.py            |    6 +-
 nova/tests/api/openstack/test_servers.py           |   51 +++----
 nova/tests/api/openstack/test_users.py             |  139 ++++++++++++++++++++
 nova/tests/api/openstack/test_zones.py             |   12 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 24 files changed, 688 insertions(+), 103 deletions(-)

commit cb9d00f82cc59378312124a5a889b37890856df8
Merge: 26c217d 90e8072
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 00:33:29 2011 +0900

    Merged to trunk rev 758.

commit 86b86bc6da2b550f4e61574edb9437e05dc094e3
Merge: c50bb69 90e8072
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 16:33:18 2011 +0100

    Merge trunk

commit 90e8072df434621a364763f1c7cae0ac0159d630
Merge: 20ae9eb f7645bc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Mar 3 15:31:36 2011 +0000

    Fix regression in the way libvirt_conn gets its instance_types

commit 26c217d1f16b100b9dc615388ee315e6daf336ce
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 00:30:19 2011 +0900

    Updated DescribeKeyPairs response tag checked in nova/tests/test_cloud.py

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6a6c01ce6794a3dc139ea19c7e84551543948e31
Merge: 693e433 20ae9eb
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 3 22:57:30 2011 +0900

    merged to trunk rev757

commit 693e4335dbef72317147abd70bdaa10e0d174020
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 3 22:54:11 2011 +0900

    Fixed based on reviewer's comments. Main changes are below.
    1. Rename nova.compute.manager.ComputeManager.mktmpfile for better naming.
    2. Several tests code in tests/test_virt.py are removed. Because it only works in libvirt environment. Only db-related testcode remains.

 nova/compute/manager.py      |   53 +++---
 nova/scheduler/driver.py     |   74 +++++----
 nova/scheduler/manager.py    |   18 +--
 nova/tests/test_scheduler.py |   14 +-
 nova/tests/test_virt.py      |  363 +++++++++---------------------------------
 nova/virt/libvirt_conn.py    |   10 +-
 nova/volume/manager.py       |    4 +-
 7 files changed, 166 insertions(+), 370 deletions(-)

commit f7645bc2fb46ab7649faf12c794834d94839e4d2
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Mar 3 13:55:01 2011 +0100

    Fix regression in the way libvirt_conn gets its instance_types

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c50bb69ce92e9d03b153a334d82fd6917764889d
Merge: 8b66f2f 9a61a49
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 13:52:09 2011 +0100

    Merge sync branch and trunk

commit 9a61a49eee126b333f82c3b129f88996e9f4d97f
Merge: be9004f 20ae9eb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 13:51:36 2011 +0100

    Merge trunk

commit 668cdc96b3f6fb412b9d1d4a3780744d6b2340b1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 00:59:09 2011 -0500

    more rigorous testing and error handling for os api personality

 nova/api/openstack/servers.py            |    8 ++++++--
 nova/tests/api/openstack/test_servers.py |   25 +++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

commit f9cce74cad854d377de113a619dc42df10b9a2ba
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 14:10:42 2011 +0900

    Updated Authors and .mailmap

 .mailmap |    1 +
 Authors  |    1 +
 2 files changed, 2 insertions(+)

commit 9bd08cb1d79d46dc988e902de0b4d4280738fdf0
Merge: f617fc0 20ae9eb
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 13:54:12 2011 +0900

    Merged to rev 757.

commit 20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3
Merge: 11dde80 dc8e308
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 3 02:04:51 2011 +0000

    merges dynamic instance types blueprint (http://wiki.openstack.org/ConfigureInstanceTypesDynamically) and bundles blueprint (https://blueprints.launchpad.net/nova/+spec/flavors)

commit dc8e308819fb383b317ff866288965a27016557e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:54:04 2011 -0800

    moved migration to 008 (sigh)

 .../versions/007_add_instance_types.py             |   87 --------------------
 .../versions/008_add_instance_types.py             |   87 ++++++++++++++++++++
 2 files changed, 87 insertions(+), 87 deletions(-)

commit de43ea935ed1a65ef48c160b48ffa0fa6df28428
Merge: 74f2a75 11dde80
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:50:48 2011 -0800

    merged trunk

commit 74f2a7537e9e4b8259a4179adc21eef59e59d3c5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:38:42 2011 -0800

    catching bare except:

 nova/compute/instance_types.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 507a13d8dcdc11ea7638c8904d6d0de22d8e109b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:14:51 2011 -0800

    added logging to instance_types for DB errors per code review

 nova/compute/instance_types.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 11dde805f48a17465c9c2b0c08b8302713f25471
Merge: cee47d4 7c18a45
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 3 01:04:38 2011 +0000

    Very simple change checking for < 0 values in "limit" and "offset" GET parameters. If either are negative, raise a HTTPBadRequest exception. Relevant tests included.

commit 45662001c477bdce7cd50b4f7f67e06479c3cbd3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:59:38 2011 -0800

    requested style change

 nova/compute/instance_types.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit cee47d411c6b55dcedf667e63eb3e42651ba1f0d
Merge: 98e665f f03f3ba
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Thu Mar 3 00:59:11 2011 +0000

    Fixes Bug #715424: nova-manage : create network crashes when subnet range provided is not enough , if the network range cannot fit the parameters passed, a ValueError is raised

commit b39a3f099a4410c95658334fc1907a8eb6b5a5dc
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:57:56 2011 -0800

    adding new source docs

 doc/.autogenerated                                 |  141 ++++++++++++++++++++
 ...ate_repo.versions.005_add_instance_metadata.rst |    6 +
 ...o.versions.006_add_provider_data_to_volumes.rst |    6 +
 ...igrate_repo.versions.007_add_instance_types.rst |    6 +
 doc/source/api/nova..tests.test_instance_types.rst |    6 +
 doc/source/api/nova..tests.test_test.rst           |    6 +
 doc/source/api/nova..tests.test_utils.rst          |    6 +
 7 files changed, 177 insertions(+)

commit 1abd891f65ea8291dc0c3f2075de80dc92c0d431
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:46:32 2011 -0800

    corrected error message

 nova/compute/instance_types.py |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

commit 28896fcfb474662fe339fa5b05aec33b3896b4fa
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:37:02 2011 -0800

    changed _context

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7305bc9a47c03d9b471d747341ca3e95e89f56f4
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:35:53 2011 -0800

    pep8

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 86aed7edae3dd90741d0da704a99460701b8bcc7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:32:09 2011 -0800

    added in req.environ for context

 nova/api/openstack/flavors.py |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

commit 22ec4e190ccf9e30a7862e1ee7d90f2a0858c438
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:12:36 2011 -0800

    pep8

 nova/compute/instance_types.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0bf74ef365688476b2b3a44e353c0062989d33b5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:12:22 2011 -0800

    fixed _context typo

 nova/api/ec2/admin.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4243e8e2b41f1438023b1184b1281474b27b5467
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:09:27 2011 -0800

    coding style change per devcamcar review

 nova/compute/instance_types.py |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 092e26667b4cf7389cbbb0d206fe7721515262eb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:07:05 2011 -0800

    fixed coding style per devcamcar review notes

 bin/nova-manage |   37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

commit 077a77a1ab6fbec468b36e2975c1e185235c17ff
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 15:49:51 2011 -0800

    removed create and delete method (and corresponding tests) from flavors.py

 nova/api/openstack/flavors.py            |   20 --------------------
 nova/tests/api/openstack/test_flavors.py |   14 ++------------
 2 files changed, 2 insertions(+), 32 deletions(-)

commit 98e665f870c20d81db13bb9e5402a7b187dfe539
Merge: ce5d90e e34e9dd
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 23:37:31 2011 +0000

    Provide the ability to rescue and unrescue a XenServer instance.

commit ce5d90ebaf0eb57a396001e6947db3cbc31fe36e
Merge: bb7c1b8 67d9051
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 23:34:43 2011 +0000

    Enable IPv6 injection for XenServer instances. Added addressV6, netmaskV6 and gatewayV6 columns to the fixed_ips table via migration #007 as per NTT FlatManager IPv6 spec.

commit e34e9dd982870915f8c4dbf84a08bece42b0c592
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 17:09:50 2011 -0600

    Updated docstrings

 nova/virt/xenapi/vmops.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit d33866923958b3529a812f4eef7dea4a6591a423
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 2 17:36:21 2011 -0500

    add support for quotas on file injection

 nova/quota.py            |   29 +++++++++++++++++++++++------
 nova/tests/test_quota.py |   10 ++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

commit 67d9051551775df73aed118a3ca307c61d284225
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 16:20:54 2011 -0600

    Added IPv6 migrations

 .../versions/007_add_ipv6_to_fixed_ips.py          |   90 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    3 +
 2 files changed, 93 insertions(+)

commit 953fe68ce9b27322003200c464c121464761d1e2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 2 15:46:50 2011 -0600

    merge fixes

 nova/compute/api.py                                |    4 +-
 nova/virt/xenapi/vm_utils.py                       |    4 +-
 nova/virt/xenapi/vmops.py                          |   48 +++++++++-----------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 4 files changed, 27 insertions(+), 31 deletions(-)

commit 6d62f387e39b42821f8a8f6ca560dd47b3bb9c7e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 15:42:21 2011 -0600

    Inject IPv6 data into XenStore for instance

 nova/virt/xenapi/vmops.py |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

commit 8707a7a28c75e789f327b20f4cec779a6e8712d2
Merge: 8a9130e bb7c1b8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 2 11:39:30 2011 -0600

    Merge from trunk

commit 50d0bcdfd689408fab9e387faaf9d5b57c4c7139
Merge: 031205a bb7c1b8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 2 10:55:12 2011 -0500

    Merge trunk

commit f617fc087367a3d65bd4b826bf735f65fec9d2fd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 00:28:04 2011 +0900

    Change DescribeKeyPairs response tag from keypairsSet to keySet, and fix lp720133.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 58ac632f8e08b248d234deffdb56fe3a33a25130
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 00:12:48 2011 +0900

    Port Todd's lp720157 fix to the current trunk, rev 752.

 nova/api/ec2/__init__.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 97563d650a08e7f2d1aa1f08237219291d821e39
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 2 10:43:45 2011 +0000

    Changed _get_vm_opaqueref removing test-specific code paths.

 nova/virt/xenapi/vmops.py |   30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

commit e0f1490e481e5b3e0e28b25049cc69eb905b74d6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 2 09:50:44 2011 +0000

    Removed excess TODO comments and debug line

 nova/virt/xenapi/vmops.py |    2 --
 1 file changed, 2 deletions(-)

commit 7825b7ce81dec97e997d296c3e30b5d143948abc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 2 01:21:54 2011 -0800

    initial commit of vnc support

 nova/api/ec2/cloud.py          |    6 ++
 nova/compute/api.py            |   17 +++++
 nova/compute/manager.py        |    9 +++
 nova/flags.py                  |    6 ++
 nova/virt/libvirt.xml.template |    1 +
 nova/virt/libvirt_conn.py      |   17 +++++
 tools/euca-get-vnc-console     |  163 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 219 insertions(+)

commit 2162bd911ec82471fa24ff4060bfcbab37fd8a3c
Merge: 282a18a bb7c1b8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 1 23:10:04 2011 -0800

    merged trunk

commit df0a4d66f7059db94e1de365fed8b8d244e16534
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Mar 1 17:12:47 2011 -0800

    Changed ra_server to gateway_v6 and removed addressv6 column from fixed_ips db table

 nova/api/ec2/cloud.py                              |    4 --
 nova/db/sqlalchemy/api.py                          |   11 ++----
 .../versions/007_add_ipv6_flatmanager.py           |   24 ++++--------
 nova/db/sqlalchemy/models.py                       |    5 +--
 nova/network/linux_net.py                          |    2 +-
 nova/network/manager.py                            |   37 ++++--------------
 nova/virt/interfaces.template                      |    6 +--
 nova/virt/libvirt.xml.template                     |    4 +-
 nova/virt/libvirt_conn.py                          |   40 ++++++++++----------
 9 files changed, 47 insertions(+), 86 deletions(-)

commit 6321c5047c082bba8edf10a660fdb6a56430cc44
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 2 00:19:02 2011 +0000

    * Added first cut of migration for os_type on instances table
    * Track os_type when taking snapshots

 .../versions/007_add_os_type_to_instances.py       |    4 +++-
 nova/virt/xenapi/vm_utils.py                       |    9 ++++++---
 nova/virt/xenapi/vmops.py                          |    4 ++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   11 +++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

commit 1519f74bf840ad6135f5ecb4f29f1b59572aa4b6
Merge: cdb1b16 bb7c1b8
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 1 23:22:33 2011 +0000

    merging trunk

commit cdb1b16a6019fd68a7969666d754c4007607ae53
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 1 23:18:37 2011 +0000

    * Added ability to launch XenServer instances with per-os vm-params.

 nova/compute/api.py                                |    5 +-
 .../versions/007_add_os_type_to_instances.py       |   45 ++++++
 nova/db/sqlalchemy/models.py                       |    2 +
 nova/virt/xenapi/vm_utils.py                       |  152 ++++++++++++++------
 nova/virt/xenapi/vmops.py                          |   17 +--
 5 files changed, 164 insertions(+), 57 deletions(-)

commit 7b3ccd5fd1636ebc437a89a3667e6e712004e87f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 16:48:01 2011 -0500

    test osapi server create with multiple personalities

 nova/tests/api/openstack/test_servers.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 94e42c3002f9043fc3c5b90a1cb5ad0c50ba261b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 16:21:37 2011 -0500

    ensure personality contents are b64 encoded

 nova/api/openstack/servers.py            |   15 ++++++++++-----
 nova/tests/api/openstack/test_servers.py |   21 +++++++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

commit 7c18a45d8c4762f59dd4bb01bf01c80798b414e1
Merge: 05a96b3 bb7c1b8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 1 15:58:36 2011 -0500

    Merged trunk

commit f03f3ba265ca5f66b66e781c0ac23618562d0085
Merge: 7c19fe8 bb7c1b8
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Mar 1 21:58:28 2011 +0100

    Fixed pep8 issues, applied jaypipes suggestion

commit 8b66f2f57bb267db228fde24e5773c3c5391b8b4
Merge: d40bbc5 be9004f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 1 20:54:51 2011 +0100

    Merge sync branch.

commit 7d3b9cae71b15499dee954ef87286ad7f128c10b
Merge: e21763b bb7c1b8
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 01:24:34 2011 +0530

    Rebased to nova revision 752.

commit be9004ffa4c70358c8edda1f33ffe7ba7e1ae1ee
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 1 20:49:46 2011 +0100

    Use functools.wraps to make sure wrapped method's metadata (docstring and name) doesn't get mangled.

 nova/tests/test_misc.py |   12 ++++++++++--
 nova/utils.py           |    6 ++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

commit e4c8ef59c2b290b05e6098c2f70f76e0afb9009c
Merge: f9d08c1 bb7c1b8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 14:31:46 2011 -0500

    merge from trunk

commit e21763b15948603e618d4435335ef3785dc5660a
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 01:00:31 2011 +0530

    Fake database module for vmware vi api. Includes false injection layer at the level of API calls.
    This module is base for unit tests for vmwareapi module.
    The unit tests runs regardless of presence of ESX/ESXi server as computer provider in OpenStack.

 nova/tests/test_vmwareapi.py     |  207 ++++++++++++++++++++++++++++++++++++++
 nova/tests/vmwareapi/__init__.py |   16 +++
 nova/tests/vmwareapi/db_fakes.py |   93 +++++++++++++++++
 nova/tests/vmwareapi/stubs.py    |   46 +++++++++
 4 files changed, 362 insertions(+)

commit 93b69176277217a3cfae738dd328e649081a370f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 13:26:31 2011 -0600

    Review feedback

 nova/compute/manager.py   |   42 ++++++++++++++++++++++++------------------
 nova/virt/xenapi/vmops.py |   42 ++++++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 38 deletions(-)

commit f952992f035ec130b7608e9851ef9c3becc2047a
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:43:29 2011 +0530

    Updated the code to include support for guest consoles, VLAN networking for guest machines on ESX/ESXi servers as compute providers in OpenStack.
    Removed dependency on ZSI and now using suds-0.4 to generate the required stubs for VMware Virtual Infrastructure API on the fly for calls by vmwareapi module.

 nova/virt/vmwareapi/__init__.py        |    9 -
 nova/virt/vmwareapi/fake.py            |  684 ++++++++++++++++++++++++++++++++
 nova/virt/vmwareapi/io_util.py         |   52 +--
 nova/virt/vmwareapi/network_utils.py   |  117 ++++++
 nova/virt/vmwareapi/read_write_util.py |  110 ++---
 nova/virt/vmwareapi/vim.py             |  117 +++---
 nova/virt/vmwareapi/vim_util.py        |  303 +++++++-------
 nova/virt/vmwareapi/vm_util.py         |  335 ++++++++--------
 nova/virt/vmwareapi/vmops.py           |  435 +++++++++-----------
 nova/virt/vmwareapi/vmware_images.py   |   96 +----
 nova/virt/vmwareapi_conn.py            |  134 +++----
 11 files changed, 1490 insertions(+), 902 deletions(-)

commit 4376b1add894aa6d9b5568865ffb07f921e7e525
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:42:39 2011 +0530

    Added support for guest console access for VMs running on ESX/ESXi servers as computer providers in OpenStack.

 nova/network/vmwareapi_net.py |  124 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

commit 09c515ab68bbb5444554a8035cac93f261570a7d
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:38:50 2011 +0530

    Support for guest consoles for VMs running on VMware ESX/ESXi servers.
    Uses vmrc to provide the console access to guests.

 nova/console/vmrc.py         |  126 ++++++++++++++++++++++++++++++++++++++
 nova/console/vmrc_manager.py |  137 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 263 insertions(+)

commit 8fdfcf2c33ee2a244aaa17115fcd181c8f7a42dc
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:37:55 2011 +0530

    Minor modification to document. Removed excess flags.

 doc/source/vmwareapi_readme.rst |    4 ----
 1 file changed, 4 deletions(-)

commit ba08f5f97a660b2b8f5b623c447e23d608a0d46d
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:36:24 2011 +0530

    Moved the guest tools script that does IP injection inside VM on ESX server to etc/esx directory from etc/ directory.

 etc/esx/guest_tool.py    |  302 ++++++++++++++++++++++++++++++++++++++++++
 etc/vmware_guest_tool.py |  326 ----------------------------------------------
 2 files changed, 302 insertions(+), 326 deletions(-)

commit f9d08c16d5c620c711d962a78be3a94b99364f14
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 13:56:33 2011 -0500

    support adding a single personality in the osapi

 nova/api/openstack/servers.py            |   22 ++++++++++++++++++++--
 nova/tests/api/openstack/test_servers.py |   21 ++++++++++++++++-----
 2 files changed, 36 insertions(+), 7 deletions(-)

commit 282a18a4c15f066e371596104f783f522309c5ee
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 1 10:40:56 2011 -0800

    corrected copyrights for new files

 doc/source/runnova/managing.instance.types.rst     |    4 +---
 nova/compute/instance_types.py                     |    1 +
 .../versions/007_add_instance_types.py             |    1 +
 nova/tests/test_instance_types.py                  |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

commit 1a912276eb636fb89849e6a2573b2c5159d500e9
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Tue Mar 1 23:22:09 2011 +0530

    Updated with flags for nova-compute, nova-network and nova-console.
    Added the flags,
     --vlan_interface=<Physical ethernet adapter name in VMware ESX host for vlan networking E.g vmnic0>
     --network_driver=nova.network.vmwareapi_net [Optional, only for VLAN Networking]
     --flat_network_bridge=<ESX Virtual Machine Port Group> [Optional, only for Flat Networking]
     --console_manager=nova.console.vmrc_manager.ConsoleVMRCManager
     --console_driver=nova.console.vmrc.VMRCSessionConsole [Optional for OTP (One time Passwords) as against host credentials]
     --vmwareapi_wsdl_loc=<http://<WEB SERVER>/vimService.wsdl>
    
    Removed ZSI from python dependency list.
    Added suds-0.4 to python depndency list.
    Added installation instructions for suds on Ubuntu/Debian.
    Updated ESX requirements section with new requirements that came from support of VLAN networking.
    Updated FAQ with a question on type of consoles supported.

 doc/source/vmwareapi_readme.rst |   54 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

commit fbcbf5ef805748bea29e4135ee8989830064c273
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 10:55:13 2011 -0600

    Fixed trunk merge issues

 nova/virt/xenapi/vm_utils.py |    2 +-
 nova/virt/xenapi/vmops.py    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit a95402f5d6c25df83c49d5293917e4c553fd01e7
Merge: 97566c0 bb7c1b8
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 10:53:19 2011 -0600

    Merged trunk

commit 688acacd85e07fc578c8731df6a4421e64499c8b
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 18:53:02 2011 +0900

    At previous commit, I forget to erase conflict - fixed it.

 nova/tests/test_compute.py |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit f133e0842994c01d3cf3afcb644b4ca2b639071f
Merge: d13a623 bb7c1b8
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 18:45:09 2011 +0900

    merged to trunk rev 752

commit 12624b5ad289e2c6c9021e6831aa1acc8b18e91f
Merge: be39094 bb7c1b8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 1 09:44:58 2011 +0000

    Rebased at lp:nova 759

commit d13a623625a56a029f9dd5ccba3e70f492efdb2c
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 18:32:57 2011 +0900

    test_compute is changed b/c lack of import instance_types

 nova/tests/test_compute.py |    1 +
 1 file changed, 1 insertion(+)

commit 1caa7f189827b4721c2e9d3ddf753acd749d7916
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 17:52:46 2011 +0900

    rename db migration script

 nova/compute/manager.py                            |    2 +-
 .../versions/007_add_live_migration.py             |   83 ++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

commit 52285565fb421d34e7efcdb5cf89d10431319f8f
Merge: 485a6c5 edf5da8
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 17:36:24 2011 +0900

    1. merged trunk rev749
    2. rpc.call returns '/' as '\/', so nova.compute.manager.mktmpfile, nova.compute.manager.confirm.tmpfile, nova.scheduler.driver.Scheduler.mounted_on_same_shared_storage are modified followed by this changes.
    3. nova.tests.test_virt.py is modified so that other teams modification is easily detected since other team is using nova.db.sqlalchemy.models.ComputeService.

commit 6ddada8ed734dd91502a3f86eed8fb66803d08f3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 18:33:33 2011 -0800

    updated docs

 doc/.autogenerated |  276 ++--------------------------------------------------
 1 file changed, 6 insertions(+), 270 deletions(-)

commit 160d5751486ef7658089868eaeba23b87b695925
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 18:32:55 2011 -0800

    updated docs

 doc/source/api/autoindex.rst                   |    6 +++++
 doc/source/man/novamanage.rst                  |    5 ++--
 doc/source/nova.concepts.rst                   |    5 ++++
 doc/source/runnova/managing.instance.types.rst |   29 +++++++++---------------
 4 files changed, 25 insertions(+), 20 deletions(-)

commit 8806858918f396cfca41a28c191dc9e8d2809a0e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 1 01:10:38 2011 +0000

    Fixed xenapi tests
    Gave up on clever things with map stored as string in xenstore. Used ast.liteeral_eval instead.
    
    Changed instance ID and names in tests from in to string (1 => '1')
    This simplified VMOps._get_vm_opaqueref
    
    Changed VMOps._get_vm_opaqueref as references returned by fake xenapi do not start with "OpaqueRef:" prefix.
    
    
    Fixed PEP8 Errors

 nova/tests/db/fakes.py       |   13 +++++-------
 nova/tests/test_xenapi.py    |   46 +++++++++++++++++++-----------------------
 nova/tests/xenapi/stubs.py   |    2 +-
 nova/virt/xenapi/fake.py     |    6 ++----
 nova/virt/xenapi/vm_utils.py |    8 --------
 nova/virt/xenapi/vmops.py    |   15 +++-----------
 6 files changed, 32 insertions(+), 58 deletions(-)

commit bb7c1b8c63632c789ed0cd3785a22b7baa90fd83
Merge: 78bd53a 4572ffc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 1 01:09:43 2011 +0000

    This branch implements the openstack-api-hostid blueprint: "Openstack API support for hostId".

commit 69779dcdc5584fafa95974f263cef14912a12ed7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 17:06:35 2011 -0800

    refactored adminclient

 nova/api/ec2/admin.py |   12 ------------
 1 file changed, 12 deletions(-)

commit 4572ffcf734b734870b90497063fc27e7642f67c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Feb 28 19:56:46 2011 -0500

    No reason to initialize metadata twice.

 nova/api/openstack/servers.py |    2 --
 1 file changed, 2 deletions(-)

commit 7482055a1a7115d449f330a5069d59df977bb269
Merge: f61718c 78bd53a
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Feb 28 19:46:39 2011 -0500

    Merge from trunk. Fixed conflict in Authors file again.

commit 4e4711ccfc7ce3c3df704a8635dccd506d6e7f01
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 1 00:28:59 2011 +0000

    Units tests fixed partially.
    Still need to address checking data injected into xenstore
    need to convert string into dict or similar.
    Also todo PEP8 fixes

 nova/tests/db/fakes.py       |   41 +++++++++++++++++++++++++++++++----------
 nova/tests/test_xenapi.py    |   42 ++++++++++++++++++------------------------
 nova/tests/xenapi/stubs.py   |    3 +++
 nova/virt/xenapi/fake.py     |    9 +++++++++
 nova/virt/xenapi/vm_utils.py |    3 ++-
 nova/virt/xenapi/vmops.py    |    7 +++++++
 nova/virt/xenapi_conn.py     |    2 +-
 7 files changed, 71 insertions(+), 36 deletions(-)

commit aafd83233a675ccf5f3c4e737d966652e45a0ecb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 16:28:46 2011 -0800

    replaced ugly INSTANCE_TYPE constant with (slightly less ugly) stubs

 nova/test.py              |    8 --------
 nova/tests/db/fakes.py    |   20 ++++++++++++++++++--
 nova/tests/test_quota.py  |   17 ++++++++++++++---
 nova/tests/test_xenapi.py |    2 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

commit 0550124fcd863be60dd0e6fefb5f30641331b198
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Feb 28 18:06:11 2011 -0500

    add test for instance creation without personalities

 nova/tests/api/openstack/test_servers.py |   40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit 2e12ee1c98241ac38b59e93fb7b4b05b66ccadc9
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 15:05:50 2011 -0800

    fixed pep8

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d40bbc512fdf2f11584a57957d184b2d8137c2ba
Merge: 0d3a1f9 d5736e9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 23:31:38 2011 +0100

    Merge lock_path change.

commit d5736e925f288462f6325130be0af49f0ace5884
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 23:31:09 2011 +0100

    Add a lock_path flag for lock files.

 nova/flags.py |    2 ++
 nova/utils.py |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 8a9130eae5a421c52573a0fb34fb0125e594ef83
Merge: 8da6796 78bd53a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 15:42:54 2011 -0600

    Merge from trunk and mega conflict resolution

commit 7ad5fe27144e592df7e794a0748301d41603377e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 13:16:07 2011 -0800

    refactored nova-manage list (-all, <name>) and fixed docs

 bin/nova-manage                                |   37 ++++++++++++------------
 doc/source/man/novamanage.rst                  |   35 ++++++++++++++++++++++
 doc/source/runnova/managing.instance.types.rst |   14 +++++++--
 nova/db/sqlalchemy/api.py                      |   18 +++++++-----
 4 files changed, 75 insertions(+), 29 deletions(-)

commit 167de65b41aa7188f01ace2359074abc8029ada2
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:49:17 2011 -0800

    moved nova-manage flavors docs

 doc/source/adminguide/managing.instance.types.rst |   83 ---------------------
 doc/source/runnova/managing.instance.types.rst    |   83 +++++++++++++++++++++
 2 files changed, 83 insertions(+), 83 deletions(-)

commit 05a96b320cf1d6b911b0edb11df0ed408a894e77
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Feb 28 14:49:03 2011 -0500

    Edited `nova.api.openstack.common:limited` method to raise an HTTPBadRequest
    exception if a negative limit or offset is given. I'm not confident that this
    is the correct approach, because I guess this method could be called out of
    an API/WSGI context, but the method *is* located in the OpenStack API module
    and is currently only used in WSGI-capable methods, so we should be safe.

 nova/api/openstack/common.py            |    8 +++++++-
 nova/tests/api/openstack/test_common.py |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

commit 4b8278bc36e10abc85e0e416e97ab0eb08f1f07c
Merge: 7f3dbda 78bd53a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:44:17 2011 -0800

    merge trunk

commit 7f3dbdab80a4b36a75c860fe1748dfbd03228f2a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:29:52 2011 -0800

    moving nova-manage integration tests to smoke tests

 nova/tests/test_nova_manage.py |  130 ----------------------------------------
 1 file changed, 130 deletions(-)

commit 78bd53a44a529f0c6641357fa001d4d037fbc375
Merge: 4aa2ffe a457595
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Mon Feb 28 18:59:34 2011 +0000

    Wrapped the instance_types comparison with an int and added a test case for it. Removed the inadvertently added newline

commit 8da6796789767b1341cb5a650066b67ad3191c74
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 12:30:02 2011 -0600

    Merge review fixes

 nova/virt/xenapi/vm_utils.py                       |   17 +++++-
 nova/virt/xenapi/vmops.py                          |   27 +++++----
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   62 +++++---------------
 3 files changed, 45 insertions(+), 61 deletions(-)

commit c1bcf1dead8734a02172b4ac20b24fbbb7dbb993
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 11:40:22 2011 -0600

    Rename migration to coincide with latest trunk changes

 .../versions/004_add_instance_migrations.py        |   61 --------------------
 .../versions/007_add_instance_migrations.py        |   61 ++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)

commit 4aa2ffe87744d3653c741d4d3e019114e3e9e5bf
Merge: edf5da8 d621566
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 28 17:40:14 2011 +0000

    Adds VHD build support for XenServer driver.
    
    * Adds new ImageType DISK_VHD
    * Adds determine_disk_image_type which uses Glance `type` to figure out whether an image is a VHD or not
    * Adds code to Glance XenServer plugin to handle downloading a VHD and depositing it into the Storage Repository
    * Modifies the remove_kernel_ramdisk code to account for RAW and VHD images
    * Adds to unit tests for determine_disk_image_type and basic test for spawning a VHD image
    
    
    Notes:
    
    Currently Nova'a Compute-API makes use of FLAGS.null_kernel ('nokernel') to determine whether an image is "RAW/VHD"-ish.  I've left that requirement in for now; however, I plan on adding a bug to make that optional.
    
    Requires Glance patch https://code.launchpad.net/~rconradharris/glance/bug720459/+merge/50098

commit ca1af3d0c14537127cad2a1ef64c992210b506f0
Merge: 2013910 edf5da8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 11:39:23 2011 -0600

    Merge from trunk and merge conflict resolution

commit 7a6daa8d92f4f11fe2fce8fb2f4b11d96cb98c2d
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Feb 28 17:27:19 2011 +0000

    Suppress stack traces unless --verbose is specified

 nova/log.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a457595224a5ca5cdb0191ba2f6fa542d16e18f5
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Mon Feb 28 11:25:14 2011 -0600

    Removed extraneous newline

 nova/tests/test_compute.py |    1 -
 1 file changed, 1 deletion(-)

commit f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436
Merge: a55fefd edf5da8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Feb 28 12:03:07 2011 -0500

    Merging trunk to my branch. Fixed a conflict in servers.py.

commit 026c83551fa2e07f7f20d6b163f7da93e331b084
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 28 16:59:00 2011 +0000

    Fixed obvious errors with flags.
    Note: tests still fail.

 nova/virt/xenapi_conn.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit d6215666fa28a1dd7368aa32bc1ae9f3ca872fab
Merge: 7ae64e0 edf5da8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 28 16:25:01 2011 +0000

    Merging trunk

commit 72940957611bcba7dc41bfe9232743369d9a151f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 28 16:04:26 2011 +0000

    Fixed default value for xenapi_agent_path flag

 nova/virt/xenapi_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3b3f4d97c46edc4cd3bd80c21238991f01a7998
Merge: 76ec5af edf5da8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 28 15:54:47 2011 +0000

    1) merge trunk
    2) removed preconfigure_xenstore
    3) added jkey for broadcast address in inject_network_info
    4) added 2 flags:
    	4.1) xenapi_inject_image (default True)
    	This flag allows for turning off data injection by mounting the image in the VDI
    	(agreed with Trey Morris)
    	4.2) xenapi_agent_path (default /usr/bin/xe-update-networking)
    	This flag specifies the path where the agent should be located. It makes sense only
    	if the above flag is True. If the agent is found, data injection is not performed

commit 0d3a1f9c7478ae3c4f042e1876d47359804e1973
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 15:29:42 2011 +0100

    Wrap IptablesManager.apply() calls in utils.synchronized to avoid having different workers step on each other's toes.

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit d488e18a4dd99ddfb77e39f5be4b270e46b2fd42
Merge: 8b0e8b1 8b3e9ad
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 15:28:49 2011 +0100

    Merge sync branch.

commit b40908d356ee12f3a944860759bb1d3438d34c6f
Merge: e263a37 edf5da8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 28 12:22:02 2011 +0000

    merge trunk

commit 8b3e9ad11c2f5c425701f1eb4abb7b3f577ae1cc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 12:37:02 2011 +0100

    Add utils.synchronized decorator to allow for synchronising method entrance across multiple workers on the same host.

 nova/tests/test_misc.py |   37 ++++++++++++++++++++++++++++++++++++-
 nova/utils.py           |   11 +++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

commit 90abcdc7ae9e3f855dadb1ccc88892a2cc7bab05
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:57:13 2011 -0500

    execvp

 nova/console/xvp.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 953efce36b74c18a32ef9c42e6b1a57190e3ff6e
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:53:53 2011 -0500

    execvp

 nova/crypto.py |   28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

commit 4f90783224025618661bf8814e016843ec237875
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:52:32 2011 -0500

    execvp

 nova/volume/driver.py |   69 +++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

commit 38c21546ecc079300c575e5950bcb990eecee3a3
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:28:04 2011 -0500

    execute: shell=True removed.

 nova/utils.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 031205a26ae6fe906a47eefa716bbd575687c479
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:35:10 2011 -0500

    Add lxc to the libvirt tests

 nova/tests/test_virt.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 33d7edb9d02d8f4dcb0b6ee85caf10434f060e1b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:29:05 2011 -0500

    Clean up the mount points when it shutsdown

 nova/virt/disk.py         |    1 -
 nova/virt/libvirt_conn.py |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 2d6987d8c33477af19179e7664bbedf689bc08dc
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:05:26 2011 -0500

    Add ability to mount containers

 nova/virt/disk.py         |   26 ++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py |    6 ++++++
 2 files changed, 32 insertions(+)

commit 1278af43c16daea1bcbd2d47cd2d81919fe2c37e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 12:51:19 2011 -0500

    Add lxc libvirt driver

 nova/virt/libvirt.xml.template |   14 ++++++++++++++
 nova/virt/libvirt_conn.py      |   13 +++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

commit 1e5008368a84ed9cdc672b69f18cb3eeddf57e6f
Merge: c0bcd79 edf5da8
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Sun Feb 27 08:07:24 2011 +0530

    Rebased to Nova revision 749.

commit f72e5b618387a7b5a06f0e5b7e68af51c6667327
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sun Feb 27 00:13:05 2011 +0100

    added listing of instances running on a specific host
    
    chronos:~ # nova-manage fixed list ares
    network           	IP address     	MAC address      	hostname       	host
    192.168.3.0/24    	192.168.3.6    	02:16:3e:75:d7:9a	i-00000c1c     	ares

 bin/nova-manage |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 2714b2df0d21ecb08966c4d145d2d75fa1bb201d
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sun Feb 27 00:07:03 2011 +0100

    fixed FIXME

 nova/db/sqlalchemy/api.py |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

commit 493aa34da71e7dc3c28c6a55254b6d7ed4d81b72
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 22:13:28 2011 +0100

    beautification...

 bin/nova-manage |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit edf5da85648659b1a7ad105248d69ef9f8c977e4
Merge: 481ef94 dcfa967
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 19:44:48 2011 +0000

    introduced new flag "max_nbd_devices" to set the number of possible NBD devices

commit dcfa9670a669ff881865750b2f96f62195dce2df
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 19:19:02 2011 +0100

    renamed flag from maximum_... to max_...

 nova/virt/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4229990fa77d6edb73b88e92750a8779c478e40c
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 19:09:57 2011 +0100

    replaced ConnectionFailed with Exception in tools/euca-get-ajax-console
    was not working for me with euca2tools 1.2 (version 2007-10-10, release 31337)

 tools/euca-get-ajax-console |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 481ef945d5ae1d83fdbab259bed886257e1dfac2
Merge: f623b52 2a3ea10
Author: Anne Gentle <anne@openstack.org>
Date:   Sat Feb 26 17:50:42 2011 +0000

    Did a pull from trunk to be sure I had the latest, then deleted the test directory. I guess it appeared when I started using venv. Doh.

commit 2a3ea106d3aaac3b97295c14742f23b250aa6874
Author: Anne Gentle <anne@openstack.org>
Date:   Sat Feb 26 11:13:32 2011 -0600

    Deleting test dir from a pull from trunk

 test/.Python                                       |    1 -
 test/bin/activate                                  |   76 --
 test/bin/activate.csh                              |   32 -
 test/bin/activate.fish                             |   79 --
 test/bin/activate_this.py                          |   32 -
 test/bin/easy_install                              |    9 -
 test/bin/easy_install-2.6                          |    9 -
 test/bin/pip                                       |    9 -
 test/bin/pip-2.6                                   |    9 -
 test/bin/python                                    |  Bin 50720 -> 0 bytes
 test/bin/python2.6                                 |    1 -
 test/include/python2.6                             |    1 -
 test/lib/python2.6/UserDict.py                     |    1 -
 test/lib/python2.6/_abcoll.py                      |    1 -
 test/lib/python2.6/abc.py                          |    1 -
 test/lib/python2.6/codecs.py                       |    1 -
 test/lib/python2.6/config                          |    1 -
 test/lib/python2.6/copy_reg.py                     |    1 -
 test/lib/python2.6/distutils/__init__.py           |   91 --
 test/lib/python2.6/distutils/distutils.cfg         |    6 -
 test/lib/python2.6/encodings                       |    1 -
 test/lib/python2.6/fnmatch.py                      |    1 -
 test/lib/python2.6/genericpath.py                  |    1 -
 test/lib/python2.6/lib-dynload                     |    1 -
 test/lib/python2.6/linecache.py                    |    1 -
 test/lib/python2.6/locale.py                       |    1 -
 test/lib/python2.6/ntpath.py                       |    1 -
 test/lib/python2.6/orig-prefix.txt                 |    1 -
 test/lib/python2.6/os.py                           |    1 -
 test/lib/python2.6/posixpath.py                    |    1 -
 test/lib/python2.6/re.py                           |    1 -
 test/lib/python2.6/site-packages/easy-install.pth  |    4 -
 .../pip-0.8.1-py2.6.egg/EGG-INFO/PKG-INFO          |  348 -----
 .../pip-0.8.1-py2.6.egg/EGG-INFO/SOURCES.txt       |   57 -
 .../EGG-INFO/dependency_links.txt                  |    1 -
 .../pip-0.8.1-py2.6.egg/EGG-INFO/entry_points.txt  |    4 -
 .../pip-0.8.1-py2.6.egg/EGG-INFO/not-zip-safe      |    1 -
 .../pip-0.8.1-py2.6.egg/EGG-INFO/top_level.txt     |    1 -
 .../pip-0.8.1-py2.6.egg/pip/__init__.py            |  261 ----
 .../pip-0.8.1-py2.6.egg/pip/_pkgutil.py            |  589 --------
 .../pip-0.8.1-py2.6.egg/pip/backwardcompat.py      |   55 -
 .../pip-0.8.1-py2.6.egg/pip/basecommand.py         |  203 ---
 .../pip-0.8.1-py2.6.egg/pip/baseparser.py          |  231 ----
 .../pip-0.8.1-py2.6.egg/pip/commands/__init__.py   |    1 -
 .../pip-0.8.1-py2.6.egg/pip/commands/bundle.py     |   33 -
 .../pip-0.8.1-py2.6.egg/pip/commands/completion.py |   60 -
 .../pip-0.8.1-py2.6.egg/pip/commands/freeze.py     |  109 --
 .../pip-0.8.1-py2.6.egg/pip/commands/help.py       |   32 -
 .../pip-0.8.1-py2.6.egg/pip/commands/install.py    |  247 ----
 .../pip-0.8.1-py2.6.egg/pip/commands/search.py     |  116 --
 .../pip-0.8.1-py2.6.egg/pip/commands/uninstall.py  |   42 -
 .../pip-0.8.1-py2.6.egg/pip/commands/unzip.py      |    9 -
 .../pip-0.8.1-py2.6.egg/pip/commands/zip.py        |  346 -----
 .../pip-0.8.1-py2.6.egg/pip/download.py            |  470 -------
 .../pip-0.8.1-py2.6.egg/pip/exceptions.py          |   17 -
 .../site-packages/pip-0.8.1-py2.6.egg/pip/index.py |  686 ----------
 .../pip-0.8.1-py2.6.egg/pip/locations.py           |   45 -
 .../site-packages/pip-0.8.1-py2.6.egg/pip/log.py   |  181 ---
 .../site-packages/pip-0.8.1-py2.6.egg/pip/req.py   | 1432 --------------------
 .../pip-0.8.1-py2.6.egg/pip/runner.py              |   18 -
 .../site-packages/pip-0.8.1-py2.6.egg/pip/util.py  |  479 -------
 .../pip-0.8.1-py2.6.egg/pip/vcs/__init__.py        |  238 ----
 .../pip-0.8.1-py2.6.egg/pip/vcs/bazaar.py          |  138 --
 .../pip-0.8.1-py2.6.egg/pip/vcs/git.py             |  204 ---
 .../pip-0.8.1-py2.6.egg/pip/vcs/mercurial.py       |  162 ---
 .../pip-0.8.1-py2.6.egg/pip/vcs/subversion.py      |  260 ----
 .../site-packages/pip-0.8.1-py2.6.egg/pip/venv.py  |   53 -
 .../site-packages/setuptools-0.6c11-py2.6.egg      |  Bin 333447 -> 0 bytes
 test/lib/python2.6/site-packages/setuptools.pth    |    1 -
 test/lib/python2.6/site.py                         |  713 ----------
 test/lib/python2.6/sre.py                          |    1 -
 test/lib/python2.6/sre_compile.py                  |    1 -
 test/lib/python2.6/sre_constants.py                |    1 -
 test/lib/python2.6/sre_parse.py                    |    1 -
 test/lib/python2.6/stat.py                         |    1 -
 test/lib/python2.6/types.py                        |    1 -
 test/lib/python2.6/warnings.py                     |    1 -
 77 files changed, 8226 deletions(-)

commit 4c83130464c88650df7dfc7974f2fd088a733fec
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 17:26:38 2011 +0100

    introduced new flag "maximum_nbd_devices" to set the number of possible NBD devices

 nova/virt/disk.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit f623b52a894d0e1227382175cb9b9fcc939f5d7d
Merge: 0bf4f90 6e6c3fc
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 09:05:03 2011 +0000

    reverted my changes from https://code.launchpad.net/~berendt/nova/lp722554/+merge/50579 and reused the existing db api methods to add the disabled services. Looks much better now :)
    
    i couldn't figure out how to uncommit and revert my changes in an already pushed branch, always ending in "ERROR: These branches have diverged.". So i created a new branch rev2 and a new proposal...

commit 5bb77cb83ea443e5e3ae4b4000763e4289f8e87a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 23:58:36 2011 -0800

    add timeout and retry for ssh

 smoketests/base.py |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 0bf4f908e18a1943b2608e269195b554c786f481
Merge: 00eb189 3368b32
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Feb 26 01:19:39 2011 +0000

    Makes nova-api correctly load the default flagfile.

commit e0ba72946011b67a218e3c619b3105529bb43e53
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 25 17:18:41 2011 -0800

    force memcache key to be str

 nova/auth/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 47c312bb659d0ad49a678c8213093827e6067f31
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 25 16:41:48 2011 -0800

    only create auth connection if cache misses

 nova/auth/manager.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 00eb189ba45ea0e6b475463b93b4d906fb091cd7
Merge: bb4ac47 4a217b6
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Sat Feb 26 00:24:23 2011 +0000

    No reason to dump a stack trace just because the AMQP server is unreachable; an error notification should be sufficient.

commit 4a217b640c3e0f488c87572787c92b6808ab0a9a
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 25 05:30:36 2011 +0000

    Add error message to the error report so we know why the AMQP server is unreachable

 nova/rpc.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c7c3fe85186862d9d8989ebe01ad69e6cdaa4ee3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Sun Mar 20 22:58:49 2011 +0000

    No reason to dump a stack trace just because we can't reach the AMQP servire; it ends up being just noise

 nova/rpc.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 20e9df05acdb89382023af1ac98cf040c827e18d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Feb 25 14:49:33 2011 -0800

    DescribeInstances modified to return ipv6 fixed ip address in case of flatmanager

 nova/api/ec2/cloud.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 97566c04b3a04626f1bc1b66e72c61b4621b6c7d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 16:18:11 2011 -0600

    Bootlock original instance during rescue

 nova/virt/xenapi/vmops.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0
Merge: eab99bb f3efbaa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:59:26 2011 -0800

    merge with zones2 fixes and trunk

commit bb4ac4766aad815aa86ba44e0c4674ee596e1256
Merge: c43b103 e6ceb29
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Feb 25 21:55:44 2011 +0000

    check if QUERY_STRING is empty or not before building the request URL in bin/nova-ajax-console-proxy

commit f3efbaa3d10997038e32c6e5e53dfef117236247
Merge: 7c6638c f42fda8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:42:37 2011 -0800

    trunk merge

commit 7c6638cc5effc7d727087ed4354c180d75476d1a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:40:15 2011 -0800

    API changed to new style class

 nova/scheduler/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3584eeeb289120eef17ae5dd448a6237e05935b
Merge: 459616a 20ae9eb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 10:55:02 2011 -0400

    trunk merge, pip-requires and novatools to novaclient changes

commit c43b1034d7e9cbd03e422ff45b52742f0adc39d6
Merge: 18e16ab 2439182
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 21:24:49 2011 +0000

    Fixes FlatDHCP by making it inherit from NetworkManager and moving some methods around.

commit e6ceb2987d1f30a1e972a4bf21a734f1a605d60e
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Feb 25 22:15:51 2011 +0100

    fixed: bin/nova-ajax-console-proxy:66:19: W601 .has_key() is deprecated, use 'in'

 bin/nova-ajax-console-proxy |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2439182bc2e91b1de460f72a8c73b651b551265d
Merge: cc82766 8b37ae8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 13:02:12 2011 -0800

    merged trunk

commit b344877bdf24985dea5342060c989a9d06fe0964
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 25 13:01:32 2011 -0800

    add a caching layer to the has_role call to increase performance

 nova/api/ec2/__init__.py |    6 ++---
 nova/auth/manager.py     |   58 ++++++++++++++++++++++++++++++++++------------
 nova/flags.py            |    2 ++
 3 files changed, 47 insertions(+), 19 deletions(-)

commit 7ad2e0a731e6b2fbace8528439f6a8c2f0d5aaad
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 14:47:25 2011 -0600

    Removed unnecessary compute import

 nova/virt/xenapi/vmops.py |    2 --
 1 file changed, 2 deletions(-)

commit 6cfa479a1375fb8274dd9130946eab38e1398538
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 14:35:29 2011 -0600

    Set rescue instance VIF device

 nova/virt/xenapi/vm_utils.py |    4 ++--
 nova/virt/xenapi/vmops.py    |   21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

commit 3368b32338f58ac6b77d0c142722c241961f858e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 12:16:58 2011 -0800

    use default flagfile in nova-api

 bin/nova-api |    2 ++
 1 file changed, 2 insertions(+)

commit 18e16ab9f5be77764a810b2d6ac5ae8c5be6bb52
Merge: 8b37ae8 fa67785
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Feb 25 19:54:40 2011 +0000

    Add tests for 718999, fix a little brittle code introduced by the committed fix.
    
    Also fix and test for a 500 if the auth token doesn't exist in the database.

commit fa6778586ab303f9e65aa3c50b80d20a4f097c6f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Mar 21 00:41:23 2011 +0000

    Rename test to describe what it actually does

 nova/tests/api/openstack/test_auth.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4453021476fac599c0cee126b6eaa426d4878145
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 18 02:09:46 2011 +0000

    Copy over to current trunk my tests, the 401/500 fix, and a couple of
    fixes to the committed fix which was actually brittle around the edges...

 Authors                               |    1 +
 nova/api/openstack/auth.py            |    8 ++++++--
 nova/db/api.py                        |    5 +++++
 nova/db/sqlalchemy/api.py             |   14 ++++++++++++--
 nova/tests/api/openstack/test_auth.py |   28 ++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 4 deletions(-)

commit 8b37ae8c291a38407654859d7ff659ced92c0270
Merge: 645bc7a e8c1843
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Feb 25 19:00:02 2011 +0000

    I'm working on consolidating install instructions specifically (they're the most asked-about right now) and pointing to the docs.openstack.org site for admin docs.

commit 26d55d0d24dd5363d3b0dd6da0351fe389b79503
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Feb 25 19:59:26 2011 +0100

    check if QUERY_STRING is empty or not before building the request URL

 bin/nova-ajax-console-proxy |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 2dc9d8bfe4bcd61c4d634767715b2be3a214426e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 12:43:09 2011 -0600

    Teardown rescue instance

 nova/virt/xenapi/vmops.py |   34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

commit 859172963f5e1f92682c06f603262e234ea14a58
Merge: 6033f65 645bc7a
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 11:00:01 2011 -0600

    Merged trunk

commit 6033f657aad9bd5b244a21908caedfc92840c9cf
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 10:54:37 2011 -0600

    Create rescue instance

 nova/db/sqlalchemy/models.py |    7 ++++-
 nova/virt/xenapi/vmops.py    |   69 ++++++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 31 deletions(-)

commit 7ae64e06643025e4945ae0ef056f9fb2184904ff
Merge: 079b532 645bc7a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 16:47:08 2011 +0000

    Merging trunk, conflicts fixed

commit 079b532a1080da9fe5d99e90fa9c60d16506de06
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 16:24:51 2011 +0000

    Verify status of image is active

 nova/api/openstack/servers.py |    5 +++++
 1 file changed, 5 insertions(+)

commit be3909403fcd7c080cc9b36e79321930b283b8ea
Merge: 43df95d 645bc7a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Feb 25 15:10:25 2011 +0000

    Rebased at lp:nova 740
    
    By rebasing to the latest from lp:nova, diff is going to be a more accurate
    picture of what we are going deal with, when the vmware branch propose for
    merge into the official branch

commit 459616ac2fdf243e65ecdc0f4b5750fa6d073edb
Merge: 18e573a bb7c1b8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 05:12:28 2011 -0400

    merged with trunk

commit 645bc7a7dea6ba01d76589632200636e243641ec
Merge: 460475c 865c3d5
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Feb 25 08:39:12 2011 +0000

    Cleanup db method names for dealing with auth_tokens to follow standard naming pattern.

commit 460475cbb6397bc294a55dee94040447d889949c
Merge: ed7c71f 8e2ebb1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Feb 25 08:34:11 2011 +0000

    The proposed bug fix stubs out the _is_vdi_pv routine for testing purposes.

commit bc7b96f11ee2ee949182f7128db6b9ff1866a247
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 22:02:50 2011 -0800

    revert a few unnecessary changes to base.py

 smoketests/base.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 24eb5c0b787d2031999aff21c471b0d9220083e3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 21:33:26 2011 -0800

    removed unused references to unittest

 smoketests/public_network_smoketests.py |    1 -
 smoketests/test_netadmin.py             |    1 -
 2 files changed, 2 deletions(-)

commit a6f607681f8eac043bfbc33c91436198f451d9e1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 21:32:27 2011 -0800

    add customizable tempdir and remove extra code

 smoketests/base.py          |   38 +++++++-------------------------------
 smoketests/test_sysadmin.py |   16 ++++++++++++----
 2 files changed, 19 insertions(+), 35 deletions(-)

commit 865c3d57f8b84dfcc493ecead12816874b160e35
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 23:51:17 2011 -0500

    Pass id of token to be deleted to the db api, not the actual object.

 nova/api/openstack/auth.py        |    2 +-
 nova/db/api.py                    |    4 ++--
 nova/db/sqlalchemy/api.py         |    9 ++++++---
 nova/tests/api/openstack/fakes.py |   13 ++++++++++---
 4 files changed, 19 insertions(+), 9 deletions(-)

commit d27197ae53f3282280198d9bfe7f37a059fa8a35
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 03:16:04 2011 +0000

    Removing unecessary headers

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 2218cb025adca1ded3e6596acc182b88742e3a51
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 21:59:36 2011 -0500

    Rename auth_token db methods to follow standard.

 nova/api/openstack/auth.py            |    6 +++---
 nova/db/api.py                        |   12 ++++++------
 nova/db/sqlalchemy/api.py             |    6 +++---
 nova/tests/api/openstack/fakes.py     |    6 +++---
 nova/tests/api/openstack/test_auth.py |    4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

commit e3d6dc70a6b77d80afcf87473bc79549540ac4ce
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 02:51:14 2011 +0000

    Removing unecessary nokernel stuff

 nova/api/openstack/servers.py                      |   51 +++++++++++---------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 --
 2 files changed, 29 insertions(+), 26 deletions(-)

commit ec9ede003c839248ca9593c03160a23ff8ec0db1
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 02:26:46 2011 +0000

    Adding _make_subprocess function

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   57 +++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

commit 8cf6a0c01ee39066f17a11d5e9313c2828a59634
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 01:50:18 2011 +0000

    No longer users image/ directory in tarball

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit c8345c9ebc0357f1fe06ac520f286f036cb0596c
Merge: 05d135b c8b630a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 01:31:02 2011 +0000

    Merging trunk, small fixes

commit 498638ce36228615ecf8d98f99c0227f4f86963d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 17:17:42 2011 -0800

    make smoketests run with nose

 run_tests.py                            |    2 +
 smoketests/admin_smoketests.py          |   95 ----------
 smoketests/netadmin_smoketests.py       |  191 --------------------
 smoketests/public_network_smoketests.py |    5 -
 smoketests/run_tests.py                 |  297 +++++++++++++++++++++++++++++++
 smoketests/sysadmin_smoketests.py       |  295 ------------------------------
 smoketests/test_admin.py                |   91 ++++++++++
 smoketests/test_netadmin.py             |  184 +++++++++++++++++++
 smoketests/test_sysadmin.py             |  287 +++++++++++++++++++++++++++++
 9 files changed, 861 insertions(+), 586 deletions(-)

commit f7beae47ca505443eb86ea1a4fba6b47c1658755
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Feb 24 17:07:59 2011 -0800

    IPV6 FlatManager changes

 nova/db/sqlalchemy/api.py                          |   11 +--
 .../versions/007_add_ipv6_flatmanager.py           |   75 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |    3 +
 nova/network/manager.py                            |   35 ++++++++-
 nova/virt/interfaces.template                      |   16 +++--
 nova/virt/libvirt_conn.py                          |   27 ++++---
 6 files changed, 149 insertions(+), 18 deletions(-)

commit ed7c71f56c5f5e2ba71273cf0099393fb986ebf9
Merge: c59109e 9c1f1c7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 01:04:25 2011 +0000

    Make tests start with a clean database for every test.

commit eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e
Merge: 307dcb7 bb4e0c9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 17:01:48 2011 -0800

    merge trunk

commit e7ed4e198e5fc2c9f33080c323b8d8c2872e8659
Merge: 6cd8097 9c1f1c7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 16:53:22 2011 -0800

    merge clean db

commit 6cd8097642647d34e1f1f9c96a035a1efd96b754
Merge: fc465b2 c59109e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 16:53:10 2011 -0800

    merged trunk

commit 307dcb7906ff066e2883cdee8998dfa78ebc8221
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 15:44:27 2011 -0800

    sorry, pep8

 nova/tests/api/openstack/test_zones.py |    5 ++---
 nova/tests/test_zones.py               |   10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

commit c59109e32678535320a39599cce50fec65689082
Merge: 0d6c226 f422134
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 24 23:35:21 2011 +0000

    adds live network injection/reconfiguration. Some refactoring.

commit f4221346418ef103635b104fc152a2507d60a8dc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 24 17:25:00 2011 -0600

    forgot to get vm_opaque_ref

 nova/virt/xenapi/vmops.py |    1 +
 1 file changed, 1 insertion(+)

commit 47bbfaab52642f3ff79bcdefb8d705fb02b549f9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 15:23:15 2011 -0800

    new tests

 nova/api/openstack/zones.py            |    4 ++--
 nova/scheduler/api.py                  |   37 +++++++++++++++++---------------
 nova/scheduler/zone_manager.py         |    3 +--
 nova/tests/api/openstack/test_zones.py |   30 +++++++++++++++++++++++---
 nova/tests/test_zones.py               |    6 ++++++
 5 files changed, 56 insertions(+), 24 deletions(-)

commit c8df2602fd8f4f2cb7716e6283f3779c6895a479
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 14:32:25 2011 -0800

    service capabilities test

 nova/scheduler/driver.py  |    7 +++++++
 nova/scheduler/manager.py |    3 ++-
 nova/tests/test_zones.py  |   28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

commit 8635f7a306e4cfa41ad09a18602efa7793f6da95
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 24 15:04:07 2011 -0600

    moved network injection and vif creation to above vm start in vmops spawn

 nova/virt/xenapi/vmops.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit ced55ac014691a3e7b9ca6b24b3508440443f3dd
Merge: 907df1b 0d6c226
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:58:55 2011 -0600

    Merged trunk

commit 907df1b90e5c22eb82ce85bc12f48d8abf09b665
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:57:11 2011 -0600

    nothing

 nova/virt/xenapi/vmops.py |   40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

commit 0d6c226afa8085753b85e9b6ab94f239a2549d2d
Merge: 00901a9 b7d8975
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 19:50:27 2011 +0000

    Removes processName from debug output since we aren't using multiprocessing and it doesn't exist in python 2.6.1

commit 00901a94897434102bf59d5d0f51072efe7b9c44
Merge: c8b630a 377b59e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 19:44:50 2011 +0000

    Add some methods to the ec2 admin api to work with VPNs.  Also implements and properly documents the get_hosts method.

commit 377b59ec5ae13d37cc375dd9b9cf7eb8d89be196
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 14:36:15 2011 -0500

    Fix copypasta pep8 violation.

 nova/adminclient.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bf222b9173e0a5a0bfbcf4705caab390ee33334b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 24 11:17:42 2011 -0800

    moved migrate script to 007 (again..sigh)

 .../versions/006_add_instance_types.py             |   86 --------------------
 .../versions/007_add_instance_types.py             |   86 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 86 deletions(-)

commit c8b630a78e955756e77be8879c1da863a5357ea0
Merge: 25f50fb 701e1c1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 24 19:05:54 2011 +0000

    Don't require metadata (hotfix for bug 724143)

commit 0b490e1ade9e8e65e8df6f86bbe47bd3dbe1d44c
Merge: 3696b1d 25f50fb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 24 11:05:18 2011 -0800

    merge trunk

commit 629d0317eddb782d75f0be3a6ae369e1213986e6
Merge: 9e018bb 25f50fb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:02:04 2011 -0600

    Merged trunk

commit 9e018bbee1d4a308fdf1700bd25aa733cedc26e6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:01:16 2011 -0600

    Updated email in Authors

 .mailmap                  |    1 +
 Authors                   |    2 +-
 nova/virt/xenapi/vmops.py |   20 +++++++++-----------
 3 files changed, 11 insertions(+), 12 deletions(-)

commit 25f50fba4a79b45edea33aab58c76197c7d764dc
Merge: 51c1c94 f8640ad
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Feb 24 18:45:06 2011 +0000

    Easy and effective fix for getting the DNS value from flag file, when working in FlatNetworking mode.

commit 51c1c948b9205ba8a8e3cb21cbb7e05d8a184a8e
Merge: 6a77a98 3115a65
Author: termie <code@term.ie>
Date:   Thu Feb 24 18:00:45 2011 +0000

    Some first steps towards resolving some of the issues brought up on the mailing list related to documenting flags.
    
    This patch helps expose some of the features of gflags that we were sort of skipping past, such as organizing flags by the file that defined them in help.
    
    There are still some things to fix, for example all the flags defined in nova.flags should be moved to other files, and the ones that are there currently show up under nova.log, but previously they were all in one spot anyway so this is still fully a step forward.
    
    Manager import was moved into Service's init so that the dynamic flags get loaded earlier so we can show them in the help.

commit 6a77a988025d75040c5b82369f807f1dccb9608e
Merge: f566673 0a64949
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 24 17:05:41 2011 +0000

    Support HP/LeftHand SANs.  We control the SAN by SSHing and issuing CLIQ commands.  Also improved the way iSCSI volumes are mounted: try to store the iSCSI connection info in the volume entity, in preference to doing discovery.  Also CHAP authentication support.
    
    CHAP support is necessary to avoid the attach-volume command require an export on the SAN device.  If we had to do that, the attach command would have to hit both the volume controller and the compute controller, and that would be complex.

commit f5666735d0cd7909b4e7241d923494ab65562f01
Merge: 829573b 7e463d2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 24 16:25:13 2011 +0000

    This fix checks whether the boot/guest directory exists on the hypervisor.
    If that is not the case, it creates it.
    
    And this time I'm pretty sure I'm not breaking anything with this fix! (see bug 723298)

commit 829573b1b629ce8bc0709939dc212563504a5506
Merge: f277be5 a721d22
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Feb 24 16:15:04 2011 +0000

    Globally exclude *.pyc files from generated tarballs.

commit 8e2ebb1a963f58514d8fb6aab4a75627e72484b9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 24 16:04:13 2011 +0000

    stubbing out _is_vdi_pv for test purposes

 nova/tests/test_xenapi.py    |    1 +
 nova/tests/xenapi/stubs.py   |    6 ++++++
 nova/virt/xenapi/vm_utils.py |   27 ++++++++++++++-------------
 3 files changed, 21 insertions(+), 13 deletions(-)

commit 76ec5af4e776ae036dc41390389c8334d9799049
Merge: d1a6cb9 f277be5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 24 15:40:16 2011 +0000

    merge trunk

commit a721d2208ed9d88884925d6f1e2c8e26d7d1ea27
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Feb 24 15:19:29 2011 +0100

    Globally exclude .pyc files from tarball contents

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit f8640adff4beff1e7d77bbd67771a6d072d42140
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Feb 24 13:58:31 2011 +0000

    Get DNS value from Flag, when working in FlatNetworking mode. Passing the flag was ineffective previously. This is an easy fix. I think we would need nova-manage to accept dns also from command line

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 7e463d262339acc7c611b86471b1422dea50d1ee
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 24 11:43:40 2011 +0000

    xenapi plugin function now checks whether /boot/guest already exists.
    If not, it creates the directory

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++++
 1 file changed, 4 insertions(+)

commit 65b9dfbea28f1607ef471e78b73ba77183d943f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 01:53:01 2011 -0800

    capability aggregation working

 nova/api/openstack/zones.py    |   15 ++++++++++++---
 nova/scheduler/api.py          |   15 +++++++++++++--
 nova/scheduler/manager.py      |   12 +++++++++---
 nova/scheduler/zone_manager.py |   35 ++++++++++++++++++++++++++++++++---
 nova/scheduler_manager.py      |    6 ++----
 5 files changed, 68 insertions(+), 15 deletions(-)

commit fc465b2a9f1c639e44e59c43cbe4d9a9a188f396
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 00:25:21 2011 -0800

    fix check for existing port 22 rule

 smoketests/netadmin_smoketests.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit cc8276655cd2424b71689776f24e2a5cc767e844
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 23:37:52 2011 -0800

    move relevant code to baseclass and make flatdhcp not inherit from flat

 nova/network/manager.py |  141 +++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 79 deletions(-)

commit 701e1c15944062f7d229e59f2ede06398226b165
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:53:44 2011 -0800

    Hotfix to not require metadata

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a649493d21a8766f416ceca2c0122c20945ca1b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:47:57 2011 -0800

    Documentation fixes so that output looks better

 nova/volume/driver.py |    9 ++++++++-
 nova/volume/san.py    |   13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

commit 79d9e06d79264d614a465971dd43176bcf190703
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 22:40:50 2011 -0800

    more smoketest fixes

 smoketests/netadmin_smoketests.py |    5 -----
 smoketests/sysadmin_smoketests.py |    6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

commit c0bcd792fcf96e79ddbaa19952e9ab397db91503
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 24 12:06:43 2011 +0530

    Removed Milind from Authors file, as individual Contributer's License Agreement & Ubuntu code of conduct are not yet signed

 Authors |    1 -
 1 file changed, 1 deletion(-)

commit 4a002ffdc1937856de7dbf35b83ae0dd78dfe4c6
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 24 11:55:25 2011 +0530

    Fixed problems found in localized string formatting. Verified the fixes by running ./run_tests.sh -V.

 nova/virt/vmwareapi/io_util.py       |    6 ++-
 nova/virt/vmwareapi/vmops.py         |   67 ++++++++++++++++++++++------------
 nova/virt/vmwareapi/vmware_images.py |    4 +-
 nova/virt/vmwareapi_conn.py          |   15 ++++----
 4 files changed, 59 insertions(+), 33 deletions(-)

commit f277be5839c76dc2b9efb6ad49dc2a979b1a028d
Merge: 211810f 3aa0183
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 06:04:58 2011 +0000

    Change missed reference to run_tests.err.log

commit f86c45764d6cf62b1ded928e807e93198ed6ffd1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:02:06 2011 -0800

    PEP 257 fixes

 nova/volume/driver.py |   42 +++++++++++++++++++++++-------------------
 nova/volume/san.py    |   22 +++++++++++++++-------
 2 files changed, 38 insertions(+), 26 deletions(-)

commit a20e02568264e188a18a92d3c4fba3d4a42c05d8
Merge: 305ef6b 211810f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 21:47:29 2011 -0800

    Merged with trunk

commit 3aa0183bca5585c706b4b02e0a7542422015c693
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 18:54:13 2011 -0800

    fix missed err.log

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05fc3ea219f36bc1c246179b25b1feb017888b01
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 23 17:58:32 2011 -0800

    Tests all working again

 nova/compute/manager.py    |    3 ++-
 nova/flags.py              |    2 +-
 nova/network/manager.py    |    7 ++++---
 nova/scheduler/api.py      |    1 -
 nova/scheduler/manager.py  |    3 ++-
 nova/scheduler_manager.py  |   22 ++++++++++++++++++----
 nova/tests/test_service.py |   25 ++++++++++++++-----------
 nova/tests/test_test.py    |    2 +-
 nova/volume/manager.py     |    7 ++++---
 9 files changed, 46 insertions(+), 26 deletions(-)

commit d27aa094a168dcfb486bbd49ef61be78bd5a50f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 17:28:38 2011 -0800

    remove extra flag in admin tests

 smoketests/admin_smoketests.py |    3 ---
 1 file changed, 3 deletions(-)

commit 211810f9eae7eb07a3d8947dacbaa5e3874d4670
Merge: df2b1de f7751ee
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Feb 24 00:34:55 2011 +0000

    Revert commit 709. This fixes issues with the Openstack API causing 'No user for access key admin' errors.

commit df2b1dec7ad4d1561ab31a4c04fd339856a7d751
Merge: 2577aad 78eddce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 00:05:44 2011 +0000

    Adds colors to output of tests and cleans up run_tests.py
    
    * sets working directory for nose to nose/tests so it loads faster
    * moves db into nova/tests/test.sqlite
    * deletes the db in run_tests.py instead of run_tests.sh before running tests

commit 503fe37427247b2728051426d3c40266de69bd71
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:59:54 2011 -0800

    Reverted bad-fix to sqlalchemy code

 nova/db/sqlalchemy/api.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit faf9253909302c2ab3198deaeb4c66d3340a24a0
Merge: ab6b11b 2577aad
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:51:48 2011 -0800

    Merged with trunk

commit 78eddce564cccf0d9be19b303cbc122966f5fa71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:42:59 2011 -0800

    added comments about where code came from

 run_tests.py |    3 +++
 1 file changed, 3 insertions(+)

commit 9c1f1c72883bb58a1d0de8541e55078859c2315c
Merge: 80970a8 c27c19e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:37:00 2011 -0800

    merge and fix conflicts

commit 2577aad970dde9c172eddf82c2f7ce129770ad49
Merge: cd301d6 5b2ec20
Author: termie <code@term.ie>
Date:   Wed Feb 23 23:35:46 2011 +0000

    Prevent logging.setup() from generating a syslog handler if we didn't request one (breaks on mac)

commit c27c19ea316b343f1623a7c1bf21c53cd426603b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:35:30 2011 -0800

    fix pep8

 run_tests.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 80970a82f1d23611291144ed41362d4c535c70e0
Merge: 19dc131 5e2f82b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:32:31 2011 -0800

    merged upstream

commit 861a7f2b53f02af2ef196411171182394edd7e17
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:31:40 2011 -0800

    Changed create from a @staticmethod to a @classmethod

 nova/apiservice.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5e2f82b1487b8f8e43539d0c71466fbbfed23121
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:29:02 2011 -0800

    revert logfile redirection and make colors work by temporarily switching stdout

 nova/tests/fake_flags.py |    1 -
 run_tests.py             |   16 +++++++++-------
 run_tests.sh             |    4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

commit f4c95e1f180157ad91e9a3b21777a376e02a09d5
Merge: 60ed7c9 cd301d6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:27:54 2011 -0800

    merged trunk

commit 3115a65f9981371ea8587a288b360c3c519de865
Author: termie <code@term.ie>
Date:   Wed Feb 23 15:26:52 2011 -0800

    add help back to the scripts that don't use service.py

 bin/nova-ajax-console-proxy |    4 +++-
 bin/nova-api                |    3 +++
 bin/nova-direct-api         |    4 ++++
 bin/nova-manage             |    3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

commit fbfc2b21657a2878ab97138c133a253f7c88303e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:17:32 2011 -0800

    Alphabetize imports

 bin/nova-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b7d89758af54b291492eecae74cee29461ca28b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:16:56 2011 -0800

    remove processName from debug output since we aren't using multiprocessing and it doesn't exist in python 2.6.1

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24090232272e0db163060e0ca32dbf97c05120c9
Author: termie <code@term.ie>
Date:   Wed Feb 23 15:14:16 2011 -0800

    updates to nova.flags to get help working better
    
    Fixes some old bugs that were brought up on the mailing list.
    
    First step towards moving flags into the places where they belong.
    
    Also moves manager import into service's init so that we can get all the
    dynamically loaded flags shortly after loading.

 nova/flags.py              |   49 +++++++++++++++++++++++++++++++++++++++-----
 nova/service.py            |   31 ++++++++++++++++------------
 nova/tests/test_service.py |    7 -------
 3 files changed, 62 insertions(+), 25 deletions(-)

commit cd301d67506bcb6d67d921492435e9d7d56aafb1
Merge: ed9bdfc 8c007b5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:50:33 2011 +0000

    Helper function that supports XPath style selectors to traverse an object tree e.g.
    
    inst = {'fixed_ip': {'floating_ips': [{'address': '1.2.3.4'}], 'address': '192.168.0.3'}, 'hostname': ''}
    
    private_ips = get_from_path(inst, 'fixed_ip/address')
    public_ips = get_from_path(inst, 'fixed_ip/floating_ips/address')
    
    Avoids messy [.get() / if / for]* nested code

commit 05065a72ab06879d8ddd48ab45bc870386a0562d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 23 14:41:11 2011 -0800

    tests working again

 nova/tests/test_rpc.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8c007b56b586257d048b6db4ecfbed8f502381fd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 14:16:31 2011 -0800

    Put back the comments I accidentally removed

 nova/api/openstack/servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit a508e2dce781b98db5a719df75a451d9a2727fca
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 14:12:43 2011 -0800

    Make sure there are two blank links after the import

 nova/api/openstack/servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 1183c9e11b12984b1f5007ace831864e80483712
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 14:07:08 2011 -0800

    Rename minixpath_select to get_from_path

 nova/api/openstack/servers.py |    5 +-
 nova/tests/test_minixpath.py  |  177 -----------------------------------------
 nova/tests/test_utils.py      |  174 ++++++++++++++++++++++++++++++++++++++++
 nova/utils.py                 |   24 +++---
 4 files changed, 188 insertions(+), 192 deletions(-)

commit ed9bdfc8b61470bbe3f61ef7bf3f3044f8483b8a
Merge: f066b83 21ebea2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 21:25:36 2011 +0000

    Fixes the describe_availability_zones to use an elevated context when getting services and the db calls to pass parameters correctly so is_admin check works.

commit 89ade95d2eaabf77f9c81a8d50c7cc11aa175464
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 12:55:07 2011 -0800

    Fix pep8 violation (trailing whitespace)

 nova/tests/test_minixpath.py |    2 --
 1 file changed, 2 deletions(-)

commit 21ebea24b4b77f8bd1fd42152454f1b0189843d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 12:54:46 2011 -0800

    fix describe_availability_zones

 nova/api/ec2/cloud.py     |    5 +++--
 nova/db/api.py            |    4 ++--
 nova/db/sqlalchemy/api.py |    9 +++------
 3 files changed, 8 insertions(+), 10 deletions(-)

commit b3b005f50de54b5ef6c62e387dcec5a123f93cf6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 12:36:09 2011 -0800

    Cope when we pass a non-list to xpath_select - wrap it in a list

 nova/tests/test_minixpath.py |   38 ++++++++++++++++++++++++++++++++++++++
 nova/utils.py                |    8 +++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

commit f066b83f89f0fb633b2a23108b3efd2d27f3d710
Merge: b2d4744 4bc6e8c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 20:10:17 2011 +0000

    Fixes existing smoketests and splits out sysadmin tests from netadmin tests.
    
    * sets use_ipv6 = False by default
    * switches to ami-tty for tests
    * generally improves error handling

commit 5283e1c131a21ea4963c702a7137536f7b894bb6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 12:05:49 2011 -0800

    Created mini XPath implementation, to simplify mapping logic

 nova/api/openstack/servers.py |   21 ++----
 nova/tests/test_minixpath.py  |  141 +++++++++++++++++++++++++++++++++++++++++
 nova/utils.py                 |   45 +++++++++++++
 3 files changed, 191 insertions(+), 16 deletions(-)

commit 19dc13131b7fe512cb7897a888093b5c9a62e69d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 12:00:02 2011 -0800

    move the deletion of the db into fixtures

 nova/tests/__init__.py |    8 ++++++--
 run_tests.py           |    4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 0addb1147f4d9edf6a320953814f3e2c0d13ef35
Merge: 3c09d48 b09534d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:56:37 2011 -0800

    merged upstream

commit f7751eedc0e895f90d48104e2110bc2b320735fc
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Feb 23 13:53:02 2011 -0600

    Revert commit 709. This fixes issues with the Openstack API causing 'No user for access key admin' errors.

 nova/api/openstack/auth.py            |    4 ++--
 nova/tests/api/openstack/fakes.py     |    8 ++------
 nova/tests/api/openstack/test_auth.py |    6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

commit b09534dac05a3b4c127c633d8c050bb310a27166
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:52:10 2011 -0800

    put the redirection back in to run_tests.sh and fix terminal colors by using original stdout

 nova/tests/fake_flags.py |    1 -
 run_tests.py             |   16 +++++++++-------
 run_tests.sh             |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

commit 7c19fe87693b89d56ef9d9402d2667eacf297b97
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Feb 23 20:51:27 2011 +0100

    Deleted trailing whitespace

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b2d474437c18df296758b79450abc909ce2c2e89
Merge: 400bbd8 48d4054
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 19:46:13 2011 +0000

    Fixes and optimizes filtering for describe_security_groups.  Also adds a unit test.

commit 1b2d67e769ff1a6fe68a933e8b966d72588ce8ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:44:09 2011 -0800

    merged trunk

 nova/test.py                                      |   18 ++++--------------
 nova/tests/__init__.py                            |   13 +++++++++++++
 nova/tests/api/openstack/__init__.py              |    4 ++--
 nova/tests/api/openstack/test_adminapi.py         |    8 ++++----
 nova/tests/api/openstack/test_api.py              |    4 ++--
 nova/tests/api/openstack/test_auth.py             |   14 +++++++-------
 nova/tests/api/openstack/test_common.py           |    5 +++--
 nova/tests/api/openstack/test_faults.py           |    4 ++--
 nova/tests/api/openstack/test_flavors.py          |   10 ++++------
 nova/tests/api/openstack/test_images.py           |   14 ++++++++++----
 nova/tests/api/openstack/test_ratelimiting.py     |   15 +++++++--------
 nova/tests/api/openstack/test_servers.py          |   10 ++++------
 nova/tests/api/openstack/test_shared_ip_groups.py |    7 ++++---
 nova/tests/api/openstack/test_zones.py            |   10 ++++------
 nova/tests/api/test_wsgi.py                       |    6 +++---
 nova/tests/objectstore_unittest.py                |    1 +
 nova/tests/test_direct.py                         |    1 +
 nova/tests/test_scheduler.py                      |    1 +
 nova/tests/test_virt.py                           |    3 ++-
 19 files changed, 78 insertions(+), 70 deletions(-)

commit 48d4054e093a2faccbd819de8e9e02c03d28cda0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:26:38 2011 -0800

    fix for failing describe_instances test

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit d8611e324680d8514995d6c222ffd440595a87cf
Merge: e7f2a16 400bbd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:26:20 2011 -0800

    merged trunk

commit 3c09d486f862de7069b848e8124787cfbf4247f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:20:52 2011 -0800

    use flags for sqlite db names and fix flags in dhcpbridge

 bin/nova-dhcpbridge      |   13 +------------
 nova/flags.py            |    3 ++-
 nova/test.py             |   11 +++++++----
 nova/tests/__init__.py   |    7 ++++++-
 nova/tests/fake_flags.py |    2 +-
 run_tests.py             |   11 ++++++++---
 6 files changed, 25 insertions(+), 22 deletions(-)

commit 489f325b8161a70f0f7288135ad04c331bcbbe90
Merge: 3b2a8b5 70bc1d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:20:07 2011 -0800

    merged trunk

commit 3c6a44327f0015cb531b06fbce38eb4e3a04ce6a
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Feb 23 20:13:50 2011 +0100

    Fixes lp715424, code now checks network range can fit num_networks * network_size

 nova/network/manager.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 400bbd8c7d56543a5cebad25d078ec0331b07a3c
Merge: dbb77c9 424a099
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 18:52:53 2011 +0000

    The proposed branch prevents FlatManager from executing network initialisation tasks contained in linux_net.init_host(), which are unnecessary when flat networking is used.
    
    This is achieved as discussed in question #144979 (https://answers.launchpad.net/nova/+question/144979):
    1) init_host in FlatManager has been overriden, thus preventing it from calling init_host in NetworkManager.
    2) Also, methods related to floating IPs have been overriden in FlatManager in order to raised NotImplementedError.

commit dbb77c920c2d8c5891742b9eaca81f2d94ef1a05
Merge: 9664c9d 2bbbfc5
Author: termie <code@term.ie>
Date:   Wed Feb 23 18:46:38 2011 +0000

    Adds some features to run_tests.sh:
    - if it crashes right away with a short erorr log, print that directly
    - allow specifying tests without the nova.tests part

commit 9664c9d6a24424c0e1b561b17596adc5cfea5c38
Merge: 70bc1d4 3ef3dfc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 18:40:59 2011 +0000

    The kernel_id and the ramdisk_id are optional, yet the OpenStack API was requiring them.  In addition, with the ObjectStore these properties are not under 'properties' (as they are with Glance)

commit e7f2a1663526c26903fb0605533d10ca1e8a9428
Merge: 828e3ea 70bc1d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 10:29:54 2011 -0800

    merged trunk

commit 424a0996693351d92db3b9d866d4e62b9b2ebe5b
Merge: 79a4c52 35991d1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 18:26:04 2011 +0000

    merge trunk

commit 70bc1d4280065f6eba368187af126cebcb6b69bb
Merge: 35991d1 ef0dfb6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 18:11:35 2011 +0000

    Initial support for per-instance metadata, though the OpenStack API.  Key/value pairs can be specified at instance creation time and are returned in the details view.  Support limits based on quota system.

commit 7504531284be2d1fd6471f0ff3ef3b82a68ae469
Merge: 94bd7e2 35991d1
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 12:10:52 2011 -0600

    Merged trunk

commit 94bd7e2c45ca971e318813bb1e897fb5e79ab7bd
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 12:05:46 2011 -0600

    Removed pass

 nova/virt/xenapi/vmops.py |    1 -
 1 file changed, 1 deletion(-)

commit ef0dfb6809f31cfe8ca8056892fc9dcc2f00a0d7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 09:40:43 2011 -0800

    Changed unit test to refer to compute API, per Todd's suggestion.
    Avoids needing to extend our implementation of the EC2 API.

 nova/api/ec2/cloud.py    |    6 +-----
 nova/tests/test_quota.py |    3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

commit 35991d1e5b1902d5a09776302d8c25761ae248d7
Merge: afcec00 015900b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 17:35:35 2011 +0000

    Fixes lots of errors in the unit tests.
    
    * Ajax Proxy test was not running properly (and was broken)
    * Lots of tests were leaking non-deleted instances into the database
    * Some tests weren't calling TearDown
    * Removes extra test that wasn't doing anything useful

commit 2bbbfc5af62db57158a8d6aa26912ba234d0296e
Author: termie <code@term.ie>
Date:   Wed Feb 23 08:46:11 2011 -0800

    dump error output directly on short import errors

 run_tests.sh |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit d160455b77d7e180f252f4b412e3f65d7286b51f
Author: termie <code@term.ie>
Date:   Wed Feb 23 08:45:27 2011 -0800

    allow users to omit 'nova.tests' with run_tests

 run_tests.py |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

commit 58215533559a9fde3aa75e942fb547bb14aa9ecf
Merge: 78ed840 afcec00
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 10:45:04 2011 -0600

    Merged trunk

commit c0d3b8415ed34c6b259e183a047ca37c9598ffd4
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Feb 23 20:04:53 2011 +0530

    * Took care of localization of strings
    * Addressed all one liner docstrings
    * Added Sateesh, Milind to Authors file

 Authors                                |    2 +
 nova/virt/vmwareapi/__init__.py        |    5 +-
 nova/virt/vmwareapi/io_util.py         |   44 ++-----
 nova/virt/vmwareapi/read_write_util.py |  182 +++++++------------------
 nova/virt/vmwareapi/vim.py             |   74 ++++-------
 nova/virt/vmwareapi/vim_util.py        |   48 ++-----
 nova/virt/vmwareapi/vm_util.py         |   43 ++----
 nova/virt/vmwareapi/vmops.py           |  226 ++++++++++++++------------------
 nova/virt/vmwareapi/vmware_images.py   |   74 ++++-------
 nova/virt/vmwareapi_conn.py            |  144 ++++++--------------
 10 files changed, 276 insertions(+), 566 deletions(-)

commit 79a4c527fbb75bc563721fa23be4ea4aa97b39ee
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 11:49:47 2011 +0000

    Fixed pep8 errors

 nova/network/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit a9075d4edc126b95910258face7f00073449073d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 10:27:30 2011 +0000

    FlatManager.init_host now inhibits call to method in superclass.
    Floating IP methods have been redefined in FlatManager to raise NotImplementedError

 nova/network/manager.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 3b2a8b516fd9dbd08563c709e14323d571b8efee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 01:52:07 2011 -0800

    speed up network tests

 nova/tests/__init__.py     |    3 ++-
 nova/tests/fake_flags.py   |    4 ++--
 nova/tests/test_network.py |    8 +++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

commit 8cfcd2b987a9d7df6b020acb4c49888b81fbd895
Merge: 2bec58e afcec00
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 01:51:47 2011 -0800

    merged trunk

commit 2bec58e35ab1f2df543e50d399433f76e98210d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 01:13:41 2011 -0800

    move db creation into fixtures and clean db for each test

 nova/test.py                                      |   17 ++---------------
 nova/tests/__init__.py                            |   15 +++++++++++++++
 nova/tests/api/openstack/__init__.py              |    4 ++--
 nova/tests/api/openstack/test_adminapi.py         |   11 +++++------
 nova/tests/api/openstack/test_api.py              |    4 ++--
 nova/tests/api/openstack/test_auth.py             |   14 +++++++-------
 nova/tests/api/openstack/test_common.py           |    5 +++--
 nova/tests/api/openstack/test_faults.py           |    4 ++--
 nova/tests/api/openstack/test_flavors.py          |   10 ++++------
 nova/tests/api/openstack/test_images.py           |   14 ++++++++++----
 nova/tests/api/openstack/test_ratelimiting.py     |   15 +++++++--------
 nova/tests/api/openstack/test_servers.py          |   10 ++++------
 nova/tests/api/openstack/test_shared_ip_groups.py |    7 ++++---
 nova/tests/api/openstack/test_zones.py            |   10 ++++------
 nova/tests/api/test_wsgi.py                       |    6 +++---
 nova/tests/objectstore_unittest.py                |    1 +
 nova/tests/test_direct.py                         |    1 +
 nova/tests/test_scheduler.py                      |    1 +
 nova/tests/test_virt.py                           |    3 ++-
 19 files changed, 79 insertions(+), 73 deletions(-)

commit 60ed7c9c52306d08b1ad3e759e173931b0a495a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 00:59:15 2011 -0800

    fix failures

 run_tests.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 015900b215805808d8cc3138b0f4deb2c0941f76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 23:30:52 2011 -0800

    remove unnecessary stubout

 nova/tests/test_scheduler.py |    1 -
 1 file changed, 1 deletion(-)

commit 943b863bef09a4e2b3de36c26a3fabbcc6093411
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 23:21:01 2011 -0800

    Lots of test fixing

 nova/api/ec2/cloud.py                    |    5 +-
 nova/compute/api.py                      |    2 +-
 nova/db/sqlalchemy/api.py                |    3 +-
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/tests/test_cloud.py                 |   75 +++++++-----------------------
 nova/tests/test_network.py               |    3 ++
 nova/tests/test_scheduler.py             |    3 ++
 nova/tests/test_virt.py                  |    3 ++
 nova/virt/fake.py                        |    4 +-
 9 files changed, 36 insertions(+), 64 deletions(-)

commit 409ee5ff22bbd62d94a7afb1df1e6b7353c95d83
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 22 23:42:49 2011 -0500

    Update the admin client to deal with VPNs and have a function host list.

 nova/adminclient.py   |   63 ++++++++++++++++++++++++----
 nova/api/ec2/admin.py |  111 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 152 insertions(+), 22 deletions(-)

commit 50e71cef14c3bd079fbc2d2c203b0e0f76ee869e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:59:23 2011 -0800

    Removed unused import & formatting cleanups

 bin/nova-api       |    1 -
 nova/apiservice.py |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

commit dd6b9c21d3ad493051f25ce632fb327ed7fc7b73
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:57:04 2011 -0800

    Exit with exit code 1 if conf cannot be read

 bin/nova-api |    1 +
 1 file changed, 1 insertion(+)

commit 3ef3dfc2f6c8b9cc14119793df4990432ff74ea2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:42:23 2011 -0800

    Return null if no kernel_id / ramdisk_id

 nova/api/openstack/servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 9f169fdef93898097e33b5e1c0318f543ced672e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:41:41 2011 -0800

    Reverted change to focus on the core bug - kernel_id and ramdisk_id are optional

 nova/api/openstack/servers.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 7c8c325f475926724f3243344803841e24d5cb84
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:15:29 2011 -0800

    Make static create method behave more like other services

 nova/apiservice.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4bc6e8c467d0ff98b552b2f50622baf8b6175d3d
Merge: ef37833 828e3ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:05:16 2011 -0800

    merged fix-describe-groups

commit ef37833e6f45f99b1d16143d29685974a191c387
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:04:32 2011 -0800

    add netadmin smoketests

 smoketests/netadmin_smoketests.py |  194 +++++++++++++++++++++++++++++++++++++
 smoketests/proxy.sh               |   22 +++++
 2 files changed, 216 insertions(+)

commit 2fd33bdd50b933dc14fea065c823f5a73324129b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:04:08 2011 -0800

    separate out smoketests and add updated nova.sh

 contrib/nova.sh                         |   12 +-
 smoketests/base.py                      |   12 +
 smoketests/public_network_smoketests.py |   11 +-
 smoketests/sysadmin_smoketests.py       |  293 +++++++++++++++++++++++
 smoketests/user_smoketests.py           |  397 -------------------------------
 5 files changed, 321 insertions(+), 404 deletions(-)

commit 828e3ea3f29f57767a4e25ad40b275c886cb7968
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:02:25 2011 -0800

    fix and optimize security group filtering

 nova/api/ec2/cloud.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit e37e7b91a9fb5664ad50c1ff38e95f1a2d655c06
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 17:58:01 2011 -0800

    Support service-like wait behaviour for API service

 bin/nova-api       |    3 ++-
 nova/apiservice.py |    8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 79f6c437b486262bab3faacb59197a5cae30b2bd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 17:50:26 2011 -0800

    Added create static method to ApiService

 nova/apiservice.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 2610a522d26351686612058a6da0300bce731112
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 17:49:38 2011 -0800

    fix test

 nova/tests/test_cloud.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit b6254db80ca9841361775a92b85f88db7251f857
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 17:45:38 2011 -0800

    Refactoring nova-api to be a service, so that we can reuse it in tests

 bin/nova-api       |   50 ++++---------------------------
 nova/apiservice.py |   85 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 45 deletions(-)

commit 18793c2e184713d33bc93306d464cf443584ffd6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 17:44:07 2011 -0800

    test that shows error on filtering groups

 nova/tests/test_cloud.py |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit 5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e
Author: termie <code@term.ie>
Date:   Tue Feb 22 17:10:34 2011 -0800

    don't make a syslog handler if we didn't ask for one

 nova/log.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ab6b11b0399655ccdd9619be00470eda464cf2a7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 16:09:41 2011 -0800

    Don't blindly concatenate queue name if second portiion is None

 nova/db/sqlalchemy/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e8a3f461319c1ee20a18f3a375af5e1e958af05e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 15:50:42 2011 -0800

    Missing import for nova.exceptions (!)

 nova/network/api.py |    1 +
 1 file changed, 1 insertion(+)

commit afcec00e9e05031e1e7c086ff75fb05cf97c412d
Merge: 3180d5d a7eed42
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Feb 22 23:39:59 2011 +0000

    At the moment --pidfile is still used in some scripts in contrib/puppet/. I don't use puppet, please check if there are possible side effects.

commit f4289df0e58080d6d9fa381915bbd0d29f3b9751
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 15:05:48 2011 -0800

    We're not using prefix matching on AMQP, so fakerabbit shouldn't be doing it!

 nova/fakerabbit.py |    1 -
 1 file changed, 1 deletion(-)

commit 3df0e171a550f06638644b8ecb0b68bb90a5a166
Merge: 6685226 e6b7fa7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 13:42:26 2011 -0800

    merge fixes from anso branch

commit 6685226189bd91964dccddab23b7c11b256a6a7b
Merge: 2f4258d bd0ca93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 13:36:18 2011 -0800

    merged trunk

commit d1a6cb96c1c72894cbba24e6806da5c81fb915df
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 20:39:33 2011 +0000

    Removed block of code that resurrected itself in the last merge.

 nova/virt/xenapi/vmops.py |    4 ----
 1 file changed, 4 deletions(-)

commit 8d1f22255ee968e0693ac0932677a4830a45e57e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 20:28:31 2011 +0000

    Added Andy Southgate to the Authors file.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 0767f3a7eb5cb0a3920829bc014283536e9c1a0d
Merge: 9049ad1 3180d5d
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 20:25:07 2011 +0000

    Merged with trunk, including manual conflict resolution in nova/virt/disk.py
    and nova/virt/xenapi/vmops.py.

commit 9049ad18f0ad40361d936c2066bded3436082275
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 20:12:30 2011 +0000

    Put the whitespace back *sigh*

 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    1 +
 1 file changed, 1 insertion(+)

commit 75190533d887a8824f234aa5e6185328f6f9b4f8
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 19:54:42 2011 +0000

    Remove duplicate import gained across a merge.

 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    2 --
 1 file changed, 2 deletions(-)

commit 8b0e8b155eab313e0caece48eee609d12df5e5d4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 20:45:36 2011 +0100

    Rename "SNATTING" chain to "snat".

 nova/network/linux_net.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 3180d5dcf928f3c47e318b41affbc956bd5e2174
Merge: c5a98e3 912e762
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 19:00:10 2011 +0000

    Fix DescribeRegion answer by introducing '{ec2,osapi}_listen' flags instead of overloading {ec2,osapi}_host. Get rid of paste_config_to_flags, bin/nova-combined. Adds debug FLAGS dump at start of nova-api.

commit 912e762c9baf3cb17a24bc0d9feba4b26892dbbc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 17:37:12 2011 +0100

    Also remove nova-combined from setup.py

 setup.py |    1 -
 1 file changed, 1 deletion(-)

commit 485a6c5a9502679bc5ecf02f8e758170ac0335dc
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Feb 23 01:20:39 2011 +0900

    Fixed some docstring

 nova/scheduler/manager.py    |    2 +-
 nova/tests/test_scheduler.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9e2942931b5381d3ba0e8cc4f9846160b003f45b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 17:18:04 2011 +0100

    Get rid of nova-combined, see rationale on ML

 bin/nova-combined |   83 -----------------------------------------------------
 1 file changed, 83 deletions(-)

commit f80d4c859b95773b8637f044f975354964ee0989
Merge: bf570ca f9f9bf5
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 17:16:43 2011 +0100

    Merged trunk

commit c5a98e3e64ae5af34f63faf2d1664f5bdfb253af
Merge: f9f9bf5 7f0e78e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 22 16:10:19 2011 +0000

    no, really fix lp721297 this time

commit 20113ae3dcb4b7cd914a0e0862240b08bb855735
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Tue Feb 22 21:14:58 2011 +0530

    Updated import statements according to HACKING guidelines.
    Added docstrings to each document.
    Verified pep8 over all files.
    Replaced some constants by enums accordingly. Still little bit more left in vm_util.py and vim_util.py files.

 nova/virt/vmwareapi/__init__.py        |   16 +++++++++++++
 nova/virt/vmwareapi/io_util.py         |   21 +++++++++++-----
 nova/virt/vmwareapi/read_write_util.py |   14 +++++++++--
 nova/virt/vmwareapi/vim.py             |    8 ++++++-
 nova/virt/vmwareapi/vim_util.py        |    2 ++
 nova/virt/vmwareapi/vm_util.py         |    5 ++++
 nova/virt/vmwareapi/vmops.py           |    9 ++++---
 nova/virt/vmwareapi/vmware_images.py   |   21 +++++++++-------
 nova/virt/vmwareapi_conn.py            |   41 ++++++++++++++++++++++++++++----
 9 files changed, 112 insertions(+), 25 deletions(-)

commit f9f9bf52f50604afa05fdd7300601f28d7b441c0
Merge: e18f708 3125d97
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 15:34:47 2011 +0000

    Add flags for listen_port to nova-api.  This allows us to listen on one port, but return another port (for a proxy or load balancer) in calls like describe_regions, etc.

commit c6b2d07f47004576fa386a6d270203b1d7937664
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Feb 23 00:15:39 2011 +0900

    Fix tiny mitakes! (remove unnecessary comment, etc)

 nova/tests/test_scheduler.py |    2 +-
 nova/tests/test_volume.py    |    3 ---
 nova/virt/libvirt_conn.py    |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

commit c32e57999be09368b18f5a89315465e629ed4819
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 22 23:55:03 2011 +0900

    Fixed based on reviewer's comment.
    1. Change docstrings format
    2. Fix comment grammer mistake, etc

 bin/nova-api                                       |    2 -
 bin/nova-dhcpbridge                                |    1 -
 bin/nova-manage                                    |   28 +-
 nova/compute/manager.py                            |  123 +++++---
 nova/db/api.py                                     |   12 +-
 nova/db/sqlalchemy/api.py                          |   27 +-
 .../versions/005_add_live_migration.py             |    3 +-
 nova/db/sqlalchemy/models.py                       |   12 +-
 nova/scheduler/driver.py                           |  121 +++++---
 nova/scheduler/manager.py                          |   15 +-
 nova/tests/test_compute.py                         |   77 ++---
 nova/tests/test_scheduler.py                       |  141 ++++-----
 nova/tests/test_service.py                         |    6 +-
 nova/tests/test_virt.py                            |  309 +++++++++-----------
 nova/virt/fake.py                                  |   74 +----
 nova/virt/libvirt_conn.py                          |  182 ++++++++----
 nova/virt/xenapi_conn.py                           |   14 +-
 nova/volume/driver.py                              |   14 +-
 18 files changed, 576 insertions(+), 585 deletions(-)

commit 7eee81ee6480a36b179ae26be88ebad9415c4b62
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 14:40:00 2011 +0100

    PEP8 again

 nova/tests/test_network.py |  103 ++++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

commit 443f01ef7d977ba6ff86508b908f66733bdd989e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 14:32:20 2011 +0100

    Account for the fact that iptables-save outputs rules with a space at the end.
    Reverse the rule deduplication so that the last one takes precedence.

 nova/network/linux_net.py  |   45 +++++++++++++++++++++++++++++---------------
 nova/tests/test_network.py |   42 +++++++++++++++++++++--------------------
 2 files changed, 52 insertions(+), 35 deletions(-)

commit 92a693b04feddad2420a835a12f53520c5529d8f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 12:42:38 2011 +0100

    floating-ip-snat was too long. Use floating-snat instead.

 nova/network/linux_net.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit b5e6601f76d64a96d6c7de5e9acdf5a8cf0fe8e9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 12:21:29 2011 +0100

    PEP8 adjustments.

 nova/network/linux_net.py  |    9 +++++----
 nova/tests/test_network.py |   10 ++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

commit 54f2362d09393ad6ccdfee5689d4f547c69b3f42
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 11:47:46 2011 +0100

    Remove leftover from debugging.

 nova/network/linux_net.py |    2 --
 1 file changed, 2 deletions(-)

commit f3a47efc69d4c5382450cb4a73072cc42129fcc6
Merge: bf37fb0 e18f708
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 11:40:57 2011 +0100

    Merge trunk

commit bf37fb0ab5503a077a3d9e4109990d252e27cb15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 11:29:58 2011 +0100

    Add a bunch of tests for everything.
    
    Add a 'head' kwarg to add_rule that lets the rule bubble to the top. This is needed for nova-filter-top to end up at the top.

 nova/network/linux_net.py  |  120 +++++++++++++++++++++++++++++------------
 nova/tests/test_network.py |  128 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 192 insertions(+), 56 deletions(-)

commit e18f708135d7a9b0cf465ecc8df1b32252de6705
Merge: d9f5f81 11c5786
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 09:59:53 2011 +0000

    Fixes various issues regarding verbose logging and logging errors on import.
    
    * Adds a call to logging.reset() after flags are loaded via FLAGS()
    * Uses logfile flag to log properly during run_tests
    * Only adds handlers to root logger
    * Removes the stream handler if logfile is set
    * Syslog handler is in addition to logfile or stream handler
    * Removed need for logging.basicConfig()

commit 3696b1d8076426b2d94a232f8b77985d99a3e658
Merge: 53784c1 d9f5f81
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 22 00:43:25 2011 -0800

    merged trunk

commit 70d526dc44299b6bd54a5757d013ca3109887747
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 09:28:02 2011 +0100

    Add a new chain, floating-ip-snat, at the top of SNATTING, so that SNATting for floating ips gets applied before the default SNAT rule.

 nova/network/linux_net.py |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

commit c53bb1718a9b5900d09637d0ee966dadbf073900
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 09:00:29 2011 +0100

    Address some review comments.

 nova/network/linux_net.py |   16 ++++++++--------
 nova/tests/test_virt.py   |    1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

commit d9f5f817175f8f9ee6554c02e10ddb730f97080d
Merge: 1f4bf71 4b2a45a
Author: termie <code@term.ie>
Date:   Tue Feb 22 07:44:41 2011 +0000

    Some quick test cleanups, first step towards standardizing the way we start services in tests.

commit 3125d978fec27608064dd3dd8d3696f2219fbf12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 23:26:03 2011 -0800

    use a different flag for listen port for apis

 bin/nova-api |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 6e6c3fcfe97d60b6262bf90d423a77fa250bd383
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Feb 22 08:22:42 2011 +0100

    added disabled services to the list of displayed services in bin/nova-manage
    
    brontes:~ # nova-manage service list
    ares       nova-scheduler enabled  :-) 2011-02-22 07:21:29
    ares       nova-network enabled  :-) 2011-02-22 07:21:29
    ares       nova-volume enabled  XXX 2011-02-16 19:04:29
    brontes    nova-volume enabled  XXX 2011-02-12 18:31:43
    brontes    nova-network enabled  :-) 2011-02-22 07:21:29
    ares       nova-compute disabled :-) 2011-02-22 07:21:25
    brontes    nova-compute disabled :-) 2011-02-22 07:21:24

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5a506da755233918db05141f28204b7ebd7fba92
Merge: 764f0a4 1f4bf71
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 22 13:36:17 2011 +0900

    merged to trunk rev709. NEEDS to be fixed based on 3rd reviewer's comment

commit 764f0a457e74c4498cbc9ea30a184e61f7932072
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 22 13:18:21 2011 +0900

    just add 005_add_live_migration.py.

 .../versions/005_add_live_migration.py             |   84 ++++++++++++++++++++
 1 file changed, 84 insertions(+)

commit 5b83126a6104d98b3d9390c04600720b4f5c4086
Merge: d88d74c bd0ca93
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 22 13:16:52 2011 +0900

    Fixed based on reviewer's comment.
    1. DB schema change
       vcpu/memory/hdd info were stored into Service table.
       but reviewer pointed out to me creating new table is better
       since Service table has too much columns.
    
    2. Querying service table method
       Querying the compute-node recode from DB, several method were
       used to same purpose. Changed to use same method.
    
    3. Removing unnecessary operation.
       FixedIP no longer have host column.
       I didnt find that, remove unnecessary operation from post_live_migration..
    
    4. Test code
       Modified testcode to fit following the above changes.

commit af34f45855f5613b8ebdd2b2276a3e4a81127964
Merge: 0f402b7 11c5786
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:22:24 2011 -0800

    update based on prereq branch

commit 0f402b72cbf80d1adde503eb532a578944fa0c79
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:22:09 2011 -0800

    update based on prereq branch

 nova/tests/fake_flags.py |    2 +-
 run_tests.sh             |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 11c57867ec18bd61dcc6bde0dc4b459318d54e70
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:19:48 2011 -0800

    fixed newline and moved import fake_flags into run_tests where it makes more sense

 nova/test.py |    3 ---
 run_tests.py |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

commit fa56b624c65c577215aff4454f965ede7641d57a
Merge: 90007cd 71f7119
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:07:45 2011 -0800

    merged fix

commit 71f7119910f16cb99c10f43a07ccb1e7c0ca473f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:05:28 2011 -0800

    remove changes to test db

 bin/nova-dhcpbridge      |    2 +-
 nova/tests/fake_flags.py |    2 +-
 run_tests.py             |    2 --
 run_tests.sh             |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

commit 305ef6bf5f8f8926fdaa8db5f75a0680fbd8a2be
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 16:02:38 2011 -0800

    Fixed my confusion in documenting the syntax of iSCSI discovery

 nova/volume/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 90007cd9085909a1e1ac59732a0b371dd79c2557
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 15:55:50 2011 -0800

    pretty colors for logs and a few optimizations

 bin/nova-dhcpbridge |    2 +
 run_tests.py        |  202 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 202 insertions(+), 2 deletions(-)

commit f797d6c6464f8ee2816d56ee771ad718418def64
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 15:52:41 2011 -0800

    Renamed db_update to model_update, and lots more documentation

 nova/volume/driver.py  |   26 ++++++++++++++++++++++----
 nova/volume/manager.py |   12 ++++++------
 nova/volume/san.py     |   18 +++++++++---------
 3 files changed, 37 insertions(+), 19 deletions(-)

commit 4b2a45aa5dc91b24aea53f748906d8a69e40f7c8
Author: termie <code@term.ie>
Date:   Mon Feb 21 15:42:16 2011 -0800

    modify tests to use specific hosts rather than default

 nova/tests/test_cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 80914923d51e65f0e7ff1d0b97797ff8b2ee74af
Merge: f668403 1f4bf71
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 15:25:42 2011 -0800

    Merged with head

commit 83e4dcb7184169d4d35769c2d56b21e66c908e75
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    remove keyword argument, per review

 nova/test.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9003241814ab67817ea910943e932d7b2e542eb6
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    move test_cloud to use start_service, too

 nova/tests/test_cloud.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit ab73d72d33369d47012437c022a0679fa4ca3b38
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    add a start_service method to our test baseclass

 nova/service.py              |    7 +++
 nova/test.py                 |   53 +++++++++++++++++-----
 nova/tests/test_scheduler.py |  100 +++++++-----------------------------------
 nova/tests/test_test.py      |    3 ++
 4 files changed, 67 insertions(+), 96 deletions(-)

commit e5d030863eae7f997867350916adf0c721625d26
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    add a test for rpc consumer isolation

 nova/tests/test_test.py |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

commit 46ccef67f35d130cd94a1a6d743124313097964b
Merge: bef44d7 1f4bf71
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 14:47:33 2011 -0800

    Merged with trunk

commit 1f4bf71dfbe742c95584ff3a357076b7ea736d11
Merge: 0eba586 990a0fd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 22:39:53 2011 +0000

    The OpenStack API was using the 'secret' as the 'access key'.  There is an 'access key' and there is a 'secret key'.  Access key ~= username.  Secret key ~= password.  This fix is necessary for the OpenStack Python API bindings to log in.

commit fc0ea52d9379649d28de88d4fa1628e455533842
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 23:08:26 2011 +0100

    Add a bunch of docs for the new iptables hotness.

 nova/network/linux_net.py |   72 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 4 deletions(-)

commit dbb071c8424871b6985c6b470d9eff522cdda660
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 13:59:46 2011 -0800

    fix pep8 and remove extra reference to reset

 bin/nova-compute |    1 -
 nova/flags.py    |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

commit 29644fe5a9cf47ae33af31b848c0edc4567f3c09
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 13:46:41 2011 -0800

    switch to explicit call to logging.setup()

 bin/nova-ajax-console-proxy          |    2 +-
 bin/nova-api                         |    2 +-
 bin/nova-combined                    |    1 +
 bin/nova-compute                     |    5 ++++
 bin/nova-console                     |    4 ++++
 bin/nova-dhcpbridge                  |    3 ++-
 bin/nova-direct-api                  |    2 ++
 bin/nova-import-canonical-imagestore |    2 ++
 bin/nova-instancemonitor             |    3 ---
 bin/nova-manage                      |    2 ++
 bin/nova-network                     |    4 ++++
 bin/nova-scheduler                   |    4 ++++
 bin/nova-volume                      |    4 ++++
 nova/log.py                          |   44 +++++++++++++++++++---------------
 nova/service.py                      |    2 --
 nova/twistd.py                       |    1 +
 nova/utils.py                        |    2 +-
 run_tests.py                         |    2 ++
 18 files changed, 61 insertions(+), 28 deletions(-)

commit 7f0e78ea37d254ef36ea62c13336989094440bf3
Merge: 02e1961 0eba586
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 21 13:29:41 2011 -0800

    merged trunk

commit 0eba5864cffa3ab9fc94ffa25d84c81a06183c7e
Merge: d5814f1 cf006cc
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Feb 21 21:14:44 2011 +0000

    Adds translation catalogs and distutils.extra glue code that automates the process of compiling message catalogs into .mo files.

commit e8c1843748601c406b4cb57b7b266adeb58c21ea
Merge: ec7ab22 d5814f1
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:43:38 2011 -0600

    Merged with trunk

commit 02e196192ea1f8be22c31828266b177d14d123cd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 21 12:41:15 2011 -0800

    make sure that ec2 response times are xs:dateTime parsable

 nova/api/ec2/apirequest.py |    8 +++++++-
 nova/tests/test_api.py     |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

commit ec7ab22b8b08820f7ffa3b05e40b09a925f1ef95
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:35:30 2011 -0600

    Removing pesky DS_Store files too. Begone.

 .bzrignore               |    1 +
 doc/build/.DS_Store      |  Bin 6148 -> 0 bytes
 doc/build/html/.DS_Store |  Bin 6148 -> 0 bytes
 3 files changed, 1 insertion(+)

commit df1213b8091c9a63a25b15c6eb82272255f96cb6
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:30:20 2011 -0600

    Updated to remove built docs

 doc/.autogenerated                                 |  406 ++++++
 doc/build/.DS_Store                                |  Bin 0 -> 6148 bytes
 doc/build/html/.DS_Store                           |  Bin 0 -> 6148 bytes
 doc/build/html/.buildinfo                          |    4 +
 doc/source/api/autoindex.rst                       |  138 ++
 doc/source/api/nova..adminclient.rst               |    6 +
 doc/source/api/nova..api.direct.rst                |    6 +
 doc/source/api/nova..api.ec2.admin.rst             |    6 +
 doc/source/api/nova..api.ec2.apirequest.rst        |    6 +
 doc/source/api/nova..api.ec2.cloud.rst             |    6 +
 .../api/nova..api.ec2.metadatarequesthandler.rst   |    6 +
 doc/source/api/nova..api.openstack.auth.rst        |    6 +
 .../api/nova..api.openstack.backup_schedules.rst   |    6 +
 doc/source/api/nova..api.openstack.common.rst      |    6 +
 doc/source/api/nova..api.openstack.consoles.rst    |    6 +
 doc/source/api/nova..api.openstack.faults.rst      |    6 +
 doc/source/api/nova..api.openstack.flavors.rst     |    6 +
 doc/source/api/nova..api.openstack.images.rst      |    6 +
 doc/source/api/nova..api.openstack.servers.rst     |    6 +
 .../api/nova..api.openstack.shared_ip_groups.rst   |    6 +
 doc/source/api/nova..api.openstack.zones.rst       |    6 +
 doc/source/api/nova..auth.dbdriver.rst             |    6 +
 doc/source/api/nova..auth.fakeldap.rst             |    6 +
 doc/source/api/nova..auth.ldapdriver.rst           |    6 +
 doc/source/api/nova..auth.manager.rst              |    6 +
 doc/source/api/nova..auth.signer.rst               |    6 +
 doc/source/api/nova..cloudpipe.pipelib.rst         |    6 +
 doc/source/api/nova..compute.api.rst               |    6 +
 doc/source/api/nova..compute.instance_types.rst    |    6 +
 doc/source/api/nova..compute.manager.rst           |    6 +
 doc/source/api/nova..compute.monitor.rst           |    6 +
 doc/source/api/nova..compute.power_state.rst       |    6 +
 doc/source/api/nova..console.api.rst               |    6 +
 doc/source/api/nova..console.fake.rst              |    6 +
 doc/source/api/nova..console.manager.rst           |    6 +
 doc/source/api/nova..console.xvp.rst               |    6 +
 doc/source/api/nova..context.rst                   |    6 +
 doc/source/api/nova..crypto.rst                    |    6 +
 doc/source/api/nova..db.api.rst                    |    6 +
 doc/source/api/nova..db.base.rst                   |    6 +
 doc/source/api/nova..db.migration.rst              |    6 +
 doc/source/api/nova..db.sqlalchemy.api.rst         |    6 +
 .../nova..db.sqlalchemy.migrate_repo.manage.rst    |    6 +
 ...sqlalchemy.migrate_repo.versions.001_austin.rst |    6 +
 ....sqlalchemy.migrate_repo.versions.002_bexar.rst |    6 +
 ...ate_repo.versions.003_add_label_to_networks.rst |    6 +
 ...y.migrate_repo.versions.004_add_zone_tables.rst |    6 +
 doc/source/api/nova..db.sqlalchemy.migration.rst   |    6 +
 doc/source/api/nova..db.sqlalchemy.models.rst      |    6 +
 doc/source/api/nova..db.sqlalchemy.session.rst     |    6 +
 doc/source/api/nova..exception.rst                 |    6 +
 doc/source/api/nova..fakememcache.rst              |    6 +
 doc/source/api/nova..fakerabbit.rst                |    6 +
 doc/source/api/nova..flags.rst                     |    6 +
 doc/source/api/nova..image.glance.rst              |    6 +
 doc/source/api/nova..image.local.rst               |    6 +
 doc/source/api/nova..image.s3.rst                  |    6 +
 doc/source/api/nova..image.service.rst             |    6 +
 doc/source/api/nova..log.rst                       |    6 +
 doc/source/api/nova..manager.rst                   |    6 +
 doc/source/api/nova..network.api.rst               |    6 +
 doc/source/api/nova..network.linux_net.rst         |    6 +
 doc/source/api/nova..network.manager.rst           |    6 +
 doc/source/api/nova..objectstore.bucket.rst        |    6 +
 doc/source/api/nova..objectstore.handler.rst       |    6 +
 doc/source/api/nova..objectstore.image.rst         |    6 +
 doc/source/api/nova..objectstore.stored.rst        |    6 +
 doc/source/api/nova..quota.rst                     |    6 +
 doc/source/api/nova..rpc.rst                       |    6 +
 doc/source/api/nova..scheduler.chance.rst          |    6 +
 doc/source/api/nova..scheduler.driver.rst          |    6 +
 doc/source/api/nova..scheduler.manager.rst         |    6 +
 doc/source/api/nova..scheduler.simple.rst          |    6 +
 doc/source/api/nova..scheduler.zone.rst            |    6 +
 doc/source/api/nova..service.rst                   |    6 +
 doc/source/api/nova..test.rst                      |    6 +
 doc/source/api/nova..tests.api.openstack.fakes.rst |    6 +
 .../nova..tests.api.openstack.test_adminapi.rst    |    6 +
 .../api/nova..tests.api.openstack.test_api.rst     |    6 +
 .../api/nova..tests.api.openstack.test_auth.rst    |    6 +
 .../api/nova..tests.api.openstack.test_common.rst  |    6 +
 .../api/nova..tests.api.openstack.test_faults.rst  |    6 +
 .../api/nova..tests.api.openstack.test_flavors.rst |    6 +
 .../api/nova..tests.api.openstack.test_images.rst  |    6 +
 ...nova..tests.api.openstack.test_ratelimiting.rst |    6 +
 .../api/nova..tests.api.openstack.test_servers.rst |    6 +
 .....tests.api.openstack.test_shared_ip_groups.rst |    6 +
 .../api/nova..tests.api.openstack.test_zones.rst   |    6 +
 doc/source/api/nova..tests.api.test_wsgi.rst       |    6 +
 doc/source/api/nova..tests.db.fakes.rst            |    6 +
 doc/source/api/nova..tests.declare_flags.rst       |    6 +
 doc/source/api/nova..tests.fake_flags.rst          |    6 +
 doc/source/api/nova..tests.glance.stubs.rst        |    6 +
 doc/source/api/nova..tests.hyperv_unittest.rst     |    6 +
 .../api/nova..tests.objectstore_unittest.rst       |    6 +
 doc/source/api/nova..tests.real_flags.rst          |    6 +
 doc/source/api/nova..tests.runtime_flags.rst       |    6 +
 doc/source/api/nova..tests.test_access.rst         |    6 +
 doc/source/api/nova..tests.test_api.rst            |    6 +
 doc/source/api/nova..tests.test_auth.rst           |    6 +
 doc/source/api/nova..tests.test_cloud.rst          |    6 +
 doc/source/api/nova..tests.test_compute.rst        |    6 +
 doc/source/api/nova..tests.test_console.rst        |    6 +
 doc/source/api/nova..tests.test_direct.rst         |    6 +
 doc/source/api/nova..tests.test_flags.rst          |    6 +
 doc/source/api/nova..tests.test_localization.rst   |    6 +
 doc/source/api/nova..tests.test_log.rst            |    6 +
 doc/source/api/nova..tests.test_middleware.rst     |    6 +
 doc/source/api/nova..tests.test_misc.rst           |    6 +
 doc/source/api/nova..tests.test_network.rst        |    6 +
 doc/source/api/nova..tests.test_quota.rst          |    6 +
 doc/source/api/nova..tests.test_rpc.rst            |    6 +
 doc/source/api/nova..tests.test_scheduler.rst      |    6 +
 doc/source/api/nova..tests.test_service.rst        |    6 +
 doc/source/api/nova..tests.test_twistd.rst         |    6 +
 doc/source/api/nova..tests.test_virt.rst           |    6 +
 doc/source/api/nova..tests.test_volume.rst         |    6 +
 doc/source/api/nova..tests.test_xenapi.rst         |    6 +
 doc/source/api/nova..tests.xenapi.stubs.rst        |    6 +
 doc/source/api/nova..twistd.rst                    |    6 +
 doc/source/api/nova..utils.rst                     |    6 +
 doc/source/api/nova..version.rst                   |    6 +
 doc/source/api/nova..virt.connection.rst           |    6 +
 doc/source/api/nova..virt.disk.rst                 |    6 +
 doc/source/api/nova..virt.fake.rst                 |    6 +
 doc/source/api/nova..virt.hyperv.rst               |    6 +
 doc/source/api/nova..virt.images.rst               |    6 +
 doc/source/api/nova..virt.libvirt_conn.rst         |    6 +
 doc/source/api/nova..virt.xenapi.fake.rst          |    6 +
 doc/source/api/nova..virt.xenapi.network_utils.rst |    6 +
 doc/source/api/nova..virt.xenapi.vm_utils.rst      |    6 +
 doc/source/api/nova..virt.xenapi.vmops.rst         |    6 +
 doc/source/api/nova..virt.xenapi.volume_utils.rst  |    6 +
 doc/source/api/nova..virt.xenapi.volumeops.rst     |    6 +
 doc/source/api/nova..virt.xenapi_conn.rst          |    6 +
 doc/source/api/nova..volume.api.rst                |    6 +
 doc/source/api/nova..volume.driver.rst             |    6 +
 doc/source/api/nova..volume.manager.rst            |    6 +
 doc/source/api/nova..volume.san.rst                |    6 +
 doc/source/api/nova..wsgi.rst                      |    6 +
 doc/source/runnova/binaries.rst                    |   57 +
 doc/source/runnova/euca2ools.rst                   |   49 +
 doc/source/runnova/flags.rst                       |  193 +++
 doc/source/runnova/getting.started.rst             |  168 +++
 doc/source/runnova/index.rst                       |   90 ++
 doc/source/runnova/managing.images.rst             |   21 +
 doc/source/runnova/managing.instances.rst          |   59 +
 doc/source/runnova/managing.networks.rst           |   70 +
 doc/source/runnova/managing.projects.rst           |   68 +
 doc/source/runnova/managing.users.rst              |   82 ++
 doc/source/runnova/managingsecurity.rst            |   39 +
 doc/source/runnova/monitoring.rst                  |   27 +
 doc/source/runnova/network.flat.rst                |   60 +
 doc/source/runnova/network.vlan.rst                |  179 +++
 doc/source/runnova/nova.manage.rst                 |  239 ++++
 test/.Python                                       |    1 +
 test/bin/activate                                  |   76 ++
 test/bin/activate.csh                              |   32 +
 test/bin/activate.fish                             |   79 ++
 test/bin/activate_this.py                          |   32 +
 test/bin/easy_install                              |    9 +
 test/bin/easy_install-2.6                          |    9 +
 test/bin/pip                                       |    9 +
 test/bin/pip-2.6                                   |    9 +
 test/bin/python                                    |  Bin 0 -> 50720 bytes
 test/bin/python2.6                                 |    1 +
 test/include/python2.6                             |    1 +
 test/lib/python2.6/UserDict.py                     |    1 +
 test/lib/python2.6/_abcoll.py                      |    1 +
 test/lib/python2.6/abc.py                          |    1 +
 test/lib/python2.6/codecs.py                       |    1 +
 test/lib/python2.6/config                          |    1 +
 test/lib/python2.6/copy_reg.py                     |    1 +
 test/lib/python2.6/distutils/__init__.py           |   91 ++
 test/lib/python2.6/distutils/distutils.cfg         |    6 +
 test/lib/python2.6/encodings                       |    1 +
 test/lib/python2.6/fnmatch.py                      |    1 +
 test/lib/python2.6/genericpath.py                  |    1 +
 test/lib/python2.6/lib-dynload                     |    1 +
 test/lib/python2.6/linecache.py                    |    1 +
 test/lib/python2.6/locale.py                       |    1 +
 test/lib/python2.6/ntpath.py                       |    1 +
 test/lib/python2.6/orig-prefix.txt                 |    1 +
 test/lib/python2.6/os.py                           |    1 +
 test/lib/python2.6/posixpath.py                    |    1 +
 test/lib/python2.6/re.py                           |    1 +
 test/lib/python2.6/site-packages/easy-install.pth  |    4 +
 .../pip-0.8.1-py2.6.egg/EGG-INFO/PKG-INFO          |  348 +++++
 .../pip-0.8.1-py2.6.egg/EGG-INFO/SOURCES.txt       |   57 +
 .../EGG-INFO/dependency_links.txt                  |    1 +
 .../pip-0.8.1-py2.6.egg/EGG-INFO/entry_points.txt  |    4 +
 .../pip-0.8.1-py2.6.egg/EGG-INFO/not-zip-safe      |    1 +
 .../pip-0.8.1-py2.6.egg/EGG-INFO/top_level.txt     |    1 +
 .../pip-0.8.1-py2.6.egg/pip/__init__.py            |  261 ++++
 .../pip-0.8.1-py2.6.egg/pip/_pkgutil.py            |  589 ++++++++
 .../pip-0.8.1-py2.6.egg/pip/backwardcompat.py      |   55 +
 .../pip-0.8.1-py2.6.egg/pip/basecommand.py         |  203 +++
 .../pip-0.8.1-py2.6.egg/pip/baseparser.py          |  231 ++++
 .../pip-0.8.1-py2.6.egg/pip/commands/__init__.py   |    1 +
 .../pip-0.8.1-py2.6.egg/pip/commands/bundle.py     |   33 +
 .../pip-0.8.1-py2.6.egg/pip/commands/completion.py |   60 +
 .../pip-0.8.1-py2.6.egg/pip/commands/freeze.py     |  109 ++
 .../pip-0.8.1-py2.6.egg/pip/commands/help.py       |   32 +
 .../pip-0.8.1-py2.6.egg/pip/commands/install.py    |  247 ++++
 .../pip-0.8.1-py2.6.egg/pip/commands/search.py     |  116 ++
 .../pip-0.8.1-py2.6.egg/pip/commands/uninstall.py  |   42 +
 .../pip-0.8.1-py2.6.egg/pip/commands/unzip.py      |    9 +
 .../pip-0.8.1-py2.6.egg/pip/commands/zip.py        |  346 +++++
 .../pip-0.8.1-py2.6.egg/pip/download.py            |  470 +++++++
 .../pip-0.8.1-py2.6.egg/pip/exceptions.py          |   17 +
 .../site-packages/pip-0.8.1-py2.6.egg/pip/index.py |  686 ++++++++++
 .../pip-0.8.1-py2.6.egg/pip/locations.py           |   45 +
 .../site-packages/pip-0.8.1-py2.6.egg/pip/log.py   |  181 +++
 .../site-packages/pip-0.8.1-py2.6.egg/pip/req.py   | 1432 ++++++++++++++++++++
 .../pip-0.8.1-py2.6.egg/pip/runner.py              |   18 +
 .../site-packages/pip-0.8.1-py2.6.egg/pip/util.py  |  479 +++++++
 .../pip-0.8.1-py2.6.egg/pip/vcs/__init__.py        |  238 ++++
 .../pip-0.8.1-py2.6.egg/pip/vcs/bazaar.py          |  138 ++
 .../pip-0.8.1-py2.6.egg/pip/vcs/git.py             |  204 +++
 .../pip-0.8.1-py2.6.egg/pip/vcs/mercurial.py       |  162 +++
 .../pip-0.8.1-py2.6.egg/pip/vcs/subversion.py      |  260 ++++
 .../site-packages/pip-0.8.1-py2.6.egg/pip/venv.py  |   53 +
 .../site-packages/setuptools-0.6c11-py2.6.egg      |  Bin 0 -> 333447 bytes
 test/lib/python2.6/site-packages/setuptools.pth    |    1 +
 test/lib/python2.6/site.py                         |  713 ++++++++++
 test/lib/python2.6/sre.py                          |    1 +
 test/lib/python2.6/sre_compile.py                  |    1 +
 test/lib/python2.6/sre_constants.py                |    1 +
 test/lib/python2.6/sre_parse.py                    |    1 +
 test/lib/python2.6/stat.py                         |    1 +
 test/lib/python2.6/types.py                        |    1 +
 test/lib/python2.6/warnings.py                     |    1 +
 232 files changed, 10985 insertions(+)

commit 3392f6b4b060402c8d9a442f1a89a24fa31c9342
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:27:37 2011 -0600

    Removing duplicate installation docs and adding flag file information, plus pointing to docs.openstack.org for Admin-audience docs

 doc/source/adminguide/binaries.rst             |   57 ----
 doc/source/adminguide/distros/others.rst       |   88 ------
 doc/source/adminguide/distros/ubuntu.10.04.rst |   40 ---
 doc/source/adminguide/distros/ubuntu.10.10.rst |   41 ---
 doc/source/adminguide/euca2ools.rst            |   49 ---
 doc/source/adminguide/flags.rst                |   23 --
 doc/source/adminguide/getting.started.rst      |  167 ----------
 doc/source/adminguide/index.rst                |   91 ------
 doc/source/adminguide/managing.images.rst      |   21 --
 doc/source/adminguide/managing.instances.rst   |   59 ----
 doc/source/adminguide/managing.networks.rst    |   70 -----
 doc/source/adminguide/managing.projects.rst    |   68 ----
 doc/source/adminguide/managing.users.rst       |   82 -----
 doc/source/adminguide/managingsecurity.rst     |   39 ---
 doc/source/adminguide/monitoring.rst           |   27 --
 doc/source/adminguide/multi.node.install.rst   |  392 ------------------------
 doc/source/adminguide/network.flat.rst         |   60 ----
 doc/source/adminguide/network.vlan.rst         |  179 -----------
 doc/source/adminguide/nova.manage.rst          |  239 ---------------
 doc/source/adminguide/single.node.install.rst  |  362 ----------------------
 doc/source/community.rst                       |   12 +-
 doc/source/index.rst                           |   20 +-
 doc/source/object.model.rst                    |   14 +-
 doc/source/quickstart.rst                      |    2 +-
 24 files changed, 24 insertions(+), 2178 deletions(-)

commit d5814f133cde3cccae6aa6977cf87e502d7c1f88
Merge: bd0ca93 eebb9bb
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 21 20:05:23 2011 +0000

    introducing a new flag timeout_nbd for manually setting the time in seconds for waiting for an upcoming NBD device

commit c7d83e26f7d6388857b4db4538602395b688aa7a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 11:42:46 2011 -0800

    use tests.sqlite so it doesn't conflict with running db

 nova/tests/fake_flags.py |    4 ++--
 run_tests.py             |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 8388144744849265b46d26735da01a11e35990b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 11:07:50 2011 -0800

    cleanup from review

 nova/log.py |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

commit cf006cce87ce18cdf9d7705fcc2be05b912d4c3f
Author: jaypipes@gmail.com <>
Date:   Mon Feb 21 13:55:25 2011 -0500

    Duh, continue skips iteration, not pass. #iamanidiot

 nova/tests/test_misc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5e02518d8ae5e7f57033e28ae85067d28c1ff3d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 10:52:28 2011 -0800

    reset to notset if level isn't in flags

 nova/log.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 78ed840ef2f7066c638a76cc3192fec2f93d8450
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 12:48:34 2011 -0600

    Enable rescue testing

 nova/virt/xenapi/vmops.py |   51 +++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

commit 8b30a903a4d2c5c6ffe44e58b8531ddc889492c0
Author: jaypipes@gmail.com <>
Date:   Mon Feb 21 13:10:45 2011 -0500

    PEP8 errors and remove check in authors file for nova-core, since nova-core owns the translation export branch

 nova/tests/test_misc.py |    2 ++
 setup.py                |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 3b8a63c31ac474b536ac38fc2383eb5f3b1167b1
Merge: ac5a1cf bd0ca93
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 11:24:26 2011 -0600

    Merged trunk

commit ac5a1cfb0dbcebd36e7cbaab20795d03d523afee
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 11:20:03 2011 -0600

    Stub out VM create

 nova/virt/xenapi/vmops.py |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

commit d5b81fa45fb43e1f90c572b7291280735aef2af8
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Feb 21 21:21:45 2011 +0530

    * Removed VimService_services.py & VimService_services_types.py to reduce the diffs to normal.
      These 2 files are auto-generated files containing stubs for VI SDK API end points.
      The stub files are generated using ZSI SOAP stub generator module ZSI.commands.wsdl2py over
      Vimservice.wsdl distributed as part of VMware Virtual Infrastructure SDK package.
      To not include them in the repository we have few options to choose from,
      1) Generate the stub files in build time and make them available as packages for distribution.
      2) Generate the stub files in installation/configuration time if ESX/ESXi server is detected as compute provider.
      Further to this, we can try to reduce the size of stub files by attempting to create stubs only for the API end points required by the module vmwareapi.
    
    * Removed vmwareapi_blockdiagram.jpg as it was moved to 'doc/source/images' in revision 448.
    
    * Removed vmwareapi_readme.rst as it was moved to 'doc/source' in revision 448.

 nova/virt/vmwareapi/VimService_services.py       | 8369 ---
 nova/virt/vmwareapi/VimService_services_types.py |72377 ----------------------
 nova/virt/vmwareapi_blockdiagram.jpg             |  Bin 75363 -> 0 bytes
 nova/virt/vmwareapi_readme.rst                   |   72 -
 4 files changed, 80818 deletions(-)

commit eebb9bb14edb6fd1d218b3aa18142ee739ddd715
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 21 16:16:21 2011 +0100

    introducing a new flag timeout_nbd for manually setting the time in seconds for waiting for an upcoming NBD device

 nova/virt/disk.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 6facb35c26b2c90d4ba7a34f3eccd10de2fb7207
Merge: f02c41a bd0ca93
Author: jaypipes@gmail.com <>
Date:   Mon Feb 21 10:04:32 2011 -0500

    Merge trunk and re-run build_i18n

commit 45f4b75491ef9f77b454792770609e0aa003a6e5
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Feb 21 19:42:20 2011 +0530

    * Removed nova/virt/guest-tools/guest_tool.bat &
      nova/virt/guest-tools/guest_tool.sh as guest_tool.py
      can be invoked directly during guest startup.
    
    * Removed 'nova/virt/guest-tools/' and the encompassed script
      'guest_tool.py' is moved to 'etc/vmware_guest_tool.py'
    
    * Moved image vmwareapi_blockdiagram.jpg from 'nova/virt/' to
      'doc/source/images/' so that it'll be picked up by document build scripts.
    
    * Moved vmwareapi_readme.rst from 'nova/virt/' to
      'doc/source/' so that it'll be handled by document build scripts.
    
    * Added 'Introduction' section to 'vmwareapi_readme.rst'
    
    * Added vmwareapi module diagram to readme document. Added reference
      to 'images/vmwareapi_blockdiagram.jpg' in document 'vmwareapi_readme.rst'

 doc/source/images/vmwareapi_blockdiagram.jpg |  Bin 0 -> 75363 bytes
 doc/source/vmwareapi_readme.rst              |   87 +++++++
 etc/vmware_guest_tool.py                     |  326 ++++++++++++++++++++++++++
 nova/virt/guest-tools/guest_tool.bat         |    5 -
 nova/virt/guest-tools/guest_tool.py          |  317 -------------------------
 nova/virt/guest-tools/guest_tool.sh          |    4 -
 6 files changed, 413 insertions(+), 326 deletions(-)

commit 1ed4df93a246a06518f2c216cd0fc60ca67eb5c4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:39:38 2011 +0100

    More PEP-8

 nova/network/linux_net.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 3d2ec0f594e02018a32c8d0d7a8cc46f7ab4c849
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:39:02 2011 +0100

    Wrap ipv6 rules, too

 nova/network/linux_net.py  |   26 +++++++++++++++++---------
 nova/tests/test_network.py |    3 ++-
 2 files changed, 19 insertions(+), 10 deletions(-)

commit 18174983d861aeea39effb536670e2801ce7e090
Merge: a57dffb bd0ca93
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:28:48 2011 +0100

    Merge trunk

commit a57dffb5fdfbfac59b9ddbe7b33d6f03b7b748ba
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:16:42 2011 +0100

    PEP-8 fixes

 nova/network/linux_net.py  |   28 ++++++++++++++++++++--------
 nova/tests/test_network.py |   21 +++++++++------------
 nova/tests/test_virt.py    |    3 ++-
 nova/utils.py              |   12 ++++++------
 nova/virt/libvirt_conn.py  |    2 --
 5 files changed, 37 insertions(+), 29 deletions(-)

commit 15203c9ceaa94f0cd5bad96622ee93af7662bcce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 12:22:29 2011 +0100

    Allow non-existing rules to be removed.

 nova/network/linux_net.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit e263a37f83ec5f8a1d81b0f4ec7a91464b2bc022
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 21 11:02:19 2011 +0000

    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    NOVA-CORE DEVELOPERS SHOULD NOT REVIEW THIS MERGE PROPOSAL
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    This is for Citrix OpenStack team only. We propose for merge
    into a cache of lp:nova to generate diffs for our internal
    peer review.

 nova/virt/xenapi/vmops.py |    1 +
 1 file changed, 1 insertion(+)

commit 96f3fe089f7e7f04cb3b6c549f640a5acd417940
Merge: 441beee bd0ca93
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 21 10:26:44 2011 +0000

    merged with nova trunk revision #706

commit 384a4525e9d6de54158cd170487fce95df814b52
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 11:01:27 2011 +0100

    Fix typo

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9eebe4317f86ae13ffeaca1622e9fc555bc28ebc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 10:42:59 2011 +0100

    Unfilter instance correctly on termination.

 nova/network/linux_net.py |    4 ++++
 nova/virt/libvirt_conn.py |    8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 753d3a6915ad8387ea29ad1a7fb4aed74c4b71fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 01:26:15 2011 -0800

    move exception hook into appropriate location and remove extra stuff from module namespace

 bin/nova-manage |    1 -
 nova/log.py     |   45 +++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

commit cbb0402efac4ededdda0ac2097ec087216e23931
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 10:18:43 2011 +0100

    Also remove rules that jump to deleted chains.

 nova/network/linux_net.py |    5 ++++-
 nova/virt/libvirt_conn.py |    7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit e773c16e1bce0e00b269394d1ed20d15884827ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 01:07:46 2011 -0800

    simplify logic for parsing log level flags

 nova/log.py |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

commit bfba5b2cf8ade746d74485bd76f9d60238ccb2ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:48:33 2011 -0800

    reset all loggers on flag change, not just root

 nova/log.py |    3 +++
 1 file changed, 3 insertions(+)

commit f28ed7d95afd17e55e1db25a75e065f9da0f06e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:24:35 2011 -0800

    add docstring to reset method

 nova/log.py |    1 +
 1 file changed, 1 insertion(+)

commit f9af5309cf50b3b1a4ef9799c071cbaa6b1b304f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:22:45 2011 -0800

    removed extra comments and initialized from flags

 nova/flags.py |    3 ---
 1 file changed, 3 deletions(-)

commit 86b202f7397b80358346e1b2a9894af81faa4f4b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:17:58 2011 -0800

    fix nova-api as well

 bin/nova-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e729c49543c5acf354b154a3e2d9fd76a2f7da35
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 09:17:33 2011 +0100

    Fix refresh sec groups.

 nova/virt/libvirt_conn.py |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 7eab72b30cad9708e976f60e121569972b835b61
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:15:49 2011 -0800

    get rid of initialized flag

 nova/flags.py            |    4 ++--
 nova/log.py              |   16 ++++------------
 nova/test.py             |    3 +++
 nova/tests/fake_flags.py |    2 --
 nova/tests/test_log.py   |    6 ++----
 5 files changed, 11 insertions(+), 20 deletions(-)

commit 2792e42a9c7da390b3db0b59b7dff357c440d3e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:45:43 2011 -0800

    clean up location of method

 nova/log.py |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit eaddb9ea529672549af28cab4aacd2f8243c62a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:36:36 2011 -0800

    remove extra references to logging.basicConfig

 bin/nova-api        |    4 ++--
 bin/nova-combined   |    2 --
 bin/nova-dhcpbridge |    1 -
 bin/nova-manage     |    2 --
 nova/log.py         |   19 +++++++++++++------
 nova/service.py     |    1 -
 nova/twistd.py      |    1 -
 nova/wsgi.py        |    1 -
 8 files changed, 15 insertions(+), 16 deletions(-)

commit 98c2ef77e6018c0a6233e32ace435fba488175f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:18:09 2011 -0800

    move the fake initialized into fake flags

 nova/test.py             |    2 --
 nova/tests/fake_flags.py |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 106eb47eff0551c73b2e90385b9c3a910fec8633
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:16:10 2011 -0800

    fixes for various logging errors and issues

 nova/api/openstack/auth.py             |    1 -
 nova/api/openstack/backup_schedules.py |    1 -
 nova/api/openstack/images.py           |    2 -
 nova/api/openstack/servers.py          |    1 -
 nova/api/openstack/shared_ip_groups.py |    2 -
 nova/api/openstack/zones.py            |    1 -
 nova/console/manager.py                |    2 +-
 nova/console/xvp.py                    |    2 +-
 nova/flags.py                          |    4 ++
 nova/log.py                            |  117 ++++++++++++++++++++------------
 nova/test.py                           |    2 +
 nova/tests/fake_flags.py               |    2 +
 nova/tests/test_auth.py                |    9 ---
 nova/tests/test_console.py             |    2 -
 nova/tests/test_direct.py              |    1 -
 nova/tests/test_localization.py        |    1 -
 nova/tests/test_log.py                 |   65 +++++++++---------
 nova/utils.py                          |    2 +-
 run_tests.py                           |    5 +-
 19 files changed, 117 insertions(+), 105 deletions(-)

commit 32f062c389a530b6af3f864eb4030a68d0a26eb1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 22:33:39 2011 -0800

    fanout works

 nova/rpc.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 7297e6bf1536f20540200f28154c15d63372d943
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 20:58:59 2011 -0800

    fanout kinda working

 nova/rpc.py               |   51 +++++++++++++++++++++++++++++----------------
 nova/scheduler/api.py     |    7 +++++++
 nova/scheduler/manager.py |    2 +-
 nova/scheduler_manager.py |    2 ++
 nova/service.py           |    8 +++----
 5 files changed, 47 insertions(+), 23 deletions(-)

commit 5d821114fc20c88e36f079089cfe655d8188914a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 16:40:08 2011 -0800

    service ping working

 nova/compute/manager.py   |    4 ++--
 nova/scheduler_manager.py |    9 +++++++--
 nova/service.py           |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

commit a10d863e5e6127b8e987719ddfb60142b9f08db9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 13:36:45 2011 -0800

    scheduler manager

 nova/scheduler_manager.py |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit 3d9d99a53d372abf9f69f1d6e66fa6c6491ec752
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 19:27:15 2011 -0400

    tests passing

 nova/tests/test_service.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 2a6ce075e19af5700960e3fb22c213e43a2e24b4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 16:28:04 2011 -0400

    start of fanout

 nova/rpc.py                    |   20 ++++++++++++++++++++
 nova/scheduler/manager.py      |    4 ++++
 nova/scheduler/zone_manager.py |    4 ++++
 nova/service.py                |    6 ++++++
 4 files changed, 34 insertions(+)

commit c297880fb7c007aa4f6b6a9f7b985ecc981d8fe2
Merge: 24f91e6 d3584ee
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 15:11:16 2011 -0400

    merge trunk

commit 24f91e6123c15510e4ed99036b568f3958189941
Merge: 459616a 20ae9eb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 11:09:33 2011 -0400

    previous trunk merge

commit a7eed42c57fe7eaf6f2981a88a74a81a6890198c
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sun Feb 20 20:56:14 2011 +0100

    puppet scripts only there as an example, should be moved to some other place if they are still necessary

 contrib/puppet/files/etc/default/nova-compute      |    1 -
 contrib/puppet/files/etc/default/nova-volume       |    1 -
 contrib/puppet/files/etc/issue                     |    5 -
 contrib/puppet/files/etc/libvirt/qemu.conf         |  170 -------
 contrib/puppet/files/etc/lvm/lvm.conf              |  463 -------------------
 contrib/puppet/files/etc/nova.conf                 |   28 --
 contrib/puppet/files/production/boto.cfg           |    3 -
 contrib/puppet/files/production/genvpn.sh          |   35 --
 .../files/production/libvirt.qemu.xml.template     |   35 --
 contrib/puppet/files/production/my.cnf             |  137 ------
 contrib/puppet/files/production/nova-iptables      |  187 --------
 contrib/puppet/files/production/nova-iscsi-dev.sh  |   19 -
 contrib/puppet/files/production/setup_data.sh      |    6 -
 contrib/puppet/files/production/slap.sh            |  261 -----------
 contrib/puppet/fileserver.conf                     |    8 -
 contrib/puppet/manifests/classes/apt.pp            |    1 -
 contrib/puppet/manifests/classes/issue.pp          |   14 -
 contrib/puppet/manifests/classes/kern_module.pp    |   34 --
 contrib/puppet/manifests/classes/loopback.pp       |    6 -
 contrib/puppet/manifests/classes/lvm.pp            |    8 -
 contrib/puppet/manifests/classes/lvmconf.pp        |    8 -
 contrib/puppet/manifests/classes/nova.pp           |  464 --------------------
 contrib/puppet/manifests/classes/swift.pp          |    7 -
 contrib/puppet/manifests/site.pp                   |  120 -----
 contrib/puppet/manifests/templates.pp              |   21 -
 contrib/puppet/puppet.conf                         |   11 -
 contrib/puppet/templates/haproxy.cfg.erb           |   39 --
 contrib/puppet/templates/monitrc-nova-api.erb      |  138 ------
 contrib/puppet/templates/nova-iptables.erb         |   10 -
 .../templates/production/nova-common.conf.erb      |   55 ---
 .../puppet/templates/production/nova-nova.conf.erb |   21 -
 31 files changed, 2316 deletions(-)

commit bd0ca93866b48a7a65de8b97ab0ac0ac9c737f73
Merge: f0daba6 a60d4cb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Feb 19 21:39:44 2011 +0000

    Various optimizations of lookups relating to users.

commit f0daba6d37ada6e49229065dc99af8496511ef0f
Merge: 39ee83d b4c6740
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Feb 19 20:49:49 2011 +0000

    If there are no keypairs registered on a create call, output a useful error message rather than an out-of-range exception

commit 39ee83d0d867350f8bd31727ad20b119966b8b2f
Merge: f522a31 e215674
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Feb 19 20:45:05 2011 +0000

    Fixes vpn images to use kernel and ramdisk specified by the image.

commit f522a31a797dd75cf3cc8fa6c25b63de149d109e
Merge: c050c1f 89a63f5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 19 20:14:32 2011 +0000

    added elif branch to handle the conversion of datetime instances to isoformat instead of plain string conversion

commit c050c1fd6ceb20a74a3accdce8979a9b8756de6a
Merge: 8de8d1d d4a37dc
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 09:59:41 2011 +0000

    Calculate time correctly for ec2 request logs

commit 89a63f53116b04a8d0681265ba8ce71eeeb5be0b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 19 01:59:07 2011 -0800

    fix ec2 launchtime response not in iso format bug

 nova/api/ec2/apirequest.py |    3 +++
 1 file changed, 3 insertions(+)

commit 915d6e70106b30ed6919fa850749b8041c3e690d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 19 01:51:13 2011 -0800

    pep8 leftover

 nova/tests/api/openstack/test_zones.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d4a37dc28daf990d903ffd14607862cb2eafb1c8
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 01:36:13 2011 -0800

    move from datetime.datetime.utcnow -> utils.utcnow

 nova/api/ec2/__init__.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 86a858d076c62ddd7c27e04300aeb5d21111b986
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 01:27:48 2011 -0800

    pass start time as a param instead of making it an attribute

 nova/api/ec2/__init__.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a3c6106f99085da69ab3c51b80135d3cedd81c4d
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 01:22:27 2011 -0800

    store time when RequestLogging starts instead of using context's time

 nova/api/ec2/__init__.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit 990a0fdce67971e81665aa2151e43b071d8bcb7c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 23:33:06 2011 -0800

    Fix FakeAuthManager so that unit tests pass; I believe it was matching the wrong field

 nova/tests/api/openstack/fakes.py     |    8 ++++++--
 nova/tests/api/openstack/test_auth.py |    6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

commit a60d4cb45f4298ce39cbc34ad3c0133ba344fa66
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 23:15:42 2011 -0800

    more optimizations context.user.id to context.user_id

 nova/api/ec2/__init__.py |    2 +-
 nova/api/ec2/cloud.py    |    8 ++++----
 nova/volume/api.py       |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit c4a0f200b023ba96024d58bf731307483dcbe288
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 23:00:28 2011 -0800

    remove extra .

 nova/api/ec2/cloud.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit e518ab4d16ec6166c0ea391af4c94aaf4d8aa2db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 22:49:13 2011 -0800

    replace context.user.is_admin() with context.is_admin because it is much faster

 nova/api/ec2/cloud.py      |   12 ++++++------
 nova/objectstore/bucket.py |    2 +-
 nova/objectstore/image.py  |    2 +-
 nova/volume/api.py         |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

commit e21567404aa31c39bf1b14b8a8b2f02703fd5905
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 21:00:58 2011 -0800

    remove the weird is_vpn logic in compute/api.py

 nova/compute/api.py |   36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

commit aeab8eeb038ca1d1dde05705028144a78552c4f7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 17:27:25 2011 -0800

    Don't crash if there's no 'fixed_ip' attribute (was returning None, which was unsubscriptable)

 nova/api/openstack/servers.py |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

commit 8684eb3aa638883ea82bbaf8eb59076f1d7e6a05
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 17:17:51 2011 -0800

    ObjectStore doesn't use properties collection; kernel_id and ramdisk_id aren't required anyway

 nova/api/openstack/servers.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit 53784c1afaa12d0a8b22248093ec1e623a1a913d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 17:17:47 2011 -0800

    added purge option and tightened up testing

 bin/nova-manage                   |   15 ++++++---
 nova/compute/instance_types.py    |   13 ++++++++
 nova/tests/test_instance_types.py |    2 +-
 nova/tests/test_nova_manage.py    |   62 +++++++++++++++++++------------------
 4 files changed, 56 insertions(+), 36 deletions(-)

commit d0733621758985bdd621a05c7c8a53fe27aa62f2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 01:28:26 2011 +0100

    Wrap iptables calls in a semaphore.

 nova/network/linux_net.py |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

commit 3609f1da7e1383b76295c6e8bd1d1dc0d798aa63
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 16:00:22 2011 -0800

    pep8

 nova/tests/test_instance_types.py |    1 -
 1 file changed, 1 deletion(-)

commit fcd31c4d7c3855cb95ac75d6966b377eca8bbe7d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 15:59:42 2011 -0800

    added instance types purge test

 nova/tests/test_instance_types.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c10e3ddb19f20e5ac3a424a2296fe63fa4c4b7ee
Merge: 23729c5 8de8d1d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:37:15 2011 +0100

    Merge trunk

commit 23729c543350ce4ce563077522f18d0bedd1e61b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:36:34 2011 +0100

    Security group fallback is named sg-fallback.

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 99760bd7a51371b29cf0f76134187dc81e7545d0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:30:44 2011 +0100

    Rename a few things for more clarity.

 nova/network/linux_net.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit cfd6d4e403dcb2405cd7ff48bad3083a02159d2c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:14:08 2011 +0100

    Port libvirt_conn.IptablesDriver over to use linux_net.IptablesManager

 nova/network/linux_net.py |   17 +++-
 nova/tests/test_virt.py   |   55 ++++++++----
 nova/virt/libvirt_conn.py |  215 ++++++++++++++++++++-------------------------
 3 files changed, 145 insertions(+), 142 deletions(-)

commit 1cc8e2e1eb262f4bc54c22b197a053e4fee4a1e6
Merge: 2da6494 8de8d1d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 14:54:23 2011 -0800

    merged trunk

commit 05d135be0c0d8a90a97d62005a101345964800cf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 22:50:13 2011 +0000

    Typo fix

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 201391007e58b2f92fd7b56ccbf308e5909da7c0
Merge: a43c592 8de8d1d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 18 16:45:31 2011 -0600

    Merge from trunk and merge conflict resolution

commit e369f2842446876505ce528c5bb56a3d41215f8f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Feb 18 16:42:26 2011 -0600

    added admin api call for injecting network info, added api test for inject network info

 nova/api/openstack/__init__.py           |    1 +
 nova/api/openstack/servers.py            |   14 ++++++++++++++
 nova/compute/api.py                      |    7 +++++++
 nova/compute/manager.py                  |   12 ++++++++++++
 nova/tests/api/openstack/test_servers.py |   12 ++++++++++++
 nova/virt/xenapi_conn.py                 |    4 ++++
 6 files changed, 50 insertions(+)

commit b4c67400324df02480b171b84ba73cfe8a6d044e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 14:36:01 2011 -0800

    If there are no keypairs, output a useful error message

 nova/api/openstack/servers.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit be898f26984da4ee92da1a027e47775cd816fed5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 14:35:12 2011 -0800

    Fix typo (?) in authentication logic

 nova/api/openstack/auth.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit eefc8938d8a8010052affab9a5c0d010778d9780
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 22:25:19 2011 +0000

    Changing type -> image_type

 nova/virt/xenapi/vm_utils.py |   44 ++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

commit a43c5929de7ebf58eb9ecb8416ce3cf4194c176a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 18 16:13:34 2011 -0600

    Pep8 cleanup

 nova/api/openstack/servers.py                      |   13 ++-
 nova/compute/api.py                                |   12 ++-
 nova/compute/manager.py                            |   85 ++++++++++----------
 nova/db/api.py                                     |    5 +-
 nova/db/sqlalchemy/api.py                          |    6 +-
 .../versions/004_add_instance_migrations.py        |    3 +-
 nova/db/sqlalchemy/models.py                       |    5 +-
 nova/tests/api/openstack/common.py                 |    7 +-
 nova/tests/api/openstack/test_servers.py           |   24 +++---
 nova/tests/test_compute.py                         |    6 +-
 nova/tests/test_xenapi.py                          |    1 +
 nova/tests/xenapi/stubs.py                         |   11 +--
 nova/virt/xenapi/vm_utils.py                       |   13 ++-
 nova/virt/xenapi/vmops.py                          |    5 +-
 nova/virt/xenapi_conn.py                           |    6 +-
 15 files changed, 104 insertions(+), 98 deletions(-)

commit fa29dc0433384d5aa47f5ac069a8dc650e23ccae
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Feb 18 15:48:49 2011 -0600

    moved creating vifs to its own function, moved inject network to its own function

 nova/virt/xenapi/vmops.py |   30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

commit 18e573a14414838f11e772edca3eb5510f852c94
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 18 17:45:57 2011 -0400

    sandy y u no read hacking guide and import classes?

 nova/api/openstack/zones.py            |    5 ++---
 nova/scheduler/manager.py              |    4 ++--
 nova/scheduler/zone_manager.py         |    4 ++--
 nova/tests/api/openstack/test_zones.py |    7 ++++---
 4 files changed, 10 insertions(+), 10 deletions(-)

commit 8916442e7f2920938a317777de71f75faf463005
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 21:42:04 2011 +0000

    Typo fix

 nova/virt/xenapi/vm_utils.py |    2 ++
 nova/virt/xenapi/vmops.py    |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 62b3eb71384581e900b061e65caa6418c4452fa9
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 21:37:57 2011 +0000

    XenAPI tests

 nova/tests/test_xenapi.py  |   12 +++++++-----
 nova/tests/xenapi/stubs.py |   38 +++++++++++++++++++++++++++++---------
 nova/virt/xenapi/fake.py   |    3 +++
 3 files changed, 39 insertions(+), 14 deletions(-)

commit 5812a95736b9a16733b99700e8664dd29ae34def
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 18 22:10:06 2011 +0100

    Introduce IptablesManager in linux_net. Port every use of iptables in linux_net to it.

 nova/network/linux_net.py  |  287 +++++++++++++++++++++++++++-----------------
 nova/tests/test_network.py |   59 +++++++++
 nova/utils.py              |   61 ++++++----
 nova/virt/libvirt_conn.py  |   28 +++--
 4 files changed, 287 insertions(+), 148 deletions(-)

commit 8de8d1d045ca9fe12596e53d2244f4f8703cc209
Merge: 5dfa5ce 982ac6b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 18 20:59:49 2011 +0000

    Use WatchedFileHandler instead of RotatingFileHandler.

commit bb5624258200f027320327a38c524c389979c97a
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 19:04:57 2011 +0000

    Resize compute tests

 nova/tests/test_xenapi.py  |   34 ++++++++++++++++++++++++++++++++++
 nova/tests/xenapi/stubs.py |   25 +++++++++++++++++++++++--
 nova/virt/xenapi/fake.py   |    2 +-
 3 files changed, 58 insertions(+), 3 deletions(-)

commit f66840390bf6f4660a091663d306417e760735bc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 10:57:19 2011 -0800

    Support for HP SAN

 .../versions/006_add_provider_data_to_volumes.py   |   72 +++++
 nova/db/sqlalchemy/models.py                       |    3 +
 nova/volume/driver.py                              |  144 ++++++++--
 nova/volume/manager.py                             |    8 +-
 nova/volume/san.py                                 |  287 ++++++++++++++++++--
 5 files changed, 459 insertions(+), 55 deletions(-)

commit a55fefdd78ac984b366c8e1701cbbd8f5ad18e97
Merge: 4673afd 5dfa5ce
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Feb 18 13:27:30 2011 -0500

    Merging trunk to my branch. Fixed conflicts in Authors file and .mailmap.

commit bef44d7621db516a0f5d407655f5e76adfd5c06d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 10:14:56 2011 -0800

    Rename migration 004 => 005

 .../versions/004_add_instance_metadata.py          |   78 --------------------
 .../versions/005_add_instance_metadata.py          |   78 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 78 deletions(-)

commit cd533e160e9c98a0c14b4e0bc32a6e94c7ab8657
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Fri Feb 18 11:44:38 2011 -0600

    Added Author and tests

 Authors                    |    1 +
 nova/tests/test_compute.py |    9 +++++++++
 2 files changed, 10 insertions(+)

commit 36ccb108da5b4e205e26649425b63b40fe069ee2
Merge: 8dceacc 5dfa5ce
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 17:33:18 2011 +0000

    Merging trunk

commit c884064e7a9af04b2ebdbbb9ee32318a00716412
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 18 12:08:35 2011 -0400

    fixups backed on merge comments

 nova/api/openstack/zones.py            |   30 +++++--------------
 nova/flags.py                          |    5 ++--
 nova/scheduler/api.py                  |   49 ++++++++++++++++++++++++++++++++
 nova/scheduler/zone_manager.py         |   15 +++++-----
 nova/tests/api/openstack/test_zones.py |   33 +++++++++++----------
 5 files changed, 82 insertions(+), 50 deletions(-)

commit bf570ca5f199091d505d96b91a3dc3acfbfc9fc7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:37:00 2011 +0100

    Fixed testing mode leftover

 bin/nova-combined |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 15d140992a980d959be6633b59d178a5ea273cdc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:23:52 2011 +0100

    PEP8 fix

 bin/nova-api |    1 +
 1 file changed, 1 insertion(+)

commit a02af158f781b61dba67c454afb59b34f27ca5d7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:23:15 2011 +0100

    Remove paste_config_to_flags since it's now unused

 nova/wsgi.py |    7 -------
 1 file changed, 7 deletions(-)

commit 27c2de313a41bced77f7a4769deae089a70f5385
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:21:14 2011 +0100

    Port changes to nova-combined, rename flags to API_listen and API_listen_port

 bin/nova-api      |    8 ++++----
 bin/nova-combined |   20 ++++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

commit a0145eed239a7afb545def17f25a08e8e4c68824
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:08:33 2011 +0100

    Set up logging once FLAGS properly read, no need to redo logging config anymore (was inoperant anyway)

 bin/nova-api |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit debfca945627323c160b4ad9aa9b63b364deff99
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:02:55 2011 +0100

    Switch to API_listen and API_listen_port, drop wsgi.paste_config_to_flags

 bin/nova-api      |   18 ++++++++++++------
 etc/nova-api.conf |    3 ---
 2 files changed, 12 insertions(+), 9 deletions(-)

commit cf8cf8287169e3e0b996db7db5a135dea88db63a
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Feb 18 12:01:50 2011 +0100

    added new class Instances to manage instances and added a new listing method into the class
    
    # nova-manage instance list
    instance   node            type       state      launched            image        kernel       ramdisk      project    user       zone       index
    i-00000547 XXXXXXX         m1.small   running    2011-02-18 08:36:37 ami-a03ndz0q ami-0isqekvw               testing    berendt    None       0
    i-00000548 XXXXXXX         m1.small   running    2011-02-18 08:37:17 ami-a03ndz0q ami-0isqekvw               testing    berendt    None       1
    i-00000549 XXXXXXX         m1.small   running    2011-02-18 08:37:52 ami-a03ndz0q ami-0isqekvw               testing    berendt    None       2

 bin/nova-manage |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

commit 205810c3da4652fd0f5203f53299cd998ac7cf82
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Feb 18 11:44:06 2011 +0100

    added functionality to list only fixed ip addresses of one node and added exception handling to list method
    
    # nova-manage fixed list XXXX
    network           	IP address     	MAC address      	hostname       	host
    10.xx.xx.0/24     	10.xx.xx.5     	02:16:3e:3f:33:b6	i-00000547     	XXXX
    10.xx.xx.0/24     	10.xx.xx.9     	02:16:3e:14:03:d6	i-00000548     	XXXX
    10.xx.xx.0/24     	10.xx.xx.12    	02:16:3e:20:1b:e7	i-00000549     	XXXX

 bin/nova-manage           |   19 ++++++++++++-------
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

commit 982ac6b348981fa26ef6b70b8673da45477a6b36
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 18 10:24:55 2011 +0100

    Use WatchedFileHandler instead of RotatingFileHandler.

 nova/log.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4673afddcb5a1069f75fb3493e43498ed1de11f9
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Feb 18 02:23:30 2011 -0500

    Incorporating minor cleanups suggested by Rick Harris:
    * Use assertNotEqual instead of assertTrue
    * Use enumerate function instead of maintaining a counter

 nova/tests/api/openstack/test_servers.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 671766cb4ada59b0e575b395b5afff82950ddb76
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 06:03:15 2011 +0000

    Resize compute tests

 nova/tests/test_compute.py |   24 +++++++++++++++++++++---
 nova/virt/fake.py          |    6 ++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

commit d88d74c9a0a28e0ebd6cedf694753b9ee9decdac
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Feb 18 14:15:04 2011 +0900

    fixed based on reviewer's comment.
    1. erase wrapper function(remove/exists/mktempfile) from nova.utils.
    2. nova-manage service describeresource(->describe_resource)
    3. nova-manage service updateresource(->update_resource)
    4. erase "my mistake print" statement
    
    Additional changes are made at:
    1. nova.image.s3.show
    2. nova.compute.api.create
    
    that's because instances cannot launched without this changes.

 bin/nova-manage                                    |   10 +++++-----
 nova/compute/api.py                                |    4 ++--
 nova/compute/manager.py                            |   15 ++++++++++-----
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |    9 ---------
 nova/image/s3.py                                   |    2 +-
 nova/scheduler/manager.py                          |    1 -
 nova/utils.py                                      |   18 ------------------
 nova/virt/disk.py                                  |    1 -
 nova/virt/libvirt_conn.py                          |    2 +-
 9 files changed, 19 insertions(+), 43 deletions(-)

commit 4b51ec3e9bca7421c66816c77c43396e51e68ea6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 23:09:06 2011 -0600

    Tests

 nova/tests/api/openstack/common.py |    8 +++++---
 nova/tests/test_compute.py         |    7 +++++++
 nova/virt/fake.py                  |   13 +++++++++++++
 nova/virt/xenapi_conn.py           |    8 --------
 4 files changed, 25 insertions(+), 11 deletions(-)

commit 2da6494d20624177c0077d0709e1fdb0e5f8f03c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 17:42:49 2011 -0800

    pep8

 nova/tests/api/openstack/test_zones.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 6cf0a30b31beffc09b56950e9869dd423d5f3b11
Merge: ff0ef60 5dfa5ce
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 17:41:36 2011 -0800

    merged trunk

commit 5dfa5ce7d1374509fea51f8d0b132ea865f34dc6
Merge: c65eb75 eef994e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 00:30:15 2011 +0000

    Makes FlatDHCPManager clean up old fixed_ips like VlanManager.

commit c65eb75f663ac19244b43efd845fe6ee45498150
Merge: 76a82e5 f6f0135
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 00:24:45 2011 +0000

    Correctly pass the associate paramater for project_get_network through the IMPL layer in the db api.

commit ff0ef603fd3f87ad9294260d13ea3c122bab387f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 16:22:04 2011 -0800

    changed migration to 006 for trunk compatibility

 .../versions/004_add_instance_types.py             |   86 --------------------
 .../versions/006_add_instance_types.py             |   86 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 86 deletions(-)

commit 9991f23957c07493d503c9667a6920e1235ef8a1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 16:07:00 2011 -0800

    completed doc and added --purge option to instance type delete

 bin/nova-manage                                   |   11 ++++++++---
 doc/source/adminguide/managing.instance.types.rst |   10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

commit f0d58ea141116ccfd1c977b0f3e5fc669c0ea8a9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 17 18:06:34 2011 -0600

    moved inject network info to a function which accepts only instance, and call it from reset network

 nova/virt/xenapi/vmops.py |   96 ++++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 41 deletions(-)

commit 88aa545b53d96c25da01218c79e8be8c1ae3370f
Author: matt.dietz@rackspace.com <>
Date:   Thu Feb 17 23:55:56 2011 +0000

    Test changes

 nova/tests/api/openstack/test_servers.py |   82 ++++++++++++++----------------
 1 file changed, 39 insertions(+), 43 deletions(-)

commit ffa40f37662864ed0e40bd0239f75e48d4b73a6a
Merge: 9a7213b 76a82e5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 17 15:36:10 2011 -0800

    Merged with trunk

commit 94f5a5748158e61bde43327970dd8e513ca36575
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Thu Feb 17 17:13:59 2011 -0600

    Always compare incoming flavor_id as an int

 nova/compute/instance_types.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a7213b615bcaa2127f76146d594f5247ea0d0a4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 17 15:00:18 2011 -0800

    Initial support for per-instance metadata, though the OpenStack API. Key/value pairs can be specified at instance creation time and are returned in the details view. Support limits based on quota system.

 nova/api/ec2/cloud.py                              |    6 +-
 nova/api/openstack/servers.py                      |   30 ++++++--
 nova/compute/api.py                                |   29 +++++++-
 nova/db/sqlalchemy/api.py                          |    2 +
 .../versions/004_add_instance_metadata.py          |   78 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   18 ++++-
 nova/quota.py                                      |   14 +++-
 nova/tests/api/openstack/test_servers.py           |   11 ++-
 nova/tests/test_quota.py                           |   24 ++++++
 run_tests.sh                                       |    4 +-
 10 files changed, 202 insertions(+), 14 deletions(-)

commit 3f3dddee0245cb143004dfb8c20204c511bec658
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 16:52:31 2011 -0600

    a few changes and a bunch of unit tests

 nova/api/openstack/servers.py                      |   16 ++--
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   60 ------------
 .../versions/004_add_instance_migrations.py        |   60 ++++++++++++
 nova/tests/api/openstack/common.py                 |   30 ++++++
 nova/tests/api/openstack/test_servers.py           |   98 +++++++++++++++++++-
 5 files changed, 197 insertions(+), 67 deletions(-)

commit eef994eb690a9454e187a2b0cdbde85aba4c55cd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 14:50:29 2011 -0800

    remove leftover periodic tasks

 nova/network/manager.py |    5 -----
 1 file changed, 5 deletions(-)

commit 76a82e57dfbca67e1e70a12db4f4b5c2111e4d93
Merge: 5688fbd c097223
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Feb 17 22:50:17 2011 +0000

    Added support for feature parity with the current Rackspace Cloud Servers practice of "injecting" files into newly-created instances for configuration, etc. However, this is in no way restricted to only writing files to the guest when it is first created.

commit e5d979596ff8c588c7bbe82b7f1cb90de8af041a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 18:49:30 2011 -0400

    missing docstring and fixed copyrights

 nova/scheduler/zone_manager.py |    3 +--
 nova/tests/test_zones.py       |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

commit fe576e28a6ed8e15d4cdb96313d9f58426715bb0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 14:39:36 2011 -0800

    move periodic tasks to base class based on class variable as per review

 nova/network/manager.py |   36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

commit f6f0135bb320de3cde093f48cb3189380c173b12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 14:14:07 2011 -0800

    Correctly pass the associate paramater to project_get_network

 nova/db/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5688fbd7a06ea47e18f38e4c900be4dbb50b921c
Merge: cc792c1 e3f461b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 22:10:12 2011 +0000

    Add **kwargs to VlanManager's create_networks so that optional args from other managers don't break.

commit c0972233901774598fe6c836fcc3a0dd1f28f180
Merge: 396b02f 52753aa
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Feb 17 22:09:26 2011 +0000

    Uncommitted changes using the wrong author, and re-committing under the correct author

commit a845b392fcd46139db9bf5c954f1fee9bcafcba9
Merge: e5443fa 60ed732
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 18:08:11 2011 -0400

    merge with zone phase 1 again

commit cc792c167443e5adb8804f3d1cf1af2ade02505f
Merge: 52753aa 60ed732
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 22:00:15 2011 +0000

    Added http://mynova/v1.0/zones/ api options for add/remove/update/delete zones. child_zones table added to database and migration. Changed novarc vars from CLOUD_SERVERS_* to NOVA_* to work with novatools. See python-novatools on github for help testing this.

commit e5443fa3e436a95de9d1c353e8772436c7cba8b6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:58:38 2011 -0400

    pip requires novatools

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 60ed73265a52f264021bb7452cde9f83181b3dfc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:51:24 2011 -0400

    copyright notice

 nova/api/openstack/servers.py                      |    2 --
 .../migrate_repo/versions/004_add_zone_tables.py   |    3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

commit 273119957fb3f6cfa72d4357054f6ad1743704e8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 13:49:36 2011 -0800

    moved 003_cactus.py migration file to 004_add_instance_types.py to avoid naming collision with new trunk migration

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   86 --------------------
 .../versions/004_add_instance_types.py             |   86 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 86 deletions(-)

commit e3f461b3b1087fa6342942daa764ba6ffb9ae383
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 22:47:02 2011 +0100

    Add **kwargs to VlanManager's create_networks so that optional args from other managers don't break.

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 432763e319cd2378a30ad103ad0fc3343ef7ff21
Merge: 4626987 782a573
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:40:57 2011 -0400

    merge with zone phase 1

commit 782a5736b01f44af43f742de537bdbe4bbda6d88
Merge: 5a988eb 52753aa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:39:03 2011 -0400

    changed from 003-004 migration

commit 7ea5a0885cae596cbd39305ed111b9ab166539bb
Merge: 1ba8f07 173d59a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 13:39:03 2011 -0800

    merged lp:~jk0/nova/dynamicinstancetypes

commit 173d59a0e0d11c0dc74744ed48efb8cea9be6b2b
Merge: 8da339d 52753aa
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 15:33:14 2011 -0600

    Merged trunk

commit 46269872192b843c80d72206a05c8b759c9f66a8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:32:25 2011 -0400

    merge from dev

 nova/tests/api/openstack/test_zones.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit a33f5495fe261641713131901fee1e83ccc4890f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 13:29:19 2011 -0800

    fixed strings

 nova/scheduler/zone_manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b9a03524d03c0ce7fa98fab5531db720941bbfdb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 13:23:56 2011 -0800

    multi positional string fix

 nova/scheduler/zone_manager.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 0e3c86dcdc49890eecaa2d1ea64c0012e569682f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 22:07:00 2011 +0100

    Use a semaphore to ensure we don't run more than one iptables-restore at a time.

 nova/virt/libvirt_conn.py |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 8da339d53b4039c3a8e5e8a15ccf1434eeda5fa2
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 15:05:19 2011 -0600

    Fixed unit test

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b47cc07a7d3be1653bbcfa3215e3427e5cc796cb
Merge: b48201b e77f875
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:45:53 2011 -0800

    merge with trunk

commit b48201be9a5fa08ce21ef241052071800e5777ca
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:43:22 2011 -0800

    fixed zone list tests

 nova/tests/api/openstack/test_zones.py |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

commit 52753aae3486f654b9fb19d6423fc26dc180644d
Merge: 3701626 f50101f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 20:42:40 2011 +0000

    Make eth0 the default for the public_interface flag.

commit aa53c9476ed37f0a1359413d4a710eb08c997b06
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 14:42:01 2011 -0600

    Finished flavor OS API stubs

 nova/api/openstack/flavors.py |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

commit 3701626e4e7a479eeb66a986ff8537b5fc863a7b
Merge: 2f48d2a c2f5859
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 20:39:49 2011 +0000

    Re-alphabetise Authors, move extra addresses into .mailmap.

commit c2f585952a67aa0c922d7ec80b387e8617587541
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 21:27:48 2011 +0100

    Re-alphabetise Authors, move extra addressses into .mailmap.

 .mailmap |   46 ++++++++++++++++++++++++++--------------------
 Authors  |   10 +++++-----
 2 files changed, 31 insertions(+), 25 deletions(-)

commit 0c002f443de98b8d0164f7ad801f9ff5ef901101
Merge: 3dd6e36 2f48d2a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:23:28 2011 -0600

    Merge from trunk

commit 3dd6e369c0aa2e3092eaa32a6b04cbba712ba5ad
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:23:20 2011 -0600

    Move the ramdisk logging stuff

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f48d2ab1cccfc68516e89f58cf5033032da70f5
Merge: 38d0641 7070ee5
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Thu Feb 17 20:20:11 2011 +0000

    Hi guys
    
    Taking Jay suggestion, i completely got rid of BadParameter and just used ValueError, no point of using a new exception class when there's already something available in Python for that purpose.
    
    Regards

commit e77f8751dd59e5d650d047a6711c3d137947dda7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 16:18:03 2011 -0400

    fixup

 bin/nova-combined              |    4 ++--
 nova/api/openstack/zones.py    |    6 +++---
 nova/flags.py                  |    2 +-
 nova/scheduler/manager.py      |    2 +-
 nova/scheduler/zone_manager.py |   18 +++++++++---------
 nova/tests/test_zones.py       |   10 +++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

commit aa71a25c9f9bf5df3aea781138fa8d69654f06d9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:12:19 2011 -0800

    zone list now comes from scheduler zonemanager

 nova/api/openstack/zones.py    |   32 +++++++++++++++-
 nova/scheduler/manager.py      |   82 +++-------------------------------------
 nova/scheduler/zone_manager.py |   11 +++++-
 3 files changed, 46 insertions(+), 79 deletions(-)

commit b1fe9a64143505235eb2e3dbe6a6c0966a85ae76
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:10:08 2011 -0600

    Stop blowing away the ramdisk

 nova/compute/manager.py   |    2 +-
 nova/virt/xenapi/vmops.py |   29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

commit 43df95d1d8a4e8de094ca0a430eb7ac913803f8f
Merge: 39ffe46 35e2d24
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Feb 17 19:49:48 2011 +0000

    Rebased at lp:nova 688

commit 38d0641f484d03c7a39b34830181abb1dc1dca1c
Merge: 7dd3669 e28ce7f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Feb 17 19:38:11 2011 +0000

    Update the Openstack API so that it returns 'addresses'.
    
    This branch should resolve nova bug #713144 (https://bugs.launchpad.net/nova/+bug/713144).

commit 7dd36690cecc51ecb0c35aafd13285b59adc1967
Merge: 2b5866f 28b7776
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Feb 17 19:35:20 2011 +0000

    I have a bug fix, additional tests for the `limiter` method, and additional commenting for a couple classes in the OpenStack API. Basically I've just tried to jump in somewhere to get my feet wet. Constructive criticism welcome.

commit 2b5866fb71e8d37835bf8b0778064ba53385b676
Merge: d4de56f ea4d21b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 17 19:32:30 2011 +0000

    added labels to networks for use in multi-nic
    added writing network data to xenstore param-list
    added call to agent to reset network
    added reset_network call to openstack api

commit d4de56f78c9b70b7a7d25e48e774155005c6cefa
Merge: 35e2d24 0b4641a
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 19:29:31 2011 +0000

    Add a command to nova-manage to list fixed ip's.

commit e67927c181a1f24df35a6df5663e397e260979cf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 13:28:39 2011 -0600

    Foo

 nova/api/openstack/servers.py |    2 +-
 nova/compute/manager.py       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit ea4d21b546d9447bac50cf97a62c11129da12d21
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 17 13:10:37 2011 -0600

    comments + Englilish, changed copyright in migration, removed network_get_all from db.api (vestigial)

 nova/api/openstack/servers.py                      |    2 +-
 nova/compute/api.py                                |    2 +-
 nova/compute/manager.py                            |    2 +-
 nova/db/api.py                                     |    7 +------
 .../versions/003_add_label_to_networks.py          |    3 +--
 nova/virt/xenapi/vmops.py                          |    6 ++++++
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent  |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

commit 841b02230866cc163c26a264e86bba94c4b0335d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Feb 17 13:15:28 2011 -0500

    Adding myself to Authors and .mailmap files.

 .mailmap |    1 +
 Authors  |    1 +
 2 files changed, 2 insertions(+)

commit 35e2d24e4bdaf2d72155114b7e97821c8a4696d1
Merge: 7798a55 5b97ee7
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 17:59:51 2011 +0000

    example:
    
    # nova-manage network list
    CIDR                    netmask         dhcp_start      DNS
    xx.xx.35.0/25           255.255.255.128 xx.xx.35.2      None
    xx.xx.36.0/25           255.255.255.128 xx.xx.36.2      None
    
    (DNS set to None because networks not yet used..)

commit 28b77765fd38038fd7093589170dead48ffc417f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Feb 17 12:13:20 2011 -0500

    Switched mailmap entries

 .mailmap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 441beee908d2534c4fa1d85523dbc87770efeb17
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 17 16:54:42 2011 +0000

    Supporting networks with multiple PIFs.
    pep8 fixes
    unit tests passed

 nova/network/linux_net.py         |    1 -
 nova/network/manager.py           |    2 +-
 nova/network/xenapi_net.py        |  130 +++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/network_utils.py |   12 ++--
 nova/virt/xenapi/vmops.py         |   11 ++--
 5 files changed, 142 insertions(+), 14 deletions(-)

commit 9d953acc0ff572b9ed6fe16b83026f85776ddc04
Merge: bded835 1ba8f07
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:52:43 2011 -0600

    Merged kpepple

commit bded835a54093c52599dec937b04ee1f9e5b3969
Merge: 9d056b6 7798a55
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:51:33 2011 -0600

    Merged trunk

commit 9d056b6fadcefed9ef9573bd89125b00af5e2726
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:50:49 2011 -0600

    More testing

 nova/api/openstack/__init__.py           |    1 +
 nova/api/openstack/flavors.py            |   14 ++++++++++++--
 nova/tests/api/openstack/test_flavors.py |    6 ++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

commit 09d0e70ddf28914dc057cd04e8309499fb36fda6
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 17 22:01:21 2011 +0530

    Block diagram for vmwareapi module

 nova/virt/vmwareapi_blockdiagram.jpg |  Bin 0 -> 75363 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 0b4641a90e5f51cddccb9886902a90d64ceb3200
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 17:10:51 2011 +0100

    added entry in the category list

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit 7a60b5c406336c5f410d1a98868c3f93d888ea0c
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 17 21:36:08 2011 +0530

    Added vmwareapi module to add support of hypervisor vmware-vsphere to OpenStack.

 nova/virt/guest-tools/guest_tool.bat             |    5 +
 nova/virt/guest-tools/guest_tool.py              |  317 +
 nova/virt/guest-tools/guest_tool.sh              |    4 +
 nova/virt/vmwareapi/VimService_services.py       | 8369 +++
 nova/virt/vmwareapi/VimService_services_types.py |72377 ++++++++++++++++++++++
 nova/virt/vmwareapi/__init__.py                  |   16 +
 nova/virt/vmwareapi/io_util.py                   |  168 +
 nova/virt/vmwareapi/read_write_util.py           |  381 +
 nova/virt/vmwareapi/vim.py                       |  195 +
 nova/virt/vmwareapi/vim_util.py                  |  291 +
 nova/virt/vmwareapi/vm_util.py                   |  321 +
 nova/virt/vmwareapi/vmops.py                     |  724 +
 nova/virt/vmwareapi/vmware_images.py             |  257 +
 nova/virt/vmwareapi_conn.py                      |  384 +
 nova/virt/vmwareapi_readme.rst                   |   72 +
 15 files changed, 83881 insertions(+)

commit 7bb9e4c598f829a16cc6444346e087ddb506182a
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 16:58:00 2011 +0100

    added new functionality to list all defined fixed ips

 bin/nova-manage           |   31 +++++++++++++++++++++++++++++++
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   11 +++++++++++
 3 files changed, 47 insertions(+)

commit 5b97ee78b1bc2073bca0204caf92ae4560ec1e8e
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 16:46:55 2011 +0100

    added more I18N

 bin/nova-manage |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 220e8cb73a480ef1fb1342df2ae459e8f142f161
Merge: 6b5823f 7798a55
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Feb 17 10:35:28 2011 -0500

    Merged trunk and fixed conflict with other Brian in Authors

commit e28ce7f82d1c89ab0c4e5ebfa98c12f502a33138
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Feb 17 09:48:16 2011 -0500

    removing superfluous pass statements; replacing list comprehension with for loop; alphabetizing imports

 nova/api/openstack/servers.py            |    6 ++----
 nova/tests/api/openstack/test_servers.py |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

commit f92edfc207a1a593f56e079b3bccc5ca965132a0
Merge: 39ffe46 7798a55
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 17 19:50:55 2011 +0530

    Rebased at lp:nova 687

commit bf7ec579786d3f02e63fc870fdfcb1e9c2674f05
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 15:14:45 2011 +0100

    added i18n of 'No networks defined'

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f50101fcf845e93637f50e426ceb759641a20b76
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 13:46:24 2011 +0100

    Make eth0 the default for FLAGS.public_interface.

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8dceaccb81e95b55fac2156df4f04ef0a7469112
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:58:42 2011 +0000

    Typo fixes

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++--
 run_tests.sh                                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit b71fd21a8a4a9b9fde3b110c8f77d172ac1a47ba
Merge: 923a493 7798a55
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:30:51 2011 +0000

    Merging trunk

commit 923a4938b73b84aa8a31f08a7c7b983cc82959fe
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:29:50 2011 +0000

    Adding tests

 nova/tests/glance/stubs.py   |   25 +++++++++++----
 nova/tests/test_xenapi.py    |   70 ++++++++++++++++++++++++++++++++++++++++--
 nova/tests/xenapi/stubs.py   |   10 ++++++
 nova/virt/xenapi/vm_utils.py |    4 +++
 4 files changed, 100 insertions(+), 9 deletions(-)

commit 1ba8f07b9fb696ffa601f5d9104612505207d147
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 16 23:02:24 2011 -0800

    first crack at instance types docs

 doc/source/adminguide/managing.instance.types.rst |   79 +++++++++++++++++++++
 1 file changed, 79 insertions(+)

commit 2ee9070c3824d296bada49fc6637c09f8e18a5eb
Merge: 6f0d271 7798a55
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 21:42:22 2011 -0500

    merge trunk

commit 984db08a205bdd9196c3e1cc3415873a853c33ba
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 18:35:43 2011 -0800

    style cleanup

 nova/scheduler/zone_manager.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 719dbda7f8b856af334744de4807036e6ee704c1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 18:30:56 2011 -0800

    polling tests

 nova/scheduler/zone_manager.py |   15 ++++++++++-----
 nova/tests/test_zones.py       |   41 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)

commit 04e29f6dc4b13b6fd0cbe5013cf241a727eb56ac
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 01:24:31 2011 +0000

    Use glance image type to determine disk type

 nova/tests/glance/stubs.py                         |   12 ++--
 nova/virt/xenapi/vm_utils.py                       |   68 +++++++++++---------
 nova/virt/xenapi/vmops.py                          |    9 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +-
 4 files changed, 49 insertions(+), 43 deletions(-)

commit 56ad2a63f1dcf4a900fa4464671015dbaac05fdc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Feb 16 19:37:28 2011 -0500

    Minor change. Adding a helper function stub_instance() inside the test
    test_get_all_server_details_with_host for readability.

 nova/tests/api/openstack/test_servers.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 7798a551e39cf39a26e966f7ef7ecea52b3f77c3
Merge: ca440bd 5b82416
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 00:24:43 2011 +0000

    Fixes ldapdriver so that it works properly with admin client.  It now sanitizes all unicode data to strings before passing it into ldap driver.  This may need to be rethought to work properly for internationalization.

commit ce847afcc1e24463d7aa522f227a08193c72fcc0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Feb 16 19:12:44 2011 -0500

    Moved definition of return_servers_with_host stub to inside the
    test_get_all_server_details_with_host test.

 nova/api/openstack/servers.py            |    3 +--
 nova/tests/api/openstack/test_servers.py |   29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

commit c01519112245f5e991ab438fe983bf9331d4e952
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 17:51:43 2011 -0600

    fixed

 nova/compute/api.py     |    5 ++++-
 nova/compute/manager.py |    2 --
 nova/db/api.py          |    3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

commit c56b1814cfae7a9c814b2d37388aff5e772771b6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:39:12 2011 +0000

    Pep8 fixes

 nova/tests/glance/stubs.py                         |    8 ++++----
 nova/virt/xenapi/vm_utils.py                       |    8 +++++---
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

commit 6f0d2719f6d79abd38fd1cc34885b863c9744509
Merge: 5da7573 ca440bd
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 18:33:38 2011 -0500

    Merge Trunk

commit 28a38e0dc00a7a7695bfec6f33a365ac2ab2106d
Merge: a5ec2be ca440bd
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:09:08 2011 +0000

    Merging trunk

commit a5ec2be709d28267075ddc9616c5c29b62622af5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:07:43 2011 +0000

    Adding basic test

 nova/tests/glance/stubs.py |   22 ++++++++++++++++++----
 nova/tests/test_xenapi.py  |    4 ++++
 nova/tests/xenapi/stubs.py |    6 ++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

commit 8f206774ee75c2d96c15dd2c604ae5da9601d91f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 17:02:57 2011 -0600

    Better exceptions

 nova/api/openstack/servers.py |   15 +++++++++------
 nova/db/api.py                |    2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

commit ca440bdc97048e997ec64087d693c68910b6142f
Merge: 2f79a9e 556e8a5
Author: termie <code@term.ie>
Date:   Wed Feb 16 22:54:39 2011 +0000

    Update to our HACKING doc to add examples of our docstring style.

commit 5faa6e59ff9dff02e8d583e6711bd08dd1f821fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 16 14:15:41 2011 -0800

    add periodic disassociate from VlanManager to FlatDHCPManager.

 nova/network/manager.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 6b5823f0aa75707fad6ca38dde490a47b740c3da
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:40:40 2011 -0500

    Flipped mailmap entries

 .mailmap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2f79a9e57474bbe16085726eaeff47ba93e95e1d
Merge: 1016379 9be3425
Author: Brian Schott <bschott@isi.edu>
Date:   Wed Feb 16 21:29:52 2011 +0000

    -from migrate.versioning import exceptions as versioning_exceptions
    +
    +try:
    +    from migrate.versioning import exceptions as versioning_exceptions
    +except ImportError:
    +    try:
    +        # python-migration changed location of exceptions after 1.6.3
    +        # See LP Bug #717467
    +        from migrate import exceptions as versioning_exceptions
    +    except ImportError:
    +        sys.exit(_("python-migrate is not installed. Exiting."))

commit 05b96f9ddd0cc54c74c55c170b2037eeeafb527a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:22:16 2011 -0500

    Accidently removed myself from Authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 5f0340504784c1a0847e5b19aa9a317d9be16c20
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:19:57 2011 -0500

    Added alternate email to mailmap

 .mailmap |    1 +
 Authors  |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

commit 49a7e430ca30768a68a111223068652c781206fe
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 13:17:42 2011 -0800

    zone manager tests

 nova/scheduler/zone_manager.py |    2 +-
 nova/tests/test_zones.py       |  132 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)

commit a5af59dd68f8177eebc3745b81dfd60e7043bd5a
Merge: cbe4ee9 1016379
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:06:47 2011 -0500

    Merged to trunk

commit c6b8f129ae57da2ea0cd844150e58d4fac7eb71d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Feb 16 14:12:54 2011 -0600

    added test for reset_network to openstack api tests, tabstop 5 to 4, renamed migration

 nova/api/openstack/__init__.py                     |    1 +
 nova/compute/api.py                                |    2 +-
 .../versions/003_add_label_to_networks.py          |   52 ++++++++++++++++++++
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   52 --------------------
 nova/tests/api/openstack/test_servers.py           |   12 +++++
 5 files changed, 66 insertions(+), 53 deletions(-)

commit 1016379757919e2bfbea6255edbca86048796c4e
Merge: 34078b6 775fc13
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:12:48 2011 +0000

    Use RotatingFileHandler instead of FileHandler.

commit 5b82416998369203f07f3b3adef9570622caa369
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 16 12:03:59 2011 -0800

    pep8 fixes

 nova/auth/ldapdriver.py |    2 ++
 1 file changed, 2 insertions(+)

commit 6bd620fa3d378b4fe437e498ef17888bf632b9d6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 16 12:02:10 2011 -0800

    sanitize all args to strings before sending them to ldap

 nova/auth/ldapdriver.py |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 34078b64564af8223eab400d76d83e30a765ab48
Merge: 61963f0 84770a2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:01:02 2011 +0000

    Use a threadpool for handling requests coming in through RPC.

commit 905cf54f06f6dde95039599ae5ea30d2f070f398
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:53:47 2011 -0600

    Typos

 nova/compute/api.py       |    8 ++++----
 nova/compute/manager.py   |    2 +-
 nova/db/sqlalchemy/api.py |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit d6c8fbe761a0c0558bb9c9635d7fdab8a99e3933
Merge: 8798454 61963f0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:49:54 2011 -0600

    Merge from trunk

commit 879845496a50477ebc2709291c159ae1e8d5aa2a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:47:14 2011 -0600

    Derp

 nova/compute/api.py       |   26 +++++++++++++++++---------
 nova/compute/manager.py   |   32 +++++++++++++++++++++++++++++---
 nova/db/sqlalchemy/api.py |    5 +++--
 3 files changed, 49 insertions(+), 14 deletions(-)

commit 84770a2679ac069e214f5ce167b8abb70fafa878
Merge: 56ebab0 17abf5c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:34:30 2011 +0100

    Merge trunk

commit 56ebab08b29da2ed9a4ec29bb1c0695371acc142
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:34:17 2011 +0100

    Spell flags correctly (i.e. not in upper case)

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 552875913e263d0e44be4613f0a07d3b53067e96
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Wed Feb 16 19:32:45 2011 +0000

    Fixed merge error

 nova/virt/xenapi/vm_utils.py |    1 +
 1 file changed, 1 insertion(+)

commit c1603c9d3ccf2cb0db8541f32380bd53f228d6ec
Merge: 2dfcfcc 61963f0
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Wed Feb 16 19:20:51 2011 +0000

    Merge trunk

commit ec39332356d204d14c8910bf72056efd9e943dd0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 11:05:03 2011 -0800

    novatools call to child zones done

 nova/scheduler/zone_manager.py |  126 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

commit 89a2ee5ee5ea7dc3d9fed4a2d5aa2fe2faed9f2b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 11:04:48 2011 -0800

    novatools call to child zones done

 nova/scheduler/manager.py |   51 +++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 13 deletions(-)

commit 585ba4d6cf25eabf83b1b33a6de794ce671c0c98
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 18:43:55 2011 +0000

    Putting glance plugin under pep8 control

 nova/compute/api.py                                |    3 ---
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    1 +
 run_tests.sh                                       |    6 +++++-
 3 files changed, 6 insertions(+), 4 deletions(-)

commit 9be342534ee54f86c274f03d1d4a0c310f08e4ae
Author: Brian Schott <bschott@isi.edu>
Date:   Wed Feb 16 13:24:46 2011 -0500

    fixed authors, import sys in migration.py

 Authors                         |    2 +-
 nova/db/sqlalchemy/migration.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9
Merge: ef7e100 17abf5c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 19:09:40 2011 +0100

    Merge trunk

commit 5da75737ddfb876fd397b71986af42a5f8d0d04c
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 12:49:04 2011 -0500

    Merge bfschott's patch for migations in.

 nova/db/sqlalchemy/migration.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 434b0f9c3998e4849f8576266051e672406a3f78
Merge: 4375069 61963f0
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 16 11:21:50 2011 -0600

    Merged trunk

commit 01e340f98765cc434624b3b4da49447f950f07ae
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 16 17:16:31 2011 +0000

    First commit of working code

 nova/network/linux_net.py         |    1 +
 nova/virt/xenapi/network_utils.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 4375069b6635d6ccd87231cb7d9f5b17708ffb1a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 16 11:11:49 2011 -0600

    Stubbed out flavor create/delete API calls

 nova/api/openstack/flavors.py            |    9 ++++++++-
 nova/tests/api/openstack/test_flavors.py |   10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

commit 163e81ac2bc2f9945273b0659ceb473767e5b19f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Feb 16 11:53:50 2011 -0500

    This implements the blueprint 'Openstack API support for hostId':
    https://blueprints.launchpad.net/nova/+spec/openstack-api-hostid
    Now instances will have a unique hostId which for now is just a hash of the
    host. If the instance does not have a host yet, the hostId will be ''.

 nova/api/openstack/servers.py            |    7 ++++-
 nova/tests/api/openstack/test_servers.py |   41 +++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)

commit 61963f00ad70e73a06ffb35f3fd4b08696e39502
Merge: 17abf5c a7f796c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Feb 16 16:20:53 2011 +0000

    Fix for bug #716847
    
    If a volume has not yet been assigned to a host, then have "nova-manage volume delete" delete from database and skip the rpc.

commit efba14e5cdb3d5f018190e75c5407b07dcaa726b
Merge: 9d9e097 17abf5c
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 11:04:17 2011 -0500

    merge trunk.

commit 1b508d80dd76810f6183df50b9d9b324831875be
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 16 12:01:22 2011 +0000

    First commit for xenapi-vlan-networking.
    Totally untested

 nova/network/manager.py           |    1 +
 nova/virt/xenapi/network_utils.py |   17 +++++++++++++++--
 nova/virt/xenapi/vm_utils.py      |    1 +
 nova/virt/xenapi/vmops.py         |   15 +++++++++++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

commit 7f8595b88df2271c278ae59b6d187b5c3b8dde40
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Feb 16 12:15:48 2011 +0100

    added functionality to nova-manage to list created networks

 bin/nova-manage           |   12 ++++++++++++
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    9 +++++++++
 3 files changed, 26 insertions(+)

commit 17abf5c23f90f15b557131f71657e70e7b5cdef8
Merge: 6c9bb2b 9f1c46f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 09:54:54 2011 +0000

    Add back --logdir=DIR option. If set, a logfile named after the binary (e.g. nova-api.log) will be kept in DIR.

commit 9f1c46f5be0520afac21c3320e206ced98acd9ba
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 10:46:59 2011 +0100

    Fix PEP-8 stuff

 nova/log.py |    3 +++
 1 file changed, 3 insertions(+)

commit a00b8b78ce16bbfe4368f0e5e383b7b8f49ba9ef
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 10:02:17 2011 +0100

    assertIsNone is a 2.7-ism.

 nova/tests/test_log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6c9bb2b8102be4874c24b474649395e9fb2b7580
Merge: 56df9b1 333ee7d
Author: Vasiliy Shlykov <vash@vasiliyshlykov.org>
Date:   Wed Feb 16 08:19:58 2011 +0000

    This branch should resolve nova bug #718675 (https://bugs.launchpad.net/nova/+bug/718675).
    
    Also added dropping of tables in case of failures so `nova-manage sync db` will can restart next time.

commit 333ee7dd74b187ec48e923f767267eb9bb29a4aa
Author: Vasiliy Shlykov <vash@vasiliyshlykov.org>
Date:   Wed Feb 16 10:13:52 2011 +0300

    Added myself to the authors file.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit c735796e0668b2bf7c45eeef6396a3fb33d22d6e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 00:14:26 2011 -0600

    I fail at sessions

 nova/compute/api.py |    2 +-
 nova/db/api.py      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 8e536500e83b311bf8d006ca23234c50962dc6aa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 00:06:29 2011 -0600

    I fail at sessions

 nova/compute/manager.py   |    1 -
 nova/db/sqlalchemy/api.py |    9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 98b038c6878772f6b272cb169b1c74bd7c9838b8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 23:56:00 2011 -0600

    Foo

 nova/api/openstack/servers.py |   12 ++++++++++--
 nova/compute/api.py           |   20 +++++++++++++++-----
 nova/compute/manager.py       |   16 +++-------------
 nova/db/sqlalchemy/api.py     |    1 +
 4 files changed, 29 insertions(+), 20 deletions(-)

commit bb98e2055002ff3ed2099f60bbe4058d5f5c7b35
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 23:10:29 2011 -0600

    hurr durr

 nova/virt/xenapi/vmops.py                          |    5 +++--
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

commit b89f3826a63440cd6a1008326c65287ba530cb05
Merge: af92057 56df9b1
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 02:44:37 2011 +0000

    Merging trunk part 1

commit 1b9413e11ba1b4b49b50965e3f812e636f2319d5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 18:20:44 2011 -0600

    stubbed out reset networkin xenapi VM tests to solve domid problem

 nova/tests/test_xenapi.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit cd5aba9d1d00d9daad87efd89f78e49079bee2c7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 18:02:57 2011 -0600

    foo

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6ea6759450aab7eb021e202c68e5301667c74a9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 17:58:57 2011 -0600

    foo

 nova/virt/xenapi/vmops.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit af920572f42b07c3ea491015d30eb5001d1f735d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 23:36:23 2011 +0000

    Adding vhd hidden sanity check

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   23 +++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 3a36121add56438a495f674b33f6dab86e868206
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 00:19:16 2011 +0100

    Fixes 718994

commit 00f785dab7d269b9baf403f51bc1d4b2ea1dc06a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 00:10:17 2011 +0100

    Make rpc thread pool size configurable.

 nova/rpc.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac
Merge: 92c0290 56df9b1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 17:06:22 2011 -0600

    merge with trunk

commit f6bf7e8c1e2481e870ed4baa9f2a6aa8001b5514
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 16:46:17 2011 -0600

    fail

 nova/compute/manager.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 21a3d77fee681d05c465c74e40177ae022bc24af
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:41:27 2011 +0000

    Fixing test by adding stub for get_image_meta

 nova/tests/glance/stubs.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 56df9b129526aad29ac1a751153d94cfe7656993
Merge: 273e670 9b4150a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 22:39:50 2011 +0000

    this bug bit me hard today. pv can be None, which does not translate to %d and this error gets clobbered by causing errors in the business in charge of capturing output and reporting errors.

commit c7cd7b755c86bd15e2b19f70a09f88f62361596c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:31:51 2011 +0000

    More pep8 fixes

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   51 ++++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

commit 28ba475d9c32a384570ce6eb0e2f9cfc3dc79a08
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:24:48 2011 +0000

    Pep8 fixes

 nova/virt/xenapi/vm_utils.py |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 24d988263324c9136a1cd9aa5a3a3c4fdf229651
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:19:58 2011 +0000

    Set name-label on VDI

 nova/virt/xenapi/vm_utils.py |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit ef7e1003a2f7f0743808236e7e10d2a2b4369de6
Merge: 297fdbf 93df409
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 23:15:03 2011 +0100

    Merge

commit 297fdbfead55017340150412cd00b3aa7b962257
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 23:13:25 2011 +0100

    Don't hide RotatingFileHandler behind FileHandler's name.

 nova/log.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 52a443dfb53e8fa2226e7ae8b8dac0fa6e32a69d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 23:11:51 2011 +0100

    Refactor code that decides which logfile to use, if any.
    
    Adds unit tests.

 nova/log.py            |   17 +++++++++++------
 nova/tests/test_log.py |   21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

commit c33378fbbe0fd76e807530522715ba4175af18d8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 21:54:42 2011 +0000

    Fixing typo

 nova/api/openstack/servers.py |   11 ++++++++---
 nova/virt/xenapi/vm_utils.py  |   14 +++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

commit 5afc1f05d303cd58fb0bf94e5d35e5bc28b9d75c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 13:40:54 2011 -0800

    polling working

 nova/scheduler/manager.py |   55 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 1d72b9d3ddc835d788ba1fec1a937c2788e94b38
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 21:36:13 2011 +0000

    Using Nova style nokernel

 nova/api/openstack/servers.py                      |    8 +-------
 nova/compute/api.py                                |    2 ++
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    9 ++++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

commit 9b4150ad66abcdeb5dd46927fa320f9f2c6c99f6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:30:44 2011 -0600

    changed d to s

 locale/nova.pot              |    2 +-
 nova/virt/xenapi/vm_utils.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 92c02908b3e33806e706ba9c59ca35398b645345
Merge: 5037498 273e670
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:27:59 2011 -0600

    merge with trunk

commit 9f77e0a46cac2ebaf9a18c4a175099b208db1adb
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 15:27:23 2011 -0600

    More plugin lol

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 503749849df73df1732583bc9452e7952bf78ac2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:25:48 2011 -0600

    moved reset network to after boot durrrrr...

 nova/virt/xenapi/vmops.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 93df4098bf4a2b1f161eb5e6675d3a4fd820d1ed
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 22:13:08 2011 +0100

    Don't hid RotatingFileHandler behind FileHandler's name.

 nova/log.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 745b7b22f7b22a09e6c3bbc1cd8591eb3aa7f554
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Feb 15 21:38:47 2011 +0100

    removed flag --pidfile from nova/services.py

 nova/service.py |    4 ----
 1 file changed, 4 deletions(-)

commit cbe4ee9f3a6bf207d475ca230032ced9325c3b7a
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Tue Feb 15 15:33:17 2011 -0500

    Added teammate Naveed to authors file for his help.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 00f2905a5debc5835b742dab8dce003f53e33fc2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 14:29:31 2011 -0600

    plugin lol

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 9d9e097068abab7dc155d6614dfa8b388290bea8
Merge: ce219ae 273e670
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 15 15:22:11 2011 -0500

    Merge trunk

commit c97d408842a4a5a8e9d379acc13c9c1f5871827f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 14:10:43 2011 -0600

    Plugin changes

 nova/virt/xenapi/vmops.py                          |   11 +++++++----
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   12 +++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

commit 8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e
Merge: 4a4a3f0 273e670
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 15 15:01:41 2011 -0500

    merging trunk back in; updating Authors conflict

commit 300657f298fbecf9a08792b6d15e462560a6cdf5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 19:51:23 2011 +0000

    Adding documentation

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   85 +++++++++++++++++---
 1 file changed, 76 insertions(+), 9 deletions(-)

commit acf95a640cfeb0812a55577b6a08bff972ad523b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 19:17:27 2011 +0000

    Regrouping methods so they make sense

 nova/virt/xenapi/vm_utils.py                       |    7 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |  233 ++++++++++----------
 2 files changed, 123 insertions(+), 117 deletions(-)

commit 0020f14f43aa6f024d9aab7dc67c79caaaeb8257
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 11:15:59 2011 -0800

    zone/info works

 bin/nova-combined              |    4 ++--
 nova/api/openstack/__init__.py |    6 +++---
 nova/api/openstack/zones.py    |    7 ++++++-
 nova/flags.py                  |    5 +++++
 4 files changed, 16 insertions(+), 6 deletions(-)

commit eb603b5ec3d54b2b6c893f8d41e7d12bbaa49e57
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:50:40 2011 +0000

    Refactoring put_vdis

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |  136 ++++++++++----------
 1 file changed, 69 insertions(+), 67 deletions(-)

commit b4b1a7fbd55784157b3084016d4dfe2bd0120e51
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:36:17 2011 +0000

    Adding safe_find_sr

 nova/virt/xenapi/vm_utils.py |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 6da631dd3a7bc9b105a6b1fea8841887fd5dd33d
Merge: 24ad2cc 273e670
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Tue Feb 15 13:35:41 2011 -0500

    Merged lp:nova

commit 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd
Merge: d665539 aaf5110
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 15 18:24:53 2011 +0000

    Fixes tarball contents by adding missing scripts and files to setup.py / MANIFEST.in

commit 0fc3a184230c479254b9f713ea61de2f24f680ab
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:23:14 2011 +0000

    Moving SR path code outside of glance plugin

 nova/virt/xenapi/vm_utils.py                       |   21 ++++++++++--
 nova/virt/xenapi_conn.py                           |    2 ++
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   34 ++------------------
 3 files changed, 23 insertions(+), 34 deletions(-)

commit d66553956ee72dba4490a7d1ad7085e4d9a43391
Merge: 7e80b20 645f473
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 15 18:19:52 2011 +0000

    When re-throwing an exception, use "raise", not "raise e".  This way we don't lose the stack trace.

commit 15cdeef7820aacd0b1ff95da48816cba9f2544ba
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:01:13 2011 +0000

    Adding more documentation, code-cleanup

 nova/virt/xenapi/vm_utils.py                       |   52 +++++++++++++----
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   60 ++++++++++----------
 2 files changed, 70 insertions(+), 42 deletions(-)

commit f02c41a7fe332b215421320d041a944e4b9ee9ee
Author: jaypipes@gmail.com <>
Date:   Tue Feb 15 12:39:17 2011 -0500

    Replace placeholders in nova.pot with some actual values.

 po/nova.pot |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7e80b2086481a68123454d910ed99cb419f6a1f4
Merge: a9705d9 e32a013
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Feb 15 17:30:19 2011 +0000

    The proposed fix puts a VM which fails to spawn in a (new) 'FAILED' power state. It does not perform a clean-up.
    This because the user needs to know what has happened to the VM he/she was trying to run. Normally, API users do not have access to log files. In this case, the only way for the user to know what happened to the instance is to query its state (e.g.: doing euca-describe-instances). If we perform a complete clean-up, no information about the instance which failed to spawn will be left.
    
    For the NO_HOST_AVAILABLE error, which occurs when there is not enough RAM left on the host, the amount of available memory is now checked at the beginning of the spawn process. This way, if there is not enough RAM left on the host, the spawn process returns immediately.
    A test case (spawn_not_enough_memory) has been added as well.
    
    I understand adding a new value to the power_state enumeration might not be acceptable. In that case I will propose for merge a different branch in which we perform a complete clean-up.
    However, I reckon we still to provide a way to inform the user the spawn process has failed.

commit a9705d95bace415df7796f9ef9562b118d4d1f68
Merge: 18387e4 701c719
Author: termie <code@term.ie>
Date:   Tue Feb 15 17:23:54 2011 +0000

    Some trivial cleanups in context.py, mostly just a test of using the updated git-bzr-ng

commit 18387e4ff3df86a2024be185a92b428141c23871
Merge: 2effeaf 89ca05c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 17:20:58 2011 +0000

    Use eventlet.green.subprocess instead of standard subprocess

commit 03a8d1baae00a4150a02ac2f0b04c413dd3b00e0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 11:19:27 2011 -0600

    derp

 nova/compute/manager.py  |    2 +-
 nova/virt/xenapi_conn.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit bf82637cad867b0e8fb6ad868f60c6dcd66d7f97
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 11:05:20 2011 -0600

    Better host acquisition

 nova/compute/manager.py                            |    7 ++++---
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    3 ++-
 nova/db/sqlalchemy/models.py                       |    3 ++-
 nova/virt/xenapi_conn.py                           |    4 ++++
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

commit 59758207d490abb14045547d37e48c1f767f8956
Merge: 365575b 5a988eb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 12:44:54 2011 -0400

    zones merge

commit 5a988eb393c306097250a7f17ea65f0919fd9219
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 12:43:29 2011 -0400

    fixed / renamed migration scripts

 .../migrate_repo/versions/003_add_zone_tables.py   |   62 ++++++++++++++++++++
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   62 --------------------
 2 files changed, 62 insertions(+), 62 deletions(-)

commit 029750943838b3512a8e1bcc1d92113b5a7f64e5
Merge: 3b278be 2effeaf
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Feb 15 10:22:17 2011 -0600

    Merged trunk

commit bb2ab1211cbe1528e510fa45b189ba4bd04ac2f9
Author: jaypipes@gmail.com <>
Date:   Tue Feb 15 11:06:28 2011 -0500

    Update .pot file with source file and line numbers after running python setup.py build

 po/nova.pot |  264 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 141 insertions(+), 123 deletions(-)

commit 322b145dcda1642243eb837a44fecbe70fd67fa7
Merge: 4915d10 3e412a5
Author: jaypipes@gmail.com <>
Date:   Tue Feb 15 11:04:47 2011 -0500

    Adds Distutils.Extra support, removes Babel support, which is half-baked at best.

commit 4915d100bb7e20b266cb5ddefdc4f9dad65b6f28
Merge: 2effeaf e90e035
Author: jaypipes@gmail.com <>
Date:   Tue Feb 15 11:03:56 2011 -0500

    Pull in .po message catalogs from lp:~nova-core/nova/translations

commit 2effeaf2905ded6c03116ed05fca4dbb0eabe955
Merge: af2da13 bf8d9d3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 15:09:52 2011 +0000

    Fix sporadically failing unittests.

commit aaf5110fa6720d5b32db9b8a41b353a446163396
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 15 15:53:58 2011 +0100

    Missing nova/tests/db/nova.austin.sqlite file

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 5dd9839c333e4c11de07ee0bad185252b3b4837c
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 15 15:44:46 2011 +0100

    Translations will be shipped in po/, not locale/

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6ec10460b60a6c0073ddcc4790b1fb18a675f1b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 15 15:02:50 2011 +0100

    Adding missing scripts and files to setup.py / MANIFEST.in

 MANIFEST.in |    9 +++++++++
 setup.py    |    7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

commit af2da1311e21aced75d80c95bffbd26106be90df
Merge: 0a93ef1 f1e536f
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Feb 15 13:50:21 2011 +0000

    Fixes issues when running euca-run-instances and euca-describe-image-attribute against the latest nova/trunk EC2 API.
    
    I noticed this late this afternoon and saw some IRC traffic with other users hitting the issue as well.

commit 365575b42a21428463516913ea822d716a3fb70b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 09:48:47 2011 -0400

    initial

commit dfcf07192cf40d0451c7dfa3802994e4cef8d116
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 14:02:19 2011 +0100

    Naïve attempt at threading rpc requests.

 nova/rpc.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit bf8d9d3adfcb5e5cd97ae0d7451e6253892622b1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 13:18:27 2011 +0100

    Beautify it a little bit, thanks to dabo.

 nova/tests/test_api.py |   37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

commit 2dfcfccd74821851c965ee2912fd315e25e7f838
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Tue Feb 15 12:15:49 2011 +0000

    OS-55: Moved conn_common code into disk.py

 nova/virt/conn_common.py     |   51 ------------------------------------------
 nova/virt/disk.py            |   27 ++++++++++++++++++++++
 nova/virt/libvirt_conn.py    |    3 +--
 nova/virt/xenapi/vm_utils.py |    3 +--
 4 files changed, 29 insertions(+), 55 deletions(-)

commit 9ab97a9b0860f912be2a085327eea6b9a7fa7674
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 12:33:31 2011 +0100

    Break out of the "for group in rv" loop in security group unit tests so that we are use we are dealing with the correct group.

 nova/tests/test_api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 4574bcdfe303a76a46eb7579a5a70de4e54cc926
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 23:58:21 2011 -0600

    Tons o loggin

 nova/compute/manager.py                            |    1 +
 nova/virt/xenapi_conn.py                           |    4 ++--
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   20 +++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

commit 663b99831b5f8323aae39946e4ab7b0c09cad0af
Merge: 3b278be 0a93ef1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 14 21:50:13 2011 -0800

    merged trunk

commit e7fe96453760320ef897b9edfc39e057d565e6c0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 23:22:37 2011 -0600

    Refactored

 nova/compute/manager.py                            |    9 ++--
 nova/virt/xenapi/vmops.py                          |   50 +++++++++++---------
 nova/virt/xenapi_conn.py                           |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   17 +++----
 4 files changed, 43 insertions(+), 35 deletions(-)

commit e90e0355b6edcd381ea4cf1977fdcf1481fdf703
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Feb 15 05:12:01 2011 +0000

    Launchpad automatic translations update.

 locale/zh_CN.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 840e75686009e4accb24cba0dfc4f32503ddd921
Merge: c15289a 0a93ef1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 23:06:56 2011 -0400

    trunk merge

commit c15289a63c90218a573d5e75833985ec2ad8691e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 23:02:26 2011 -0400

    better filtering

 nova/api/openstack/zones.py            |   13 ++++++++-----
 nova/tests/api/openstack/test_zones.py |   10 +++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

commit fe6efb38ee30c5a3e532cd19faef0fec063b7446
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 01:37:54 2011 +0000

    Adding DISK_VHD to ImageTypes

 nova/virt/xenapi/vm_utils.py |   38 ++++++++++++++++++++++++++++++--------
 nova/virt/xenapi/vmops.py    |   22 +++++++++++++++-------
 2 files changed, 45 insertions(+), 15 deletions(-)

commit f1e536fb296c927a9fc953b1dfe24b9060a0387a
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Feb 14 19:51:51 2011 -0500

    Updates to that S3ImageService kernel_id and ramdisk_id mappings work with
    EC2 API.

 nova/api/ec2/cloud.py |    3 +++
 nova/compute/api.py   |    4 ++--
 nova/image/s3.py      |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit e65291cf34894322bd0f3f6661907e48e7a6a0b5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 20:11:29 2011 -0400

    fixed nova-combined debug hack and renamed ChildZone to Zone

 bin/nova-combined               |    4 ++--
 nova/db/api.py                  |   10 +++++-----
 nova/db/sqlalchemy/api.py       |   10 +++++-----
 nova/db/sqlalchemy/migration.py |    2 +-
 nova/db/sqlalchemy/models.py    |    6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

commit 3014c0896202b592858fc1a7fc9c29b92a6f5d1b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 18:04:07 2011 -0600

    plugin

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 238ae2b5a8c559acc362a3b44160404771f1259f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 00:00:56 2011 +0000

    Removing testing statements

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 0a93ef16bbb999b75a951adb73612338579db954
Merge: 799f522 17cca3c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 14 23:49:46 2011 +0000

    Adds missing flag that makes use_nova_chains work properly.

commit b7cf8f233a585043f0aa85f4d26dc2fb5a6701c7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:34:54 2011 -0600

    bad plugin

 nova/virt/xenapi/vmops.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit e44a91ced3d19a3bca10457239592307bf6f829b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:31:20 2011 -0600

    bad plugin

 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0bd48e3d53c6fce04b0c5e483537b3fd31c7364a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:24:33 2011 -0600

    bad plugin

 nova/virt/xenapi/vmops.py                          |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9d1bdde7efc7b8cb6aa8db6a86777393e838fe8e
Merge: ee4cba7 799f522
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 17:18:59 2011 -0600

    fixed merge conflict

commit 41e4e18a0324593c0076c3936d63bb6dcca487cb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 14 23:12:34 2011 +0000

    First cut on XenServer unified-images

 nova/api/openstack/servers.py                      |    6 +-
 nova/virt/xenapi/vm_utils.py                       |   47 ++++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |  204 ++++++++++++++++----
 3 files changed, 217 insertions(+), 40 deletions(-)

commit 1da5dcc0644a13cfb99852f3438649f710feb2bc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:54:04 2011 -0800

    removed debugging

 nova/api/openstack/auth.py |    1 -
 1 file changed, 1 deletion(-)

commit 6147a606cbe6b7e764865d2471d86f503437051b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:52:58 2011 -0800

    fixed template and added migration

 nova/auth/novarc.template                          |    6 +-
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   62 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

commit 19dc4751819b7ca3082b32b475435407e1a6edff
Merge: df9bf23 ef77681
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:50:29 2011 -0800

    better filtering

commit 2816ca39281bf7c1994791d969bc63d22c86f911
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 14 23:27:31 2011 +0100

    Use RotatingFileHandler instead of FileHandler.

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9a71c79dc3beb554c86a1b1b5d03ab66c6e96edc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 16:24:51 2011 -0600

    Typo fixes

 nova/compute/manager.py                            |    2 +-
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 nova/virt/xenapi/vmops.py                          |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

commit 96d0edff2348040362b77491892e525217a17562
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 14 23:19:15 2011 +0100

    Resurrect logdir option.

 nova/flags.py  |    2 ++
 nova/log.py    |   11 +++++++++--
 nova/twistd.py |    2 --
 3 files changed, 11 insertions(+), 4 deletions(-)

commit fad5baf307b74a92fd5b9d8e2d1479f558e180aa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 15:55:52 2011 -0600

    hurr

 nova/virt/xenapi/vm_utils.py                       |   12 ++++++++----
 nova/virt/xenapi/vmops.py                          |   13 ++++++++-----
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    7 ++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

commit 7bb6122549ad5ac549465f0012020f8e5dc9d506
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 15:26:08 2011 -0600

    Some refactoring

 nova/compute/manager.py                            |    4 ++--
 nova/virt/xenapi/vm_utils.py                       |   12 ++++++++----
 nova/virt/xenapi/vmops.py                          |   13 ++++++++-----
 nova/virt/xenapi_conn.py                           |    2 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    8 ++++++--
 5 files changed, 25 insertions(+), 14 deletions(-)

commit 411d828fc3511a09420e579ceee65a9470242509
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 14:40:58 2011 -0600

    hurr

 nova/virt/xenapi/vm_utils.py |   38 +++++++++++++++++++++-----------------
 nova/virt/xenapi/vmops.py    |    8 +++++---
 2 files changed, 26 insertions(+), 20 deletions(-)

commit fc8394a80b28f94561aa9ebf94c067ce2d1efd3b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 14:25:00 2011 -0600

    Snapshot correctly

 nova/virt/xenapi/vmops.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8f7c7b705cf9511c62fc783c5ad1462dc027f0f5
Merge: ac7eb23 c8521da
Author: Brian Schott <bschott@isi.edu>
Date:   Mon Feb 14 15:13:20 2011 -0500

    Added try clause to handle changed location of exceptions after 1.6.3 in python-migrate LP Bug #717467

commit 89ca05c457cb951e91060359493e5f830fe5eeda
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 14 21:06:16 2011 +0100

    Use eventlet.green.subprocess instead of standard subprocess
    
    Eventlet's monkey patching causes the os.wait call in the standard
    subprocess module to be non-blocking. This means that if it happens
    to call self.wait on a Popen object that hasn't completely terminated
    it'll be left as a zombie and its fd's are also leaked.

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 799f5222e5eea2825f1e05a66e44eb4df709234e
Merge: ef77681 9a55136
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 14 19:52:14 2011 +0000

    Made kernel and ram disk be deleted in xen api upon instance termination

commit 9f22390532332b955cb8d78ebfd8cf9670a63ac8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 13:50:06 2011 -0600

    Snapshot correctly

 nova/virt/xenapi/vmops.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit ea5e1b141c787053bab273e127f986800cb1712b
Merge: 1518e66 ef77681
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 15 04:42:33 2011 +0900

    merged recent version. no conflict, no big/important change to this branch

commit 1631196f3f277608fb0569c7242a7d8391605d0d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 13:38:05 2011 -0600

    wharrgarbl

 nova/virt/xenapi/vmops.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 1518e66d0c4a4a72b6893cb117648f81dd3e3aff
Merge: 2b7e2e8 10626fc
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 15 04:36:46 2011 +0900

    Merge request candidate version.
    1. ISCSI checker is added
    2. pep8 check, etc.

commit 3b278be55c6544004622eee71e411da0012737bc
Merge: b03d6f5 ae4d8e0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 14 11:32:51 2011 -0800

    merge jk0 branch (with trunk merge) which added additional columns for instance_types (which are openstack api specific).

commit ee4cba7779daa5b2e7415fb69cabc698b7dd60da
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 12:59:46 2011 -0600

    corrected model for table lookup

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f23e417bb5ac3db8ac28dfb4b032a3e233c9821
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 12:50:54 2011 -0600

    More fixes

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 875c4e1bab5e364a23695e46df69f1b21d9a8200
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 12:44:07 2011 -0600

    Derp

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a7f796c0a3dbccb74ba3fe51e3885c716bc88592
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Feb 14 10:43:22 2011 -0800

    fix for bug #716847 - if a volume has not been assigned to a host, then delete from db and skip rpc

 bin/nova-manage |    7 +++++++
 1 file changed, 7 insertions(+)

commit 3f96e6dbf12533355aa6722eeb498814df076aea
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 12:32:33 2011 -0600

    added call to reset_network from openstack api down to vmops

 nova/api/openstack/servers.py |   14 ++++++++++++++
 nova/compute/api.py           |    9 ++++++++-
 nova/compute/manager.py       |   12 ++++++++++++
 nova/virt/xenapi_conn.py      |    4 ++++
 4 files changed, 38 insertions(+), 1 deletion(-)

commit 7070ee5a668b1673f806835b3ca6635272d34f62
Merge: ee26d08 ef77681
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Feb 14 17:48:38 2011 +0100

    merging with trunk

commit ee26d0827b7ad3e4d7869614835fe58abe32dfc8
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Feb 14 17:43:39 2011 +0100

    Got rid of BadParameter, just using standard python ValueError

 nova/network/manager.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit ae4d8e0ffb8120e8a58dc261cb1fb24bb52389c5
Merge: fa4e3af ef77681
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 14 10:38:29 2011 -0600

    Merged trunk

commit 9c0862b5f84cdb09b7ab0aafca669d30f261a666
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 10:21:16 2011 -0600

    support for multiple IPs per network

 nova/virt/xenapi/vmops.py |   24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit 3e412a5f34c6dae44d8f4d6bce030fb267aa5aea
Author: jaypipes@gmail.com <>
Date:   Mon Feb 14 11:04:45 2011 -0500

    Merge Distutils.Extra changes for automating translation message catalog compilation

 babel.cfg       |    2 -
 locale/nova.pot | 2130 -------------------------------------------
 po/nova.pot     | 2705 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py        |   12 +-
 4 files changed, 2715 insertions(+), 2134 deletions(-)

commit 8001f334221a16d8328289f6954ef549844f76f3
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Feb 14 14:26:32 2011 +0100

    Fix DescribeRegion answer by using specific 'listen' configuration parameter instead of overloading ec2_host

 bin/nova-api      |    4 ++--
 bin/nova-combined |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 64a2a487d8ad524c0e948545a2318cebfefb36fe
Author: Vasiliy Shlykov <vash@vasiliyshlykov.org>
Date:   Mon Feb 14 16:02:58 2011 +0300

    Fixed tables creation order and added clearing db after errors.

 .../sqlalchemy/migrate_repo/versions/001_austin.py |   14 ++++++++------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |    7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

commit ef7768154324bbddb56d2c7d7a9d2e354b7d60cf
Merge: 821dcea 27139d3
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Feb 14 10:56:10 2011 +0000

    Modified S3ImageService to return the format defined in BaseService to allow EC2 API's DescribeImages to work against Glance.

commit 17cca3c90f203a023d921e7b01a667e68ef695b5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 13 21:48:14 2011 -0800

    re-add input_chain because it got deleted at some point

 nova/network/linux_net.py |    2 ++
 1 file changed, 2 insertions(+)

commit cad2e12da52c235f2b97a17a9151296861830901
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Feb 14 05:22:52 2011 +0000

    Launchpad automatic translations update.

 locale/zh_CN.po |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 821dcea02bd962244353bd154fc9148c2c192012
Merge: dc2f551 9f3d269
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 14 03:14:23 2011 +0000

    Fixes a typo in the auth checking for DescribeAvailabilityZones.

commit dc2f551f36fb0d0f6c46b465035f4a5fa064574e
Merge: 5a35643 7713cb9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 14 03:04:34 2011 +0000

    Fixes describe_security_groups by forcing it to return a list instead of a generator.

commit 7713cb99635f3a06e298d4a504dc1249e5bf3232
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 13 15:44:41 2011 -0800

    return a list instead of a generator from describe_groups

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5a35643962a8978a1ac584d64dd381a9ffbc8517
Merge: 2df3182 abe0077
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Sun Feb 13 20:04:45 2011 +0000

    Hi guys
    
    This branch fixes lp708329.
    
    Have a look at cloud.py/describe_security_groups , it was just a matter of sorting by project, then by group name before returning the groups.
    
    Regards

commit 27139d33ec027bae4b247c1651bfe635a32f5ebf
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Feb 13 11:55:50 2011 -0800

    Added missing doc string and made a few style tweaks

 nova/api/ec2/cloud.py |    1 +
 nova/image/s3.py      |   33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

commit 9f3d269c9b5b610846acbf4ba2bf6719577b199a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 13 10:45:20 2011 -0800

    fix typo in auth checking for describe_availability_zones

 nova/api/ec2/__init__.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit abe00772e1b8eef361ff2ce614a4679603438228
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Sun Feb 13 19:34:20 2011 +0100

    now sorting by project, then by group

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b554867a3ff9dd67bb528c0731f14b6730a28cf4
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sun Feb 13 05:09:17 2011 +0000

    Launchpad automatic translations update.

 locale/zh_CN.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 07bff0f397b3b6463532f709daeb7a36ed4ad5b1
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Feb 12 20:58:22 2011 -0800

    Made a few tweaks to format of S3 service implementation

 nova/api/ec2/cloud.py |    8 ++++----
 nova/image/s3.py      |    7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 2e75026ef11dfac37f1449a54c0d6f85ff8bfca6
Merge: 6f6a092 2df3182
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Feb 12 18:34:36 2011 -0800

    Merged trunk

commit 6f6a09216458ffdba17d1960bbad723a3e71e7b2
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Feb 12 18:33:49 2011 -0800

    First attempt to make all image services use similar schemas

 nova/api/ec2/cloud.py |   16 +++++++++++++++-
 nova/image/s3.py      |   22 +++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

commit 556e8a585cf3a344f0ecf386e6195e6e61848071
Author: termie <code@term.ie>
Date:   Sat Feb 12 13:30:31 2011 -0800

    fix :returns: and add pep-0257

 HACKING |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 635f6c9fb2bc3a09fac43832d1e57913ce893714
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Sat Feb 12 21:32:58 2011 +0100

    Preliminary fix for issue, need more thorough testing before pushing to lp

 nova/api/ec2/cloud.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit ae70e05c0dd0e703da0826e4d7087cef3283af56
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Feb 12 05:37:22 2011 +0000

    Launchpad automatic translations update.

 locale/zh_CN.po |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 252ebfe9a039fb883e3e88eda8feafae037e750e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:12:18 2011 -0600

    More typos

 nova/db/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit 520b1b50bc2b1d039ad2f89d791bba21b7a35f05
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:09:11 2011 -0600

    More typos

 nova/db/sqlalchemy/api.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit f3b25fc06e3eff6f1b0e8fed4a0bf90612bf0230
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:07:34 2011 -0600

    More typos

 nova/compute/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 384a5aff50926784590ad66b92919b4d0408319d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:05:02 2011 -0600

    More typos

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 66365ece306023c1cf848d452d5af2c418e4e14c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:04:00 2011 -0600

    More typos

 nova/compute/manager.py   |   12 ++++++++++--
 nova/db/sqlalchemy/api.py |    4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

commit c8521da3539d28dce56a914d89c43c4908e46e57
Author: Brian Schott <bschott@isi.edu>
Date:   Fri Feb 11 19:03:45 2011 -0500

    fixed exceptions import from python migrate

 nova/db/sqlalchemy/migration.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f181051ac04084f2937438b61c988804fc2ef845
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 17:39:04 2011 -0600

    Cast to host

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2df3182b6e9637fe0e9ce9358a60ee874a97acb3
Merge: c42ace8 d7042ae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 11 23:34:30 2011 +0000

    This fixes a lazy-load issue in describe-instances, which causes a crash.  The solution is to specifically load the network table when retrieving an instance.

commit b03d6f523a0dda7c942c298ac75bc46331085056
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 11 14:06:33 2011 -0800

    added instance_type_purge() to actually remove records from db

 nova/db/api.py                    |    7 +++++++
 nova/db/sqlalchemy/api.py         |   15 +++++++++++++++
 nova/tests/test_instance_types.py |    1 +
 3 files changed, 23 insertions(+)

commit 40ec6d45a25bf997ae62dbbf08494aa39f047e33
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 11 13:53:54 2011 -0800

    updated tests and added more error checking

 bin/nova-manage                   |   15 ++++++---------
 nova/compute/instance_types.py    |   12 ++++++------
 nova/db/sqlalchemy/api.py         |   14 +++++++-------
 nova/tests/test_instance_types.py |   17 +++++++++++++++++
 nova/tests/test_nova_manage.py    |   21 +++++++++------------
 5 files changed, 45 insertions(+), 34 deletions(-)

commit fa4e3af4c8d4161cdb90f0ac54f357e9724cbc22
Merge: 4a05890 c42ace8
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 11 15:18:32 2011 -0600

    Merged trunk

commit e4061a0f5d06dfd6136c5dda94945214cc9a2cf5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 11 13:11:28 2011 -0800

    more error checking on inputs and better errors returned

 nova/compute/instance_types.py |   38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

commit 4a058908db774bfebce4ece814534225e123345c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 11 15:04:49 2011 -0600

    Added more columns to instance_types tables

 bin/nova-manage                                    |   41 ++++++++++++++---
 nova/compute/instance_types.py                     |   28 +++++++++---
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    4 +-
 nova/db/sqlalchemy/models.py                       |    3 ++
 nova/tests/test_nova_manage.py                     |   48 ++++++++++++++++----
 5 files changed, 101 insertions(+), 23 deletions(-)

commit 7bc6ea8911e95c33b685c8f9b9a0e649f1ebbe93
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Feb 11 22:02:05 2011 +0100

    Added LOG line to describe groups function to find out what's going

 nova/api/ec2/cloud.py |    2 ++
 1 file changed, 2 insertions(+)

commit d7042ae6bb37a3bff94d0e90535b92a92d7c94f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 11 11:30:56 2011 -0800

    joinedload network so describe_instances continues to work

 nova/db/sqlalchemy/api.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit df9bf23ecda1f32fd31ebffc6013e2f60f7fd3fa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 11 15:13:05 2011 -0400

    zone api tests passing

 nova/api/openstack/__init__.py         |    3 +-
 nova/api/openstack/zones.py            |    1 +
 nova/tests/api/openstack/test_zones.py |   81 ++++++++++++++++++++++++++++++--
 3 files changed, 78 insertions(+), 7 deletions(-)

commit c42ace8e605b987e683372efb4913d85ee472a70
Merge: d673602 c6ad6b5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 11 17:54:36 2011 +0000

    Create a new AMQP connection by default.

commit ae3f4a827a580b8905b6606c0d46668cc5c5459a
Merge: 42bd44d d673602
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 11:15:28 2011 -0600

    Merge from trunk

commit 42bd44db235ed2b2fb10e05d70de8d04b0fa869d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 11:14:51 2011 -0600

    First, not all

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24ad2cc21abbab494a3be18a7f09a6c1d9210804
Merge: 590f5f1 d673602
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Fri Feb 11 11:05:49 2011 -0500

    Merged to trunk and fixed merge conflict in Authors.

commit c230dba962a3db2a3a8bb502dfb33313f0ef274b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 11 11:25:55 2011 -0400

    rough cut at zone api tests

 nova/tests/api/openstack/test_zones.py |   74 ++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

commit e32a0131cfa0d7655545aca50559d9988e62142d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Feb 11 13:08:41 2011 +0000

    Following Rick and Jay's suggestions:
    - Fixed LOG.debug for translation
    - improved vm_utils.VM_Helper.ensure_free_mem

 nova/virt/xenapi/vm_utils.py |    7 +++----
 nova/virt/xenapi/vmops.py    |    7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

commit c6ad6b53230d1c3ca540a1dcdcd1f3ebf4f31f07
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 11 12:27:50 2011 +0100

    Create a new AMQP connection by default.

 nova/rpc.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit a36b67d192eb619963494896928efffef5dae4b6
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 18:35:10 2011 -0800

    after hours of tracking his prey, ken slowly crept behind the elusive wilderbeast test import hiding in the libvirt_conn.py bushes and gutted it with his steely blade

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8ac02818a514716fa4899d633831877a388239c0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 16:29:25 2011 -0800

    fixed destroy calls

 nova/compute/instance_types.py    |    7 +------
 nova/db/sqlalchemy/api.py         |   14 +++++++-------
 nova/tests/test_instance_types.py |    3 +--
 nova/tests/test_nova_manage.py    |   10 +++++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

commit 363371ddc6bbe008a536bda06da016385850a98a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 17:20:10 2011 -0600

    Forgot the metadata includes

 nova/db/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 57e58ba23c5c6a1af0f132385d3d9b9cc370b47d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 16:26:08 2011 -0600

    added get IPs by instance

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   11 +++++++++++
 2 files changed, 16 insertions(+)

commit 96640472934c4eba48c6ab0048ac5bcf3c192eb4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 15:25:26 2011 -0600

    added resetnetwork to the XenAPIPlugin.dispatch dict

 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 68b7ae27036e1a9b16ceb835c5dc6b934e3b964a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:06:27 2011 -0600

    Forgot the metadata includes

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 3fc68b805bb5326ef4fa2b8a51a58862ec23a6a4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:04:06 2011 -0600

    Forgot the metadata includes

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    1 +
 1 file changed, 1 insertion(+)

commit a70ac6609713f2b610923a7ae382208f4d46b74a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:01:38 2011 -0600

    Typo fixes and some stupidity about the models

 nova/api/openstack/servers.py                      |   11 +++++------
 nova/compute/manager.py                            |    2 +-
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    4 ++++
 nova/virt/xenapi/vmops.py                          |    2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

commit 87d0b5203610f1e0a7a2e09033c79071fabacaba
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 15:01:31 2011 -0600

    passing instance to reset_network instead of vm_ref, also not converting to an opaque ref before making plugin call

 nova/virt/xenapi/vmops.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit d6736026aa11a536d1c0f342d89bca063b43b3ff
Merge: ac7eb23 51b7eb9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 10 20:49:39 2011 +0000

    Define sql_idle_timeout flag to be an integer.
    
    This fixes bug706405 where MySQL Gone Away Errors were being generated.

commit b0c6190e0b098af4d808d993c6dcd0796cc80e83
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 14:18:16 2011 -0600

    forgot to add network_get_all_by_instance to db.api

 nova/db/api.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 389b548e332a496bcc74d637030f753c66add570
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 10 16:08:19 2011 -0400

    template adjusted to NOVA_TOOLS, zone db & os api layers added

 nova/api/openstack/zones.py  |   75 ++++++++++++++++++++++++++++++++++++++++++
 nova/auth/novarc.template    |    7 ++--
 nova/db/api.py               |   26 +++++++++++++--
 nova/db/sqlalchemy/api.py    |   41 +++++++++++++++++++++--
 nova/db/sqlalchemy/models.py |   11 ++++++-
 5 files changed, 149 insertions(+), 11 deletions(-)

commit a6ce3b777221690df17137e70d6b7bf35ad10b02
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 13:59:54 2011 -0600

    Spawn from disk

 nova/compute/manager.py   |    2 +-
 nova/virt/xenapi/vmops.py |   47 +++++++++++++++++++++++++--------------------
 nova/virt/xenapi_conn.py  |    4 ++--
 3 files changed, 29 insertions(+), 24 deletions(-)

commit d8a7a76cd4fd22a6ad9fc1a7b879a8dbffcede5f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 13:42:57 2011 -0600

    Some more cleanup

 nova/compute/manager.py                            |    7 ++++---
 nova/virt/xenapi/vmops.py                          |    3 ++-
 nova/virt/xenapi_conn.py                           |    5 +----
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |    3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

commit 51b7eb9fd9a56e58137c8be21ea002871bd65e30
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 10 19:40:21 2011 +0000

    sql_idle_timeout should be an integer

 nova/flags.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 106e3ad185f927af70879d47647ee3a26602d002
Merge: fd915e3 9029d89
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 11:24:58 2011 -0800

    merged model change: flavorid needs to unique in model

commit fd915e3db7f1006e67342b034eb8db0384c87d34
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 11:21:53 2011 -0800

    testing refactor

 bin/nova-manage                   |    2 +-
 nova/compute/instance_types.py    |    6 +++---
 nova/tests/test_instance_types.py |   10 ++++------
 nova/tests/test_nova_manage.py    |   32 ++++++++++++++++++++++----------
 4 files changed, 30 insertions(+), 20 deletions(-)

commit 9029d89d26b9115cad282c6f3f9ee11c47a28444
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 11:19:02 2011 -0800

    flavorid needs to unique in model

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ac7eb23c88437fa30f0ab256f53ba8a2df6e7965
Merge: ac0fb8f aff6381
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 18:34:50 2011 +0000

    Add forwarding rules for floating IPs to the OUTPUT chain on the network node in addition to the PREROUTING chain.

commit d601471f54de5db95cf06f4a558362f90cc65c6b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 10:28:52 2011 -0800

    typo

 nova/compute/api.py |    3 ---
 1 file changed, 3 deletions(-)

commit 493d4d73ce427a686a674e00a2090d5aaec55a46
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 10:20:33 2011 -0800

    refactored api call to use instance_types

 nova/compute/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ac0fb8fe22daae3dfadb38fc71a07377f12f3041
Merge: 8e97cdd d65d2e2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 17:59:47 2011 +0000

    Use a NullPool for sqlite connections.

commit 8e97cddde4dfed5b3d3fe5a985d6c9a4c6baf293
Merge: 5e66cf4 3f800a8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 16:19:34 2011 +0000

    Get a fresh connection in rpc.cast rather than using a recycled one.

commit 3f800a8ecde159cb34c5fe358da3aadce660a03a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 14:56:24 2011 +0100

    Make rpc.cast create a fresh amqp connection. Each API request has its own thread, and they don't multiplex well.

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d65d2e2d34bffa2548dabcde2e230da185125026
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 14:37:13 2011 +0100

    Only use NullPool when using sqlite.

 nova/db/sqlalchemy/session.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit aff63810b287fdbd0eb6b2e8881dcf6683ed7d91
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 14:31:51 2011 +0100

    Also add floating ip forwarding to OUTPUT chain.

 nova/network/linux_net.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 624bf51eebf1f589e31191b3e2b2cbdfbea25b42
Merge: 16ffc15 5e66cf4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 10 08:49:55 2011 -0400

    trunk merge

commit 16ffc15b1fb45a09de14cece6b382357a030b9dc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 10 08:43:46 2011 -0400

    removed ZoneCommands from nova-manage

 bin/nova-manage                |   10 ----------
 nova/api/openstack/__init__.py |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

commit 3e13d005c776b99604d1b8714a79709da1e76467
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 13:23:06 2011 +0100

    Try using NullPool instead of SingletonPool

 nova/db/sqlalchemy/session.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 648a26d2980b54edafbf0c924a96e6be0dfdb794
Merge: f6ec956 5e66cf4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 10 12:22:54 2011 +0000

    Merge from trunk

commit 1280c9e97b66b3914c3b7426ef6aeca57e6ff9e4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 12:49:52 2011 +0100

    Try setting isolation_level=immediate

 nova/db/sqlalchemy/session.py |    1 +
 1 file changed, 1 insertion(+)

commit 5e66cf492f150bfbd01e5983d876192c5b158343
Merge: 10626fc 216822b
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:   Thu Feb 10 10:39:29 2011 +0000

    This branch fixes bug #708347: RunInstances: Invalid instance type gives improper error message

commit 216822bdda290f964020134599749ebbadc76566
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:   Thu Feb 10 13:08:25 2011 +0300

    Wrap line to under 79 characters

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2e7fd058bf68e3d4c7699a29645423b4f30af812
Author: Launchpad Translations on behalf of nova-core <>
Date:   Thu Feb 10 05:13:45 2011 +0000

    Launchpad automatic translations update.

 locale/de.po |   43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

commit 4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Feb 9 21:54:52 2011 -0500

    adding myself to Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 2b7e2e8c1479fd2931ad6d99a9c1865976e44c21
Merge: 09f2c47 0351365
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Feb 10 11:39:24 2011 +0900

    1. Merged to rev654(?)
    2. Fixed bug continuous request.
       if user continuouslly send live-migration request to same host,
       concurrent request to iptables occurs, and iptables complains.
       This version add retry for this issue.
    
    NOTE: Dont use this version b/c cannot ping to instances.
    we know fixing linux_net.py works well for this issue,
    but hopefully rev655 change correct this..

commit 1a9225d945bdc9b94473c1dd4ad5b9e4b7624571
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 9 15:48:31 2011 -0800

    forgot to register new instance_types table

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5ed3abd0c689517db7a76e19c5b44fa4cc5d811f
Merge: ac33f61 10626fc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 16:40:29 2011 -0600

    Merge from trunk

commit ac33f61c5c382fc7c8e8ab872192858860672d70
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 16:38:27 2011 -0600

    Plugin tidying and more migration implementation

 nova/virt/xenapi/vm_utils.py                       |   16 +++--
 nova/virt/xenapi/vmops.py                          |   35 +++++++---
 nova/virt/xenapi_conn.py                           |    9 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 +-
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   67 +++++++++++++++++++-
 5 files changed, 108 insertions(+), 23 deletions(-)

commit cf2db4f18dbff14fb8882a4747c607ff26b1de55
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 9 13:58:43 2011 -0800

    fixed overlooked mandatory changes in Xen

 nova/virt/libvirt_conn.py    |    5 +++--
 nova/virt/xenapi/vm_utils.py |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 482c7b57a3d0ac8bf6df98539bf8a1220470e0f7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 15:27:23 2011 -0600

    Renamed migration plugin

 .../xenapi/etc/xapi.d/plugins/data_transfer        |   53 --------------------
 .../xenserver/xenapi/etc/xapi.d/plugins/migration  |   53 ++++++++++++++++++++
 2 files changed, 53 insertions(+), 53 deletions(-)

commit ce5e3bdd30712aa6704926e6cdeb5ae73ae8200b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 15:26:37 2011 -0600

    A lot of stuff

 nova/compute/manager.py                            |    8 +--
 nova/db/sqlalchemy/models.py                       |    1 +
 nova/virt/xenapi/vmops.py                          |   53 ++++++++++++++++----
 nova/virt/xenapi_conn.py                           |    8 ++-
 .../xenapi/etc/xapi.d/plugins/data_transfer        |   37 +++++++-------
 5 files changed, 71 insertions(+), 36 deletions(-)

commit 52e1ad5321590b7b4671349373217bc8fce275fc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Feb 9 15:55:29 2011 -0500

    - population of public and private addresses containers in openstack api
    - replacement of sqlalchemy model in instance stub with dict

 nova/api/openstack/servers.py            |   18 ++++++++
 nova/tests/api/openstack/test_servers.py |   66 ++++++++++++++++++++++++++++--
 2 files changed, 81 insertions(+), 3 deletions(-)

commit 10626fc89e0f842b095b7c5864bb91e762984fbc
Merge: 3c5f3a0 ef92175
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 9 20:49:25 2011 +0000

    Fixes the ordering of init_host commands so that iptables chains are created before they are used.
    
    This fixes an issue that arises if nova-network is started with flushed iptables after floating ips have been assigned.

commit 3c5f3a0a058d5a5241e0fbbe921bf9eaf23f97c8
Merge: 48a741c fef2b4e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 9 20:34:19 2011 +0000

    Pass timestamps to the db layer in fixed_ip_disassociate_all_by_timeout rather than converting to strings ahead of time, otherwise comparison between timestamps would often fail.

commit 48a741c7a353a128026d6f589b737c42402fc556
Merge: 7c78d71 b1fbb1a
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 19:39:32 2011 +0000

    Added support for 'SAN' style volumes.  A SAN's big difference is that the iSCSI target won't normally run on the same host as the volume service.

commit 99a02a7d68416c72675f7b6c554df9b682771e04
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 9 11:36:45 2011 -0800

    added support to pull list of ALL instance types even those that are marked deleted

 nova/compute/instance_types.py |   14 ++++++++------
 nova/db/api.py                 |    4 ++--
 nova/db/sqlalchemy/api.py      |    6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

commit b1fbb1a4a087722ce6dc7fd7a1b9fe01cb6ec766
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 11:25:18 2011 -0800

    Indent args to ssh_connect correctly

 nova/volume/san.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d4b4fa93e7603d73eb99c8edb0e648ff047cda30
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 11:18:48 2011 -0800

    Fix PEP8 violations

 nova/utils.py      |    1 +
 nova/volume/san.py |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

commit 590f5f1793c1f829101b4edbacbc79eac7acd2ef
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 9 13:36:16 2011 -0500

    Added myself to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 6e881239c9b8a1fb209868addf1a2b83042f2128
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 9 13:30:40 2011 -0500

    1) Moved tests for limiter to test_common.py (from __init__.py) and expanded
    test suite to include bad inputs and tests for custom limits (#2)
    
    2) Wrapped int() calls in blocks to ensure logic regardless of input.
    
    3) Moved 1000 hard limit hard-coding to a keyword param.
    
    4) Added comments as I went.

 nova/api/openstack/common.py            |   33 ++++---
 nova/tests/api/openstack/__init__.py    |   28 ------
 nova/tests/api/openstack/test_common.py |  161 +++++++++++++++++++++++++++++++
 3 files changed, 181 insertions(+), 41 deletions(-)

commit 636bf106d5fc0424b9045e79ea18fb74406e070c
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 09:49:59 2011 -0800

    Added my mail alias
    (Part of an experiment in using github, which got messy fast...)

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit 9a55136eb691de8d795ec47c5720556160899244
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 9 15:39:37 2011 +0000

    Fixed pep8 error in vm_utils.py

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96fbbcde9c84a72036a74ba07318f31a471eb402
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:   Wed Feb 9 17:24:36 2011 +0300

    Add my name to AUTHORS, remove parentheses from the substitution made in the previous commit

 Authors                        |    1 +
 nova/compute/instance_types.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit fef2b4edaaf77109457dc2bf80e7f845a65a129e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 9 13:22:10 2011 +0100

    Don't convert datetime objects to a string using .isoformat(). Leave it to sqlalchmeny (or pysqlite or whatever it is that does the magic) to work it out.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f6ec9568561dd430bd772f171f5bbddd0bd038c6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 9 10:08:15 2011 +0000

    Added test case for 'not enough memory'
    Successfully ran  unit tests
    Fixed pep8 errors

 nova/compute/manager.py      |    2 +-
 nova/compute/power_state.py  |    4 +++-
 nova/tests/test_xenapi.py    |   11 +++++++++--
 nova/virt/xenapi/fake.py     |    4 ++++
 nova/virt/xenapi/vm_utils.py |    4 ++--
 nova/virt/xenapi/vmops.py    |    7 ++++---
 6 files changed, 23 insertions(+), 9 deletions(-)

commit d5501234cfc434fbb4b959b63822598a1a68b88b
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:   Wed Feb 9 11:34:23 2011 +0300

    Give a better error message if the instance type specified is invalid.

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 129935dfa787c79f32b1e317e360bd05a3126319
Author: Launchpad Translations on behalf of nova-core <>
Date:   Wed Feb 9 05:41:14 2011 +0000

    Launchpad automatic translations update.

 locale/de.po | 2136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2136 insertions(+)

commit dd2544345e1686ee1ed020fd8f14607d10d8b3d1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 19:24:14 2011 -0800

    added testing for instance_types.py and refactored nova-manage to use instance_types.py instead of going directly to db.

 bin/nova-manage                   |   63 +++++++++++++++++-----------------
 nova/compute/instance_types.py    |   31 +++++++++++++----
 nova/db/sqlalchemy/api.py         |    9 +++--
 nova/tests/test_instance_types.py |   67 +++++++++++++++++++++++++++++++++++++
 nova/tests/test_nova_manage.py    |    4 +--
 5 files changed, 129 insertions(+), 45 deletions(-)

commit cf562efb7441a761fcebf0653e4a886655826a10
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 15:03:35 2011 -0800

    added create and delete methods to instance_types in preparation to call them from nova-manage

 nova/compute/instance_types.py |   39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

commit 2f5d8a25c99875838a08ed06728bcd9d68cdd7f1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 11:31:20 2011 -0800

    added testing for nova-manage instance_type

 nova/tests/test_nova_manage.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit ffc788fb41bf5a4bcb85cfa80b3437ed94d46291
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 11:24:05 2011 -0800

    additional error checking for nova-manage instance_type

 bin/nova-manage           |   57 ++++++++++++++++++++++++++++-----------------
 nova/db/sqlalchemy/api.py |   26 +++++++++++++++------
 2 files changed, 54 insertions(+), 29 deletions(-)

commit 089286802db0dca22cd67e46f26fab3ab0a3a73b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 13:12:21 2011 -0600

    Typos and primary keys

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 7c78d71eba66b64f2a2cac0309dcd01f2acf8b4d
Merge: 0351365 6f30cff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 8 19:09:42 2011 +0000

    Automates the setup for FlatDHCP regardless of whether the interface has an ip address.
    
    FlatDHCP only has worked until now if the underlying interface that you bridge into has no ip address.  This branch will do the necessary setup to allow it to work by:
    
    * Creating a bridge with the private address for dhcp
    * Moving any existing ips from the interface onto the bridge
    * Adding the interface to the bridge
    * Recreating the default route if it was deleted by moving the interface
    
    It will additionally add a route to compute hosts for bridges that it adds to the compute hosts.  This seems to be necessary in some cases where the default route uses a different interface.

commit 6f30cff7374e91c2920759e13971c0149d96d821
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 8 10:54:29 2011 -0800

    add docstring and revert set_ip changes as they are unnecessary

 nova/network/linux_net.py |   21 ++++++++++++++++-----
 nova/network/manager.py   |   10 ++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

commit 39f2ec9ba1b9f589d665b25551307cccf66a35ca
Merge: 49e07d0 0351365
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 11:07:55 2011 -0600

    Merge from trunk

commit 49e07d0581317daf1bb605d56575c62743a210be
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 11:07:03 2011 -0600

    Commas help

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 3f2cd17011e17991ebf1a77605686ce3dc48d92e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 10:47:23 2011 -0600

    Changes and bug fixes

 nova/compute/manager.py                            |    8 ++--
 nova/db/sqlalchemy/api.py                          |    6 +--
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   46 ++++++++++++++++++++
 nova/db/sqlalchemy/migration.py                    |    2 +-
 nova/virt/xenapi/vmops.py                          |    2 +-
 5 files changed, 54 insertions(+), 10 deletions(-)

commit 653ff11692fa5cd5ec5f9ea75cddc03df1b3dcd5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Feb 8 16:39:46 2011 +0000

    avoiding HOST_UNAVAILABLE exception: if there is not enough free memory does not spawn the VM at all.
    instance state is set to "SHUTDOWN"

 nova/virt/xenapi/vm_utils.py |   11 +++++++++++
 nova/virt/xenapi/vmops.py    |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 39ffe46a749ad8f4a390f8e4c36c871845af2fc0
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Feb 8 10:48:55 2011 +0000

    merge lp:nova at revision #654

commit fa97b4a0214446854cba3310b3a6b5a327e4b028
Merge: a524358 0351365
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Feb 8 10:39:27 2011 +0000

    merge with lp:nova

commit 2ecd9de1a0b26cd7168a008f44caad47ecb49c01
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Feb 8 10:14:51 2011 +0000

    Fixed pep8 errors
    Unit tests passed

 nova/virt/xenapi/vm_utils.py                       |    9 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent  |    7 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   63 +++++++++++---------
 .../xenapi/etc/xapi.d/plugins/objectstore          |   46 +++++++-------
 4 files changed, 70 insertions(+), 55 deletions(-)

commit 937e260fa631d2aa39b59c00dbc4d50a9ba8af85
Merge: 976420e 0351365
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 7 22:15:02 2011 -0800

    merge source and remove ifconfig

commit 035136525ef7944d3da4dcf8a4b0d28840bdfae3
Merge: 71c0060 e12069f
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Feb 8 06:07:05 2011 +0000

    fixes #713766 and probably #710959, please test the patch before committing it.

commit 976420e608140e449db5748e57cb18fab74b6d43
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 7 22:05:45 2011 -0800

    use route -n instead of route to avoid chopped names

 nova/network/linux_net.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 71c00607bdd62f1efb1ac13a3ba8cc89cb26ec0a
Merge: 4222e51 a6b913d
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Feb 8 06:04:27 2011 +0000

    Updates to the multinode install doc based on Wayne's findings. Merged with trunk so should easily merge in.

commit 4222e516f45a550cb8df245e71e4d4aef2a985b3
Merge: 0eb27a6 1532171
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Feb 8 05:58:51 2011 +0000

    Checks whether the instance id is a list or not before assignment. This is to fix a bug relating to nova/boto. The AWK-SDK libraries pass in a string, not a list. The euca tools pass in a list.

commit 25f96558743a0dd10dfa82d1e5f463c0ed5ccfaa
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Feb 8 05:28:14 2011 +0000

    Launchpad automatic translations update.

 locale/cs.po |   51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

commit 0eb27a6805f5da4edb8a57a6953021c732a0b1c7
Merge: 5a2e8b2 a51d187
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Feb 8 04:18:38 2011 +0000

    Catching all socket errors in _get_my_ip, since any socket error is likely enough to cause a failure in detection.

commit a51d187128def4f44ad06cd0880a3e3b4518e073
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Feb 8 01:00:00 2011 +0000

    Catching all socket errors in _get_my_ip, since any socket error is likely enough to cause a failure in detection.

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 203c94c89caabc1d4ece4c462819a90c05cde163
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 17:39:53 2011 -0600

    blargh

 nova/compute/api.py                                |    2 +-
 nova/virt/xenapi/vmops.py                          |    8 ++++++++
 nova/virt/xenapi_conn.py                           |    2 +-
 .../xenapi/etc/xapi.d/plugins/data_transfer        |    6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

commit a40f6041556ec09a1cb79c2b8abcec7fa70e72bf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 17:12:15 2011 -0600

    Some stuff

 nova/virt/xenapi_conn.py                           |    2 +-
 .../xenapi/etc/xapi.d/plugins/data_transfer        |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

commit bb2a379e2827ceccc5b46b0a9936e6dcedc6499e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 7 15:04:26 2011 -0800

    added INSTANCE_TYPES to test for compatibility with current tests

 nova/compute/instance_types.py |   12 ++++++------
 nova/test.py                   |    8 ++++++++
 nova/tests/db/fakes.py         |    6 ++----
 nova/tests/test_quota.py       |    9 +++------
 nova/tests/test_xenapi.py      |    3 +--
 nova/virt/libvirt_conn.py      |    7 +++----
 nova/virt/xenapi/vm_utils.py   |    4 ++--
 7 files changed, 25 insertions(+), 24 deletions(-)

commit 15321719332a5b782ba5ac66d85db0eccc98ccba
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Feb 7 23:01:57 2011 +0000

    Checking whether the instance id is a list or not before assignment. This is to fix a bug relating to nova/boto. The AWK-SDK libraries pass in a string, not a list. the euca tools pass in a list.

 nova/api/ec2/cloud.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 4c50ddee48971c76f0f6252295747b89de5d3697
Merge: c02a587 5a2e8b2
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Feb 7 22:59:55 2011 +0000

    Merge from trunk

commit e59c62efe5492e59fcc26b7b74f6ac2daa0caabe
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 16:57:02 2011 -0600

    Added data_transfer xapi plugin

 nova/virt/xenapi_conn.py                           |    2 +-
 .../xenapi/etc/xapi.d/plugins/data_transfer        |   44 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

commit a6b913dfd1d940cbf435cb9d9c5c6e2716cf5c2a
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 7 16:35:03 2011 -0600

    Another quick fix to multinode install doc

 doc/source/adminguide/multi.node.install.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2613d6449fa9f07c5ee1627a3c44895071fb1a59
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 7 16:32:04 2011 -0600

    Made updates to multinode install doc

 doc/source/adminguide/multi.node.install.rst |   38 ++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

commit 346087804dd923bcaa0faf433dc1f83a2f193815
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 7 13:32:25 2011 -0800

    fixed instance_types methods to use database backend

 nova/compute/instance_types.py |   37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

commit 5a5e96ae90187e1ebfe93262df47ec2c4be23ef1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 7 13:00:39 2011 -0800

    require user context for most flavor/instance_type read calls

 nova/db/sqlalchemy/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit b6022c1f7d7dc9294f6b1b613c7e99bd9437a72e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 7 13:43:23 2011 -0600

    added network_get_all_by_instance(), call to reset_network in vmops

 nova/db/sqlalchemy/api.py |   19 +++++++++++++------
 nova/virt/xenapi/vmops.py |   11 +++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

commit 5a2e8b2b6571636b2cf9ddc36a4c509fedde9b93
Merge: 40715cf e62665a
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 19:14:03 2011 +0000

    added new parameter --dhcp_domain to set the used domain by dnsmasq in /etc/nova/nova.conf

commit 41e615b843c284631a0d878db2c93ef97f2eb4b8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 7 14:46:54 2011 -0400

    minor

 nova/api/openstack/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 93d6050078214945fd2c842a15fb177f24811fa1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 7 17:06:30 2011 +0000

    Fix for bug #714709

 nova/virt/xenapi/vm_utils.py                       |    5 +++++
 nova/virt/xenapi/vmops.py                          |   19 +++++++++++++++++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   14 ++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

commit 2458d674807d951a6b58c28cd334cd8d097822a9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 10:20:49 2011 -0600

    A few changes

 nova/compute/manager.py |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

commit e62665a12e0b02ef73562a5d579782972332cbe1
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 15:20:16 2011 +0100

    fixed format according to PEP8

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e12069f79cbf35215eeba5257b2394e9ebde5855
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 14:29:11 2011 +0100

    replaced all calls to ifconfig with calls to ip

 nova/network/linux_net.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit 26f2f38ef217676292c6cd151664a91fb6c9fd24
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 11:57:12 2011 +0100

    added myself to the Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 1833ed67ffde756ac1bf1aadbc164a22f7a9b005
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 10:51:43 2011 +0100

    applied http://launchpadlibrarian.net/63698868/713434.patch

 nova/network/linux_net.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 96ea3dd3db826440a7b52d32fa1663c17aa8394e
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Feb 7 05:52:49 2011 +0000

    Launchpad automatic translations update.

 locale/cs.po | 2130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2130 insertions(+)

commit ea5ba79802321bb25f03dfb24fd7fb01866d9921
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Feb 6 13:48:03 2011 -0800

    aliased flavor to instance_types in nova-manage. will probably need to make flavor a full fledged class as users will want to list flavors by flavor name

 bin/nova-manage                |    5 +++--
 nova/tests/test_nova_manage.py |    9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

commit 7dcdbcc546248c3384bd15975a721413e1d1f507
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Feb 6 13:28:07 2011 -0800

    simplified instance_types db calls to return entire row - we may need these extra columns for some features and there seems to be little downside in including them. still need to fix testing calls.

 bin/nova-manage                          |   10 +++++---
 nova/api/ec2/admin.py                    |    5 ++--
 nova/api/openstack/flavors.py            |   10 ++++----
 nova/compute/api.py                      |    2 +-
 nova/db/sqlalchemy/api.py                |   41 ++++++++----------------------
 nova/tests/api/openstack/test_flavors.py |   22 ----------------
 nova/tests/db/fakes.py                   |    2 +-
 7 files changed, 28 insertions(+), 64 deletions(-)

commit ea5271ed69d72dcab8189c3bfc66220c7ff60862
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Feb 6 10:56:05 2011 -0800

    refactor to remove ugly code in flavors

 nova/api/openstack/flavors.py |    9 ++++-----
 nova/tests/db/fakes.py        |    2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 555e5b5a0d3ae30f5d8b77d6b2dc47a953b4a81b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:54:56 2011 -0800

    updated api.create to use instance_type table

 nova/compute/api.py       |    7 +++----
 nova/db/sqlalchemy/api.py |    2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 2acc31a293b067644f26877dc52bacb7ef9e9bd1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:28:26 2011 -0800

    added preliminary testing for bin/nova-manage
    while i am somewhat conflicted about the path these tests have taken,
    i think it is better than no tests at all

 nova/tests/test_nova_manage.py |   72 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

commit 12a9db3e767b6b88fac5ad1d16c0aef39c4a801f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:27:51 2011 -0800

    rewrote nova-manage instance_type to use correct db.api returned objects and have more robust error handling

 bin/nova-manage |   47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

commit d5a5324fee480152fd4e77f19fce5b025e1b4987
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:26:53 2011 -0800

    instance_types should return in predicatable order (by name currently)

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 5cd5d4e9682848cba60a8dec352fe0f74aaa9eac
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:23:01 2011 -0800

    flavorid and name need to be unique in the database for the ec2 and openstack apis, repectively

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit fcd0a7b245470054718c94adf0da6a528a01f173
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 13:49:38 2011 -0800

    corrected db.instance_types to return expect dict instead of lists. updated openstack flavors to expect dicts instead of lists. added deleted column to returned dict.

 bin/nova-manage                          |    5 ++--
 nova/api/openstack/flavors.py            |   12 +++++----
 nova/db/sqlalchemy/api.py                |   42 ++++++++++++++++++++++++++----
 nova/tests/api/openstack/test_flavors.py |    5 ++--
 4 files changed, 49 insertions(+), 15 deletions(-)

commit 79ea4533df3bd8c58b96177c2979fab2987a842a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 02:45:53 2011 -0800

    converted openstack flavors over to use instance_types table. a few pep changes.

 bin/nova-manage                                    |    5 ++---
 nova/api/openstack/flavors.py                      |   22 +++++++++++++-------
 nova/db/api.py                                     |    5 +++++
 nova/db/sqlalchemy/api.py                          |    7 +++++++
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    4 ++--
 5 files changed, 30 insertions(+), 13 deletions(-)

commit 25a5afbb783e28bd5303853bf09e4b254c938302
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 01:14:45 2011 -0800

    added FIXME(kpepple) comments for all constant usage of INSTANCE_TYPES. updated api/ec2/admin.py to use the new instance_types db table

 bin/nova-manage                                    |   11 ++++++-----
 nova/api/ec2/admin.py                              |   19 ++++++++++++++-----
 nova/api/openstack/flavors.py                      |    4 ++--
 nova/compute/api.py                                |    3 ++-
 nova/compute/instance_types.py                     |    8 ++++----
 nova/db/api.py                                     |    5 ++++-
 nova/db/sqlalchemy/api.py                          |    9 ++++++---
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    2 +-
 nova/tests/api/openstack/test_flavors.py           |   18 ++++++++++++------
 nova/tests/db/fakes.py                             |    2 +-
 nova/tests/test_quota.py                           |    6 +++---
 nova/tests/test_xenapi.py                          |    2 +-
 nova/virt/libvirt_conn.py                          |    4 ++--
 nova/virt/xenapi/vm_utils.py                       |    2 +-
 14 files changed, 59 insertions(+), 36 deletions(-)

commit e283bd21babc245f691e3ca394c5c2b2484a4022
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Feb 5 05:36:48 2011 +0000

    Launchpad automatic translations update.

 locale/ast.po   |    2 +-
 locale/da.po    |    2 +-
 locale/es.po    |    2 +-
 locale/it.po    |    2 +-
 locale/ja.po    |    2 +-
 locale/pt_BR.po |    2 +-
 locale/ru.po    |    2 +-
 locale/uk.po    |    2 +-
 locale/zh_CN.po |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

commit d86f1af6326d4276e9cbfb3274c211ff3f5629cb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 4 17:03:37 2011 -0800

    allow for bridge to be the public interface

 nova/network/linux_net.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 645f4733081dfe03554cc30221ccc1a8b359d1ea
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 16:20:24 2011 -0600

    Removed (newly) unused exception variables

 nova/compute/api.py    |    4 ++--
 nova/volume/manager.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 855b9443cf109302e9882d527f237049b9624a05
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 4 15:43:41 2011 -0600

    Didn't mean to actually make changes to the glance plugin

 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ----
 1 file changed, 4 deletions(-)

commit 48dcaa60e6d5e1b1874f732e27abac8aeb618f4b
Merge: b65e994 40715cf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 4 15:15:23 2011 -0600

    Merge from trunk

commit b65e994d9597f0a989b30eafc7a51bc34c4c361f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 4 15:13:18 2011 -0600

    Added a bunch of stubbed out functionality

 nova/compute/api.py                                |   22 ++++---
 nova/compute/manager.py                            |   65 +++++++++++++++++---
 nova/db/api.py                                     |   22 ++++++-
 nova/db/sqlalchemy/api.py                          |   53 ++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   12 +++-
 nova/virt/xenapi/vmops.py                          |   18 +++++-
 nova/virt/xenapi_conn.py                           |   11 ++++
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    4 ++
 8 files changed, 187 insertions(+), 20 deletions(-)

commit 0753b724b91cdaf6f9e59be276e60008dd72b05c
Merge: 62d2a1a 5315d50
Author: SuperStack <justin@fathomdb.com>
Date:   Fri Feb 4 13:12:43 2011 -0600

    Moved ssh_execute to utils; moved comments to docstring

commit 5315d5068c6250ccf71c1aa67e7e0109a0718f2a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 13:07:17 2011 -0600

    Fixes for Vish & Devin's feedback

 nova/utils.py      |   35 ++++++++++++++++++++++++
 nova/volume/san.py |   77 ++++++++++++----------------------------------------
 2 files changed, 53 insertions(+), 59 deletions(-)

commit 40715cfde9f20ede97b696c3c3ebbbf67aaa8243
Merge: 7783105 c852a4d
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Feb 4 17:49:30 2011 +0000

    Fixes https://bugs.launchpad.net/nova/+bug/681417

commit 3cae5a2573c96900f224d0145cee5077b01424b5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 11:36:09 2011 -0600

    Don't swallow exception stack traces by doing 'raise e'; just use 'raise'

 nova/compute/api.py    |    4 ++--
 nova/volume/manager.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 62d2a1a101dc97e80cb0a582197a6b7468abf593
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 11:04:55 2011 -0600

    Implementation of 'SAN' volumes
    A SAN volume is 'special' because the volume service probably won't run on the iSCSI target.
    Initial support is for Solaris with COMSTAR (Solaris 11)

 nova/volume/driver.py  |   10 +-
 nova/volume/manager.py |    2 +-
 nova/volume/san.py     |  373 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 379 insertions(+), 6 deletions(-)

commit c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3
Merge: e35ca46 7783105
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Feb 4 11:48:45 2011 +0100

    merging

commit e35ca46173a5f3bf2d1460c19249fd0bf9f5b538
Merge: 3ad2221 5e4259c
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Feb 4 11:26:28 2011 +0100

    Fixed PEP8 test problems, complaining about too many blank lines at line 51

commit 7783105dbbfa5c6e6d1ab9cc965929d1c4cc4eef
Merge: f5c1ef8 f3652fd
Author: termie <code@term.ie>
Date:   Fri Feb 4 06:59:15 2011 +0000

    Adds logging.basicConfig() to run_tests.py so that attempting to log debug messages from tests will work.

commit 60891ed6f3a978ce77575e8710b695aa9828adcc
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Feb 4 05:31:40 2011 +0000

    Launchpad automatic translations update.

 locale/ast.po   |    2 +-
 locale/da.po    |    2 +-
 locale/es.po    |    2 +-
 locale/it.po    |    2 +-
 locale/ja.po    |    2 +-
 locale/pt_BR.po |   16 ++++++++--------
 locale/ru.po    |    2 +-
 locale/uk.po    |   25 +++++++++++++++----------
 locale/zh_CN.po |    2 +-
 9 files changed, 30 insertions(+), 25 deletions(-)

commit 9be0770208b0e75c7d93ba10165b82d5be11be27
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 3 17:57:46 2011 -0800

    flagged all INSTANCE_TYPES usage with FIXME comment. Added basic usage to nova-manage (needs formatting). created api methods.

 bin/nova-manage                          |   39 +++++++++++-------------------
 nova/api/ec2/admin.py                    |    1 +
 nova/api/openstack/flavors.py            |    2 ++
 nova/compute/api.py                      |    2 ++
 nova/compute/instance_types.py           |   17 +++----------
 nova/db/api.py                           |   20 +++++++++++++++
 nova/db/sqlalchemy/api.py                |   31 ++++++++++++++++++++++++
 nova/db/sqlalchemy/models.py             |    1 +
 nova/tests/api/openstack/test_flavors.py |   30 ++++++++++++++---------
 nova/tests/db/fakes.py                   |    1 +
 nova/tests/test_quota.py                 |    3 +++
 nova/tests/test_xenapi.py                |    1 +
 nova/virt/libvirt_conn.py                |    2 ++
 nova/virt/xenapi/vm_utils.py             |    1 +
 14 files changed, 102 insertions(+), 49 deletions(-)

commit 563a77fd4aa80da9bddac5cf7f8f27ed2dedb39d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 3 17:52:19 2011 -0800

    added seed data to migration

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   53 +++++++++++---------
 1 file changed, 30 insertions(+), 23 deletions(-)

commit 321f581660aad3fc9da5f88276bfdf11f6960d97
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 3 13:10:19 2011 -0800

    Don't need a route for guests. Turns out the issue with routing from the guests was due to duplicate macs

 nova/network/linux_net.py |    8 --------
 1 file changed, 8 deletions(-)

commit f5c1ef877290e4bead7d2ac9add96a6471f4b40d
Merge: 0d0f6e8 86b96d3
Author: termie <code@term.ie>
Date:   Thu Feb 3 20:29:16 2011 +0000

    Changes the behavior of run_test.sh so that pep8 is only run in the default case (when running all tests). It will no longer run when individual test cases are being given as in:
    
    ./run_tests.sh nova.tests.test_compute

commit 0d0f6e850a2f7fc575eaf7aab6f9468132133852
Merge: 75e052e 10657ad
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 3 15:54:38 2011 +0000

    open cactus

commit 4b121d03b27fd2ab3e5a2df0833ff8dfae5dfad3
Author: termie <code@term.ie>
Date:   Wed Feb 2 13:13:10 2011 -0800

    some updates to HACKING to describe the docstrings

 HACKING |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit f300958eed8f3ddd65ccd2330fb38d30e900d7d2
Merge: 6d2e2c5 75e052e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 2 11:38:22 2011 -0600

    Merge from trunk

commit 6d2e2c52012abac8cab322357ce0ffd0ffc2fbaf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 2 10:49:02 2011 -0600

    Casting to the scheduler

 nova/compute/api.py |   10 +++++++---
 nova/rpc.py         |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

commit ef9217548b1ae74d3e4f7282d26e0d9fee5470ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 2 08:15:57 2011 -0800

    moves driver.init_host into the base class so it happens before floating forwards and sets up proper iptables chains

 nova/network/manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 75e052e2c0bb7f470b959ea1a6168a6c5cddd8fd
Merge: e031151 c98a298
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:18:00 2011 +0000

    Set FINAL = True in version.py.

commit 10657adef2028926319fa5c0402f434187213263
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:23:08 2011 +0100

    Open Cactus development.

 nova/version.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c98a298c3aefb1f465530537ee4773bd04673fe4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:16:00 2011 +0100

    Set FINAL = True in version.py.

 nova/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d647a067acb884ff2c324afa5a962a8dae71c6c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 1 19:31:43 2011 -0800

    pass the set_ip from ensure_vlan_bridge

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 08794dba04c3919f9abbbfea1615b651394e5ee8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 1 18:42:12 2011 -0800

    don't fail on ip add exists and recreate default route on ip move if needed

 nova/network/linux_net.py |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit a776844e38c7e747397785a6ce6b1de1b043d850
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 1 18:34:46 2011 -0800

    initial support for dynamic instance_types: db migration and model, stub tests and stub methods.

 bin/nova-manage                                    |   41 ++++++++++-
 nova/compute/instance_types.py                     |   12 ++++
 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   76 ++++++++++++++++++++
 nova/db/sqlalchemy/models.py                       |   10 +++
 nova/tests/api/openstack/test_flavors.py           |   10 +++
 5 files changed, 148 insertions(+), 1 deletion(-)

commit 48a0e252be8b001705db98de8143e1c1ad6294ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 1 17:55:14 2011 -0800

    better setup for flatdhcp

 nova/network/linux_net.py |   40 +++++++++++++++++++++++++++++++++-------
 nova/network/manager.py   |   10 ++++++----
 2 files changed, 39 insertions(+), 11 deletions(-)

commit 0e6b1c02b3ae82526f3cf83ce70213e7a107701d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 1 15:41:53 2011 -0600

    added to inject networking data into the xenstore

 nova/virt/xenapi/vmops.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 620eba09a96f25a059249c23a5e73efd18aaf89a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 1 14:11:21 2011 -0600

    forgot context param for network_get_all

 nova/virt/xenapi/vmops.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit e0311518a6bed3495e3bb22cc04d3e43838753be
Merge: 256186d ccd10fe
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 1 19:14:29 2011 +0000

    Fixes bug #709057
    
    * Mark security_group_instance_associations as deleted when instance deleted
    * Mark security_group_instance_associations as deleted when security_group deleted
    * Make SecurityGroup.instances mapping properly ignore deleted security_group_instance_associations
    * Add tests
    
    IMO, this is important to merge.  Nebula has monitoring projects that continually launch and destroy instances, and I imagine other real-world deployments may have similar health checkers.  After a few weeks such health checkers choke due to the inefficient queries related to #709057.

commit ce219ae1adc4b5bd761f4efe068ea5c4c494c0dc
Merge: d552158 256186d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 1 12:33:24 2011 -0500

    Merge trunk.

commit d552158b19bf1652da795e1681c9dc904bdc425b
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 1 12:32:58 2011 -0500

    Add and document the provider_fw method in virt/FakeConnection.

 nova/virt/fake.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 256186ddbb1474d2396b8fa81a3bb16713d589a4
Merge: 672fa32 cf5e4de
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Feb 1 17:14:39 2011 +0000

    Fix for LP Bug #709510

commit ccd10fec118adf2025d36bd4d5d9e4e75a7ddc8a
Merge: 199e511 256186d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 1 08:10:42 2011 -0800

    merge trunk

commit 199e511e17af5e1a0659cc9ca65e9d55a5296947
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 1 08:09:34 2011 -0800

    fix pep8 error :/

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 672fa32dd2c419bb6040c5e16cae83f5eccaf7c6
Merge: ad6300d 5850b15
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Feb 1 09:44:15 2011 +0000

    Changed default handler for uncaughted exceptions. It uses logging instead print to stderr.

commit c021c985660aa37861b6c01bba9db914f349d13d
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Feb 1 05:19:59 2011 +0000

    Launchpad automatic translations update.

 locale/ru.po |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit 7b8ddb4e00c7b592697a2db521a8655d84ca0356
Merge: a83c914 ad6300d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Jan 31 17:05:54 2011 -0600

    Merge from trunk

commit e4356ceab8b2627dda0b02c7ebbba6d033129360
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 31 14:43:33 2011 -0800

    rpartition sticks the rhs in [2]

 nova/network/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf5e4de7019091ee931ea911d69732c25a2cc1dd
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jan 31 14:43:03 2011 -0800

    Fix for LP Bug #709510

 nova/api/openstack/__init__.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 85fe11e11a6332f95a9dac300994e77e7e48dfec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 31 14:38:45 2011 -0800

    change ensure_bridge so it doesn't overwrite existing ips

 nova/network/linux_net.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit b1caafa03d0fb36c9df5502282c4267974d1b889
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jan 31 14:36:40 2011 -0800

    Fix for LP Bug #709510

 nova/api/ec2/__init__.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit ad6300d279cfd87061ef4cef5f1a9e96aaac2f42
Merge: 1cd4dfe 54779a3
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Jan 31 21:29:22 2011 +0000

    Enabled modification of projects using the EC2 admin API.

commit d47886e16504cc92d0f9b33e02417229970d3efb
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 31 16:02:29 2011 -0500

    Reorder insance rules for provider rules immediately after base, before secgroups.

 nova/virt/libvirt_conn.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 7ee26753b06dcf49867796fcadfa6f430bc46578
Merge: ece7d2f 1cd4dfe
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 31 15:29:24 2011 -0500

    Merge trunk and make work with provider fw rules (setup alongside basic_rules).

commit 87932046edbc01f99460c1745e8ea6dd4590955a
Merge: 1344211 1cd4dfe
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 31 09:23:57 2011 -0600

    Merged trunk

commit 1cd4dfe34acaec06c96925c7903a9d8dc25fe34f
Merge: 8fbfae5 07698fa
Author: termie <code@term.ie>
Date:   Mon Jan 31 10:04:40 2011 +0000

    Match the initial db version to the actual Austin release db schema.
    
    Fixes: https://bugs.launchpad.net/nova/+bug/709183
    
    Tested by copying nova/tests/db/nova.austin.sqlite to ./nova.sqlite and running ./bin/nova-manage db sync

commit 09f2c4729456443c4874a8cadc53299817d6371a
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jan 31 18:41:10 2011 +0900

    1. Discard nova-manage host list
    Reason: nova-manage service list can be replacement.
    Changes: nova-manage
    
    
    2. Fix resource checking inappropriate design.
    Reason:
        nova.scheduler.driver.has_enough_resource has inappropriate design,
        so fix it. This method didnt check free memory but check total memory.
        We need to register free memory onto databases(periodically).
    
        But periodically updating may causes flooding request to db in case of
        many compute-node. Currently, since memory information is only used in
        this feature, we take the choice that administrators manually has to
        execute nova-manage to let compute node update their own memory information.
    
    Changes:
        nova.db.sqlalchemy.models
            - Adding memory_mb_used, local_gb_used, vcpu_used column to Service.
              (local_gb and vcpu is just for reference to admins for now)
    
        nova.compute.manager
            - Changing nova.compute.manager.update_service
              Service table column is changed, so updating method must be changed.
            - Adding nova.compute.manager.update_available_resource
              a responder to  admin's request to let compute nodes update their
              memory infomation
    
        nova.virt.libvirt_conn
        nova.virt.xenapi_conn
        nova.virt.fake
            - Adding getter method for memory_mb_used/local_gb_used/vcpu_used.
    
        nova-manage
            - request method to let compute nodes update their own memory info.

 bin/nova-manage              |   92 +++++++++++-----------
 nova/compute/manager.py      |   54 ++++++++++++-
 nova/db/sqlalchemy/models.py |    5 +-
 nova/rpc.py                  |    3 +
 nova/scheduler/driver.py     |   67 +++++++++++-----
 nova/scheduler/manager.py    |   11 ++-
 nova/tests/test_compute.py   |   55 +++++++++++--
 nova/tests/test_scheduler.py |  175 +++++++++++++++++++++++++-----------------
 nova/tests/test_virt.py      |   86 ++++++++++++++++++++-
 nova/utils.py                |   18 +++++
 nova/virt/fake.py            |   22 ++++--
 nova/virt/libvirt_conn.py    |   37 +++++++--
 nova/virt/xenapi_conn.py     |   22 ++++--
 13 files changed, 476 insertions(+), 171 deletions(-)

commit 86b96d377cb5f0cbaccf40fc87f2c1ad64ae05e1
Author: termie <code@term.ie>
Date:   Sun Jan 30 21:55:32 2011 -0800

    Only run pep8 after tests if running all the tests

 run_tests.sh |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit f3652fd4814eb5d9df851422aa946f283263fd07
Author: termie <code@term.ie>
Date:   Sun Jan 30 21:38:58 2011 -0800

    add logging.basicConfig() to tests

 run_tests.py |    3 +++
 1 file changed, 3 insertions(+)

commit 07698fa5826ad65553d0c86594098ad5b980dc8a
Author: termie <code@term.ie>
Date:   Sun Jan 30 17:01:49 2011 -0800

    fix austin->bexar db migration

 .../sqlalchemy/migrate_repo/versions/001_austin.py |   24 ++++----------------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |   24 +++++++++++++++++++-
 nova/db/sqlalchemy/migration.py                    |   11 +++++----
 nova/tests/db/nova.austin.sqlite                   |  Bin 0 -> 44032 bytes
 4 files changed, 35 insertions(+), 24 deletions(-)

commit 701c71999a135996575dd76a7171eb707b4d74ef
Author: termie <code@term.ie>
Date:   Sun Jan 30 16:04:52 2011 -0800

    woops

 nova/context.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f76a0a9d4d8aa3d8cc2669da1a8eea7d610a8616
Author: termie <code@term.ie>
Date:   Sun Jan 30 15:55:48 2011 -0800

    trivial cleanup for context.py

 nova/context.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 8fbfae5065c07a4c0258585ab19c838fc87b0913
Merge: 396b02f 6ed93f6
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Jan 30 23:54:16 2011 +0000

    Made adminclient get_user return None instead of throwing EC2Exception if requested user not available.
    
    This change is isolated to the adminclient code itself and has no ramifications on the nova server codebase.
    
    This bug severely impacts automated deployments of django-nova and the openstack-dashboard, which are scheduled for formal release next week, so I'd really like to see this simple patch make it in for bexar release.

commit 6ed93f6116ed092e64ceef9a255b46167099bfc3
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Jan 30 15:45:17 2011 -0800

    pep8

 nova/adminclient.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 54779a3db8af199f4b72043aa7c1bed208fefd88
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jan 28 22:40:41 2011 -0800

    Added modify project to ec2 admin api

 nova/adminclient.py   |    7 +++++++
 nova/api/ec2/admin.py |   11 +++++++++++
 2 files changed, 18 insertions(+)

commit 5becf2ad3dbbb7074202406fdd6f7f05dfef53cc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jan 28 15:31:23 2011 -0800

    incorporate feedback from devin - use sql consistently in instance_destroy
    also, set deleted_at

 nova/db/sqlalchemy/api.py |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit a83c914a563f284672514118ef02c41e60f0025a
Merge: 6b0601c 396b02f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Jan 28 15:39:08 2011 -0600

    Merge from trunk

commit a1a1ee16992c0292de18828cd9bfc93d9bc6c1cc
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jan 28 12:37:19 2011 -0800

    Fixed whitespace

 nova/adminclient.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3f3f169d6b9cdf0b0d4dca308dbded38bf9a87b9
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jan 28 12:32:21 2011 -0800

    Made adminclient get_user return None instead of throwing EC2Exception if requested user not available

 nova/adminclient.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 46456155d42dd8a668b370fa84972c388094e1d8
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 28 18:40:19 2011 +0000

    OS-55: Fix typo for libvirt_conn operation

 nova/virt/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3478f843609f25300b29352650050b33fdd7d6db
Merge: 2993160 396b02f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jan 28 09:57:13 2011 -0800

    merge trunk

commit 29931605602e0eba562f870cd14cb6f16d3a215d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jan 28 09:55:58 2011 -0800

    remove extraneous line

 nova/tests/test_compute.py |    3 ---
 1 file changed, 3 deletions(-)

commit 5850b1505cbd9e63418d9edaf003d3bd426279a2
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jan 28 20:46:46 2011 +0300

    Fixed pep8 errors

 nova/log.py |    2 ++
 1 file changed, 2 insertions(+)

commit af343a09b66ecded610051a443cb24f6b63e48ec
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jan 28 20:10:03 2011 +0300

    Changed default handler for uncaughted exceptions. Logging with level critical instead of print to stderr

 nova/log.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 396b02f876030f1f54b7af32cf94fccbbe1fe46b
Merge: be89c64 98cc358
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 28 10:07:42 2011 +0000

    Disassociate all floating ips on terminate instance.

commit be89c642e335e76bcb304b2880a4fd8241783436
Merge: 381893d c5a691b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 28 10:05:00 2011 +0000

    Fixes simple scheduler to able to be run_instance by admins + availability zones.

commit 381893d0ad7482d0cc15f6806fd0d509e7c95fcd
Merge: 2a64ccb dd7008e
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jan 28 08:04:31 2011 +0000

    Makes having sphinx to build docs a conditional thing - if you have it, you can get docs. If you don't, you can't.

commit dd7008e4edc6e9be2248ff663664adb2a662e745
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jan 27 23:53:46 2011 -0800

    Fixed a pep8 spacing issue.

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit 7b34f59ef8d2f6a752dcd94be3f5d14f0f93d3b2
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Jan 27 22:51:36 2011 -0800

    fixes for bug #709057

 nova/db/sqlalchemy/api.py    |    6 +++++
 nova/db/sqlalchemy/models.py |    6 ++++-
 nova/tests/test_compute.py   |   58 ++++++++++++++++++++++++++++++++++++------
 3 files changed, 61 insertions(+), 9 deletions(-)

commit eabc4c00eea8859c37efed3f180edbc41fd3b71d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 23:53:28 2011 -0600

    Working on api / manager / db support for zones

 bin/nova-manage                |   10 ++++++++++
 nova/api/openstack/__init__.py |    5 +++++
 nova/db/api.py                 |    8 ++++++++
 nova/db/sqlalchemy/api.py      |    9 +++++++++
 4 files changed, 32 insertions(+)

commit fe3836c5ce16f7c4921eaee746c108d7ae7b4d1a
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Jan 28 05:21:04 2011 +0000

    Launchpad automatic translations update.

 locale/ast.po   | 2130 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/da.po    | 2130 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/es.po    | 2177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/it.po    | 2141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/ja.po    | 2143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/pt_BR.po | 2148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/ru.po    | 2136 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/uk.po    | 2130 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 locale/zh_CN.po | 2135 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 19270 insertions(+)

commit 2a64ccb8139eb30aab394391cf137d4cb83ce55e
Merge: caca4a1 870faca
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Jan 28 03:09:46 2011 +0000

    Adds security group output to describe_instances.

commit caca4a1320638b0d806f1854ba8233d941f50e86
Merge: f8f96f3 f61da82
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 28 00:29:09 2011 +0000

    Use firewall_driver flag as expected with NWFilterFirewall.  This way, either you use NWFilterFirewall directly, or you use IptablesFirewall, which creates its own instance of NWFilterFirewall for the setup_basic_filtering command.  This removes the requirement that LibvirtConnection would always need to know about NWFirewallFilter, and cleans up the area where the flag is used for loading the firewall class.

commit 98cc358d4cc04b61fc19ce77f5db58cf88c6e908
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 16:26:15 2011 -0800

    simplify get and remove extra reference to import logging.

 nova/compute/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f8f96f3bf97be6fbfd7af3879a9877865d5eaae9
Merge: d4f77e1 c679e64
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 28 00:19:12 2011 +0000

    Added a test that checks for localized strings in the source code that contain position-based string formatting placeholders. If found, an exception message is generated that summarizes the problem, as well as the location of the problematic code. This will prevent future trunk commits from adding localized strings that cannot be properly translated.

commit f61da82b6dc614867028e39eec71ed98de8bfac7
Merge: 4b4781f d4f77e1
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 15:58:22 2011 -0800

    Merge & fix conflict.

commit c679e64d13a9ff8643d20316d3a96ed5fc27e0ca
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 16:54:59 2011 -0600

    Made changes based on code review

 nova/tests/test_localization.py |   29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

commit c5a691be561615073507b61dca5a9f8f768a48b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 14:14:10 2011 -0800

    makes sure that : is in the availability zone before it attempts to use it to send instances to a particular host

 nova/scheduler/simple.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit d4f77e1c9eaad19f2a917081737840f9e52dac13
Merge: 05f49c2 9c35a9a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 22:10:42 2011 +0000

    Makes sure all instance and volume commands that raise not found are changed to show the ec2_id instead of the internal id.

commit 1a44e3cd5e366b0862c505e8d93581184c3162f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 13:48:19 2011 -0800

    remove all floating addresses on terminate instance

 nova/compute/manager.py |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

commit 55860f5fa897f81f769073fde9fe7c4bbd86bff5
Merge: a495294 05f49c2
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 13:55:25 2011 -0600

    Merged in trunk changes

commit a495294ccc40a868b79144085da38196759f699c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 13:52:10 2011 -0600

    Fixed formatting issues in current codebase.

 nova/service.py                 |    5 +++--
 nova/tests/test_localization.py |    2 +-
 nova/utils.py                   |    4 ++--
 nova/virt/xenapi/vm_utils.py    |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

commit bc94ab2278c592a944a3bc9e4aa4c3e9e491f23c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 12:52:55 2011 -0600

    Added the test for localized string formatting

 nova/tests/test_localization.py |   95 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

commit 9c35a9a32dc58cb56685292a7ba056f95e715474
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 10:48:00 2011 -0800

    Fixes NotFound messages in api to show the ec2_id.
    
    Added InstanceNotFound and VolumeNotFound errors to store internal id.
    Removed redundant method instance_get_by_id.
    Caught exceptions in api layer and fixed messages to use ec2_id.

 nova/api/ec2/__init__.py                 |   15 +++++++++++-
 nova/api/ec2/cloud.py                    |   16 ++++---------
 nova/compute/api.py                      |    2 +-
 nova/db/api.py                           |    5 ----
 nova/db/sqlalchemy/api.py                |   38 +++++++-----------------------
 nova/exception.py                        |   13 +++++++++-
 nova/tests/api/openstack/test_servers.py |    2 +-
 nova/virt/xenapi/vmops.py                |    2 +-
 8 files changed, 41 insertions(+), 52 deletions(-)

commit 05f49c2942d53e648f07300754fdd4338c0964cf
Merge: e70e9cd 498171d
Author: Jordan Rinke <jordan@openstack.org>
Date:   Thu Jan 27 17:56:54 2011 +0000

    Changed cpu limit to a static value of 100000 (100%) instead of using the vcpu value of 1. There is no weight/limit variable now so I see no other solution than the static max limit.

commit e70e9cdd4fe91d61cb5292699ff1ce20842bbc17
Merge: 8c4a7e1 ae0f6c6
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 27 17:50:50 2011 +0000

    Make nova.virt.images fetch images from a Glance URL when Glance is used as the image service (rather than unconditionally fetch them from an S3/objectstore URL).

commit 498171d2212f51185e9479da1222f0753acab779
Author: Jordan Rinke <jordan@openstack.org>
Date:   Thu Jan 27 09:43:25 2011 -0800

    Fixed spacing... AGAIN

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c4a7e17acaf44e9f917e7a0365bad3fac67c778
Merge: c6875da 6f0bebe
Author: John Dewey <john@dewey.ws>
Date:   Thu Jan 27 17:19:10 2011 +0000

    Make unit tests clean up their mess in /tmp after themselves.

commit c6875da9fec5c1e0d360776340cac2fc70ed1a5a
Merge: fa188fa fb46c42
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 27 17:11:06 2011 +0000

    Make xml namespace match the API version requested.

commit fa188fae7925fedad4c5cfe2ae8566c9fa82e206
Merge: 0a6ab43 fed4adf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 17:00:46 2011 +0000

    Missing import in xen plugin.

commit 3b59176df0ea63715e2f8af73258af87bb06ee97
Author: Jordan Rinke <jordan@openstack.org>
Date:   Thu Jan 27 08:48:22 2011 -0800

    Shortened comment for 80char limt.

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fed4adfb61a5f9f9cb7fd1e797858d36975e8ae4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 10:12:07 2011 -0600

    Added missing import

 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    1 +
 1 file changed, 1 insertion(+)

commit ae0f6c611d0d195da243e4a8f7dfe5fcb79978ac
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 27 16:39:51 2011 +0100

    Naive, low-regression-risk fix enabling Glance to work with libvirt/hyperv

 nova/virt/images.py |    3 +++
 1 file changed, 3 insertions(+)

commit fb46c42ee4a0936c6e29864b1cb49a49257d0fb4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 27 15:45:24 2011 +0100

    Add unit test for xmlns version matching request version.

 nova/tests/test_api.py |   34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

commit 870faca2947289758c03c24a422fe8391a9ce45e
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:19:15 2011 +0000

    Properly pulling the name attribute from security_group

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd1a3ec7f92cd661d5bdd16f7762581b3a193da7
Merge: b03fc3f c02a587
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:18:22 2011 +0000

    Merge from trunk

commit c02a587ea03fecde26f49bec52f8d96aa551979a
Merge: fc8f41e caca4a1
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:17:43 2011 +0000

    Merge from trunk

commit 7c8096384507908a5e583f4554d0fc765ae5f2eb
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Jan 27 20:39:33 2011 +0900

    adding testcode

 bin/nova-api                 |    2 +
 nova/compute/manager.py      |   66 ++--
 nova/db/sqlalchemy/api.py    |   49 +--
 nova/db/sqlalchemy/models.py |   12 +-
 nova/scheduler/driver.py     |   53 ++--
 nova/scheduler/manager.py    |   28 +-
 nova/tests/test_compute.py   |  305 ++++++++++++++++++
 nova/tests/test_scheduler.py |  722 ++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_service.py   |   61 +++-
 nova/tests/test_virt.py      |  520 +++++++++++++++++++++++++++++-
 nova/virt/fake.py            |   12 +-
 nova/virt/libvirt_conn.py    |  159 +++++-----
 nova/virt/xenapi_conn.py     |   14 +-
 nova/volume/manager.py       |    2 +-
 14 files changed, 1809 insertions(+), 196 deletions(-)

commit 0a6ab4362284d92cddd22ee6bfa4182c64299064
Merge: abb1111 6273b2f
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Jan 27 10:08:30 2011 +0000

    Fix Bug #703037. ra_server is None

commit abb1111ee67d1d157b249c004584dfc16642536e
Merge: af67241 504118b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 09:51:47 2011 +0000

    Fix regression in s3 image service.  This should be a feature freeze exception.

commit 504118b849962f85626be2631e195f6bda29f4d6
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 00:30:24 2011 -0800

    I have a feeling if we try to migrate from imageId to id we'll be tracking it down a while.

 nova/api/ec2/cloud.py |    2 +-
 nova/image/s3.py      |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

commit 7460924a798e4b2821077bbc054859b74c28d66c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 00:13:09 2011 -0800

    more instanceId => id fixes

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7bc025c855bcfe575ef69d82f5339b6d1c66ea41
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 23:40:44 2011 -0800

    Fix regression in imageId => id field rename in s3 image service.

 nova/image/s3.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ece7d2fa493e901c2a826e42a86ca93bb0afaed4
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 22:56:34 2011 -0800

    Apply lp:707675 to this branch to be able to test.

 nova/tests/test_virt.py   |    7 ++++++-
 nova/virt/libvirt_conn.py |   29 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

commit 68e61a62f0215853150a497a79afc05a16c05742
Merge: d6c6d81 af67241
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 22:54:52 2011 -0800

    merge trunk

commit d6c6d8115b9dda07716d85fb1201cde0e907a9bd
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 22:54:39 2011 -0800

    A couple of bugfixes.

 nova/adminclient.py       |    3 ++-
 nova/api/ec2/admin.py     |    3 ++-
 nova/virt/libvirt_conn.py |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

commit af67241089ec9e078cadf4e6d7c2c93b4b352315
Merge: 4ada868 6bb6249
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jan 26 23:49:18 2011 +0000

    Fixes a stupid mistake I made when I moved this method from a module into a class.
    
    Thanks Dan for spotting it.

commit 6bb6249d76909a41e198cb0637172a65b0e72aa4
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jan 26 18:34:56 2011 -0500

    Add dan.prince to Authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit f43e1182a77b68ebb3401f3b7316de4e242eb746
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 26 23:44:21 2011 +0100

    Make xml namespace match the API version requested.

 nova/api/ec2/__init__.py   |    3 ++-
 nova/api/ec2/apirequest.py |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 8f794ff09225285439299f03bdaba4362e2e1ff5
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Jan 26 16:12:35 2011 -0500

    Fix issue in s3.py causing where '_fix_image_id' is not defined.

 nova/image/s3.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0c7893e4119bcccdfdfdcdef0931fcc8802688e8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jan 26 14:59:17 2011 -0600

    added mapping parameter to write_network_config_to_xenstore

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f868b00dbb2de469dde3519f2370e59937c4fc6
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Wed Jan 26 19:58:45 2011 +0000

    OS-55: Added a test case for XenAPI file-based network injection
    OS-55: Stubbed out utils.execute for all XenAPI VM tests, including command
    simulation where necessary

 nova/tests/fake_utils.py  |   98 +++++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_xenapi.py |   83 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 180 insertions(+), 1 deletion(-)

commit 4ada8681832e17d8682dab65892b750604a9e74e
Merge: 8d04abd 8dceebd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 26 16:39:50 2011 +0000

    Simple little changes related to openstack api to work better with glance.
    
    Fixes ImageID missing from Glance and int->string id problem.

commit 134421176e011d815a06d421f9475fc04468a1e1
Merge: 671f273 8d04abd
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 26 10:37:17 2011 -0600

    Merged trunk

commit 671f27322156615643ce9194a26bec66819c0c78
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 26 10:34:57 2011 -0600

    Cleaned up _start() and _shutdown()

 nova/virt/xenapi/vmops.py |   39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

commit 8dceebdf9ebce6aa94124504564b395b11c55682
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 26 10:16:16 2011 -0600

    Added missing int to string conversion

 nova/api/openstack/servers.py |    1 +
 1 file changed, 1 insertion(+)

commit 8d04abda758a6f322b97013142d9875369276259
Merge: 5e4259c f04b58b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 26 16:07:16 2011 +0000

    Simple little changes related to openstack api to work better with glance.
    
    Fixes ImageID missing from Glance and int->string id problem.

commit 6273b2f95a905d98c217e98c1dbfc46b097b7533
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 21:10:51 2011 +0900

    use 'ip addr change'

 nova/network/linux_net.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 19:44:13 2011 +0900

    Fix merge miss

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d139d81d3facb440f5f9b040d05e5b380ebf2c68
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 26 16:58:24 2011 -0500

    Changed method signature of create_network

 bin/nova-manage         |    4 ++--
 nova/network/manager.py |    6 +++++-
 nova/test.py            |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

commit 2413d949e1d1ac2bed97a9ed5f54d2f9d386cbd1
Merge: 095a706 5e4259c
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 26 16:21:37 2011 -0500

    merged r621

commit 095a70607ca0ec39fe7c04927794862823a1fcfe
Merge: 166591f 0c77697
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 26 16:12:52 2011 -0500

    Merged with http://bazaar.launchpad.net/~vishvananda/nova/lp703037

commit 166591fda420cb39d38738e4cef77a8b030b9591
Merge: a44e97d 521d872
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 15:17:52 2011 +0900

    Merged with vish branch

commit 6f0bebe2ee63f986376295a03f7c0fde16fa90b6
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 18:16:25 2011 -0800

    Prefixed ending multi-line docstring with a newline.

 nova/image/local.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 45ad2dcaf97a373a6b62b78b115ae3c8eb4c47a1
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 18:09:02 2011 -0800

    Fixing documentation strings.  Second attempt at pep8.
    
    Many of the files under nova/image/*.py do not appear to follow
    the same documentation string rules.

 nova/image/local.py |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

commit be28eceff7b0a7a1dc33c3ade3ab221c6b1c8acd
Merge: bbea3a0 5e4259c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 17:51:49 2011 -0800

    Merge trunk.

commit 5ef600a9b8ad8401bf4d1f4b4f4c771b88a2acc0
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 17:22:16 2011 -0800

    Removal of image tempdir in test tearDown.  Also, reformatted a couple
    method comments to match the file's style.

 nova/image/local.py                     |   12 ++++++++++--
 nova/tests/api/openstack/test_images.py |    1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 5e4259ce6deb227b778acf23770e35f786c9c3d0
Merge: 4854a64 687886b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 01:19:42 2011 +0000

    Add DescribeInstanceTypes to admin api.  This lets the dashboard know what sizes can be launched (using the -t flag in euca-run-instances, for example) and what resources they provide.

commit 4b4781f5cc015c80c9acb0625aaeac9cde667d4b
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 17:13:34 2011 -0800

    Rename Mock, since it wasn't a Mock.

 nova/tests/test_virt.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 687886beeb7519e79b792ff6c42eaab75e664336
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 16:40:23 2011 -0800

    Add DescribeInstanceTypes to admin api (dashboard uses it).

 nova/adminclient.py   |   44 ++++++++++++++++++++++++++++++++++++++++++++
 nova/api/ec2/admin.py |   13 +++++++++++++
 2 files changed, 57 insertions(+)

commit 4854a64703a18dd2f07122dbd42122ac07efd371
Merge: dbbaa7c ccb5e57
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jan 26 00:09:08 2011 +0000

    Fix for LP Bug #699654

commit 0114eec76754c5759c438b47477b077f21196432
Merge: 5fdf113 dbbaa7c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 16:04:40 2011 -0800

    Merge trunk.

commit 5fdf1132f3418c1f6ecaa5593835536db9895085
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 15:56:55 2011 -0800

    Change how libvirt firewall drivers work to have meaningful flags.

 nova/tests/test_virt.py   |    7 ++++++-
 nova/virt/libvirt_conn.py |   29 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

commit ccb5e573f7a3f85a2b591d3a1fb968003e321b28
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 15:53:43 2011 -0800

    Fixed pep8 errors

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dbbaa7c41384c57b2aa10514518b71180316e64a
Merge: cbf94d5 12952fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 23:39:35 2011 +0000

    This branch updates docs to reflect the db sync addition.  It additionally adds some useful errors to nova-manage to help people that are using old guides.  It wraps sqlalchemy errors in generic DBError. Finally, it updates nova.sh to use current settings.

commit ae60200491d329b05a5c67c65e6c93020fb0f5b6
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 15:32:41 2011 -0800

    Added myself to the authors list.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 12952feab2fdcf0fe705114404c303cbb0f7c0d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 15:29:30 2011 -0800

    fix pep8 issue (and my commit hook that didn't catch it)

 bin/nova-manage |    1 +
 1 file changed, 1 insertion(+)

commit cbf94d5a5cac6190b9dabb589eb5ee9b6d2f5127
Merge: 7614c02 f51526b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 23:20:55 2011 +0000

    Add a host argument to virt drivers's init_host method. It will be set to the name of host it's running on.
    
    Make libvirt's init_host method go and look at what virtual machines are running when the compute worker starts up.
    
    This ensures firewalls are set up correctly for existing VM's. It also enables easier rolling upgrades.

commit 34eae5738c1f4ab0eddc469309ae0cbbd5346c4e
Merge: 10e22fa 7614c02
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 15:20:08 2011 -0800

    merged trunk

commit 7614c02e9a31bfbdc9cc52e42b438848eec6af58
Merge: 22fb357 60f992b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 23:14:48 2011 +0000

    Wraps the NotFound exception at the api layer to print the proper instance id.  Does the same for volume.  Note that euca-describe-volumes doesn't pass in volume ids properly, so you will get no error messages on euca-describe-volumes with improper ids.  We may also need to wrap a few other calls as well.

commit 22fb35771a08e94cb0f48dc3eb92bf6b673c3390
Merge: efdf3ca 2155505
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 23:04:35 2011 +0000

    Fixes issue with SNATTING chain not getting created or added to POSTROUTING when nova-network starts.

commit efdf3caaef85d2a82833253b1c150a3ec8823260
Merge: ec3ee01 0d24758
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jan 25 22:59:36 2011 +0000

    Fix for bug #702237

commit 2155505ca082c644e7b4f373d8fae3e157a451bb
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 22:53:09 2011 +0000

    Moving init_host before metadata_forward, as metadata_forward modifies prerouting rules

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f04b58b1eacccf29162d9898e428ae84a62b3d9c
Merge: 078914a 7ff5056
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 16:51:02 2011 -0600

    another trunk merge

commit 7f04601100c06140445705ee74418907d9b27c0f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 14:50:04 2011 -0800

    Limit all lines to a maximum of 79 characters

 nova/api/ec2/__init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ec3ee01cf7c89f612261e6a6970c14094470abeb
Merge: 7ff5056 5f3e509
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 22:49:39 2011 +0000

    Perform same filtering for OUTPUT as FORWARD in iptables.
    
    This removes a way around the filtering for traffic originating on the guests's host (not from VM's on the same host, but traffic from the host itself).

commit 5f3e50951df022e5a3ebfe35ce1de78a4ac090a1
Merge: e44b28a 1b259ba
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 23:38:39 2011 +0100

    Merge with lp:~tpatil/nova/bug707554

commit 078914a7b6b517cb2929b5f3e27e5a327447e801
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 16:38:29 2011 -0600

    Fixed up a little image_id return

 nova/api/openstack/common.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0d247586e708078e590913d1e36e4b2afa70d750
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Jan 26 01:02:34 2011 +0300

    Trunk merged

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7ff50565f33f3e854fe6261bb6c7be36f1ddbd9b
Merge: 705cbaa 9fac0ce
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 25 21:59:18 2011 +0000

    This patch:
    
    1. Removes the krm.json file which maps machine images to kernel and ramdisks
    2. Adds support to pull kernel_id and ramdisk_id directly from Glance image record.
    
    Note: This patch is dependent upon this bug in Glance being fixed: https://bugs.launchpad.net/glance/+bug/706192

commit c32ec232facf17dfc34d7598411f9195b484e44e
Merge: e811667 705cbaa
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Jan 26 00:56:33 2011 +0300

    Trunk merged

commit 9fac0cefb1ba4d7ffa85315a3843ef70ce37691c
Merge: a9ab2d0 705cbaa
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 25 21:46:12 2011 +0000

    Merge trunk

commit 705cbaa3d311c21cf2a7318e52a60eeadebb435a
Merge: b2d0a77 1b259ba
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 21:34:17 2011 +0000

    In instance chains and rules for ipv4 and ipv6, ACCEPT target was missing.

commit 0167151518dcfa714ecd8dab55f2378de5edf51f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 15:06:05 2011 -0600

    moved imageId change to s3 client

 nova/api/openstack/common.py |    8 +-------
 nova/image/s3.py             |   11 ++++++++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

commit bbea3a093f3e9be5052a2e64b6d5d0b909ae33ee
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 13:05:47 2011 -0800

    Migration for provider firewall rules.

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   76 ++++++++++++++++++++
 1 file changed, 76 insertions(+)

commit 4e3524c57f6fa0f917bdb30ec15c8d4633a307e5
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 12:52:00 2011 -0800

    Updates for provider_fw_rules in admin api.

 nova/api/ec2/admin.py |    7 +++++--
 nova/compute/api.py   |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

commit 7a57a10a6a12302915ebbac0744833e365d7961b
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 20:51:57 2011 +0000

    Adds driver.init_host() call to flatdhcp driver

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 50d845e717b3e9ceb650fb5058d44ed4fc1507ca
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 12:50:54 2011 -0800

    Fixed pep8 errors

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d
Merge: 2e6a571 b2d0a77
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 20:50:14 2011 +0000

    Merge from trunk

commit 1b259ba6ac7401d99eff2ded3100c73f3048728e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 12:38:20 2011 -0800

    Fixed pep8 errors

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b1d2fc75d57080b3e0867f93aae71d0613d72d3c
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 12:31:36 2011 -0800

    No longer hard coding to "/tmp/nova/images/".   Using tempdir so tests
    run by different people on the same development machine pass.

 nova/image/local.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit e44b28a0daa771c67fa8672f89f7d52ee1bfec22
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 21:20:42 2011 +0100

    Perform same filtering for OUTPUT as FORWARD in iptables. This removes a way around the filtering.

 nova/virt/libvirt_conn.py |    1 +
 1 file changed, 1 insertion(+)

commit 588bf6717a11930435ad3b3aa1941cff8495e2b5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 21:19:34 2011 +0100

    Fix pep-8 problem from prereq branch.

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f51526b596f3d89cda2ec4501e19baf085c534e0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 20:49:29 2011 +0100

    Add a host argument to virt driver's init_host method. It will be set to the name of host it's running on.
    
    Make libvirt's init_host method go and look at what virtual machines are running when the compute worker starts up. This ensures firewalls are set up correctly for existing VM's. It also enables easier rolling upgrades.

 nova/compute/manager.py   |    2 +-
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   11 +++++++++++
 nova/virt/fake.py         |    5 +++--
 nova/virt/hyperv.py       |    2 +-
 nova/virt/libvirt_conn.py |   27 +++++++++++++++++++++++++--
 nova/virt/xenapi_conn.py  |    2 +-
 7 files changed, 47 insertions(+), 7 deletions(-)

commit 83213922360b68f3a1c26c6b0a319a21f390ffb7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 11:46:24 2011 -0800

    updated authors since build is failing

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 9a3d84b29e33eb5249cc1c04f61bb47f8d1fc1f6
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jan 25 11:41:49 2011 -0800

    Adds conditional around sphinx inclusion.

 setup.py |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit a6052241ec7bce94b81e8d4fa1d43353e4eec51b
Merge: 5ff1898 b2d0a77
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 13:34:50 2011 -0600

    merge with trunk

commit b2d0a77c53d1bd108d233e58f68655381cec4e16
Merge: 01e674a 9ab4670
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 19:17:01 2011 +0000

    Fixes project and role checking when a user's naming attribute is not uid.

commit 01e674ac0128e358d9a8c7dbd592c2fc18146dfe
Merge: d7fb2cc 87189b3
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 19:14:19 2011 +0000

    I am new to nova, and wanted to fix a fairly trivial bug in order to understand the process.
    
    Corrected some white space issues which pep8 found.
    
    John

commit 7d66725e5a1e5438453aedcec809f8a25fae08d8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 11:10:26 2011 -0800

    Fix for LP Bug #707554

 nova/virt/libvirt_conn.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit e811667b1e08bdfd7647cc29f792441db2cfb752
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jan 25 21:58:07 2011 +0300

    Added iptables rule to IptablesFirewallDriver like in Hisaharu Ishii patch with some workaround

 nova/virt/libvirt_conn.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit d7fb2cc101e2f783acebef4476d592a3df41b293
Merge: 07f3980 722d607
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 18:39:21 2011 +0000

    Set the default number of IP's to to reserve for VPN to 0.

commit a44e97d04123905e6ffb822f895531b2c2821a3d
Merge: a9bf56c 6715575
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 25 12:37:44 2011 -0500

    Merged with r606

commit 0fb22b90295c0137dbe4535643ac741d249356f7
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 09:21:31 2011 -0800

    Properly fixed spacing issue for pep8

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fd1fa81e86c708020e8f3940da38cfc768557fb
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 09:18:55 2011 -0800

    Fixed spacing issue for pep8

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a964fc3a8efad33b0dbb94e8a128c512a248f7f1
Merge: f02c9e7 07f3980
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 09:00:56 2011 -0800

    Merge trunk.

commit 3ad22216eee67abfabb28efe2561f0fdcf10e6e1
Merge: 34d1022 07f3980
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Jan 25 15:33:19 2011 +0100

    Fixed merge conflict

commit 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Jan 25 13:50:11 2011 +0100

    Added myself to ./Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 07f39806f3b82d5d06371758e3efe597a47434ed
Merge: bca5b56 521d872
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 12:44:26 2011 +0000

    Switches from project_get_network to network_get_by_instance, which actually works with all networking modes.  Also removes a couple duplicate lines from a bad merge.

commit 722d6076ea3d6bcfc521e3f30c4be39645bbd8ab
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 13:24:16 2011 +0100

    Set the default number of IP's to to reserver for VPN to 0.

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bca5b5650921307ec97602607817de6109fb819d
Merge: 6715575 6de7cb3
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 25 11:53:48 2011 +0000

    Localized strings that employ formatting should not use positional arguments, as they prevent the translator from re-ordering the translated text; instead, they should use mappings (i.e., dicts). This change replaces all localized formatted strings that use more than one formatting placeholder with a mapping version.

commit 0c77697789079cc1971c27cc4952d07c34e30ac7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 00:15:23 2011 -0800

    add ip and network to nwfilter test

 nova/tests/test_virt.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 7bcb77277973dd80691f1c07aa66d89b7c2be150
Merge: 521d872 a9bf56c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 00:14:07 2011 -0800

    merged ntt branch

commit 521d872d332486e2d30a7b4cec06a3b4f3ffbe87
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 24 20:57:44 2011 -0800

    use network_get_by_instance

 nova/virt/libvirt_conn.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit 87189b3952cdda465a9cbb3df433a3ecba1152db
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 20:16:09 2011 -0800

    Added myself (John Dewey) to Authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit c0514b68b03b4409fd553c08e4599ef153a2875d
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 18:39:47 2011 -0800

    corrected nesting of the data dictionary

 bin/nova-spoolsentry |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e7364cb00fd33e82d87aa2006be1b512ae35cc2
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 18:31:04 2011 -0800

    Updated a couple data structures to pass pep8.

 bin/nova-spoolsentry    |    6 ++----
 nova/tests/test_virt.py |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 303803ca29b7676d544e4c1988eb467bc8d2e0b9
Author: Jordan Rinke <jordan@openstack.org>
Date:   Mon Jan 24 14:24:22 2011 -0800

    Added static cpu limit of 100000 (100%) to hyperv.py instead of using the vcpu value of 1

 nova/virt/hyperv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ab4670464e65aaa10f1e032adda2c39b7ca1981
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 24 21:25:13 2011 +0000

    PEP8 fixes

 nova/auth/ldapdriver.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 70d97f5ca927dbf26e2d2590e54acce036b6179e
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 24 19:07:12 2011 +0000

    Changes __dn_to_uid to return the uid attribute from the user's object.

 nova/auth/ldapdriver.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 2e6a5713d86b487c0b26a72b111531781745aeb2
Merge: 6cc743d 6715575
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 24 19:05:31 2011 +0000

    Merge from trunk.

commit cd346a2cda13833f976b9e838d67cf17c52f327e
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Mon Jan 24 19:04:25 2011 +0000

    OS-55: PEP8 fixes

 nova/tests/db/fakes.py       |   17 ++++-----
 nova/tests/test_xenapi.py    |   19 +++++-----
 nova/tests/xenapi/stubs.py   |   10 +++---
 nova/virt/conn_common.py     |    3 +-
 nova/virt/disk.py            |    2 ++
 nova/virt/xenapi/fake.py     |    9 +++--
 nova/virt/xenapi/vm_utils.py |   80 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    |    6 ++--
 8 files changed, 77 insertions(+), 69 deletions(-)

commit 6b0601c12927bc72fb0cba3f88d8f99bee5e63e2
Merge: d0008c1 6715575
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Jan 24 12:43:01 2011 -0600

    Merge from trunk

commit 303a8ee5bf3086d9b527ff7561b1ec426cff4597
Merge: 00b029f be58edd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jan 24 12:42:20 2011 -0600

    merged branch to name net_manager.create_networks args

commit 671557507ae65ff5521e32f0d6cf2342e3a5af55
Merge: 9ca3967 be58edd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jan 24 18:33:57 2011 +0000

    the net_managers expect different args to create_networks, so nova-manage's call to net_manager.create_networks was changed to use named args to prevent argument mismatching.

commit c97618e1eaff4091f01381073a298d0f67050126
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Mon Jan 24 18:28:50 2011 +0000

    OS-55: Post-merge fixes

 nova/tests/db/fakes.py       |    3 ++-
 nova/virt/xenapi/vm_utils.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 9ca396778cf3b367fb5ce86d5037dfe92e00426c
Merge: 3b06788 fb4638f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 24 18:24:06 2011 +0000

    Fix describe_regions by changing renamed flags.  Also added a test to catch future errors.

commit be58eddf4d254db3d225bfa3740cf4d19c7c22db
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jan 24 12:07:12 2011 -0600

    changed nova-manage to use named arguments to net_manager.create_networks

 bin/nova-manage |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit b167e7ec69b6d3b92794cc2875aac2526395b7a8
Merge: e8748af 3b06788
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 24 11:22:53 2011 -0600

    Merged trunk

commit 6de7cb36e9d848f87bde6caa45eeaeb4bf76296a
Merge: 09188c6 3b06788
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 24 09:19:51 2011 -0600

    Removed tabs form source. Merged trunk changes

commit 3b06788ba2e8184e17f875f41ced0bbc0254beac
Merge: b6d2d24 26891c0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 23 23:28:40 2011 +0000

    allow docs to build in virtualenv
    prevent setup.py from failing with sphinx in virtualenv

commit 26891c0e92d42964ba447ec2495cf1a9131db74e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 23 12:52:09 2011 -0800

    fixes doc build and setup.py fail in virtualenv

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit fb4638f1cbe17ce0c2e0eb4580f81f3cb787de0f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 17:46:05 2011 -0800

    fix reversed assignment

 nova/tests/test_cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e6b7fa7ae31e90f2d7322445da3843281fff9a70
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 16:20:36 2011 -0800

    fixes and refactoring of smoketests

 smoketests/base.py            |   43 ++++++++++---
 smoketests/flags.py           |    2 +-
 smoketests/user_smoketests.py |  133 +++++++++++++----------------------------
 3 files changed, 77 insertions(+), 101 deletions(-)

commit 1fc00fd38629735352dd887573f3a4fca8946601
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:17:43 2011 -0800

    remove extra print

 nova/tests/test_cloud.py |    1 -
 1 file changed, 1 deletion(-)

commit 354c16138abed0e4c43a4b0e0e21dfe7d2106a7a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:14:33 2011 -0800

    add test and fix describe regions

 nova/api/ec2/cloud.py    |    8 ++++----
 nova/flags.py            |    2 +-
 nova/tests/test_cloud.py |   11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

commit f6c360947a56e0500e8326bf722c16ed5eceece9
Merge: d757a1a b6d2d24
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:14:10 2011 -0800

    merged trunk

commit b6d2d24e778eb6d4b6570246bfe09cba1897d254
Merge: 7da2bb5 f5b051b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 22:13:49 2011 +0000

    This patch skips VM shutdown if already in the halted state.

commit a9ab2d0f0618f855686cb8713b28c3737faabdcc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 21:20:09 2011 +0000

    Use Glance to relate machine image with kernel and ramdisk

 krm_mapping.json.sample        |    3 ---
 nova/api/openstack/__init__.py |    3 ---
 nova/api/openstack/servers.py  |   28 +++++++++++++++++-----------
 3 files changed, 17 insertions(+), 17 deletions(-)

commit f5b051bbd0858294157f911ecbb04542fadbb38d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 04:59:58 2011 +0000

    Skip shutdown if already halted

 nova/virt/xenapi/vmops.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 69dd45d382f241389ff19983a4f12404f0a63662
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 04:57:11 2011 +0000

    Refactoring _destroy into steps

 nova/virt/xenapi/vmops.py |   68 ++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 22 deletions(-)

commit 60f992b7fa1d1abf494cc210f7f199414a0538bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 16:03:51 2011 -0800

    i18n!

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 10e22fac85e0684a12325aa987fb6d5c3450bf93
Merge: 9bdcc71 7da2bb5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 15:53:44 2011 -0800

    merged trunk fixed whitespace in rst

commit 9bdcc71733105a49636f74a99130112ef96d0bce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 15:48:10 2011 -0800

    wrap sqlalchemy exceptions in a generic error

 bin/nova-manage               |    5 ++-
 contrib/nova.sh               |   67 ++++++++++++++++++++++-------------------
 nova/db/api.py                |    1 -
 nova/db/sqlalchemy/session.py |    3 ++
 nova/exception.py             |   18 +++++++++++
 5 files changed, 59 insertions(+), 35 deletions(-)

commit d0008c166ad9df901d8de098cc9fac0a118ae08f
Merge: 11aaf02 7da2bb5
Author: matt.dietz@rackspace.com <>
Date:   Fri Jan 21 23:45:49 2011 +0000

    Merge from trunk

commit 842bd9646ad0e9008af86da9153fdf592788b3c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 14:51:24 2011 -0800

    Wrap instance at api layer to print the proper error.  Use same logic for volumes.

 nova/api/ec2/cloud.py     |   28 +++++++++++++++++++++-------
 nova/db/sqlalchemy/api.py |    2 ++
 2 files changed, 23 insertions(+), 7 deletions(-)

commit 7da2bb5bd74ff94f65bc11af88694aa79b35f5d5
Merge: ec60562 21cafbd
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 22:34:19 2011 +0000

    This patch adds two flags:
    
    --xenapi_remap_vbd_dev
    --xenapi_remap_vbd_dev_prefix
    
    If the plugged-in VBD dev is wrong, these configs let your remap it on the fly. This works around a bug in Ubuntu Maverick: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/684875

commit 21cafbd6b05212f076d0b3d485358d1ca7514e71
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 22:16:52 2011 +0000

    Using new style logging

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 56051e2c54dafa265bf87e0c148d251e52a06712
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 21:31:47 2011 +0000

    Adding ability to remap VBD device

 nova/virt/xenapi/vm_utils.py |   31 ++++++++++++++++++++++++++++++-
 nova/virt/xenapi_conn.py     |    8 ++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

commit 09188c61d5359750f9deadcf912f0fa5fbf005b7
Merge: 75f93d8 ec60562
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 21 16:10:26 2011 -0500

    Resolved trunk merge conflicts

commit ec60562b1a6d18e6df4024870468c0501dc692f9
Merge: 2da8463 b05f4f5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 19:44:44 2011 +0000

    Adds gettext to pluginlib_nova.py. Fixes #706029.

commit b05f4f55f05d9b177ddde03da769cb95c8fbb72e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 19:10:31 2011 +0000

    Adding getttext to pluginlib_nova

 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    2 ++
 1 file changed, 2 insertions(+)

commit f02c9e781bdddd609601da81b97a438b6d5b9781
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 21 12:30:26 2011 -0500

    Add provider_fw_rules awareness to iptables firewall driver.

 nova/api/ec2/admin.py     |    3 ++-
 nova/virt/libvirt_conn.py |   49 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

commit 2da846342bdd36381e557a86ecffdbcf2c7f9262
Merge: c123128 6b9ca44
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jan 21 17:14:30 2011 +0000

    No longer chmod 0777 instance directories, since nova works just fine without them.

commit c1231289abe5be0ed31a15731fb3995d2a5a051e
Merge: 977393f d8225be
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 21 17:09:36 2011 +0000

    Updated docs for db sync requirements; merged with Vish's similar doc updates

commit 977393fe3e487926899f3f64cfd33f39105cc97e
Merge: 14edbd5 2042c87
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jan 21 16:24:39 2011 +0000

    Change default log formats so that:
     * they include a timestamp (necessary to correlate logs)
     * no longer display version on every line (shorter lines)
     * use [-] instead of [N/A] (shorter lines, less scary-looking)
     * show level before logger name (better human-readability)
    
    Display version once at node startup time instead.
    Fix description of the log format flags.

commit 48990b109eb39f0dd4ea7bf86be79f6e03c3ad74
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 21 16:23:30 2011 +0000

    OS55: pylint fixes

 nova/tests/test_xenapi.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 9039c2cc59904a72fc71255a3a31ec2b17018963
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 21 16:06:32 2011 +0000

    OS-55: Added unit test for network injection via xenstore

 nova/tests/db/fakes.py     |   54 ++++++++++++++++++++++++++++----------------
 nova/tests/test_xenapi.py  |   46 ++++++++++++++++++++++++++++++++-----
 nova/tests/xenapi/stubs.py |   15 ++++++++++++
 nova/virt/xenapi/fake.py   |   12 ++++++++--
 4 files changed, 100 insertions(+), 27 deletions(-)

commit 75f93d83be59a85b63a267dc22458a133c591f8e
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 21 10:37:21 2011 -0500

    fixed typo

 nova/api/ec2/apirequest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8225bee3d448f462689115e93107fd2217aaf1b
Merge: 2be5a31 fc96437
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 21 09:22:04 2011 -0600

    Merge doc changes affected by db sync

commit 1dbdb180cb93a812f8336bbfc49bf67a5203d1eb
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 21 12:00:45 2011 +0000

    OS-55: Fix current unit tests

 nova/tests/db/fakes.py       |    2 ++
 nova/virt/xenapi/fake.py     |    4 ++++
 nova/virt/xenapi/vm_utils.py |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

commit a9bf56c7e4613c83646c109ce9e6452e0cd25d2d
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 21 20:30:29 2011 +0900

    Fixed for pep8

 nova/virt/libvirt_conn.py |    2 --
 1 file changed, 2 deletions(-)

commit d55e281efef06dbbcfec9ef4aad4ed0bac9a9368
Merge: 3294d3f 14edbd5
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 21 20:04:02 2011 +0900

    Merged with rev597

commit 6b9ca44c5140fe96395600b858a4566af87795a3
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jan 21 10:08:21 2011 +0100

    No longer chmod 0777 instance directories

 nova/virt/libvirt_conn.py |    2 --
 1 file changed, 2 deletions(-)

commit 14f01f5daeca8cac9d669c584348712c2e893bc1
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jan 20 17:29:17 2011 -0800

    Reverted log type from error to audit

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 00b029f60baca843487b3cfd89940ed65e85389a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:51:46 2011 -0600

    undid moving argument

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit edceeb76885a246191315c6a6c76a7e4e89511e5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jan 20 16:47:46 2011 -0800

    Fix for LP Bug #699654

 Authors                  |    1 +
 nova/api/ec2/__init__.py |   17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

commit 7ef1c34c2251eb32ef2effa58ea7ee85f46112f7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:44:00 2011 -0600

    moved argument for label

 bin/nova-manage |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d4a643976adbe49ec52db53694481e9ba687cddf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:40:04 2011 -0600

    fixed the migration

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |    5 +++++
 1 file changed, 5 insertions(+)

commit a9f9a0fcb7443b93db3f4de8f68218f20f0cc1a9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:36:18 2011 -0600

    really added migration for networks label

 .../sqlalchemy/migrate_repo/versions/003_cactus.py |   47 ++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit f38196b0eb7a11501f9b0ffa9409c05510798761
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:08:01 2011 -0600

    added default label to nova-manage and create_networks

 bin/nova-manage         |    5 +++--
 nova/network/manager.py |    8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

commit f77043d44aa640e1811a3fe236fc8fd5dfecf990
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 16:27:09 2011 -0600

    syntax

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8d1798008fcec536f1117a275b168ca449f1dfbf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 16:19:07 2011 -0600

    syntax error

 nova/db/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b993d50835c79d23dca422335de362ebaf7f4fa
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 15:47:08 2011 -0600

    added plugin call for resetnetworking

 nova/virt/xenapi/vmops.py                         |    3 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 14edbd55e667b16b8d46c0230b11ccd964f5742f
Merge: 3eeb76d a112d11
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 20 21:29:05 2011 +0000

    Fix metadata using versions other than /later.  Patch via ~ttx

commit 089bdfa8c2f0f116b55c69bbcde6fca6632cb145
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 15:20:23 2011 -0600

    should be writing some kindof network info to the xenstore now, hopefully

 nova/db/api.py               |    5 +++++
 nova/db/sqlalchemy/api.py    |    6 ++++++
 nova/db/sqlalchemy/models.py |    1 +
 nova/virt/xenapi/vmops.py    |   39 +++++++++++++++++++++++++++++++--------
 4 files changed, 43 insertions(+), 8 deletions(-)

commit a112d11cc2184fb70d9ed4c0db931d92e02b6c82
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 20 16:07:27 2011 -0500

    Use ttx's patch to be explict about paths, as urlmap doesn't work as I expected.

 etc/nova-api.conf |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit fc964378b521458be3c405783b2991b0c4f3f560
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Jan 20 14:56:29 2011 -0600

    Doc changes for db sync

 doc/source/adminguide/distros/ubuntu.10.04.rst |    2 +-
 doc/source/adminguide/index.rst                |    3 +-
 doc/source/adminguide/multi.node.install.rst   |  149 +++++++++++++++---------
 doc/source/adminguide/single.node.install.rst  |    2 +-
 doc/source/index.rst                           |    4 +-
 5 files changed, 98 insertions(+), 62 deletions(-)

commit 3eeb76d13126313f14206f0683945ad98df09a2a
Merge: c44986b 7511b1b
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 20:24:22 2011 +0000

    Fixes issue with instance creation throwing errors when non-default groups are used.

commit b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 20:05:07 2011 +0000

    Saving a database call by getting the security groups from the instance object.

 nova/api/ec2/cloud.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit c44986b60e598deaa3e2d85b3667ef0b0894a68c
Merge: a902763 36681f0
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 20:04:57 2011 +0000

    Fixes issue with describe_instances requiring an admin context.

commit 8f531ef7c0782feba46f83ec2e45d113753c4052
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Thu Jan 20 19:51:23 2011 +0000

    OS-55: pylint fixes

 nova/virt/xenapi/vm_utils.py |   96 +++++++++++++++++++++++++++---------------
 nova/virt/xenapi/vmops.py    |    3 +-
 2 files changed, 63 insertions(+), 36 deletions(-)

commit 7511b1b50b9a3f9d7dc7f3aaec6187577d97f194
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 19:33:37 2011 +0000

    Fixing another instance of getting a list of ids instead of a list of objects.

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8caebc896499184721f9d880186e6baa7e42aeac
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 19:07:24 2011 +0000

    Adds security group output to describe_instances

 nova/api/ec2/cloud.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit a90276387c069057fb2f4f3ed5b744f9fd7c4987
Merge: d40213a 13b4f32
Author: jaypipes@gmail.com <>
Date:   Thu Jan 20 19:04:54 2011 +0000

    Finds and fixes remaining strings for i18n. Fixes bug #705186

commit d40213a83ec4eef8994df01acb3a745ed40e2278
Merge: 2be5a31 b2ec5bf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 18:29:13 2011 +0000

    Pass a PluginManager to nose.config.Config(). This lets us use plugins like coverage, xcoverage, etc.

commit 13b4f32d1995a8c50bcf86786b6ee75d49bea701
Author: jaypipes@gmail.com <>
Date:   Thu Jan 20 12:52:02 2011 -0500

    i18n's strings that were missed or have been added since initial i18n strings branch.

 nova/api/ec2/cloud.py                              |    2 +-
 nova/auth/dbdriver.py                              |    4 +-
 nova/auth/ldapdriver.py                            |   43 +++++++-------
 nova/console/manager.py                            |    2 +-
 nova/console/xvp.py                                |   14 ++---
 nova/network/manager.py                            |    2 +-
 nova/objectstore/handler.py                        |    6 +-
 nova/objectstore/image.py                          |   13 +++--
 nova/rpc.py                                        |    2 +-
 nova/scheduler/simple.py                           |    4 +-
 nova/twistd.py                                     |    4 +-
 nova/virt/libvirt_conn.py                          |    3 +-
 nova/wsgi.py                                       |    2 +-
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |   60 ++++++++++++--------
 14 files changed, 91 insertions(+), 70 deletions(-)

commit 88be6540d2a796e313f2d8ef4ccc6e66ba1a3ed1
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Thu Jan 20 16:49:54 2011 +0000

    OS-55: Only modify Linux image with no or injection-incapable guest agent
    OS-55: Support network configuration via xenstore for Windows images

 nova/virt/xenapi/vm_utils.py |  105 ++++++++++++++++++++++++++++++++++++++----
 nova/virt/xenapi/vmops.py    |    3 ++
 2 files changed, 99 insertions(+), 9 deletions(-)

commit abb6286b3a4a4cca03d99a5d0d59bc621208bfd2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 20 11:37:15 2011 -0500

    A couple of copypasta errors.

 nova/compute/manager.py   |    2 +-
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 2042c8722910c1f22ba04636163841812b3e24ba
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 15:12:02 2011 +0100

    Keep exception tracing as it was

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b2ec5bf282f212f251479ec2bde520bc21531435
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 15:05:55 2011 +0100

    Pass a PluginManager to nose.config.Config(). This lets us use plugins like coverage, xcoverage, etc.

 run_tests.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6ef429d425b82db6dc87fa40241d97bea897bd23
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 12:26:19 2011 +0100

    Also print version at nova-api startup, for consistency

 bin/nova-api |    3 +++
 1 file changed, 3 insertions(+)

commit 87045ba442a59e9f1497c37c0a1b8b236233eee3
Merge: a9c8ef0 2be5a31
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 12:21:12 2011 +0100

    Merge from trunk

commit a9c8ef031780636dd851095f0e76dabeb9eed487
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 12:20:50 2011 +0100

    Add timestamp to default log format, invert name and level for better readability, log version once at startup

 nova/log.py     |   10 +++++-----
 nova/service.py |    4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

commit 3294d3f98cb78b169656711c73547e1cf0527432
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Jan 20 19:54:05 2011 +0900

    When radvd is already running, not to hup, but to restart

 nova/network/linux_net.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit ffe08ea0c5c47ef13a459ac2821e7f706b4070a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 20 00:40:57 2011 -0800

    fix ipv6 conditional

 contrib/nova.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 2f4258d99e8d97ec70645cd2df2f4e54dc869e89
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 20 00:14:42 2011 -0800

    more smoketest fixes

 nova/__init__.py              |    2 --
 smoketests/base.py            |    7 +++++--
 smoketests/flags.py           |    2 +-
 smoketests/user_smoketests.py |   26 ++++++++++++++++----------
 4 files changed, 22 insertions(+), 15 deletions(-)

commit 6cc743de02ee3993b3301bfe34c645ba63881e38
Merge: 10bae72 2be5a31
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 01:53:08 2011 +0000

    Merge from trunk.

commit 36681f096574e5fdab26e6167a39e87df0f92fd4
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 01:34:54 2011 +0000

    Passing in an elevated context instead of making the call non-elevated.

 nova/api/ec2/cloud.py     |    2 +-
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 2be5a31a95f264f26f3beb4aba6b9d947790d4b1
Merge: 3466df5 d5fd7b6
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Jan 20 01:33:58 2011 +0000

    Added changes to make errors and recovery for volumes more graceful:
    
    * If an error occurs while creating our exporting a volume, volume['status'] is set to 'error,' rather than leaving it in 'creating.'  Similarly, if an error occurs while deleting, volume['status'] is set to 'error_deleting'
    * Gracefully handle condition where iscsi export has already been removed, or has never successfully been created, in ISCSIDriver.remove_export
    * In ISCSIDriver.ensure_export, gracefully handle situation where an iscsi_target is nil.  This occurs when there is an error creating a volume that prevents the target from being assigned.
    * Add nova-manage volume commands: delete and reattach
    ** delete can be used to delete volumes that are in error state, since users can only delete volumes flagged as 'available'
    ** reattach can be used after host reboot to reattach volumes
    
    Note that I didn't implement rollback as the original bug suggested, but this code accomplishes the same objectives IMO by making it more clear when errors occur and providing tools for dealing with certain common error conditions.

commit 33803f02a3b4bd16d394363179a8b91b7f295318
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 01:17:51 2011 +0000

    Fetches the security group from ID, allowing the object to be used properly, later.

 nova/compute/api.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4203bba809eec90dd8a176c2d4f8869ae748e8bc
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 00:47:33 2011 +0000

    Changing service_get_all_by_host to not require admin context as it is used for describing instances, which any user in a project can do.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 10bae7259abd6c663ff9513991f03c88555be1e6
Merge: 5177483 3466df5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 00:46:04 2011 +0000

    Merge from trunk

commit 3466df5035b3cc6e376124d1caa72b0761341c4c
Merge: 2b63f83 2c75ad0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 00:38:58 2011 +0000

    Exclude vcsversion.py from pep8 check. It's not compliant, but out of our control.

commit 2c75ad02c5a025e2262cd3cd6c9ab42cd34b585c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 01:23:57 2011 +0100

    Exclude vcsversion.py from pep8 check. It's not compliant, but out of our control.

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2b63f836e05fa6ab269d2fa9a7815aefb8983c32
Merge: 97d9b42 f8db53d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 00:04:21 2011 +0000

    Include paste config in tarball.

commit f8db53d4b106940e123aaaadcef0b8e7082fbd6c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 00:46:20 2011 +0100

    Add etc/ directory to tarball.

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 97d9b426f80544dd6cc82f5753783d2bf8f3957f
Merge: c25a105 2f4e7b7
Author: jaypipes@gmail.com <>
Date:   Wed Jan 19 22:46:31 2011 +0000

    Fixes for bugs:
    
    * Bug #704422: nova-direct-api: AttributeError: 'module' object has no attribute 'ComputeAPI'
    * Bug #704424: bin/stack: AttributeError: port
    * Bug #704447: bin/stack: urllib2.HTTPError when issuing reflection request

commit c25a105ead4cd571a1089d2dabf9f338afdd4784
Merge: 6e803ac 43a9cbf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 22:44:02 2011 +0000

    Return non-zero if either unit tests or pep8 fails.

commit 6e803acaf421e5bd8a8a2f9221a617939d582e31
Merge: ff9ec35 8d82852
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 22:38:57 2011 +0000

    Eagerly load fixed_ip.network in instance_get_by_id.

commit 43a9cbf855d8128be0d1fb6fb4f3b8e855bac113
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 23:32:08 2011 +0100

    Add Rob Kost to Authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 96a7787874a2c3f71bdfda1d4addf99408ca4e34
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 23:15:20 2011 +0100

    Return non-zero if either unit tests or pep8 fails.

 run_tests.sh |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit e8748afd0773e2599aaa9898d6fe4ef850d6fe5a
Merge: 76e88b6 ff9ec35
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 14:57:42 2011 -0600

    Merged trunk

commit 9f84019339c6e90dfa517de2bc08ee3e6ab643a9
Merge: 6a0512f ff9ec35
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 12:40:03 2011 -0800

    merge trunk

commit ff9ec3576c4efb24baa657405591ead991ea1287
Merge: 1b6a789 1862fe5
Author: Kost <kost@isi.edu>
Date:   Wed Jan 19 20:34:14 2011 +0000

    Add paste and paste.deploy installation to nova.sh, needed for api server.

commit a7165d76efe048acba68c607ed4a1f9ebb44a659
Merge: c58a8ed 1b6a789
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:29:35 2011 -0500

    Merge trunk.

commit d131bcece0f14ae9124f386b814f8354f8da8ecd
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 15:26:09 2011 -0500

    Updated trunk changes to work with localization

 nova/api/ec2/admin.py         |    2 +-
 nova/objectstore/handler.py   |    5 ++---
 nova/tests/test_rpc.py        |    3 ++-
 nova/virt/hyperv.py           |    4 ++--
 nova/virt/xenapi/vm_utils.py  |   16 +++++++++-------
 nova/virt/xenapi/volumeops.py |    2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

commit c58a8edb5c282f661d5be361ce68131516c741ba
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:17:06 2011 -0500

    Implement provider-level firewall rules in nwfilter.

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   11 ++++++++++
 nova/virt/libvirt_conn.py |   51 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

commit 46c1c554e7d98959a2b20597d6b0f2b0f648cdc9
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:16:12 2011 -0500

    Whitespace (pep8) cleanups.

 nova/adminclient.py   |   29 ++++++++++++++---------------
 nova/api/ec2/admin.py |    1 -
 2 files changed, 14 insertions(+), 16 deletions(-)

commit b760e7cf6c84233bba1bcf336f630cbbbe54f672
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Jan 19 21:15:23 2011 +0100

    Exception string lacking 'G' for gigabytes unit

 nova/volume/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1b6a78910aa959dd0a51502da7e8d1505e871ffd
Merge: f28b7aa beff00f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 19:59:19 2011 +0000

    Fixes **params unpacking to ensure all kwargs are strings for compatibility with python 2.6.1

commit beff00fbe9b9e05e265f3c4ce5b6670426e22de2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 11:20:56 2011 -0800

    make sure params have no unicode keys

 nova/api/direct.py |    2 ++
 1 file changed, 2 insertions(+)

commit 6ab5b9bd81ee754553c515fc28b7c2da71e0ab12
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 13:05:01 2011 -0600

    Removed unneeded line

 nova/virt/xenapi/vm_utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 76e88b6c1139640fede5150b58d2e3427a582a8a
Merge: dd70c9f f28b7aa
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 12:56:08 2011 -0600

    Merged trunk

commit f28b7aa6fc51fcbae3c82b88f6e946124b1f2a98
Merge: 7d7fbf5 50ec058
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 18:50:14 2011 +0000

    Refactor run_tests.sh to allow us to run an extra command after the tests.
    
    Run pep8 after unit tests in run_tests.sh.
    
    Fix setup.py to be PEP-8 compliant.

commit 6a0512f440f196223a857e7f5e92fe5a8cc7e2a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 10:43:50 2011 -0800

    update the docs to reflect db sync as well

 doc/source/adminguide/multi.node.install.rst  |  118 +++++++++++++------------
 doc/source/adminguide/nova.manage.rst         |   35 +++++---
 doc/source/adminguide/single.node.install.rst |   28 +++---
 doc/source/man/novamanage.rst                 |   35 +++++---
 4 files changed, 123 insertions(+), 93 deletions(-)

commit 72f08004f3f722a98316018a8e9ec2e270c3669f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 10:26:55 2011 -0800

    add helpful error messages to nova-manage and update nova.sh

 bin/nova-manage |   29 ++++++++++++++++++++++++-----
 contrib/nova.sh |   36 +++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 18 deletions(-)

commit dd70c9f3909c800d72d73d507e9da05a6ed932de
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 11:20:16 2011 -0600

    Fixed unit tests

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 11aaf029fa2de53ca0f8a6d1a0953bb616535cbb
Merge: 2c0f1d7 7d7fbf5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Jan 19 10:50:54 2011 -0600

    Merge from trunk

commit 98e27d29182d882ed7153ce9834b3e6a7ea99733
Merge: 22fc6fc 7d7fbf5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 10:40:13 2011 -0600

    Merged trunk

commit 1dc38833c75d546b1c64d2bcd1f5d9a5bab8836d
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Jan 20 01:14:23 2011 +0900

    fixed pep8 error

 nova/scheduler/manager.py |    7 +++----
 nova/service.py           |    8 ++++----
 nova/virt/fake.py         |    5 +++--
 3 files changed, 10 insertions(+), 10 deletions(-)

commit 8d828520602dd3fc66fa0ea22af797c1d99d3f1a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 17:03:09 2011 +0100

    Eagerly load instance's fixed_ip.network attribute.

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit ea812e66a4d2d84af8c63281c35c4109be1f67db
Merge: c4ecab2 7d7fbf5
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 10:41:30 2011 -0500

    merged trunk changes

commit c4ecab260bed2118b119c7e415c2682e689fca3b
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 09:27:53 2011 -0600

    minor code cleanup

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ceb5f7ca02d46920c0f18372b8a8aabc0c423e31
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 09:21:04 2011 -0600

    minor code cleanup

 nova/db/sqlalchemy/api.py |    2 +-
 nova/virt/xenapi/fake.py  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 6c7d7aa264c031304904ea349412e9f8da0283a8
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 23:38:52 2011 +0900

    remove blank from Authors

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4780df11fcaaf29064cb40166701c5bddcc20d73
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 23:35:02 2011 +0900

    .mailmap rewrite

 .mailmap |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e56376d2fc67b7e291745012aafab392aba5aa8c
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 22:18:30 2011 +0900

    .mailmap updated

 .mailmap |    1 +
 Authors  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 50ec058cc70044a4cfbad97147940a6124aa10a8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 10:50:54 2011 +0100

    Refactor run_tests.sh to allow us to run an extra command after the tests.
    
    Run pep8 after unit tests in run_tests.sh.
    
    Fix setup.py to be PEP-8 compliant.

 run_tests.sh |   58 +++++++++++++++++++++++++++++-----------------------------
 setup.py     |   17 +++++++++--------
 2 files changed, 38 insertions(+), 37 deletions(-)

commit 7d7fbf5dfd8a8e10f584df5d27d3479c4b2b4d3a
Merge: 604be35 c79e72b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 09:39:22 2011 +0000

    Add an apply_instance_filter method to NWFilter driver.
    
    Adjust unit tests for both firewall drivers to actually exercise these
    code paths.

commit c79e72b2a14b5e231724a1e187bf7effe5c64fc4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 10:11:55 2011 +0100

    PEP-8 fixes

 nova/tests/test_virt.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 30ec3b18dbb24fe1a1cfa0e733c373edee49ca84
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 19 12:45:07 2011 +0900

    Revert Firewalldriver

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 604be356a02653f945c3f2fcc58a04c4a0acae3c
Merge: 4eed55b ec5e44e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 02:58:48 2011 +0000

    Replace an old use of ec2_id with id in describe_addresses.

commit 9bd72f56224a8cc980620b17210d9b9b9ede6166
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:33:04 2011 -0800

    various fixes to smoketests, including allowing admin tests to run as a user, better timing, and allowing volume tests to run on non-udev linux

 smoketests/flags.py           |    2 +-
 smoketests/user_smoketests.py |   28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

commit eb33a6b78b8d802c3f92a80e5d5e4a60aef5bf68
Merge: 324d8fd 4eed55b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:29:56 2011 -0800

    merged trunk

commit ec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:27:08 2011 -0800

    replace old ec2_id with proper id in describe_addresses

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d5fd7b68d2ec4b4ee3cf6de6b7c10a00300a81a0
Merge: 76a4d68 9d76fb7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 18 18:14:03 2011 -0800

    merge vish's changes (which merged trunk and fixed a pep8 problem)

commit 9d76fb7d6bb88c7b8e1e78d076168ac58a6d978a
Merge: 76a4d68 4eed55b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:50:21 2011 -0800

    merged trunkand fixed conflicts and pep error

commit 4190d539315c50c50edcb8f7866274fe3d95d9a1
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 19 11:13:33 2011 +0900

    get_my_linklocal raises exception

 nova/utils.py                  |   10 +++++-----
 nova/virt/libvirt.xml.template |    6 ++++--
 nova/virt/libvirt_conn.py      |   26 ++++++++++++++++----------
 3 files changed, 25 insertions(+), 17 deletions(-)

commit 68c9c8930038fe3af3092f3de75591146d57c9e4
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 18 21:00:28 2011 -0500

    Completed first pass at converting all localized strings with multiple format substitutions.

 bin/nova-api                     |    2 +-
 bin/nova-dhcpbridge              |    6 +--
 doc/ext/nova_todo.py             |    5 ++-
 nova/api/ec2/__init__.py         |   20 ++++++----
 nova/api/ec2/admin.py            |   39 ++++++++++--------
 nova/api/ec2/apirequest.py       |    6 ++-
 nova/api/ec2/cloud.py            |   14 ++++---
 nova/api/openstack/servers.py    |    6 +--
 nova/auth/ldapdriver.py          |    4 +-
 nova/auth/manager.py             |   69 +++++++++++++++++++-------------
 nova/compute/api.py              |   11 ++++--
 nova/compute/manager.py          |   32 ++++++++-------
 nova/compute/monitor.py          |   10 +++--
 nova/db/sqlalchemy/__init__.py   |    7 ++--
 nova/db/sqlalchemy/api.py        |   32 ++++++---------
 nova/exception.py                |    5 ++-
 nova/fakerabbit.py               |   11 +++---
 nova/network/manager.py          |   10 +++--
 nova/objectstore/handler.py      |   32 ++++++++-------
 nova/rpc.py                      |   19 ++++-----
 nova/scheduler/manager.py        |    2 +-
 nova/service.py                  |   13 +++---
 nova/tests/test_rpc.py           |    2 +-
 nova/utils.py                    |    8 ++--
 nova/virt/hyperv.py              |   81 +++++++++++++++++++++-----------------
 nova/virt/images.py              |    2 +-
 nova/virt/libvirt_conn.py        |   26 ++++++------
 nova/virt/xenapi/fake.py         |    6 ++-
 nova/virt/xenapi/vm_utils.py     |   46 ++++++++++++----------
 nova/virt/xenapi/vmops.py        |    7 +++-
 nova/virt/xenapi/volume_utils.py |   18 ++++-----
 nova/virt/xenapi/volumeops.py    |   25 ++++++------
 nova/virt/xenapi_conn.py         |   13 ++----
 nova/volume/api.py               |    7 ++--
 nova/volume/manager.py           |    6 ++-
 nova/wsgi.py                     |    3 +-
 36 files changed, 333 insertions(+), 272 deletions(-)

commit 4eed55b46cfaba58b5d344f0ca96eba090d8bd34
Merge: 3b87480 7f352a7
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 19 01:39:41 2011 +0000

    Allows moving from the Austin-style db to the Bexar-style.
    
    Prevents the db from being created automatically when services run.
    
    Adds nova-manage db sync and nova manage db version to bring the db up-to-date and to check the current version. Must be run with the same privileges as the services who will access the database (or you need to chmod the db afterwards if sqlite)

commit 7f352a72333e94c642d8288638c73a166cfb2943
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 17:32:54 2011 -0800

    move db sync into nosetests package-level fixtures so that the existing nosetests attempt in hudson will pass

 nova/tests/__init__.py |    5 +++++
 run_tests.py           |    7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

commit f935cf4c6e679d1c8eed99bcabe0d4515c2ba254
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 09:46:43 2011 +0900

    previous commit breaks volume.driver. fix it..

 nova/compute/manager.py |    1 -
 nova/volume/driver.py   |   13 ++++++++-----
 nova/volume/manager.py  |    4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

commit 76a4d683d973c7f8120ae6b409d9fd9c09a3ab98
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 18 16:12:52 2011 -0800

    per vish's feedback, allow admin to specify volume id in any of the
    acceptable manners (vol-, volume-, and int)
    
    Also, have manager only attempt to export volumes that are in-use or available

 bin/nova-manage        |   14 ++++++++++++--
 nova/volume/manager.py |    5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

commit 22fc6fc6605b188b5176e6a573aecde8088a0e5e
Merge: 4b77a53 3b87480
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 18:10:22 2011 -0600

    Merged trunk

commit 4b77a532fd641947c9259327cef9104f689f1127
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 18:09:58 2011 -0600

    Fixed unit tests

 nova/tests/xenapi/stubs.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb727b7032104d3d3966108d846dd3e5b8a1a37d
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:59:26 2011 -0600

    Fix merge conflict

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e2f11223e7f8d09ed91636d06184180773195a19
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 15:59:02 2011 -0800

    add two more columns, set string lengths)

 .../sqlalchemy/migrate_repo/versions/001_austin.py |  148 ++++++++++----------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |   60 +++++---
 2 files changed, 114 insertions(+), 94 deletions(-)

commit 3b874805e2f7de43fd143f2b414e40ceef70e0c4
Merge: b9c96ef 87cca15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 18 23:58:58 2011 +0000

    Enable the use_ipv6 flag in unit tests by default.

commit 2b2f08dc1dfe1b55433c9122d7d42a480cdb5e67
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:57:11 2011 -0600

    Fixed unit tests

 nova/tests/xenapi/stubs.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ac447a687d306af8068bb0b721fe8b61c81d4ff6
Merge: 9750e4a b9c96ef
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 15:51:13 2011 -0800

    merge from upstream and fix small issues

commit 8c92638f89029e34717558e56aa1202958085d22
Merge: a0779f5 8e6684a
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 08:50:47 2011 +0900

    merged  to trunk rev572

commit a0779f5df2829f91bdc944e7275f44bd831643cc
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 08:49:17 2011 +0900

    fixed based on reviewer's comment

 nova/api/ec2/cloud.py     |    2 --
 nova/virt/libvirt_conn.py |    1 +
 nova/volume/driver.py     |    9 +++------
 nova/volume/manager.py    |    2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

commit 2c0f1d78927c14f1d155e617a066b09a00acb100
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Jan 18 17:40:36 2011 -0600

    Basic stubbing throughout the stack

 nova/api/openstack/servers.py |   37 ++++++++++++++++++++++++++++++++++++-
 nova/compute/api.py           |   14 ++++++++++++++
 nova/compute/manager.py       |   13 +++++++++++++
 nova/virt/fake.py             |   12 ++++++++++++
 nova/virt/xenapi/vmops.py     |    4 ++++
 nova/virt/xenapi_conn.py      |    4 ++++
 6 files changed, 83 insertions(+), 1 deletion(-)

commit 87cca15270e29666cf46adb5ea72e103c284d525
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 00:39:24 2011 +0100

    Enable the use_ipv6 flag in unit tests by default.

 nova/tests/fake_flags.py |    1 +
 1 file changed, 1 insertion(+)

commit b6ad755dcb495743c9137b0da441d264420b02b6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 00:31:51 2011 +0100

    Add an apply_instance_filter method to NWFilter driver.
    
    Adjust unit tests for both firewall drivers to actually exercise these
    code paths.

 nova/tests/test_virt.py   |   53 ++++++++++++++++++++++++++++++---------------
 nova/virt/libvirt_conn.py |    4 ++++
 2 files changed, 40 insertions(+), 17 deletions(-)

commit 13398a761da64bc51864a9e5e46155095ef6ed47
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 18 15:28:19 2011 -0800

    update status to 'error_deleting' on volumes where deletion fails

 nova/volume/manager.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 58f5b14c7dd329de435a222433186c251481f8a0
Merge: 468a9d7 b9c96ef
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:17:44 2011 -0600

    Merged trunk

commit b9c96efe7eb7eee62fbc0f2e1568679506468ca9
Merge: 943af38 7e6e3c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 23:14:03 2011 +0000

    This disables ipv6 by default.  Most use cases will not need it on and it makes dependencies more complex.

commit 943af386a9f7d963c78ea1a3b5698d377a1b8185
Merge: 5b496ed 453436b
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 23:09:14 2011 +0000

    The live_migration branch ( https://code.launchpad.net/~nttdata/nova/live-migration/+merge/44940 ) was not ready to be merged.
    
    Outstanding issues:
     - many style violations, especially in docstrings (leading spaces, extra newlines)
     - no test coverage
     - unusual defaults in the database columns (-1?)
     - unusual naming "phy_resource"
    
    The database changes in particular should preclude the original from being merged until they are correct, and for a patch of this scope some tests are really necessary for the new functionality.
    
    The patch needs further review and should not be rushed in for bexar as it commits us to a variety of data model decisions that require more input.

commit 453436bdbdb5c7f5ee9b0e6340fa913017b8e226
Merge: 18773e2 5b496ed
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 14:55:03 2011 -0800

    merge from upstream to fix conflict

commit 19aae256676e45a8147f25553398ca980b3e1bd4
Merge: d4e7eb8 5b496ed
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 17:42:00 2011 -0500

    Trunk merge.

commit a0af78323131b05a76eb7959df38f6a18e2b39ed
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 18 14:17:54 2011 -0800

    s/cleanup/volume.  volume commands will need their own ns in the long run

 bin/nova-manage |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 7e6e3c3895d050dad81c4789bd296d2b910c7c6c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 14:07:03 2011 -0800

    disable ipv6 by default

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 468a9d7645ced05b323021ed221904f26018959e
Merge: ecc2afd 5b496ed
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 15:54:45 2011 -0600

    Merged trunk

commit ecc2afda9fed4e9e69edcc470baf254fac448ce7
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 15:49:42 2011 -0600

    Plug VBD to existing instance and minor cleanup

 nova/tests/xenapi/stubs.py    |    2 +-
 nova/virt/xenapi/fake.py      |    2 +-
 nova/virt/xenapi/vm_utils.py  |   12 +++++------
 nova/virt/xenapi/vmops.py     |   45 ++++++++++++++++++++++++++++++++---------
 nova/virt/xenapi/volumeops.py |    2 +-
 nova/virt/xenapi_conn.py      |   15 ++++++++------
 6 files changed, 52 insertions(+), 26 deletions(-)

commit 25f9c308714a41c93450ae4c5b14e90615d75425
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 18 13:46:06 2011 -0800

    fixes related to #701749.  Also, added nova-manage commands to recover
    from certain states:
    
    # Delete a volume that is in an error state
    nova-manage cleanup delete_volume vol-id
    
    # reattach a volume.  this is typically required after a host reboot
    nova-manage cleanup reattach_volume vol-id

 bin/nova-manage        |   44 +++++++++++++++++++++++++++++++++++++++++++-
 nova/volume/driver.py  |   33 +++++++++++++++++++++++++++++++--
 nova/volume/manager.py |   18 ++++++++++++------
 3 files changed, 86 insertions(+), 9 deletions(-)

commit 5b496ed35c53869623e4a968ab9d310089f3bfb2
Merge: 6421a47 e8a8b14
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Jan 18 21:19:10 2011 +0000

    Implement support for streaming images from Glance when using the XenAPI virtualization backend, as per the bexar-xenapi-support-for-glance blueprint.
    
    Images may be streamed raw, or will be streamed into the right place to allow room for an MBR and partition table, if using non-raw images.  PV vs HVM detection now occurs on the image, immediately after it has been streamed.  External kernel / ramdisk are also supported in this mode.
    
    Unit test changes include a partial Glance simulator, which is stubbed in place of glance.client.Client.  This allows us to pass through the VM spawn path with either glance or objectstore backends enabled; the unit tests now cover both.  A dependency upon glance has been added to pip-requires, in order to pull the Glance client code into the venv.
    
    This includes minor fixes to nova.image.glance.  This code is expected to be heavily reworked anyway with the image-service-use-glance-clients work.

commit 6421a47cc71c4dfb5c93be2b48f202aebeb1c5a7
Merge: ea1674c 6bef91e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 20:59:11 2011 +0000

    Works around the app-armor problem of requiring disks with backing files to be named appropriately by changing the name of our extra disks.
    
    disk is fine, as is disk.local and disk.rescue.

commit 6bef91e9fe67a893bd2a1ba0ef8ef56d4b2bb72d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 12:42:20 2011 -0800

    fix test to respect xml changes

 nova/tests/test_virt.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit ef9b60f4b8d22f16c0606c5b3c2d2d40d76eac02
Merge: 47a2dc2 4577c11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 12:42:06 2011 -0800

    merged trunk

commit ea1674cf33615e29ae7e6f57988076321461b22d
Merge: 4577c11 be8b74f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 19:54:27 2011 +0000

    Add refresh_security_group_* methods to nova/virt/fake.py, as FakeConnection is the reference for documentation and method signatures that should be implemented by virt connection drivers.

commit 1862fe5ecd5265d963f8e9ec591f8eaa7b51fde3
Author: Kost <kost@isi.edu>
Date:   Tue Jan 18 14:41:32 2011 -0500

    added paste pastedeploy to nova.sh

 contrib/nova.sh |    1 +
 1 file changed, 1 insertion(+)

commit 18773e2aa53329511649fed5cdf37f5a80008f5c
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 11:34:29 2011 -0800

    authors needed for test

 .mailmap |    2 ++
 Authors  |    2 ++
 2 files changed, 4 insertions(+)

commit be8b74ff0226557df01d4bdce2c76d0157e09b8f
Merge: 11a10dc 4577c11
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 14:30:26 2011 -0500

    Merge trunk.

commit d91229f7a3b60095677e1bb76a548668c59ee9e2
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 11:01:16 2011 -0800

    revert live_migration branch

 .mailmap                       |    2 -
 Authors                        |    2 -
 bin/nova-manage                |   82 +-----------
 nova/api/ec2/cloud.py          |    2 +-
 nova/compute/manager.py        |  118 +----------------
 nova/db/api.py                 |   30 -----
 nova/db/sqlalchemy/api.py      |   64 ---------
 nova/db/sqlalchemy/models.py   |   26 +---
 nova/network/manager.py        |   14 +-
 nova/scheduler/driver.py       |  183 -------------------------
 nova/scheduler/manager.py      |   48 -------
 nova/service.py                |    4 -
 nova/virt/cpuinfo.xml.template |    9 --
 nova/virt/fake.py              |   32 -----
 nova/virt/libvirt_conn.py      |  287 ----------------------------------------
 nova/virt/xenapi_conn.py       |   30 -----
 nova/volume/driver.py          |   30 +----
 nova/volume/manager.py         |    9 +-
 setup.py                       |    1 -
 19 files changed, 17 insertions(+), 956 deletions(-)

commit 4577c11923f05ba60ec898186d3f959d86e5de4c
Merge: 3fa93ad 0cef0fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:59:12 2011 +0000

    This removes the need for the custom udev rule for iscsi devices.  It instead attaches the device based on /dev/disk/by-path/ which should make the setup of nova-volume a little easier.

commit 084eb7e96d9201e4616d49211cb80acaa717560b
Merge: be54850 3fa93ad
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 11:08:33 2011 -0600

    Merged trunk

commit 3fa93adb2047ca2b7333ab52d1d8bf15dfac9852
Merge: 8e6684a 1dc3883
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jan 18 16:39:26 2011 +0000

    Risk of Regression: This patch don’t modify existing functionlities, but I have added some.
        1. nova.db.service.sqlalchemy.model.Serivce (adding a column to database)
        2. nova.service ( nova-compute needes to insert information defined by 1 above)
    
    So, db migration is necessary for existing user, but just adding columns.

commit 2f4e7b732d5cafd09a5a73cbc01583503b8ba105
Author: jaypipes@gmail.com <>
Date:   Tue Jan 18 10:25:40 2011 -0500

    Docstrings aren't guaranteed to exist, so split() can't automatically be called on a method without first checking for the method docstring's existence. Fixes Bug #704447

 nova/api/direct.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 785c5df3d17bb158ef2c1a66ce59ee8e6d4236b1
Author: jaypipes@gmail.com <>
Date:   Tue Jan 18 10:24:20 2011 -0500

    Removes circular import issues from bin/stack and replaces utils.loads with json.loads. Fixes Bug#704424

 bin/stack |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit c9610db6c4d573568bd4b6dc390df99349b0a4ea
Author: jaypipes@gmail.com <>
Date:   Tue Jan 18 08:48:50 2011 -0500

    ComputeAPI -> compute.API in bin/nova-direct-api. Fixes LP#704422

 bin/nova-direct-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba73128770b49998a26652ff9446e927a8e8e13d
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 18 20:04:16 2011 +0900

    Fixed apply_instance_filter is not implemented in NWFilterFirewall

 nova/virt/libvirt_conn.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 11a10dc9a2fcaaf94e9c661fc9162fd5b8bd420e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 02:05:07 2011 -0500

    pep8

 nova/virt/fake.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 4243440af10f3d682d255f7283618361a6e94d57
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 02:03:52 2011 -0500

    I might have gone overboard with documenting _members.

 nova/virt/fake.py |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit d4e7eb818c9f4ec51fd3a88a0e92d557867511d4
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 23:18:46 2011 -0500

    Add rules to database, cast refresh message and trickle down to firewall driver.

 nova/api/ec2/admin.py        |   43 ++++++++++++++++++++++++++++++++++++++----
 nova/compute/api.py          |    9 +++++++++
 nova/compute/manager.py      |    5 +++++
 nova/db/api.py               |    8 ++++++++
 nova/db/sqlalchemy/api.py    |   12 ++++++++++++
 nova/db/sqlalchemy/models.py |   11 +++++++++++
 nova/virt/connection.py      |    1 +
 nova/virt/libvirt_conn.py    |   10 ++++++++++
 8 files changed, 95 insertions(+), 4 deletions(-)

commit 685bea1846032057cf5407e791a266c435dca15a
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Jan 18 11:41:05 2011 +0900

    Fixed error message in get_my_linklocal

 nova/utils.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 5ff189808d45582f0799c14eaaec687a3cf8ad5e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 17 16:47:19 2011 -0800

    openstack api fixes for glance

 nova/api/openstack/common.py  |    7 ++++++-
 nova/api/openstack/servers.py |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 3403e773f5a38c5d415e4ab66799c6e239223a0d
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 19:40:35 2011 -0500

    Stubbed-out code for working with provider-firewalls.

 nova/adminclient.py   |   21 +++++++++++++++++++++
 nova/api/ec2/admin.py |    8 ++++++++
 2 files changed, 29 insertions(+)

commit be54850d6268243d9e6deee9768b0a112c526c39
Merge: 8c79b0c 8e6684a
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 13:59:22 2011 -0600

    Merged trunk

commit e8a8b14e6b4604633313ab083821f43ba9b8a64c
Merge: b8c45af 8e6684a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jan 17 19:32:34 2011 +0000

    Merged with trunk revno 572.

commit 8c79b0c1995bd9d061c1c379c0034f49cbdb8d05
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 13:31:05 2011 -0600

    Better shutdown handling

 nova/virt/xenapi/vmops.py |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit 8e6684a58eea3ecacdde99e1940d2ae351b8465c
Merge: 3b94033 b156f7d
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 19:19:15 2011 +0000

    Change where paste.deploy factories live and how they are called.  They are now in the nova.wsgi.Application/Middleware classes, and call the __init__ method of their class with kwargs of the local configuration of the paste file.

commit b156f7d9593135a0ab3de83c25643bb0201e2747
Merge: e88bd8c 6906137
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:51:00 2011 -0500

    Merge trunk

commit 3b94033b06ccc2d503d899e9fd7a3c8c6e2a7cba
Merge: 93deb2e 6906137
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 18:49:11 2011 +0000

    Further decouple api routing decisions and move into paste.deploy configuration.  This makes paste back the nova-api binary.

commit e88bd8cd04b32818f693910fac772016a542e1da
Merge: 12a6e44 500b268
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:44:52 2011 -0500

    Merge pep8 fixes from wsgirouter branch.

commit 6906137b99181925f091ca547d019499c3bc1701
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:36:55 2011 -0500

    Clean up openstack api test fake.

 nova/tests/api/openstack/__init__.py |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit f71f815915fcbdbeec790dc3a459727764018d38
Merge: 3300e69 93deb2e
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 12:32:20 2011 -0600

    Merged trunk

commit 3300e692b61dc53ac8ae3bfdbac5bb1019983feb
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 12:21:08 2011 -0600

    Add Start/Shutdown support to XenAPI

 nova/virt/xenapi/vmops.py |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

commit 93deb2e9a375a18300eff258f2353e597932c47b
Merge: 8256524 c947f4e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 18:14:10 2011 +0000

    The Openstack API requires image metadata to be returned immediately after an image-create call.
    
    This is accomplished by having the ImageService create a 'queued' image in Glance.
    
    When the image is subsequently uploaded, the image will go from 'queued' -> 'saving' -> 'queued'.
    
    Related Future Work:
    
    The ImageService needs to be cleaned up so that there is a canonical set of attributes (id, status, etc), and a canonical set of values ('queued', 'saving', etc). Right now, EC2 is fairly coupled to LocalImageService and S3ImageService while OpenStackAPI is coupled to GlanceImageService; ideally, we should be able mix-and-match from any of these.

commit 58c647501254fe6274d348cf768280e3773fe1ec
Merge: 500b268 8256524
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:05:26 2011 -0500

    merge trunk.

commit c947f4ed1214c83434436a8e5263233f945aa4f9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:34:01 2011 -0600

    Fixing whitespace

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 523d7788acd6ecb0835dfda73d4cd5540a651a85
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:21:56 2011 -0600

    Returning image_metadata from snapshot()

 nova/compute/api.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit b5445da21b9ae91308e2adecc7aaa8e56e278d50
Merge: 0d6882f 8256524
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:16:36 2011 -0600

    Merging trunk

commit 40565d190087200278048d871e4d07938fe8c4a1
Merge: 9f7d476 8256524
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 10:43:46 2011 -0600

    Merged trunk

commit a56bc070784c7ea23528025463ea7f0bee133150
Merge: 525544e 8256524
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jan 17 04:12:27 2011 +0900

    merged trunk rev569

commit 525544e689334346305ecc11552105fc1b32a5dd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sun Jan 16 14:54:35 2011 +0900

    merged to rev 561 and fixed based on reviewer's comment

 bin/nova-manage              |   30 ++++----
 nova/compute/manager.py      |   65 +++++++++++-----
 nova/db/api.py               |   30 --------
 nova/db/sqlalchemy/api.py    |  111 +++++----------------------
 nova/db/sqlalchemy/models.py |   40 +++++-----
 nova/network/api.py          |    1 +
 nova/scheduler/driver.py     |  173 +++++++++++++++++++++++++++---------------
 nova/scheduler/manager.py    |   25 +++---
 nova/service.py              |   29 +------
 nova/virt/fake.py            |   31 ++++++++
 nova/virt/libvirt_conn.py    |   86 ++++++++++++++++-----
 nova/virt/xenapi_conn.py     |   30 ++++++++
 nova/volume/manager.py       |    9 +--
 13 files changed, 365 insertions(+), 295 deletions(-)

commit 825652456ac826a2108956ba8a9cbdc8221520dc
Merge: 34ceed1 69c11c2
Author: Andy Smith <code@term.ie>
Date:   Sat Jan 15 02:25:00 2011 +0000

    Adds a developer interface with direct access to the internal inter-service APIs and a command-line tool based on reflection to interact with them.
    
    Example output from command-line tool:
    
    (.nova-venv)termie@preciousroy:p/nova/easy_api % ./bin/stack
    usage: stack [options] <controller> <method> [arg1=value arg2=value]
    
      `stack help` should output the list of available controllers
      `stack <controller>` should output the available methods for that controller
      `stack help <controller>` should do the same
      `stack help <controller> <method>` should output info for a method
    
    ./bin/stack:
      -?,--[no]help: show this help
      --[no]helpshort: show usage only for this module
      --[no]helpxml: like --help, but generates XML output
      --host: Direct API host
        (default: '127.0.0.1')
      --port: Direct API host
        (default: '8001')
        (an integer)
      --project: Direct API project
        (default: 'proj1')
      --user: Direct API username
        (default: 'user1')
    
    Available controllers:
       reflect   Reflection methods to list available methods.
       compute   API for interacting with the compute manager.
    
    (.nova-venv)termie@preciousroy:p/nova/easy_api % ./bin/stack help reflect
    Available methods for reflect:
       get_controllers   List available controllers.
       get_methods       List available methods.
       get_method_info   Get detailed information about a method.
    
    (.nova-venv)termie@preciousroy:p/nova/easy_api % ./bin/stack help reflect get_method_info
    get_method_info(method):
    
    Get detailed information about a method.
    
    (.nova-venv)termie@preciousroy:p/nova/easy_api % ./bin/stack reflect get_method_info method=/reflect/get_method_info
    {u'args': [[u'method']],
     u'doc': u'Get detailed information about a method.',
     u'name': u'get_method_info',
     u'short_doc': u'Get detailed information about a method.'}

commit 9750e4ab3e41d3f4205b0df56ef8200744c327a0
Merge: eb6021a 34ceed1
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:57:42 2011 -0800

    merge from upstream

commit 69c11c27c20c74aced491ecfe78a80872ad6232a
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:54:36 2011 -0800

    pep8 fixes... largely to things from trunk?

 nova/api/ec2/cloud.py     |    3 ++-
 nova/db/sqlalchemy/api.py |    6 +++---
 nova/network/manager.py   |    6 ++----
 nova/virt/libvirt_conn.py |    3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)

commit 073336d206e124f7bebbe8a239193a8727fef7ed
Merge: 731126b 34ceed1
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:48:48 2011 -0800

    merge from upstream

commit 731126b299da757588656fa72b291ca4da96b5fe
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:44:47 2011 -0800

    pep8

 nova/db/sqlalchemy/models.py |    2 +-
 nova/tests/test_console.py   |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 4f920a8316afc4becdabbc0a75959a8e8017836f
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:43:34 2011 -0800

    remove print statement

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 34ceed1ce114ab01eca06eced00a204ae71dc3db
Merge: beec236 d0713a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 20:14:32 2011 +0000

    This branch fixes two outstanding bugs in compute.  It also fixes a bad method signature in network and removes an unused method in cloud.

commit beec23614e0a268d01341ab2c06c5718161f2d80
Merge: 2639a17 f160304
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 19:54:37 2011 +0000

    Re-removes TrialTestCase.  It was accidentally added in by some merges and causing issues with running tests individually.

commit d0713a6a2149274eeeef6fd22e7da4706a8190ec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:36:48 2011 -0800

    removed rpc in cloud

 nova/api/ec2/cloud.py |    1 -
 1 file changed, 1 deletion(-)

commit 9f84aff45733788546464329ea05ade653dcd1d4
Merge: bf0d75e f160304
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:22:12 2011 -0800

    merged trial fix again

commit bf0d75e6f78bc3c66dce8481d44e52c40a9addb0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:20:46 2011 -0800

    fix bad function signature in create_networks

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f16030423d43272c5c3bea7fe51a0e03f0d95846
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:19:51 2011 -0800

    undo accidental removal of fake_flags

 nova/test.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9f7d476635db2b90f90c8bd19f1134291b3ac1a9
Merge: 912e434 2639a17
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 13:16:43 2011 -0600

    Merged trunk

commit 23332a656759176466c7a86c3cfeb99b35690c2b
Merge: 76e8754 e0dcd52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:06:01 2011 -0800

    merged lp:~vishvananda/nova/lp703012

commit e0dcd52b98de4bfe9843b148decf22526713dea2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:00:47 2011 -0800

    remove TrialTestCase again and fix merge issues

 nova/test.py                  |   99 +----------------------------------------
 nova/tests/test_api.py        |    4 +-
 nova/tests/test_log.py        |    8 ++--
 nova/tests/test_middleware.py |    2 +-
 nova/tests/test_twistd.py     |    2 +-
 5 files changed, 10 insertions(+), 105 deletions(-)

commit 76e875476848ee7f4aa483f65484903115e2bb49
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 10:25:44 2011 -0800

    import re, remove extra call in cloud.py.  Move get_console_output to compute_api

 nova/api/ec2/cloud.py |   17 +----------------
 nova/compute/api.py   |   19 ++++++++++---------
 2 files changed, 11 insertions(+), 25 deletions(-)

commit 912e4343cf2622fa42aa4e1c5eac392ce1be96e0
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 11:49:59 2011 -0600

    Create and use a generic handler for RPC calls to compute.

 nova/compute/api.py |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 2639a17fb52cf248115c24327cb9888e7e7960d7
Merge: 9fb1e7b cf0e5bd
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 17:49:42 2011 +0000

    Create and use a generic handler for RPC calls to compute.

commit cf0e5bd3eeb6b175b53df6ae0a0ef8957ec7ba13
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 11:24:45 2011 -0600

    Create and use a generic handler for RPC calls

 nova/compute/api.py |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

commit 8040d0de838ab475b5f54dad85307df579eb0935
Merge: ed0b531 9fb1e7b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 10:47:38 2011 -0600

    Merged trunk

commit fe22186eb989b0302e1cb26a5b92cd77ce47bb9b
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 14 16:13:50 2011 +0000

    OS-55: Inject network settings in linux images

 nova/virt/conn_common.py                           |   50 ++++++++++++++++++++
 nova/virt/disk.py                                  |   19 +++++---
 nova/virt/libvirt_conn.py                          |   24 ++--------
 nova/virt/xenapi/vm_utils.py                       |   36 ++++++++++++++
 nova/virt/xenapi/vmops.py                          |    7 +++
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    1 +
 6 files changed, 110 insertions(+), 27 deletions(-)

commit b8c45af21d38e476d8f667089fc03b347d7969e2
Merge: c71d5d4 9fb1e7b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 14 15:51:42 2011 +0000

    Merged with trunk revno 565.

commit 47a2dc24b08ca4be7d114d95b42dc4faf19d9fad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 02:24:57 2011 -0800

    use .local and .rescue for disk images so they don't make app-armor puke

 nova/virt/libvirt.xml.template |   10 +++++-----
 nova/virt/libvirt_conn.py      |   18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

commit 9fb1e7b1f627b10fda1249754e4bc612d697110c
Merge: 8a4eb03 01a1ad3
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 14 07:49:41 2011 +0000

    Implements the blueprint for enabling the setting of the root/admin password on an instance.
    
    It uses a new xenapi plugin 'agent' that handles communication to/from the agent running on the guest.

commit 8a4eb03ec32144381e8defa791e923675a1c2314
Merge: c468658 449913d
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Jan 14 07:14:25 2011 +0000

    OpenStack Compute (Nova) IPv4/IPv6 dual stack support
    http://wiki.openstack.org/BexarIpv6supportReadme
    
    Tested with
     unit test
     smoke test
    
    No conflict with current branch r 562.
    Fixed comment by Soren and Vish

commit 449913debbe8533d734b618394f5c8b4eeece936
Merge: 4ff82fe c468658
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Fri Jan 14 13:59:06 2011 +0900

    Merged to rev.563

commit c468658d553d3fd9cb8d9d39c7dcbc3f2ffbc640
Merge: 14a42e4 600e397
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 04:44:15 2011 +0000

    This change introduces support for Sheepdog (distributed block storage
    system) which is proposed in
    https://blueprints.launchpad.net/nova/+spec/sheepdog-support
    
    
    Requirements:
    
     - libvirt 0.8.7 or later
     - qemu 0.13.0 or later
    
    
    How to test:
    
    1. install Sheepdog
    
      The software is available from SourceForge.net:
        https://sourceforge.net/projects/sheepdog/files/
    
      See also:
        http://wiki.qemu.org/Features/Sheepdog/Getting_Started#Install
    
    2. run the sheepdog daemon on each hosts
    
        $ sheep /store_dir
    
      /store_dir is a directory to store sheepdog objects. The directory
      must be on the filesystem with an xattr support.
    
    3. format the sheepdog storage
    
        $ collie cluster format --copies=3
    
    4. run nova-volume
    
        $ nova-volume --volume_driver=nova.volume.driver.SheepdogDriver

commit 600e397515ec425958a24c35a4440d85bd47133a
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:46:10 2011 +0900

    Sort Authors

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 67f17444ab914dbc51d635ed2e01dcd0c592ace7
Merge: 25ada0e 14a42e4
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:39:54 2011 +0900

    Merge trunk

commit 25ada0ee2864ead19df82abf9419f956c0c39b2a
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:25:34 2011 +0900

    Update Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit eb6021ad9489185418f545a54e1d415ba6c3429d
Merge: 380a279 14a42e4
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:06:17 2011 -0800

    merge from upstream:

commit 380a279809bdba00734286950c7d3dd085241ad1
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:04:24 2011 -0800

    pep8 fixes

 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 715b83a299a933468f01206fe6f771a51d00c3f5
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:03:07 2011 -0800

    update migration script to add new tables since merge

 .../sqlalchemy/migrate_repo/versions/001_austin.py |  547 ++++++++++++++++++++
 .../migrate_repo/versions/001_first_database.py    |  547 --------------------
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |  189 +++++++
 .../migrate_repo/versions/002_update_to_trunk.py   |  125 -----
 4 files changed, 736 insertions(+), 672 deletions(-)

commit 4ff82fe82729c46e64242a3a3a8aea1aff6ffeb1
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 14 11:44:35 2011 +0900

    sort Authors

 Authors |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f5f0819e1c1cb40c5f4f7ceeb66d2be603eb8163
Merge: b3778ed 14a42e4
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 14 11:40:50 2011 +0900

    Merged with r562

commit 14a42e45cf1a29fb7622a5f704b275335ab04b79
Merge: 24e6372 21c4f64
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 00:19:14 2011 +0000

    This modifies libvirt to use CoW images instead of raw images.  This is much more efficient and allows us to use the snapshotting capabilities available for qcow2 images.  It also changes local storage to be a separate drive instead of a separate partition.
    
    I'm proposing this branch for review to get feedback.  I may have inadvertently broken a few things.  Comments and possible issues:
    
    1. I haven't tested the other hypervisors.  I may have broken libvirt xen support and uml support with this patch.
    2. Is it useful to have a use_cow_images param, or should it just be automatic for qemu/kvm and turned off for everything else.
    3. create_image is a large annoying method.  I tried to clean it up a bit, but it could probably use a bit more refactoring.
    4. disk.py seems to be only used by the hypervisors, so perhaps it should move into virt dir.
    5. disk.py/partition() is unused now. Should we leave it in or throw it away?
    
    Comments welcome

commit 500b268d0ef83b4770f9883690564e458cf94247
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 13 18:57:29 2011 -0500

    pep8.  Someday I'll remember 2 blank lines between module methods.

 nova/wsgi.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit fa5024b384953d30e91117a0c2874560e086aa58
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 08:55:56 2011 +0900

    remove ">>>MERGE" iin nova/db/sqlalchemy/api.py

 nova/db/sqlalchemy/api.py |    1 -
 1 file changed, 1 deletion(-)

commit c57ccba743c54786e28317194000bcf22dc5b69e
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 08:26:25 2011 +0900

    checking based on pep8

 bin/nova-manage           |    1 -
 nova/compute/manager.py   |   10 ++++++----
 nova/scheduler/driver.py  |    6 +++---
 nova/scheduler/manager.py |    2 --
 nova/virt/libvirt_conn.py |   36 +++++++++++++++++-------------------
 5 files changed, 26 insertions(+), 29 deletions(-)

commit 12a6e44015dfb761f9a5212525d2927a27f73813
Merge: f58b4f7 16a8f4a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 13 18:26:18 2011 -0500

    Merge trunk + wsgirouter.

commit 16a8f4a98973ae5e5541f2b43db4dc36eaed2647
Merge: 73e49ac 24e6372
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 13 18:23:18 2011 -0500

    Merge trunk and fix how nova-combined works with paste.deploy.
    Refactor some of the bits of nova-api into nova/wsgi for working with paste,
    for a little bit of de-duplication between nova-api and nova-combined.
    Makes a cleaner interface for how paste configs can set flags.

commit 21c4f64d9df9c76a5a77ae4e92c600a3b4457418
Merge: 914b055 24e6372
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 15:15:25 2011 -0800

    merged trunk

commit 914b0554a092d2b38f292942dc4d7ddea5d99b9a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 15:13:31 2011 -0800

    Modified per sorens review.
    
    Moved disk.py
    Removed disk.partition
    Changed docstrings
    Use pid to find nbd devices

 nova/compute/disk.py      |  247 ---------------------------------------------
 nova/virt/disk.py         |  186 ++++++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py |   10 +-
 3 files changed, 190 insertions(+), 253 deletions(-)

commit 0d6882fb2a3ec3b45b28120d00b8b4ff5fbc9187
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 17:08:23 2011 -0600

    Fix for Pep-8

 nova/image/glance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b3778edddb4e58e2518adbdca4621bea8c419c97
Merge: bc0c5ba 24e6372
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Jan 14 06:50:44 2011 +0900

    Merged with r561

commit bc0c5ba5026610013759fa731d21e2287e3d709a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Jan 14 06:25:41 2011 +0900

    Moved commands which needs sudo to nova.sh

 contrib/nova.sh           |    3 +++
 nova/network/linux_net.py |    5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 2d642f64dcf0bcabf739aa1373eb2794112f9be4
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Jan 14 06:18:16 2011 +0900

    Added netaddr for pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 98cb2518467374ae87d7dbc70890f79bb5084960
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 14:01:21 2011 -0600

    Marking snapshots as private for now

 nova/compute/api.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit e10c6b9046b04af3201d2993f16e50556b052d79
Merge: 2c7ffd2 24e6372
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 13:48:36 2011 -0600

    Merging Trunk

commit 2c7ffd2dab260c2bfc308ccd0c8d52e57a015413
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 13:48:01 2011 -0600

    Fixing Image ID workaround and typo

 nova/api/openstack/images.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 6bfcd0e63f247553207dcbfe2a3ad0d1403eec5a
Merge: ea28b31 d737335
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 04:39:35 2011 +0900

    Fixed based on the comments from code review. Merged to trunk rev 561

commit 24e6372891be1b6dd81de0af89ece88f256a32e9
Merge: efd116d 27480db
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 19:09:50 2011 +0000

    Add a new method to firewall drivers to tell them to stop filtering a particular instance. Call it when an instance has been destroyed.
    
    Use dict()s (keyed off id's) instead of set()s for keeping track of instances and security groups in the iptables firewall driver. __eq__ for objects from sqlalchemy fetched in different sessions doesn't work as expected, so I needed to explicitly filter on ID.

commit d7373358443bb64f72b65ee18e35b8d90518f011
Merge: b887c9b 24e6372
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 03:58:02 2011 +0900

    merged to trunk rev 561

commit ed0b531c57ebbf5a3e28b8cd0a1d02bad712705b
Merge: ff66069 efd116d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 12:39:07 2011 -0600

    Merged trunk

commit b887c9bb04aabccf268abcccd32d9ab1c53ebfc0
Merge: 41a9ad5 efd116d
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 03:37:41 2011 +0900

    merge trunk rev560

commit efd116da3da634156f6acb8190d21f6ef24e0235
Merge: a60a9fc 3df3c23
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 18:24:06 2011 +0000

    Fixes related to how EC2 ids are displayed and dealt with.
    
    Additionally adds two flags that define a template string that is used for the internal naming of things (like the volume name of a logical volume on disk), default being similar to the EC2 format, so that the ids are easy to match while testing when you may need to manually delete or check something.

commit 41a9ad538cc70d4f8f39eb51c1d137917967b04c
Merge: 5afd984 1e746ce
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 03:02:17 2011 +0900

    Get reviewed and fixed based on comments.
    Merged latest version.

commit ff6606938749ce5f1a8e430b24d279cde7556c1b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 11:24:11 2011 -0600

    Make libvirt and XenAPI play nice together

 nova/compute/manager.py |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 27480db8f9b9df08b69a00e1155c64e6590d79f3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 18:08:53 2011 +0100

    Spelling is hard. Typing even moreso.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 373a0eb1de5f8457d5147f6957dcdd4f940f8943
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 17:57:06 2011 +0100

    Revert changes to version.py

 nova/version.py |    4 ----
 1 file changed, 4 deletions(-)

commit 01a1ad3d2cdf61c73ca3ab7aa14e82f0e4450103
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:53:13 2011 -0600

    Minor code cleanups

 nova/virt/xenapi/vmops.py |    1 -
 1 file changed, 1 deletion(-)

commit 22b21cde84f200f6fd45ba5f2cfcb6a54e595f1b
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:52:28 2011 -0600

    Minor code cleanups

 nova/tests/test_xenapi.py |    2 +-
 nova/virt/xenapi/vmops.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 7af8f5ac5fc02abe79dec3cf3651b6f0a9deb78c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:51:31 2011 -0600

    Minor code cleanups

 nova/compute/manager.py   |    2 +-
 nova/tests/test_xenapi.py |    4 ----
 nova/virt/xenapi/vmops.py |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

commit 702d1bd5e58c15e5b7f43e9d56bd591d728ecb71
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:47:23 2011 -0600

    Make driver calls compatible

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f26032b24b4eb22b5a81646756f6a8071e367c24
Merge: 752bed3 a60a9fc
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:45:26 2011 -0600

    Merged trunk

commit 752bed3311f09e7a43e642231e1638b4252f74a6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:44:29 2011 -0600

    Stubbed out XenServer rescue/unrescue

 nova/virt/xenapi/vmops.py |    8 ++++++++
 nova/virt/xenapi_conn.py  |    8 ++++++++
 2 files changed, 16 insertions(+)

commit 441a6d363116535147d32e778f08a3c2648360e7
Merge: 0002d9e a60a9fc
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:38:40 2011 -0600

    Added unit tests for the Diffie-Hellman class. Merged recent trunk changes

commit 953f506949951c4aad18c5bdfcb0dc9b82a95c63
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 16:59:14 2011 +0100

    Bring NWFilter driver up to speed on unfilter_instance.

 nova/version.py           |    4 ++++
 nova/virt/libvirt_conn.py |    8 ++++++++
 2 files changed, 12 insertions(+)

commit 0002d9ea9690cc82f7fac05881c30bfd9581702b
Merge: 0240e04 aa20d2c
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 09:58:42 2011 -0600

    Replaced home-grown Diffie-Hellman implementation with the M2Crypto version supplied by Soren

commit 868b8e1ea069170afa7a4130a0505e9ea18039b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 16:54:20 2011 +0100

    Instead of a set() to keep track of instances and security groups, use a dict(). __eq__ for stuff coming out of sqlalchemy does not do what I expected (probably due to our use of sessions).

 nova/virt/libvirt_conn.py |   36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

commit a60a9fcab59e5486e166d51d47c84d6b4a9ede26
Merge: c474caf a46c753
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 14:59:10 2011 +0000

    Fixes broken call to __generate_rc in auth manager.

commit c474cafe69fe71cbbfcf2a5a478f7708823e1f87
Merge: 621cf8e f3332a1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Jan 13 14:14:19 2011 +0000

    Fixes bug #701055.  Moves code for instance termination inline so that the manager doesn't prematurely mark an instance as deleted.  Prematurely doing so causes find calls to fail, prevents instance data from being deleted, and also causes some other issues.

commit 8089898b7909c9ab7a55da14d0d5b08358e6d720
Merge: b5f60e0 c474caf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 15:11:40 2011 +0100

    Merge trunk.

commit b5f60e099b849ab2640eb37d903f33bf094008c2
Merge: ea4cde3 621cf8e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 15:09:03 2011 +0100

    Merge trunk

commit 40e13153d3a8ceef80fa40a59145672df796baa8
Merge: 1c694e9 621cf8e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu Jan 13 21:02:14 2011 +0900

    Merge trunk

commit 1c694e9093c627bd50b35e9fb0ae11adf315a154
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu Jan 13 20:59:02 2011 +0900

    Revert r510 and r512 because Josh had already done the same work

 nova/virt/libvirt_conn.py |   25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

commit 0e307db62b9e8b0dcc38518822ab69f6bb12f052
Merge: a6b82b3 621cf8e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 01:57:53 2011 -0800

    merged trunk

commit 515b4fb9ec53f1fbcfc8e502a51e52f67706cc40
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Jan 13 16:59:29 2011 +0900

    Fixed Authors

 Authors |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 01c14510b3b2eaa3f05ceb403c9b07872b52eaec
Merge: a502632 621cf8e
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Jan 13 16:50:07 2011 -0500

    Merged with 557

commit a5026320b4ae14f0171ee450fe79ea687ab5647a
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Thu Jan 13 15:58:05 2011 +0900

    Fixed missing _().
    Fixed to follow logging to LOG changes.
    Fixed merge miss (get_fixed_ip was moved away).
    Update some missing comments.

 nova/network/linux_net.py |   14 +++++++-------
 nova/tests/test_api.py    |    1 -
 nova/utils.py             |   17 ++---------------
 3 files changed, 9 insertions(+), 23 deletions(-)

commit d4793e9f678d3388fcbacacb027fa81195aa3f34
Merge: 3419fef 621cf8e
Author: termie <code@term.ie>
Date:   Wed Jan 12 20:19:28 2011 -0800

    merge from upstream and fix leaks in console tests

commit 3419feff16e1974aa353188eee11609fc786148d
Author: termie <code@term.ie>
Date:   Wed Jan 12 19:38:27 2011 -0800

    make sure get_all returns

 nova/compute/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 621cf8e156582b3ff4dd44409324cc3a5f9aecf4
Merge: 27369c1 4eb2e46
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 02:04:22 2011 +0000

    Fixes a typo in the name of a variable.

commit f3332a1a63db657b84b52cf17ff46a853dfd063c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Jan 13 01:25:08 2011 +0000

    Fixes #701055.  Move instance termination code inline to prevent manager from prematurely marking it as destroyed.

 nova/virt/libvirt_conn.py |   27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

commit 4eb2e469fc3780ff1399bd610a308bbdebdcfd1d
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 17:12:20 2011 -0800

    fix invalid variable reference in cloud api

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5e304292a99162c7d5f5aa88a111a9dcada0ed10
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 16:57:39 2011 -0800

    fix indentation

 nova/db/sqlalchemy/migrate_repo/manage.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f5c0c64ec9d397048dfd7b8d5c007ec0fa39ec5
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 16:57:04 2011 -0800

    add support for database migration

 bin/nova-manage                                    |   20 +-
 nova/db/migration.py                               |   38 ++
 nova/db/sqlalchemy/__init__.py                     |   28 -
 nova/db/sqlalchemy/migrate_repo/README             |    4 +
 nova/db/sqlalchemy/migrate_repo/manage.py          |    4 +
 nova/db/sqlalchemy/migrate_repo/migrate.cfg        |   20 +
 .../migrate_repo/versions/001_first_database.py    |  547 ++++++++++++++++++++
 .../migrate_repo/versions/002_update_to_trunk.py   |  125 +++++
 nova/db/sqlalchemy/migration.py                    |   72 +++
 nova/db/sqlalchemy/models.py                       |   45 --
 nova/service.py                                    |   13 -
 run_tests.py                                       |    9 +-
 tools/pip-requires                                 |    1 +
 13 files changed, 838 insertions(+), 88 deletions(-)

commit a46c753d8f65e948bd67f70a13544763c91645c4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 12 16:56:21 2011 -0800

    fix changed call to generate_rc

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7bc94bb337bc3cdb0270a8316f8be097aff26ec1
Merge: df0be03 27369c1
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Jan 13 09:28:35 2011 +0900

    merged with r555

commit df0be0318cf22d250bdf9abdd9ed3b91bb83f0ea
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Jan 13 09:10:44 2011 +0900

    fixed method signature of modify_rules
    fixed unit_test for ipv6

 nova/tests/test_network.py |   17 +++++++++--------
 nova/virt/libvirt_conn.py  |    2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

commit 3df3c2359369fc74d78cb566545fbc54d0627c7e
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:21:18 2011 -0800

    standardize volume ids

 nova/tests/test_cloud.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 1f59fcb405e16869c9cc94f54cda6e6aae23fc40
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:20:13 2011 -0800

    standardize volume ids

 nova/api/ec2/cloud.py    |   17 ++++++++++++-----
 nova/tests/test_cloud.py |   11 +++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

commit 5fbc74784918abb509aba88400e6ed9a1d01deb9
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:03:08 2011 -0800

    standardize on hex for ids, allow configurable instance names

 nova/api/ec2/cloud.py        |   14 +++++---------
 nova/db/api.py               |    4 ++++
 nova/db/sqlalchemy/models.py |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

commit 1fa45c2ce52612455d88d1fdabec38d4bcc01ca7
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:01:23 2011 -0800

    correct volume ids for ec2

 nova/api/ec2/cloud.py    |    3 ++-
 nova/tests/test_cloud.py |   11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

commit c966028d5123940aecf4710a15082ae10fcc76e6
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 14:56:26 2011 -0800

    correct formatting for volume ids

 nova/api/ec2/cloud.py    |   12 ++++++------
 nova/tests/test_cloud.py |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

commit f58b4f74e3a87590476adba51b2e440ba53e7ef6
Merge: 773b7f8 73e49ac
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 17:47:43 2011 -0500

    Merge trunk + wsgirouter

commit 73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd
Merge: 038c9c7 27369c1
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 17:41:15 2011 -0500

    Merge trunk

commit 038c9c7663ee1a884726521afe181d30ebe00cc6
Merge: 6ebf9bb 6730742
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 17:35:09 2011 -0500

    Merge trunk and handle flagfiles with kid-gloves in nova-api.  Rename some flags for clarity.

commit 27369c18bde257c068ffc51e5ef51b479ad351d0
Merge: c5c5b77 a58fe18
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 12 22:24:16 2011 +0000

    Fix test failures on Python 2.7 by eagerly loading the fixed_ip attribute on instances. No clue why it doesn't affect python 2.6, though.

commit 204e5a2d9a481abba64ce31c12510d7e1bf288a6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 16:03:51 2011 -0600

    Adding TODO to clarify status

 nova/compute/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit afaec68e7a43499aaa07f8ea45cbb92341891b10
Merge: eb146fd c5c5b77
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 15:49:44 2011 -0600

    Merging trunk

commit a58fe1849ad7473f7e437e07611aa9c9611cf5e6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 12 22:45:44 2011 +0100

    Do joinedload_all('fixed_ip.floating_ips') instead of joinedload('fixed_ip')

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c5c5b77a405cf1adb6d6289be24d4385ff6d5ea9
Merge: aa20d2c 982067a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 21:44:09 2011 +0000

    Initialize logging in nova-manage so we don't see errors about missing handlers.

commit aa20d2c7ce4567b1bab540a1d4c06b6ef5e42571
Merge: 6730742 c29fe49
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jan 12 21:34:05 2011 +0000

    _wait_with_callback was changed out from under suspend/resume. fixed.

commit 7f2a4fdf5e43620081e163fc46f2ca4fdefd18f3
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 15:07:51 2011 -0600

    Make rescue/unrescue available to API

 nova/api/openstack/servers.py |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 982067aefcd656de7751623e272d9b6cf1447dc3
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 15:12:08 2011 -0500

    Stop error messages for logs when running nova-manage.

 bin/nova-manage |    2 ++
 1 file changed, 2 insertions(+)

commit eb146fd75183d80e50f8a67021dae565f4915b2e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 14:01:20 2011 -0600

    Fixing stub so tests pass

 nova/tests/api/openstack/fakes.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8074b9f7e50174f05aad9ec06186f48da7812d94
Merge: f797567 6730742
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 13:47:40 2011 -0600

    Merging trunk

commit f7975676ddc3928caa369464ca2c4191d890f466
Merge: 69a2612 31f4000
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 13:46:34 2011 -0600

    Merging trunk, small fixes

commit 67307428d6d6f47f3215f485a1af720013a5c2ae
Merge: 0a0f966 70ac0df
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Wed Jan 12 19:39:25 2011 +0000

    This branch adds a backend for using RBD (RADOS Block Device) volumes in nova via libvirt/qemu.
    This is described in the blueprint here: https://blueprints.launchpad.net/nova/+spec/ceph-block-driver
    
    Testing requires Ceph and the latest qemu and libvirt from git. Instructions for installing these can be found on the Ceph wiki (http://ceph.newdream.net/wiki/#Getting_Ceph and http://ceph.newdream.net/wiki/QEMU-RBD).

commit 773b7f8477d2258d2640682fd3fee24c4f6b5cdd
Merge: 2c7dfbf 6ebf9bb
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:37:29 2011 -0500

    Merge version matching url change from wsgirouter branch.

commit 6ebf9bb2db0aaad607e35e516bb6d7ffc971c5de
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:36:36 2011 -0500

    Fix url matching for years 2010-forward.

 etc/nova-api.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2c7dfbfd5307a122317cdab4c477b0852115e240
Merge: 18a83d9 88641cd
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:33:40 2011 -0500

    Update config for launching logger with cleaner factory.

commit 18a83d92d10bb84eddec786c7327153983c97d57
Merge: f45133f 03c9f49
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:31:28 2011 -0500

    Merge trunk.

commit 88641cd9784b562c9df25643d6b525dd7bf940ce
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:30:12 2011 -0500

    Update paste config for ec2 request logging.

 etc/nova-api.conf |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

commit 0240e044b281f0c7af0a23b0ab1b3854a6e6b94a
Merge: ea1f5ad 0a0f966
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 12 13:22:30 2011 -0600

    merged changes from trunk

commit ea1f5ad611a84931dc4a02b3c4bf2c6ef89f7360
Merge: 5b5fa0e 3d57735
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 12 13:22:01 2011 -0600

    cleaned up prior merge mess

commit 03c9f498e6b972e001ec67e6d57c309960b7f9f0
Merge: 2997c6c 3d57735
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:20:05 2011 -0500

    Merge trunk (logging, etc).

commit 0c4e8879ea14f79e906ae853032f67f027d58e04
Merge: 47bc72e 0a0f966
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 12:50:17 2011 -0600

    Merged trunk

commit 0a0f966fc7e31099574a3fc8eeaf30ac7fc151ad
Merge: 3d57735 3e9d08b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 12 18:49:42 2011 +0000

    My previous modifications to novarc had CLOUDSERVER_AUTH_URL pointing to the ec2 api port. Now it's correctly pointing to os api port.

commit 70ac0dfea7a55c3580d4a9cd65752f894dfaa222
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Wed Jan 12 10:17:48 2011 -0800

    Check for whole pool name in check_for_setup_error

 nova/volume/driver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3e9d08bded2f504a5dd03712c82e981f73ae16ed
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 12 14:16:51 2011 -0400

    change novarc template from cc_port to osapi_port. Removed osapi_port from bin scripts.

 bin/nova-api         |    1 -
 bin/nova-combined    |    1 -
 nova/auth/manager.py |    2 +-
 nova/flags.py        |    1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

commit 47bc72e5ec27bec349dcfc9468af6325f0a51019
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 12:10:26 2011 -0600

    Start to add rescue/unrescue support

 nova/api/openstack/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit c29fe496c1124369a8b9b77aeee84e8296f964f9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jan 12 11:28:05 2011 -0600

    fixed pause and resume

 nova/virt/xenapi/vmops.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c71d5d41bb6e5d7a046a76563eed75a4d6e77e90
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 17:05:40 2011 +0000

    Fixed another issue in _stream_disk, as it did never execute _write_partition.
    Fixed fake method accordingly.
    Fixed pep8 errors.

 nova/tests/xenapi/stubs.py   |    2 +-
 nova/virt/xenapi/vm_utils.py |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit f3dba791b9f10fec759dce0fe4e2abc214e3fd61
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 14:37:03 2011 +0000

    pep8 fixes

 nova/tests/xenapi/stubs.py   |    2 +-
 nova/virt/xenapi/vm_utils.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 32eac05776d18dcbde49aa022f149fd597907cbe
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 14:28:50 2011 +0000

    Fixing the stub for _stream_disk as well

 nova/tests/xenapi/stubs.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7d56986366a349f5636f8de6018fb52e9befd440
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 14:17:22 2011 +0000

    Fix for _stream_disk

 nova/virt/xenapi/vm_utils.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 52122c0d60c8da5fc561e69fe90f8e0656e98a89
Merge: b945fed 3d57735
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 22:02:31 2011 +0900

    Merged with r551

commit b945fed7779bddf799aa4a180d44745052d2da8c
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 21:55:36 2011 +0900

    Support IPv6 firewall with IptablesFirewallDriver

 nova/db/sqlalchemy/api.py |    2 +-
 nova/virt/libvirt_conn.py |   66 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 16 deletions(-)

commit a6a2a057d8a027781e4270c9abc4f815c67293ec
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 10:12:18 2011 -0500

    Fixed syntax errors

 nova/api/ec2/cloud.py     |    2 +-
 nova/utils.py             |    2 +-
 nova/virt/libvirt_conn.py |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

commit b4600b088b61a5653be9a93a0497c9d80916c8c0
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed Jan 12 21:12:25 2011 +0900

    Check whether 'device_path' has ':' before splitting it

 nova/virt/libvirt_conn.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ba0f974c126c2a24ca6b1464ccc4a06be071b04e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:54:58 2011 +0000

    PEP8 fixes, and switch to using the new LOG in vm_utils, matching what's
    just come in from trunk.

 nova/tests/glance/stubs.py   |    2 +-
 nova/tests/test_xenapi.py    |   14 +++++------
 nova/virt/xenapi/fake.py     |    3 ++-
 nova/virt/xenapi/vm_utils.py |   55 ++++++++++++++++++++----------------------
 nova/virt/xenapi/vmops.py    |    3 ++-
 5 files changed, 37 insertions(+), 40 deletions(-)

commit 6cdea8c9b024194d81ae724245b2f595d99606fe
Merge: 3461b9c 3d57735
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:43:29 2011 +0000

    Merged with trunk.

commit 3461b9cf49201eb88ed65473eccf395382c25611
Merge: 6f9408d 2f9ac0f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:35:13 2011 +0000

    Merged with Orlando's recent changes.

commit 3d57735caf78fd421da6e660c4d56c635706fa7d
Merge: 5227bfc b94f3a6
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Jan 12 11:34:16 2011 +0000

    Added support of availability zones for compute.
    models.Service got additional field availability_zone and was created ZoneScheduler that make decisions based on this field.
    Also replaced fake 'nova' zone in EC2 cloud api.

commit ef86d16f15276581932ab50029e895c9cbf655af
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 12 12:29:28 2011 +0100

    Eagerly load fixed_ip property of instances.

 nova/db/sqlalchemy/api.py |    2 ++
 1 file changed, 2 insertions(+)

commit 5227bfc76657a5af08fc47d3544bf6b06b66e8bf
Merge: 76fdd66 2493979
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Jan 12 11:14:27 2011 +0000

    Had to abandon the other branch (~annegentle/nova/newscript) because the diffs weren't working right for me. This is a fresh branch that should be merged correctly with trunk. Thanks for your patience. :)

commit 6f9408d7ac38d5c857e1e1cdd92c49e000742734
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:08:08 2011 +0000

    Added unit tests for the xenapi-glance integration.  This adds a glance
    simulator that can stub in place of glance.client.Client, and enhances the
    xapi simulator to add the additional calls that the Glance-specific path
    requires.
    
    The test itself is just the spawn test, but now we run through with
    xenapi_image_service set to "objectstore", and then again set to "glance".

 nova/tests/glance/__init__.py |   20 ++++++++++
 nova/tests/glance/stubs.py    |   37 ++++++++++++++++++
 nova/tests/test_xenapi.py     |   28 ++++++++++----
 nova/tests/xenapi/stubs.py    |   24 +++++++++---
 nova/virt/xenapi/fake.py      |   86 ++++++++++++++++++++++++++++++++++++-----
 nova/virt/xenapi/vm_utils.py  |   35 +++++++++--------
 6 files changed, 191 insertions(+), 39 deletions(-)

commit 0a33f1ed87ffb2ad3ff6c41848e2bb254a62e3da
Merge: 04cd324 76fdd66
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 18:46:01 2011 +0900

    Merged with 549

commit 04cd3241f442f1c6a9fd030ab47b4d15e79ec032
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 18:37:18 2011 +0900

    Change command to get link local address
    Remove superfluous code

 nova/utils.py             |    4 ++--
 nova/virt/libvirt_conn.py |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 76fdd667f2efe7e2dc710fe0254437d176efb45c
Merge: 78882d4 7cfca52
Author: root <sleepsonthefloor@gmail.com>
Date:   Wed Jan 12 09:24:57 2011 +0000

    This branch adds web based serial console access.  Here is an overview of how it works (for libvirt):
    
    1. User requests an ajax console for an instance_id (either through OS api, or tools/euca-get-ajax-console)
      a. api server calls compute worker to complete request
      b. compute worker parses an instance's xml to locate its pseudo terminal (/dev/pts/x)
      c. compute worker spawns an ajaxterm daemon, bound to a random port in a specified range.  socat is used to connect to /dev/pts/x.  Note that ajaxterm was modified in the following ways:
        i. dies after 5 minutes of inactivity
        ii. now requires token authentication.  Previously it was trivial to hijack an ajaxterm
      d. compute worker returns ajaxterm connect information to the api server: port, host, token
      e. api server casts connect information to the nova-ajax-console-proxy (a new service)
      f. api server returns a url for the ajaxterm (eg. http://nova-ajax-console-proxy/?token=123)
    2. User now has a url, and can paste it in a browser
      a. Browser sends request to https://nova-ajax-console-proxy/?token=123
      b. nova-ajax-console-proxy maps token to connect information
      c. nova-ajax-console-proxy constructs a proxy to the ajaxterm that is running on the host machine.  This is now done with eventlet, though previously it was done using twisted
    3. User interacts with console through web browser
    
    
    NOTE: For this to work as expected, serial console login must be enabled in the instance.  Instructions for how to do this on ubuntu can be found here: https://help.ubuntu.com/community/SerialConsoleHowto.  Note that you must actively log out of the serial console when you are finished, otherwise the console will remain open even after the ajaxterm term session has ended.
    
    Also note that nova.sh has been modified in this branch to launch nova-ajax-console-proxy.

commit 6a4b4f0767f8518e57384ff88efafaa853d642a4
Merge: 7a6b7c3 78882d4
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 17:47:54 2011 +0900

    Merged with r548

commit 7a6b7c32ed25d1edc58b924ce5621dc0d8de9686
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 03:50:09 2011 -0500

    Fixed bug

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d368d182d7fa4b0f0cd9c7c5ad1e804b19365b26
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 12:05:27 2011 +0900

    Add DescribeInstanceV6 for backward compatibility

 contrib/boto_v6/ec2/connection.py |    2 +-
 nova/api/ec2/cloud.py             |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

commit 2f9ac0fd02115ff9af2e96f5a92f3442d273c6b0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 02:41:44 2011 +0000

    Fixed test environments.
    Fixed bugs in _fetch_image_objecstore and _lookup_image_objcestore (objectstore was broken!)
    Added tests for glance
    
    NEED TO:
    - add SR & PBD records to fake xenapi session for find_sr to work
    - fake somehow stream in _fetch_image_glance

 nova/tests/test_xenapi.py    |   26 ++++++++++++++++++++++----
 nova/tests/xenapi/stubs.py   |   11 +++++++++++
 nova/virt/xenapi/vm_utils.py |   22 +++++++++++++---------
 nova/virt/xenapi/vmops.py    |    7 ++++++-
 4 files changed, 52 insertions(+), 14 deletions(-)

commit 1629dcf935a29c01d4e4ad509e33356daa93b051
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 11:26:22 2011 +0900

    Fixed for pep8
    Remove temporary debugging

 bin/nova-manage           |   10 +++++-----
 nova/db/api.py            |    3 +++
 nova/db/sqlalchemy/api.py |    4 ++++
 nova/utils.py             |    1 -
 4 files changed, 12 insertions(+), 6 deletions(-)

commit c14425541a1e77eb2049b94060bc0c4cd1df578f
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 02:15:09 2011 -0500

    changed exception class

 nova/utils.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 78882d496b94915b8a6e2f2edce13e8129299982
Merge: 03fef88 54f6237
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Jan 12 02:04:09 2011 +0000

    Changing DN creation to do searches for entries.
    
    This change adds additional interoperability (as many directory servers and LDAP admins use cn, or another attribute, as the naming attribute). DN creation will incur a slight performance penalty for doing so, as DNs must be searched for now. User and project creation skip this performance penalty, as there is no need to search for an entry that is being created.

commit 03fef88e884d49fb5f24d7798ba6f74c6da6864f
Merge: 6d895bf d09772b
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jan 12 01:34:05 2011 +0000

    Fixes bug #701575: run_tests.sh fails with a meaningless error if virtualenv is not installed. Proposed fix tries to use easy_install to install virtualenv if not present.
    
    Test by doing "run_tests.sh -V" on a system that has easy_install installed but not virtualenv.

commit 7cfca5208766539ae368a9f0b8daba6103041f7f
Merge: eb48bdc 78882d4
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 11 17:32:12 2011 -0800

    merge trunk, fix conflict

commit 0cef0fe332859ce8b46d5d8d1745a63d377e1052
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 17:21:39 2011 -0800

    more useful prefix and fix typo in string

 nova/volume/driver.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 32316a4ed6b4c175af8dd8ad3c345e54f161fd1c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 17:07:24 2011 -0800

    use by-path instead of custom udev script

 nova/volume/driver.py |    2 +-
 tools/iscsidev.sh     |   41 -----------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

commit 6d895bf668c388fa4c2f92a1b9a6531550246273
Merge: 0d15149 0ac0cd5
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 11 23:34:21 2011 +0000

    Quick bugfix.  Also make the error message more specific and unique in the equivalent code in the revoke method.

commit b94f3a6cce3a49853c2426b87740fc467a4a787b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Jan 12 02:19:05 2011 +0300

    remove extra whitspaces

 nova/db/sqlalchemy/models.py |    2 +-
 nova/tests/test_scheduler.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 0ac0cd5976ad6b053aa011071194614ee4f70c48
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 11 18:03:15 2011 -0500

    Raise meaningful exception when there aren't enough params for a sec group rule.

 nova/api/ec2/cloud.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit eb48bdce5ad131245977dff50030f5561b8809c1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 11 14:33:20 2011 -0800

    bah - pep8 errors

 nova/compute/api.py       |    4 ++--
 nova/tests/test_cloud.py  |    2 +-
 nova/virt/fake.py         |    1 +
 nova/virt/libvirt_conn.py |    7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

commit d01b546ae574f74b9c4c07a039c2c52cf0ed3bfb
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Jan 12 01:27:36 2011 +0300

    resolve pylint warnings

 nova/api/ec2/cloud.py        |   14 ++++----
 nova/db/api.py               |    1 -
 nova/db/sqlalchemy/models.py |    1 +
 nova/scheduler/zone.py       |    8 ++---
 nova/service.py              |    3 +-
 nova/tests/test_cloud.py     |   45 ++++++++++++------------
 nova/tests/test_scheduler.py |   78 +++++++++++++-----------------------------
 7 files changed, 59 insertions(+), 91 deletions(-)

commit 24939796b9b38703ab4f57ab6912df0fe9a8daa3
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Jan 11 16:24:38 2011 -0600

    Removing script file

 contrib/nova-CC-installer.sh |  481 ------------------------------------------
 1 file changed, 481 deletions(-)

commit 0d15149103c57ad419e65fd5e66f49bcd3334b27
Merge: 31f4000 77e75fe
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 11 21:54:30 2011 +0000

    Read Full Spec for implementation details and notes on how to boot an instance using OS API.
    http://etherpad.openstack.org/B2RK0q1CYj
    
    Look at these notes for known issues:
    http://etherpad.openstack.org/BXOU0TTj9M

commit d09772b6b1701eaf1ca02b9afafd93b4cafe2342
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jan 11 14:59:51 2011 -0500

    Added my name to Authors list

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 69a2612be4e865063fa5982462673f1843e8befc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 11 13:54:23 2011 -0600

    Changes per Edays comments

 nova/api/openstack/images.py |    2 +-
 nova/compute/api.py          |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 31f400078bb42ad6084a807288542ebb9f4460db
Merge: b8de522 ea4cde3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 11 19:49:18 2011 +0000

    Fixed a number of issues with the iptables firewall backend:
     * Port specifications for firewalls come back from the data store as integers, but were compared as strings.
     * --icmp-type was misspelled as --icmp_type (underscore vs dash)
     * There weren't any unit tests for these issues.

commit 5b5fa0eb4b9ffd597b6e49b2cef5a2ad9028d55f
Merge: d91a06b b8de522
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 11 12:19:29 2011 -0600

    merged trunk changes

commit d91a06b4fea7e45fd2e9abe35803cd9deb5d8e92
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 11 12:17:39 2011 -0600

    Removed unneeded SimpleDH code from agent plugin. Improved handling of plugin call failures.

 nova/virt/xenapi/vmops.py                         |   14 ++-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   95 ---------------------
 2 files changed, 12 insertions(+), 97 deletions(-)

commit 4c66b2bb2a1f2b44acf9fa62216b78faa10fdfd7
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jan 11 13:11:30 2011 -0500

    Now tries to install virtualenv via easy_install if not present

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 0528a70562afcdb56bbc83359c1443459a6684ba
Merge: ecb6363 b8de522
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 11 12:05:51 2011 -0600

    Merging trunk

commit a96c12f13421a7c27e7cb1459f73ca4bd5cdf917
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jan 11 16:11:08 2011 +0000

    fixed issue in pluginlib_nova.py

 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit af759efab2f3de57a03a54b9c10c9d606dd1b668
Merge: 1a6fba0 1e746ce
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jan 11 16:17:49 2011 +0300

    Trunk merge and conflcts resolved

commit b8de5221368c4055fc593c6d0d7164f2be956924
Merge: 1e746ce d6a66d1
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jan 11 12:24:58 2011 +0000

    Implementation of xs-console blueprint (adds support for console proxies like xvp)
    
    
    If you spin up the nova-console service, you should be able to see the xvp.conf being edited, and the xvp daemon started/stopped if you exercise the openstack console api (consoles sub-resource on servers)

commit ea4cde387c04e450c7bea9407772ca4276ea54f4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 11 11:06:16 2011 +0100

    Fixed a number of issues with the iptables firewall backend:
     * Port specifications for firewalls come back from the data store as integers, but were compared as strings.
     * --icmp-type was misspelled as --icmp_type (underscore vs dash)
     * There weren't any unit tests for these issues.

 nova/tests/test_virt.py   |   44 +++++++++++++++++++++++++++++++++++++++++++-
 nova/virt/libvirt_conn.py |    6 +++---
 2 files changed, 46 insertions(+), 4 deletions(-)

commit b11fbe9b005d98dbab0d4088624927f5f5210717
Merge: 15b81ab 1e746ce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 11 10:34:28 2011 +0100

    Merge trunk

commit 5afd9848ad09414c00062ceebdad45bca0604888
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Tue Jan 11 18:01:23 2011 +0900

    Add support for EBS volumes to the live migration feature.
    Currently, only AoE is supported.

 Authors                                           |    1 +
 bin/nova-manage                                   |    9 +-
 nova/api/ec2/cloud.py                             |   13 +-
 nova/compute/api.py                               |    3 +-
 nova/compute/manager.py                           |   55 ++---
 nova/db/api.py                                    |    5 +
 nova/db/sqlalchemy/api.py                         |   14 ++
 nova/db/sqlalchemy/models.py                      |    1 -
 nova/livemigration_test/UT/computeManager.test.py |   12 +-
 nova/livemigration_test/UT/nova-manage.test.py    |    3 +
 nova/network/manager.py                           |    1 -
 nova/scheduler/driver.py                          |    9 +
 nova/service.py                                   |    2 +-
 nova/service.py.THIS                              |  222 ---------------------
 nova/virt/libvirt_conn.py                         |   45 +++--
 nova/volume/driver.py                             |   26 ++-
 nova/volume/manager.py                            |   12 +-
 17 files changed, 143 insertions(+), 290 deletions(-)

commit 77e75fefc7c9c4085a64eabb5ef44ffd5fff3229
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 11 03:38:40 2011 -0400

    Changed shared_ip_group detail routing

 nova/api/openstack/shared_ip_groups.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 77258c8c5e8f94fbcb15fc4be83cf623ac414bd6
Merge: 2222851 b8de522
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 11 02:47:35 2011 -0400

    Changed shared_ip_group detail routing

commit 1e746ce1ef027aa2549a8fba2904f3797eff0702
Merge: 490f1d8 324d8fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 06:20:00 2011 +0000

    A few more changes to the smoeketests.  Allows smoketests to find the nova package from the checkout.  Adds smoketests for security groups.  Also fixes a couple of typos.

commit 490f1d82b3f61c6d5d67380899c791863b7bd70b
Merge: 9e199de 3b4582b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 05:49:46 2011 +0000

    Fixes the metadata forwarding to work by default.
    
    This branch also moves get_my_ip into flags.py from utils.py and sets up a flag called my_ip.  Any flag that was using get_my_ip can just use '$my_ip' as the default value.  This allows a user to change all ips by changing one flag.

commit 9e199deb9585c537e55f1c847bdb42ea1c9f960b
Merge: 9d5ef60 8d04f68
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 11 05:44:44 2011 +0000

    Adds support to nova-manage to modify projects

commit d47183b2685787cb250fe4025cbeb3f94455de54
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Jan 11 03:09:48 2011 +0000

    Add glance to pip-requires, as we're now using the Glance client code from
    Nova.

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 6ba35582eec774253d725ab7a6959fdc12cea215
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jan 11 01:50:14 2011 +0000

    Now removing kernel/ramdisk VDI after copy
    Code tested with PV and HVM guests
    Fixed pep8 errors
    
    Could not run tests - test environment broken on dev machine

 nova/tests/test_xenapi.py                          |   81 ++++++++++++--------
 nova/virt/hyperv.py                                |    2 +-
 nova/virt/xenapi/vm_utils.py                       |   20 +++--
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |    3 +-
 4 files changed, 65 insertions(+), 41 deletions(-)

commit cd39a9814c80ad92857ba3200c443d3155993dd9
Merge: bae57e8 9d5ef60
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 16:10:03 2011 -0600

    merged trunk changes

commit 4edfa8ea26f8e820674e8bebbe34b6ed5885a69b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 10 13:44:45 2011 -0800

    consolidate boto_extensions.py and euca-get-ajax-console, fix bugs
    from previous trunk merge

 bin/nova-ajax-console-proxy |   13 +++++++++++-
 nova/api/ec2/cloud.py       |    2 +-
 nova/boto_extensions.py     |   40 ------------------------------------
 nova/compute/api.py         |    6 +++---
 tools/euca-get-ajax-console |   48 ++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 63 insertions(+), 46 deletions(-)

commit bae57e82767b4877bae5c2dcb6fe052291d16b32
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 15:33:10 2011 -0600

    Fixed issues raised by reviews

 nova/compute/api.py                               |    2 +-
 nova/virt/xenapi/vmops.py                         |   15 +++++++--------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |   16 ----------------
 3 files changed, 8 insertions(+), 25 deletions(-)

commit 9d5ef60e4126f3c5f742d24d4e6a617a7cff20eb
Merge: 16c420e 72e9f08
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 10 21:29:45 2011 +0000

    xenapi_conn was not terminating utils/LoopingCall when an exception was occurring. This was causing the eventlet Event to have send_exception() called more than once (a no-no).
    
    This would have affected more than just pause/unpause, but any XenApi call that raised an exception.

commit 220259d6ca9131c738a2d4ea9cd28ca64edbcfeb
Merge: 9b99e38 16c420e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 10 13:06:36 2011 -0800

    merge trunk

commit d6a66d13718a41d5146d713ced192e795e72457e
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 15:00:30 2011 -0600

    whups, fix accidental change to nova-combined

 bin/nova-combined |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 94f3782eb27fd63c64845f9ab59039d07ac7ba8c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 14:59:32 2011 -0600

    remove uneeded superclass

 bin/nova-combined      |    3 ++-
 nova/console/driver.py |   60 ------------------------------------------------
 nova/console/fake.py   |    3 +--
 nova/console/xvp.py    |    7 ++++--
 4 files changed, 8 insertions(+), 65 deletions(-)

commit 16c420ee156f8c7716c7e84b66af35cbccf5090c
Merge: 5e9eab1 ec8e777
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 10 20:29:42 2011 +0000

    Bugfix.

commit 5e9eab1d477189fb3283842375d0665370cc5a1a
Merge: 4830cb5 2c0b306
Author: jaypipes@gmail.com <>
Date:   Mon Jan 10 19:59:55 2011 +0000

    Adds the requisite infrastructure for automating translation templates import/export to Launchpad.

commit 2c0b306a688d5e8674afcbbfd38ee0c58e836a63
Merge: 4830cb5 00808c0
Author: jaypipes@gmail.com <>
Date:   Mon Jan 10 14:36:22 2011 -0500

    Merge babel support from Monty and fix a missing _() in nova/wsgi.py

commit 00808c08c6935872ad8842ce093b515b68bdf3de
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Jan 10 11:26:38 2011 -0800

    Added babel/gettext build support.

 babel.cfg       |    2 +
 locale/nova.pot | 2130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.cfg       |   14 +
 setup.py        |   15 +-
 4 files changed, 2159 insertions(+), 2 deletions(-)

commit 97ff39bd1d83f3cfa412f291087e025a91d147cd
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jan 10 18:26:40 2011 +0000

    Can now correctly launch images with external kernels through glance.
    
    Further tests and Pep8 fixes to come.

 nova/virt/xenapi/vm_utils.py                       |   23 +++++++++++----
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   30 +++++++++++++++++++-
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |    4 +--
 3 files changed, 48 insertions(+), 9 deletions(-)

commit 583788478b91d8c5d5dadd58884eddd87cdc4986
Merge: b2d6bb8 4830cb5
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 11:37:06 2011 -0600

    re-merged in trunk to correct conflict

commit ec8e7773b79ed52aa2950db185ead881c77632f7
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 10 10:57:13 2011 -0500

    Fix describe_availablity_zones versobse.

 nova/api/ec2/cloud.py     |    3 ++-
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

commit 8d04f68f00d5cd37f13028a4ee5909530ea9c92c
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 15:13:30 2011 +0000

    Typo fix

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb3667b95ceead8a677fdfa24abf2a56baf12992
Merge: a0ec77b 4830cb5
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 09:09:59 2011 -0600

    merged changes from trunk

commit 20a326c1724fe74b196db5695a0ac2ecf040c0d8
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 15:02:29 2011 +0000

    Adding modify option for projects

 bin/nova-manage |    5 +++++
 1 file changed, 5 insertions(+)

commit 4830cb5d8959c06fbe480481823bc922a2a59e3e
Merge: d9d334b c856662
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 10 14:49:34 2011 +0000

    Fixes describe_instances to filter by a list of instance_ids.
    
    Also adds a test to verify that we don't break this again.

commit 5177483ffed3a6a74bff07442f1b9f9f29c1d2c5
Merge: 9531ec9 4830cb5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 14:41:13 2011 +0000

    Merge from trunk

commit 9531ec9a508ee204191e6e41261ec788b28d1d4b
Merge: 5412e72 cbd67da
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 14:40:37 2011 +0000

    Merge from trunk

commit d9d334bb5520bbbc4af6760cabb9bfd022ec13ef
Merge: d968ce5 4a9a025
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 10 14:14:37 2011 +0000

    Late import module for register_models() so it doesn't create the db before flags are loaded.
    
    This is a quick fix because trunk is broken for anything but the default database.  I really think we ultimately need to remove all code that runs in __init__.py

commit d968ce5b92181a9551f9cd36c899595ca726fb99
Merge: c556d07 5eb5373
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 10 12:19:59 2011 +0000

    Checks for existence of volume group using vgs instead of checking to see if /dev/nova-volumes exists.  The dev is created by udev and isn't always there even if the volume group does exist.

commit c556d071ce02d258adeb7af4aada4536defed21a
Merge: c5b1fcd 15b81ab
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 10 10:49:39 2011 +0000

    Add a new firewall backend for libvirt, based on iptables.

commit 15b81abbd23f033fc9e35a7d49b8f65d2ae76586
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 10 11:32:17 2011 +0100

    Create LibvirtConnection directly, rather than going through libvirt_conn.get_connection. This should remove the dependency on libvirt for tests.

 nova/tests/test_virt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 72e9f0819837da68c52f5604e83385037fdcdfb2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 10 05:12:48 2011 -0400

    Fixed xenapi_conn wait_for_task to properly terminate LoopingCall on exception

 nova/tests/xenapi/stubs.py |    2 +-
 nova/virt/xenapi_conn.py   |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit f9d1a59fc10425b0a9b82edca857c771e6be9809
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 10 04:40:57 2011 -0400

    Fixed xenapi_conn wait_for_task to properly terminate LoopingCall on exception

 nova/virt/xenapi_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d09511edeef2a8f6dc866ea3011bd8cc4632ac38
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 10 04:20:11 2011 -0400

    Fixed xenapi_conn wait_for_task to properly terminate LoopingCall on exception

 nova/tests/xenapi/stubs.py |   24 ++++++++++++++++++++++++
 nova/virt/xenapi_conn.py   |   15 +++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

commit c8566628d4c15bcaf16baf8fca2a31528e7eac13
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jan 9 23:53:51 2011 -0800

    optimize to call get if instance_id is specified since most of the time people will just be requesting one id

 nova/api/ec2/cloud.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 6d05c3e5d9112aead1db23e942f24605a3301af9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jan 9 23:01:10 2011 -0800

    fix describe instances + test

 nova/api/ec2/cloud.py    |   14 ++++++++------
 nova/tests/test_cloud.py |   18 +++++++++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

commit 3b4582b5db905a6dcadda31be27c9f340d7fe5cf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jan 9 18:08:54 2011 -0800

    Moved get_my_ip into flags because that is the only thing it is being used for and use it to set a new flag called my_ip

 nova/flags.py                     |   26 +++++++++++++++++++-------
 nova/network/linux_net.py         |    2 +-
 nova/network/manager.py           |    2 +-
 nova/tests/api/openstack/fakes.py |    2 +-
 nova/utils.py                     |   13 -------------
 5 files changed, 22 insertions(+), 23 deletions(-)

commit c5b1fcdc76693f1cad846616a7259d126689c351
Merge: b4ca59a bc3d288
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 9 20:19:30 2011 +0000

    fixes Document make configuration by updating nova version mechanism to conform to rev530 update

commit bc3d288abb6b1cae1465490b3df99a201be8bdc5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 9 11:13:19 2011 -0800

    alphbetized Authors

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5424690912a6edc2a64bfbbd44120e52a85c7f48
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 9 09:25:27 2011 -0800

    added myself to authors and fixed typo to follow standard

 Authors            |    2 +-
 doc/source/conf.py |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 346bd0e7c93757f940f133179b36657302d4296f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Jan 8 17:46:22 2011 -0800

    typo correction

 doc/source/conf.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ed84e51475471c5ae37eacdd4d5c93ef91ebcf10
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Jan 9 01:40:51 2011 +0000

    fixed small glitch in _fetch_image_glance
     virtual_size = imeta['size']
    
    changed to
    
     virtual_size = int(meta['size'])

 nova/virt/xenapi/vm_utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 16eeac71055ffa9fe0fc7a13032da4e6397121b1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Jan 8 17:40:06 2011 -0800

    fixed doc make process for new nova version (rev530) machanism

 doc/source/conf.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4a9a02575bacb493b57dd83744561a77516bd6ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 8 16:39:12 2011 -0800

    late import module for register_models() so it doesn't create the db before flags are loaded

 nova/service.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 5eb5373af5dd8f062975b4c42e12f95569f7e41b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 8 10:04:22 2011 -0800

    use safer vgs call

 nova/volume/driver.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b4ca59a68ff4a6af2967b8342b9240f0092f27a4
Merge: 3885195 d757a1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 8 16:35:02 2011 +0000

    Return proper region info in describe_regions.

commit 325330840ebe87da8e5943735b8956c8dfc4d112
Merge: 19ffc12 3885195
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jan 8 15:35:50 2011 +0100

    Merge with trunk

commit b2d6bb841857599096467470ec704e6696317829
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Fri Jan 7 19:04:22 2011 -0600

    change API classname to match the way other API's are done.

 nova/api/openstack/consoles.py |    4 ++--
 nova/console/__init__.py       |    1 +
 nova/console/api.py            |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

commit d79600c1029ab91de8a81809df9efddc762351c0
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:42:38 2011 -0800

    small cleanups

 nova/api/openstack/servers.py |    2 +-
 nova/db/sqlalchemy/models.py  |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 9f8719b334df28521154be8587bd7d30c431a993
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Jan 8 00:25:54 2011 +0000

    First cut at implementing partition-adding in combination with the Glance
    streaming.  Untested.

 nova/virt/xenapi/vm_utils.py |   43 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

commit 8fe01c087943ca9b46d25c84d4408b752461e6bd
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:05:06 2011 -0800

    some small cleanups

 nova/compute/api.py       |    6 +-----
 nova/tests/test_direct.py |    4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

commit 89ac4c78aa8796a1910b1b710043cc7eabb6c68d
Merge: b8fc639 0ed247f
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:03:53 2011 -0800

    merged from upstream and made applicable changes

commit 3885195ba05ca5317975797760a0cf81b5e4c647
Merge: 0ed247f a29bba7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 23:24:42 2011 +0000

    Adds a mechanism to programmatically determine the version of Nova. The designated version is defined in nova/version.py. When running python setup.py from a bzr checkout, information about the bzr branch is put into nova/vcsversion.py which is conditionally imported in nova/version.py.
    
    In short, you can now do:
    
    >>> import nova.version
    >>> nova.version.canonical_version_string()
    '2011.1'
    >>> nova.version.version_string()
    '2011.1-dev'
    >>> nova.version.version_string_with_vcs()
    u'2011.1-newlog2:soren@linux2go.dk-20110107130049-g2cbri7t80vsg2h1'
    
    It's also consumed by the docs and setup.py, so this ought to be the canonical place for updating version information from now on.

commit d757a1a10f0cbc5a3c0f5b1427d1d526584298ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 7 23:22:52 2011 +0000

    Return region info in the proper format.

 nova/api/ec2/cloud.py |    1 +
 1 file changed, 1 insertion(+)

commit af5af6155690baf55c30f6a70c0c9f829f107802
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 7 23:11:41 2011 +0000

    Now that we aren't using twisted we can vgs to check for the existence of the volume group

 nova/volume/driver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a29bba7e9f57b97085902fa97d17de32da8044cb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jan 8 00:02:24 2011 +0100

    s/canonical_version/canonical_version_string/g

 doc/source/conf.py |    2 +-
 setup.py           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6e0665415a65bc800b4c6f2778d66e944cbbe81e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 22:56:11 2011 +0000

    Fix indentation.

 nova/virt/xenapi/vm_utils.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 09a8b83c5fca2ba6ad250b0224b2297bff2306a2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 23:44:47 2011 +0100

    s/string_with_vcs/version_string_with_vcs/g

 nova/log.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fedf946c7d04465fb958707e143d8de558ea4321
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 22:28:59 2011 +0000

    Some fixes to _lookup_image_glance: fix the return value from lookup_image,
    attach the disk read-only before running pygrub, and add some debug logging.

 nova/virt/xenapi/vm_utils.py |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

commit a0ec77b597713fd9a4be5bb7b892eba4ac53e625
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:56:32 2011 -0600

    Reverted formatting change no longer necessary

 nova/api/openstack/servers.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 18b8d8307d0fc008f62dd8eeeedb351a954a3471
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:51:28 2011 -0600

    removed a merge conflict line I missed before

 nova/compute/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 253652adb578aee227b95dec3a5f854cac51bf4b
Merge: 5d9ad54 0ed247f
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:49:12 2011 -0600

    merged trunk changes

commit b8fc639af336630c56ce3807639a5e26c0d07982
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 13:02:55 2011 -0800

    set the hostname factory in the service init

 nova/api/ec2/cloud.py     |    7 ++++---
 nova/compute/api.py       |   22 +++++-----------------
 nova/tests/test_direct.py |    2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

commit 5d9ad54cc38283d0b946779f4235f54370b12489
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:50:43 2011 -0500

    incorporated changes suggested by eday

 nova/api/openstack/servers.py |    9 +++------
 nova/compute/api.py           |   13 +++++++------
 nova/compute/manager.py       |    1 +
 3 files changed, 11 insertions(+), 12 deletions(-)

commit 509c3b02f171d47ff9bc8cbbb3f0ac7cd1e888b3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 21:44:27 2011 +0100

    Add copyright and license info to version.py

 nova/version.py |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 0ed247f360f77f0a4a469a8d3b155ac5fcfa509c
Merge: 05ccbb7 5e34b63
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Jan 7 20:29:35 2011 +0000

    Fixes issue in trunk with downloading s3 images for instance creation.

commit 5ca8ec42037ed4e2a1475bf29064f61068308687
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 20:26:25 2011 +0000

    Fix pep8 errors.

 nova/image/glance.py         |    2 +-
 nova/virt/xenapi/vm_utils.py |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

commit e92f0a9352bf7de0f42951b5b6f1bb452a609bf6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 20:19:59 2011 +0000

    Many fixes to the Glance integration.

 nova/virt/xenapi/vm_utils.py |   75 +++++++++++++++++++-----------------------
 nova/virt/xenapi_conn.py     |    3 ++
 2 files changed, 36 insertions(+), 42 deletions(-)

commit 05ccbb75c45aa3c348162043495e1a3d279e5b06
Merge: cbd67da 149ea34
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 20:09:54 2011 +0000

    Wrap logs so we can:
    * use a "context" kwarg to track requests all the way through the system
    * use a custom formatter so we get the data we want (configurable with flags)
    * allow additional formatting for debug statements for easer debugging
    * add an AUDIT level, useful for noticing changes to system components
    * use named logs instead of the general logger where it makes sesnse

commit 149ea349592a9fa60057e290e7659aad65b6cf65
Merge: 8952629 cbd67da
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 14:49:07 2011 -0500

    Merge trunk.

commit 8952629c576498c3b576a1f9085a8d1b850e8639
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 14:09:38 2011 -0500

    pep8 fixes

 bin/nova-logspool |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cbd67da1ae2a24462767a5a2aad0861792652c09
Merge: 3d7b8d3 01bb7d0
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 18:45:17 2011 +0000

    Bug #699910: Nova RPC layer silently swallows exceptions
    
    Log exceptions thrown during message handling.

commit 3d7b8d3288f239f9768e36e2a5c4e6203d7e3e65
Merge: e33102d 2ea4af0
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 18:40:02 2011 +0000

    Bug #699912: When failing to connect to a data store, Nova doesn't log which
    data store it tried to connect to
    
    Log FLAGS.sql_connection when failing to connect, to aid debugging.

commit 01bb7d0c941c1cdb27e354c7f037fe0056a87770
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 18:15:29 2011 +0000

    Bug #699910: Nova RPC layer silently swallows exceptions
    
    Log exceptions thrown during message handling.

 nova/rpc.py |    1 +
 1 file changed, 1 insertion(+)

commit b23dece0d29d295f6ee140b96230ed27c7fd1268
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jan 7 18:11:41 2011 +0000

    pv/hvm detection with pygrub updated for glance

 nova/virt/xenapi/vm_utils.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 2ea4af0f3059ef2aee6e25db8849a39248983d30
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 18:11:04 2011 +0000

    Bug #699912: When failing to connect to a data store, Nova doesn't log which
    data store it tried to connect to
    
    Log FLAGS.sql_connection when failing to connect, to aid debugging.

 nova/db/sqlalchemy/__init__.py |    5 +++--
 nova/service.py                |    7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 4a2b505f3e70879506b96af833a1f794bd5e60e0
Merge: 147693e e011239
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 11:29:32 2011 -0600

    Resolved merge differences

commit 147693e45c7be174c54e39160869ca9a83bb4fff
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 11:04:53 2011 -0600

    Additional cleanup prior to pushing

 nova/api/__init__.py                              |   14 +-----
 nova/api/openstack/servers.py                     |    2 -
 nova/compute/api.py                               |   54 ++++++---------------
 nova/db/api.py                                    |    5 --
 nova/db/sqlalchemy/api.py                         |   23 ---------
 nova/virt/xenapi/vmops.py                         |    6 +++
 nova/virt/xenapi_conn.py                          |    1 -
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    8 +--
 8 files changed, 29 insertions(+), 84 deletions(-)

commit 5d02ee9e5f1502de2d379ce1acbc7e6bae1732f1
Merge: 80d10d9 e33102d
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 7 10:57:53 2011 -0600

    Merged with trunk

commit 80d10d960d0d472bf9a1d35bce081fb350c98a35
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 7 10:56:41 2011 -0600

    Fixing unescaped quote in nova-CC-install.sh script plus formatting fixes to multinode install

 contrib/nova-CC-installer.sh                       |   11 +-
 doc/.autogenerated                                 | 1609 --------------------
 doc/source/adminguide/multi.node.install.rst       |    2 -
 doc/source/api/autoindex.rst                       |   99 --
 doc/source/api/nova..adminclient.rst               |    6 -
 doc/source/api/nova..api.ec2.admin.rst             |    6 -
 doc/source/api/nova..api.ec2.apirequest.rst        |    6 -
 doc/source/api/nova..api.ec2.cloud.rst             |    6 -
 .../api/nova..api.ec2.metadatarequesthandler.rst   |    6 -
 doc/source/api/nova..api.openstack.auth.rst        |    6 -
 .../api/nova..api.openstack.backup_schedules.rst   |    6 -
 doc/source/api/nova..api.openstack.faults.rst      |    6 -
 doc/source/api/nova..api.openstack.flavors.rst     |    6 -
 doc/source/api/nova..api.openstack.images.rst      |    6 -
 doc/source/api/nova..api.openstack.servers.rst     |    6 -
 .../api/nova..api.openstack.sharedipgroups.rst     |    6 -
 doc/source/api/nova..auth.dbdriver.rst             |    6 -
 doc/source/api/nova..auth.fakeldap.rst             |    6 -
 doc/source/api/nova..auth.ldapdriver.rst           |    6 -
 doc/source/api/nova..auth.manager.rst              |    6 -
 doc/source/api/nova..auth.signer.rst               |    6 -
 doc/source/api/nova..cloudpipe.pipelib.rst         |    6 -
 doc/source/api/nova..compute.disk.rst              |    6 -
 doc/source/api/nova..compute.instance_types.rst    |    6 -
 doc/source/api/nova..compute.manager.rst           |    6 -
 doc/source/api/nova..compute.monitor.rst           |    6 -
 doc/source/api/nova..compute.power_state.rst       |    6 -
 doc/source/api/nova..context.rst                   |    6 -
 doc/source/api/nova..crypto.rst                    |    6 -
 doc/source/api/nova..db.api.rst                    |    6 -
 doc/source/api/nova..db.sqlalchemy.api.rst         |    6 -
 doc/source/api/nova..db.sqlalchemy.models.rst      |    6 -
 doc/source/api/nova..db.sqlalchemy.session.rst     |    6 -
 doc/source/api/nova..exception.rst                 |    6 -
 doc/source/api/nova..fakerabbit.rst                |    6 -
 doc/source/api/nova..flags.rst                     |    6 -
 doc/source/api/nova..image.service.rst             |    6 -
 doc/source/api/nova..manager.rst                   |    6 -
 doc/source/api/nova..network.linux_net.rst         |    6 -
 doc/source/api/nova..network.manager.rst           |    6 -
 doc/source/api/nova..objectstore.bucket.rst        |    6 -
 doc/source/api/nova..objectstore.handler.rst       |    6 -
 doc/source/api/nova..objectstore.image.rst         |    6 -
 doc/source/api/nova..objectstore.stored.rst        |    6 -
 doc/source/api/nova..quota.rst                     |    6 -
 doc/source/api/nova..rpc.rst                       |    6 -
 doc/source/api/nova..scheduler.chance.rst          |    6 -
 doc/source/api/nova..scheduler.driver.rst          |    6 -
 doc/source/api/nova..scheduler.manager.rst         |    6 -
 doc/source/api/nova..scheduler.simple.rst          |    6 -
 doc/source/api/nova..service.rst                   |    6 -
 doc/source/api/nova..test.rst                      |    6 -
 doc/source/api/nova..tests.api.fakes.rst           |    6 -
 doc/source/api/nova..tests.api.openstack.fakes.rst |    6 -
 .../api/nova..tests.api.openstack.test_api.rst     |    6 -
 .../api/nova..tests.api.openstack.test_auth.rst    |    6 -
 .../api/nova..tests.api.openstack.test_faults.rst  |    6 -
 .../api/nova..tests.api.openstack.test_flavors.rst |    6 -
 .../api/nova..tests.api.openstack.test_images.rst  |    6 -
 ...nova..tests.api.openstack.test_ratelimiting.rst |    6 -
 .../api/nova..tests.api.openstack.test_servers.rst |    6 -
 ...va..tests.api.openstack.test_sharedipgroups.rst |    6 -
 doc/source/api/nova..tests.api.test_wsgi.rst       |    6 -
 doc/source/api/nova..tests.declare_flags.rst       |    6 -
 doc/source/api/nova..tests.fake_flags.rst          |    6 -
 .../api/nova..tests.objectstore_unittest.rst       |    6 -
 doc/source/api/nova..tests.real_flags.rst          |    6 -
 doc/source/api/nova..tests.runtime_flags.rst       |    6 -
 doc/source/api/nova..twistd.rst                    |    6 -
 doc/source/api/nova..utils.rst                     |    6 -
 doc/source/api/nova..virt.connection.rst           |    6 -
 doc/source/api/nova..virt.fake.rst                 |    6 -
 doc/source/api/nova..virt.images.rst               |    6 -
 doc/source/api/nova..virt.libvirt_conn.rst         |    6 -
 doc/source/api/nova..volume.driver.rst             |    6 -
 doc/source/api/nova..volume.manager.rst            |    6 -
 doc/source/api/nova..wsgi.rst                      |    6 -
 77 files changed, 6 insertions(+), 2153 deletions(-)

commit eaa5b5994891eee0280b750dff221a4b54932eb9
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 10:23:48 2011 -0600

    getting ready to push for merge prop

 nova/api/openstack/servers.py                     |    4 ++--
 nova/compute/api.py                               |   18 +++++++++---------
 nova/compute/manager.py                           |    3 +--
 nova/virt/xenapi/vmops.py                         |   16 ++++++++++------
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent |    4 ++--
 5 files changed, 24 insertions(+), 21 deletions(-)

commit 5e34b63b874b9c75215b9eeabc8e8e951a866fe7
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Jan 7 15:12:34 2011 +0000

    Fixing headers line by wrapping the headers in single quotes

 nova/virt/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 52aa05daf90d5100cd74ec553404becace9c2444
Merge: 59b3e0f e33102d
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 09:46:17 2011 -0500

    Merge trunk.

commit 8b3925e4d4b97dc28bfc903483ec4793fb38fed5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 15:17:03 2011 +0100

    Less code generation.

 .bzrignore         |    1 +
 doc/source/conf.py |    5 ++---
 nova/version.py    |   40 ++++++++++++++++++----------------------
 setup.py           |   38 ++++----------------------------------
 4 files changed, 25 insertions(+), 59 deletions(-)

commit e01123943e7fbe81d7cb40325cde6c517bb2ffd9
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 08:36:11 2011 -0500

    grabbed the get_info fix from my other branch

 nova/virt/xenapi/vmops.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit b024dcf6f0c1e5a2735e84d21d6edef5ff38d1cf
Merge: e66f301 e33102d
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 07:28:30 2011 -0600

    merged changes from trunk

commit 9b35abf29438600ff8a8a91226000e7ea11ca534
Merge: ada65e0 8cdfdd1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 14:00:49 2011 +0100

    Merge version stuff

commit 19ffc1275814a6c00f6ff19dd0c03060143d097a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 12:08:22 2011 +0100

    Remove redundant import of nova.context.
    Use db instance attribute rather than module directly.

 nova/compute/api.py       |    6 +++---
 nova/db/sqlalchemy/api.py |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

commit d950e542704a381872da0c08b7ae9aae42033169
Merge: d111883 e33102d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 12:03:45 2011 +0100

    Merge trunk

commit ecb6363533251cb7f1c22e87e36db8fcf6d64eb1
Merge: 8de9629 e33102d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 23:46:36 2011 -0600

    Merging trunk

commit 8de96296dfb22d0e6c491fcaf072210dfbaa67e8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 23:38:01 2011 -0600

    Removing some FIXMEs

 nova/api/openstack/images.py |   15 ++++++++++-----
 nova/compute/api.py          |    2 +-
 nova/image/glance.py         |    6 ++++--
 nova/utils.py                |    3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

commit 3bf9bc6f6c0fbf90e3f4eab68a9bd99d85fcc422
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 21:37:33 2011 -0600

    Reserving image before uploading

 nova/api/openstack/images.py                       |   10 +-
 nova/compute/api.py                                |   10 +-
 nova/compute/manager.py                            |    4 +-
 nova/image/glance.py                               |  157 ++------------------
 nova/utils.py                                      |   20 ++-
 nova/virt/libvirt_conn.py                          |    2 +-
 nova/virt/xenapi/vm_utils.py                       |   24 +--
 nova/virt/xenapi/vmops.py                          |    6 +-
 nova/virt/xenapi_conn.py                           |    8 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/glance |   11 +-
 10 files changed, 77 insertions(+), 175 deletions(-)

commit 1a6fba0ada49a464b372e681b83bac59d3a3a79a
Merge: 579d0e1 3478e90
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jan 7 06:18:01 2011 +0300

    merge

commit df2785fb12d38cf0842921d380de2ed2d1c6bf5b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 03:10:28 2011 +0000

    Half-finished implementation of the streaming from Glance to a VDI through
    nova-compute.

 nova/virt/xenapi/vm_utils.py |  158 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 157 insertions(+), 1 deletion(-)

commit 193ef47ae87afde18f780c5141a597480845de1e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 03:08:38 2011 +0000

    Fix Nova not to immediately blow up when talking to Glance: we were using the
    wrong URL to get the image metadata, and ended up getting the whole image
    instead (and trying to parse it as json).
    
    Also, fix some URLs, all of which were missing the leading slash.

 nova/image/glance.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 2222851017c5c34b1a9ea1d2855f49c45395843c
Merge: 792ba27 e33102d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 23:04:21 2011 -0400

    another merge with trunk to remedy instance_id issues

commit 3478e90442ad7a22497b53153ae893df96e55b4e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jan 7 05:59:30 2011 +0300

    merge

 Authors                      |    1 +
 nova/api/ec2/cloud.py        |   34 +++++++++++++++++++++++++++++----
 nova/compute/api.py          |    3 ++-
 nova/db/api.py               |   13 ++++++++++++-
 nova/db/sqlalchemy/api.py    |   17 +++++++++++++++++
 nova/db/sqlalchemy/models.py |    2 +-
 nova/flags.py                |    1 -
 nova/service.py              |    3 ++-
 nova/tests/test_cloud.py     |   35 ++++++++++++++++++++++++++++++++++
 nova/tests/test_scheduler.py |   43 ++++++++++++++++++++++++++++++++++++++++++
 nova/tests/test_service.py   |   15 +++++++++++----
 11 files changed, 154 insertions(+), 13 deletions(-)

commit e33102d23ec8f357c08e2583f8d9e3c1753bab4d
Merge: ae5dbe2 59f8986
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 7 01:19:22 2011 +0000

    Include date in API action query.

commit 59f8986df4d78f61528162e65f560064febef7af
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:59:15 2011 -0600

    Review feedback

 nova/api/openstack/servers.py |    8 ++++++--
 nova/db/sqlalchemy/api.py     |   10 ++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

commit ae5dbe2b5d4871d3e26e859c03feab705c9c59ea
Merge: 9eca4d5 76e3923
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jan 7 00:49:30 2011 +0000

    This branch implements lock functionality. The lock is stored in the compute worker database. Decorators have been added to the openstack API actions which alter instances in any way.

commit a0edf5a7ba372419ebfed987b8585171e7167e48
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:18:28 2011 -0600

    Review feedback

 nova/api/openstack/servers.py |    2 +-
 nova/db/sqlalchemy/api.py     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6a162512cac5eafdbe46ba4df6117bfed6f40e4b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:12:22 2011 -0600

    Review feedback

 nova/api/openstack/servers.py |    4 ++++
 nova/compute/api.py           |    9 +--------
 nova/db/sqlalchemy/api.py     |    5 ++++-
 3 files changed, 9 insertions(+), 9 deletions(-)

commit 3dd9c56477078114bcd9b20a49a3413615539103
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 17:50:44 2011 -0600

    Review feedback

 nova/api/openstack/servers.py |    3 ++-
 nova/compute/api.py           |    9 ++++++++-
 nova/db/sqlalchemy/api.py     |    7 ++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

commit 76e3923c40dff2f754b045847d8ad19ea9a7cef1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:27:57 2011 -0600

    typo

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ebec92778bdaf4af58029f9977697865c53f881d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:25:17 2011 -0600

    refers to instance_id instead of instance_ref[instance_id]

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7450f84e0f491f8a24273135432e105677c4a589
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:23:00 2011 -0600

    passing the correct parameters to decorated function

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 11d6e9d2f917d124946d0fa47c1512a1f8ab940d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:02:20 2011 -0600

    accidentally left unlocked in there, it should have been locked

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit dea9f51d65ce0d5c3c4ea328a2231499c71719d6
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 17:37:02 2011 -0500

    various cleanup and fixes

 nova/api/openstack/servers.py |    7 ++-----
 nova/compute/api.py           |    2 +-
 nova/db/sqlalchemy/api.py     |   23 -----------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

commit f9c33f4ba09e02f8668bdd655b7acba15984838c
Merge: ba245da 9eca4d5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:35:48 2011 -0600

    merged trunk

commit ba245da7a339cb769451b67f27cd801c0ce12120
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:30:45 2011 -0600

    pep8

 nova/tests/test_compute.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 006a3c43093ce3324173e0aed172a3be1396d5dc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:21:59 2011 -0600

    altered argument handling

 nova/compute/manager.py |   44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

commit e66f3017373dcf9135c53ae4d510b0b2a5dcecf0
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 15:53:11 2011 -0600

    Got the basic 'set admin password' stuff working

 nova/api/openstack/servers.py                      |   17 +-
 nova/compute/manager.py                            |    3 -
 nova/exception.py                                  |    4 +
 nova/virt/xenapi/vmops.py                          |   22 +-
 nova/virt/xenapi_conn.py                           |   16 +-
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent  |  235 ++++++++++++++++++++
 .../xenserver/xenapi/etc/xapi.d/plugins/agent.py   |  221 ------------------
 7 files changed, 258 insertions(+), 260 deletions(-)

commit 19db369868b2f4a200624cb67d72740eabaab699
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 15:33:01 2011 -0600

    Include date in action query

 nova/db/sqlalchemy/api.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 8cdfdd14a03e1356cda4fcbdfbcc528bc7f397bd
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:29:38 2011 -0500

    Let documentation get version from nova/version.py as well.

 doc/source/conf.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit f3ea4d876fe0d62dcf63cfdcaf7657949cc4dbcf
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:20:04 2011 -0500

    Add default version file for developers.

 nova/version.py |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 54f6237f2d76fa90d639c7a4ac61b3cb16d864f4
Merge: e80e8d9 5412e72
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 6 20:14:22 2011 +0000

    Merge from trunk

commit 41b5bc26a4ca079414a246191fe8a5ee0284e468
Merge: 13b1374 59b3e0f
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:09:50 2011 -0500

    merge pep8 fixes from newlog2

commit 13b1374897c59c6e59fe5542ab71b0180aa6fc00
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:08:26 2011 -0500

    Track version info, and make available for logging.

 nova/log.py |   14 ++++----------
 setup.py    |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 10 deletions(-)

commit 59b3e0f2700d6a9067bffe045ea335b7abc35a27
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:08:14 2011 -0500

    pep8

 nova/log.py            |    3 +--
 nova/tests/test_log.py |    9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 473e692e60fe32b261f67c365bb813419029ad71
Merge: 17cf68f 275d067
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 13:51:34 2011 -0600

    Merged trunk

commit f45133f00d3d0a3d52cb9070627063b93af19e78
Merge: 4e034f3 2997c6c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:46 2011 -0500

    merge pep8 and tests from wsgirouter branch.

commit 2997c6cd216089b569878ec93b142ee9485127ee
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:18 2011 -0500

    Remove test for removed class.

 nova/tests/api/fakes.py |   26 ---------------
 nova/tests/api/test.py  |   81 -----------------------------------------------
 2 files changed, 107 deletions(-)

commit 8003dd2f5b027491f4e171f92ccd2a1cf2946315
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:11 2011 -0500

    Pep8

 nova/api/openstack/__init__.py       |    1 +
 nova/tests/api/openstack/test_api.py |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

commit 1ce25cab7f1818aababb18d60959f44602f2e17c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Jan 6 13:19:58 2011 -0600

    pep8 fix

 nova/db/sqlalchemy/api.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit ed6a4974f19ab7b13c90d41b83ae279403e272e8
Merge: 3d70b49 9eca4d5
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 13:02:57 2011 -0600

    merged trunk changes

commit 3d70b49a1c17bccfc6163198b2d99efb9a9829a7
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 13:02:32 2011 -0600

    commit before merging trunk

 nova/api/ec2/cloud.py         |    2 +-
 nova/api/openstack/servers.py |   14 +++++++++++---
 nova/compute/api.py           |   18 ++++--------------
 nova/compute/manager.py       |    5 +++--
 nova/db/api.py                |    5 +++++
 nova/db/sqlalchemy/api.py     |   23 +++++++++++++++++++++++
 nova/virt/xenapi/vmops.py     |    7 +++++++
 nova/virt/xenapi_conn.py      |    3 +++
 8 files changed, 57 insertions(+), 20 deletions(-)

commit 9eca4d51f55b078942c9886fd5b785d6f045c6d2
Merge: 275d067 6c01a84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 6 18:59:18 2011 +0000

    Fixes format_instances error by passing reservation_id as a kwarg instead of an arg.  Also removes extraneous yields in test_cloud that were causing tests to pass with broken code.

commit 4e034f3d69c6aba6920dd7dd38e07aeb495b45db
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:57:48 2011 -0500

    Remove module-level factory methods in favor of having a factory class-method
    on wsgi components themselves.  Local options from config are passed to the
    __init__ method of the component as kwargs.

 etc/nova-api.conf                           |   26 +++++------
 nova/api/ec2/__init__.py                    |   36 +---------------
 nova/api/ec2/metadatarequesthandler.py      |    7 +--
 nova/api/openstack/__init__.py              |   19 +++-----
 nova/api/openstack/auth.py                  |    6 ---
 nova/api/openstack/ratelimiting/__init__.py |    6 ---
 nova/wsgi.py                                |   62 +++++++++++++++++++--------
 7 files changed, 66 insertions(+), 96 deletions(-)

commit 6c01a842493079fdff9d5887562aec1a6fe8033b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 6 18:46:28 2011 +0000

    fix the broken tests that allowed the breakage in format to happen

 nova/tests/test_cloud.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 4a7105898e45cf5b6393f68d8d2d921dd218724b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 6 18:35:18 2011 +0000

    Fix format_run_instances to pass in reservation id as a kwarg

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71d78e1a6f611a7bce4fd4c38c2e7b4ccf3a4578
Merge: 963ece6 787631f
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:18:30 2011 -0500

    Merge __init__ file.

commit 963ece6feac200151b35df2efa0df4b1c75f1763
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:18:17 2011 -0500

    Add factories into the wsgi classes.

 nova/wsgi.py |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

commit 787631f7b3d882b6743ed52dc948301fdbca471e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:17:28 2011 -0500

    Add blank __init__ file for fixing importability.  The stale .pyc masked this error locally.

 nova/api/__init__.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 5412e72aaf959e51d172bd443dcf7a18cce34ee3
Merge: 32fb1e5 275d067
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 6 13:54:41 2011 +0000

    Merge from trunk

commit 0209ad587b2d8d35a7abdf60ca9b33391cab4a83
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 07:21:11 2011 -0600

    merged trunk changes

 nova/compute/api.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit 275d06792fd5de40b82ef461e3d565c3d0ed3700
Merge: ceeb007 80abf53
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Jan 6 13:12:57 2011 +0000

    Introduces basic support for spawning, rebooting and destroying vms when using Microsoft Hyper-V as the hypervisor.
    Images need to be in VHD format. Note that although Hyper-V doesn't accept kernel and ramdisk
    separate from the image, the nova objectstore api still expects an image to have an associated aki and ari. You can use dummy aki and ari images -- the hyper-v driver won't use them or try to download them.
    Requires Python's WMI module.

commit 504e9a62b39f5743d8a1d8993705e56e07d78a14
Merge: a3e12f5 ceeb007
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 07:00:02 2011 -0600

    merged trunk changes

commit a3e12f5eb92921acc622ea7bd9097edeea0d40fd
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 06:45:14 2011 -0600

    Renamed 'set_root_password' to 'set_admin_password' globally.

 nova/compute/api.py        |   50 +++++++++++++++-----------------------------
 nova/compute/manager.py    |   24 +++++++++++----------
 nova/tests/test_compute.py |    6 +++---
 nova/virt/fake.py          |   19 +++++++++--------
 nova/virt/xenapi/vmops.py  |   20 +++++++++---------
 nova/virt/xenapi_conn.py   |    6 +++---
 6 files changed, 56 insertions(+), 69 deletions(-)

commit 792ba27a6e6d5abb51b2659cd02e7fb5f8bd1cf4
Merge: 457e198 9eca4d5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 04:59:13 2011 -0400

    merge with trunk

commit 457e19826cfdb7f8f324180e42d8df79da48cfc6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 04:55:16 2011 -0400

    renamed sharedipgroups to shared_ip_groups and fixed tests for display_name

 nova/api/openstack/__init__.py                    |    4 +-
 nova/api/openstack/shared_ip_groups.py            |   69 +++++++++++++++++++++
 nova/api/openstack/sharedipgroups.py              |   69 ---------------------
 nova/compute/api.py                               |    3 +-
 nova/tests/api/openstack/test_shared_ip_groups.py |   39 ++++++++++++
 nova/tests/api/openstack/test_sharedipgroups.py   |   39 ------------
 6 files changed, 112 insertions(+), 111 deletions(-)

commit bccec6c8bac90517a972a5eb8bb91a82b3a13065
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 02:08:01 2011 -0500

    Fix openstack api tests and add a FaultWrapper to turn exceptions to faults.

 etc/nova-api.conf                         |   10 ++++++--
 nova/api/openstack/__init__.py            |   24 +++++++++++++----
 nova/tests/api/openstack/fakes.py         |   13 ++++++++++
 nova/tests/api/openstack/test_adminapi.py |   10 +++++---
 nova/tests/api/openstack/test_api.py      |   26 ++++++++++++-------
 nova/tests/api/openstack/test_auth.py     |   18 ++++++-------
 nova/tests/api/openstack/test_flavors.py  |    2 +-
 nova/tests/api/openstack/test_images.py   |    4 +--
 nova/tests/api/openstack/test_servers.py  |   40 ++++++++++++++---------------
 9 files changed, 96 insertions(+), 51 deletions(-)

commit 114577d4f4ed1ca173dadf47d4bf3a5a05c449a2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 03:05:59 2011 -0400

    Fixed display_name on create_instance

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 22:11:05 2011 -0600

    fix some glitches due to someone removing instanc.internal_id (not that I mind)
    remove accidental change to nova-combined script

 bin/nova-combined         |    5 ++---
 nova/console/api.py       |   23 +++++++++--------------
 nova/console/driver.py    |    2 ++
 nova/db/sqlalchemy/api.py |    6 +++---
 4 files changed, 16 insertions(+), 20 deletions(-)

commit d32633399622141e47cba44e25549e3d4e04077f
Merge: 401c337 275d067
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 22:23:23 2011 -0400

    Fixed trunk merge conflicts as spotted by dubs.

commit 401c3374c708d9f80d12eeea39360a26483c30da
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 22:15:47 2011 -0400

    OS API parity: map image ID to numeric ID. Ensure all other OS operations are at least stubbed out and callable.

commit f9fa25f9a873c1e4831c342689f7b5adc8f41013
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 20:14:36 2011 -0600

    add in separate public hostname for console hosts.
    flesh out console api data.

 nova/api/openstack/consoles.py |   17 +++++++++++++----
 nova/console/manager.py        |    7 ++++++-
 nova/db/sqlalchemy/models.py   |    1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

commit 324d8fdf284bd5109e34692049256722d731b572
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 6 01:51:05 2011 +0000

    allow smoketests to find nova package and add security rules

 smoketests/admin_smoketests.py |    9 ++++-
 smoketests/user_smoketests.py  |   87 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 4 deletions(-)

commit f21f078113fc81c1dcee4f3a077bd555c0cf85f6
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 19:45:46 2011 -0600

    Fix a bunch of pep8 stuff

 nova/api/openstack/consoles.py |    5 -----
 nova/compute/manager.py        |    2 --
 nova/console/__init__.py       |    7 ++++---
 nova/console/api.py            |    2 +-
 nova/console/driver.py         |    3 +--
 nova/console/fake.py           |    2 +-
 nova/console/manager.py        |   26 ++++++++++++--------------
 nova/console/xvp.py            |   18 ++++++++----------
 nova/db/api.py                 |   11 ++++++++---
 nova/db/sqlalchemy/api.py      |   22 +++++++++++++---------
 nova/db/sqlalchemy/models.py   |    5 ++++-
 nova/flags.py                  |    3 ++-
 nova/tests/test_console.py     |   19 +++++++++----------
 nova/virt/fake.py              |    6 +++---
 nova/virt/libvirt_conn.py      |    8 ++++----
 nova/virt/xenapi_conn.py       |    6 +++---
 16 files changed, 73 insertions(+), 72 deletions(-)

commit ceeb00765ed3fe03c0c2ad1583e1fe4b3421f0bf
Merge: 2a7fb3c 989b5b8
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Jan 6 01:44:16 2011 +0000

    This addition to the docs clarifies that it is a requirement for contributors to be listed in the Authors file before their commits can be merged to trunk.

commit 989b5b8ed01ebbc60a854d16ac68be5f1f1b6ef7
Merge: af6a90d 2a7fb3c
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Jan 5 20:13:49 2011 -0500

    merge trunk

commit 6549efce27997488bbcef8261b425bd9112309c4
Merge: 8e18c84 2a7fb3c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 19:04:23 2011 -0600

    another merge from trunk to the latest rev.

commit 8e18c84b03c442bd5272000712a55a6b60d037ed
Merge: b437a98 dd1e36b
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 19:02:24 2011 -0600

    pulled changes from trunk
    added console api to openstack api

commit 2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9
Merge: 20e990d a897306
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jan 5 23:49:27 2011 +0000

    Removed dependencies on nova server components for the admin client.

commit 20e990de345d02b443d52d73bd1db8d58d738cc0
Merge: 89f929f 5912176
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 23:34:57 2011 +0000

    Remove stale doc files so the autogeneration extension for sphinx will work properly.

commit 32fb1e59948f0bf1940712e36c671e8d74ede4d0
Merge: 6a068e6 ceeb007
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Jan 5 23:31:12 2011 +0000

    Merge from trunk

commit 80abf5306c7dcc08e63c9af182b31007b9de677c
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Jan 5 15:04:51 2011 -0800

    Add to Authors and mailmap

 .mailmap |    1 +
 Authors  |    1 +
 2 files changed, 2 insertions(+)

commit b4e57fe01778d7e3f115a369eebaeb9ee328895e
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Jan 5 15:02:09 2011 -0800

    Make test case work again

 nova/tests/hyperv_unittest.py |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit 89f929f2102acf7b4108e8cf23743919b0758d30
Merge: 4b23bbd def5583
Author: Eric Day <eday@oddments.org>
Date:   Wed Jan 5 22:59:41 2011 +0000

    This branch contains the internal API cleanup branches I had previously proposed, but combined together and with all the UUID key replacement ripped out. This allows multiple REST interfaces (or other tools) to use the internal API directly, rather than having the logic tied up in the ec2 cloud.py file.

commit 9b99e385967c4ba21d94d82aa62115fc11634118
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Jan 5 14:57:31 2011 -0800

    socat will need to be added to our nova sudoers

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 950f1b5c713eaeabd7cbd8141556cc1da3cc00b1
Merge: f67802d 4b23bbd
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 5 16:42:36 2011 -0600

    merged trunk changes

commit f67802d62ee530b4e81aaf108dfd3813c84550b2
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 5 16:41:50 2011 -0600

    intermediate work

 nova/api/__init__.py          |   14 ++++++++++++--
 nova/api/openstack/servers.py |    7 ++++---
 nova/compute/api.py           |    2 +-
 nova/virt/xenapi/vmops.py     |   19 ++++++++++++++-----
 4 files changed, 31 insertions(+), 11 deletions(-)

commit 4b23bbd4772c33621ddbf34fd13a4277c1126dcc
Merge: 2e0fd7d 02c86d1
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 5 22:39:58 2011 +0000

    Created a XenAPI plugin that will allow nova code to read/write/delete from xenstore records for a given instance. Added the basic methods for working with xenstore data to the vmops script, as well as plugin support to xenapi_conn.py

commit 17cf68f2dc67326c52280543a34f5d8ded817ace
Merge: dd1e36b 2e0fd7d
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 16:31:11 2011 -0600

    Merged trunk

commit 2e0fd7df549115e5974a3e6c3723938a5fd8e2ce
Merge: dd1e36b 11d5e91
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 22:29:40 2011 +0000

    Recover from a lost data store connection.

commit 11d5e914044583882384ffd462991ef4f678b28e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 16:04:16 2011 -0600

    Updated register_models() docstring

 nova/db/sqlalchemy/models.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a6b82b3015a64922a0733bd0dd5463b1a49ca080
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 20:46:18 2011 +0000

    simplify decorator into a wrapper fn

 nova/compute/disk.py      |   10 ++++-
 nova/virt/libvirt_conn.py |  106 ++++++++++++++++++++++-----------------------
 2 files changed, 60 insertions(+), 56 deletions(-)

commit b437a98738c7a564205d1b27e36b844cd54445d1
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 14:16:14 2011 -0600

    add in xs-console worker and tests.

 Authors                        |    1 +
 bin/nova-combined              |    5 +-
 bin/nova-console               |   44 +++++++++
 nova/compute/manager.py        |    5 ++
 nova/console/__init__.py       |   11 +++
 nova/console/driver.py         |   59 ++++++++++++
 nova/console/fake.py           |   59 ++++++++++++
 nova/console/manager.py        |  130 +++++++++++++++++++++++++++
 nova/console/xvp.conf.template |   16 ++++
 nova/console/xvp.py            |  193 ++++++++++++++++++++++++++++++++++++++++
 nova/db/api.py                 |   41 +++++++++
 nova/db/sqlalchemy/api.py      |   81 +++++++++++++++++
 nova/db/sqlalchemy/models.py   |   23 ++++-
 nova/flags.py                  |    3 +
 nova/tests/test_console.py     |  134 ++++++++++++++++++++++++++++
 nova/virt/fake.py              |    5 ++
 nova/virt/libvirt_conn.py      |    8 ++
 nova/virt/xenapi_conn.py       |    7 ++
 18 files changed, 822 insertions(+), 3 deletions(-)

commit 3d30bb1706812c4e6f9c1e01b373bb076a9f7ee3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:52:55 2011 +0000

    pep8 cleanup

 nova/compute/disk.py      |    1 +
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit f1f292a787ba20134c007da087bd9585d1875e86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:50:39 2011 +0000

    more fixes, docstrings

 nova/compute/disk.py      |   18 ++++++----
 nova/virt/libvirt_conn.py |   83 ++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 50 deletions(-)

commit b5f8ab0e913c121a80ff0efe358960099e7c87f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:16:17 2011 +0000

    fix injection and xml

 contrib/nova.sh                |    5 +-
 nova/compute/disk.py           |    9 ++--
 nova/virt/libvirt.xml.template |   10 ++--
 nova/virt/libvirt_conn.py      |  109 +++++++++++++++++++++++++++-------------
 4 files changed, 89 insertions(+), 44 deletions(-)

commit 190d6a2ba4d11d5a54b64cdc5bb1207c0d5e86be
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Jan 5 13:10:25 2011 -0600

    Fixing formatting problems with multinode install document

 doc/source/adminguide/multi.node.install.rst |  129 +++++++++++---------------
 1 file changed, 56 insertions(+), 73 deletions(-)

commit def5583469bd265c9107ed54d461441bc6303151
Author: Eric Day <eday@oddments.org>
Date:   Wed Jan 5 09:50:19 2011 -0800

    Split internal API get calls to get and get_all, where the former takes an ID and returns one resource, and the latter can optionally take a filter and return a list of resources.

 nova/api/ec2/cloud.py         |    9 +++++----
 nova/api/openstack/servers.py |    2 +-
 nova/compute/api.py           |   12 +++++++-----
 nova/volume/api.py            |   13 +++++++------
 4 files changed, 20 insertions(+), 16 deletions(-)

commit f85eba86b04253612e2272b3eb6a9fd79fab6567
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 12:39:35 2011 -0500

    missing _()

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 90ced5f211c3a53389d2f5d7413f9289770b279a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 12:38:34 2011 -0500

    Fixed for pep8

 nova/virt/libvirt_conn.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 40b156f74e90a94abb255950f29d714f4bc4c428
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 12:36:47 2011 -0500

    Fixed:Create instance fails when use_ipv6=False

 nova/virt/libvirt_conn.py |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

commit 69b7a0d69c3ac79b84c2bda19d379606c5a323ab
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 10:42:15 2011 -0500

    Removed debug message which is not needed.

 nova/virt/libvirt_conn.py |    1 -
 1 file changed, 1 deletion(-)

commit b47f37d0f9c06f2c4bc5adcf3afcececa2354324
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 10:35:15 2011 -0500

    Fixed misspelled variable

 nova/virt/libvirt_conn.py     |    2 +-
 smoketests/user_smoketests.py |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 28bf4e2df324db79a81a853d39cb5912985c2e45
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 10:25:16 2011 -0500

    Fixed bug in nova_project_filter_v6

 nova/virt/libvirt_conn.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit b14a8975dece3be18216cf2ad790be0c8fd22f7a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 09:52:45 2011 -0500

    The _update method in base Instance class overides dns_name_v6,so fixed it.

 contrib/boto_v6/ec2/instance.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 732d1946b5de78ec5e5ad8ac13b7d02c5fd90d10
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 09:40:19 2011 -0400

    self.XENAPI...

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8434ba0b13cc1b7e46be64ace3bee300de882aa0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 09:23:19 2011 -0400

    Changed Paused power state from Error to Paused

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cd2eb79121d987afcb0c8d33b861b8c723db696b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 08:10:08 2011 -0400

    fixed json syntax error

 krm_mapping.json.sample |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1cc5e933ccc29a88d09d2050e5224ee27eda767c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 08:05:11 2011 +0000

    stop using partitions and first pass at cow images

 nova/compute/disk.py           |  108 +++++++++++++++++++++++++--------------
 nova/virt/libvirt.xml.template |    6 +++
 nova/virt/libvirt_conn.py      |  110 +++++++++++++++++++++++-----------------
 3 files changed, 139 insertions(+), 85 deletions(-)

commit 5912176111ccb37d3d26dd7b415de83e544d9c54
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 02:56:02 2011 -0500

    Remove stale doc files.

 doc/.autogenerated                                 |   97 -------------------
 doc/source/api/autoindex.rst                       |   99 --------------------
 doc/source/api/nova..adminclient.rst               |    6 --
 doc/source/api/nova..api.cloud.rst                 |    6 --
 doc/source/api/nova..api.ec2.admin.rst             |    6 --
 doc/source/api/nova..api.ec2.apirequest.rst        |    6 --
 doc/source/api/nova..api.ec2.cloud.rst             |    6 --
 doc/source/api/nova..api.ec2.images.rst            |    6 --
 .../api/nova..api.ec2.metadatarequesthandler.rst   |    6 --
 doc/source/api/nova..api.openstack.auth.rst        |    6 --
 .../api/nova..api.openstack.backup_schedules.rst   |    6 --
 doc/source/api/nova..api.openstack.faults.rst      |    6 --
 doc/source/api/nova..api.openstack.flavors.rst     |    6 --
 doc/source/api/nova..api.openstack.images.rst      |    6 --
 doc/source/api/nova..api.openstack.servers.rst     |    6 --
 .../api/nova..api.openstack.sharedipgroups.rst     |    6 --
 doc/source/api/nova..auth.dbdriver.rst             |    6 --
 doc/source/api/nova..auth.fakeldap.rst             |    6 --
 doc/source/api/nova..auth.ldapdriver.rst           |    6 --
 doc/source/api/nova..auth.manager.rst              |    6 --
 doc/source/api/nova..auth.signer.rst               |    6 --
 doc/source/api/nova..cloudpipe.pipelib.rst         |    6 --
 doc/source/api/nova..compute.disk.rst              |    6 --
 doc/source/api/nova..compute.instance_types.rst    |    6 --
 doc/source/api/nova..compute.manager.rst           |    6 --
 doc/source/api/nova..compute.monitor.rst           |    6 --
 doc/source/api/nova..compute.power_state.rst       |    6 --
 doc/source/api/nova..context.rst                   |    6 --
 doc/source/api/nova..crypto.rst                    |    6 --
 doc/source/api/nova..db.api.rst                    |    6 --
 doc/source/api/nova..db.sqlalchemy.api.rst         |    6 --
 doc/source/api/nova..db.sqlalchemy.models.rst      |    6 --
 doc/source/api/nova..db.sqlalchemy.session.rst     |    6 --
 doc/source/api/nova..exception.rst                 |    6 --
 doc/source/api/nova..fakerabbit.rst                |    6 --
 doc/source/api/nova..flags.rst                     |    6 --
 doc/source/api/nova..image.service.rst             |    6 --
 doc/source/api/nova..manager.rst                   |    6 --
 doc/source/api/nova..network.linux_net.rst         |    6 --
 doc/source/api/nova..network.manager.rst           |    6 --
 doc/source/api/nova..objectstore.bucket.rst        |    6 --
 doc/source/api/nova..objectstore.handler.rst       |    6 --
 doc/source/api/nova..objectstore.image.rst         |    6 --
 doc/source/api/nova..objectstore.stored.rst        |    6 --
 doc/source/api/nova..process.rst                   |    6 --
 doc/source/api/nova..quota.rst                     |    6 --
 doc/source/api/nova..rpc.rst                       |    6 --
 doc/source/api/nova..scheduler.chance.rst          |    6 --
 doc/source/api/nova..scheduler.driver.rst          |    6 --
 doc/source/api/nova..scheduler.manager.rst         |    6 --
 doc/source/api/nova..scheduler.simple.rst          |    6 --
 doc/source/api/nova..server.rst                    |    6 --
 doc/source/api/nova..service.rst                   |    6 --
 doc/source/api/nova..test.rst                      |    6 --
 doc/source/api/nova..tests.access_unittest.rst     |    6 --
 doc/source/api/nova..tests.api.fakes.rst           |    6 --
 doc/source/api/nova..tests.api.openstack.fakes.rst |    6 --
 .../api/nova..tests.api.openstack.test_api.rst     |    6 --
 .../api/nova..tests.api.openstack.test_auth.rst    |    6 --
 .../api/nova..tests.api.openstack.test_faults.rst  |    6 --
 .../api/nova..tests.api.openstack.test_flavors.rst |    6 --
 .../api/nova..tests.api.openstack.test_images.rst  |    6 --
 ...nova..tests.api.openstack.test_ratelimiting.rst |    6 --
 .../api/nova..tests.api.openstack.test_servers.rst |    6 --
 ...va..tests.api.openstack.test_sharedipgroups.rst |    6 --
 doc/source/api/nova..tests.api.test_wsgi.rst       |    6 --
 doc/source/api/nova..tests.api_integration.rst     |    6 --
 doc/source/api/nova..tests.api_unittest.rst        |    6 --
 doc/source/api/nova..tests.auth_unittest.rst       |    6 --
 doc/source/api/nova..tests.cloud_unittest.rst      |    6 --
 doc/source/api/nova..tests.compute_unittest.rst    |    6 --
 doc/source/api/nova..tests.declare_flags.rst       |    6 --
 doc/source/api/nova..tests.fake_flags.rst          |    6 --
 doc/source/api/nova..tests.flags_unittest.rst      |    6 --
 doc/source/api/nova..tests.network_unittest.rst    |    6 --
 .../api/nova..tests.objectstore_unittest.rst       |    6 --
 doc/source/api/nova..tests.process_unittest.rst    |    6 --
 doc/source/api/nova..tests.quota_unittest.rst      |    6 --
 doc/source/api/nova..tests.real_flags.rst          |    6 --
 doc/source/api/nova..tests.rpc_unittest.rst        |    6 --
 doc/source/api/nova..tests.runtime_flags.rst       |    6 --
 doc/source/api/nova..tests.scheduler_unittest.rst  |    6 --
 doc/source/api/nova..tests.service_unittest.rst    |    6 --
 doc/source/api/nova..tests.twistd_unittest.rst     |    6 --
 doc/source/api/nova..tests.validator_unittest.rst  |    6 --
 doc/source/api/nova..tests.virt_unittest.rst       |    6 --
 doc/source/api/nova..tests.volume_unittest.rst     |    6 --
 doc/source/api/nova..twistd.rst                    |    6 --
 doc/source/api/nova..utils.rst                     |    6 --
 doc/source/api/nova..validate.rst                  |    6 --
 doc/source/api/nova..virt.connection.rst           |    6 --
 doc/source/api/nova..virt.fake.rst                 |    6 --
 doc/source/api/nova..virt.images.rst               |    6 --
 doc/source/api/nova..virt.libvirt_conn.rst         |    6 --
 doc/source/api/nova..virt.xenapi.rst               |    6 --
 doc/source/api/nova..volume.driver.rst             |    6 --
 doc/source/api/nova..volume.manager.rst            |    6 --
 doc/source/api/nova..wsgi.rst                      |    6 --
 98 files changed, 772 deletions(-)

commit e774f2cd7206b5ae632a42c1eda7330858b1613c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 03:51:21 2011 -0400

    pep8

 nova/api/openstack/common.py             |    4 ++--
 nova/api/openstack/images.py             |    2 +-
 nova/api/openstack/servers.py            |    8 ++++----
 nova/compute/api.py                      |    3 ++-
 nova/tests/api/openstack/test_servers.py |    6 +++---
 nova/virt/xenapi/vm_utils.py             |    3 ++-
 6 files changed, 14 insertions(+), 12 deletions(-)

commit 53127ca97729fd60a51588dea397dda3a9e80b3b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 03:10:49 2011 -0400

    tests fixed up

 nova/tests/api/openstack/test_images.py  |    2 ++
 nova/tests/api/openstack/test_servers.py |   10 ++++++++++
 2 files changed, 12 insertions(+)

commit ada65e007e4511f63efcbfa94e51d2d41af1d315
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 01:54:31 2011 -0500

    Better method for eventlet.wsgi.server logging.

 nova/log.py  |    2 +-
 nova/wsgi.py |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

commit aab31f797b41feb5b9b8856dd2df4b46435ccdbc
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 00:59:39 2011 -0500

    Silence eventlet.wsgi.server so it doesn't go to stdout and pollute our logs.

 nova/wsgi.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 6f855be07afb598090184bacf6d709191012c807
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:50:17 2011 -0500

    Declare a flag for test to run in isolation.

 nova/tests/test_compute.py |    1 +
 1 file changed, 1 insertion(+)

commit f62a010717c3ac66284948870f9c8d8216e4221b
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:42:56 2011 -0500

    Build app manually for test_api since nova.ec2.API is gone.

 nova/tests/test_api.py |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 472af7e750f369e3b999d2b1ac48f74369975ba6
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 4 18:34:47 2011 -0600

    Recover from a lost data store connection

 nova/service.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 69ca1170952826ca40c447df0417eff3be730c3d
Merge: 9052bef 02c86d1
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 18:33:08 2011 -0600

    Added xenstore plugin changed

commit 9052bef412208c5b8fe2d658766d050e7e6307e2
Merge: 5b240fe dd1e36b
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 18:25:40 2011 -0600

    merged changes from trunk

commit 7c01430020ceabec765f388b70685808064cda3f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 4 16:22:47 2011 -0800

    some more cleanup

 nova/adminclient.py            |   24 ------------------------
 nova/api/ec2/admin.py          |    1 -
 nova/api/ec2/cloud.py          |    2 --
 nova/virt/libvirt.xml.template |    2 +-
 4 files changed, 1 insertion(+), 28 deletions(-)

commit f7543cdf973f4ddb5718255e9671530fc98fc756
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 16:21:27 2011 -0800

    need one more newline

 nova/tests/hyperv_unittest.py |    1 +
 1 file changed, 1 insertion(+)

commit 7924b211f23dcd687612b32341e2be0b57fd386e
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 16:20:14 2011 -0800

    Redis dependency no longer needed

 nova/tests/hyperv_unittest.py |    4 ----
 1 file changed, 4 deletions(-)

commit a05edf5eebf093f6f1b48a9fcbeaf8a9ae7b3899
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:13:37 2011 -0500

    Make test_access use ec2.request instead of .controller and .action.

 nova/tests/test_access.py |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

commit 46a249eaa1db7d0f5b765cff701bb13005e3db49
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 16:06:03 2011 -0800

    Revert some unneeded formatting since twistd is no longer used

 nova/twistd.py      |    6 ++----
 nova/virt/images.py |    1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

commit 8926f33d4da9def15dde68a5a15fd9477aee6452
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:02:56 2011 -0500

    pep8 fixes.

 nova/api/ec2/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit 406c8cdf027b13636ab3c8fa609aabe929057d6f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 18:46:12 2011 -0500

    Remove flags and unused API class from openstack api, since such things are specified in paste config now.

 nova/api/openstack/__init__.py |   29 -----------------------------
 1 file changed, 29 deletions(-)

commit c40e41f7fbfac12ce07bbd1ee6bf57d1897e6009
Merge: 91e4460 dd1e36b
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:42:59 2011 -0800

    Merge from trunk again

commit 91e44607d1454a9c2e258910f009a034fb9cff1c
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:42:29 2011 -0800

    i18n logging and exception strings

 nova/virt/hyperv.py |   62 +++++++++++++++++++++++++--------------------------
 nova/virt/images.py |    2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

commit 6dc2e665b5b6f690882e6029984a11dc7063b437
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 18:33:17 2011 -0500

    remove unused nova/api/__init__.py

 nova/api/__init__.py |  111 --------------------------------------------------
 1 file changed, 111 deletions(-)

commit 468bc4745f002b521f21c5d621bdcb596b8ddfcd
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:18:28 2011 -0800

    Merge from trunk again -- get rid of twistd dependencies

 nova/twistd.py      |   39 +++++++++++++++++++--------------------
 nova/virt/hyperv.py |   30 +++++++++++++++---------------
 nova/virt/images.py |    6 ++++--
 3 files changed, 38 insertions(+), 37 deletions(-)

commit 2491c2484f025cb3f061fcc6a5c6915006feb47b
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 18:16:16 2011 -0500

    Make paste the default api pattern.
    
    * get rid of the --use_lockout flag since it will be specified in paste config
      (Example line is commented out in etc/nova-api.conf, factory is in place)
    * remove old nova-api binary and promote nova-api-paste
    * change how we store ec2 parameters to bin the the ApiRequest
    * get rid of Router, since paste.urlmap is equally effective
      (Requestify now gets passed the name of the controller requests are to.)

 bin/nova-api               |   75 +++++++++++++++++++++++++-----
 bin/nova-api-paste         |  109 --------------------------------------------
 etc/nova-api.conf          |    4 ++
 nova/api/ec2/__init__.py   |   74 +++---------------------------
 nova/api/ec2/apirequest.py |    7 +--
 5 files changed, 79 insertions(+), 190 deletions(-)

commit f55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 18:01:29 2011 -0500

    Rework how routing is done in ec2 endpoint.

 etc/nova-api.conf        |   19 ++++++++++++++-----
 nova/api/ec2/__init__.py |   43 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 13 deletions(-)

commit dca2df171d9ff196a24b0970cd8848ea30db73d9
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Jan 4 16:58:08 2011 -0600

    Change all 2010 Copyright statements to 2010-2011 in doc source directory only

 doc/.autogenerated                            |  216 +++++++++++++++++++++++++
 doc/source/adminguide/binaries.rst            |    2 +-
 doc/source/adminguide/flags.rst               |    2 +-
 doc/source/adminguide/getting.started.rst     |    2 +-
 doc/source/adminguide/index.rst               |    2 +-
 doc/source/adminguide/managing.images.rst     |    2 +-
 doc/source/adminguide/managing.instances.rst  |    2 +-
 doc/source/adminguide/managing.networks.rst   |    4 +-
 doc/source/adminguide/managing.projects.rst   |    2 +-
 doc/source/adminguide/managingsecurity.rst    |    2 +-
 doc/source/adminguide/monitoring.rst          |    2 +-
 doc/source/adminguide/multi.node.install.rst  |    2 +-
 doc/source/adminguide/network.flat.rst        |    2 +-
 doc/source/adminguide/network.vlan.rst        |    2 +-
 doc/source/adminguide/nova.manage.rst         |    2 +-
 doc/source/cloud101.rst                       |    2 +-
 doc/source/community.rst                      |    2 +-
 doc/source/devref/addmethod.openstackapi.rst  |    2 +-
 doc/source/devref/api.rst                     |    2 +-
 doc/source/devref/architecture.rst            |    2 +-
 doc/source/devref/auth.rst                    |    2 +-
 doc/source/devref/cloudpipe.rst               |    2 +-
 doc/source/devref/compute.rst                 |    2 +-
 doc/source/devref/database.rst                |    2 +-
 doc/source/devref/development.environment.rst |    2 +-
 doc/source/devref/fakes.rst                   |    2 +-
 doc/source/devref/glance.rst                  |    2 +-
 doc/source/devref/index.rst                   |    2 +-
 doc/source/devref/network.rst                 |    2 +-
 doc/source/devref/nova.rst                    |    2 +-
 doc/source/devref/objectstore.rst             |    2 +-
 doc/source/devref/scheduler.rst               |    2 +-
 doc/source/devref/services.rst                |    2 +-
 doc/source/devref/volume.rst                  |    2 +-
 doc/source/index.rst                          |    2 +-
 doc/source/livecd.rst                         |    2 +-
 doc/source/nova.concepts.rst                  |    2 +-
 doc/source/object.model.rst                   |    2 +-
 doc/source/quickstart.rst                     |    2 +-
 doc/source/service.architecture.rst           |    2 +-
 40 files changed, 256 insertions(+), 40 deletions(-)

commit 5679caa48b90ecebf9a1143bf92cec0e7c0ed1f8
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:39:48 2011 -0800

    rename easy to direct in the scripts

 bin/nova-direct-api |    2 +-
 bin/stack           |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 1a66771aaf49d16d4131a1a787a1fda39aa680fd
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:37:04 2011 -0800

    fix typo in stack tool

 bin/stack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35d3050511ef513ff440fbd9f8b44695ea8be797
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:07:46 2011 -0800

    rename Easy API to Direct API

 bin/nova-direct-api         |   61 ++++++++++++
 bin/nova-easy-api           |   61 ------------
 nova/api/direct.py          |  232 +++++++++++++++++++++++++++++++++++++++++++
 nova/api/easy.py            |  232 -------------------------------------------
 nova/tests/easy_unittest.py |  102 -------------------
 nova/tests/test_direct.py   |  102 +++++++++++++++++++
 6 files changed, 395 insertions(+), 395 deletions(-)

commit e97cb0f19f66ee4d28685575cea57b1eb32c4ed3
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 13:56:36 2011 -0800

    Moved __init__ api code to api.py and changed allowed_instances quota method argument to accept all type data, not just vcpu count.

 nova/compute/__init__.py |  369 +-------------------------------------------
 nova/compute/api.py      |  385 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/network/__init__.py |   70 +--------
 nova/network/api.py      |   87 +++++++++++
 nova/quota.py            |    6 +-
 nova/tests/test_quota.py |   10 +-
 nova/volume/__init__.py  |   83 +---------
 nova/volume/api.py       |  100 ++++++++++++
 8 files changed, 585 insertions(+), 525 deletions(-)

commit 02c86d1e1146c1162a36620560eb8116ce8d47f1
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 15:20:10 2011 -0600

    Made the plugin output fully json-ified, so I could remove the exception handlers in vmops.py. Cleaned up some pep8 issues that weren't caught in earlier runs.

 nova/virt/xenapi/vmops.py                          |   19 +++-------
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |   28 +++++++++-----
 .../xenapi/etc/xapi.d/plugins/xenstore.py          |   39 +++++++++++++++-----
 3 files changed, 55 insertions(+), 31 deletions(-)

commit f1e423389e86954a3e143482b29ec6d37053e173
Merge: 8e1b74a dd1e36b
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 12:57:18 2011 -0800

    merged from trunk

commit 2899896d1c7742ad59e2da2d2369bc2ff9526fed
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 12:27:50 2011 -0800

    Renamed argument to represent possible types in volume_utils.

 nova/virt/xenapi/volume_utils.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 4b0509f014aa164273a0e544441838be5352b1eb
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 12:16:43 2011 -0800

    Removed leftover UUID reference.

 nova/db/sqlalchemy/api.py |    4 ----
 1 file changed, 4 deletions(-)

commit 8bbcadafbc25c7ab478d6143293232f2cea24411
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 09:44:15 2011 -0800

    Removed UUID keys for instance and volume.

 nova/api/ec2/cloud.py            |   12 ++++---
 nova/db/sqlalchemy/models.py     |   64 ++++++--------------------------------
 nova/virt/xenapi/volume_utils.py |    3 ++
 3 files changed, 21 insertions(+), 58 deletions(-)

commit f40baf7d966dc2f72484411c518e503866521b96
Merge: 5db1463 dd1e36b
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 09:07:09 2011 -0800

    Merged trunk.

commit ee10df91b1c46971cb028096c42f998508d52d92
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Jan 4 10:48:10 2011 -0600

    Final edits to multi-node doc and install script

 contrib/nova-CC-installer.sh                      |   18 +-
 doc/.autogenerated                                | 1296 +++++++++++++++++++++
 doc/source/adminguide/multi.node.install.rst      |  169 ++-
 doc/source/api/nova..api.cloud.rst                |    6 -
 doc/source/api/nova..api.ec2.images.rst           |    6 -
 doc/source/api/nova..process.rst                  |    6 -
 doc/source/api/nova..server.rst                   |    6 -
 doc/source/api/nova..tests.access_unittest.rst    |    6 -
 doc/source/api/nova..tests.api_integration.rst    |    6 -
 doc/source/api/nova..tests.api_unittest.rst       |    6 -
 doc/source/api/nova..tests.auth_unittest.rst      |    6 -
 doc/source/api/nova..tests.cloud_unittest.rst     |    6 -
 doc/source/api/nova..tests.compute_unittest.rst   |    6 -
 doc/source/api/nova..tests.flags_unittest.rst     |    6 -
 doc/source/api/nova..tests.network_unittest.rst   |    6 -
 doc/source/api/nova..tests.process_unittest.rst   |    6 -
 doc/source/api/nova..tests.quota_unittest.rst     |    6 -
 doc/source/api/nova..tests.rpc_unittest.rst       |    6 -
 doc/source/api/nova..tests.scheduler_unittest.rst |    6 -
 doc/source/api/nova..tests.service_unittest.rst   |    6 -
 doc/source/api/nova..tests.twistd_unittest.rst    |    6 -
 doc/source/api/nova..tests.validator_unittest.rst |    6 -
 doc/source/api/nova..tests.virt_unittest.rst      |    6 -
 doc/source/api/nova..tests.volume_unittest.rst    |    6 -
 doc/source/api/nova..validate.rst                 |    6 -
 doc/source/api/nova..virt.xenapi.rst              |    6 -
 doc/source/cloud101.rst                           |    3 +-
 27 files changed, 1416 insertions(+), 208 deletions(-)

commit 8147c6bbc6a6428d303f95b2994dc0662da8a9be
Merge: 3d09b41 dd1e36b
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 07:49:22 2011 -0600

    Merged trunk changes

commit d02d923a4c4c7ef3495f4f1fd860a136f8ed624c
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 07:40:29 2011 -0500

    Some Bug Fix

 nova/utils.py                  |    4 +---
 nova/virt/libvirt.xml.template |    2 +-
 nova/virt/libvirt_conn.py      |   16 +++++++++++-----
 smoketests/user_smoketests.py  |    2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

commit c528be81a5d0acaea5077c183ec4d15356d457d5
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 05:35:13 2011 -0500

    Fixed bug in libvirt

 nova/virt/libvirt_conn.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 505becef0704cc801f957d2931c8b994e2df92ca
Author: nova <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 05:00:21 2011 -0500

    Fixed bug

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96facdeee025cdf33df0b16abeeeb97f9ec87e70
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 04:27:39 2011 -0500

    Fixed for pep8

 nova/virt/libvirt_conn.py |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 56969837fdf1a9e5316443ce72b32ae268ed2947
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 04:21:50 2011 -0500

    Fixed conflict with r515

 nova/virt/libvirt.uml.xml.template |   27 ---------------------------
 1 file changed, 27 deletions(-)

commit 4267c1f2042f6e13cd9c77eced7f02750927ee83
Merge: c5c58cb dd1e36b
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 04:18:26 2011 -0500

    Merged and fiexed conflicts with r515

commit ee2d8a5bcdaf938b7047131d7809d1b6b3120b59
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 22:51:19 2011 -0800

    some fixes per vish's feedback

 nova/compute/instance_types.py |    2 +-
 nova/compute/manager.py        |    2 +-
 nova/virt/libvirt_conn.py      |    5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

commit 45f2f563d1722d2f4d81d49de9d6a3cfd3d0fe3e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 00:37:47 2011 -0500

    Don't know where that LOG went...

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b9576a9f73195656f4a0a1327cd6bee3c4a6b6c9
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 00:26:41 2011 -0500

    Final few log tweaks, i18n, levels, including contexts, etc.

 bin/nova-dhcpbridge            |   15 ++++----
 bin/nova-instancemonitor       |    2 +-
 bin/nova-manage                |    2 --
 nova/api/ec2/__init__.py       |   14 ++++----
 nova/api/ec2/cloud.py          |    4 +--
 nova/api/openstack/__init__.py |    2 +-
 nova/auth/ldapdriver.py        |    3 +-
 nova/auth/manager.py           |    3 +-
 nova/compute/manager.py        |   77 ++++++++++++++++++++--------------------
 nova/compute/monitor.py        |    2 +-
 nova/exception.py              |    1 +
 nova/network/manager.py        |   14 ++++----
 nova/objectstore/handler.py    |    2 +-
 nova/rpc.py                    |    5 +--
 nova/service.py                |    3 --
 nova/virt/libvirt_conn.py      |   10 +++---
 nova/virt/xenapi/fake.py       |    2 +-
 nova/virt/xenapi/vmops.py      |    1 +
 nova/wsgi.py                   |    2 +-
 19 files changed, 79 insertions(+), 85 deletions(-)

commit c7305af78049f94dedcbb55480b91a3c6d843b9f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 00:23:35 2011 -0500

    Apply logging changes as a giant patch to work around the cloudpipe delete + add issue in the original patch.

 bin/nova-dhcpbridge                     |   20 ++-
 bin/nova-instancemonitor                |    7 +-
 bin/nova-logspool                       |  156 ++++++++++++++++++
 bin/nova-manage                         |   19 ++-
 bin/nova-spoolsentry                    |   97 ++++++++++++
 nova/api/ec2/__init__.py                |   92 ++++++++---
 nova/api/ec2/admin.py                   |   38 ++++-
 nova/api/ec2/apirequest.py              |   12 +-
 nova/api/ec2/cloud.py                   |   45 ++++--
 nova/api/ec2/metadatarequesthandler.py  |    7 +-
 nova/api/openstack/__init__.py          |   13 +-
 nova/auth/ldapdriver.py                 |    7 +-
 nova/auth/manager.py                    |   62 ++++++--
 nova/auth/signer.py                     |   15 +-
 nova/compute/api.py                     |   33 ++--
 nova/compute/disk.py                    |   11 +-
 nova/compute/manager.py                 |   76 +++++----
 nova/compute/monitor.py                 |   39 ++---
 nova/crypto.py                          |    5 +-
 nova/exception.py                       |    8 +-
 nova/fakerabbit.py                      |   20 ++-
 nova/flags.py                           |   12 +-
 nova/image/glance.py                    |   23 ++-
 nova/log.py                             |  261 +++++++++++++++++++++++++++++++
 nova/network/linux_net.py               |   19 +--
 nova/network/manager.py                 |   16 +-
 nova/objectstore/handler.py             |   68 +++++---
 nova/rpc.py                             |   26 ++-
 nova/scheduler/manager.py               |    5 +-
 nova/service.py                         |   19 +--
 nova/tests/api/openstack/test_images.py |    1 -
 nova/tests/objectstore_unittest.py      |    2 -
 nova/tests/test_access.py               |    1 -
 nova/tests/test_auth.py                 |    9 +-
 nova/tests/test_cloud.py                |   18 +--
 nova/tests/test_compute.py              |    8 +-
 nova/tests/test_log.py                  |  107 +++++++++++++
 nova/tests/test_network.py              |    9 +-
 nova/tests/test_quota.py                |    4 -
 nova/tests/test_rpc.py                  |    7 +-
 nova/tests/test_volume.py               |    6 +-
 nova/twistd.py                          |   25 +--
 nova/utils.py                           |   17 +-
 nova/virt/connection.py                 |    5 +-
 nova/virt/libvirt_conn.py               |   63 ++++----
 nova/virt/xenapi/fake.py                |   24 +--
 nova/virt/xenapi/vm_utils.py            |   68 ++++----
 nova/virt/xenapi/vmops.py               |   26 +--
 nova/virt/xenapi/volume_utils.py        |   44 +++---
 nova/virt/xenapi/volumeops.py           |   31 ++--
 nova/virt/xenapi_conn.py                |   16 +-
 nova/volume/driver.py                   |   11 +-
 nova/volume/manager.py                  |   21 +--
 nova/wsgi.py                            |    8 +-
 setup.py                                |    2 +
 55 files changed, 1282 insertions(+), 482 deletions(-)

commit 75618ce6379cb01b9f78ddb7c2f26501b838ca71
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 19:32:25 2011 -0800

    dabo fix to update for password reset v2

 nova/api/openstack/servers.py |    6 +++---
 nova/compute/api.py           |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

commit 09b1844c012504e5b14d05e6178e35dfeb0c6579
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 19:28:54 2011 -0800

    krm_mapping.json sample file added

 krm_mapping.json.sample |    3 +++
 1 file changed, 3 insertions(+)

commit 1097e32645dad68b89507d6ac7704c1db626723b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 19:10:33 2011 -0800

    dabo fix to update for password reset

 nova/compute/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 16e5c095619d6ea3fd493ecf3e349d8bad0c3eae
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 17:06:50 2011 -0800

    added cloudserver vars to novarc template

 nova/auth/manager.py      |   14 +++++++++-----
 nova/auth/novarc.template |    4 ++++
 nova/flags.py             |    2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

commit c93e8f5317ce0cc05e7af59b9e3dd8b8b6401b87
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Mon Jan 3 16:07:53 2011 -0800

    Update Authors.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit a073e6eab677d8903bd35f94e5e8ebce9d392c2d
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Mon Jan 3 16:05:55 2011 -0800

    Add support for rbd volumes.

 nova/virt/libvirt_conn.py |   23 +++++++++++++++----
 nova/volume/driver.py     |   56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 5 deletions(-)

commit dd1e36b9690a2c2de18c565c496b25295a13d0aa
Merge: bed422c 6a8f011
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 3 23:49:48 2011 +0000

    Fixes LP688545.

commit e43dd605ed6e19b4c3fb349461bf5aede16217b0
Merge: dd1e36b f4a2d86
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 15:46:55 2011 -0800

    First pass at feature parity. Includes Image ID hash

commit 4ced09acb75ec0ebc431b98a84763f5f6530ba66
Merge: dc2c64b bed422c
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 16:58:45 2011 -0600

    Fixing merge conflicts with new branch

commit 3d09b41bb8c488b0678aa3cb41285c3be89c1862
Merge: 9335314 0e88a58
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 3 16:43:24 2011 -0600

    merged in trunk changes

commit dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 16:14:18 2011 -0600

    Fixing merge conflicts

 doc/source/nova.concepts.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6a8f011789ddad57726ce55962b51a04a69fe527
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 3 16:08:52 2011 -0600

    Fixes LP688545

 nova/compute/manager.py        |    1 +
 nova/db/sqlalchemy/__init__.py |   21 ++++++++++++++++++++-
 nova/flags.py                  |    2 ++
 nova/tests/test_xenapi.py      |   19 ++++++++++---------
 4 files changed, 33 insertions(+), 10 deletions(-)

commit bed422cb2677f9e7505b5e7dc9ac46edb9a90dea
Merge: 40de3b9 090a2aa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 21:34:44 2011 +0000

    Make sure we point to the right PPA's everywhere.

commit d196ab33aef41ce33742734a65a394ae95b57759
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 14:46:38 2011 -0600

    Editing note about the database schema available on the wiki

 doc/source/nova.concepts.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7874475b2983ce340a352a09bd6db6dc0e91dad9
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 14:38:53 2011 -0600

    Modifying based on reviewer comments

 doc/source/adminguide/multi.node.install.rst |    3 ++-
 doc/source/cloud101.rst                      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 40de3b9ffb284b46aabdf22b2fb2dda00a2a8025
Merge: 6fc9fdc ba31a61
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 3 19:54:39 2011 +0000

    Uses paste.deploy to make application running configurable.  This includes the ability to swap out middlewares, define new endpoints, and generally move away from having code to build wsgi routers and middleware chains into a configurable, extensible method for running wsgi servers.

commit 03e9caea9fcda536e5d01e880383bc7948288710
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 13:50:41 2011 -0600

    Modifications to the nova-CC-installer.sh based on review

 contrib/nova-CC-installer.sh |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 6fc9fdc57cc0c516feec36f594a1fb8460c1c8e0
Merge: 3a54315 5fd9ff8
Author: Ryan Lucio <rlucio@internap.com>
Date:   Mon Jan 3 19:49:45 2011 +0000

    Adds the pool_recycle option to the sql engine startup call.  This enables connection auto-timeout so that connection pooling will work properly.  The recommended setting (per sqlalchemy FAQ page) has been provided as a default for a new configuration flag.  What this means is that if a db connection sits idle for the configured # of seconds, the engine will automatically close the connection and return it to the available thread pool.  See Bug #690314 for info.
    
    The fix was tested and verified on multi-node deployments of Austin and Bexar with MySQL, and it was also verified that the change does not affect sqlite users (dev environment testing only).

commit 3a54315765861bb883e15c00623752d32560de54
Merge: 8543aba b9fda9c
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 3 19:44:26 2011 +0000

    Add burnin support.  Services are now by default disabled, but can have instances and volumes run on them using availability_zone = nova:HOSTNAME.  This lets the hardware be put through its paces without being put in the generally available pool of hardware.  There is a 'service' subcommand for nova-manage where you can enable, disable, and list statuses of services.

commit 1e28685abe25cc3c1ce4d81794ec8c373111fc13
Merge: 97cfb85 8543aba
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Mon Jan 3 11:39:50 2011 -0800

    Merge from trunk: process replaced with util

commit 97cfb850033597eebe6be88266cd0e1f457ec9bc
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Mon Jan 3 11:37:07 2011 -0800

    Merge from trunk: process replaced with util

 nova/virt/images.py |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit b9fda9cfdb8d93ad9b9d4e9d9508bf742b6cb922
Merge: d88c746 8543aba
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 3 14:29:39 2011 -0500

    pep8 fixes

commit 5db1463bb246f58b90db4c8387a02428844b4d4e
Merge: 9b93bce a36b38d
Author: Eric Day <eday@oddments.org>
Date:   Mon Jan 3 11:21:01 2011 -0800

    Merged compute-api-cleanup branch.

commit a36b38d78ef887e23451c1dd22fdde8615c40b08
Author: Eric Day <eday@oddments.org>
Date:   Mon Jan 3 11:19:36 2011 -0800

    Removed compute dependency in quota.py.

 nova/compute/__init__.py |    4 ++--
 nova/quota.py            |    8 +++-----
 nova/tests/test_quota.py |    6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

commit b289812d388cf8e612ddff5ea13f7dc41a6bc359
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 10:57:35 2011 -0800

    add timeout constant, set to 5 minutes

 tools/ajaxterm/ajaxterm.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 5fd9ff898bf372f26bac3c0530521ba7abb7f26c
Author: Ryan Lucio <rlucio@internap.com>
Date:   Mon Jan 3 10:55:52 2011 -0800

    removed extra whitespace chars at the end of the changed lines

 nova/db/sqlalchemy/session.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8543aba27ae8a28c854b12f0a875275b2874f69b
Merge: 0e88a58 5d8c5c9
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 18:14:19 2011 +0000

    Several documentation corrections and formatting fixes.

commit 26da70249e24b144607af310e0feaa84fb26d771
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 10:59:13 2011 -0600

    Minor edits prior to merging changes to the script file

 doc/source/adminguide/network.vlan.rst |    3 +--
 doc/source/cloud101.rst                |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 8df8dd5cedb8bd84053fa489df8b9cf34ee68895
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 08:56:36 2011 -0800

    add stubs for xen driver

 nova/virt/xenapi/vmops.py |    5 +++++
 nova/virt/xenapi_conn.py  |    4 ++++
 2 files changed, 9 insertions(+)

commit febe1e32d1e0441206f1645748ed216abe3e89e4
Merge: 13dfb66 0e88a58
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 08:51:35 2011 -0800

    merge in trunk

commit 5b240fe5d963e195525c42bf097d79b3f003c8d4
Merge: 108352d 0e88a58
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 3 09:56:49 2011 -0600

    merged latest trunk

commit af6a90df770308faba19314a0ef19815f6e73b9e
Merge: 918a2f4 0e88a58
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 10:27:39 2011 -0500

    merge trunk

commit 5d8c5c9cf0ca7c003dc43fdab28b89e28831f068
Merge: e8e460c 0e88a58
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 10:09:58 2011 -0500

    merge trunk

commit f4a2d86519434f934bd6c90ba401b08875420d19
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 05:17:42 2011 -0800

    temp

 bin/nova-combined                      |    4 ++--
 nova/api/__init__.py                   |    3 +--
 nova/api/openstack/__init__.py         |    6 +++++-
 nova/api/openstack/backup_schedules.py |    9 +++++++--
 nova/api/openstack/common.py           |   16 ++++++++++++++++
 nova/api/openstack/images.py           |   19 ++++++++++++++++++-
 nova/api/openstack/servers.py          |   27 ++++++++++++++++++++++++---
 nova/api/openstack/sharedipgroups.py   |   10 +++++++---
 nova/compute/api.py                    |    1 +
 nova/virt/xenapi/vm_utils.py           |    3 ++-
 10 files changed, 83 insertions(+), 15 deletions(-)

commit d1118830c01267082c1371ef2faad1057e7a811e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:55:44 2011 +0100

    Stop returning generators in the refresh_security_group_{rules,members} methods.

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 804169715c020e4c2387a1bb8aa565547c4a6a42
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:54:54 2011 +0100

    Don't lie about which is the default firewall implementation.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb14565d4a21084b54a4fad3c395b31b88f41680
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:16:02 2011 +0100

    Move a closing bracket.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2281c6b6b27777a7c9bfa75acf7679dd76fcfb4d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:06:14 2011 +0100

    Stub out init_host in libvirt driver.

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit 4102913e33093e984aa5cbaae6666bb4c6d4312b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 11:39:31 2011 +0100

    Adjust test suite to the split between base firewall rules provided by nwfilter and the security group filtering.

 nova/tests/test_virt.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 2b26cbfd8dc5f03026dfb03eef9cd3a443edab86
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 11:39:02 2011 +0100

    Fix a merge artifact.

 nova/virt/libvirt_conn.py |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit c6736ab21a789830d76588333242b63979abc65c
Merge: b420a3d 0e88a58
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 10:56:21 2011 +0100

    Merge trunk

commit 090a2aa8c5b1e833617adfa375605158fa4e191d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 10:08:32 2011 +0100

    Remove references to nova-core/ppa and openstack/ppa PPA's.

 doc/source/adminguide/distros/ubuntu.10.04.rst |   13 ++++++-------
 doc/source/adminguide/getting.started.rst      |    6 +++---
 doc/source/adminguide/multi.node.install.rst   |    4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

commit 108352d5c132f6accc79974d8c646a2bc7d4f127
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 12:21:04 2010 -0600

    Updated the password generation code

 nova/compute/manager.py   |    8 +++++---
 nova/virt/fake.py         |    2 +-
 nova/virt/xenapi/vmops.py |    4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

commit f8272fc0b38be55d383860b6138e79a8a74965be
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Sat Jan 1 02:53:51 2011 +0900

    Add support for Sheepdog volumes

 nova/volume/driver.py |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

commit 9c17d68bb670f389a16e05d4306ad0a720e7a1e4
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Sat Jan 1 02:53:45 2011 +0900

    Add support for various block device types (block, network, file)

 nova/virt/libvirt_conn.py |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

commit 2d480782784c9fa3b1724ce0687e95ba8a08a81d
Merge: 4f77545 9335314
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:57:16 2010 -0600

    Added agent.py plugin. Merged xenstore plugin changes.

commit 4f77545cb1ae58484669028fbddb06592b1ee7e4
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:54:10 2010 -0600

    fixed pep8 issues

 nova/virt/xenapi/vmops.py |   64 ++++++++++++++++++++-------------------------
 nova/virt/xenapi_conn.py  |   20 +++++++-------
 2 files changed, 39 insertions(+), 45 deletions(-)

commit 933531440767f0696e14a73069448d0c3f5ae24e
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:53:01 2010 -0600

    Added OpenStack's copyright to the xenstore plugin.

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |    1 +
 1 file changed, 1 insertion(+)

commit f0e4bed6f4bf4ab3835ecd3e54eb9d7ac21dd5f1
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 07:04:40 2010 -0600

    fixed pep8 issues

 nova/virt/xenapi/vmops.py |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

commit 824f3cea65374747ae13fcc16fafc9a44ec9b8c2
Merge: b50433d b097d5a
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 06:41:19 2010 -0600

    merged in trunk and xenstore-plugin changes

commit 0e88a58cf95bf9298a52d132cd1eb02f29c6bfe1
Merge: 03a45dc 3d6c193
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 31 11:39:14 2010 +0000

    Ignore CA/crl.pem

commit b50433d77207c542ee63b7858eb465bb51ba56ea
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 05:37:30 2010 -0600

    Before merge with xenstore-plugin code

 nova/compute/manager.py   |   19 ++-
 nova/virt/xenapi/vmops.py |  290 +++++++++++++++++++++++++++++++++++++--------
 nova/virt/xenapi_conn.py  |   18 ++-
 3 files changed, 267 insertions(+), 60 deletions(-)

commit b097d5a247f95fac180c3270cb1f613edfa46523
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 04:44:45 2010 -0600

    Corrected the sloppy import in the xenstore plugin that was copied from other plugins.

 .../xenapi/etc/xapi.d/plugins/xenstore.py          |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 3d6c193fb7a44f62e3cb1dc18670fdca10f028cf
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 20:03:21 2010 -0800

    Ignore CA/crl.pem

 .bzrignore |    1 +
 1 file changed, 1 insertion(+)

commit 9b93bcef9519e23cf13c01c9601cf633fb685061
Merge: 71d715d 806e4e5
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:58:21 2010 -0800

    Merged trunk.

commit 806e4e5621ada77c1a072a89fa9981a5ab40dd10
Merge: 750a0c9 1ee171f
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:55:00 2010 -0800

    Merged trunk.

commit ea28b3117b02bcfd26e4017e850313cf5272d354
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Dec 31 12:43:40 2010 +0900

    deleting README.livemigration.txt and nova/livemigration_test/*

 README.livemigration.txt                           |  154 -------
 nova/livemigration_test/SI/picture.pptx            |  Bin 137730 -> 0 bytes
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 49152 -> 0 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 464384 -> 0 bytes
 nova/livemigration_test/SI/utils/demo-firstboot.sh |   39 --
 .../SI/utils/demo-runInstance.sh                   |   57 ---
 nova/livemigration_test/SI/utils/nova-manage.conf  |   18 -
 nova/livemigration_test/SI/utils/nova.conf         |   10 -
 nova/livemigration_test/SI/utils/nova.sh           |  180 --------
 nova/livemigration_test/SI/utils/nova.sh.compute   |   37 --
 nova/livemigration_test/UT/computeManager.test.py  |  411 ------------------
 .../UT/libvirtConnection.test.py                   |  382 ----------------
 nova/livemigration_test/UT/nova-manage.test.py     |  313 --------------
 .../livemigration_test/UT/schedulerManager.test.py |  456 --------------------
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 203776 -> 0 bytes
 15 files changed, 2057 deletions(-)

commit 1ee171f37b7fbb2b5c4e97a5d95757d0649446bf
Merge: 6407813 e0c83a4
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:37:56 2010 -0800

    Merged trunk.

commit e0c83a438eb780407e94a7b48ff8f20fb1783a9f
Merge: 6debe20 7080fb4
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:35:02 2010 -0800

    Merged trunk.

commit 5bcdb373a3f79bfc74d824c60c43f9af06091537
Merge: bf7bc87 03a45dc
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 31 12:18:58 2010 +0900

    最新バージョンにマージ。変更点は以下の通り。
    Authorsに自分の所属を追加
    utils.pyのgenerate_uidがおかしいのでインスタンスIDがオーバーフローしていたが、
    その処理を一時撤廃。後で試験しなおしとすることにした。

commit 7080fb40cae33017b0365bb8e2c94f515bf39d3d
Merge: 8900067 03a45dc
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 18:58:08 2010 -0800

    Merged trunk.

commit 03a45dc892f65a0778e5ae0151a63223340279a4
Merge: 4039bec 5c34edb
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 31 02:04:39 2010 +0000

    Auth Tokens assumed the user_id was an int, not a string.

commit a89730699db2add131028ccda031ead3526b2c4f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Dec 30 17:50:32 2010 -0800

    Removed dependencies on flags.py from adminclient

 nova/adminclient.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 4039bec5aa7e9e73304ab342c9a38f824ac78c98
Merge: 3bace9a ffaf32b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Dec 31 01:19:46 2010 +0000

    Make InstanceActions and live diagnostics available through the Admin API.

commit ffaf32b9ac9a3e71ac25f68eb593bbf16a11946a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 19:07:20 2010 -0600

    Cleanup

 nova/tests/test_xenapi.py |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

commit f55991c01421350434893200db8f01ca3911d957
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 18:56:12 2010 -0600

    Improved test

 nova/tests/test_xenapi.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit b5f5ec40bbc6b898ac73444e9a0f0372c92fc12a
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 30 18:25:30 2010 -0600

    removed some debugging code left in previous push.

 nova/virt/xenapi/vmops.py |    4 ----
 1 file changed, 4 deletions(-)

commit 7f27f62e41fd655049574975bd3bf6c5b00e9ccf
Author: Ryan Lucio <rlucio@internap.com>
Date:   Thu Dec 30 16:21:11 2010 -0800

    Converted the pool_recycle setting to be a flag with a default of 3600 seconds

 nova/db/sqlalchemy/session.py |    4 +++-
 nova/flags.py                 |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 66f8e28fb4f4a898803ac6a38974a9fa804612d0
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 30 18:12:57 2010 -0600

    completed the basic xenstore read/write/delete functionality

 nova/virt/xenapi/vmops.py                          |  222 ++++++++++++++++++--
 nova/virt/xenapi_conn.py                           |   28 ++-
 .../xenapi/etc/xapi.d/plugins/xenstore.py          |  158 ++++++++++++++
 3 files changed, 378 insertions(+), 30 deletions(-)

commit e453e2761daee6e96da9575a860e694a065c68c0
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 18:12:10 2010 -0600

    Removed problematic test

 nova/tests/test_compute.py |    5 -----
 1 file changed, 5 deletions(-)

commit e80e8d95c136526167dcb8fc92fb3a584c6b0027
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 23:48:27 2010 +0000

    PEP8 fix

 nova/auth/ldapdriver.py |    1 +
 1 file changed, 1 insertion(+)

commit 58940b1d62456543f0ebf4dca96055556624927e
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 23:44:49 2010 +0000

    * Fix bad query in __project_to_dn
    * use __find_dns instead of __find_objects in __uid_to_dn and __project_to_dn

 nova/auth/ldapdriver.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 71d715d422a746f4951877d8ff76e0ace355281e
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 15:43:41 2010 -0800

    Moved network operation code in ec2 api into a generic network API class. Removed a circular dependency with compute/quota.

 nova/api/ec2/cloud.py    |   59 ++++------------------------------
 nova/compute/__init__.py |   20 ++++++++----
 nova/network/__init__.py |   79 +++++++++++++++++++++++++++++++++++++++-------
 nova/quota.py            |    8 ++---
 nova/tests/test_quota.py |    6 ++--
 5 files changed, 93 insertions(+), 79 deletions(-)

commit d1129fa4b14d9edba8d6c4c3cb2d13e7c66c1391
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 17:02:16 2010 -0600

    Oopsies

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e8e460c8b4ae31f33adb0edc8531df61481caceb
Merge: f5611d9 3bace9a
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 17:43:37 2010 -0500

    merge trunk

commit 918a2f4440d6299bd073389e62650af163091eab
Merge: 384f399 3bace9a
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 17:43:01 2010 -0500

    merge trunk

commit d89b3a4b5c1f6bfe1f59da6c33cb469da589e866
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 16:27:31 2010 -0600

    Make compute.api methods verbs

 nova/api/openstack/servers.py |    4 ++--
 nova/compute/api.py           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 5c34edb3fc215a519f1a00e8c3ff6223ee050041
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 30 16:13:42 2010 -0600

    Fail

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 00abbb4401c87cca9f1540d7be1c0119fc7aee44
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 16:06:48 2010 -0600

    Review feedback

 nova/compute/api.py        |    6 +-----
 nova/compute/manager.py    |   11 -----------
 nova/tests/test_compute.py |   11 ++---------
 nova/tests/test_xenapi.py  |   31 ++++++-------------------------
 4 files changed, 9 insertions(+), 50 deletions(-)

commit 3bace9ab20c2ba10f638dd8613ea5e05c4efbeec
Merge: ac6fd22 384da35
Author: termie <code@term.ie>
Date:   Thu Dec 30 22:04:29 2010 +0000

    Cleans up the output of run_tests.sh to look closer to Trial.
    
    Example output:
    
    VolumeTestCase
        test_concurrent_volumes_get_different_targets               ok
        test_create_delete_volume                                   ok
        test_multi_node                                             ok
        test_run_attach_detach_volume                               ok
        test_too_big_volume                                         ok
        test_too_many_volumes                                       ok
    XenAPIVMTestCase
        test_list_instances_0                                       ok
        test_spawn                                                  ok
    XenAPIVolumeTestCase
        test_attach_volume                                          ok
        test_attach_volume_raise_exception                          ok
        test_create_iscsi_storage                                   ok
        test_parse_volume_info_raise_exception                      ok
    
    ----------------------------------------------------------------------
    Ran 232 tests in 82.677s
    
    Launchpad is removing a bunch of spaces from the output, but the 'ok' parts are all lined up in the 65th column

commit 384da35986ff174e63272b41d3ba383378abf1ab
Author: termie <code@term.ie>
Date:   Thu Dec 30 13:31:56 2010 -0800

    change exit code

 run_tests.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b2557962b5a365d78346fef727b2fcee75fe3270
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 21:27:44 2010 +0000

    Changing DN creation to do searches for entries.
    
    This change adds additional interoperability (as many directory servers and LDAP admins use cn, or another attribute, as the naming attribute). DN creation will incur a slight performance penalty for doing so, as DNs must be searched for now. User and project creation skip this performance penalty, as there is no need to search for an entry that is being created.

 nova/auth/ldapdriver.py |   92 +++++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 39 deletions(-)

commit c107e96c2aa16be5106c13528bcfb3d9b5f90103
Merge: 42f6a99 ac6fd22
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:23:14 2010 -0600

    Merged trunk

commit 42f6a993bcc4d0bc8823e4d039b1f59a6d6758a8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:13:32 2010 -0600

    Implemented review feedback

 nova/compute/manager.py   |    6 +++---
 nova/virt/fake.py         |    3 ---
 nova/virt/libvirt_conn.py |    3 ---
 nova/virt/xenapi/vmops.py |   10 ----------
 nova/virt/xenapi_conn.py  |    4 ----
 5 files changed, 3 insertions(+), 23 deletions(-)

commit ac6fd2290febed0238b67ac0cd83b220cdbd3efc
Merge: 0880026 601b192
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 30 21:09:27 2010 +0000

    This patch is beginning of XenServer snapshots in nova. It adds:
    
    1. A snapshot() method to the compute API
    2. Snapshot to the compute drivers(), stubs for libvirt and fake, and an implementation for xenapi_conn.
    3. A `glance` XenServer plugin (modeled after the current `objectstore` plugin).
    
    To test functionally you will need to be running both the Glance API and the Glance Registry.
    
    In order to use the cloudservers tool-chain (cloudservers command-line utility, openstack-api, etc), you will need create a project called 'openstack' or override FLAGS.default_project.
    
    You can verify that snapshots work by using the cloudservers command-line utility to run:
        cloudservers image-create <instance-id> <my snapshot name>
    
    The utility itself will generate an exception since we're not returning the appropriate metadata yet (that will be a future commit); however, you can confirm that the snapshot worked by checking the compute-service logs, and verifying the snapshot resides in the glance fs-store directory.

commit 44c83db6130e2ac59fc0649c4e37d906e348dd78
Merge: 5b8137b 0880026
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:02:34 2010 -0600

    Merged trunk

commit 601b19291a7cf1bcda7bcd4ebf27e4eefe3e28fd
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 30 14:09:16 2010 -0600

    Calling compute api directly from OpenStack image create

 nova/api/openstack/images.py |   10 +++++-----
 nova/image/glance.py         |    4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

commit f5611d9fdeaed5e2c16cf4b31a85db2ba4f5b30d
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 14:23:52 2010 -0500

    Several documentation corrections

 doc/source/adminguide/multi.node.install.rst |   23 ++++++-------
 doc/source/devref/addmethod.openstackapi.rst |    8 ++---
 doc/source/devref/rabbit.rst                 |    4 +--
 doc/source/nova.concepts.rst                 |   14 ++++----
 doc/source/quickstart.rst                    |   47 ++++++++------------------
 5 files changed, 39 insertions(+), 57 deletions(-)

commit bf7bc8725fcc26cc5074ea1628bcba6ac6093768
Merge: 85acbbe bd6a3cb
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 31 04:03:37 2010 +0900

    merge recent revision(version of 2010/12/28)
    Change:
       1. Use greenthread instead of defer at nova.virt.libvirt_conn.live_migration.
       2. Move nova.scheduler.manager.live_migration to nova.scheduler.driver
       3. Move nova.scheduler.manager.has_enough_resource to nova.scheduler.driver
       4. Any check routine in nova-manage.instance.live_migration is moved to
          nova.scheduler.driver.schedule_live_migration.

commit 6a068e60bf6d84acb7bbdf728c5f018d17d9f897
Merge: 3f37287 0880026
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 17:54:45 2010 +0000

    Merge from trunk

commit 2a08bed775aef2574d362cee6b7883469bbd2e09
Merge: cc906e4 0880026
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 30 11:26:21 2010 -0600

    Merging trunk

commit 384f39966b6387fcc9466f0b42bcc0ffaf49ba4c
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 12:25:14 2010 -0500

    Note that contributors are required to be listed in Authors file before work can be merged into trunk

 doc/source/devref/development.environment.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 26cdebcf742c5fea533c9947ef7278948a772e29
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 12:10:31 2010 -0500

    Mention Authors and .mailmap files in Developer Guide

 doc/source/community.rst                      |    3 ++-
 doc/source/devref/development.environment.rst |    7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit ba31a61ae6348bffbd70d5875f12a540d49e8885
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Dec 30 02:20:31 2010 -0500

    pep 8

 nova/api/ec2/__init__.py               |    7 ++++++-
 nova/api/ec2/metadatarequesthandler.py |    1 +
 nova/api/openstack/__init__.py         |    1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

commit aa73649911132598a96bbd908670dc3dadf50e91
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Dec 30 01:25:29 2010 -0500

    remove cloudpipe from paste config

 etc/nova-api.conf |    4 ----
 1 file changed, 4 deletions(-)

commit 5b0450d5a145814baee9d5e05eab6fcc872dab9a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Dec 30 01:19:38 2010 -0500

    Clean up how we determine IP to bind to.

 bin/nova-api-paste |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 750a0c9b413ad3912d522355332cffadd9667d0c
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 29 21:41:42 2010 -0800

    Converted a few more ec2 calls to use compute api.

 nova/api/ec2/cloud.py    |   13 ++++---------
 nova/compute/__init__.py |   12 +++++++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

commit b1a08af498ed6b52e3373a23196ded0396e6d34b
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 29 20:30:36 2010 -0800

    Cleaned up the compute API, mostly consistency with other parts of the system and renaming redundant module names.

 nova/api/ec2/cloud.py                    |   24 +--
 nova/api/openstack/servers.py            |   22 +-
 nova/compute/__init__.py                 |  324 +++++++++++++++++++++++++++--
 nova/compute/api.py                      |  332 ------------------------------
 nova/tests/api/openstack/test_servers.py |    8 +-
 nova/tests/test_compute.py               |   10 +-
 6 files changed, 341 insertions(+), 379 deletions(-)

commit a4088ce75347acb2ee2f2550c185afb4ce3231de
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 22:16:34 2010 -0600

    fixed the compute lock test

 nova/tests/test_compute.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4531600425d71659581aa549bdc5e719e41efc9e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 22:08:38 2010 -0600

    altered the compute lock test

 nova/compute/manager.py    |   16 ++++++++++------
 nova/tests/test_compute.py |   12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

commit da7d31d5a4fa712ae24f6ec56d7469a3ee453c87
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 21:26:45 2010 -0600

    removed tests.api.openstack.test_servers test_lock, to hell with it. i'm not even sure if testing lock needs to be at this level

 nova/tests/api/openstack/test_servers.py |   28 ----------------------------
 1 file changed, 28 deletions(-)

commit 2515d8ee9e32e0658b6179e900cf2e0e87a032dc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 21:16:53 2010 -0600

    fixed up the compute lock test, was failing because the context was always admin

 nova/tests/test_compute.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 656233762a61929d43f671e4765d52f25299562f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 20:52:48 2010 -0600

    syntax error

 nova/compute/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit f1523f2fd19cde4ddbb046dc0362a0ac7d6b79e8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 20:48:33 2010 -0600

    moved check lock decorator from the compute api to the come manager... when it rains it pours

 nova/compute/api.py     |   52 -------------------------------------
 nova/compute/manager.py |   65 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 52 deletions(-)

commit 32b310f430c5db05c99de65a5bd400675770ef1d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 19:27:43 2010 -0600

    removed db.set_lock, using update_instance instead

 nova/compute/manager.py   |    4 ++--
 nova/db/sqlalchemy/api.py |   12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

commit b848f7459eb65ad365177d831783b3d63818f977
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:57:33 2010 -0600

    added some logging

 nova/compute/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit 6f76367d2fefcec9b957352dd60e76c2cc3ba233
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:49:45 2010 -0600

    typo, trying to hurry.. look where that got me

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 837724193ece16310ff588a84d23891a75ced2f2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:46:36 2010 -0600

    altered error exception/logging

 nova/compute/api.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit d06f85c611adf244f2c757f023c92c2b6cad2e7c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:40:03 2010 -0600

    altered error exception/logging

 nova/compute/api.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 74785bf8c070bf0760724b3412f4ee1bb05cf72b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:34:49 2010 -0600

    fixd variables being out of scope in lock decorator

 nova/compute/api.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 24e253a1feaa0a39e4095f447f62f7ea9b43c8bb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:30:01 2010 -0600

    moved check lock decorator to compute api level. altered openstack.test_servers according and wrote test for lock in tests.test_compute

 nova/api/openstack/servers.py            |   43 -----------------------------
 nova/compute/api.py                      |   44 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |   35 +++++++-----------------
 nova/tests/test_compute.py               |   17 ++++++++++++
 4 files changed, 71 insertions(+), 68 deletions(-)

commit 64078137ce12ee52fff710f5a262d57b4ace2809
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 29 16:29:15 2010 -0800

    Moved ec2 volume operations into a volume API interface for other components to use. Added attach/detach as compute.api methods, since they operate in the context of instances (and to avoid a dependency loop).

 nova/api/ec2/cloud.py   |  141 ++++++++++++-----------------------------------
 nova/compute/api.py     |   34 +++++++++++-
 nova/volume/__init__.py |   91 ++++++++++++++++++++++++++----
 3 files changed, 149 insertions(+), 117 deletions(-)

commit 13dfb66624ca082bd5e83969213c657d2d2d1dff
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 29 16:11:02 2010 -0800

    pep8 fix, and add in flags that don't refernece my laptop

 nova/flags.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit eb0ba37ff97230494cbc4397838cbeab7cf01e7f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 29 16:07:41 2010 -0800

    apt-get install socat, which is used to connect to the console

 contrib/nova.sh |    1 +
 1 file changed, 1 insertion(+)

commit be6750a77e5121fe8f0d95016da4e96c9de3b5aa
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 17:40:18 2010 -0600

    removed lock check from show and changed returning 404 to 405

 nova/api/openstack/servers.py            |    3 +--
 nova/tests/api/openstack/test_servers.py |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 0880026253d0de67afd7c80415b332f72764457d
Merge: 9a84a2b e7be0b4
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 23:24:27 2010 +0000

    fix lp:695182, scheduler tests needed to DECLARE flag to run standalone.

commit aac25e8cc6e75d5d0abc41a8cf979300e58bcc3b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 17:04:40 2010 -0600

    removed () from if (can't believe i did that) and renamed checks_lock decorator

 nova/api/openstack/servers.py |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit c1acb68ef54309584816fbf5c93e38266accb2f0
Author: Ryan Lucio <rlucio@internap.com>
Date:   Wed Dec 29 15:04:21 2010 -0800

    Add the pool_recycle setting to enable connection pooling features for the sql engine.  The setting is hard-coded to 3600 seconds (one hour) per the recommendation provided on sqlalchemy's site

 nova/db/sqlalchemy/session.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 903b053f7eb2bcac7ee0809d7a1cd1efe676909e
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 17:15:50 2010 -0500

    i18n

 bin/nova-api-paste |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

commit 66a074cc74a6c3cc09d7b36f3e5dcb5ad5e7b6d8
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 17:08:42 2010 -0500

    Pep-8 cleanup.

 bin/nova-api-paste |    4 ++++
 1 file changed, 4 insertions(+)

commit e7be0b485e2d6c7cd95d1f5b7e6a401032f437e6
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 17:01:34 2010 -0500

    Fix scheduler testcase so it knows all flags and can run in isolation.

 nova/tests/test_scheduler.py |    1 +
 1 file changed, 1 insertion(+)

commit 6202b21b42615cf15b0dd60089026472e6836c69
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 15:31:53 2010 -0600

    removed some code i didn't end up using

 nova/api/openstack/__init__.py |   72 ----------------------------------------
 nova/db/sqlalchemy/api.py      |   10 ------
 2 files changed, 82 deletions(-)

commit f09d1ce4d38f3a8ef72566e95cde38f1dc1b8bed
Merge: 9b9b5fe 9a84a2b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 15:13:24 2010 -0600

    fixed merge conflict with trunk

commit 9b9b5fed18231a800018bc60fa653ec521b34a5c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 14:32:03 2010 -0600

    pep8

 nova/tests/api/openstack/test_servers.py |    1 -
 1 file changed, 1 deletion(-)

commit 48f0aa891c9c82c1c9e7a2e4bc1bef4da3c4d90b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 14:30:29 2010 -0600

    fixed up test for lock

 nova/tests/api/openstack/test_servers.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 579d0e1437efb32ef1a1c50ddbfca9093cfa3d18
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 29 23:30:08 2010 +0300

    added tests for EC2 describe_instances

 nova/api/ec2/cloud.py    |    7 +++++--
 nova/tests/test_cloud.py |   16 +++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

commit d88c746332430ff71dd5ef56d42ab416b351c807
Merge: 9da1fcd 9a84a2b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 15:22:37 2010 -0500

    Merge trunk.

commit 6ba4e731921051e9b401cfb4222fbcb7afe46a34
Merge: 5a6a823 9a84a2b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 15:20:44 2010 -0500

    Merge trunk.

commit 5b8137b2f50a4ed3eb105e38cefa280927f1c2ea
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 14:15:04 2010 -0600

    PEP8 cleanup

 nova/db/sqlalchemy/api.py |    2 +-
 nova/virt/xenapi/vmops.py |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 9a84a2bb4abb73d4022dbc8d699600f07d19267e
Merge: 90acbd3 34f5bed
Author: Ryan Lucio <rlucio@internap.com>
Date:   Wed Dec 29 20:09:16 2010 +0000

    This branch fixes an issue where VM creation fails because of a missing flag definition for 'injected_network_template'.  See Bug #695467 for more info.

commit 823c5fc1ff3c37acbfe9b30d7057f53b050b93c6
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 14:02:57 2010 -0600

    Added tests

 nova/tests/api/openstack/test_servers.py |   16 ++++++++++++++++
 nova/tests/test_compute.py               |   16 ++++++++++++++--
 nova/tests/test_xenapi.py                |   30 ++++++++++++++++++++----------
 nova/virt/xenapi/vm_utils.py             |    4 ++++
 4 files changed, 54 insertions(+), 12 deletions(-)

commit 2eaf3bb2a9d54bb7dd2c518cecca0caf7c80571f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:50:25 2010 -0600

    added test for lock to os api

 nova/tests/api/openstack/test_servers.py |   44 ++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

commit 0afb4a06dcb94ae41d04b3d78304746b0cc5b26f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:33:51 2010 -0600

    refactor

 nova/api/openstack/servers.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 34f5bed4d9c99af58c83b82b499f898c270124a8
Author: Ryan Lucio <rlucio@internap.com>
Date:   Wed Dec 29 11:24:42 2010 -0800

    Re-added flag definition for injected_network_template.  Tested & verified fix in the same env as the original bug.

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit b6e5c68d65701b840006cea49367879ee88c9b80
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:09:49 2010 -0600

    forgot import

 nova/api/openstack/__init__.py |    1 -
 nova/api/openstack/servers.py  |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

commit 3a85ba4fa4215737731b2e755abfa350c509e46f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:04:41 2010 -0600

    syntax error

 nova/api/openstack/servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 65842e244859505fa7181a397145f46c61a64d53
Merge: 7811a77 90acbd3
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 11:35:49 2010 -0600

    Merged trunk

commit d30ec2b5814480010d1b42ce2e9bed9fbc441fd1
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 29 19:51:25 2010 +0300

    Added implementation availability_zones to EC2 API

 nova/api/ec2/cloud.py     |   25 +++++++++++++++++++++----
 nova/db/api.py            |    7 +++++--
 nova/db/sqlalchemy/api.py |   14 ++++++++++++--
 nova/flags.py             |    1 -
 nova/tests/test_cloud.py  |   17 +++++++++++++++++
 5 files changed, 55 insertions(+), 9 deletions(-)

commit cc906e48c13012da552cc346146d9586afc6092e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 29 10:35:29 2010 -0600

    Updating Authors

 .mailmap |    1 +
 Authors  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 0dd84453db5d8a3293421049b92385b00a602fc3
Merge: f4da70e 90acbd3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Dec 29 17:17:06 2010 +0300

    merge

commit 90acbd3dd834fdef6f1000b69dfba4d4c1d12fd5
Merge: 71be236 99a228a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 29 06:55:58 2010 +0000

    Changes and error fixes to help ensure basic parity with the Rackspace API. Some features are still missing, such as shared ip groups, and will be added in a later patch set.

commit 8aea573bd2e44e152fb4ef1627640bab1818dede
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 28 23:55:58 2010 -0600

    initial lock functionality commit

 nova/api/openstack/__init__.py |   73 ++++++++++++++++++++++++++++++++++
 nova/api/openstack/servers.py  |   86 ++++++++++++++++++++++++++++++++++++++++
 nova/compute/api.py            |   35 +++++++++++++++-
 nova/compute/manager.py        |   24 +++++++++++
 nova/db/sqlalchemy/api.py      |   22 ++++++++++
 nova/db/sqlalchemy/models.py   |    2 +
 6 files changed, 241 insertions(+), 1 deletion(-)

commit a14807c9de0b555427aad10a172a929a07fd9505
Merge: d753b97 75e2cbe
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Dec 28 21:42:17 2010 -0600

    Merged with trunk

commit d753b97675a0fa31a79acff259cc2465170146b7
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Dec 28 21:41:28 2010 -0600

    Additional edits in nova.concepts.rst while waiting for script changes

 doc/source/nova.concepts.rst |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 71be236ef4a1fd956f7462ff236ff53d93fef2dc
Merge: b7b2760 380b28f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Dec 29 02:24:08 2010 +0000

    Bug #694880: nova-compute now depends upon Cheetah even when not using libvirt
    
    Only import Cheetah when needed, as we do already with libvirt and libxml2.  This ensures that users of other virt backends don't need Cheetah to run nova-compute.
    
    Resubmitted with pep8 violations fixed.

commit aa71b29518377a14d6dfec792ffd3790bd7849e7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 18:11:28 2010 -0800

    add ajax console proxy to nova.sh

 contrib/nova.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4b5bd4b4a8db70c40180c745f9bfc33aa6572e09
Merge: 3563807 71be236
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 18:11:02 2010 -0800

    merge trunk

commit 380b28f89481c52dbcda0b54fd7409b6bc72bb56
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Dec 29 01:58:04 2010 +0000

    Fix pep8 violations.

 nova/virt/libvirt_conn.py |    2 ++
 1 file changed, 2 insertions(+)

commit 35638077a186f9315ac6e30cdbe096730a540ed8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 17:42:33 2010 -0800

    add in unit tests

 nova/tests/cloud_unittest.py   |   13 +++++++++++++
 nova/tests/compute_unittest.py |   10 ++++++++++
 nova/virt/fake.py              |    2 ++
 3 files changed, 25 insertions(+)

commit 99a228a8ef3ee2760774fbafd136f137bd578dba
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 17:34:51 2010 -0600

    removed superfluous line

 nova/api/openstack/servers.py |    1 -
 1 file changed, 1 deletion(-)

commit b7b2760cd7cf74fde8ff48bbfefe64c53c3d149c
Merge: abc05ff 8ee15b6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 28 23:09:18 2010 +0000

    Address bug #695157 by using a blank request class and setting an empty request path.
    
    This fixes the test suite in environments with webob >= 1.0 (e.g. Ubuntu Natty).
    
    (Thanks for Greg Holt for the suggestion)

commit 9da1fcd6eca6f2f88e95242b8d046f4ee11f3761
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 17:54:31 2010 -0500

    Defualt services to enabled.

 nova/db/api.py               |    4 ++--
 nova/db/sqlalchemy/api.py    |    4 ++--
 nova/db/sqlalchemy/models.py |    2 +-
 nova/tests/test_scheduler.py |   34 +++++++---------------------------
 4 files changed, 12 insertions(+), 32 deletions(-)

commit 8ee15b6e93b5666b4645f2cefef357b0af3d26d0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 28 23:25:50 2010 +0100

    Address bug #695157 by using a blank request class and setting an empty request path.

 nova/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5a25de893f34cb9b05996406488188b6ed47fca1
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 17:14:01 2010 -0500

    Add flag --enable_new_services to toggle default state of service when created.

 nova/db/api.py             |    5 +++++
 nova/db/sqlalchemy/api.py  |    2 ++
 nova/tests/test_service.py |   25 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

commit d531e873b97a8ff92d1534811f702e89a8cf60a7
Merge: ef8e449 675ca7c
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Dec 28 16:02:46 2010 -0600

    merge from trunk

commit 79abcb065a07ca342cee6b843960dc877300c750
Merge: 902df6e 675ca7c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 15:49:36 2010 -0600

    Merge from trunk

commit abc05ff27a61e0ad2ceb11269c22261a841b3d1a
Merge: 675ca7c 8d03539
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Dec 28 21:49:33 2010 +0000

    This commit introduces scripts to apply XenServer host networking protections.

commit 902df6eb4968743dd451e54cde27ce88fc83ddaa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 15:48:48 2010 -0600

    Whoops

 nova/api/openstack/backup_schedules.py |    4 ++--
 nova/api/openstack/sharedipgroups.py   |   15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

commit 2ed57981b1e353fa256780b10af43d852077c15b
Merge: 7e46969 675ca7c
Author: termie <code@term.ie>
Date:   Tue Dec 28 13:43:35 2010 -0800

    merge from upstream and fix conflicts

commit 8d03539e15bf4ac168af550e27a81353a896df54
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Dec 28 16:35:56 2010 -0500

    Update .mailmap with both email addresses for Ant and myself

 .mailmap |    2 ++
 1 file changed, 2 insertions(+)

commit 7811a77753943ee87f3c3b10f37d22e61c5119d0
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 14:32:45 2010 -0600

    Make action log available through Admin API

 nova/api/openstack/__init__.py |    1 +
 nova/api/openstack/servers.py  |    5 +++++
 nova/compute/api.py            |    9 +++++++++
 nova/compute/manager.py        |   10 ++++++++++
 nova/db/sqlalchemy/api.py      |    9 ++++++---
 nova/virt/fake.py              |    3 +++
 nova/virt/libvirt_conn.py      |    5 ++++-
 nova/virt/xenapi/vmops.py      |    8 ++++++++
 nova/virt/xenapi_conn.py       |    4 ++++
 9 files changed, 50 insertions(+), 4 deletions(-)

commit 5a6a8234a70819ab9b108c7c11c4ccef36102750
Merge: ca5c957 675ca7c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 15:15:43 2010 -0500

    Merge trunk.

commit f22e555324786a9446aa3ba369cfe390cb90fc83
Merge: 729468d 675ca7c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 15:11:41 2010 -0500

    Merge trunk.

commit f27c7589e6f627983c48b8412d770524e346c3cc
Merge: 96384b6 675ca7c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Dec 28 13:01:54 2010 -0600

    Merging trunk

commit 96384b689953e381f2210d4a78f1b5239a78e507
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Dec 28 12:53:32 2010 -0600

    Add some basic snapshot tests

 nova/tests/test_xenapi.py    |  106 +++++++++++++++++++++++++++++-------------
 nova/tests/xenapi/stubs.py   |   66 ++++++++++++++++++++++++++
 nova/virt/xenapi/fake.py     |   64 +++++++++++++++++++++++--
 nova/virt/xenapi/vm_utils.py |   15 +++---
 4 files changed, 206 insertions(+), 45 deletions(-)

commit 7ddd833bc61252061b3dfd2449765a93f750bffa
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 12:19:25 2010 -0600

    Added get_diagnostics placeholders to libvirt and fake

 nova/virt/fake.py         |    3 +++
 nova/virt/libvirt_conn.py |    3 +++
 2 files changed, 6 insertions(+)

commit 4cb30d2327ad6e03acddc7d1fc71dccfc1c272a1
Merge: 0fb37c5 675ca7c
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 12:15:14 2010 -0600

    Merged trunk

commit 0fb37c5a08db4b2631ff687cb0fc6af43ba20190
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 11:49:07 2010 -0600

    Added InstanceAction DB functions

 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    9 +++++++++
 2 files changed, 14 insertions(+)

commit 3a3987d3acaa23a90131ab550e659f2611fed63a
Merge: 002bbfa 675ca7c
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Dec 28 10:50:18 2010 -0500

    merge trunk

commit 675ca7c5f38af0fa1150936e881482aa20fdaa45
Merge: d3d0e85 821fc6b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Dec 28 12:37:33 2010 +0000

    Bug #694890: run_tests.sh sometimes doesn't pass arguments to nosetest
    
    Change the argument parsing in run_tests.sh so that we explicitly gather
    the arguments that aren't meant for run_tests.sh, and pass them on to
    nosetests.

commit 7e469690f04b06f2371650fdf419ba028388c5e9
Author: termie <code@term.ie>
Date:   Tue Dec 28 01:40:24 2010 -0800

    Output of run_tests.sh to be closer to trial

 run_tests.py |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 run_tests.sh |   10 +++++----
 2 files changed, 74 insertions(+), 4 deletions(-)

commit d3d0e855d8584dd4dac258598326b526a049124a
Merge: a40f3e0 32bfe6a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 28 05:51:31 2010 +0000

    I've added suspend along with a few changes to power state as well. I can't imagine suspend will be controversial but I've added a new power state for "suspended" to nova.compute.power_states which libvirt doesn't use and updated the xenapi power mapping to use it for suspended state. I also updated the mappings in nova.api.openstack.servers to map PAUSED to "error" and SUSPENDED to "suspended". Thoughts there are that we don't currently (openstack API v1.0) use pause, so if somehow an instance were to be paused an error occurred somewhere, or someone did something in error. Either way asking the xenserver host for the status would show "paused". Support for more power states needs to be added to the next version of the openstack API.
    
    merge notes:
    merge with trunk went well locally
    unittests passed locally
    testing of suspend succeeded locally
    
    Notes for testing:
    Suspending an instance requires PV drivers.
    If using the cloudservers API, suspend and resume are not implemented. I tested by modifying in place nova.api.openstack.servers after pulling my branch. I made pause() and unpause() immediately return self.suspend() and self.resume(). Afterwards cloudserver pause (id) and cloudserver unpause (id) will perform the suspend/resume, and you can watch the compute worker log for info on what is happening.
    
    SAMPLE LOG OUTPUT FOR PAUSE/UNPAUSE +++++++++++++++++++++
    DEBUG:root:instance 1178831109: pausing
    INFO:root:Task OpaqueRef:ba3b1595-0d70-574a-aaca-27442d04be87 status: success.
    INFO:root:(VM_UTILS) xenserver vm state -> |Paused|
    INFO:root:(VM_UTILS) xenapi power_state -> |3|
    DEBUG:root:instance 1178831109: unpausing
    INFO:root:Task OpaqueRef:2d9cb792-0ce5-be23-6c50-3dc52cf1535c status: success.
    INFO:root:(VM_UTILS) xenserver vm state -> |Running|
    INFO:root:(VM_UTILS) xenapi power_state -> |1|
    
    SAMPLE LOG OUTPUT FOR SUSPEND/RESUME +++++++++++++++++++++
    DEBUG:root:instance 1178831109: suspending
    INFO:root:Task OpaqueRef:bc5d51da-922f-c9fb-f07c-aaa027fde601 status: success.
    INFO:root:(VM_UTILS) xenserver vm state -> |Suspended|
    INFO:root:(VM_UTILS) xenapi power_state -> |7|
    DEBUG:root:instance 1178831109: resuming
    INFO:root:Task OpaqueRef:4e5a3af8-baed-c144-30ea-63637390f6c8 status: success.
    INFO:root:(VM_UTILS) xenserver vm state -> |Running|
    INFO:root:(VM_UTILS) xenapi power_state -> |1|

commit 32bfe6acdf8e462f90c72c9230b77c8c6fdca93b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 28 05:14:21 2010 +0000

    fixed a line length

 nova/compute/manager.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit eab0ce934e6296910b26c087e4268a65dc233a55
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Dec 28 01:37:04 2010 +0000

    Bug #694880: nova-compute now depends upon Cheetah even when not using libvirt
    
    Only import Cheetah when needed, as we do already with libvirt and libxml2.
    This ensures that users of other virt backends don't need Cheetah to run
    nova-compute.

 nova/tests/test_virt.py   |    1 +
 nova/virt/libvirt_conn.py |   12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 821fc6b5bce393e584d2c0f93243beb43ff547a5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Dec 28 01:09:42 2010 +0000

    Bug #694890: run_tests.sh sometimes doesn't pass arguments to nosetest
    
    Change the argument parsing in run_tests.sh so that we explicitly gather
    the arguments that aren't meant for run_tests.sh, and pass them on to
    nosetests.

 run_tests.sh |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit a40f3e0b14bc761b5f45ac6f5d927fbfdb85160b
Merge: 6a36c90 1c00947
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 28 00:41:22 2010 +0000

    fix bug #lp694311

commit ca5c95726b33bc7d9487a97151a5e65eb2d5f57e
Merge: dfa3fa9 6a36c90
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Dec 27 19:10:26 2010 -0500

    Merge trunk.

commit 31d3aed581302e73b3f155b1dd72586324433e91
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:35:59 2010 -0600

    Typo fix

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ef248060b552825f6a5188eee3061bfd3ac6f5d3
Merge: 431c54b 6a36c90
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:30:23 2010 -0600

    Merge from trunk

commit 431c54ba76a2a85ff55658c571f68378b47ce39d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:29:45 2010 -0600

    Renamed based on feedback from another branch

 nova/api/openstack/backup_schedules.py |    2 ++
 nova/api/openstack/servers.py          |   27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

commit 8e1b74aa1c5a2f9113473eedc8e35b38b41445ea
Author: Andy Smith <code@term.ie>
Date:   Mon Dec 27 15:15:24 2010 -0800

    Added stack command-line tool

 bin/nova-easy-api           |   61 ++++++++++++++++++
 bin/stack                   |  145 +++++++++++++++++++++++++++++++++++++++++++
 nova/api/easy.py            |   57 ++++++++++++-----
 nova/compute/api.py         |    6 ++
 nova/tests/easy_unittest.py |    6 +-
 nova/utils.py               |    2 +-
 nova/wsgi.py                |    3 +-
 7 files changed, 259 insertions(+), 21 deletions(-)

commit 7cc68042a911dc38f1c2c24b3361757c16142b74
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 22:59:08 2010 +0000

    missed a couple of gettext _()

 nova/virt/xenapi/vmops.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 6a36c901b4e72b70ad69e27b50e598d053d4c749
Merge: 0ef58ba 243ba12
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 22:02:57 2010 +0000

    Cleans up nova.api.openstack.images and fix it to work with cloudservers api. Previously "cloudservers image-list" wouldn't work, now it will. There are mappings in place to handle s3 or glance/local image service. In the future when the local image service is working, we can probably drop the s3 mappings.

commit 8d522838ace090a7325d930df08c37f1e9d9803e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 15:42:30 2010 -0600

    Fixing snapshots, pep8 fixes

 nova/api/openstack/images.py      |    2 +-
 nova/tests/api/openstack/fakes.py |    1 +
 nova/virt/fake.py                 |    2 --
 nova/virt/xenapi/vm_utils.py      |   58 ++++++++++++++++++++-----------------
 nova/virt/xenapi/vmops.py         |   16 +++++-----
 nova/virt/xenapi_conn.py          |    2 +-
 6 files changed, 43 insertions(+), 38 deletions(-)

commit 243ba12a903b2eac30dd99305a92f76e430cfb49
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:39:48 2010 +0000

    translate status was returning the wrong item

 nova/api/openstack/images.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 748aa8089eabfd15425199c2318079e9bf84578f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 14:23:53 2010 -0600

    Fixing bad merge

 nova/virt/xenapi/vmops.py |   48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

commit 6debe20395d6ab476bfd2a237df8c2b08050e0e6
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 12:19:36 2010 -0800

    Converted Volume model and operation to use UUIDs.

 nova/api/ec2/cloud.py        |   10 +++++-----
 nova/db/sqlalchemy/api.py    |   39 ---------------------------------------
 nova/db/sqlalchemy/models.py |   15 +++++++--------
 nova/tests/test_cloud.py     |    4 ++--
 nova/tests/test_xenapi.py    |   11 +++++------
 5 files changed, 19 insertions(+), 60 deletions(-)

commit e86f765181a9d0a75486a98e827cc8505b7c4111
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:17:53 2010 +0000

    inst -> item

 nova/api/openstack/images.py |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit 0c983d1f3cba82f992fc128985f4f794fb76190f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:11:36 2010 +0000

    syntax error

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d2ec717f7f819503f977c7a6f35e96867cc6c512
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:06:45 2010 +0000

    renaming things to be a bit more descriptive

 nova/api/openstack/images.py            |   60 +++++++++++++++----------------
 nova/tests/api/openstack/test_images.py |    4 ---
 2 files changed, 29 insertions(+), 35 deletions(-)

commit d22b5f10be4b81c26088d220d62dba02fee0a569
Merge: 54778ea 0ef58ba
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 13:45:57 2010 -0600

    Merging trunk

commit 89000675dfe321240b3dae53604ba87115a3ca3e
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 11:43:17 2010 -0800

    Converted instance references to GUID type.

 nova/db/sqlalchemy/models.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 438197264ea5ddc8bf076100586af6c71b0bf58d
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 11:22:15 2010 -0800

    Added custom guid type so we can choose the most efficient backend DB type easily.

 nova/db/sqlalchemy/models.py |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

commit b879c746049241837af3785adc3068fbe35f199d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 13:20:37 2010 -0600

    backup schedule changes

 nova/api/openstack/__init__.py         |    2 +-
 nova/api/openstack/backup_schedules.py |   10 +++++++++-
 nova/api/openstack/servers.py          |    6 ++++--
 nova/api/openstack/sharedipgroups.py   |   27 ++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 7 deletions(-)

commit d808c70dd5420daf90931cdf122d0937af0655b3
Merge: 77d7e02 0ef58ba
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 10:50:02 2010 -0800

    Merged trunk.

commit 54778eacd5e8db448f2079ec82055c3a3aa5d906
Merge: a68f669 75e2cbe
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 12:13:57 2010 -0600

    Merging trunk, fixing failed tests

commit 3490fde00fd8bfb00834b1085de62d86c9c9d061
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 12:08:22 2010 -0600

    A few fixes

 nova/api/openstack/backup_schedules.py |    5 ++++-
 nova/api/openstack/servers.py          |    3 ++-
 nova/api/openstack/sharedipgroups.py   |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

commit 404015903646a00901ad1310c2a7731f960fae75
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 17:18:43 2010 +0000

    removed \

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 002bbfa7a648a1117e14713eab3ee3ee4b2b6d8e
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 27 12:06:36 2010 -0500

    Moving README to doc/networking.rst per recommendation from Jay Pipes

 plugins/xenserver/doc/networking.rst |  144 ++++++++++++++++++++++++++++++++++
 plugins/xenserver/networking/README  |  144 ----------------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

commit 951da0d458755d339a226cc54250921fecc6b735
Merge: bd46ab4 0ef58ba
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 27 10:53:32 2010 -0600

    Merged trunk

commit 4b271b9e25ac2573cbb82f4b89434d608a91a8c7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 16:41:41 2010 +0000

    couple of pep8s

 nova/api/openstack/images.py            |    1 -
 nova/tests/api/openstack/test_images.py |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit d009dcbfb458e825e6a6f70312f846c96c2ddca2
Merge: b98c22f 0ef58ba
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 27 11:27:46 2010 -0500

    merge trunk

commit 0ef58bac84f5a5824cf91cc3d583ded2ccb1fd9a
Merge: bd6a3cb c2e6454
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 27 14:06:50 2010 +0000

    Fixed after Jay's review.
    Integrated code from Soren (we now use the same 'magic number' for images without kernel & ramdisk.

commit c2e645416d88e4438b9359c5dccacf4690c4f54e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 27 10:04:25 2010 +0000

    Fixed pep8 errors

 nova/virt/libvirt_conn.py |   15 ++++++++-------
 nova/virt/xenapi/fake.py  |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

commit 85acbbe916df8b2d18f0dc3a0b8cad9fcfdd6907
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Mon Dec 27 17:49:07 2010 +0900

    launch_at を前回コミット時に追加したが、lauched_atというカラムが既に存在し、
    紛らわしいのでlauched_onにした。

 nova/compute/manager.py      |    2 +-
 nova/db/sqlalchemy/models.py |    4 ++--
 nova/scheduler/manager.py    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 1c00947aa86597d918d651b5385a6a4d72671c10
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sun Dec 26 14:08:38 2010 +0000

    logs inner exception in nova/utils.py->import_class

 nova/utils.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit bd6a3cb1acb68ac2252c1bafc531b3b12f9746d8
Merge: 956f842 f361891
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 25 12:47:20 2010 +0000

    Fix Bug #693963

commit f361891d100bbc9a5fb0f2ffd5424b6c69100133
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 24 19:17:02 2010 +0000

    remove requirement of sudo on tests

 nova/tests/test_xenapi.py  |    1 +
 nova/tests/xenapi/stubs.py |   13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 5f0aaa0fb60f052f0738a5df62327f30c14e6a10
Merge: f15349b 956f842
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 24 18:58:06 2010 +0000

    merge trunk

commit f4da70ef42e5b8908f9979f2f80c60798a517c60
Merge: 43f59fc 956f842
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Dec 24 21:07:53 2010 +0300

    Merge

commit 43f59fc025b4decd02a78acbfd0cf654bc9cf0db
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Dec 24 21:05:45 2010 +0300

    adding zones to api

 nova/api/ec2/cloud.py        |    7 ++++++-
 nova/compute/api.py          |    6 ++++--
 nova/db/sqlalchemy/models.py |    2 +-
 nova/service.py              |    3 ++-
 nova/tests/test_scheduler.py |    7 ++++---
 nova/tests/test_service.py   |   24 ++++++++++++++++--------
 6 files changed, 33 insertions(+), 16 deletions(-)

commit c5c58cb20def79401a374f863983a343139b53f3
Author: NTT PF Lab. <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Dec 24 20:38:49 2010 +0900

    Support IPv6

 bin/nova-manage                         |   12 ++-
 contrib/boto_v6/__init__.py             |   37 +++++++
 contrib/boto_v6/ec2/connection.py       |   41 +++++++
 contrib/boto_v6/ec2/instance.py         |   33 ++++++
 contrib/nova.sh                         |    6 ++
 nova/api/ec2/cloud.py                   |    9 +-
 nova/db/api.py                          |    9 ++
 nova/db/sqlalchemy/api.py               |   23 ++++
 nova/db/sqlalchemy/models.py            |    4 +
 nova/network/linux_net.py               |   88 +++++++++++++++
 nova/network/manager.py                 |   30 +++++-
 nova/test.py                            |    3 +-
 nova/tests/api_unittest.py              |   67 ++++++++++++
 nova/tests/network_unittest.py          |   21 ++++
 nova/utils.py                           |   39 +++++++
 nova/virt/libvirt.qemu.xml.template     |    1 +
 nova/virt/libvirt.uml.xml.template      |    1 +
 nova/virt/libvirt_conn.py               |   68 ++++++++++--
 smoketests/admin_smoketests.py          |    3 +-
 smoketests/base.py                      |   17 ++-
 smoketests/flags.py                     |    3 +-
 smoketests/public_network_smoketests.py |  180 +++++++++++++++++++++++++++++++
 smoketests/user_smoketests.py           |   39 +++++--
 23 files changed, 702 insertions(+), 32 deletions(-)

commit d7a790440b4beced21ee4986448e75d83415ec0e
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:29:27 2010 +0900

    test commit

commit a32ccff2e224d0d2bf72a0471d9e9599ba4d8990
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:06:11 2010 +0900

    テスト項目表を再び追加した状態でコミット

 nova/livemigration_test/SI/picture.pptx            |  Bin 0 -> 137730 bytes
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 0 -> 43520 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 0 -> 464384 bytes
 nova/livemigration_test/SI/utils/demo-firstboot.sh |   39 ++
 .../SI/utils/demo-runInstance.sh                   |   57 +++
 nova/livemigration_test/SI/utils/nova-manage.conf  |   18 +
 nova/livemigration_test/SI/utils/nova.conf         |   10 +
 nova/livemigration_test/SI/utils/nova.sh           |  180 +++++++++
 nova/livemigration_test/SI/utils/nova.sh.compute   |   37 ++
 nova/livemigration_test/UT/computeManager.test.py  |  411 ++++++++++++++++++++
 .../UT/libvirtConnection.test.py                   |  372 ++++++++++++++++++
 nova/livemigration_test/UT/nova-manage.test.py     |  351 +++++++++++++++++
 .../livemigration_test/UT/schedulerManager.test.py |  408 +++++++++++++++++++
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 0 -> 202752 bytes
 14 files changed, 1883 insertions(+)

commit 21c1ba77cdb95b95a13a81c243ac13e0cf8a632f
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:05:24 2010 +0900

    テスト項目表をローカルから一度削除した状態でコミット

 nova/livemigration_test/SI/picture.pptx            |  Bin 137730 -> 0 bytes
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 43520 -> 0 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 464384 -> 0 bytes
 nova/livemigration_test/SI/utils/demo-firstboot.sh |   39 -
 .../SI/utils/demo-runInstance.sh                   |   57 --
 nova/livemigration_test/SI/utils/nova-manage.conf  |   18 -
 nova/livemigration_test/SI/utils/nova.conf         |   10 -
 nova/livemigration_test/SI/utils/nova.sh           |  180 -----
 nova/livemigration_test/SI/utils/nova.sh.compute   |   37 -
 nova/livemigration_test/UT/computeManager.test.py  |  821 --------------------
 .../UT/libvirtConnection.test.py                   |  741 ------------------
 nova/livemigration_test/UT/nova-manage.test.py     |  672 ----------------
 .../livemigration_test/UT/schedulerManager.test.py |  771 ------------------
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 202752 -> 0 bytes
 14 files changed, 3346 deletions(-)

commit 6b4511d33562da46f9954bf5423ada49f9696d75
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 15:45:05 2010 +0900

    テスト項目表がなぜか消えたので追加

 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 0 -> 43520 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 0 -> 464384 bytes
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 0 -> 202752 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

commit 366ca61fd1e02135cb0b5289a04f325c16cbb051
Merge: 70f1f0d f983884
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 15:30:42 2010 +0900

    nova.compute.managerがこれまでの修正でデグレしていたので修正
    CPUID, その他のチェックルーチンをnova.scheduler.manager.live_migrationに追加

commit f983884dd262f46907f80a04121d957347881240
Author: root <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 15:09:05 2010 +0900

    nova.compute.managerがこれまでの修正でデグレしていたので修正
    CPUID, その他のチェックルーチンをnova.scheduler.manager.live_migrationに追加

 bin/nova-manage                                    |   23 +--
 nova/compute/manager.py                            |   15 +-
 nova/db/sqlalchemy/models.py                       |    8 +-
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 35840 -> 43520 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 464384 -> 464384 bytes
 nova/livemigration_test/UT/computeManager.test.py  |   10 +-
 .../UT/libvirtConnection.test.py                   |   10 +-
 nova/livemigration_test/UT/nova-manage.test.py     |   77 +++++---
 .../livemigration_test/UT/schedulerManager.test.py |  192 ++++++++++++--------
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 195072 -> 202752 bytes
 nova/scheduler/manager.py                          |   70 +++++--
 nova/service.py                                    |   17 +-
 nova/virt/libvirt_conn.py                          |   40 +++-
 13 files changed, 327 insertions(+), 135 deletions(-)

commit 956f842c587bf1610f55ca3893f3b9eef924293c
Merge: 75e2cbe 24eada1
Author: David Pravec <David.Pravec@danix.org>
Date:   Fri Dec 24 01:51:33 2010 +0000

        Make nova work even when user has LANG or LC_ALL configured
    
        Some commands are having different results when used in another language environment.
        For example ifconfig output parsing fails in my language.
        Also unittest using cat failed, as it didnt expect czech language in the error message.
    
        This small patch makes it work.
        Also adding myself to 'Authors' file

commit 24eada1bf54f973d5bd423ba51d505352321324c
Merge: 6035549 75e2cbe
Author: David Pravec <David.Pravec@danix.org>
Date:   Fri Dec 24 02:17:29 2010 +0100

    merged trunk, resolved trivial conflict

commit 6035549fb7a930a0f0995da7ae696a4dc1ebc548
Merge: 41b5e4a 8060b52
Author: David Pravec <David.Pravec@danix.org>
Date:   Fri Dec 24 02:10:40 2010 +0100

    merged trunk, resolved conflict
    
    someone deleted process_unittest.py in trunk, so the problem in that one is gone now.

commit 59c3e5bf0dda0c0c1b77307a339f3102c7179885
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 18:09:52 2010 -0600

    Faked out handling for shared ip groups so they return something

 nova/api/openstack/ratelimiting/__init__.py |    4 ++--
 nova/api/openstack/sharedipgroups.py        |   22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

commit f793e186910c1aec10759f5d05e305cf6889a02f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:52:33 2010 +0000

    another typo

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 26a8afd85233e142f97fdcc802c41b9a765efb32
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:27:39 2010 +0000

    applied power state conversion to test

 nova/tests/api/openstack/test_images.py |    2 ++
 1 file changed, 2 insertions(+)

commit d8d66d4c2c25d25892289e08ca52720f9d123d88
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:19:24 2010 +0000

    trying again

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 391ab4dd63297afcc9449059bcadfe6ac5008b5f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:13:03 2010 +0000

    typo

 nova/tests/api/openstack/test_images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 257da8a0e5fd949f62232bf2eef9d91f36fc41ce
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:09:58 2010 +0000

    fixed the os api image test for glance

 nova/tests/api/openstack/test_images.py |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

commit ef8e4495f5ed195a08be6c02b3eb3326f6403bb6
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 23 16:56:21 2010 -0600

    updated the xenstore methods to reflect that they write to the param record of xenstore, not the actual xenstore itself.

 nova/virt/xenapi/vmops.py |  142 ++++++++++++++++++++++++++-------------------
 1 file changed, 82 insertions(+), 60 deletions(-)

commit 6df8d6827d48572ba4cc7cf13fd69286f0dcafe1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 22:00:44 2010 +0000

    fixed typo

 nova/api/openstack/images.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f4a6468b9694a34c477df7fc0c5a077ae6f1207e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 23 21:57:11 2010 +0000

    Merged with trunk
    All tests passed
    Could not fix some pep8 errors in nova/virt/libvirt_conn.py

 nova/virt/xenapi/fake.py         |    1 +
 nova/virt/xenapi/volume_utils.py |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

commit 5f8d02b39fb8917b34b68bbbf450656e1b68211c
Merge: 1c26d2b 75e2cbe
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:53:33 2010 +0000

    fixed merge conflict

commit 1c26d2b2ce824dbc64525eea699efbfa8bf04617
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:48:14 2010 +0000

    updated since dietz moved the limited function

 nova/api/openstack/images.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8e1122997867a16c161954004b5f1722282a97ef
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:45:01 2010 +0000

    fixed error occuring when tests used glance attributes, fixed docstrings

 nova/api/openstack/images.py |   51 +++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 15 deletions(-)

commit 2ae831a6b656ea9203b7326e06db4ba9ebcc25d8
Merge: 301dd94 75e2cbe
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 23 21:41:54 2010 +0000

    Merged again from trunk

commit 2d68b42c8950596955fe6227445c2cffb09236a6
Merge: a0ca9d4 75e2cbe
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:33:16 2010 +0000

    fixed a few docstrings, added _() for gettext

commit a0ca9d4a9550370cc262574fbee097e5b70e408d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 20:35:16 2010 +0000

    added _() for gettext and a couple of pep8s

 nova/api/openstack/servers.py  |    8 ++++----
 nova/compute/manager.py        |    4 ++--
 nova/tests/compute_unittest.py |    4 ++--
 nova/virt/fake.py              |    8 ++++++--
 nova/virt/xenapi/vm_utils.py   |    4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

commit a1b5220879632d093f450413f96668a8f77c0613
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 23 12:04:19 2010 -0800

    adds a reflection api

 nova/api/easy.py |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

commit 57ead438d06dd5c6e98e971670f397bed5d7e29c
Merge: d88817a 75e2cbe
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Dec 23 22:58:20 2010 +0300

    Merge with trunk

commit d88817a360676173ac31566e13201d56f1e2b0b0
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Dec 23 22:46:58 2010 +0300

    unit test - should be reworked

 nova/tests/scheduler_unittest.py |   43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 75e2cbec9eb5132a49446f1b6d563d5f43d007de
Merge: 8cecaac e275fbd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 19:46:46 2010 +0000

    Moves implementation specific Openstack API code from the middleware to the drivers. Also cleans up a few areas and ensures all the API tests are passing again.

commit bd46ab4a721da856da5743c9f55ab5e50ec9b60f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:36:01 2010 -0600

    PEP8 fix

 nova/virt/xenapi/vmops.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit e275fbd8e16e6dc55c54072aa162815d522f9242
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 13:30:24 2010 -0600

    One more time

 nova/tests/api/openstack/fakes.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cb679a01e5905e4f7316f81de7c9ead9dc6536b8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 13:17:53 2010 -0600

    Pep8 cleanup

 nova/api/openstack/auth.py                  |    1 +
 nova/api/openstack/common.py                |    2 ++
 nova/api/openstack/ratelimiting/__init__.py |    1 +
 nova/api/openstack/sharedipgroups.py        |    2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

commit 13e8c8d83b8fc44cff343ea751a98f66857d1865
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:14:56 2010 -0600

    Resolved merge conflict

 nova/virt/xenapi_conn.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit de40fa065b1bc6631e69992e1baeab629b89337d
Merge: 55a8081 8cecaac
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:10:38 2010 -0600

    Merged trunk

commit 8cecaace79ec4a06de0c5857cc1fb5b375af8dc5
Merge: a0ab2ff bb6f5e7
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 23 19:07:10 2010 +0000

    Trying to remove twisted dependencies, this gets everything working under nosetests.

commit bb6f5e70c058717758b638684f24111e7288b00f
Merge: 5324961 c273c2b
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 23 10:33:05 2010 -0800

    Merged Monty's branch.

commit 5324961f55cc82510276a6afa6017afcc6249f98
Merge: b1d4579 a0ab2ff
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 23 10:31:46 2010 -0800

    Merged trunk and resolved conflicts.

commit 55a80811a5982cb9af5b80e7ac3e925334a1b22d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 12:23:28 2010 -0600

    Working diagnostics API; removed diagnostics DB model - not needed

 nova/api/openstack/servers.py |    3 ++-
 nova/compute/api.py           |    9 +++++++++
 nova/compute/manager.py       |   11 +++++++++++
 nova/db/sqlalchemy/models.py  |   11 +----------
 nova/virt/xenapi/vmops.py     |    6 +++---
 nova/virt/xenapi_conn.py      |    4 ++--
 6 files changed, 28 insertions(+), 16 deletions(-)

commit 99854dbb46ef9b1d266bfb5e36a2b15733bef6ea
Merge: 4d8d2e3 a0ab2ff
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 23 12:07:42 2010 -0600

    merged trunk

commit f6c616cb883ee6439ac0c1fa99816aede24a84e3
Merge: ba6a99f a0ab2ff
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 12:06:00 2010 -0600

    Merge from trunk

commit 4d8d2e34369d67a91491f1c0c8e3ff2613e00d6f
Merge: 6c8fe19 5f3f5ac
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 23 12:04:42 2010 -0600

    merged trunk

commit ba6a99f926180d47870dcb18e4387d18cddad9b0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 11:58:13 2010 -0600

    Superfluous images include and added basic routes for shared ip groups

 nova/api/openstack/sharedipgroups.py     |   20 +++++++++++++++++++-
 nova/tests/api/openstack/test_servers.py |    1 -
 2 files changed, 19 insertions(+), 2 deletions(-)

commit a0ab2ffca9a4a578115f36319bbd8640b0521cb0
Merge: f0c4580 5012ccb
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 23 17:46:59 2010 +0000

    Simplifies and improves ldap schema.

commit f0c4580aa66984bae61846ac110dd679813b933e
Merge: 0761ecb 0859344
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 17:27:02 2010 +0000

    xenapi iscsi support + unittests

commit 358961f3cf259487a2ff9bbb225defdc7cd9e7a7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 11:22:51 2010 -0600

    Fixed trunk and PEP8 cleanup

 nova/virt/libvirt_conn.py |   16 +++++++++-------
 nova/virt/xenapi_conn.py  |    4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

commit e232fe3015b6e80a595551e7e80614f3bc385255
Merge: a7dd37c 0761ecb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 11:11:18 2010 -0600

    Merged trunk

commit c273c2b93471ad0d3ab4990458147c253d22bdc5
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Dec 23 08:57:04 2010 -0800

    Added reference in setup.py so that python setup.py test works now.

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit a52435869a0fb95f7890318c7b6a845bd6d12b7b
Merge: 0f57592 0859344
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 13:16:47 2010 +0000

    merge lp:nova

commit e4c1fa91e0245dc6f673c5ac8880a99bd3d0dea1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:32:15 2010 -0800

    better bin name, and pep8

 bin/nova-ajax-console-proxy |  126 +++++++++++++++++++++++++++++++++++++++++++
 bin/nova-ajax-proxy         |  126 -------------------------------------------
 tools/euca-get-ajax-console |   47 ++++++++--------
 3 files changed, 151 insertions(+), 148 deletions(-)

commit 50fe4b93ce2a015c31286d2b2de64a0128761086
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:26:03 2010 -0800

    pep8 fixes

 bin/nova-ajax-proxy |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 43dfae5926bafa1575aee9624651cfcb8f170bb3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:22:54 2010 -0800

    some pep8 fixes

 nova/flags.py             |    2 +-
 nova/virt/libvirt_conn.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 777f739e954389dcabc92ef4da7063efd2bae6a3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:58:15 2010 -0800

    removing xen/uml specific switches.  If they need special treatment, we can add it

 nova/virt/libvirt_conn.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit 60329e3b7561314f35ad66882dec3bdcb0ed8970
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:43:15 2010 -0800

    add license

 tools/euca-get-ajax-console |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 8edbd81dbaaec3aaf528b7c0c73979b465af261d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:41:21 2010 -0800

    delete xtra dir

commit 0a2655ecb6aa6df02014d7ab30b43dd5b615a31a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:40:41 2010 -0800

    move euca-get-ajax-console up one directory

 tools/euca-get-ajax-console                |   95 +++++++++++++++++++++++++++
 tools/euca_additions/euca-get-ajax-console |   96 ----------------------------
 2 files changed, 95 insertions(+), 96 deletions(-)

commit e9bd42f731904b16752822cacd0d078d7fd9d798
Merge: 151ffc5 0761ecb
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:38:11 2010 -0800

    merge trunk

commit 151ffc57a3dd5217981dbaa1754384290d7d73ec
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:23:08 2010 -0800

    move port range for ajaxterm to flag

 nova/virt/libvirt_conn.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 86b9e564fec24423485b5087e41584abd0de1da0
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:49:10 2010 -0800

    more tweaks

 bin/nova-ajax-proxy |    3 ---
 1 file changed, 3 deletions(-)

commit e6a01c663bbcd5fc5244c48b97ef0bef4ce524ea
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:47:46 2010 -0800

    add in license

 bin/nova-ajax-proxy |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 237326dd6b5905a18fc7ba740457ceb52164ab59
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:46:21 2010 -0800

    some cleanup

 bin/nova-ajax-proxy |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

commit 4364a6e0570794fca841a7e5ecc8cecebf1bae9b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:41:07 2010 -0800

    rewrite proxy to not use twisted

 bin/nova-ajax-proxy       |  128 ++++++++++++++++++++++-----------------------
 nova/flags.py             |    3 ++
 tools/ajaxterm/sarissa.js |    2 +-
 3 files changed, 67 insertions(+), 66 deletions(-)

commit 45c75b0c8ecea6952d68cc28d2925c6a42a799de
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 07:05:45 2010 +0000

    added power state logging to nova.virt.xenapi.vm_utils

 nova/virt/xenapi/vm_utils.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 62286399b69218418020baaf524292c1677d27d3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 06:48:15 2010 +0000

    added suspend as a power state

 nova/api/openstack/servers.py |    3 ++-
 nova/compute/power_state.py   |    4 +++-
 nova/virt/xenapi/vm_utils.py  |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit 0859344e5f709808daaf35e3c84ccdcb8d91ae4d
Merge: 2467828 0761ecb
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 03:36:13 2010 +0000

    last merge trunk before push

commit 24678288054982fa6dccb9e96954fe00014f3a52
Merge: 497734c 6aabbed
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 03:35:41 2010 +0000

     merge trunk, fixed unittests, added i18n strings, cleanups etc etc.

commit 12a9dc88f6ae947d005568dd2e644566cd1a9677
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 21:14:06 2010 -0600

    And the common module

 nova/api/openstack/common.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 4e9b4c9ce31a7a50d7e38d5e0bd71718d5bb8b95
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 18:52:43 2010 -0800

    minor notes, commit before rewriting proxy with eventlet

 bin/nova-ajax-proxy       |    1 -
 nova/compute/api.py       |    1 -
 nova/virt/libvirt_conn.py |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

commit 0761ecb442bcae74513a77c9bf19d195c89860ed
Merge: 6aabbed 588b399
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 02:14:33 2010 +0000

    There were a few unclaimed addresses in mailmap.
    
    <vishvananda@gmail.com> is me from my vm
    <sleepsonthefloor@gmail.com> is Anthony Young
    
    <rlane@wikimedia.org> is Ryan Lane.  If I can find a real email address for him, I'll change that one as well.

commit 497734c73414342ac8ffd44bf940a202143d8dfc
Merge: 4cf47fc 63649bd
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 02:09:50 2010 +0000

    first merge after i18n

commit 7c1b3ef521c652ce375390a1ecb04a60d1f100f0
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 18:04:35 2010 -0800

    remove some notes

 nova/api/easy.py |    2 --
 1 file changed, 2 deletions(-)

commit 588b39981d03c61c7b4eafdb489467ab57540d13
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 02:03:39 2010 +0000

    Add Ryan Lane as well

 .mailmap |    3 +--
 Authors  |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 70d254c626e925f6de8408f0ca70f3de28a7307a
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 17:53:42 2010 -0800

    added tests to ensure the easy api works as a backend for Compute API

 nova/api/easy.py               |   10 +++++-----
 nova/api/ec2/cloud.py          |   34 ++++++++++++++++++++--------------
 nova/compute/api.py            |   19 +++++++++++++++----
 nova/tests/cloud_unittest.py   |    2 ++
 nova/tests/compute_unittest.py |    9 ++++++---
 nova/tests/easy_unittest.py    |   19 ++++++++++++++++++-
 nova/utils.py                  |   31 +++++++++++++++++++++++++++++++
 nova/wsgi.py                   |    6 +++---
 8 files changed, 100 insertions(+), 30 deletions(-)

commit 93dcd9088108b17c44337f556d0c624e802ba788
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 01:32:57 2010 +0000

    fix commits from Anthony and Vish that were committed with the wrong email

 .mailmap |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 43e9f8727af618fc3e50308cba95b27c67ee83c5
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:52:16 2010 -0800

    remove some yields that snuck in

 nova/tests/cloud_unittest.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 6b6f020e60bb8f9aad924138bbc95614ae1d2a99
Merge: 4ff2da2 6aabbed
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:50:08 2010 -0800

    merge from trunk

commit 4ff2da231d485598232d9aacc41538950005ac34
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:43:47 2010 -0800

    Basic Easy API functionality

 nova/api/easy.py            |  163 +++++++++++++++++++++++++++++++++++++++++++
 nova/tests/easy_unittest.py |   85 ++++++++++++++++++++++
 nova/wsgi.py                |   31 ++++++--
 run_tests.py                |    1 +
 4 files changed, 274 insertions(+), 6 deletions(-)

commit 6aabbeda013db5af36de4a82f0e8a9fda4d4d273
Merge: e69f5f9 d0a3603
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 00:38:57 2010 +0000

    Fixes reboot (and rescue) to work even if libvirt doesn't know about the instance and the network doesn't exist.

commit d0a360342b8aba0ec9caa4f49a27b721d8974895
Merge: a7e5a4a e69f5f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 00:30:52 2010 +0000

    merged trunk

commit e69f5f90200850db6ffb3210133d361b720be7e9
Merge: a49bca3 a7e5a4a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 00:14:57 2010 +0000

    Fixes reboot (and rescue) to work even if libvirt doesn't know about the instance and the network doesn't exist.

commit a49bca309734415cc8fb0d2701c306d02388a0f9
Merge: 5f3f5ac 440978c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 23:59:14 2010 +0000

    Adds a flag to use the X-Forwarded-For header to find the ip of the remote server.  This is needed when you have multiple api servers with a load balancing proxy in front.  It is a flag that defaults to False because if you don't have a sanitizing proxy in front, users could masquerade as other ips by passing in the header manually.

commit 5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d
Merge: e893be0 3f37287
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 22 23:47:31 2010 +0000

    Merge from trunk, and resolve conflict with nova/auth/ldapdriver.py

commit 3f37287c1adfe35756c58938ea8d826181bad2e2
Merge: e55a8ff 5f3f5ac
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 22 23:44:05 2010 +0000

    Merge from trunk

commit 6c8fe1963e6d64ba76698dbbaeb7ef9f63cfda95
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 17:33:21 2010 -0600

    Got basic xenstore operations working

 nova/virt/xenapi/vmops.py |   63 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 8 deletions(-)

commit a7dd37cfa300284f19e9b85858dc4bdf7dafc99f
Merge: 749af38 5f3f5ac
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:16:01 2010 -0600

    Merged trunk

commit 749af384c0b7ca36bdd8c511f02b819a65e5dae0
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:09:46 2010 -0600

    Modified InstanceDiagnostics and truncate action

 nova/api/openstack/__init__.py |    1 +
 nova/api/openstack/servers.py  |    4 ++++
 nova/db/sqlalchemy/models.py   |   10 ++--------
 nova/virt/xenapi_conn.py       |    2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

commit a7e5a4a39b93b32974ca82b77391368c4f01cdd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 22:54:43 2010 +0000

    removed extra files

 nova/virt/libvirt.rescue.qemu.xml.template.THIS |   38 -----------------------
 nova/virt/libvirt.rescue.uml.xml.template.THIS  |   31 ------------------
 2 files changed, 69 deletions(-)

commit de7e4d2da9ba498344e9d02fbf9b64d6557dfa09
Merge: f0195eb 5f3f5ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 22:54:13 2010 +0000

    merged trunk

commit 5f3f5acbddd66dfb3e8203724ed0ff9d0be3d5ae
Merge: eb64fe7 0704c0c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 22:04:30 2010 +0000

    Moves the ip allocation requests to the from the api host into calls to the network host made from the compute host.

commit 0704c0c4073f6c03959c113f90c51dfe4d72fd76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:55:11 2010 +0000

    pep8 fix

 nova/fakerabbit.py |    1 +
 1 file changed, 1 insertion(+)

commit 440978ce046a73acede887117e9812f1a6a026fa
Merge: ca10179 eb64fe7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:50:58 2010 +0000

    merged trunk and fixed conflicts

commit 775958e3a020b6b4b4c9fd4777aa72f7e9b0bdbc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 15:50:26 2010 -0600

    Accidentally yanked the datetime line in auth

 nova/api/openstack/__init__.py |    2 +-
 nova/api/openstack/auth.py     |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 1509d51c7e9be04f8ca7aa9fb50d7b06b20a4e71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:41:40 2010 +0000

    remove extra files that slipped in

 nova/virt/libvirt.uml.xml.template.THIS |   27 ---------------------------
 1 file changed, 27 deletions(-)

commit d0807b0e7290bcb1dfd7449470bc2def903272be
Merge: 9e42bc1 eb64fe7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:38:44 2010 +0000

    merged trunk

commit 9e42bc18a12fe19ae333a3447d153bf3796d54d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:38:06 2010 +0000

    add missing flag

 nova/network/linux_net.py |    2 ++
 1 file changed, 2 insertions(+)

commit eb64fe72160ca7c68809eaf0af91768f4eb5d8e8
Merge: 0149b76 26798c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:33:58 2010 +0000

    Optimize creation of nwfilter rules so they aren't constantly being recreated.

commit 0093342106cc270859df0511dbefad8ec8fc2320
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 13:31:33 2010 -0800

    use libvirt python bindings instead of system call

 nova/virt/libvirt_conn.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit f7a9bc85e57a5941ec3557d62143a246c12273af
Merge: 9d4a60d 0149b76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:21:56 2010 +0000

    fixed more conflicts

commit 26798c6b52afb9a58f74008ccfe646d587093684
Merge: 8119166 0149b76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:17:30 2010 +0000

    merged trunk again

commit aa8a6a01bdf8a2f0f732e993a1732993f7328eff
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 13:00:20 2010 -0800

    add in support of openstack api

 nova/api/ec2/cloud.py         |   23 +----------------------
 nova/api/openstack/servers.py |    9 +++++++++
 nova/compute/api.py           |   24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 22 deletions(-)

commit 81191660cf6d1e5ea47630ed45041dc923f6b57a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:59:53 2010 +0000

    merge trunk and upgrade to cheetah templating

 .mailmap                                        |    1 +
 Authors                                         |    2 +
 MANIFEST.in                                     |    2 +-
 nova/adminclient.py                             |    1 +
 nova/api/cloudpipe/__init__.py                  |    4 +-
 nova/api/ec2/__init__.py                        |    6 +-
 nova/api/ec2/admin.py                           |    1 +
 nova/api/ec2/apirequest.py                      |    4 +-
 nova/api/ec2/cloud.py                           |   54 ++++----
 nova/api/ec2/metadatarequesthandler.py          |    2 +-
 nova/api/openstack/__init__.py                  |   17 ++-
 nova/api/openstack/backup_schedules.py          |    1 +
 nova/api/openstack/servers.py                   |   29 ++++
 nova/auth/dbdriver.py                           |   20 +--
 nova/auth/fakeldap.py                           |  101 +++++++++-----
 nova/auth/ldapdriver.py                         |   69 +++++-----
 nova/auth/manager.py                            |   30 ++--
 nova/cloudpipe/pipelib.py                       |    2 +-
 nova/compute/api.py                             |   47 +++++--
 nova/compute/disk.py                            |   38 +++--
 nova/compute/instance_types.py                  |    3 +-
 nova/compute/manager.py                         |   73 +++++++---
 nova/compute/monitor.py                         |   12 +-
 nova/crypto.py                                  |   18 +--
 nova/db/api.py                                  |    5 +
 nova/db/sqlalchemy/api.py                       |   64 +++++----
 nova/db/sqlalchemy/models.py                    |   36 ++++-
 nova/exception.py                               |   11 +-
 nova/fakerabbit.py                              |   12 +-
 nova/flags.py                                   |    7 +-
 nova/image/glance.py                            |    8 +-
 nova/image/s3.py                                |    3 +-
 nova/network/linux_net.py                       |   10 +-
 nova/network/manager.py                         |   20 +--
 nova/objectstore/handler.py                     |   24 ++--
 nova/rpc.py                                     |   34 ++---
 nova/scheduler/chance.py                        |    2 +-
 nova/scheduler/driver.py                        |    2 +-
 nova/scheduler/manager.py                       |    2 +-
 nova/scheduler/simple.py                        |   13 +-
 nova/service.py                                 |   14 +-
 nova/tests/api/openstack/test_servers.py        |   37 ++++-
 nova/tests/auth_unittest.py                     |   10 +-
 nova/tests/compute_unittest.py                  |    8 ++
 nova/tests/virt_unittest.py                     |  134 ++++++++++++++----
 nova/twistd.py                                  |    8 +-
 nova/utils.py                                   |   14 +-
 nova/virt/connection.py                         |    2 +-
 nova/virt/fake.py                               |   16 ++-
 nova/virt/libvirt.qemu.xml.template             |   34 -----
 nova/virt/libvirt.rescue.qemu.xml.template      |   38 -----
 nova/virt/libvirt.rescue.qemu.xml.template.THIS |   38 +++++
 nova/virt/libvirt.rescue.uml.xml.template       |   31 -----
 nova/virt/libvirt.rescue.uml.xml.template.THIS  |   31 +++++
 nova/virt/libvirt.rescue.xen.xml.template       |   34 -----
 nova/virt/libvirt.uml.xml.template              |   27 ----
 nova/virt/libvirt.uml.xml.template.THIS         |   27 ++++
 nova/virt/libvirt.xen.xml.template              |   30 ----
 nova/virt/libvirt.xml.template                  |   79 +++++++++++
 nova/virt/libvirt_conn.py                       |  168 ++++++++++++-----------
 nova/virt/xenapi/network_utils.py               |    1 +
 nova/virt/xenapi/vm_utils.py                    |    7 +-
 nova/virt/xenapi/vmops.py                       |   55 ++++++--
 nova/virt/xenapi/volumeops.py                   |    1 +
 nova/virt/xenapi_conn.py                        |   81 +++++++----
 nova/volume/driver.py                           |   10 +-
 nova/volume/manager.py                          |   20 +--
 tools/pip-requires                              |    1 +
 68 files changed, 1074 insertions(+), 672 deletions(-)

commit 2504643977e40a0f37101280118df8d3c5dc3b1c
Merge: cd460a1 ff1575e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:59:16 2010 +0000

    Optimize nwfilter creation and project filter

commit a68f669333c76aeb87ad492541ee3ae290968389
Merge: f31395c 0149b76
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:58:02 2010 -0600

    Merging trunk

commit 9d4a60d6bd7621b44a1ccd4a48741f32e620f342
Merge: db938f9 ff1575e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:54:58 2010 +0000

    fixed conflicts

commit f31395c30c835201372802e9cdf9293dcbabdb5c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:54:02 2010 -0600

    Adding more comments regarding XS snapshots

 Authors                        |    1 +
 nova/tests/compute_unittest.py |    8 ++++++++
 nova/virt/fake.py              |   16 ++++++++++++++++
 nova/virt/libvirt_conn.py      |    2 +-
 nova/virt/xenapi/vm_utils.py   |   20 +++++++++++++++++---
 nova/virt/xenapi/vmops.py      |   22 +++++++++++++++++++++-
 nova/virt/xenapi_conn.py       |    1 -
 7 files changed, 64 insertions(+), 6 deletions(-)

commit 19f389b3dcc89f0115dc6fc1a6ca606338ad866a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 12:36:37 2010 -0800

    working connection security

 bin/nova-ajax-proxy                        |   57 ++++++++++++++++++++--------
 nova/api/ec2/cloud.py                      |   21 ++++++----
 nova/flags.py                              |    5 ++-
 nova/virt/libvirt_conn.py                  |    8 ++--
 tools/euca_additions/euca-get-ajax-console |    1 +
 5 files changed, 63 insertions(+), 29 deletions(-)

commit 0149b760b686465aaa7d68a1411713207becd035
Merge: 8678b95 be6793d
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 22 20:19:20 2010 +0000

    WSGI middleware for lockout after failed authentications of ec2 access key.

commit 8678b955db3a84500bc0364ae4bc59e8acf1fe62
Merge: fb16888 0d70511
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:11:16 2010 +0000

    Modifies nova-network to recreate important data on start.

commit fb168880cc967b2a6ecf0180a1c0bbfc46ecb1f9
Merge: 9547b76 2a070f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:09:23 2010 +0000

    Puts the creation of nova iptables chains into the source code and cleans up rule creation.  This makes nova play more nicely with other iptables rules that may be created on the host.
    
    Additionally adds support via flag for specifying a dns server to use for dnsmasq instead of just using the default /etc/hosts and dns server that the host is using.
    
    Note: based on lp:~vishvananda/nova/project-vpns to simplify merging of flag changes.

commit c2faf1c5e689ac5e81068a305a624e626e9a87b5
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Dec 22 20:06:22 2010 +0000

    Forgot the copyright info

 nova/api/openstack/auth.py                  |   18 +++++++++++++++++-
 nova/api/openstack/ratelimiting/__init__.py |   17 +++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 7c03b9aa49b390e13cfbe8315a62c660778ef854
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:00:31 2010 -0600

    i18n support for xs-snaps

 nova/compute/manager.py      |   11 ++++------
 nova/flags.py                |    2 +-
 nova/virt/libvirt_conn.py    |    4 ++--
 nova/virt/xenapi/vm_utils.py |   50 ++++++++++++++++++++++++------------------
 nova/virt/xenapi/vmops.py    |   26 ++++++++++++----------
 nova/virt/xenapi_conn.py     |    2 --
 6 files changed, 51 insertions(+), 44 deletions(-)

commit 168cde072542f9f4df7e7eb26f6b632306c0b7d2
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Dec 22 19:52:13 2010 +0000

    Finished moving the middleware layers and fixed the API tests again

 nova/api/openstack/auth.py            |    2 +-
 nova/tests/api/openstack/__init__.py  |   13 ++++++-------
 nova/tests/api/openstack/fakes.py     |   15 +++++++++------
 nova/tests/api/openstack/test_auth.py |    4 ++--
 4 files changed, 18 insertions(+), 16 deletions(-)

commit dcc58be823aec7725d0b85c443c463124fcdae38
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Dec 22 22:38:50 2010 +0300

    Zone scheduler added

 nova/db/sqlalchemy/models.py |    1 +
 nova/scheduler/zone.py       |   58 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

commit e419c27a00a85b7daba42f580e332d31713ae271
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 13:33:26 2010 -0600

    Moved some things for testing

 nova/api/openstack/auth.py                  |    1 +
 nova/api/openstack/ratelimiting/__init__.py |    1 +
 nova/tests/api/openstack/__init__.py        |    2 ++
 3 files changed, 4 insertions(+)

commit ea4ee5736063b95d19dff24b3692e4239639dda2
Merge: af4d6e8 9547b76
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 13:20:32 2010 -0600

    Merging trunk

commit c4fb755b169895f9ffab6ab4d18f5227688b7ae4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 13:18:26 2010 -0600

    Abstracted auth and ratelimiting more

 nova/api/openstack/__init__.py              |   56 ++++-----------------------
 nova/api/openstack/auth.py                  |   22 ++++++++---
 nova/api/openstack/ratelimiting/__init__.py |   22 +++++++++--
 3 files changed, 43 insertions(+), 57 deletions(-)

commit af4d6e84c67b8f59f63ef0275778fa897dac9e95
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 13:01:33 2010 -0600

    Getting Snapshots to work with cloudservers command-line tool

 nova/api/openstack/__init__.py           |    3 +--
 nova/api/openstack/images.py             |    8 +++++---
 nova/compute/api.py                      |    9 +++++++++
 nova/compute/manager.py                  |   11 +++--------
 nova/flags.py                            |    2 +-
 nova/image/glance.py                     |    5 ++++-
 nova/virt/xenapi/vm_utils.py             |    8 +++-----
 plugins/xenapi/etc/xapi.d/plugins/glance |   20 ++++++++------------
 8 files changed, 34 insertions(+), 32 deletions(-)

commit b98c22f6b6a8c09f6a30485ca46ecd6860e6a005
Merge: 1f9f997 9547b76
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:53:36 2010 -0500

    merge trunk

commit aa1c251eecdf16a7e819602207bf5c65a55e914d
Merge: 2186729 9547b76
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 12:44:59 2010 -0600

    Merge from trunk and resolved conflicts

commit 21867297b673ec9fe055fb6c7e4a3dadcfa6fdd2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 12:39:59 2010 -0600

    Minor bug fix

 nova/api/__init__.py         |    1 +
 nova/api/openstack/images.py |    1 +
 2 files changed, 2 insertions(+)

commit 9547b76a69ad8f6a7c646dd2b5ac37b965f7013c
Merge: cc1b077 f783e8a
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Dec 22 18:28:57 2010 +0000

    Populate user_data field from run-instances call parameter, default to empty string to avoid metadata base64 decoding failure, LP: #691598

commit 1f9f997ae342ea16d0640c3e406402950b1d2a9b
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:27:51 2010 -0500

    Adding myself and Antony Messerli to the Authors file

 Authors |    2 ++
 1 file changed, 2 insertions(+)

commit cc1b077d4f7afc7e12a8cd953d95d44c67bd1159
Merge: 63649bd dfea8ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 18:24:00 2010 +0000

    Fixes per-project vpns (cloudpipe) and adds manage commands and support for certificate revocation.

commit a689d42d81996ffb7fa5934158850dfe89cc8e6e
Merge: 3d810cf 63649bd
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:19:21 2010 -0500

    merge trunk

commit 3d810cf7c6eb102dd38bcddf707d4b6b828bba1d
Merge: ba7afd0 a653173
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:18:03 2010 -0500

    merge antonymesserli's changes, fixed some formatting, and added copyright notice

commit dfea8ce877866678a1ee1b66228c3c252bac3086
Merge: 902db57 ff1575e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 17:31:26 2010 +0000

    merged i8n and fixed conflicts

commit a653173c75fdd3810ce75c3d5de5ea491d5d6922
Author: Antony Messerli <ant@openstack.org>
Date:   Wed Dec 22 11:28:08 2010 -0600

    Added networking protections readme

 plugins/xenserver/networking/README |  126 +++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

commit 130d75a8b240068a6251188da68296496c2c1564
Author: Antony Messerli <ant@openstack.org>
Date:   Wed Dec 22 11:27:23 2010 -0600

    Moved xenapi into xenserver specific directory

 plugins/xenapi/README                              |    6 -
 plugins/xenapi/etc/xapi.d/plugins/objectstore      |  231 --------------------
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |  216 ------------------
 plugins/xenserver/xenapi/README                    |    6 +
 .../xenapi/etc/xapi.d/plugins/objectstore          |  231 ++++++++++++++++++++
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |  216 ++++++++++++++++++
 6 files changed, 453 insertions(+), 453 deletions(-)

commit 0848f10f83dfb075f11a6b68f900f578eb246603
Merge: 269ab03 ff1575e
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 11:24:28 2010 -0600

    after trunk merge

commit 63649bd07c8d34792db50f567e54657481d55b68
Merge: ff1575e 56856ac
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 17:23:55 2010 +0000

    Fixes documentation builds for gettext...

commit 269ab03f74ea94a586f6af5b7d61847443522ba1
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 11:20:30 2010 -0600

    committing so that I can merge trunk changes

 nova/compute/manager.py   |   10 +---------
 nova/virt/xenapi/vmops.py |   22 ++++++++++++----------
 2 files changed, 13 insertions(+), 19 deletions(-)

commit ff1575e782fb08fb3923a09cb1a18d703b33be4a
Merge: d9b37f9 876e01a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:09:00 2010 +0000

    Log all XenAPI actions to InstanceActions.

commit 876e01a7efb669e76b011e04178b662677de3fc2
Merge: d85c78d d9b37f9
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 10:43:40 2010 -0600

    Merged trunk

commit ba7afd00a4ea826fc12113d98de391aace1fd2d2
Merge: 4ef1a23 d9b37f9
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 11:28:25 2010 -0500

    merging trunk

commit 4ef1a234aaee98e55a5d8e3d8fac1f8f282c803d
Merge: 1b47ef9 41b5e4a
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 11:28:20 2010 -0500

    merging trunk

commit 56856ac1103ec9f3ba0f2da81832a59e7e773256
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 11:12:20 2010 -0500

    Fix doc building endpoint for gettext.

 doc/ext/nova_autodoc.py |    3 +++
 1 file changed, 3 insertions(+)

commit d9b37f9a3b6cc7dbf6026ceb94b9e4c585e59e01
Merge: 41b5e4a 46c4d44
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 15:52:55 2010 +0000

    All merged with trunk and let's see if a new merge prop (with no pre-req) works..

commit 46c4d44affb289209dd6024cbb289b265d9c89c7
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 10:40:24 2010 -0500

    Problem was with a missplaced parentheses. ugh.

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f783e8ad65c2ba3f605bdc350ac64f4beaf27e9d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Dec 22 13:52:44 2010 +0100

    Adding me in the Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 7af11742b6bab492eb87c212d05bf77c0c13aea9
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Dec 22 12:24:53 2010 +0100

    Populate user_data field from run-instances call parameter, default to empty string to avoid metadata base64 decoding failure, LP: #691598

 nova/api/ec2/cloud.py |    1 +
 nova/compute/api.py   |    2 ++
 2 files changed, 3 insertions(+)

commit f98bb2b2dee4a0ff67a6548646a852686092c53f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 02:19:38 2010 -0800

    connecting ajax proxy to rabbit to allow token based security

 bin/nova-ajax-proxy                        |   71 +++++++++++++++++++++++++---
 nova/api/ec2/cloud.py                      |    4 ++
 nova/flags.py                              |    3 +-
 tools/euca_additions/euca-get-ajax-console |    9 ++++
 4 files changed, 79 insertions(+), 8 deletions(-)

commit d118660d1ba860842f539f5e42a1182dc70c3dbe
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 23:16:29 2010 -0800

    remove a debugging line

 tools/euca_additions/euca-get-ajax-console |    1 -
 1 file changed, 1 deletion(-)

commit 28645bec4a6d084f6dc6fa51184061844826cb12
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 23:15:00 2010 -0800

    a few more fixes after merge with trunk

 nova/virt/libvirt_conn.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit 17f25cf4faf95297177bb71b2825202a1f997180
Merge: a84e2b9 41b5e4a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 22:01:51 2010 -0800

    merging in trunk

commit dfa3fa9330eaacd535f8f09023fe3d691094344a
Merge: 8c8b289 41b5e4a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 22 00:09:18 2010 -0500

    Merge trunk.

commit a84e2b9131e4c8b212c9de0b9ad4931f7743ff75
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 18:20:55 2010 -0800

    move prototype code from api into compute worker

 nova/api/ec2/cloud.py     |   49 ++++++---------------------------------------
 nova/compute/manager.py   |    2 +-
 nova/virt/libvirt_conn.py |   49 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 45 deletions(-)

commit 729468d0be1bf97c869b1169414154a76d9b96b2
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 21 19:20:28 2010 -0500

    Burnin support by specifying a specific host via availability_zone for running
    instances and volumes on.

 bin/nova-manage                  |   50 ++++++++++++++++-
 nova/api/ec2/cloud.py            |   38 +++++++++++++
 nova/compute/api.py              |    4 +-
 nova/db/sqlalchemy/models.py     |    4 +-
 nova/scheduler/driver.py         |    5 ++
 nova/scheduler/simple.py         |   26 +++++++++
 nova/tests/scheduler_unittest.py |  110 ++++++++++++++++++++++++++++++++++++--
 7 files changed, 231 insertions(+), 6 deletions(-)

commit d85c78d62fe3f84276b1ed37dc56907c88fc1df7
Merge: 3b05f5b 41b5e4a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 17:06:24 2010 -0600

    Merged trunk

commit 41b5e4a12d23308f2143dfb5a059c43a931370e2
Merge: 9d40ff4 27d89c2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 22:58:55 2010 +0000

    This stops the nova-network dhcp ip from being added to all of the compute hosts.

commit 08963a0df7a6d1c90ba12ce60cbf15c93b0b70e6
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 14:44:53 2010 -0800

    prototype works with kvm.  now moving call from api to compute

 nova/api/ec2/cloud.py                      |   37 ++++++++++++++++++++++------
 nova/compute/instance_types.py             |    2 +-
 nova/compute/manager.py                    |    9 +++++++
 nova/virt/libvirt.qemu.xml.template        |   22 ++++++++++-------
 tools/euca_additions/euca-get-ajax-console |    8 ++++--
 5 files changed, 59 insertions(+), 19 deletions(-)

commit 3b05f5b5b46dd58a891f2e4c7a15231ea44a3e46
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 15:56:12 2010 -0600

    Style correction

 nova/tests/virt_unittest.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit f0195ebfd2cc56cee5797fff19fb9702c51df51b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 21:47:13 2010 +0000

    fix reboot command to work even if a host is rebooted

 nova/compute/manager.py   |    4 +++-
 nova/virt/libvirt_conn.py |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 555bea30cddfd32c42b6d7453b5afd2e7fcfb7f2
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 15:46:44 2010 -0600

    Filter templates and dom0 from list_instances()

 nova/virt/xenapi/vmops.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit db938f975da64540ebb942e9dfd640db4dd7f939
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 21:34:51 2010 +0000

    removed unused import and fix docstring

 nova/api/ec2/cloud.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 1f7103964045a5433fa8b3580ed492d9d34acd0c
Merge: 132b12e 40dba7d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 21:07:53 2010 +0000

    merge fakerabbit fix and turn fake back on for cloud unit tests

commit 40dba7dc0b8faef6dace3e9d54f43b19398c73fc
Author: Eric Day <eday@oddments.org>
Date:   Tue Dec 21 13:00:30 2010 -0800

    Reworked fakerabbit backend so each connection has it's own. Moved queues and exchanges to be globals.

 nova/fakerabbit.py |  135 +++++++++++++++++++++++-----------------------------
 1 file changed, 60 insertions(+), 75 deletions(-)

commit 7da5fdf45add8e5c049321c5553f98229446e6b9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 14:28:20 2010 -0600

    PEP8 cleanup

 nova/db/sqlalchemy/api.py   |    2 +-
 nova/tests/virt_unittest.py |   46 ++++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

commit 005a4e645f8e913c673c6ba07e7b0c8c54f33e1c
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Dec 21 14:17:29 2010 -0600

    Refactored duplicate rpc.cast() calls in nova/compute/api.py. Cleaned up some formatting issues.

 nova/compute/api.py            |   47 ++++++++++++--------------------
 nova/compute/manager.py        |   32 ++++++++++++++++++++++
 nova/tests/compute_unittest.py |    7 +++++
 nova/virt/fake.py              |   12 ++++++++
 nova/virt/xenapi/vmops.py      |   15 ++++++++--
 nova/virt/xenapi_conn.py       |   59 +++++++++++++++++++++-------------------
 6 files changed, 111 insertions(+), 61 deletions(-)

commit b3fce81e384aec46c0963db1f144cc58d02340a4
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 14:13:18 2010 -0600

    Log all XenAPI actions

 nova/db/api.py               |    5 +++++
 nova/db/sqlalchemy/api.py    |   12 ++++++++++++
 nova/db/sqlalchemy/models.py |    1 -
 nova/virt/xenapi/vmops.py    |   16 ++++++++--------
 nova/virt/xenapi_conn.py     |   33 +++++++++++++++++++++++----------
 5 files changed, 48 insertions(+), 19 deletions(-)

commit f9e2bbdf1182f54d69f6005eb7c39007eddbd3cd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 21 20:06:53 2010 +0000

    correct xenapi resume call

 nova/virt/xenapi/vmops.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 132b12e27fa69319f85dee0089fad1ba1a342fd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 19:24:12 2010 +0000

    activate fake rabbit for debugging

 nova/tests/rpc_unittest.py |    1 -
 1 file changed, 1 deletion(-)

commit aa0639b00c3cd4b7bd5dd7dc9027e86d0f43150a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:57:11 2010 +0000

    change virtualization to not get network through project

 nova/virt/libvirt_conn.py |    4 ++--
 nova/virt/xenapi/vmops.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 902db577ea19459c9b01ed7b262024b900440573
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:48:07 2010 +0000

    update db/api.py as well

 nova/db/api.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit a17fa6df76a3215d84d99738a1a7752a54cfe914
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:43:41 2010 +0000

    don't allocate networks when getting vpn info

 nova/auth/manager.py      |    6 +++---
 nova/db/sqlalchemy/api.py |   24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

commit 9d40ff49f6b4a840e2528edf187725ef2a60b246
Merge: 086f2d8 48a84b9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 17:59:50 2010 +0000

    Added InstanceDiagnostics and InstanceActions DB models.

commit d2eb04cea6b7f0a669758fc1fba32e77a008a7eb
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 11:42:25 2010 -0600

    PEP8 cleanup

 nova/virt/xenapi/vmops.py |   16 ++++++++--------
 nova/virt/xenapi_conn.py  |   30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 23 deletions(-)

commit 48a84b9e3bfd7de64b08662796e2575b3d389809
Merge: f53532b 086f2d8
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 11:12:47 2010 -0600

    Merged trunk

commit 887ee0aae54fc51124bb869af2bfee055a46d27a
Merge: 1b4b36c 086f2d8
Author: jaypipes@gmail.com <>
Date:   Tue Dec 21 10:25:39 2010 -0500

    Merge trunk and resolve conflicts

commit 4cf47fcb9aedab76b24e4afbcfa809e613bef980
Merge: b69946a 086f2d8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 21 12:08:20 2010 +0000

    merge trunk

commit 301dd942b533f8efbe55a74def7ae79de3a11f48
Merge: c7dada9 086f2d8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 21 11:43:06 2010 +0000

    1) Merged from trunk
    2) 'type' parameter in VMHelper.fetch_image converted in enum
    3) Fixed pep8 errors
    4) Passed unit tests

commit 8c8b289f2626b1d9bad76bc5d4819904ace5800d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 21 02:21:01 2010 -0500

    Remove ec2 config chain and move openstack versions to top-level application.

 etc/nova-api.conf              |   15 ++++++++++-----
 nova/api/openstack/__init__.py |   18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

commit c364724a0dc7a658058fcb167af66ee7eb5bcd2a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 21 01:41:28 2010 -0500

    Use paste.deploy for running the api server.

 bin/nova-api-paste                     |  103 ++++++++++++++++++++++++++++++++
 etc/nova-api.conf                      |   62 +++++++++++++++++++
 nova/api/__init__.py                   |    1 -
 nova/api/cloudpipe/__init__.py         |    3 +
 nova/api/ec2/__init__.py               |   50 +++++++++++++++-
 nova/api/ec2/metadatarequesthandler.py |    3 +
 nova/api/openstack/__init__.py         |   13 ++++
 tools/pip-requires                     |    4 +-
 8 files changed, 235 insertions(+), 4 deletions(-)

commit fb24146290e6cf49397441d36878652da376f66d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:43:47 2010 +0000

    pep8 and removed extra imports

 nova/compute/api.py          |    1 -
 nova/tests/cloud_unittest.py |    6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

commit a2019a14f7e7902c0bfef9fe3e9b576d9f45defe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:39:28 2010 +0000

    add missing greenthread import

 nova/virt/libvirt_conn.py |    1 +
 1 file changed, 1 insertion(+)

commit 3a0878b7a94ba3411feb9a7944f42c9f352d3a45
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:34:30 2010 +0000

    add a few extra joined objects to get instance

 nova/compute/manager.py   |    1 -
 nova/db/sqlalchemy/api.py |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 83cf1f7140c20ea2188272b57e4e2c1a95f8ff9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:26:50 2010 +0000

    remove extra print statements

 nova/api/ec2/cloud.py |    2 --
 1 file changed, 2 deletions(-)

commit 7d73a3582d5045dab273c7e8cfd396b900edc3b4
Merge: de38302 0d70511
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:21:07 2010 +0000

    Tests pass after cleaning up allocation process

commit 7f83b9d963fee2d65b267542c7cd8c48df23a1ef
Merge: f3f5b58 086f2d8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 20 18:00:26 2010 -0600

    Merge from trunk

commit 11d0a21e44dae5340febfc8e8f7f9323ad9fb8b9
Merge: 40c8a8a 086f2d8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 20 17:36:36 2010 -0600

    Merging trunk

commit 40c8a8a1a1e834c4e5bb61c853397a90475d83ff
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 20 17:36:10 2010 -0600

    Typo fix, stubbing out to use admin project for now

 nova/api/openstack/__init__.py |    4 +++-
 nova/api/openstack/images.py   |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 1b47ef95fff4d8419e27a7cc247178806cc065ff
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 20 18:15:40 2010 -0500

    Close devnull filehandle

 .../networking/etc/xensource/scripts/vif_rules.py  |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit aded4faba96e4de88f0294604927ef824cb249be
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 20 22:55:11 2010 +0000

    added suspend and resume

 nova/api/openstack/__init__.py           |    2 ++
 nova/api/openstack/servers.py            |   22 ++++++++++++++++++++
 nova/compute/api.py                      |   18 +++++++++++++++++
 nova/compute/manager.py                  |   32 ++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |   32 ++++++++++++++++++++++++++++--
 nova/tests/compute_unittest.py           |    8 ++++++++
 nova/virt/fake.py                        |    8 ++++++++
 nova/virt/libvirt_conn.py                |    8 ++++++++
 nova/virt/xenapi/vmops.py                |   23 +++++++++++++++++++--
 nova/virt/xenapi_conn.py                 |    8 ++++++++
 10 files changed, 157 insertions(+), 4 deletions(-)

commit 63d9378bccf5500e96037956f07618e86c5d38eb
Merge: ab0cba6 086f2d8
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 20 17:51:56 2010 -0500

    Merge commit

commit ab0cba603d96e25ee151222bb5fcf550459cfc7a
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 20 17:24:08 2010 -0500

    Rewrite of vif_rules.py to meet coding standards and be more pythonic in
    general.  Use absolute paths for iptables/ebtables/arptables in host-rules.

 plugins/xenserver/networking/etc/init.d/host-rules |   54 +++---
 .../etc/xensource/scripts/vif_5.6-fp1.patch        |    4 +-
 .../networking/etc/xensource/scripts/vif_rules.py  |  180 ++++++++++++--------
 3 files changed, 146 insertions(+), 92 deletions(-)

commit 086f2d87be3c56ac8dafaf4551096868d57454db
Merge: 85b07de 9b5d860
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Dec 20 22:04:12 2010 +0000

    Add raw disk image support.

commit 9b5d8600ab3cadd5f3174056eaedd0db420f1f1b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 20 22:53:07 2010 +0100

    Add my @linux2go.dk address to .mailmap

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit b5756f6abf582b04a5fe6744d6a139b12440e35a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 20 21:12:20 2010 +0000

    fixed some pep8 business

 nova/api/openstack/images.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit de383023e4d5c30d3ad4474af104f6b659e1bd32
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Dec 20 21:04:54 2010 +0000

    directly copy ip allocation into compute

 nova/compute/api.py     |   44 -------------------------------------
 nova/compute/manager.py |   55 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 46 deletions(-)

commit a7983cad94f88ca10a0dc3620c8eeb8a06122174
Merge: 8907dd2 800ecbd
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Dec 20 14:54:27 2010 -0600

    Minor spellchecking fixes

commit 85b07de25094b35928f2b67d1be11748e2af6713
Merge: 800ecbd 8ddae12
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Dec 20 20:26:59 2010 +0000

    Adds support for Pause and Unpause of xenserver instances.
    
    Pause freezes the vm, keeping resources in-memory.
    
    I used this version of python cloudservers to test with:
    https://github.com/SandyWalsh/python-cloudservers
    
    url's are
    http://a.b.c.d/v1.0/servers/#######/pause
    and
    http://a.b.c.d/v1.0/servers/#######/unpause
    
    Note: no support for libvirt.

commit f53532bf17d0fac1cc4a1f51f6c12e2ae12d0d74
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 14:21:01 2010 -0600

    Make column names more generic

 nova/db/sqlalchemy/models.py |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit 27d89c2d425aefcd32549b08e3cff8b132d3e75b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Dec 20 20:04:24 2010 +0000

    don't add the ip to bridge on compute hosts

 nova/network/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit e91590145962827e68bbb3518990d7d94e99608d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 20 20:37:56 2010 +0100

    PEP8 fixups

 nova/compute/disk.py |    2 ++
 1 file changed, 2 insertions(+)

commit 2eafa204703785f314226eeebb31a840d3dd502f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 11:31:21 2010 -0600

    Added InstanceActions DB model

 nova/db/sqlalchemy/models.py |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 2462eab6f02105b15f4686a6183eb043d7b1a5e3
Author: Antony Messerli <ant@openstack.org>
Date:   Mon Dec 20 10:56:10 2010 -0600

    initial commit of xenserver host protections

 plugins/xenserver/networking/etc/init.d/host-rules |   83 ++++++++++++++++++++
 .../etc/xensource/scripts/vif_5.6-fp1.patch        |   22 ++++++
 .../networking/etc/xensource/scripts/vif_rules.py  |   72 +++++++++++++++++
 3 files changed, 177 insertions(+)

commit 44fb3e77b89dd816ec8f753c9790b1fcb00e7b0c
Merge: 7954862 800ecbd
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 10:41:54 2010 -0600

    Merged trunk

commit c7dada9b2f5811afbc7a181636d6be3ab8ab98cc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 20 15:41:43 2010 +0000

    Fixed pep8 errors

 nova/compute/disk.py        |    2 ++
 nova/tests/virt_unittest.py |   43 ++++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

commit 31023d1172ba6168e30d0907e9240737c592c58c
Merge: 3356aeb 69fb0f2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 20 15:20:13 2010 +0000

    Integrated changes from Soren (raw-disk-images).
    Updated authors file.
    All tests passed.

commit 1b4b36cec4d82009d595a601c408e2f582ef790c
Merge: afae367 800ecbd
Author: jaypipes@gmail.com <>
Date:   Mon Dec 20 10:15:07 2010 -0500

    Merge trunk and address ttx's review comments

commit 8ddae1280da59a0e86e1daf1c8de97248ef6cb13
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Dec 19 22:14:36 2010 -0400

    pep8 (again again)

 nova/tests/api/openstack/test_servers.py |    1 +
 1 file changed, 1 insertion(+)

commit d00a0cec7e8bb02b44c7d9fd94cb9763c37c505e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Dec 19 22:05:46 2010 -0400

    pep8 (again)

 nova/tests/api/openstack/test_servers.py |    2 ++
 1 file changed, 2 insertions(+)

commit d71b9a34c3f76f95227da0f7a746cc5a1a76da24
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Sun Dec 19 23:51:17 2010 +0000

    small clean up

 nova/api/openstack/images.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit df045f9252f6a50171d477c265564f062294e47a
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Mon Dec 20 08:06:11 2010 +0900

    テストコードをレポジトリに追加
    nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更
     - 正常終了の戻り値をTrueに変更
     - fixed_ipが見つからないときにはRemoteErrorをraiseする
     - それに合わせてnova.compute.manager.live_migrationも変更

 nova/compute/manager.py                            |   13 +-
 nova/livemigration_test/SI/picture.pptx            |  Bin 0 -> 137730 bytes
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 0 -> 35840 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 0 -> 464384 bytes
 nova/livemigration_test/SI/utils/demo-firstboot.sh |   39 ++
 .../SI/utils/demo-runInstance.sh                   |   57 +++
 nova/livemigration_test/SI/utils/nova-manage.conf  |   18 +
 nova/livemigration_test/SI/utils/nova.conf         |   10 +
 nova/livemigration_test/SI/utils/nova.sh           |  180 +++++++++
 nova/livemigration_test/SI/utils/nova.sh.compute   |   37 ++
 nova/livemigration_test/UT/computeManager.test.py  |  407 ++++++++++++++++++++
 .../UT/libvirtConnection.test.py                   |  366 ++++++++++++++++++
 nova/livemigration_test/UT/nova-manage.test.py     |  318 +++++++++++++++
 .../livemigration_test/UT/schedulerManager.test.py |  360 +++++++++++++++++
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 0 -> 195072 bytes
 15 files changed, 1799 insertions(+), 6 deletions(-)

commit 70f1f0d8c7a7214c5b6683c0be863cdbf0f060af
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Mon Dec 20 08:03:25 2010 +0900

    テストコードをレポジトリに追加
    nova.compute.manager.pre_live_migration()について、異常終了しているのに正常終了の戻り値を返すことがあったため変更
     - 正常終了の戻り値をTrueに変更
     - fixed_ipが見つからないときにはRemoteErrorをraiseする
     - それに合わせてnova.compute.manager.live_migrationも変更

 nova/compute/manager.py                            |   13 +-
 nova/livemigration_test/SI/picture.pptx            |  Bin 0 -> 137730 bytes
 nova/livemigration_test/SI/testCase_SI.xls         |  Bin 0 -> 35840 bytes
 .../SI/testParameterSheet_SI.xls                   |  Bin 0 -> 464384 bytes
 nova/livemigration_test/SI/utils/demo-firstboot.sh |   39 ++
 .../SI/utils/demo-runInstance.sh                   |   57 +++
 nova/livemigration_test/SI/utils/nova-manage.conf  |   18 +
 nova/livemigration_test/SI/utils/nova.conf         |   10 +
 nova/livemigration_test/SI/utils/nova.sh           |  180 +++++++++
 nova/livemigration_test/SI/utils/nova.sh.compute   |   37 ++
 nova/livemigration_test/UT/computeManager.test.py  |  407 ++++++++++++++++++++
 .../UT/libvirtConnection.test.py                   |  366 ++++++++++++++++++
 nova/livemigration_test/UT/nova-manage.test.py     |  318 +++++++++++++++
 .../livemigration_test/UT/schedulerManager.test.py |  360 +++++++++++++++++
 nova/livemigration_test/UT/testCase_UT.xls         |  Bin 0 -> 195072 bytes
 15 files changed, 1799 insertions(+), 6 deletions(-)

commit ca1017988f98a246aa82c16f471791c7ea3eceec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Dec 19 20:05:41 2010 +0000

    Support proxying api by using X-Forwarded-For

 nova/api/ec2/__init__.py               |    8 +++++++-
 nova/api/ec2/metadatarequesthandler.py |   11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

commit 0f57592a7b1ddaed550fc13f54eb814711d46124
Merge: f15349b b69946a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 18 13:58:26 2010 +0000

    eventlet merge updates

commit 650a0cdbc854d37fd62348ce34a14ef91ccbabad
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Dec 17 19:17:39 2010 -0600

    Cleaned up TODOs, using flags now

 nova/compute/manager.py                  |    3 +-
 nova/flags.py                            |    3 ++
 nova/virt/xenapi/vm_utils.py             |   50 ++++++++++----------
 nova/virt/xenapi/vmops.py                |   15 +++---
 nova/virt/xenapi_conn.py                 |    9 ++--
 plugins/xenapi/etc/xapi.d/plugins/glance |   76 ++++++++++++++++++++----------
 6 files changed, 95 insertions(+), 61 deletions(-)

commit b69946adc893256a5a857cfeedb0f80968b453a0
Merge: ca81b0c 800ecbd
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 18 01:09:28 2010 +0000

    merge trunk and minor fix(for whatever reason validator_unittest did not get removed from run_test.py)

commit ca81b0c12a3853942e9ce85154c38dad381ead0e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 18 00:50:49 2010 +0000

    fixed unittests and further clean-up post-eventlet merge

 nova/tests/xenapi_unittest.py     |   48 +++++++++++++------------------------
 nova/virt/xenapi/__init__.py      |    2 +-
 nova/virt/xenapi/network_utils.py |    2 +-
 nova/virt/xenapi/vm_utils.py      |    3 +--
 nova/virt/xenapi/vmops.py         |    8 ++++---
 nova/virt/xenapi/volume_utils.py  |    2 +-
 nova/virt/xenapi/volumeops.py     |    1 -
 nova/virt/xenapi_conn.py          |    8 +++----
 8 files changed, 29 insertions(+), 45 deletions(-)

commit f3f5b58f395794b3933cc3489ff37ce08002de89
Merge: 5b8362d 800ecbd
Author: mdietz <matt.dietz@rackspace.com>
Date:   Sat Dec 18 00:18:36 2010 +0000

    All API tests finally pass

commit 69fb0f2e3fc6496db5e66cb8c7a6992c6fa1d4c6
Merge: 2be7a90 800ecbd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Dec 18 01:00:13 2010 +0100

    Merge trunk

commit 800ecbd713c55d7410d6eb860a439cb87468e7ad
Merge: 5cae69f 7f5ec9c
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 23:54:37 2010 +0000

    Removing unneeded Trial specific code

commit 5b8362d0f56bdbeba7ee8292222863a501bad6af
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 16:56:42 2010 -0600

    A few more tweaks to get the OS API tests passing

 nova/tests/api/openstack/fakes.py        |    5 +++--
 nova/tests/api/openstack/test_servers.py |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 8907dd281f66128cd93d5e4325f85337e7f14193
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Dec 17 16:53:27 2010 -0600

    Adding new install script plus changes to multinode install doc

 contrib/nova-CC-installer.sh                 |  470 ++++++++++++++++++++++++++
 doc/source/adminguide/multi.node.install.rst |  431 ++++++++++++-----------
 2 files changed, 699 insertions(+), 202 deletions(-)

commit 7f5ec9caa5cad314c6fec598d6c230dfbc8f0eae
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 16:29:55 2010 -0600

    Removing unneeded Trial specific code

 nova/tests/auth_unittest.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 5cae69f5e5a3f8cfb33de0564940b3f45498d7dc
Merge: 3756074 56a0dfd
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 22:14:14 2010 +0000

    Replaced the use of redis in fakeldap with a customized dict class. Auth unittests should now run fine without a redis server running, or without python-redis installed.

commit 3756074f350fa5dde339d92de4e9ef06deaffefa
Merge: cd460a1 e2a41d3
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 22:09:01 2010 +0000

    Adding Ed Leafe to Authors file

commit 75d6de8a67db02f886636edfedcf3f3fc8cff9cc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 16:03:21 2010 -0600

    Some tweaks

 nova/db/sqlalchemy/api.py         |    3 +++
 nova/tests/api/openstack/fakes.py |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit e2a41d30c55edeba92f0e59f84e8d9eb7e16ca62
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 15:25:44 2010 -0600

    Adding in Ed Leafe so we can land his remove-redis test branch

 Authors |    2 ++
 1 file changed, 2 insertions(+)

commit e55a8ffb862732726c6371ebb20ab3954a16a8e9
Merge: 332549a cd460a1
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Dec 17 20:55:54 2010 +0000

    Merge from trunk

commit ae54d5bdf3e0615c5be9ebe4f03f7256f22484ee
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Dec 17 14:21:03 2010 -0600

    Add wait_for_vhd_coalesce

 nova/virt/xenapi/vm_utils.py |   52 +++++++++++++++++++++++++++---------------
 nova/virt/xenapi/vmops.py    |    3 +++
 2 files changed, 37 insertions(+), 18 deletions(-)

commit 05774f26fd4f05e1aeeb9ac84be6f767f417da64
Merge: 6383f7f cd460a1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 12:10:10 2010 -0600

    Merge from trunk

commit 6383f7f9f63e348a12adeff66a266ef796d98ded
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 11:54:59 2010 -0600

    Some typo fixes

 nova/api/openstack/__init__.py              |    4 ++--
 nova/api/openstack/auth.py                  |    4 ++--
 nova/api/openstack/ratelimiting/__init__.py |    4 ++--
 nova/tests/api/openstack/__init__.py        |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

commit 56a0dfde6e7d598df15bdce2541cd60c7757f557
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:24:06 2010 -0600

    pep8 cleanup

 nova/auth/fakeldap.py |    3 ---
 1 file changed, 3 deletions(-)

commit 02d2e305bd71aec3f723a42da620d2939e041f0c
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:14:32 2010 -0600

    Fixed some old code that was merged incorrectly

 nova/auth/manager.py |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

commit d16a41f552c70708a909067ce8555b40c3785027
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:07:59 2010 -0600

    Replaced redis with a modified dict class

 nova/auth/fakeldap.py       |  102 ++++++++++++++++++++++++++++---------------
 nova/auth/manager.py        |   10 ++++-
 nova/tests/auth_unittest.py |    5 +--
 3 files changed, 77 insertions(+), 40 deletions(-)

commit 3356aebe4d830e8d488a8eba2847a58e621045f6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 16:41:35 2010 +0000

    bug fixes

 nova/compute/api.py          |    7 ++-----
 nova/virt/xenapi/vm_utils.py |   10 +++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

commit afae367d63c6d38faa5d9be54725df29c2a5b903
Merge: d283922 cd460a1
Author: jaypipes@gmail.com <>
Date:   Fri Dec 17 11:10:11 2010 -0500

    Merge eventlet and resolve all conflicts

commit 336bdb43ecc7d53d58d99f80877b10b57d4a6195
Merge: db96fd5 cd460a1
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 17 13:35:57 2010 +0000

    first revision after eventlet merge. Currently xenapi-unittests are broken, but everything else seems to be running okay.

commit fb4a3b3f086f064a47c6659d537eaff45c49002f
Merge: 6c9ec94 cd460a1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 12:25:30 2010 +0000

    Integrated eventlet_merge patch.

commit 2be7a90e546447ea66580f50c289e6ff87ee9487
Merge: e84f46e cd460a1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Dec 17 13:07:43 2010 +0100

    Merge trunk (naïvely).

commit 6c9ec94d0c9303316ad8f3347532eabf31ca8316
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 11:49:00 2010 +0000

    Code reviewed

 nova/compute/api.py                           |    7 +++----
 nova/virt/xenapi/vm_utils.py                  |    4 ++--
 nova/virt/xenapi/vmops.py                     |    8 ++++----
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

commit e601ab4a1068029b2f0b79789ed506fda1332404
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 16 20:59:27 2010 -0600

    XenAPI Snapshots first cut

 nova/compute/manager.py                  |   30 ++++++++-
 nova/virt/libvirt_conn.py                |    7 ++
 nova/virt/xenapi/vm_utils.py             |   91 +++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py                |   43 ++++++++++--
 nova/virt/xenapi_conn.py                 |    7 ++
 plugins/xenapi/etc/xapi.d/plugins/glance |  108 ++++++++++++++++++++++++++++++
 6 files changed, 278 insertions(+), 8 deletions(-)

commit b1d4579404f9e49fcdea23c21733fdf65edc1da3
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 16 17:29:26 2010 -0800

    Fixed network test (thanks Vish!) and fixed run_tests.sh.

 bin/nova-dhcpbridge            |    1 -
 nova/tests/network_unittest.py |  347 ----------------------------------------
 nova/tests/test_network.py     |  347 ++++++++++++++++++++++++++++++++++++++++
 run_tests.sh                   |   12 +-
 4 files changed, 355 insertions(+), 352 deletions(-)

commit 8c343e1b4b92aa7b1062acebe8eaea402bc6ab4a
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 16 17:05:54 2010 -0800

    First pass at converting run_tests.py to nosetests. The network and objctstore tests don't yet work. Also, we need to manually remove the sqlite file between runs.

 nova/test.py                     |    3 +
 nova/tests/access_unittest.py    |  127 --------------
 nova/tests/api/__init__.py       |   81 ---------
 nova/tests/api/test.py           |   81 +++++++++
 nova/tests/api_integration.py    |   54 ------
 nova/tests/api_unittest.py       |  338 ------------------------------------
 nova/tests/auth_unittest.py      |  352 --------------------------------------
 nova/tests/cloud_unittest.py     |  332 -----------------------------------
 nova/tests/compute_unittest.py   |  155 -----------------
 nova/tests/flags_unittest.py     |  102 -----------
 nova/tests/misc_unittest.py      |   55 ------
 nova/tests/quota_unittest.py     |  153 -----------------
 nova/tests/rpc_unittest.py       |  103 -----------
 nova/tests/scheduler_unittest.py |  246 --------------------------
 nova/tests/service_unittest.py   |  227 ------------------------
 nova/tests/test_access.py        |  127 ++++++++++++++
 nova/tests/test_api.py           |  338 ++++++++++++++++++++++++++++++++++++
 nova/tests/test_auth.py          |  352 ++++++++++++++++++++++++++++++++++++++
 nova/tests/test_cloud.py         |  332 +++++++++++++++++++++++++++++++++++
 nova/tests/test_compute.py       |  155 +++++++++++++++++
 nova/tests/test_flags.py         |  102 +++++++++++
 nova/tests/test_misc.py          |   55 ++++++
 nova/tests/test_quota.py         |  153 +++++++++++++++++
 nova/tests/test_rpc.py           |  103 +++++++++++
 nova/tests/test_scheduler.py     |  246 ++++++++++++++++++++++++++
 nova/tests/test_service.py       |  227 ++++++++++++++++++++++++
 nova/tests/test_twistd.py        |   53 ++++++
 nova/tests/test_virt.py          |  258 ++++++++++++++++++++++++++++
 nova/tests/test_volume.py        |  175 +++++++++++++++++++
 nova/tests/twistd_unittest.py    |   53 ------
 nova/tests/virt_unittest.py      |  258 ----------------------------
 nova/tests/volume_unittest.py    |  175 -------------------
 run_tests.py                     |  125 --------------
 33 files changed, 2760 insertions(+), 2936 deletions(-)

commit 2a070f397dd12db715902b0b66d7a2edaa17a941
Merge: c3ffac6 baf0b1d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:52:54 2010 +0000

    remerged for pep8

commit baf0b1db2d4997f0e47277763e8ab393c131b8c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:52:17 2010 +0000

    pep8

 nova/flags.py |    1 +
 1 file changed, 1 insertion(+)

commit c3ffac68e41c5a53f8e4267db1b2474b9e10812e
Merge: 9e28957 86f7149
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:45:35 2010 +0000

    merged in project-vpns to get flag changes

commit 9e28957c45c69bf11a414faeb16a068f10a6a73d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:44:08 2010 +0000

    clean up use of iptables chains

 nova/network/linux_net.py |  104 +++++++++++++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 26 deletions(-)

commit 86f71493fa5a02762bc7c56308c85b9182913efb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:43:18 2010 +0000

    move some flags around

 nova/api/__init__.py      |    2 +-
 nova/api/ec2/cloud.py     |   16 ++++++++++------
 nova/flags.py             |   12 +++++++-----
 nova/network/linux_net.py |    5 ++---
 nova/utils.py             |    5 -----
 5 files changed, 20 insertions(+), 20 deletions(-)

commit 0d705117a0d0c04d845c5d146455cd11ba9af88c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 23:47:14 2010 +0000

    add conditional bind to linux net

 nova/network/linux_net.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit a6f90bacda223add276698958b2e7479bb6841e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 23:25:21 2010 +0000

    make sure all network data is recreated when nova-network is rebooted

 nova/network/manager.py |   34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

commit be6793d2ff94b341011074eee92cb1e910c88888
Merge: e1da5d6 cd460a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 22:57:36 2010 +0000

    merged trunk

commit 26ebccc8d92aba23efa1663fe9949c141a4cc671
Merge: dc29400 cd460a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 22:52:08 2010 +0000

    merged trunk, fixed conflicts and tests

commit 7954862c8133bacd5e612864a26e7d0ae9b0d663
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:54:38 2010 -0600

    Added Instance Diagnostics DB model

 nova/db/sqlalchemy/models.py |   23 ++++++++++++++++++++---
 nova/virt/xenapi/vm_utils.py |    6 +-----
 2 files changed, 21 insertions(+), 8 deletions(-)

commit cd460a1f661eea7e050891f50a8218fdf24f2c6f
Merge: d67b9f7 e5a3d99
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 21:38:52 2010 +0000

    Put flags back in nova.virt.xenapi/vm_utils.

commit e5a3d993cb13c8dc5e984a67521f77ce8fdf8e4c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:19:35 2010 -0600

    Removed unnecessary blank lines

 nova/virt/xenapi/vm_utils.py |    2 --
 1 file changed, 2 deletions(-)

commit 611935aa3e3a66e9638b0c127041a6fca4788b9c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:03:37 2010 -0600

    Put flags back in vm_utils

 nova/virt/xenapi/vm_utils.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit d67b9f7b8b1fb7d73ad08a04c6ee2d98fc9037d8
Merge: edff809 e306d23
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 16 20:59:22 2010 +0000

    This branch removes most of the dependencies on twisted and moves towards the plan described by https://blueprints.launchpad.net/nova/+spec/unified-service-architecture
    
    Tests are currently passing besides objectstore which is being skipped because it is heavily reliant on our twisted pieces, and I can run everything using the nova.sh
    
    Additionally this adds nova-combined that covers everythign except for nova-objectstore, to test it what I've usually done is run nova.sh as usual
    
    $ sudo ./eventlet_merge/contrib/nova.sh run ignored eventlet_merge
    
    and then quit all the services except for nova-objectstore and then in one of the screens do
    
    $ ./eventlet_merge/bin/nova-combined
    
    And then run whatever manual testing you normally run.
    
    Once objectstore has been deprecated and removed nova-combined can be expected to run the whole nova stack in a single process for testing and dev.

commit e306d236e3cf91c00a36940e277ad2d105b055a1
Author: termie <code@term.ie>
Date:   Thu Dec 16 12:45:06 2010 -0800

    pep8 fixes for bin

 bin/nova-combined |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d283922defdda6ede5fa2e09656cd8d411a90096
Author: jaypipes@gmail.com <>
Date:   Thu Dec 16 14:47:42 2010 -0500

    PEP8 cleanups

 nova/api/ec2/cloud.py       |    3 ++-
 nova/objectstore/handler.py |    8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit dc29400d104d34c6383132a43e018f7724e85ec3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 19:13:37 2010 +0000

    use getent, update docstring

 CA/genvpn.sh         |   36 ++++++++++++++++++++++++++++++++++++
 nova/auth/manager.py |    3 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)

commit 9b049acc27d477a1ab9e13c9e064e59d8bd0a3ae
Author: termie <code@term.ie>
Date:   Thu Dec 16 10:52:30 2010 -0800

    pep8 fixes

 nova/compute/manager.py        |    2 +-
 nova/service.py                |   10 +++++-----
 nova/test.py                   |    1 +
 nova/tests/rpc_unittest.py     |    2 +-
 nova/tests/service_unittest.py |    2 +-
 nova/utils.py                  |    7 ++++---
 nova/virt/libvirt_conn.py      |   12 ++++++------
 nova/virt/xenapi_conn.py       |    2 +-
 8 files changed, 20 insertions(+), 18 deletions(-)

commit db96fd559d28bcfdf8cc29d79b9afca6dea1cfb7
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 16 18:44:42 2010 +0000

    reviewed the FIXMEs, and spotted an uncaught exception in volume_utils...yay!

 nova/tests/virt_unittest.py      |    2 --
 nova/tests/xenapi/stubs.py       |   24 +++++++++---------------
 nova/tests/xenapi_unittest.py    |    5 ++---
 nova/virt/xenapi/fake.py         |    1 +
 nova/virt/xenapi/volume_utils.py |   29 +++++++++++++++++------------
 5 files changed, 29 insertions(+), 32 deletions(-)

commit fc1354a639edb1c3a7f979f58bb90918c63695ab
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:17:53 2010 +0000

    fixed a couple of more syntax errors

 nova/api/openstack/images.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e01e6d7976adfd99addf31f4f914c7625a394fda
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 16 12:09:38 2010 -0600

    Moved implementation specific stuff from the middleware into their respective modules

 nova/api/openstack/__init__.py              |   83 +++------------------------
 nova/api/openstack/auth.py                  |   20 ++++---
 nova/api/openstack/common.py                |   17 ++++++
 nova/api/openstack/flavors.py               |    3 +-
 nova/api/openstack/images.py                |    6 +-
 nova/api/openstack/ratelimiting/__init__.py |   60 +++++++++++++++++++
 nova/api/openstack/servers.py               |    3 +-
 7 files changed, 106 insertions(+), 86 deletions(-)

commit 7b0c5b3f06328ec9dbb02b2def306d671353354e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:09:25 2010 +0000

    typo

 nova/api/openstack/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7f2cae4d63d1fb9c351d88ad911166f55e89c2f4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:01:21 2010 +0000

    fixed up openstack api images index and detail

 nova/api/openstack/images.py |   58 +++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 12 deletions(-)

commit 8152acf7c3df83a04591fdafb21201965da7bfad
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 16 17:47:48 2010 +0000

    fake session clean-up

 nova/tests/db/__init__.py     |   16 ----------------
 nova/tests/xenapi/__init__.py |   16 ----------------
 nova/virt/xenapi/fake.py      |   34 ++++++++++++++++++++++------------
 3 files changed, 22 insertions(+), 44 deletions(-)

commit a4db44b94e611798d57ad59f4d4dbb5fb00516db
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 16 16:33:38 2010 +0000

    Removed FakeInstance and introduced stubout for DB. Code clean-up

 nova/tests/db/__init__.py     |   33 +++++++++
 nova/tests/db/fakes.py        |   61 +++++++++++++++
 nova/tests/xenapi/__init__.py |   33 +++++++++
 nova/tests/xenapi/stubs.py    |   98 ++++++++++++++++++++++++
 nova/tests/xenapi_unittest.py |  165 +++++++++++------------------------------
 5 files changed, 267 insertions(+), 123 deletions(-)

commit 988d6c01b0f6870a21c7294534cdcc01fbf15dc0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 16 12:22:29 2010 +0000

    removed extra stuff used for debugging

 nova/virt/libvirt.qemu.xml.template |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

commit 4a451f96ba4a2ef9d061a491b97b61780c28a252
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 16 12:09:51 2010 +0000

    Restore code which was changed for testing reasons to the original state.
    Kudos to Armando for spotting this.

 nova/compute/instance_types.py |    2 +-
 nova/db/sqlalchemy/api.py      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 8060b526e1fecc66a6766de3f9e4b008e69af1e3
Author: David Pravec <David.Pravec@danix.org>
Date:   Thu Dec 16 12:35:46 2010 +0100

      Make nova work even when user has LANG or LC_ALL configured
    
      Some commands are having different results when used in another language environment.
      For example ifconfig output parsing fails in my language.
      Also unittest using cat failed, as it didnt expect czech language in the error message.
    
      This small patch makes it work.
      Also adding myself to 'Authors' file.

 Authors                                       |    1 +
 contrib/nova.sh                               |    2 +-
 contrib/puppet/files/production/nova-iptables |    2 ++
 nova/cloudpipe/bootscript.sh                  |    1 +
 nova/tests/process_unittest.py                |    2 +-
 tools/clean-vlans                             |    2 ++
 tools/setup_iptables.sh                       |    2 +-
 7 files changed, 9 insertions(+), 3 deletions(-)

commit 02371cafcc50957d79253cbd11f1c5bccc7cde6c
Merge: 57e839b edff809
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 16 10:08:05 2010 +0000

    Merged changes from trunk into the branch

commit 4809c1bf82130f969614a8f0458636a462b81a88
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Thu Dec 16 18:20:04 2010 +0900

    Hostテーブルのカラム名を修正
    FlatManager, FlatDHCPManagerに対応

 bin/nova-manage              |   12 ++++--------
 nova/compute/manager.py      |   32 +++++++++++---------------------
 nova/db/sqlalchemy/api.py    |    6 ++++++
 nova/db/sqlalchemy/models.py |    4 ++--
 nova/network/manager.py      |   15 +++++++++------
 nova/scheduler/manager.py    |   14 ++++++++------
 nova/service.py              |    8 ++++----
 nova/virt/libvirt_conn.py    |    4 ++++
 8 files changed, 48 insertions(+), 47 deletions(-)

commit e93d6f449f92f82cf631c41948cc0e6e07b88f48
Merge: a87b408 d67b9f7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Dec 15 20:31:32 2010 -0400

    merged with trunk. fixed compute.pause test

commit a87b4081c6617ba193836ad12008204d62814549
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Dec 15 18:23:51 2010 -0400

    fixup after merge with trunk

 nova/virt/libvirt_conn.py |    2 --
 1 file changed, 2 deletions(-)

commit e1da5d66b2e33a043e7e9ee357d9769276d6e302
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 13:14:28 2010 -0800

    memcached requires strings not unicode

 nova/api/ec2/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit edff8090714f11305d6dbc091a96eece20f0d1a1
Merge: 1ca7d86 17daec6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 15 20:54:37 2010 +0000

    Fix 688220
    Added dependency on Twisted>=10.1.0 to pip-requires

commit d7edc3d1d4ea67e4a3b86cc4c8c4836b23bc703a
Merge: c00d991 1ca7d86
Author: jaypipes@gmail.com <>
Date:   Wed Dec 15 15:14:09 2010 -0500

    Merge trunk and resolve slight conflict

commit 1ca7d8697679e6c7522ab294f5a97ed8608920b6
Merge: 0a93a92 aff411d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 20:04:19 2010 +0000

    Make sure we properly close the bzr WorkingTree in our Authors up-to-datedness unit test.

commit 9a8113584edc9a8dbf42e7039b373429c11a7760
Author: termie <code@term.ie>
Date:   Wed Dec 15 11:53:18 2010 -0800

    fixes for xenapi (thanks sandywalsh)

 nova/virt/xenapi_conn.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit dd4ee43cc2042299ed7a56b4690999fa1df120a1
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 11:23:33 2010 -0800

    clean up tests and add overriden time method to utils

 nova/api/ec2/__init__.py          |   11 +++++-----
 nova/fakememcache.py              |   11 +++++-----
 nova/tests/middleware_unittest.py |   23 +++++++++-----------
 nova/utils.py                     |   42 +++++++++++++++++++++++++++++++++++--
 4 files changed, 60 insertions(+), 27 deletions(-)

commit 40dd925070e6c7b69fc0cc59d48343787c4f733f
Merge: fdf0670 0a93a92
Author: termie <code@term.ie>
Date:   Wed Dec 15 11:02:33 2010 -0800

    merged from upstream

commit fdf067037981c2b4b4501258919af0f9e1d0ec26
Author: termie <code@term.ie>
Date:   Wed Dec 15 10:38:30 2010 -0800

    add missing import

 nova/virt/xenapi_conn.py |    2 ++
 1 file changed, 2 insertions(+)

commit e893be0a8d32cf1eb2c91187b81a6febf90e5b7c
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 15 18:28:00 2010 +0000

    Adding back in openssh-lpk schema, as keys will likely be stored in LDAP again.

 nova/auth/opendj.sh                   |    1 +
 nova/auth/openssh-lpk_openldap.schema |   19 +++++++++++++++++++
 nova/auth/openssh-lpk_sun.schema      |   10 ++++++++++
 nova/auth/slap.sh                     |    1 +
 4 files changed, 31 insertions(+)

commit c725787c6709d6b2777e89092eef1cdf4a9b1681
Merge: fa7d288 9a81135
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Dec 15 14:19:39 2010 -0400

    basic conversion of xs-pause to eventlet done

commit f15349b4c0d0bc68fba9cbafbf0b532d95168d8c
Merge: cfd28ad dada567
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 15 18:01:29 2010 +0000

    brougth clean-up from unittests branch and tests

commit 57e839b1333e29a44a33dc2571dfb8a0a0c956e3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 17:58:55 2010 +0000

    I made pep8 happy

 nova/compute/api.py          |    6 +++---
 nova/virt/libvirt_conn.py    |   15 +++++++--------
 nova/virt/xenapi/vm_utils.py |   42 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    |   16 ++++++++--------
 4 files changed, 39 insertions(+), 40 deletions(-)

commit dada56794679b213b2d80e4e1f907a212b73f54e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 15 17:50:05 2010 +0000

    * code cleanup
    * revised unittest approach
    * added stubout and a number of tests

 nova/tests/xenapi_unittest.py |  136 ++++++++++++++++++++++++++++++++++++++---
 nova/virt/xenapi/__init__.py  |   22 +------
 nova/virt/xenapi/fake.py      |   40 +-----------
 nova/virt/xenapi/vmops.py     |    6 +-
 nova/virt/xenapi/volumeops.py |    7 +--
 nova/virt/xenapi_conn.py      |   24 ++++----
 6 files changed, 146 insertions(+), 89 deletions(-)

commit b0279030127b7fe8df21db12a8727ea623ca46e2
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 09:38:38 2010 -0800

    clean up code to use timeout instead of two keys

 nova/api/ec2/__init__.py          |   58 +++++++++++++++++--------------------
 nova/fakememcache.py              |   38 +++++++++++++++---------
 nova/tests/middleware_unittest.py |   27 ++++++++++-------
 3 files changed, 68 insertions(+), 55 deletions(-)

commit 9308d57ee06baab7eda304d0456544d1f9e587f0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 17:35:56 2010 +0000

    final cleanup

 nova/compute/api.py                           |    2 +-
 nova/virt/xenapi/vm_utils.py                  |    1 -
 nova/virt/xenapi/vmops.py                     |    2 +-
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

commit 17daec6992456efc70ffbf05423ea91123db1fc2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 15 20:17:44 2010 +0300

    Restore alphabetical order in Authors file

 Authors |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eaf463e4cc15820a5a8b91a31266fee02438c2c9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 14:27:07 2010 +0000

    removed temporary comment lines

 nova/compute/api.py                           |    7 +------
 nova/flags.py                                 |    4 ----
 nova/virt/xenapi/vm_utils.py                  |   13 ++++---------
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    7 -------
 4 files changed, 5 insertions(+), 26 deletions(-)

commit b420a3daa5f1b827f49e5d6557aaa0f8d396b81b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 14:04:06 2010 +0100

    Lots of PEP-8 work.

 nova/api/ec2/cloud.py       |    4 +--
 nova/compute/api.py         |    8 ++----
 nova/compute/manager.py     |    2 --
 nova/db/api.py              |    2 +-
 nova/db/sqlalchemy/api.py   |    3 +-
 nova/tests/virt_unittest.py |   67 +++++++++++++++++++++++--------------------
 nova/virt/libvirt_conn.py   |   29 +++++++++----------
 7 files changed, 57 insertions(+), 58 deletions(-)

commit 1539df7429a235ba2fefe3f65422fe94b248ac08
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 14:03:19 2010 +0100

    refresh_security_group renamed to refresh_security_group_rules

 nova/compute/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8de34796e5d70550f7d762a6415b68730f0bb078
Merge: be9a3cd 0a93a92
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 13:23:33 2010 +0100

    Merge trunk

commit 69f0674ba1c4778a3131aba3ae662a60f70faa19
Merge: e756221 cfd28ad
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 15 12:19:33 2010 +0000

    added volume tests and extended fake to support them

commit e84f46e739c56b7ae186866f33c713a0ac98e770
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 13:15:19 2010 +0100

    Make sure the new, consolidated template gets included.

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aff411d80f4243ad0b40649af3a7586c7c38ac2d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 11:57:56 2010 +0100

    Make sure we unlock the bzr tree again in the authors unit test.

 nova/tests/misc_unittest.py |   43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

commit bb0adb5f3309e9502f1afc34224d7194485f0124
Merge: bf34529 0a93a92
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 11:54:00 2010 +0100

    Merge trunk

commit 0a93a9298dda075b5519e71289d0bac6fb461404
Merge: e328d7b 3a96066
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 15 07:48:51 2010 +0000

    The ppa was moved.  This updates nova.sh to reflect that.

commit e9a9a4e48ff40b4b1c8233a7c7aaa9ad77af2cee
Merge: a2a8406 87265fd
Author: termie <code@term.ie>
Date:   Tue Dec 14 17:06:56 2010 -0800

    merged upstream

commit 82ccd2b656a364251aeecbf4c31cd062af6513f0
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Dec 14 16:48:44 2010 -0800

    remove some logging

 nova/virt/images.py |    2 --
 1 file changed, 2 deletions(-)

commit 38c236ab5f0fa54f9837d3407f3bdbb3abd1931b
Merge: a58648f 87265fd
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Dec 14 16:42:51 2010 -0800

    Merged from trunk and fixed merge issues.
    Also fixed pep8 issues

commit 99347717ed2c7e92b3dc3bd33c12a3a05e8e349d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 15 00:25:04 2010 +0000

    Lockout middleware for ec2 api

 nova/api/ec2/__init__.py          |   70 ++++++++++++++++++++++++++++++-
 nova/fakememcache.py              |   50 ++++++++++++++++++++++
 nova/tests/middleware_unittest.py |   82 +++++++++++++++++++++++++++++++++++++
 run_tests.py                      |    1 +
 4 files changed, 202 insertions(+), 1 deletion(-)

commit a2a8406b5d793545c8ecb359e18b80bba618c509
Author: termie <code@term.ie>
Date:   Tue Dec 14 16:05:39 2010 -0800

    updates per review

 bin/nova-api                      |    9 ++---
 bin/nova-combined                 |    3 --
 bin/nova-scheduler                |    2 +-
 nova/compute/manager.py           |    4 +--
 nova/manager.py                   |    2 +-
 nova/rpc.py                       |    1 -
 nova/service.py                   |   69 +------------------------------------
 nova/tests/service_unittest.py    |   13 -------
 nova/utils.py                     |    2 +-
 nova/virt/fake.py                 |    4 +--
 nova/virt/libvirt_conn.py         |   14 ++++----
 nova/virt/xenapi/network_utils.py |    5 ++-
 nova/virt/xenapi/vmops.py         |    3 +-
 nova/virt/xenapi_conn.py          |    6 ++--
 nova/volume/driver.py             |   25 ++++++--------
 run_tests.py                      |    5 ---
 16 files changed, 35 insertions(+), 132 deletions(-)

commit e328d7bbb18a4b32671f2016ef3dc1bd63cbe3a0
Merge: 87265fd 797e3f8
Author: jaypipes@gmail.com <>
Date:   Tue Dec 14 23:59:11 2010 +0000

    Initial work on i18n.  This adds the installation of the nova domain in gettext to all the "endpoints", which are all the bin/* files and run_tests.py.
    
    In addition, we place a small hack in /nova/tests/__init__.py that allows nosetests to run without problems.
    
    The next series of patches will "i18n"-ify the strings in Nova using the _() gettext function.

commit 797e3f8a1cc72599aa8540b5655e29da8975e56f
Author: jaypipes@gmail.com <>
Date:   Tue Dec 14 18:22:03 2010 -0500

    For some reason, I forgot to commit the other endpoints...

 bin/nova-import-canonical-imagestore |    3 +++
 bin/nova-instancemonitor             |    3 +++
 bin/nova-manage                      |    3 +++
 bin/nova-network                     |    3 +++
 bin/nova-objectstore                 |    3 +++
 bin/nova-scheduler                   |    3 +++
 bin/nova-volume                      |    3 +++
 7 files changed, 21 insertions(+)

commit 9c2fa95298000c0c9d3953f0ef87823ed604949a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 14 23:35:54 2010 +0100

    Remove default_{kernel,ramdisk} flags. They are not used anymore.

 nova/flags.py |    4 ----
 1 file changed, 4 deletions(-)

commit aab6a89ba1e9ace73dcb4fa68a67957e29c47f84
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 14 23:34:08 2010 +0100

    Don't attempt to fiddle with partitions for whole-disk-images.

 nova/compute/disk.py      |    7 +++++++
 nova/virt/libvirt_conn.py |   21 +++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

commit fa7d288e6af3d997d6275d9e6778e932be9f1c3f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 17:56:42 2010 -0400

    pep8

 nova/adminclient.py                      |    1 +
 nova/api/ec2/admin.py                    |    1 +
 nova/api/openstack/backup_schedules.py   |    1 +
 nova/api/openstack/servers.py            |    2 --
 nova/compute/api.py                      |    1 -
 nova/compute/manager.py                  |   18 ++++++++----------
 nova/db/sqlalchemy/api.py                |    4 ++++
 nova/exception.py                        |    3 +++
 nova/process.py                          |    2 ++
 nova/server.py                           |    2 +-
 nova/tests/api/openstack/test_servers.py |    4 ++--
 nova/twistd.py                           |    2 +-
 nova/virt/fake.py                        |    1 +
 nova/virt/libvirt_conn.py                |    5 +++--
 nova/virt/xenapi/network_utils.py        |    1 +
 nova/virt/xenapi/vm_utils.py             |    1 +
 nova/virt/xenapi/vmops.py                |    1 +
 nova/virt/xenapi/volumeops.py            |    1 +
 nova/virt/xenapi_conn.py                 |    2 ++
 19 files changed, 34 insertions(+), 19 deletions(-)

commit 87265fd2de6b73a32bd327553ce542ee5ec125b3
Merge: 911f111 72b18d0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 14 19:14:10 2010 +0000

    Includes architecture on register. Additionally removes a couple lines of cruft.

commit 2bda552391f5503d3b08a41972e675305a695be8
Merge: a6e1399 e33cce1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:25:02 2010 +0000

    nothing

commit a6e1399dfb7ffc411876b537ad5a9b80122feacc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:16:58 2010 +0000

    nothing

 nova/virt/xenapi/vm_utils.py                  |    6 +++++-
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 31c1407f7fe39b5a366e75b3131769efbfb50b57
Merge: bfe019e 911f111
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 14 18:11:30 2010 +0100

    Merge trunk

commit 1dfcd8e6cdd58a0737a8667f8d2b18190527657a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:02:43 2010 +0000

    nothing

 nova/virt/xenapi/vm_utils.py                  |    1 +
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit 41203e726fd3e43bcce7f800c6bf042e9dd70531
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 16:32:28 2010 +0000

    support for pv guests (in progress)

 nova/virt/xenapi/vm_utils.py                  |   45 ++++++++++++++++++-------
 nova/virt/xenapi/vmops.py                     |    8 +++--
 plugins/xenapi/etc/xapi.d/plugins/objectstore |   30 +++++++++++++----
 3 files changed, 63 insertions(+), 20 deletions(-)

commit cfd28ad20495c3698c1b392c3e7534a5c8dadc93
Merge: 6e37cf4 911f111
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 14 15:34:17 2010 +0000

    merge trunk

commit bfe019e0de486eea09e4702262cd228791a4694c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 14 15:33:18 2010 +0100

    Now that we have a templating engine, let's use it. Consolidate all the libvirt templates into one, extending the unit tests to make sure I didn't mess up.

 nova/tests/virt_unittest.py                |  135 ++++++++++++++++++++++------
 nova/virt/libvirt.qemu.xml.template        |   37 --------
 nova/virt/libvirt.rescue.qemu.xml.template |   37 --------
 nova/virt/libvirt.rescue.uml.xml.template  |   26 ------
 nova/virt/libvirt.rescue.xen.xml.template  |   34 -------
 nova/virt/libvirt.uml.xml.template         |   26 ------
 nova/virt/libvirt.xen.xml.template         |   35 --------
 nova/virt/libvirt.xml.template             |   76 ++++++++++++++++
 nova/virt/libvirt_conn.py                  |   60 +++----------
 9 files changed, 199 insertions(+), 267 deletions(-)

commit e7562217edf80afdb5ca8254b624c401f549ec1e
Merge: fe66735 6e37cf4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 14 14:27:56 2010 +0000

    first cut of unittest framework for xenapi

commit d3a41eff912762dddd1516006da197f99af53b4e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Dec 14 14:54:50 2010 +0300

    Added my contacts to Authors file

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 6e37cf42d758b5040442d9c296b21955d10a7327
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 14 11:48:29 2010 +0000

    final cleanup, after moving unittest work into another branch

 nova/virt/xenapi/__init__.py      |   30 +++++++++++++++++
 nova/virt/xenapi/fake.py          |   66 +++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/network_utils.py |    3 +-
 nova/virt/xenapi/vm_utils.py      |   19 ++---------
 nova/virt/xenapi/vmops.py         |    6 ++--
 nova/virt/xenapi/volume_utils.py  |   20 ++---------
 nova/virt/xenapi/volumeops.py     |    8 +++--
 nova/virt/xenapi_conn.py          |   10 ++++--
 8 files changed, 118 insertions(+), 44 deletions(-)

commit 90190eb3b4d285cab2e8884045f361ea9441a84a
Merge: 99ba9bc 911f111
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 04:25:39 2010 -0400

    fixup after merge with trunk

commit 99ba9bc7c4cd7bdb085e76a8f926ade27d558a84
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 02:43:15 2010 -0400

    added callback param to fake_conn

 nova/virt/fake.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bd611a717ef1f0a3707702a76b09fbadb56869c6
Merge: 8a6ee60 1395d31
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 00:10:30 2010 -0400

    added not implemented stubs for libvirt

commit 8a6ee60bd368e307c548e9f7fa5648c442a1fb98
Merge: 54e4174 f7862f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Dec 13 23:34:48 2010 -0400

    merge with trey tests

commit 1395d31badc43bdce036e8da3927af22a22ca91e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Dec 13 18:25:17 2010 -0800

    Fixed power state update with Twisted callback

 nova/compute/manager.py   |   21 +++++++++++++++++----
 nova/virt/xenapi/vmops.py |   12 ++++++++----
 nova/virt/xenapi_conn.py  |    8 ++++----
 3 files changed, 29 insertions(+), 12 deletions(-)

commit 72b18d065669a01d8d083aa3edcc726be9be6547
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 14 00:20:27 2010 +0000

    simplified version using original logic

 nova/objectstore/image.py |   49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

commit e30801445f8b543d78494ca63be60f85b94d3a53
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 13 20:31:33 2010 +0000

    moving xenapi unittests changes into another branch

 nova/tests/virt_unittest.py |   76 -------------------------
 nova/virt/xenapi/fake.py    |  128 -------------------------------------------
 2 files changed, 204 deletions(-)

commit 911f11139926a772a5d90b8ec65cc4cb7ad850e9
Merge: a70e2bf 50ac7dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Dec 13 19:54:07 2010 +0000

    Adds support to the ec2 api for filtering describe volumes by volume_ids.

commit a70e2bf4a5c9a3effc1f79e32ac23b53617f2634
Merge: e87561c d60ed93
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Dec 13 19:36:20 2010 +0000

    Added LiveCD info as well as some changes to reflect consolidation of .conf files.

commit e87561ca6eed4be640c6f221b93ba965f2883173
Merge: 8a7c7f0 c06ec98
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Mon Dec 13 19:34:09 2010 +0000

    Fix exception throwing with wrong instance type.

commit c06ec98897e7c3e33f15d45ba2704b0d4b77a453
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Mon Dec 13 18:56:07 2010 +0000

    Add myself.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit fe667352c3e25c744a989ca45f4f9ed472778ae3
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 13 18:43:24 2010 +0000

    removing imports that should have not been there

 nova/tests/virt_unittest.py |    3 ++-
 nova/virt/xenapi/fake.py    |   10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

commit 669d5f5612840c9ed6449d91ee5aae97842cac72
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 13 18:22:56 2010 +0000

    second round for unit testing framework

 nova/tests/virt_unittest.py  |   65 ++++++++++++++++++++++++++----------
 nova/virt/xenapi/__init__.py |    5 +++
 nova/virt/xenapi/fake.py     |   75 ++++++++++++++++++++++++++++++++++++++++--
 nova/virt/xenapi/vmops.py    |    3 +-
 nova/virt/xenapi_conn.py     |    2 +-
 5 files changed, 127 insertions(+), 23 deletions(-)

commit 8e642730b1e32477bcd124592f2c9e00857da1b9
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Dec 13 20:02:27 2010 +0300

    Added Twisted version dependency into pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit e33cce1b76d5e0752c49b51cdc24c3368d12125f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 13 16:11:12 2010 +0000

    only needs work for distinguishing pv from hvm

 .project                     |   17 +++++++++++++++++
 .pydevproject                |   10 ++++++++++
 nova-api.pid                 |    1 +
 nova-manage.conf             |   26 ++++++++++++++++++++++++++
 nova-network.pid             |    1 +
 nova-objectstore.pid         |    1 +
 nova-scheduler.pid           |    1 +
 nova/virt/xenapi/vm_utils.py |   14 +++++++++-----
 8 files changed, 66 insertions(+), 5 deletions(-)

commit be9a3cd7e17edac4032c8ae554f75d725b0ad54a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 13 16:42:35 2010 +0100

    Move security group refresh logic into ComputeAPI.
    
    Add a trigger_security_group_members_refresh to ComputeAPI which
    finds the hosts that have instances that have security groups that
    reference a security group in which a new instance has just been placed,
    and sends a refresh_security_group_members to each of them.

 nova/api/ec2/cloud.py     |   15 +++--------
 nova/compute/api.py       |   61 +++++++++++++++++++++++++++++++++++++++++++++
 nova/compute/manager.py   |   16 +++++++++---
 nova/db/api.py            |    7 ++++++
 nova/db/sqlalchemy/api.py |   19 ++++++++++++++
 nova/virt/libvirt_conn.py |   32 +++++++++++++++++-------
 6 files changed, 127 insertions(+), 23 deletions(-)

commit 65c0443c4a6c6ffa525d07e47275382c45bc8ffe
Merge: 8db57c6 8a7c7f0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 13 14:12:02 2010 +0100

    Merge trunk

commit 8a7c7f0cda35bd13ff12c915337bb71e25345483
Merge: 8dfd55c a21c338
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Dec 13 11:53:55 2010 +0000

    Refactored smoketests to use novarc environment and to separate user and admin specific tests.

commit 8dfd55c18ac5396b94a6b3844ef6dad601be70fb
Merge: 1a759c3 1c323ef
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 13 11:38:53 2010 +0000

    Changed OpenStack API auth layer to inject a RequestContext rather than building one everywhere we need it.

commit 8db57c605d59f492eaba68d134275a348c525640
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 13 09:49:13 2010 +0100

    Elaborate a bit on ipsets comment.

 nova/virt/libvirt_conn.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit c00d99102c826f6a501ff7a530291dc8d7680df7
Author: jaypipes@gmail.com <>
Date:   Sat Dec 11 15:42:05 2010 -0500

    Final round of marking translation strings

 nova/virt/connection.py   |    2 +-
 nova/virt/fake.py         |    3 ++-
 nova/virt/libvirt_conn.py |   41 ++++++++++++++++++++++-------------------
 nova/virt/xenapi_conn.py  |   16 ++++++++--------
 nova/volume/driver.py     |   10 +++++-----
 nova/volume/manager.py    |   20 ++++++++++----------
 6 files changed, 48 insertions(+), 44 deletions(-)

commit 12802a76c775a35e9d5a651bf896cfa25bec547f
Author: jaypipes@gmail.com <>
Date:   Sat Dec 11 15:23:40 2010 -0500

    First round of i18n-ifying strings in Nova

 nova/api/cloudpipe/__init__.py         |    4 +-
 nova/api/ec2/__init__.py               |    6 +--
 nova/api/ec2/apirequest.py             |    4 +-
 nova/api/ec2/cloud.py                  |   51 ++++++++++++-----------
 nova/api/ec2/metadatarequesthandler.py |    2 +-
 nova/api/openstack/__init__.py         |    6 +--
 nova/auth/dbdriver.py                  |   20 ++++-----
 nova/auth/fakeldap.py                  |    2 +-
 nova/auth/ldapdriver.py                |   69 ++++++++++++++++++--------------
 nova/auth/manager.py                   |   30 +++++++-------
 nova/cloudpipe/pipelib.py              |    2 +-
 nova/compute/api.py                    |   12 +++---
 nova/compute/disk.py                   |   16 ++++----
 nova/compute/instance_types.py         |    2 +-
 nova/compute/manager.py                |   32 +++++++--------
 nova/compute/monitor.py                |   12 +++---
 nova/crypto.py                         |   18 ++++-----
 nova/db/sqlalchemy/api.py              |   48 +++++++++++-----------
 nova/exception.py                      |    8 ++--
 nova/fakerabbit.py                     |   12 +++---
 nova/image/glance.py                   |    8 ++--
 nova/image/s3.py                       |    3 +-
 nova/network/linux_net.py              |   10 ++---
 nova/network/manager.py                |   17 ++++----
 nova/objectstore/handler.py            |   20 ++++-----
 nova/process.py                        |    2 +-
 nova/rpc.py                            |   36 ++++++++---------
 nova/scheduler/chance.py               |    2 +-
 nova/scheduler/driver.py               |    2 +-
 nova/scheduler/manager.py              |    2 +-
 nova/scheduler/simple.py               |   13 +++---
 nova/server.py                         |    4 +-
 nova/service.py                        |   12 +++---
 nova/twistd.py                         |    6 +--
 nova/utils.py                          |   14 +++----
 nova/validate.py                       |   12 +++---
 36 files changed, 267 insertions(+), 252 deletions(-)

commit a6645d8a431ed933eef4ea6c42c0224ead6f2272
Author: jaypipes@gmail.com <>
Date:   Sat Dec 11 15:10:24 2010 -0500

    Initial i18n commit for endpoints. All endpoints must install
    gettext, which injects the _ function into the builtins.

 bin/nova-api           |    3 +++
 bin/nova-compute       |    3 +++
 bin/nova-dhcpbridge    |    3 +++
 nova/tests/__init__.py |    5 +++++
 run_tests.py           |    3 +++
 5 files changed, 17 insertions(+)

commit d60ed93a22b5cfb7dcaad2882b28a5a37c797af9
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Dec 10 16:03:30 2010 -0600

    Fixed spelling errors in index.rst

 doc/source/index.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f09b008388b9ed8dbd1d3f74cb1e9f2a458a3000
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 10 21:15:33 2010 +0000

    fix pep8

 nova/objectstore/image.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 68dbbbba34af234f2770b40c03e4e4bfa5ad78d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 10 21:09:37 2010 +0000

    Includes kernel and ramdisk on register. Additinally removes a couple lines of cruft

 nova/objectstore/image.py |   46 +++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

commit c835c441981a17764931390bc1ace6121ab100a4
Author: Andy Smith <code@term.ie>
Date:   Fri Dec 10 11:53:17 2010 -0800

    port new patches

 nova/virt/xenapi/vmops.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit e3aae367c2d449bfc25216865f37182953b535f4
Merge: 4d06429 1a759c3
Author: Andy Smith <code@term.ie>
Date:   Fri Dec 10 11:46:29 2010 -0800

    merge-a-tat-tat upstream to this branch

commit 8d08206cb4759328e7cf3b836eeff824e0d22052
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Dec 10 18:49:54 2010 +0000

    Format fixes and modification of Vish's email address.

 nova/auth/ldapdriver.py        |   41 +++++++++++++++++++++-------------------
 nova/auth/nova_openldap.schema |    2 +-
 nova/auth/nova_sun.schema      |    2 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

commit 2a5ad56319dfdf75bf2eab1337032f035822f272
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 10 18:37:17 2010 +0000

    There is always the odd change that one forgets!

 nova/virt/xenapi_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 83cd4057e358e597e0d1f13392e000cbb58f096a
Merge: 9420d99 1a759c3
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 10 18:24:59 2010 +0000

    * pylint fixes
    * code clean-up
    * first cut for xenapi unit tests

commit f7862f6d212d52e09d2a3a076762c936618cf061
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 17:55:21 2010 +0000

    added pause and unpause to fake connection

 nova/virt/fake.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 1e410a0c4528a2a70e56bd243d995aede9b95854
Merge: 1d22b67 54e4174
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 16:45:26 2010 +0000

    merged changes from sandy's branch

commit 1d22b67c9dc0e01c8e4afb66fbc6c9be8f843974
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 16:28:23 2010 +0000

    added unittest for pause

 nova/tests/compute_unittest.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 4d06429290a373ae3a42b1f9b58d7253d269e048
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:45:51 2010 -0800

    add back utils.default_flagflie

 bin/nova-api       |    1 +
 bin/nova-combined  |    2 ++
 bin/nova-compute   |    2 ++
 bin/nova-network   |    2 ++
 bin/nova-scheduler |    2 ++
 bin/nova-volume    |    2 ++
 6 files changed, 11 insertions(+)

commit af5c175dbc77048fb74311bf92569866676eee9c
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:18:52 2010 -0800

    removed a few more references to twisted

 nova/rpc.py                       |    6 ++--
 nova/service.py                   |    2 --
 nova/virt/images.py               |    2 +-
 nova/virt/xenapi/network_utils.py |    9 ++----
 nova/virt/xenapi/vmops.py         |   61 +++++++++++++++++--------------------
 5 files changed, 36 insertions(+), 44 deletions(-)

commit a1640f352806ee12f6b485a8d69a65bd42b51411
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:05:13 2010 -0800

    formatting and naming cleanup

 bin/nova-api                       |    6 +-
 bin/nova-combined                  |    4 +-
 bin/nova-compute                   |    4 +-
 bin/nova-network                   |    4 +-
 bin/nova-scheduler                 |    4 +-
 bin/nova-volume                    |    4 +-
 nova/flags.py                      |    4 +-
 nova/objectstore/image.py          |    2 -
 nova/rpc.py                        |    5 +-
 nova/server.py                     |  151 ------------------------------------
 nova/test.py                       |    9 +--
 nova/tests/access_unittest.py      |    2 +-
 nova/tests/api/__init__.py         |    3 +-
 nova/tests/auth_unittest.py        |   11 +--
 nova/tests/cloud_unittest.py       |    2 +-
 nova/tests/compute_unittest.py     |    2 +-
 nova/tests/flags_unittest.py       |    2 +-
 nova/tests/misc_unittest.py        |    2 +-
 nova/tests/network_unittest.py     |    2 +-
 nova/tests/objectstore_unittest.py |    4 +-
 nova/tests/quota_unittest.py       |    2 +-
 nova/tests/rpc_unittest.py         |    2 +-
 nova/tests/scheduler_unittest.py   |    4 +-
 nova/tests/service_unittest.py     |    4 +-
 nova/tests/virt_unittest.py        |    4 +-
 nova/tests/volume_unittest.py      |    2 +-
 nova/utils.py                      |    7 --
 run_tests.py                       |    1 -
 28 files changed, 39 insertions(+), 214 deletions(-)

commit b3f5aba0c465b263c1d0a15c7d249dafb3a98e6c
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 15:25:14 2010 -0800

    remove service and rename service_eventlet to service

 bin/nova-combined                |   14 +-
 bin/nova-compute                 |    6 +-
 bin/nova-network                 |    6 +-
 bin/nova-scheduler               |    6 +-
 bin/nova-volume                  |    6 +-
 nova/service.py                  |  169 +++++++++++++++++----
 nova/service_eventlet.py         |  303 --------------------------------------
 nova/tests/scheduler_unittest.py |    2 +-
 nova/tests/service_unittest.py   |    2 +-
 9 files changed, 160 insertions(+), 354 deletions(-)

commit 3b376b8ad167e91119e21180bbff41eceef22e26
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 15:19:56 2010 -0800

    get service unittests runnning again

 nova/service_eventlet.py         |   20 +++++--
 nova/test.py                     |  118 ++++++++++++++++++++++++++++++--------
 nova/tests/scheduler_unittest.py |   22 +++----
 nova/tests/service_unittest.py   |   44 +++++++-------
 nova/utils.py                    |    7 ++-
 run_tests.py                     |    4 +-
 6 files changed, 149 insertions(+), 66 deletions(-)

commit 2cad5375dc3784397ac8e6a0aa170a161e97ea7e
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 14:37:43 2010 -0800

    whitespace fix

 nova/service_eventlet.py |    1 +
 1 file changed, 1 insertion(+)

commit 00f329d479564ad8349ed32a27990da2ed3a396e
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 14:36:23 2010 -0800

    make nova binaries use eventlet

 bin/nova-api             |   10 +++++-----
 bin/nova-combined        |   14 +++++++++++---
 bin/nova-compute         |    1 +
 bin/nova-network         |    1 +
 bin/nova-scheduler       |   15 ++++++---------
 bin/nova-volume          |   15 ++++++---------
 nova/service_eventlet.py |    4 +++-
 7 files changed, 33 insertions(+), 27 deletions(-)

commit 77d7e022fd5f2c8709a6784cc83429494d126a3b
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 9 13:59:50 2010 -0800

    Converted the instance table to use a uuid instead of a auto_increment ID and a random internal_id. I had to use a String(32) column with hex and not a String(16) with bytes because SQLAlchemy doesn't like non-unicode strings going in for String types. We could try another type, but I didn't want a primary_key on blob types.

 nova/api/ec2/cloud.py                    |   70 ++++++++++++++----------------
 nova/api/openstack/servers.py            |    4 +-
 nova/compute/api.py                      |   26 +++++------
 nova/db/api.py                           |    8 ++--
 nova/db/sqlalchemy/api.py                |   32 ++++----------
 nova/db/sqlalchemy/models.py             |   23 +++++-----
 nova/tests/api/openstack/test_servers.py |    9 ++--
 nova/tests/cloud_unittest.py             |    4 +-
 8 files changed, 78 insertions(+), 98 deletions(-)

commit 54e4174a0b6a3c1dd4105617b06bb7a69f45202c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 17:32:27 2010 -0400

    remove debug messages

 nova/compute/api.py |    2 --
 1 file changed, 2 deletions(-)

commit 9aa82478391b29a1662b3b2493e9878c37adb253
Merge: 90c89f5 2941029
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 17:13:53 2010 -0400

    merge with trey

commit 90c89f5f7b24bb6c95d405d42f7f15292b5452a9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 17:03:49 2010 -0400

    pause and unpause code/tests in place. To the point it stuffs request in the queue.

 nova/api/openstack/__init__.py           |   13 +++++++-----
 nova/api/openstack/servers.py            |   33 ++++++++++++++++++++++++++++++
 nova/compute/api.py                      |   21 +++++++++++++++++++
 nova/tests/api/openstack/test_servers.py |   31 +++++++++++++++++++++++++++-
 4 files changed, 92 insertions(+), 6 deletions(-)

commit 4c9bf2f01fb712a3af6a9876a175a7a0638bcd59
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Thu Dec 9 20:18:06 2010 +0000

    import module and not classe directely as per Soren recommendation.

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1a759c3722610d720dd8dabf816db146c1063937
Merge: c5b1fd0 dc1919e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 9 20:09:14 2010 +0000

    Make XenServer VM diagnostics available through nova.virt.xenapi.

commit dc1919eab2c468754afdc76b3660aa9588bde642
Merge: a00c801 c5b1fd0
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 13:38:57 2010 -0600

    Merged trunk

commit a00c8015e4ffe417f6c111a5eaf0578d9ef79b7d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 13:37:30 2010 -0600

    Added exception handling to get_rrd()

 nova/virt/xenapi/vm_utils.py |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

commit 1c323efd0777587b44b275827187b7c5cd6afdc5
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 9 09:57:15 2010 -0800

    Changed OpenStack API auth layer to inject a RequestContext rather than building one everywhere we need it.

 nova/api/openstack/__init__.py        |    9 ++++----
 nova/api/openstack/auth.py            |    4 +---
 nova/api/openstack/images.py          |    9 ++------
 nova/api/openstack/servers.py         |   41 ++++++++++++++-------------------
 nova/tests/api/openstack/fakes.py     |   13 ++++++++---
 nova/tests/api/openstack/test_auth.py |    3 +++
 6 files changed, 37 insertions(+), 42 deletions(-)

commit 294102984964e8853fcaf32485c273cbdcc7748a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 17:54:30 2010 +0000

    changed resume to unpause

 nova/compute/manager.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 470dcfdf793f9a8b34c320731dcfc8d403a61bd2
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 11:32:23 2010 -0600

    Import module instead of function

 nova/virt/xenapi/vm_utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 50ac7dc67686742c3e57cc3a408ca9e8c988b89b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 9 17:30:03 2010 +0000

    filter describe volumes by supplied ids.  Includes unittest.

 nova/api/ec2/cloud.py        |    6 ++++--
 nova/tests/cloud_unittest.py |   13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

commit 48d10e0aa0cbbbbadd022c020bca1695f50003da
Merge: 5f72a00 94edf23
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 17:25:57 2010 +0000

    merging sandy's branch

commit 043d3ac3643e7183d4afe8c628ce90d62a468427
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 11:08:24 2010 -0600

    Make get_diagnostics async

 nova/virt/xenapi/vmops.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 49a1cadd61b4badff0578ecd26adb57fb284ad9a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 9 16:42:52 2010 +0000

    raw instances can now be launched in xenapi (only as hvm at the moment)

 nova/compute/api.py                           |   25 ++++++++---
 nova/compute/instance_types.py                |    2 +-
 nova/db/sqlalchemy/api.py                     |    2 +-
 nova/flags.py                                 |    7 ++++
 nova/virt/libvirt.qemu.xml.template           |   18 ++++++--
 nova/virt/libvirt_conn.py                     |   56 ++++++++++++++++++-------
 nova/virt/xenapi/vm_utils.py                  |   41 +++++++++++++-----
 nova/virt/xenapi/vmops.py                     |   19 ++++++---
 plugins/xenapi/etc/xapi.d/plugins/objectstore |    9 ++--
 9 files changed, 135 insertions(+), 44 deletions(-)

commit 5f72a004dee0cb8de3f2daee1976fa978f6e51f3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 16:41:35 2010 +0000

    pause from compute.manager <-> xenapi

 nova/compute/manager.py   |   32 ++++++++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py |   20 ++++++++++++++++++++
 nova/virt/xenapi_conn.py  |    8 ++++++++
 3 files changed, 60 insertions(+)

commit 79e8b0033c198b6c893110207e18840f74926ea9
Merge: fd79318 783f4fa
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 10:40:44 2010 -0600

    Merged Armando's XenAPI fix

commit 94edf2329a1077e76cff32892d37f285ebd26a36
Merge: cc83aa5 c5b1fd0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 10:42:00 2010 -0400

    merge with trunk to pull in admin-api branch

commit c5b1fd0424cec19be44751b6f4f2aeec13752733
Merge: 3c114a7 e607944
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 14:34:26 2010 +0000

    Flag to define which operations are exposed in the OpenStack API, disabling all others.

commit e6079449dc034234dc24e77b94bbcc4a257387d9
Merge: f0b5313 3c114a7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 10:22:50 2010 -0400

    Fixed Authors conflict and re-merged with trunk

commit b35b86c6f415a205b6ce49164cccb2a870c46fcb
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Thu Dec 9 13:43:54 2010 +0000

    fixes exception throwing with wrong instance type.

 nova/compute/instance_types.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 916f23e63add6167aef40931d6f564c685c6aefd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Dec 9 14:15:38 2010 +0100

    Ignore security group rules that reference foreign security groups.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 783f4fa44b835ef6c399e18679774a2e4bc4124a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 9 10:40:07 2010 +0000

    fixed how the XenAPI library is loaded

 nova/virt/xenapi/vm_utils.py |    9 +++++++++
 nova/virt/xenapi/vmops.py    |    2 ++
 2 files changed, 11 insertions(+)

commit 15f7361f5497c3d27dcafbb27d314af76069ed42
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 17:25:57 2010 -0800

    remove some unused files

 nova/process.py                  |  209 --------------------------------------
 nova/tests/process_unittest.py   |  132 ------------------------
 nova/tests/validator_unittest.py |   42 --------
 nova/validate.py                 |   94 -----------------
 4 files changed, 477 deletions(-)

commit 653373842815a1ba9992d3d662431ba102ac8ce1
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 17:21:43 2010 -0800

    port volume manager to eventlet also

 nova/volume/manager.py |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

commit 3c85f1b7ed593a2d4d126a34241f217da5cf7ce6
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 17:18:27 2010 -0800

    intermediate commit to checkpoint progress
    
    all relevant tests are passing except volume, next step is volume manager fixery

 nova/manager.py                |    3 +-
 nova/objectstore/image.py      |    3 +
 nova/rpc.py                    |   75 ++++++-----------------
 nova/service.py                |    1 -
 nova/test.py                   |   52 ++++++++--------
 nova/tests/api/__init__.py     |    3 +-
 nova/tests/auth_unittest.py    |    5 +-
 nova/tests/cloud_unittest.py   |    4 +-
 nova/tests/compute_unittest.py |   39 ++++++------
 nova/tests/rpc_unittest.py     |   34 +++++------
 nova/tests/service_unittest.py |    9 +--
 nova/tests/virt_unittest.py    |    7 +--
 nova/tests/volume_unittest.py  |   56 ++++++++---------
 nova/utils.py                  |   23 ++++---
 nova/virt/images.py            |    9 +--
 nova/virt/libvirt_conn.py      |   28 ++++-----
 nova/virt/xenapi/vm_utils.py   |   28 ++++-----
 nova/virt/xenapi_conn.py       |    1 -
 nova/volume/driver.py          |  131 +++++++++++++++++-----------------------
 run_tests.py                   |   14 ++++-
 20 files changed, 230 insertions(+), 295 deletions(-)

commit 3c114a7dd596dfb12de42577711d97d1a98d10ec
Merge: 0184957 0ae0190
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 00:09:29 2010 +0000

    some pylint caught changes to compute

commit 0ae019062712fd15dd9e040a3fa60546db9c4111
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 23:47:25 2010 +0000

    added to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 0184957d12d2f562c9ac1db1553a274ea8ce8581
Merge: 69d826e 708425a
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 21:49:19 2010 +0000

    adds bzr to the list of dependencies in pip-require so that upon checkout using run_tests.sh succeeds

commit df66b715214867efde334d6052766f6ee5f9602a
Merge: 88c0e3e 69d826e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 21:36:26 2010 +0000

    merge conflict

commit 0324b6609fe413866fd4cc52a87760f2b5ab2d85
Merge: 2337fab 69d826e
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 12:59:22 2010 -0800

    merged upstream changes

commit 708425aa5b42aae0f399b127ee5a648b7162b05e
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 12:20:44 2010 -0800

    add bzr to the dev dependencies

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit fd7931847de7cb24c629380fb71bca7833710edc
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:16:49 2010 -0600

    Fixed docstrings

 nova/virt/xenapi/vm_utils.py |    1 +
 nova/virt/xenapi_conn.py     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 11234cf88d3eca96da7bc54c4c2cd7bc47151f16
Merge: d4b6cfe 69d826e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:09:31 2010 -0600

    Merged trunk

commit d4b6cfe98f0ce81c21a45f420ce30c5c693c1144
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:05:50 2010 -0600

    Got get_diagnostics in working order

 nova/virt/xenapi/vm_utils.py |   23 +++++++++++++++++++++++
 nova/virt/xenapi/vmops.py    |   28 ++--------------------------
 nova/virt/xenapi_conn.py     |    4 ++++
 3 files changed, 29 insertions(+), 26 deletions(-)

commit cc83aa52086f1472a97914b36f7c4ef7ebb52750
Merge: c56ef6a 69d826e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 19:29:07 2010 +0000

    merged updates to trunk

commit 9420d99dc2fb75a8f6b518f55b6580027af582c3
Merge: 63006a1 69d826e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 18:54:15 2010 +0000

    merge trunk

commit 63006a18701ff185e6837aa2b88f001052643460
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 18:49:28 2010 +0000

    typo fix

 nova/virt/xenapi/volume_utils.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 180c94585ac9bb0e72a936f64ed27052af395999
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Dec 8 11:59:37 2010 -0600

    removing extraneous config ilnes

 doc/source/adminguide/multi.node.install.rst |    3 ---
 1 file changed, 3 deletions(-)

commit 69d826ee3b036d80439396166bb7406f8258f03c
Merge: 67cbebd c1a40a8
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 8 17:54:18 2010 +0000

    Finished cleaning up the openstack servers API, it no longer touches the database directly. Also cleaned up similar things in ec2 API and refactored a couple methods in nova.compute.api to accommodate this work.

commit 67cbebdfcb57d4b81be65e54e4ed4a2201d4efa4
Merge: 3bb38e6 90ddeb5
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 8 17:24:40 2010 +0000

    Pushed terminate instance and network manager/topic methods into network.compute.api.

commit eeac485381f9beaf3df68e8f47b5837a3f48558c
Merge: a107c6f 3bb38e6
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 11:22:12 2010 -0600

    Merged trunk

commit 3bb38e64ed5144db00d77488243b6b70023a3c44
Merge: c56ef6a b206273
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 8 17:19:43 2010 +0000

    Moved the reboot/rescue methods into nova.compute.api.

commit 55bc83b07abc8700c2b619be6be88b348f42a4d8
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 16:38:35 2010 +0000

    PEP8 fixes

 nova/auth/ldapdriver.py |   41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

commit 5e79e5957a016c1f38fb2d126f710078a4b7f9a2
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 16:26:12 2010 +0000

    Setting the default schema version to the new schema

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 393d4687e625caa3c801ef2ef9b2564992d06412
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 16:23:59 2010 +0000

    Adding support for choosing a schema version, so that users can more easily migrate from an old schema to the new schema.

 nova/auth/ldapdriver.py        |   79 +++++++++++++++++++++++-----------------
 nova/auth/nova_openldap.schema |    4 +-
 nova/auth/nova_sun.schema      |    5 ++-
 3 files changed, 52 insertions(+), 36 deletions(-)

commit 818ddcba6de4c0fa5614303f96f436c7c984802c
Merge: 699ac07 c56ef6a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 13:50:37 2010 +0000

    merged with trunk. All clear!

commit 03920759ac485e76c9104b4c9a1bf53231e2c47c
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 10:22:29 2010 +0000

    Removing novaProject from the schema. This change may look odd at first; here's how it works:
    
    Both roles are projects are groupOfNames. Previously, we were differentiating projects from project roles by using the novaProject objectclass on the project, and not on the roles. This change removes novaProject, and uses the owner attribute instead of the projectManager attribute. Only projects should have an owner. We can differentiate projects from project roles by checking for the existence of this attribute. To check for the existence of an attribute in LDAP, a wildcard search is used.
    
    The fake LDAP driver did not support wildcard searches, so I put in "all or nothing" support for it. The wildcard search support doesn't work exactly like wildcard searches in LDAP, but will work for the case that's required.

 nova/auth/fakeldap.py          |    3 +++
 nova/auth/ldapdriver.py        |   16 ++++++++--------
 nova/auth/nova_openldap.schema |   16 ----------------
 nova/auth/nova_sun.schema      |    2 --
 nova/auth/opendj.sh            |    2 --
 nova/auth/slap.sh              |    4 +---
 6 files changed, 12 insertions(+), 31 deletions(-)

commit 64b2ada5efe69709aeca54768130fb0fa01987e7
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Wed Dec 8 17:23:51 2010 +0900

    test commit

 README.livemigration.txt |    1 +
 1 file changed, 1 insertion(+)

commit 8d2bb4659fc06c306afa02e57e138646a1fc0f47
Merge: da010f3 332549a
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 08:21:44 2010 +0000

    Merge from trunk

commit 3313a5170a83feb6e571faa6296ffea7f065ec25
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Wed Dec 8 17:21:04 2010 +0900

    コメントを除去
    README.live_migration.txtのレビュー結果を修正

 README.livemigration.txt  |   25 +++++++++++++++++++++----
 nova/compute/api.py       |    3 ---
 nova/compute/manager.py   |   12 ------------
 nova/db/api.py            |    6 ------
 nova/db/sqlalchemy/api.py |    7 -------
 nova/network/manager.py   |    7 -------
 nova/scheduler/manager.py |    5 +----
 nova/service.py           |    2 --
 nova/virt/libvirt_conn.py |    7 -------
 9 files changed, 22 insertions(+), 52 deletions(-)

commit 332549add2c74c82c1f476642d56f7866dd0db9b
Merge: 5c1c870 0184957
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 07:38:19 2010 +0000

    Merge from trunk

commit 5c1c8702ec7a75f94f341134fca513696e84daee
Merge: ec2b0d5 c56ef6a
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:54:58 2010 +0000

    Merge from trunk

commit ec2b0d5a5146d5b430a84b2547ad4c38e00302f2
Merge: 2cf46f1 a1b28af
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:52:20 2010 +0000

    Merge from trunk

commit c56ef6aa6162d96c1b4225a06e51c706e9ae38e9
Merge: a1b28af 9fdff2a
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:49:20 2010 +0000

    This change adds better support for LDAP integration with pre-existing LDAP infrastructures. A new configuration option has been added to specify the LDAP driver should only modify/add/delete attributes for user entries.
    
    This change also fixes crashing issues for entries that have the novaUser objectclass, but do not have accessKey, secretKey, or isAdmin attributes. The code now only identifies a user as existing if all attributes and the objectclass exists.
    
    A couple new functions were added to check for existence of users in LDAP, even if they do not have the novaUser objectclass.
    
    The ldap_user_modify_only configuration option added assumes that users will be managed by external means, and will not attempt to add or delete user entries.

commit 9fdff2a0f0b45d7ddf1df58f83ac723fc8d99532
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:34:20 2010 +0000

    More pep8 fixes to remove deprecated functions

 nova/auth/ldapdriver.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 70371ab447bff6af36f12ad9594eb6ffdbff4396
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:26:41 2010 +0000

    pep8 fix

 nova/auth/ldapdriver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit abdb8080e365a584c64ce6562934eefb750568ba
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:08:47 2010 +0000

    Clarifying previously commited exception message

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 45324fc9f15135437051eaaedda68a5ef1f0da7a
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 23:53:01 2010 +0000

    Raising an exception if the user doesn't exist before trying to modify its attributes

 nova/auth/ldapdriver.py |    2 ++
 1 file changed, 2 insertions(+)

commit 17fd38e3cb277d51dcf9297178879a620623a855
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 23:46:18 2010 +0000

    Removing redundant check

 nova/auth/ldapdriver.py |   49 +++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

commit d647d6b070e0a910a9f20cfc1106027c86858f30
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Dec 7 16:48:42 2010 -0600

    Added livecd instructions plus fixed references to .conf files

 doc/source/adminguide/managing.networks.rst   |    2 +-
 doc/source/adminguide/multi.node.install.rst  |   27 ++++-----------
 doc/source/adminguide/single.node.install.rst |    4 +--
 doc/source/cloud101.rst                       |    9 +++--
 doc/source/images/novascreens.png             |  Bin 0 -> 27949 bytes
 doc/source/images/novashvirtually.png         |  Bin 0 -> 39000 bytes
 doc/source/index.rst                          |    2 --
 doc/source/livecd.rst                         |   46 +++++++++++++++++++++++++
 8 files changed, 62 insertions(+), 28 deletions(-)

commit 699ac0785240307ef2396d688e6c0a2acb446665
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 22:22:48 2010 +0000

    pylint fixes

 nova/virt/xenapi/vm_utils.py     |    2 +-
 nova/virt/xenapi/volume_utils.py |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

commit a107c6f69237cd7488b9ff716e370dd01b8dd8bd
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 7 16:06:55 2010 -0600

    Initial diagnostics import -- needs testing and cleanup.

 nova/virt/xenapi/vm_utils.py |   15 +++++++++++++++
 nova/virt/xenapi/vmops.py    |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

commit a1b28afb30026be1e8c545b45c14fd94f5403c10
Merge: dd9de2b d03620f
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 21:29:14 2010 +0000

    Added a script to use OpenDJ as an LDAP server instead of OpenLDAP. Also modified nova.sh to add an USE_OPENDJ option, that will be checked when USE_LDAP is set.

commit d03620f31aac6e8720bb6dc19860cb609af878c6
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 21:13:54 2010 +0000

    Reverting last change

 Authors |    1 -
 1 file changed, 1 deletion(-)

commit 98c7fde4cf9b5166e84c9fc61f9659f9bbca5cab
Merge: c0fc8a5 d7ca22c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 21:06:23 2010 +0000

    a few more things ironed out

commit dd9de2b1fb93cc8bcfe5912a69d8b5cc88de1b11
Merge: c7f582e bf34529
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 20:54:11 2010 +0000

    Make sure Authors check also works for pending merges (otherwise stuff can get merged that will make the next merge fail this check).

commit c7f582e81605140d8d3a06667103737bee91960b
Merge: 3ab829d dc7bbd0
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 20:39:19 2010 +0000

    It looks like Soren fixed the author file, can I hit the commit button?

commit dc7bbd02b38bb0e8c147317b3d440ac1c6ae4f8e
Merge: d7ca22c 3ab829d
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 21:00:39 2010 +0000

    merge trunk

commit bf34529e75022451f3833552df0e807139d0e498
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 21:35:15 2010 +0100

    Make sure Authors check also works for pending merges (otherwise stuff can get merged that will make the next merge fail this check).

 nova/tests/misc_unittest.py |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit 3ab829dbf635e34dd3a57b3ebcd9fa8dafd4a066
Merge: 1dc4532 1e050bb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 20:04:26 2010 +0000

    Add a helpful error message to nova-manage in case of NoMoreNetworks.
    
    This is one of the most common problems people have, and the solution
    is not currently easily discoverable. This should address that.

commit 1dc4532c14b554d94a9ed0ebc80bf07b3c4a0c01
Merge: 9340149 994f282
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 19:49:15 2010 +0000

    Add Ryan Lucio to Authors.

commit 06c5889936cec1be503595915a0e0df2c4f925a8
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 19:35:05 2010 +0000

    Adding myself to the authors list

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 994f2820676b47b4f2e919d5ae7d2f9eb66c4372
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 20:25:24 2010 +0100

    Add Ryan Lucio to Authors

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit 934014998b0649fbcbd5f8a5f87f88597949da24
Merge: b3ea4ea 4f2a8c5
Author: Ryan Lucio <rlucio@internap.com>
Date:   Tue Dec 7 19:07:47 2010 +0000

    Addresses bug 677475 by changing the DB column for internal_id in the instances table to be unsigned.

commit d7ca22cce7df319efc57a2e8224016817c92bbdb
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 18:57:44 2010 +0000

    importing XenAPI module loaded late

 nova/virt/xenapi/vm_utils.py |    9 ++++++---
 nova/virt/xenapi/vmops.py    |    6 +++++-
 nova/virt/xenapi_conn.py     |    8 +++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

commit c1a40a8381ae3e559b3faad4a93ffec1abe8907f
Author: Eric Day <eday@oddments.org>
Date:   Tue Dec 7 10:06:49 2010 -0800

    Added docstring for get_instances.

 nova/compute/api.py |    3 +++
 1 file changed, 3 insertions(+)

commit c0fc8a5e9e72ecb780258d9cf41b32973620eb4c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 15:35:56 2010 +0000

    small fixes on Exception handling

 nova/virt/xenapi/vm_utils.py     |    2 +-
 nova/virt/xenapi/volume_utils.py |   10 +++++++---
 nova/virt/xenapi/volumeops.py    |    7 ++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

commit 31a1c59ec2aa45400ded83d228af54b433910b8d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 7 14:36:49 2010 +0000

    first test commit

 plugins/xenapi/etc/xapi.d/plugins/objectstore |    1 +
 1 file changed, 1 insertion(+)

commit 88777c09ad909c68da8d433800cae862e9bbff4a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 14:26:38 2010 +0000

    and yet another pylint fix

 nova/virt/xenapi/vm_utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e9597d1370211de15ca96f1fa52fcbe3c9166a7e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 14:15:22 2010 +0000

    fixed pylint violations that slipped out from a previous check

 nova/virt/xenapi/vm_utils.py |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

commit be723e39a6445f1c71210a0eb0bb853b068e6f69
Merge: 06c5205 09ebc4c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 13:48:35 2010 +0000

    * merged with lp:~armando-migliaccio/nova/xenapi-refactoring
    * fixed pylint score
    * complied with HACKING guidelines

commit 09ebc4c33ff52c352cdab54fea41d1b116a446f4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 11:31:43 2010 +0000

    addressed review comments, complied with HACKING guidelines

 nova/virt/xenapi/__init__.py |    8 --
 nova/virt/xenapi/novadeps.py |  170 ------------------------------------------
 nova/virt/xenapi/vm_utils.py |   36 ++++++---
 nova/virt/xenapi/vmops.py    |   42 +++++------
 nova/virt/xenapi_conn.py     |   38 +++++++---
 5 files changed, 71 insertions(+), 223 deletions(-)

commit 096a06c26ea64af36b38bbeb1c99e2eeaa48aec5
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Tue Dec 7 19:38:19 2010 +0900

    adding README.livemigration.txt

 README.livemigration.txt |  136 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

commit 2925ca3ac3010b9a65276ad2cfc8118679827da3
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Tue Dec 7 19:25:43 2010 +0900

    rev439ベースにライブマイグレーションの機能をマージ
    このバージョンはEBSなし、CPUフラグのチェックなし

 bin/nova-manage              |  122 ++++++++++++++++++++++++++++++++++++-
 nova/api/ec2/cloud.py        |   13 +++-
 nova/compute/api.py          |    3 +
 nova/compute/manager.py      |  138 ++++++++++++++++++++++++++++++++++++++++++
 nova/db/api.py               |   69 +++++++++++++++++++++
 nova/db/sqlalchemy/api.py    |  131 +++++++++++++++++++++++++++++++++++++++
 nova/db/sqlalchemy/models.py |   24 +++++++-
 nova/network/manager.py      |    7 +++
 nova/scheduler/manager.py    |  107 ++++++++++++++++++++++++++++++++
 nova/service.py              |   22 +++++++
 nova/utils.py                |   13 +++-
 nova/virt/libvirt_conn.py    |  101 +++++++++++++++++++++++++++++++
 setup.py                     |    5 +-
 13 files changed, 745 insertions(+), 10 deletions(-)

commit 88c0e3e380d50d5794970063bbe464171089f260
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 7 04:41:53 2010 +0000

    modified a few files

 nova/api/ec2/cloud.py |    1 -
 nova/compute/api.py   |   14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

commit 12f46626c4dd8a41a23c109e784a296ec702dd9a
Merge: 4203aa1 90ddeb5
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 6 13:29:52 2010 -0800

    Fixed conflicts with gundlach's fixes.

commit e1e4e639bf24dab49676f619fbb358c91cca3023
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 6 22:20:05 2010 +0100

    Remove dead test code.

 nova/tests/virt_unittest.py |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

commit cf21683d741165d2cf0798b7dc9968daa311fafc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 6 22:19:29 2010 +0100

    Add iptables based security groups implementation.

 nova/db/sqlalchemy/api.py   |   20 ++++++
 nova/network/linux_net.py   |    2 +
 nova/tests/virt_unittest.py |  121 ++++++++++++++++++++++++++++---
 nova/virt/libvirt_conn.py   |  165 +++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 290 insertions(+), 18 deletions(-)

commit 90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2
Merge: 98a0b25 76fd35b
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 6 12:56:53 2010 -0800

    Merged gundlach's fixes.

commit 76fd35b62bf565fe626ca30c412178894d8e579c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Dec 6 15:14:41 2010 -0500

    Don't wrap HTTPAccepted in a fault.  Correctly pass kwargs to update_instance.

 nova/api/openstack/servers.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c2e328a158cadf45df9fb07f0c3da91f11ad416e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 19:46:42 2010 +0000

    fixed import module in __init__.py

 nova/virt/xenapi/__init__.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 06c52051005f5e43a1f543e2d1c5922aa91c7918
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 19:29:00 2010 +0000

    minor changes to docstrings

 nova/virt/xenapi/novadeps.py |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit ee71c0accbb540bcb9d08cdcdc8b659f29a0edd6
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 19:06:32 2010 +0000

    added interim solution for target discovery. Now info can either be passed via flags or discovered via iscsiadm. Long term solution is to add a few more fields to the db in the iscsi_target table with the necessary info and modify the iscsi driver to set them

 nova/virt/xenapi/novadeps.py  |   89 ++++++++++++++++++++++++++++++++---------
 nova/virt/xenapi/volumeops.py |    2 +-
 2 files changed, 71 insertions(+), 20 deletions(-)

commit 7f6770f0802cdf0e73b789494ebdc8a57bf9cfad
Merge: e4cfd7f b4ac00d
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 16:56:27 2010 +0000

    merge with lp:~armando-migliaccio/nova/xenapi-refactoring

commit b4ac00dcbba9bd827177888f2790fb48e1432262
Merge: f25a25d b3ea4ea
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 16:15:04 2010 +0000

    merge trunk

commit f25a25d2693d603eb9a6f87d9629d53542219736
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 15:53:35 2010 +0000

    moved XenAPI namespace definition into xenapi/__init__.py

 nova/virt/xenapi/__init__.py |   11 +++++++++++
 nova/virt/xenapi/vm_utils.py |    1 +
 nova/virt/xenapi/vmops.py    |    1 +
 nova/virt/xenapi_conn.py     |    7 +------
 4 files changed, 14 insertions(+), 6 deletions(-)

commit 1637de18a86712c52d89441c154a8e9aae6fb503
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 12:42:34 2010 +0000

    pylint and pep8 fixes

 nova/virt/xenapi/network_utils.py |   13 +++++---
 nova/virt/xenapi/novadeps.py      |   59 +++++++++++++++++++++++++++----------
 nova/virt/xenapi/vm_utils.py      |   30 ++++++++++++-------
 nova/virt/xenapi/vmops.py         |   18 ++++++++---
 nova/virt/xenapi/volumeops.py     |    2 ++
 nova/virt/xenapi_conn.py          |   15 +++++++++-
 6 files changed, 101 insertions(+), 36 deletions(-)

commit 4f2a8c5398d4d4848f441e366e8bcc5e97a0b34f
Author: Ryan Lucio <rlucio@internap.com>
Date:   Fri Dec 3 13:50:30 2010 -0800

    Decreased the maximum value for instance-id generation from uint32 to int32 to avoid truncation when being entered into the instance table.  Reverted fix to make internal_id column a uint

 nova/db/sqlalchemy/api.py    |    2 +-
 nova/db/sqlalchemy/models.py |    3 +--
 nova/image/local.py          |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

commit 4203aa1060e5a97bed86d2e201c4c2443ef7e042
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 12:21:18 2010 -0800

    Finished cleaning up the openstack servers API, it no longer touches the database directly. Also cleaned up similar things in ec2 API and refactored a couple methods in nova.compute.api to accomodate this work.

 nova/api/ec2/cloud.py                    |   25 ++++----
 nova/api/openstack/servers.py            |   48 ++++++---------
 nova/auth/manager.py                     |    4 ++
 nova/compute/api.py                      |   96 ++++++++++++++----------------
 nova/db/sqlalchemy/api.py                |    1 +
 nova/flags.py                            |    2 +-
 nova/tests/api/openstack/fakes.py        |    3 +-
 nova/tests/api/openstack/test_servers.py |   10 ++--
 nova/tests/compute_unittest.py           |   24 +++-----
 9 files changed, 94 insertions(+), 119 deletions(-)

commit 98a0b2513489fc50e0687f75ef859293afff9a6f
Merge: 47b47bc b206273
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 09:37:40 2010 -0800

    Merged reboot-rescue into network-manager.

commit b2062735781b9e189e2dfa395a6976be9e04e1ee
Merge: 2657195 b3ea4ea
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 09:37:36 2010 -0800

    Merged trunk.

commit b3ea4eac33c160f574c36acda451294fc6d2bf87
Merge: 7eddff3 a8df0a7
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Dec 3 09:14:37 2010 +0000

    Fixes a missing step (nova-manage network create IP/nn n nn) in the single-node install guide

commit 7eddff3f890e5a9ce016f3feda2c254b12687032
Merge: 17280b1 111285b
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 08:05:28 2010 +0000

    Tired of seeing various test files in bzr stat.

commit 108bab90cb70798151b8e6a09d2176a3eb120380
Author: Ryan Lucio <rlucio@internap.com>
Date:   Thu Dec 2 17:01:44 2010 -0800

    Updated sqlalchemy model to make the internal_id column of the instances table as unsigned integer

 nova/db/sqlalchemy/models.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit da010f311c07ee31d7d00ceb48d0f8656f1825ca
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Dec 3 00:01:21 2010 +0000

    * Removes unused schema
    * Removes MUST uid from novaUser
    * Changes isAdmin to isNovaAdmin
    * Adds two new configuration options:
    ** ldap_user_id_attribute, with a default of uid
    ** ldap_user_name_attribute, with a default of cn
    * ldapdriver.py has been modified to use these changes
    
    Rationale:
    
    Removing uid from novaUser:
    
    Requiring uid makes the schema very posix specific. Other schemas don't use uid for identifiers at all. This
    change makes the schema more interoperable.
    
    Changing isAdmin to isNovaAdmin:
    
    This attribute is too generic. It doesn't describe what the user is an admin of, and in a pre-existing directory
    is out of place. This change is to make the attribute more specific to the software.
    
    Adding config options for id and name:
    
    This is another interoperability change. This change makes the driver more compatible with directories like AD,
    where sAMAccountName is used instead of uid. Also, some directory admins prefer to use displayName rather than
    CN for full names of users.

 nova/auth/ldapdriver.py               |   21 ++++++++++++---------
 nova/auth/nova_openldap.schema        |   26 +++-----------------------
 nova/auth/nova_sun.schema             |    6 ++----
 nova/auth/openssh-lpk_openldap.schema |   19 -------------------
 nova/auth/openssh-lpk_sun.schema      |   10 ----------
 5 files changed, 17 insertions(+), 65 deletions(-)

commit 47b47bc4ae34f90a6d1c59718b5ee759fb7c7327
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 15:26:14 2010 -0800

    Pushed terminate instance and network manager/topic methods into network.compute.api.

 nova/api/ec2/cloud.py                    |   65 ++---------------------
 nova/api/openstack/servers.py            |   26 +++-------
 nova/compute/api.py                      |   82 ++++++++++++++++++++++++++----
 nova/tests/api/openstack/test_servers.py |   13 +++++
 4 files changed, 98 insertions(+), 88 deletions(-)

commit 17280b197aa6e91a34cd8f22c282241106b10d0e
Merge: 15663b4 ad8577f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 22:09:38 2010 +0000

    Fix bugs that prevented OpenStack API from supporting server rename.

commit ad8577fdf07cc6ef8734962c93c85cb03afe23a7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 15:33:43 2010 -0600

    pep8

 nova/tests/api/openstack/test_servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8be00510243918a67558b60557e7261e4649e94e
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 14:17:41 2010 -0600

    Use newfangled compute_api

 nova/api/openstack/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 84b130f5fcc02964bc38423bb0153db9cc89e520
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 14:14:31 2010 -0600

    Update tests to use proper id

 nova/tests/api/openstack/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a8df0a7d6c2de55d7906fa311f79887ccf575508
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Dec 2 13:48:39 2010 -0600

    Fixing single node install doc

 doc/source/adminguide/multi.node.install.rst  |   13 +++++--------
 doc/source/adminguide/single.node.install.rst |   20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

commit 7bcbc2a6e1b907886e03e5254dcd0a726ccdcd9d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 13:29:37 2010 -0600

    Oops, update 'display_name', not 'name'.  And un-extract-method.

 nova/api/openstack/__init__.py |    2 ++
 nova/api/openstack/servers.py  |   20 +++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

commit 9d5e1b52f837047aac55d08a664a35be7cc5b8ef
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 12:58:13 2010 -0600

    Correctly translate instance ids to internal_ids in some spots we neglected.
    
    And do some pylint cleanup.

 nova/api/openstack/servers.py |   12 ++++++------
 nova/compute/manager.py       |   10 ++++------
 nova/virt/xenapi.py           |    2 --
 3 files changed, 10 insertions(+), 14 deletions(-)

commit 111285b9bcbee26e3f49b92dcc68355e251007a7
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 10:53:32 2010 -0800

    Added test files to be ignored.

 .bzrignore |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 15663b4d4686a6c42810e86940d5b7e27b207d26
Merge: 644699a 325e84d
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 18:35:36 2010 +0000

    Consolidated the start instance logic in the two API classes into a single method. This also cleans up a number of small discrepencies between the two.

commit 26571952bb8f1015b11d6b9514d232ad8a20d837
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 10:21:43 2010 -0800

    Moved reboot/rescue methods into nova.compute.api.

 nova/api/cloud.py             |   58 -----------------------------------------
 nova/api/ec2/cloud.py         |    7 +++--
 nova/api/openstack/servers.py |    3 +--
 nova/compute/api.py           |   27 +++++++++++++++++++
 4 files changed, 31 insertions(+), 64 deletions(-)

commit 325e84d4734d381da4a4bef166ec228aa1a4b0a8
Merge: 1bcc4da 644699a
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 09:34:52 2010 -0800

    Merged trunk and resolved conflicts. Again.

commit 644699a21a65dc15d21ea23f46a10f730d317791
Merge: f8afbcc 3af6da1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 17:24:40 2010 +0000

    Instances are assigned a display_name if one is not passed in -- and now, they're assigned a display_name even if None is explicitly passed in (as the EC2 API does.)
    
    And this time I gave in and wrote a test rather than relying on my super-awesome 'test-by-code-review' approach.

commit 1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2
Merge: 6956057 f8afbcc
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 08:47:25 2010 -0800

    Merged trunk and resolved conflicts.

commit 3af6da1fa5a38c8238ea45a7b03a6e3fbb78fe5b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 10:08:56 2010 -0600

    Default Instance.display_name to a value even when None is explicitly passed in.

 nova/compute/manager.py        |    2 +-
 nova/tests/compute_unittest.py |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

commit 16c440c5b598dab51ce4bd37c48f02f3da87c092
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Dec 2 16:21:31 2010 +0100

    Refactor nwfilter code somewhat. For iptables based firewalls, I still want to leave it to nwfilter to protect against arp, mac, and ip spoofing, so it needed a bit of a split.

 nova/tests/virt_unittest.py |    8 ++-
 nova/virt/libvirt_conn.py   |  157 +++++++++++++++++++++++++++++--------------
 2 files changed, 112 insertions(+), 53 deletions(-)

commit 1e050bb4a8eeb65a7ac25a9fb90493567b5b07f4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Dec 2 15:18:45 2010 +0100

    Add a helpful error message to nova-manage in case of NoMoreNetworks.
    
    This is one of the most common problems people have, and the solution
    is not currently easily discoverable. This should address that.

 bin/nova-manage |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit e4cfd7f3fe7d3c50d65c61abf21bf998fde85147
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 14:09:23 2010 +0000

    minor refactoring after merge

 nova/virt/xenapi/novadeps.py |   28 ++++++++++++++++++++--------
 nova/virt/xenapi_conn.py     |    5 ++++-
 2 files changed, 24 insertions(+), 9 deletions(-)

commit c1331f5a2e81aadc6c8633b5b09105a974bb774c
Merge: f26489e d9472da
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 13:27:36 2010 +0000

    merge lp:~armando-migliaccio/nova/refactoring

commit d9472dabe9f7f5c7993f23d4873fa9d3bec3e111
Merge: b684bc2 f8afbcc
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:56:47 2010 +0000

    merge trunk

commit b684bc26fc7c7f41cf90e0294af35b2bda243733
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:36:05 2010 +0000

    typo fix

 nova/virt/xenapi_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd44f9d2ec1d101960642a68d45bffc9c37f0d7f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:13:56 2010 +0000

    moved flags into xenapi/novadeps.py

 nova/virt/xenapi/novadeps.py |   40 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi_conn.py     |   31 ++++++-------------------------
 2 files changed, 46 insertions(+), 25 deletions(-)

commit e75b8f9bb05bc539500b88ebba7a98903bec0ba9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Dec 2 11:40:44 2010 +0100

    Add a simple abstraction for firewalls.
    
    Some might say I should have done this from the start. They'd be absolutely correct.

 nova/virt/libvirt_conn.py |   47 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

commit 3a96066987e42382e1ed75735473971ea90a76a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 1 22:43:46 2010 +0000

    fix nova.sh to reflect new location of ppa

 contrib/nova.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 364b4204ba9e4d04b0d0293a9c5fd62320ae3a63
Author: Rick Clark <rick@openstack.org>
Date:   Wed Dec 1 16:23:34 2010 -0600

    Changed null_kernel flag from aki-00000000 to nokernel

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8afbcc08b65d4d6764a6dc66c804816573ab3b4
Merge: 225fd37 8af2b1c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 22:14:29 2010 +0000

    Guarantee that the OpenStack API's Server-related responses will always contain a "name" value.  And get rid of a redundant field in models.py.

commit 8af2b1c97903f11034a95894a23bb7e77f573aa6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 16:04:04 2010 -0600

    Going for a record commits per line changes ratio

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f53f5880c08994d04a552a41ce6f88dfbd867946
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 15:53:27 2010 -0600

    Oops, internal_id isn't available until after a save.  This code saves twice; if I moved it into the DB layer we could do it in one save.  However, we're moving to one sqlite db per compute worker, so I'd rather have two saves in order to keep the logic in the right layer.

 nova/compute/manager.py   |    8 ++++++--
 nova/db/sqlalchemy/api.py |    6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

commit fdf0aa30a1127eb8311a599dfdad9653ac699154
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 14:55:42 2010 -0600

    Todd points out that the API doesn't require a display_name, so let's make a default.  That way the OpenStack API can rest assured that its server responses will always have a name key.

 nova/compute/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 225fd37fb234740c814410b3e4d3149212cf54c5
Merge: 687cfac d6a74a2
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Dec 1 20:44:43 2010 +0000

    Adds in more documentation contributions from Citrix.

commit 93c7bbf98f0396718724cbf1d4d2f3953078776c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 14:18:24 2010 -0600

    Remove duplicate field and make OpenStack API return server.name for EC2-API-created instances

 nova/api/openstack/servers.py            |    5 ++---
 nova/db/sqlalchemy/models.py             |    3 +--
 nova/tests/api/openstack/test_servers.py |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

commit 687cfacc3fd8e53171dd215161c8776a5a001c50
Merge: 3e1fc4c 9117146
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 1 20:16:21 2010 +0000

    Move cc_host and cc_port flags into nova/network/linux_net.py. They
    weren't used anywhere else.
    
    Make cc_host default to nova.utils.get_my_ip() instead of 127.0.0.1.
    cc_host is used to set up forwarding to the meta-data service, and the
    kernel doesn't allow routing to a loopback device, so 127.0.0.1 is a
    poor default.

commit 3e1fc4c5bdf4119971ccc7f77f62ed5bfcd7d606
Merge: fefa0f1 a7fe9d8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 1 19:09:55 2010 +0000

    Add include_package_data=True to setup.py.
    
    This makes sure the various templates get installed into the python path when running "python setup.py install".

commit fefa0f13434ec6a8162fc985ba45a51591f3b114
Merge: 5269e68 6e6b532
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 17:59:35 2010 +0000

    With utils.default_flagfile() in its old location, the flagfile isn't being read -- twistd.serve() loads flags earlier than that point.  Move the utils.default_flagfile() call earlier so the flagfile is included.

commit 6e6b5325bfc5233b243ed9f8279694136d605ddf
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 11:43:20 2010 -0600

    Removed a blank line.

 bin/nova-compute |    1 -
 1 file changed, 1 deletion(-)

commit 6956057ac490c788cb94fbfd0af7fe6e91a7ca96
Author: Eric Day <eday@oddments.org>
Date:   Wed Dec 1 09:24:39 2010 -0800

    Broke parts of compute manager out into compute.api to separate what gets run on the API side vs the worker side.

 nova/api/ec2/cloud.py          |   15 +--
 nova/api/openstack/servers.py  |    5 +-
 nova/compute/api.py            |  207 ++++++++++++++++++++++++++++++++++++++++
 nova/compute/manager.py        |  169 --------------------------------
 nova/db/base.py                |   36 +++++++
 nova/manager.py                |   10 +-
 nova/tests/compute_unittest.py |    8 +-
 7 files changed, 262 insertions(+), 188 deletions(-)

commit 11dddd7ca4f4264ef3a8f1e251601c1d8fd7a626
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 10:44:51 2010 -0600

    Move default_flagfile() call to where it will be parsed in time to load the flagfile

 bin/nova-compute         |    3 ++-
 bin/nova-instancemonitor |    2 +-
 bin/nova-network         |    2 +-
 bin/nova-objectstore     |    2 +-
 bin/nova-scheduler       |    2 +-
 bin/nova-volume          |    2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

commit f26489ef1ad2a7df0e9f72a8c9ad4f2e3a65ae57
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 1 12:02:02 2010 +0000

    minor refactoring

 nova/virt/xenapi/novadeps.py     |   82 ++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/volume_utils.py |   77 -----------------------------------
 nova/virt/xenapi/volumeops.py    |    6 ++-
 3 files changed, 86 insertions(+), 79 deletions(-)

commit 9117146ad8b09ccd428f36efde795f8c9b989a19
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 1 11:50:25 2010 +0100

    Move cc_host and cc_port flags into nova/network/linux_net.py. They weren't used anywhere else.
    
    Make cc_host default to nova.utils.get_my_ip() instead of 127.0.0.1. cc_host is used to set up forwarding to the meta-data service, and the kernel doesn't allow routing to a loopback device, so 127.0.0.1 is a poor default.

 nova/flags.py             |    2 --
 nova/network/linux_net.py |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

commit aaee43a74264d5e6a4ccf638f882b19d477c3c9f
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 23:12:19 2010 +0000

    Added a script to use OpenDJ as an LDAP server instead of OpenLDAP. Also modified nova.sh to add an USE_OPENDJ option, that will be checked when USE_LDAP is set.

 contrib/nova.sh     |   10 ++++-
 nova/auth/opendj.sh |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)

commit 89dbaf4f2607666914440f0eaec440659ed925d3
Merge: 7d462fd 2cf46f1
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 22:34:25 2010 +0000

    Merge from trunk

commit 2cf46f1fb4384c476a6d3b31e71c266a67a4afd2
Merge: 7d462fd 5269e68
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 22:34:01 2010 +0000

    Merge from trunk

commit ffa41022463c23a67dda2a6de74b6d5203cb37ac
Author: Rick Clark <rick@openstack.org>
Date:   Tue Nov 30 16:09:31 2010 -0600

    Fixed termie's tiny bits from the prior merge request

 nova/compute/disk.py |    4 ++--
 nova/flags.py        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 5269e689046276093b59c5a55ab9ecd3b3ed01b1
Merge: c0989a2 9edcc38
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 21:04:54 2010 +0000

    Delete unused flag in nova.sh.

commit c0989a26bae2644e274db4010ff9ff297e6dc195
Merge: 29ffb1d 725a1f6
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 20:59:52 2010 +0000

    Moving the openldap schema out of nova.sh into it's own files, and adding sun (opends/opendj/sun directory server/fedora ds) schema files

commit 9edcc382299e312d51b45235b02800716f52a8e8
Merge: 0aa072c 29ffb1d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 14:56:40 2010 -0500

    Merge from trunk

commit 29ffb1d27b32e9b71fc436a142e0c4601251c398
Merge: 2d8c152 84fdd48
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 19:09:38 2010 +0000

    OpenStack API returns the wrong x-server-management-url.  Fix that.
    
    Fixes https://bugs.launchpad.net/nova/+bug/680709 .

commit 4b74a1b243d87d53e660029728d12a9c067deeac
Author: Rick Clark <rick@openstack.org>
Date:   Tue Nov 30 13:08:39 2010 -0600

    Cleaned up pep8 errors

 nova/api/ec2/cloud.py     |    2 +-
 nova/compute/disk.py      |    6 +++---
 nova/virt/libvirt_conn.py |   13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

commit bf050bf0090c972a32b57ef7724c73627fcd04c7
Merge: 40de074 689a06f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 30 19:08:06 2010 +0000

    brought latest changes from trunk

commit 40de074f44059f89caa15420a7174f63c76eec48
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 30 19:03:13 2010 +0000

    iscsi volumes attach/detach complete. There is only one minor issue on how to discover targets from device_path

 nova/virt/xenapi/vm_utils.py     |   38 +++++++
 nova/virt/xenapi/volume_utils.py |  210 ++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/volumeops.py    |   93 ++++++++++++-----
 3 files changed, 313 insertions(+), 28 deletions(-)

commit 84fdd48fe2db20661f076884810f0c726630452f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 13:52:46 2010 -0500

    Fix unit tests

 nova/api/openstack/auth.py            |    5 +----
 nova/tests/api/openstack/fakes.py     |    1 -
 nova/tests/api/openstack/test_auth.py |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

commit 2d8c15257b6860d107c24a2a7321d713f709d066
Merge: 689a06f 6d097a2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 30 18:24:49 2010 +0000

    Fix DescribeImages EC2 API call.
    
    Reluctantly not including unit tests. I've filed bug #682888 about it. I think this is important enough to get fixed that we can defer the tests for a few days.

commit 8e4a19495527613ab288e56bb241048f3d410e0c
Merge: 689a06f 98623a1
Author: Rick Clark <rick@openstack.org>
Date:   Tue Nov 30 11:52:43 2010 -0600

    merged Justin Santa Barbara's raw-disk-image back into the latest trunk

commit 0aa072ca6773c7759bb1b1bf16fbd1b88eb7fdbc
Merge: e82afc9 689a06f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 10:58:21 2010 -0500

    Merge from trizzunk

commit 41b3faf113d7591e61b03678dc13cd9ef031efbb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 10:40:17 2010 -0500

    If only I weren't so lazy.

 nova/tests/api/openstack/test_auth.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d097a220846c54cb11b4a0e480f282e50db6058
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 30 09:19:32 2010 +0100

    Rename imageSet variable to images.

 nova/api/ec2/cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e82afc902020d7bf7bc60141a629287599d8796a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 29 17:38:51 2010 -0600

    remove FAKE_subdomain reference

 contrib/nova.sh |    1 -
 1 file changed, 1 deletion(-)

commit 8ee658e7f6da2484377bec7652f37df7259f9e8a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 29 17:26:05 2010 -0600

    Return the correct server_management_url

 nova/api/openstack/auth.py |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit 689a06fdd47c84271512ec2913f2216b5fc1b341
Merge: 4112e43 2cc4922
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 29 22:39:43 2010 +0000

    Default flagfile moved in trunk recently.  This updates nova.sh to run properly with the new flagfile location.

commit e6dde30724ac47f6abeb5eaa56a68fb9ac166397
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 23:04:54 2010 +0100

    Correctly handle imageId list passed to DescribeImages API call.

 nova/api/ec2/cloud.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 2cc492240fab447a62e7ca3ea1c16744baad9256
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 29 21:23:21 2010 +0000

    update of nova.sh because default flagfile moved

 contrib/nova.sh |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 6d472828a0e88678f873a6abf267acf04f4ab8ee
Merge: f74094c 4112e43
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 29 21:19:31 2010 +0000

    merged trunk

commit 4112e432c6a7b0e82bfc72fac0ceae8eca8bba49
Merge: 50db779 03deb0d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 21:19:16 2010 +0000

    Add a templating mechanism in the flag parsing.
    
    Add a state_path flag that will be used as the top-level dir for all other state (such as images, instances, buckets, networks, etc).
    This way you only need to change one flag to put all your state in e.g. /var/lib/nova. This simplifies packaging quite a bit.

commit 03deb0dde48a0b9c7c6c52689ecf8a70e1fa7b7e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 22:01:19 2010 +0100

    Adjust state_path default setting so that api unit tests find things where they used to find them.

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 28927f0c9688dd7f3c84a1eda4cc646a1aff7896
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 21:05:40 2010 +0100

    Import string instead of importing Template from string. This is how we do things.

 nova/flags.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 004704f0fec2280f75ec0cf9757008228b01410d
Merge: 04b1740 a82581c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 17:37:34 2010 +0000

    brought the xenapi refactoring in plus trunk changes

commit 04b1740c991d6d499364c21c2524c46ed5fc2522
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 17:26:44 2010 +0000

    changes

 nova/virt/xenapi.py |   93 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 25 deletions(-)

commit a82581cbada92d0e274438757f7beb3ed335da1b
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 16:31:31 2010 +0000

    pep8 fixes and further round of refactoring

 nova/virt/connection.py           |    4 +-
 nova/virt/xapi/__init__.py        |   15 ---
 nova/virt/xapi/network_utils.py   |   40 -------
 nova/virt/xapi/novadeps.py        |  100 ----------------
 nova/virt/xapi/vm_utils.py        |  190 -------------------------------
 nova/virt/xapi/vmops.py           |  123 --------------------
 nova/virt/xapi/volumeops.py       |   30 -----
 nova/virt/xenapi.py               |  228 -------------------------------------
 nova/virt/xenapi/__init__.py      |   15 +++
 nova/virt/xenapi/network_utils.py |   40 +++++++
 nova/virt/xenapi/novadeps.py      |  103 +++++++++++++++++
 nova/virt/xenapi/vm_utils.py      |  190 +++++++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py         |  123 ++++++++++++++++++++
 nova/virt/xenapi/volumeops.py     |   30 +++++
 nova/virt/xenapi_conn.py          |  227 ++++++++++++++++++++++++++++++++++++
 15 files changed, 730 insertions(+), 728 deletions(-)

commit 50db779e891244d5de9c4c67c8758c2d440aac16
Merge: 4f92d1d a19d0e2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 29 16:29:43 2010 +0000

    Rename cloudServersFault to computeFault -- I missed this Rackspace branding when we renamed nova.api.rackspace to nova.api.openstack.

commit c8f6db354f5e8f55b432854d5259dcf84f0c8ba0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 15:49:12 2010 +0100

    Make sure templated flags work across calls to ParseNewFlags.
    
    ParseNewFlags creates a new FlagValues object, which doesn't have all the previously defined flags, so template lookups fail miserably. Pass the existing FlagValues object too the template mapping object to fix this.

 nova/flags.py |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

commit a7fe9d8cbc4bb6b2ca4306c0adff46edcb2fce6f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 14:02:03 2010 +0100

    Add include_package_data=True to setup.py.
    
    This makes sure the various templates get installed into the python path when running "python setup.py install".

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit 9e34c9c7dc88d9e361c7f2d05e06b53ff68ee53f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 12:52:03 2010 +0000

    fixed deps

 nova/virt/xapi/__init__.py        |   15 +++
 nova/virt/xapi/network_utils.py   |   40 ++++++++
 nova/virt/xapi/novadeps.py        |  100 +++++++++++++++++++
 nova/virt/xapi/vm_utils.py        |  190 ++++++++++++++++++++++++++++++++++++
 nova/virt/xapi/vmops.py           |  123 ++++++++++++++++++++++++
 nova/virt/xapi/volumeops.py       |   30 ++++++
 nova/virt/xenapi.py               |   11 ++-
 nova/virt/xenapi/network_utils.py |   42 --------
 nova/virt/xenapi/novadeps.py      |   97 -------------------
 nova/virt/xenapi/vm_utils.py      |  192 -------------------------------------
 nova/virt/xenapi/vmops.py         |  122 -----------------------
 nova/virt/xenapi/volumeops.py     |   30 ------
 12 files changed, 505 insertions(+), 487 deletions(-)

commit c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f
Merge: b65b41e 4f92d1d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 13:14:26 2010 +0100

    Merge trunk.

commit 9d26ad69bfeb88106a08f0f3f1e15ed621c18af2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 10:25:52 2010 +0000

    first cut of the refactoring of the XenAPIConnection class. Currently the class merged both the code for managing the XenAPI connection and the business logic for implementing Nova operations. If left like this, it would eventually become difficult to read, maintain and extend. The file was getting kind of big and cluttered, so a quick refactoring now will save a lot of headaches later

 nova/virt/xenapi/network_utils.py |   10 ----------
 nova/virt/xenapi/vm_utils.py      |    2 +-
 nova/virt/xenapi/vmops.py         |    1 -
 nova/virt/xenapi/volumeops.py     |    5 -----
 4 files changed, 1 insertion(+), 17 deletions(-)

commit c10a6f3e97a5871ac0cdce97bde89b3cee59d336
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sun Nov 28 15:12:37 2010 +0000

    other round of refactoring

 nova/virt/xenapi/novadeps.py    |   97 +++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi/power_state.py |   25 ----------
 nova/virt/xenapi/vm_utils.py    |   32 ++++---------
 nova/virt/xenapi/vmops.py       |   43 ++++++++---------
 nova/virt/xenapi/volumeops.py   |   35 ++++++++++++++
 5 files changed, 161 insertions(+), 71 deletions(-)

commit b6bed02342ac716b3cb3847fb54b5f285995f3b7
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sun Nov 28 01:49:28 2010 +0000

    further refactoring

 nova/virt/xenapi.py               |   15 +-
 nova/virt/xenapi/network_utils.py |   52 +++++
 nova/virt/xenapi/vm_utils.py      |  206 +++++++++++++++++
 nova/virt/xenapi/vmops.py         |  126 +++++++++++
 nova/virt/xenapi/xenapi.py        |  439 -------------------------------------
 5 files changed, 391 insertions(+), 447 deletions(-)

commit 541f8ce212a33d14ac5ba48b3dde6c43a60bc368
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Nov 27 13:33:38 2010 +0000

    typos and pep8 fixes

 nova/virt/xenapi.py             |   35 ++++++++++++++++++++---------------
 nova/virt/xenapi/power_state.py |    1 -
 2 files changed, 20 insertions(+), 16 deletions(-)

commit a44ee54dfe3f243a44636e9224082e86fdee452f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Nov 27 12:56:19 2010 +0000

    first cut of the refactoring of the XenAPIConnection class. Currently the class merged both the code for managing the XenAPI connection and the business logic for implementing Nova operations. If left like this, it would  eventually become difficult to read, maintain and extend. The file was getting kind of big and cluttered, so a quick refactoring now will save a lot of headaches later.

 nova/virt/xenapi.py             |  323 +++++-----------------------
 nova/virt/xenapi/power_state.py |   26 +++
 nova/virt/xenapi/xenapi.py      |  439 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 515 insertions(+), 273 deletions(-)

commit 8a7e6e0f003e1b3837b918ac9af1564ac1665aae
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Nov 26 17:59:48 2010 +0000

    PEP fixes

 nova/auth/ldapdriver.py |   72 +++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

commit c3072aea3dc5d44d26fcac5c7db65b8cc445fccc
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Nov 26 17:04:27 2010 +0000

    Adding support for modification only of user accounts.

 nova/auth/ldapdriver.py |  110 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 84 insertions(+), 26 deletions(-)

commit 725a1f638b01985a2ae9a4f0a68f16ef31914a51
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Nov 26 17:01:50 2010 +0000

    This modification should have occured in a different branch. Reverting.

 nova/auth/ldapdriver.py |  110 +++++++++++------------------------------------
 1 file changed, 26 insertions(+), 84 deletions(-)

commit a9b900d24020b68284e402a98ee28c107de0bd71
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 20:42:22 2010 +0000

    added attach_volume implementation

 nova/virt/xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 688d564668aefa4b644236421a3a45fc90486634
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 20:31:32 2010 +0000

    work on attach_volume, with a few things to iron out

 nova/virt/xenapi.py |   99 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 83 insertions(+), 16 deletions(-)

commit 4f92d1d39fcfda4dad73e6e0339351f0d7d00d61
Merge: 07ee963 d62d3f7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Nov 25 15:24:21 2010 +0000

    A few more changes:
     * Fixed up some flags
     * Put in an updated nova.sh
     * Broke out metadata forwarding so it will work in flatdhcp mode
     * Added descriptive docstrings explaining the networking modes in more detail
    
    Original Message:
    
    FlatDHCPManager wasn't quite working.  This makes it work again.  I discovered that automatically bridging into eth0 without a vlan is very dangerous.  If eth0 has an ip that you are using for ssh, you lose your connectivity.  For that reason, I set bridge_dev to None by default.  This unfortunately means that you have to specify a bridge_dev for VlanManager to actually work.

commit 71c358e69c80cbeb349db94be20a4c8cf2222276
Merge: 9f722a0 07ee963
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 10:46:58 2010 +0000

    small conflict resolution

commit 9f722a0bcdb987c228f4ebf1e42c904a26d0ef73
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 10:42:06 2010 +0000

    first cut of changes for the attach_volume call

 nova/virt/xenapi.py |   94 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 87 insertions(+), 7 deletions(-)

commit 7d771bf9c549499c0a138ea991da5df537e0dd88
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 24 15:16:23 2010 -0800

    The image server should throw not found errors, don't need to check in compute manager.

 nova/compute/manager.py |    2 --
 1 file changed, 2 deletions(-)

commit 1188dd95fbfef144ca71a3c9df2f7dbdb665c97f
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 24 14:52:10 2010 -0800

    Consolidated the start instance logic in the two API classes into a single method. This also cleans up a number of small discrepencies between the two.

 nova/api/ec2/cloud.py                    |  174 +++++-------------------------
 nova/api/openstack/servers.py            |   96 +++--------------
 nova/compute/instance_types.py           |   20 ++++
 nova/compute/manager.py                  |  130 ++++++++++++++++++++++
 nova/quota.py                            |    5 +
 nova/tests/api/openstack/fakes.py        |    2 +-
 nova/tests/api/openstack/test_servers.py |    6 ++
 nova/tests/quota_unittest.py             |   16 +--
 8 files changed, 211 insertions(+), 238 deletions(-)

commit d7515bcb1d35e2e558a01c381b1d3a22165daa4b
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 22:34:52 2010 +0000

    Setting "name" back to "cn", since id and name should be separate

 nova/auth/ldapdriver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 309c8b8ff8732e8d80c445381aee7e1f9852def6
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 22:10:21 2010 +0000

    Adding support for modification only of user accounts.

 nova/auth/ldapdriver.py |  110 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 84 insertions(+), 26 deletions(-)

commit f74094cd303b21c12e8a83790d405bcae8103be8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 24 21:40:41 2010 +0000

    don't error on edge case where vpn has been launched but fails to get a network

 bin/nova-manage |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 07ee9639a105a58b8b212fff607f4e0639d411da
Merge: 6e349f6 9819273
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 19:09:42 2010 +0000

    Make sure all workers look for their flagfile in the same spot.
    
    Stop nova-manage from using /etc/nova/nova-manage.conf as its default
    flagfile. This made made development awkward since everything but
    nova-manage would use defaults for everything, but nova-manage would use
    whatever config was in /etc/nova/nova-manage.conf which was likely put
    there by a package of some sort.
    
    This way, we can leave it to the packagers to set this default to
    something else.

commit 6416210aae86d41a2f0175ce3715bafa8313f8fb
Merge: 7869876 7d462fd
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 15:46:32 2010 +0000

    Merge from trunk

commit 7d462fd04cf799689bcbea0b926f0bd38e64869c
Merge: ebffd9c 6e349f6
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 15:46:22 2010 +0000

    Merge from main branch

commit 6e349f6ea1846c104f620aa68a26cfc753e8977d
Merge: d68ec8e d3be61f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 14:39:21 2010 +0000

    Fix typo "nova.util" -> "nova.utils".

commit d3be61f2548758fedcaa77e74bfd779d941966a6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 15:14:55 2010 +0100

    Fix typo "nova.util" -> "nova.utils"

 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d68ec8e791cbc5cf5f532e61930585783d59b3af
Merge: 49a4921 2aa1fb1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 14:14:24 2010 +0000

    Added a .mailmap that maps addresses in bzr to people's real, preferred
    e-mail addresses. (I made a few guesses along the way, feel free to
    adjust according to what is actually the preferred e-mail)
    
    Added a couple of methods to nova.utils to parse said .mailmap and do
    the appropriate (though highly naïve) replacement.
    
    Apply mailmap replacement in changelog generation in setup.py.
    
    Add a unit test that checks everyone is properly listed in Authors.
    
    Add missing people to Authors.

commit 49a49211562bc609c13ff15287281ed4a607355a
Merge: 645df81 3779635
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 13:59:25 2010 +0000

    Add a placeholder in doc/build. Although bzr handles empty directories
    just fine, setuptools does not, so to actually ship this directory in
    the tarball, we need a file in it.

commit 3779635945df10669fdf28358e39ae8c74eace00
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 10:09:18 2010 +0100

    Add a placeholder in doc/build. Although bzr handles empty directories
    just fine, setuptools does not, so to actually ship this directory in
    the tarball, we need a file in it.

 0 files changed

commit 07597ee0d597892ebb5496d7418be77454c8eed4
Merge: b91e18d 645df81
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 10:08:57 2010 +0100

    Merged trunk.

commit d62d3f7bcf06802662f77f8013c9da99eccec0a7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 24 00:16:47 2010 +0000

    pep8

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit f67a2bfd59af8af0f3e688007078f32901c3eb97
Merge: 521dd52 645df81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:58:26 2010 +0000

    merged trunk, added recent nova.sh

commit 521dd52e49feeae04108f3e21480f42456b4e4c7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:56:26 2010 +0000

    fix typos in docstring

 nova/network/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 84521218b84d2eed307364c9efc9f6f2ee212aac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:18:02 2010 +0000

    docstrings, more flags, breakout of metadata forwarding

 nova/network/linux_net.py |   10 +++----
 nova/network/manager.py   |   67 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 65 insertions(+), 12 deletions(-)

commit 645df81dd0bf03b8d014a437b60726de222c66c8
Merge: b91e18d b763764
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 23:14:31 2010 +0000

    doc/build was recently accidentally removed from VCS. This adds it back, which makes the docs build again.

commit b7637641251d5d7b494c06c238ab708d828368e8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 23:02:57 2010 +0100

    Add doc/build dir back to bzr.

commit b91e18d3b4e8c174a0fcc10c1d8885c3f99eb6f3
Merge: c4f0f35 513e4eb
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 21:59:30 2010 +0000

    Make aws_access_key_id and aws_secret_access_key configurable.

commit a7a24e2ac54b88ba09afe5966806f42181784e9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 21:48:32 2010 +0000

    add vpn ping and optimize vpn list

 bin/nova-manage           |   27 +++++++++-----------------
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |   12 ++++++++++++
 nova/utils.py             |   46 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 18 deletions(-)

commit 2aa1fb1c7994d07a335e31121ae0b98db0a90667
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 22:34:53 2010 +0100

    Add an alias for Armando.

 .mailmap |    1 +
 1 file changed, 1 insertion(+)

commit 7b26772ba74e52d4d2b9f4aa6e5f67d0f270cc29
Merge: 3df7b85 c81064a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 22:33:22 2010 +0100

    Merge trunk

commit 1638e71c4442187a315f44840453ad14cafb36ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 21:16:25 2010 +0000

    the serial returned by x509 is already formatted in hex

 nova/crypto.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit c4f0f35ca15a6c549f06c09d3d1238a89c233795
Merge: c81064a 8cd5381
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Nov 23 21:09:42 2010 +0000

    Adding developer documentation - setting up dev environment and how to add to the OpenStack API

commit c81064a96063dee98f582af9487d7def79383194
Merge: 9d6a1be edd7e3e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 20:59:53 2010 +0000

    Add a --logdir flag that will be prepended to the logfile setting. This makes it easier to share a flagfile between multiple workers while still having separate log files.

commit 3df7b85265b123080387f1a844e067026410a9bc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 21:58:46 2010 +0100

    Address pep8 complaints.

 nova/utils.py |    2 ++
 1 file changed, 2 insertions(+)

commit edd7e3ed3bee6c11156569ab13b4eb5b3a1f7152
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 21:52:00 2010 +0100

    Address PEP8 complaints.

 nova/server.py |    3 ++-
 nova/twistd.py |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 9d6a1beecb3c4bdd87b68da92648a5e094d504d4
Merge: a81547f 9c57e5c
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 19:09:36 2010 +0000

    Remove FAKE_subdomain from docs.

commit 8cd5381c528de6819e2d4b9c112bd3df9529e8f3
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Nov 23 12:58:08 2010 -0600

    Adding more polish

 doc/source/devref/development.environment.rst |   69 ++++++++++++-------------
 1 file changed, 33 insertions(+), 36 deletions(-)

commit 1bf3c29df39a6c0f4a82cceb2ea698081a7e3274
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Nov 23 12:49:28 2010 -0600

    Adding developer howtos

 doc/build/doctrees/adminguide/binaries.doctree     |  Bin 11915 -> 0 bytes
 .../doctrees/adminguide/distros/others.doctree     |  Bin 13777 -> 0 bytes
 .../adminguide/distros/ubuntu.10.04.doctree        |  Bin 8787 -> 0 bytes
 .../adminguide/distros/ubuntu.10.10.doctree        |  Bin 9906 -> 0 bytes
 doc/build/doctrees/adminguide/euca2ools.doctree    |  Bin 15156 -> 0 bytes
 doc/build/doctrees/adminguide/flags.doctree        |  Bin 4917 -> 0 bytes
 .../doctrees/adminguide/getting.started.doctree    |  Bin 37699 -> 0 bytes
 doc/build/doctrees/adminguide/index.doctree        |  Bin 16133 -> 0 bytes
 .../doctrees/adminguide/managing.images.doctree    |  Bin 4991 -> 0 bytes
 .../doctrees/adminguide/managing.instances.doctree |  Bin 8530 -> 0 bytes
 .../doctrees/adminguide/managing.networks.doctree  |  Bin 23566 -> 0 bytes
 .../doctrees/adminguide/managing.projects.doctree  |  Bin 24817 -> 0 bytes
 .../doctrees/adminguide/managing.users.doctree     |  Bin 34523 -> 0 bytes
 .../doctrees/adminguide/managingsecurity.doctree   |  Bin 7476 -> 0 bytes
 doc/build/doctrees/adminguide/monitoring.doctree   |  Bin 5600 -> 0 bytes
 .../doctrees/adminguide/multi.node.install.doctree |  Bin 49860 -> 0 bytes
 doc/build/doctrees/adminguide/network.flat.doctree |  Bin 12519 -> 0 bytes
 doc/build/doctrees/adminguide/network.vlan.doctree |  Bin 43599 -> 0 bytes
 doc/build/doctrees/adminguide/nova.manage.doctree  |  Bin 40316 -> 0 bytes
 .../adminguide/single.node.install.doctree         |  Bin 41777 -> 0 bytes
 doc/build/doctrees/api/autoindex.doctree           |  Bin 6648 -> 0 bytes
 doc/build/doctrees/api/nova..adminclient.doctree   |  Bin 3469 -> 0 bytes
 doc/build/doctrees/api/nova..api.cloud.doctree     |  Bin 3449 -> 0 bytes
 doc/build/doctrees/api/nova..api.ec2.admin.doctree |  Bin 3489 -> 0 bytes
 .../doctrees/api/nova..api.ec2.apirequest.doctree  |  Bin 3539 -> 0 bytes
 doc/build/doctrees/api/nova..api.ec2.cloud.doctree |  Bin 3489 -> 0 bytes
 .../doctrees/api/nova..api.ec2.images.doctree      |  Bin 3499 -> 0 bytes
 .../nova..api.ec2.metadatarequesthandler.doctree   |  Bin 3659 -> 0 bytes
 .../doctrees/api/nova..api.openstack.auth.doctree  |  Bin 3539 -> 0 bytes
 .../nova..api.openstack.backup_schedules.doctree   |  Bin 3659 -> 0 bytes
 .../api/nova..api.openstack.faults.doctree         |  Bin 3559 -> 0 bytes
 .../api/nova..api.openstack.flavors.doctree        |  Bin 3569 -> 0 bytes
 .../api/nova..api.openstack.images.doctree         |  Bin 3559 -> 0 bytes
 .../api/nova..api.openstack.servers.doctree        |  Bin 3569 -> 0 bytes
 .../api/nova..api.openstack.sharedipgroups.doctree |  Bin 3639 -> 0 bytes
 doc/build/doctrees/api/nova..auth.dbdriver.doctree |  Bin 3489 -> 0 bytes
 doc/build/doctrees/api/nova..auth.fakeldap.doctree |  Bin 3489 -> 0 bytes
 .../doctrees/api/nova..auth.ldapdriver.doctree     |  Bin 3509 -> 0 bytes
 doc/build/doctrees/api/nova..auth.manager.doctree  |  Bin 3479 -> 0 bytes
 doc/build/doctrees/api/nova..auth.signer.doctree   |  Bin 3469 -> 0 bytes
 .../doctrees/api/nova..cloudpipe.pipelib.doctree   |  Bin 3529 -> 0 bytes
 doc/build/doctrees/api/nova..compute.disk.doctree  |  Bin 3479 -> 0 bytes
 .../api/nova..compute.instance_types.doctree       |  Bin 3579 -> 0 bytes
 .../doctrees/api/nova..compute.manager.doctree     |  Bin 3509 -> 0 bytes
 .../doctrees/api/nova..compute.monitor.doctree     |  Bin 3509 -> 0 bytes
 .../doctrees/api/nova..compute.power_state.doctree |  Bin 3549 -> 0 bytes
 doc/build/doctrees/api/nova..context.doctree       |  Bin 3429 -> 0 bytes
 doc/build/doctrees/api/nova..crypto.doctree        |  Bin 3419 -> 0 bytes
 doc/build/doctrees/api/nova..db.api.doctree        |  Bin 3419 -> 0 bytes
 .../doctrees/api/nova..db.sqlalchemy.api.doctree   |  Bin 3529 -> 0 bytes
 .../api/nova..db.sqlalchemy.models.doctree         |  Bin 3559 -> 0 bytes
 .../api/nova..db.sqlalchemy.session.doctree        |  Bin 3569 -> 0 bytes
 doc/build/doctrees/api/nova..exception.doctree     |  Bin 3449 -> 0 bytes
 doc/build/doctrees/api/nova..fakerabbit.doctree    |  Bin 3459 -> 0 bytes
 doc/build/doctrees/api/nova..flags.doctree         |  Bin 3409 -> 0 bytes
 doc/build/doctrees/api/nova..image.service.doctree |  Bin 3489 -> 0 bytes
 doc/build/doctrees/api/nova..manager.doctree       |  Bin 3429 -> 0 bytes
 .../doctrees/api/nova..network.linux_net.doctree   |  Bin 3529 -> 0 bytes
 .../doctrees/api/nova..network.manager.doctree     |  Bin 3509 -> 0 bytes
 .../doctrees/api/nova..objectstore.bucket.doctree  |  Bin 3539 -> 0 bytes
 .../doctrees/api/nova..objectstore.handler.doctree |  Bin 3549 -> 0 bytes
 .../doctrees/api/nova..objectstore.image.doctree   |  Bin 3529 -> 0 bytes
 .../doctrees/api/nova..objectstore.stored.doctree  |  Bin 3539 -> 0 bytes
 doc/build/doctrees/api/nova..process.doctree       |  Bin 3429 -> 0 bytes
 doc/build/doctrees/api/nova..quota.doctree         |  Bin 3409 -> 0 bytes
 doc/build/doctrees/api/nova..rpc.doctree           |  Bin 3389 -> 0 bytes
 .../doctrees/api/nova..scheduler.chance.doctree    |  Bin 3519 -> 0 bytes
 .../doctrees/api/nova..scheduler.driver.doctree    |  Bin 3519 -> 0 bytes
 .../doctrees/api/nova..scheduler.manager.doctree   |  Bin 3529 -> 0 bytes
 .../doctrees/api/nova..scheduler.simple.doctree    |  Bin 3519 -> 0 bytes
 doc/build/doctrees/api/nova..server.doctree        |  Bin 3419 -> 0 bytes
 doc/build/doctrees/api/nova..service.doctree       |  Bin 3429 -> 0 bytes
 doc/build/doctrees/api/nova..test.doctree          |  Bin 3399 -> 0 bytes
 .../api/nova..tests.access_unittest.doctree        |  Bin 3569 -> 0 bytes
 .../doctrees/api/nova..tests.api.fakes.doctree     |  Bin 3509 -> 0 bytes
 .../api/nova..tests.api.openstack.fakes.doctree    |  Bin 3609 -> 0 bytes
 .../api/nova..tests.api.openstack.test_api.doctree |  Bin 3639 -> 0 bytes
 .../nova..tests.api.openstack.test_auth.doctree    |  Bin 3649 -> 0 bytes
 .../nova..tests.api.openstack.test_faults.doctree  |  Bin 3669 -> 0 bytes
 .../nova..tests.api.openstack.test_flavors.doctree |  Bin 3679 -> 0 bytes
 .../nova..tests.api.openstack.test_images.doctree  |  Bin 3669 -> 0 bytes
 .....tests.api.openstack.test_ratelimiting.doctree |  Bin 3729 -> 0 bytes
 .../nova..tests.api.openstack.test_servers.doctree |  Bin 3679 -> 0 bytes
 ...tests.api.openstack.test_sharedipgroups.doctree |  Bin 3749 -> 0 bytes
 .../doctrees/api/nova..tests.api.test_wsgi.doctree |  Bin 3549 -> 0 bytes
 .../api/nova..tests.api_integration.doctree        |  Bin 3569 -> 0 bytes
 .../doctrees/api/nova..tests.api_unittest.doctree  |  Bin 3539 -> 0 bytes
 .../doctrees/api/nova..tests.auth_unittest.doctree |  Bin 3549 -> 0 bytes
 .../api/nova..tests.cloud_unittest.doctree         |  Bin 3559 -> 0 bytes
 .../api/nova..tests.compute_unittest.doctree       |  Bin 3579 -> 0 bytes
 .../doctrees/api/nova..tests.declare_flags.doctree |  Bin 3549 -> 0 bytes
 .../doctrees/api/nova..tests.fake_flags.doctree    |  Bin 3519 -> 0 bytes
 .../api/nova..tests.flags_unittest.doctree         |  Bin 3559 -> 0 bytes
 .../api/nova..tests.network_unittest.doctree       |  Bin 3579 -> 0 bytes
 .../api/nova..tests.objectstore_unittest.doctree   |  Bin 3619 -> 0 bytes
 .../api/nova..tests.process_unittest.doctree       |  Bin 3579 -> 0 bytes
 .../api/nova..tests.quota_unittest.doctree         |  Bin 3559 -> 0 bytes
 .../doctrees/api/nova..tests.real_flags.doctree    |  Bin 3519 -> 0 bytes
 .../doctrees/api/nova..tests.rpc_unittest.doctree  |  Bin 3539 -> 0 bytes
 .../doctrees/api/nova..tests.runtime_flags.doctree |  Bin 3549 -> 0 bytes
 .../api/nova..tests.scheduler_unittest.doctree     |  Bin 3599 -> 0 bytes
 .../api/nova..tests.service_unittest.doctree       |  Bin 3579 -> 0 bytes
 .../api/nova..tests.twistd_unittest.doctree        |  Bin 3569 -> 0 bytes
 .../api/nova..tests.validator_unittest.doctree     |  Bin 3599 -> 0 bytes
 .../doctrees/api/nova..tests.virt_unittest.doctree |  Bin 3549 -> 0 bytes
 .../api/nova..tests.volume_unittest.doctree        |  Bin 3569 -> 0 bytes
 doc/build/doctrees/api/nova..twistd.doctree        |  Bin 3419 -> 0 bytes
 doc/build/doctrees/api/nova..utils.doctree         |  Bin 3409 -> 0 bytes
 doc/build/doctrees/api/nova..validate.doctree      |  Bin 3439 -> 0 bytes
 .../doctrees/api/nova..virt.connection.doctree     |  Bin 3509 -> 0 bytes
 doc/build/doctrees/api/nova..virt.fake.doctree     |  Bin 3449 -> 0 bytes
 doc/build/doctrees/api/nova..virt.images.doctree   |  Bin 3469 -> 0 bytes
 .../doctrees/api/nova..virt.libvirt_conn.doctree   |  Bin 3529 -> 0 bytes
 doc/build/doctrees/api/nova..virt.xenapi.doctree   |  Bin 3469 -> 0 bytes
 doc/build/doctrees/api/nova..volume.driver.doctree |  Bin 3489 -> 0 bytes
 .../doctrees/api/nova..volume.manager.doctree      |  Bin 3499 -> 0 bytes
 doc/build/doctrees/api/nova..wsgi.doctree          |  Bin 3399 -> 0 bytes
 doc/build/doctrees/cloud101.doctree                |  Bin 16806 -> 0 bytes
 doc/build/doctrees/code.doctree                    |  Bin 11873 -> 0 bytes
 doc/build/doctrees/community.doctree               |  Bin 24317 -> 0 bytes
 doc/build/doctrees/devref/api.doctree              |  Bin 44655 -> 0 bytes
 doc/build/doctrees/devref/architecture.doctree     |  Bin 11727 -> 0 bytes
 doc/build/doctrees/devref/auth.doctree             |  Bin 52150 -> 0 bytes
 doc/build/doctrees/devref/cloudpipe.doctree        |  Bin 18597 -> 0 bytes
 doc/build/doctrees/devref/compute.doctree          |  Bin 68876 -> 0 bytes
 doc/build/doctrees/devref/database.doctree         |  Bin 10449 -> 0 bytes
 .../devref/development.environment.doctree         |  Bin 5035 -> 0 bytes
 doc/build/doctrees/devref/fakes.doctree            |  Bin 58479 -> 0 bytes
 doc/build/doctrees/devref/glance.doctree           |  Bin 5457 -> 0 bytes
 doc/build/doctrees/devref/index.doctree            |  Bin 10079 -> 0 bytes
 doc/build/doctrees/devref/modules.doctree          |  Bin 3166 -> 0 bytes
 doc/build/doctrees/devref/network.doctree          |  Bin 22897 -> 0 bytes
 doc/build/doctrees/devref/nova.doctree             |  Bin 56579 -> 0 bytes
 doc/build/doctrees/devref/objectstore.doctree      |  Bin 11101 -> 0 bytes
 doc/build/doctrees/devref/scheduler.doctree        |  Bin 10942 -> 0 bytes
 doc/build/doctrees/devref/services.doctree         |  Bin 10756 -> 0 bytes
 doc/build/doctrees/devref/volume.doctree           |  Bin 11687 -> 0 bytes
 doc/build/doctrees/environment.pickle              |  Bin 1803754 -> 0 bytes
 doc/build/doctrees/index.doctree                   |  Bin 18401 -> 0 bytes
 doc/build/doctrees/installer.doctree               |  Bin 4868 -> 0 bytes
 doc/build/doctrees/livecd.doctree                  |  Bin 2484 -> 0 bytes
 doc/build/doctrees/man/novamanage.doctree          |  Bin 38822 -> 0 bytes
 doc/build/doctrees/nova.concepts.doctree           |  Bin 42051 -> 0 bytes
 doc/build/doctrees/object.model.doctree            |  Bin 6809 -> 0 bytes
 doc/build/doctrees/quickstart.doctree              |  Bin 28924 -> 0 bytes
 doc/build/doctrees/service.architecture.doctree    |  Bin 17800 -> 0 bytes
 doc/source/devref/addmethod.openstackapi.rst       |   56 +++++++++++++
 doc/source/devref/development.environment.rst      |   83 +++++++++++++++++++-
 doc/source/devref/index.rst                        |    6 +-
 doc/source/devref/rabbit.rst                       |   10 +--
 150 files changed, 147 insertions(+), 8 deletions(-)

commit 9c57e5ce37c1f2405fcf7a1ba322946e6d84efeb
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 12:46:07 2010 -0600

    Remove FAKE_subdomain from docs

 contrib/nova.sh                                    |    1 -
 .../templates/production/nova-common.conf.erb      |    1 -
 doc/source/adminguide/getting.started.rst          |    1 -
 doc/source/adminguide/multi.node.install.rst       |   11 ++---------
 nova/api/__init__.py                               |    1 -
 5 files changed, 2 insertions(+), 13 deletions(-)

commit 513e4eb76a8d21108484bbc08e3ff755190cb2d9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 12:04:34 2010 -0600

    Make aws_access_key_id and aws_secret_access_key configurable

 nova/adminclient.py     |   16 +++++++++++-----
 nova/compute/monitor.py |    4 ++--
 nova/flags.py           |    2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

commit 015b7e5848c010ab86f067fb5dff462c2f34f4f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:57:25 2010 +0000

    updated nova.sh

 contrib/nova.sh |   29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

commit 6811f824f7c1edd1b3882621d80fba54a2bf019d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:57:12 2010 +0000

    added flat_interface for flat_dhcp binding

 nova/network/manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 693624831066af08dcf488d1528b017048fbde71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:56:43 2010 +0000

    changed bridge_dev to vlan_interface

 nova/network/linux_net.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a81547f780afec4eee88e87a301b32c903943c2c
Merge: 36ca124 01c5ce0
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 23 15:14:38 2010 +0000

commit 89f56207de1ffe2f1f9d5c3cad3ab71ba324d133
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 13:48:57 2010 +0100

    Add a --logdir flag that will be prepended to the logfile setting. This makes it easier to share a flagfile between multiple workers while still having separate log files.

 nova/server.py |    3 +++
 nova/twistd.py |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

commit 01c5ce00381e2b08d907385d752bc42b496bf4af
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 23 12:11:15 2010 +0000

    added svg files (state.svg is missing because its source is a screen snapshot)

 doc/source/images/rabbit/arch.svg  |  292 +++++++++++++++++
 doc/source/images/rabbit/flow1.svg |  617 ++++++++++++++++++++++++++++++++++++
 doc/source/images/rabbit/flow2.svg |  423 ++++++++++++++++++++++++
 doc/source/images/rabbit/rabt.svg  |  581 +++++++++++++++++++++++++++++++++
 4 files changed, 1913 insertions(+)

commit 981927385193b95f532dbf03c3e350f65c1b9005
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 11:45:56 2010 +0100

    Unify the location of the default flagfile.
    Not all workers called utils.default_flagfile, and nova-manage
    explicitly said to use the one in /etc/nova/nova-manage.conf.
    
    This made development awkward since everything but nova-manage would use
    defaults for everything, but nova-manage would use whatever config was
    in /etc/nova/nova-manage.conf which was likely put there by a package of
    some sort.

 bin/nova-compute         |    2 ++
 bin/nova-instancemonitor |    2 ++
 bin/nova-manage          |    2 +-
 bin/nova-network         |    2 ++
 bin/nova-scheduler       |    2 ++
 bin/nova-volume          |    2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

commit 36ca124af4238b4431754e208a4ca32d7607168d
Merge: 2b0e1f3 f0f9904
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 23:04:38 2010 +0000

    Set and use AMQP retry interval and max retry FLAGS.

commit d6a74a219b8448d74a08730f6c452c20fb59abba
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 22 17:03:54 2010 -0600

    Incorporating security groups info

 doc/source/devref/cloudpipe.rst |    2 +-
 doc/source/nova.concepts.rst    |   17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

commit a19d0e294efac1fb7e8e3e45a286f6032172da23
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 22 17:59:49 2010 -0500

    Rename cloudServersFault (rackspace branding) to computeFault.  Fixes bug lp680285.

 nova/api/openstack/faults.py         |    2 +-
 nova/tests/api/openstack/test_api.py |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit f0f990495428c028401ba9a4740e6b7a0441213c
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:48:44 2010 -0600

    Use FLAGS instead of constants

 nova/flags.py |    2 ++
 nova/rpc.py   |   11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 0b70b44c11830549938c5153b4322b960c53963d
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 22 16:43:17 2010 -0600

    Incorporating more networking info

 doc/source/adminguide/index.rst             |    6 +++---
 doc/source/adminguide/managing.networks.rst |   15 ---------------
 doc/source/adminguide/network.vlan.rst      |    8 ++++----
 doc/source/nova.concepts.rst                |   21 +++++++++++++++++----
 4 files changed, 24 insertions(+), 26 deletions(-)

commit deac609ceb1cd6e081445bfc4d8f8c3222b97774
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:28:28 2010 -0600

    Make time.sleep() non-blocking

 nova/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a8497abaf24436a92a85129d9771a12f046f2f42
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:04:21 2010 -0600

    Removed unnecessary continue

 nova/rpc.py |    1 -
 1 file changed, 1 deletion(-)

commit 3b163dd4c3ae12de8845dfa253b7d1146f24c99d
Merge: 33dd63e c4a8768
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 22 22:33:03 2010 +0100

    Update Authors and add a couple of names to .mailmap (from people who failed to set bzr whoami properly).

commit 33dd63eaa0fe32916dd15ec03943903ff2823bff
Merge: 3b695e1 4730b20
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 22 22:27:15 2010 +0100

    Merge with trunk.

commit 14e4ba7f0e10fc3c2f532b445c1f656f53c8aa95
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 15:22:02 2010 -0600

    Refactor AMQP retry loop

 nova/rpc.py |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 2b0e1f330422398e0ec9dcaf9d964d74ec6ca25d
Merge: 7a8c91c d65c35b
Author: Eric Day <eday@oddments.org>
Date:   Mon Nov 22 21:06:44 2010 +0000

    Allows user to specify hosts to listen on for nova-api and -objectstore

commit 7a8c91cc4b595bfee05540ef325f12c1b8516c98
Merge: bc63846 89cb1e3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 22 21:04:22 2010 +0000

    Make sure all the libvirt templates are included in the tarball (by
    replacing the explicitly listed set with a glob pattern).

commit bc63846c0d46f4bed627a8f0cee024355bbad310
Merge: 4730b20 958591a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 20:49:28 2010 +0000

    fixed pep8 violations

commit 51be7159574d3e0cba8a81b8ea3e9706ce74ac3a
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 14:45:05 2010 -0600

    Set and use AMQP retry interval and max retry constants

 nova/rpc.py |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

commit 958591ab2996443ffb6d2f92f928eaad277aa2db
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 13:11:00 2010 +0000

    pep8 violations fix

 nova/virt/xenapi.py |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

commit 9ca0b3435d93a87407ca42a853562cd06aaa896e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 12:57:03 2010 +0000

    added placeholders

 nova/virt/xenapi.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 96b42bc9cd759e8cc0d515472a717e98c3052410
Merge: aa43354 4730b20
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 12:15:11 2010 +0000

    added test for invalid handles

commit 89cb1e32da33815d5f8e6eb34380ca3401bfad28
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Nov 20 22:26:15 2010 +0100

    Make sure all templates are included (at least rescue tempaltes didn't used to be included).

 MANIFEST.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 4730b2037d4b53cd79c7d46965c5cafa1912c812
Merge: acf8800 874edc5
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Nov 20 21:04:35 2010 +0000

    Check for running AMQP instances.

commit 874edc5103e1ebbe1def1639ef056574dcd406e9
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Nov 20 12:16:54 2010 -0600

    Use logging.exception instead

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dec8aab1001d85ff7845f7521faf1f610700bd09
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:42:37 2010 -0600

    Reverted some changes

 nova/rpc.py |   36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

commit aa9fe71ed82889f1f3ca306c5836414966d08539
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:13:04 2010 -0600

    Added some comments

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit acf8800d73215b5b0974dd64f0047a9fc6c0a4c7
Merge: 2509fcc 55780d1
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 19 22:04:37 2010 +0000

    Adds images (only links one in), start for a nova-manage man file, and also documents all nova-manage commands. Can we merge it in even though the man page build isn't working?

commit 281008b1ce3f92507622d856e0a310690ea37ab3
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:01:55 2010 -0600

    Added some comments

 nova/rpc.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 300e6e3517d0e50c7fd6775eff10f1b0d677f25a
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 15:47:24 2010 -0600

    Check for running AMQP instances

 nova/rpc.py |   45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

commit aa433547ff797678cd2aad17d70c1c0b569d1e37
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Nov 19 17:32:38 2010 +0000

    first cut of fixes for bug  #676128

 nova/virt/xenapi.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit 55780d1490ff2a97b78babde580161f16aeccdd6
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 19 09:57:49 2010 -0600

    Removed .DS_Store files everywhere, begone!

 .DS_Store                       |  Bin 6148 -> 0 bytes
 doc/.DS_Store                   |  Bin 6148 -> 0 bytes
 doc/build/.DS_Store             |  Bin 6148 -> 0 bytes
 doc/source/.DS_Store            |  Bin 6148 -> 0 bytes
 doc/source/_templates/.DS_Store |  Bin 6148 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

commit 2509fccebc2d374542e116d9e482a617e2c02686
Merge: 5b0a170 9c7ddf2
Author: Eric Day <eday@oddments.org>
Date:   Fri Nov 19 06:09:40 2010 +0000

    Moves the EC2 API S3 image service into nova.service. There is still work to be done to make the APIs align, but this is the first step.

commit 9c7ddf24acfdbdb220bcc56d8e4d6421cd46e1d7
Author: Eric Day <eday@oddments.org>
Date:   Thu Nov 18 21:27:00 2010 -0800

    PEP8 fixes, 2 lines were too long.

 nova/image/s3.py                        |    3 ++-
 nova/tests/api/openstack/test_images.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 8e1b88cc228f9ed55c3b6e4fdd790a572d63e6fe
Author: Eric Day <eday@oddments.org>
Date:   Thu Nov 18 13:27:52 2010 -0800

    First step to getting the image APIs consolidated. The EC2 API was using a one-off S3 image service wrapper, but this should be moved into the nova.image space and use the same interface as the others. There are still some mismatches between the various image service implementations, but this patch was getting large and wanted to keep it within a resonable size.

 nova/api/ec2/cloud.py                   |   24 ++--
 nova/api/ec2/images.py                  |  123 -----------------
 nova/api/openstack/images.py            |   13 +-
 nova/flags.py                           |    2 +-
 nova/image/glance.py                    |  227 +++++++++++++++++++++++++++++++
 nova/image/local.py                     |   88 ++++++++++++
 nova/image/s3.py                        |  108 +++++++++++++++
 nova/image/service.py                   |   97 +------------
 nova/image/services/glance/__init__.py  |  216 -----------------------------
 nova/tests/api/openstack/fakes.py       |   20 ++-
 nova/tests/api/openstack/test_images.py |   40 +++---
 11 files changed, 481 insertions(+), 477 deletions(-)

commit 5b0a1704e1daf4d929b43792bc7415f5263d7e8c
Merge: 17b7206 973b2d6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Nov 18 20:04:38 2010 +0000

    Improved Pylint Score

commit 17b72064389f847c9102e6e112c5872cf7f1bc10
Merge: ff9b3b4 70e1050
Author: root <vishvananda@gmail.com>
Date:   Thu Nov 18 19:35:17 2010 +0000

    Fixes improper display of api error messages that happen to be unicode.

commit 70e10503472d37f08f9f0880c87e10afc3abc851
Author: root <vishvananda@gmail.com>
Date:   Thu Nov 18 10:52:54 2010 -0800

    Make sure that the response body is a string and not unicode

 nova/api/ec2/__init__.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9364e486d1b68113feb55e507c5d783e4990dd4b
Merge: 2a06dfc 609c505
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 18 09:09:53 2010 -0600

    Soren updated setup.py so that the man page builds. Will continue working on man pages for nova-compute and nova-network

commit 609c50578f15e7dd117cb0f2b1e7032240346037
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Nov 18 11:11:30 2010 +0100

    Overwrite build_sphinx, making it run once for each of the html and man builders.

 setup.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit 659058bef7913254eca63e7f67a5d74ffe146e57
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Nov 18 00:11:45 2010 +0000

    fixes flatdhcp, updates nova.sh, allows for empty bridge device

 contrib/nova.sh           |   28 ++++++++++++++++++++--------
 nova/network/linux_net.py |    7 ++++---
 nova/network/manager.py   |   24 +++++++++++++++---------
 3 files changed, 39 insertions(+), 20 deletions(-)

commit ff9b3b49090773070439d37df3149727fc7d3988
Merge: 279a564 fb5f32b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 17 22:14:35 2010 +0000

    Update version to 2011.1 as that is the version we expect to release next.

commit 2a06dfc2aa83e6f3f77404f047a66791b91ec10c
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 16:03:09 2010 -0600

    really adding images

 .DS_Store                                          |  Bin 0 -> 6148 bytes
 doc/.DS_Store                                      |  Bin 0 -> 6148 bytes
 doc/build/.DS_Store                                |  Bin 0 -> 6148 bytes
 doc/build/html/.buildinfo                          |    4 -
 .../html/.doctrees/adminguide/binaries.doctree     |  Bin 11915 -> 0 bytes
 .../.doctrees/adminguide/distros/others.doctree    |  Bin 13777 -> 0 bytes
 .../adminguide/distros/ubuntu.10.04.doctree        |  Bin 8787 -> 0 bytes
 .../adminguide/distros/ubuntu.10.10.doctree        |  Bin 9906 -> 0 bytes
 .../html/.doctrees/adminguide/euca2ools.doctree    |  Bin 15156 -> 0 bytes
 doc/build/html/.doctrees/adminguide/flags.doctree  |  Bin 4917 -> 0 bytes
 .../.doctrees/adminguide/getting.started.doctree   |  Bin 37699 -> 0 bytes
 doc/build/html/.doctrees/adminguide/index.doctree  |  Bin 16133 -> 0 bytes
 .../.doctrees/adminguide/managing.images.doctree   |  Bin 4991 -> 0 bytes
 .../adminguide/managing.instances.doctree          |  Bin 8530 -> 0 bytes
 .../.doctrees/adminguide/managing.networks.doctree |  Bin 23566 -> 0 bytes
 .../.doctrees/adminguide/managing.projects.doctree |  Bin 24817 -> 0 bytes
 .../.doctrees/adminguide/managing.users.doctree    |  Bin 34523 -> 0 bytes
 .../.doctrees/adminguide/managingsecurity.doctree  |  Bin 7476 -> 0 bytes
 .../html/.doctrees/adminguide/monitoring.doctree   |  Bin 5600 -> 0 bytes
 .../adminguide/multi.node.install.doctree          |  Bin 49860 -> 0 bytes
 .../html/.doctrees/adminguide/network.flat.doctree |  Bin 12519 -> 0 bytes
 .../html/.doctrees/adminguide/network.vlan.doctree |  Bin 44409 -> 0 bytes
 .../html/.doctrees/adminguide/nova.manage.doctree  |  Bin 22878 -> 0 bytes
 .../adminguide/single.node.install.doctree         |  Bin 41777 -> 0 bytes
 doc/build/html/.doctrees/api/autoindex.doctree     |  Bin 6648 -> 0 bytes
 .../html/.doctrees/api/nova..adminclient.doctree   |  Bin 4144 -> 0 bytes
 .../html/.doctrees/api/nova..api.cloud.doctree     |  Bin 4122 -> 0 bytes
 .../html/.doctrees/api/nova..api.ec2.admin.doctree |  Bin 4166 -> 0 bytes
 .../.doctrees/api/nova..api.ec2.apirequest.doctree |  Bin 4221 -> 0 bytes
 .../html/.doctrees/api/nova..api.ec2.cloud.doctree |  Bin 4166 -> 0 bytes
 .../.doctrees/api/nova..api.ec2.images.doctree     |  Bin 4177 -> 0 bytes
 .../nova..api.ec2.metadatarequesthandler.doctree   |  Bin 4353 -> 0 bytes
 .../.doctrees/api/nova..api.openstack.auth.doctree |  Bin 4221 -> 0 bytes
 .../nova..api.openstack.backup_schedules.doctree   |  Bin 4353 -> 0 bytes
 .../api/nova..api.openstack.faults.doctree         |  Bin 4243 -> 0 bytes
 .../api/nova..api.openstack.flavors.doctree        |  Bin 4254 -> 0 bytes
 .../api/nova..api.openstack.images.doctree         |  Bin 4243 -> 0 bytes
 .../api/nova..api.openstack.servers.doctree        |  Bin 4254 -> 0 bytes
 .../api/nova..api.openstack.sharedipgroups.doctree |  Bin 4331 -> 0 bytes
 .../html/.doctrees/api/nova..auth.dbdriver.doctree |  Bin 4166 -> 0 bytes
 .../html/.doctrees/api/nova..auth.fakeldap.doctree |  Bin 4166 -> 0 bytes
 .../.doctrees/api/nova..auth.ldapdriver.doctree    |  Bin 4188 -> 0 bytes
 .../html/.doctrees/api/nova..auth.manager.doctree  |  Bin 4155 -> 0 bytes
 .../html/.doctrees/api/nova..auth.signer.doctree   |  Bin 4144 -> 0 bytes
 .../.doctrees/api/nova..cloudpipe.pipelib.doctree  |  Bin 4210 -> 0 bytes
 .../html/.doctrees/api/nova..compute.disk.doctree  |  Bin 4155 -> 0 bytes
 .../api/nova..compute.instance_types.doctree       |  Bin 4265 -> 0 bytes
 .../.doctrees/api/nova..compute.manager.doctree    |  Bin 4188 -> 0 bytes
 .../.doctrees/api/nova..compute.monitor.doctree    |  Bin 4188 -> 0 bytes
 .../api/nova..compute.power_state.doctree          |  Bin 4232 -> 0 bytes
 doc/build/html/.doctrees/api/nova..context.doctree |  Bin 4100 -> 0 bytes
 doc/build/html/.doctrees/api/nova..crypto.doctree  |  Bin 4089 -> 0 bytes
 doc/build/html/.doctrees/api/nova..db.api.doctree  |  Bin 4089 -> 0 bytes
 .../.doctrees/api/nova..db.sqlalchemy.api.doctree  |  Bin 4210 -> 0 bytes
 .../api/nova..db.sqlalchemy.models.doctree         |  Bin 4243 -> 0 bytes
 .../api/nova..db.sqlalchemy.session.doctree        |  Bin 4254 -> 0 bytes
 .../html/.doctrees/api/nova..exception.doctree     |  Bin 4122 -> 0 bytes
 .../html/.doctrees/api/nova..fakerabbit.doctree    |  Bin 4133 -> 0 bytes
 doc/build/html/.doctrees/api/nova..flags.doctree   |  Bin 4078 -> 0 bytes
 .../html/.doctrees/api/nova..image.service.doctree |  Bin 4166 -> 0 bytes
 doc/build/html/.doctrees/api/nova..manager.doctree |  Bin 4100 -> 0 bytes
 .../.doctrees/api/nova..network.linux_net.doctree  |  Bin 4210 -> 0 bytes
 .../.doctrees/api/nova..network.manager.doctree    |  Bin 4188 -> 0 bytes
 .../.doctrees/api/nova..objectstore.bucket.doctree |  Bin 4221 -> 0 bytes
 .../api/nova..objectstore.handler.doctree          |  Bin 4232 -> 0 bytes
 .../.doctrees/api/nova..objectstore.image.doctree  |  Bin 4210 -> 0 bytes
 .../.doctrees/api/nova..objectstore.stored.doctree |  Bin 4221 -> 0 bytes
 doc/build/html/.doctrees/api/nova..process.doctree |  Bin 4100 -> 0 bytes
 doc/build/html/.doctrees/api/nova..quota.doctree   |  Bin 4078 -> 0 bytes
 doc/build/html/.doctrees/api/nova..rpc.doctree     |  Bin 4056 -> 0 bytes
 .../.doctrees/api/nova..scheduler.chance.doctree   |  Bin 4199 -> 0 bytes
 .../.doctrees/api/nova..scheduler.driver.doctree   |  Bin 4199 -> 0 bytes
 .../.doctrees/api/nova..scheduler.manager.doctree  |  Bin 4210 -> 0 bytes
 .../.doctrees/api/nova..scheduler.simple.doctree   |  Bin 4199 -> 0 bytes
 doc/build/html/.doctrees/api/nova..server.doctree  |  Bin 4089 -> 0 bytes
 doc/build/html/.doctrees/api/nova..service.doctree |  Bin 4100 -> 0 bytes
 doc/build/html/.doctrees/api/nova..test.doctree    |  Bin 4067 -> 0 bytes
 .../api/nova..tests.access_unittest.doctree        |  Bin 4254 -> 0 bytes
 .../.doctrees/api/nova..tests.api.fakes.doctree    |  Bin 4188 -> 0 bytes
 .../api/nova..tests.api.openstack.fakes.doctree    |  Bin 4298 -> 0 bytes
 .../api/nova..tests.api.openstack.test_api.doctree |  Bin 4331 -> 0 bytes
 .../nova..tests.api.openstack.test_auth.doctree    |  Bin 4342 -> 0 bytes
 .../nova..tests.api.openstack.test_faults.doctree  |  Bin 4364 -> 0 bytes
 .../nova..tests.api.openstack.test_flavors.doctree |  Bin 4375 -> 0 bytes
 .../nova..tests.api.openstack.test_images.doctree  |  Bin 4364 -> 0 bytes
 .....tests.api.openstack.test_ratelimiting.doctree |  Bin 4430 -> 0 bytes
 .../nova..tests.api.openstack.test_servers.doctree |  Bin 4375 -> 0 bytes
 ...tests.api.openstack.test_sharedipgroups.doctree |  Bin 4452 -> 0 bytes
 .../api/nova..tests.api.test_wsgi.doctree          |  Bin 4232 -> 0 bytes
 .../api/nova..tests.api_integration.doctree        |  Bin 4254 -> 0 bytes
 .../.doctrees/api/nova..tests.api_unittest.doctree |  Bin 4221 -> 0 bytes
 .../api/nova..tests.auth_unittest.doctree          |  Bin 4232 -> 0 bytes
 .../api/nova..tests.cloud_unittest.doctree         |  Bin 4243 -> 0 bytes
 .../api/nova..tests.compute_unittest.doctree       |  Bin 4265 -> 0 bytes
 .../api/nova..tests.declare_flags.doctree          |  Bin 4232 -> 0 bytes
 .../.doctrees/api/nova..tests.fake_flags.doctree   |  Bin 4199 -> 0 bytes
 .../api/nova..tests.flags_unittest.doctree         |  Bin 4243 -> 0 bytes
 .../api/nova..tests.network_unittest.doctree       |  Bin 4265 -> 0 bytes
 .../api/nova..tests.objectstore_unittest.doctree   |  Bin 4309 -> 0 bytes
 .../api/nova..tests.process_unittest.doctree       |  Bin 4265 -> 0 bytes
 .../api/nova..tests.quota_unittest.doctree         |  Bin 4243 -> 0 bytes
 .../.doctrees/api/nova..tests.real_flags.doctree   |  Bin 4199 -> 0 bytes
 .../.doctrees/api/nova..tests.rpc_unittest.doctree |  Bin 4221 -> 0 bytes
 .../api/nova..tests.runtime_flags.doctree          |  Bin 4232 -> 0 bytes
 .../api/nova..tests.scheduler_unittest.doctree     |  Bin 4287 -> 0 bytes
 .../api/nova..tests.service_unittest.doctree       |  Bin 4265 -> 0 bytes
 .../api/nova..tests.twistd_unittest.doctree        |  Bin 4254 -> 0 bytes
 .../api/nova..tests.validator_unittest.doctree     |  Bin 4287 -> 0 bytes
 .../api/nova..tests.virt_unittest.doctree          |  Bin 4232 -> 0 bytes
 .../api/nova..tests.volume_unittest.doctree        |  Bin 4254 -> 0 bytes
 doc/build/html/.doctrees/api/nova..twistd.doctree  |  Bin 4089 -> 0 bytes
 doc/build/html/.doctrees/api/nova..utils.doctree   |  Bin 4078 -> 0 bytes
 .../html/.doctrees/api/nova..validate.doctree      |  Bin 4111 -> 0 bytes
 .../.doctrees/api/nova..virt.connection.doctree    |  Bin 4188 -> 0 bytes
 .../html/.doctrees/api/nova..virt.fake.doctree     |  Bin 4122 -> 0 bytes
 .../html/.doctrees/api/nova..virt.images.doctree   |  Bin 4144 -> 0 bytes
 .../.doctrees/api/nova..virt.libvirt_conn.doctree  |  Bin 4210 -> 0 bytes
 .../html/.doctrees/api/nova..virt.xenapi.doctree   |  Bin 4144 -> 0 bytes
 .../html/.doctrees/api/nova..volume.driver.doctree |  Bin 4166 -> 0 bytes
 .../.doctrees/api/nova..volume.manager.doctree     |  Bin 4177 -> 0 bytes
 doc/build/html/.doctrees/api/nova..wsgi.doctree    |  Bin 4067 -> 0 bytes
 doc/build/html/.doctrees/cloud101.doctree          |  Bin 16806 -> 0 bytes
 doc/build/html/.doctrees/code.doctree              |  Bin 11873 -> 0 bytes
 doc/build/html/.doctrees/community.doctree         |  Bin 24317 -> 0 bytes
 doc/build/html/.doctrees/devref/api.doctree        |  Bin 65750 -> 0 bytes
 .../html/.doctrees/devref/architecture.doctree     |  Bin 11727 -> 0 bytes
 doc/build/html/.doctrees/devref/auth.doctree       |  Bin 57755 -> 0 bytes
 doc/build/html/.doctrees/devref/cloudpipe.doctree  |  Bin 20717 -> 0 bytes
 doc/build/html/.doctrees/devref/compute.doctree    |  Bin 30516 -> 0 bytes
 doc/build/html/.doctrees/devref/database.doctree   |  Bin 13184 -> 0 bytes
 .../devref/development.environment.doctree         |  Bin 5035 -> 0 bytes
 doc/build/html/.doctrees/devref/fakes.doctree      |  Bin 17916 -> 0 bytes
 doc/build/html/.doctrees/devref/glance.doctree     |  Bin 6177 -> 0 bytes
 doc/build/html/.doctrees/devref/index.doctree      |  Bin 10079 -> 0 bytes
 doc/build/html/.doctrees/devref/modules.doctree    |  Bin 3166 -> 0 bytes
 doc/build/html/.doctrees/devref/network.doctree    |  Bin 24991 -> 0 bytes
 doc/build/html/.doctrees/devref/nova.doctree       |  Bin 46154 -> 0 bytes
 .../html/.doctrees/devref/objectstore.doctree      |  Bin 14674 -> 0 bytes
 doc/build/html/.doctrees/devref/scheduler.doctree  |  Bin 14504 -> 0 bytes
 doc/build/html/.doctrees/devref/services.doctree   |  Bin 12171 -> 0 bytes
 doc/build/html/.doctrees/devref/volume.doctree     |  Bin 13881 -> 0 bytes
 doc/build/html/.doctrees/environment.pickle        |  Bin 1748540 -> 0 bytes
 doc/build/html/.doctrees/index.doctree             |  Bin 18401 -> 0 bytes
 doc/build/html/.doctrees/installer.doctree         |  Bin 4868 -> 0 bytes
 doc/build/html/.doctrees/livecd.doctree            |  Bin 2484 -> 0 bytes
 doc/build/html/.doctrees/man/novamanage.doctree    |  Bin 29090 -> 0 bytes
 doc/build/html/.doctrees/nova.concepts.doctree     |  Bin 42051 -> 0 bytes
 doc/build/html/.doctrees/object.model.doctree      |  Bin 6809 -> 0 bytes
 doc/build/html/.doctrees/quickstart.doctree        |  Bin 28924 -> 0 bytes
 .../html/.doctrees/service.architecture.doctree    |  Bin 17800 -> 0 bytes
 doc/build/html/_images/cloudpipe.png               |  Bin 89812 -> 0 bytes
 doc/build/html/_images/fabric.png                  |  Bin 125915 -> 0 bytes
 doc/build/html/_sources/adminguide/binaries.txt    |   57 -
 .../html/_sources/adminguide/distros/others.txt    |   88 -
 .../_sources/adminguide/distros/ubuntu.10.04.txt   |   41 -
 .../_sources/adminguide/distros/ubuntu.10.10.txt   |   41 -
 doc/build/html/_sources/adminguide/euca2ools.txt   |   49 -
 doc/build/html/_sources/adminguide/flags.txt       |   23 -
 .../html/_sources/adminguide/getting.started.txt   |  168 -
 doc/build/html/_sources/adminguide/index.txt       |   90 -
 .../html/_sources/adminguide/managing.images.txt   |   21 -
 .../_sources/adminguide/managing.instances.txt     |   59 -
 .../html/_sources/adminguide/managing.networks.txt |   85 -
 .../html/_sources/adminguide/managing.projects.txt |   68 -
 .../html/_sources/adminguide/managing.users.txt    |   82 -
 .../html/_sources/adminguide/managingsecurity.txt  |   39 -
 doc/build/html/_sources/adminguide/monitoring.txt  |   27 -
 .../_sources/adminguide/multi.node.install.txt     |  298 -
 .../html/_sources/adminguide/network.flat.txt      |   60 -
 .../html/_sources/adminguide/network.vlan.txt      |  180 -
 doc/build/html/_sources/adminguide/nova.manage.txt |  225 -
 .../_sources/adminguide/single.node.install.txt    |  344 -
 doc/build/html/_sources/api/autoindex.txt          |   99 -
 doc/build/html/_sources/api/nova..adminclient.txt  |    6 -
 doc/build/html/_sources/api/nova..api.cloud.txt    |    6 -
 .../html/_sources/api/nova..api.ec2.admin.txt      |    6 -
 .../html/_sources/api/nova..api.ec2.apirequest.txt |    6 -
 .../html/_sources/api/nova..api.ec2.cloud.txt      |    6 -
 .../html/_sources/api/nova..api.ec2.images.txt     |    6 -
 .../api/nova..api.ec2.metadatarequesthandler.txt   |    6 -
 .../html/_sources/api/nova..api.openstack.auth.txt |    6 -
 .../api/nova..api.openstack.backup_schedules.txt   |    6 -
 .../_sources/api/nova..api.openstack.faults.txt    |    6 -
 .../_sources/api/nova..api.openstack.flavors.txt   |    6 -
 .../_sources/api/nova..api.openstack.images.txt    |    6 -
 .../_sources/api/nova..api.openstack.servers.txt   |    6 -
 .../api/nova..api.openstack.sharedipgroups.txt     |    6 -
 .../html/_sources/api/nova..auth.dbdriver.txt      |    6 -
 .../html/_sources/api/nova..auth.fakeldap.txt      |    6 -
 .../html/_sources/api/nova..auth.ldapdriver.txt    |    6 -
 doc/build/html/_sources/api/nova..auth.manager.txt |    6 -
 doc/build/html/_sources/api/nova..auth.signer.txt  |    6 -
 .../html/_sources/api/nova..cloudpipe.pipelib.txt  |    6 -
 doc/build/html/_sources/api/nova..compute.disk.txt |    6 -
 .../_sources/api/nova..compute.instance_types.txt  |    6 -
 .../html/_sources/api/nova..compute.manager.txt    |    6 -
 .../html/_sources/api/nova..compute.monitor.txt    |    6 -
 .../_sources/api/nova..compute.power_state.txt     |    6 -
 doc/build/html/_sources/api/nova..context.txt      |    6 -
 doc/build/html/_sources/api/nova..crypto.txt       |    6 -
 doc/build/html/_sources/api/nova..db.api.txt       |    6 -
 .../html/_sources/api/nova..db.sqlalchemy.api.txt  |    6 -
 .../_sources/api/nova..db.sqlalchemy.models.txt    |    6 -
 .../_sources/api/nova..db.sqlalchemy.session.txt   |    6 -
 doc/build/html/_sources/api/nova..exception.txt    |    6 -
 doc/build/html/_sources/api/nova..fakerabbit.txt   |    6 -
 doc/build/html/_sources/api/nova..flags.txt        |    6 -
 .../html/_sources/api/nova..image.service.txt      |    6 -
 doc/build/html/_sources/api/nova..manager.txt      |    6 -
 .../html/_sources/api/nova..network.linux_net.txt  |    6 -
 .../html/_sources/api/nova..network.manager.txt    |    6 -
 .../html/_sources/api/nova..objectstore.bucket.txt |    6 -
 .../_sources/api/nova..objectstore.handler.txt     |    6 -
 .../html/_sources/api/nova..objectstore.image.txt  |    6 -
 .../html/_sources/api/nova..objectstore.stored.txt |    6 -
 doc/build/html/_sources/api/nova..process.txt      |    6 -
 doc/build/html/_sources/api/nova..quota.txt        |    6 -
 doc/build/html/_sources/api/nova..rpc.txt          |    6 -
 .../html/_sources/api/nova..scheduler.chance.txt   |    6 -
 .../html/_sources/api/nova..scheduler.driver.txt   |    6 -
 .../html/_sources/api/nova..scheduler.manager.txt  |    6 -
 .../html/_sources/api/nova..scheduler.simple.txt   |    6 -
 doc/build/html/_sources/api/nova..server.txt       |    6 -
 doc/build/html/_sources/api/nova..service.txt      |    6 -
 doc/build/html/_sources/api/nova..test.txt         |    6 -
 .../_sources/api/nova..tests.access_unittest.txt   |    6 -
 .../html/_sources/api/nova..tests.api.fakes.txt    |    6 -
 .../api/nova..tests.api.openstack.fakes.txt        |    6 -
 .../api/nova..tests.api.openstack.test_api.txt     |    6 -
 .../api/nova..tests.api.openstack.test_auth.txt    |    6 -
 .../api/nova..tests.api.openstack.test_faults.txt  |    6 -
 .../api/nova..tests.api.openstack.test_flavors.txt |    6 -
 .../api/nova..tests.api.openstack.test_images.txt  |    6 -
 ...nova..tests.api.openstack.test_ratelimiting.txt |    6 -
 .../api/nova..tests.api.openstack.test_servers.txt |    6 -
 ...va..tests.api.openstack.test_sharedipgroups.txt |    6 -
 .../_sources/api/nova..tests.api.test_wsgi.txt     |    6 -
 .../_sources/api/nova..tests.api_integration.txt   |    6 -
 .../html/_sources/api/nova..tests.api_unittest.txt |    6 -
 .../_sources/api/nova..tests.auth_unittest.txt     |    6 -
 .../_sources/api/nova..tests.cloud_unittest.txt    |    6 -
 .../_sources/api/nova..tests.compute_unittest.txt  |    6 -
 .../_sources/api/nova..tests.declare_flags.txt     |    6 -
 .../html/_sources/api/nova..tests.fake_flags.txt   |    6 -
 .../_sources/api/nova..tests.flags_unittest.txt    |    6 -
 .../_sources/api/nova..tests.network_unittest.txt  |    6 -
 .../api/nova..tests.objectstore_unittest.txt       |    6 -
 .../_sources/api/nova..tests.process_unittest.txt  |    6 -
 .../_sources/api/nova..tests.quota_unittest.txt    |    6 -
 .../html/_sources/api/nova..tests.real_flags.txt   |    6 -
 .../html/_sources/api/nova..tests.rpc_unittest.txt |    6 -
 .../_sources/api/nova..tests.runtime_flags.txt     |    6 -
 .../api/nova..tests.scheduler_unittest.txt         |    6 -
 .../_sources/api/nova..tests.service_unittest.txt  |    6 -
 .../_sources/api/nova..tests.twistd_unittest.txt   |    6 -
 .../api/nova..tests.validator_unittest.txt         |    6 -
 .../_sources/api/nova..tests.virt_unittest.txt     |    6 -
 .../_sources/api/nova..tests.volume_unittest.txt   |    6 -
 doc/build/html/_sources/api/nova..twistd.txt       |    6 -
 doc/build/html/_sources/api/nova..utils.txt        |    6 -
 doc/build/html/_sources/api/nova..validate.txt     |    6 -
 .../html/_sources/api/nova..virt.connection.txt    |    6 -
 doc/build/html/_sources/api/nova..virt.fake.txt    |    6 -
 doc/build/html/_sources/api/nova..virt.images.txt  |    6 -
 .../html/_sources/api/nova..virt.libvirt_conn.txt  |    6 -
 doc/build/html/_sources/api/nova..virt.xenapi.txt  |    6 -
 .../html/_sources/api/nova..volume.driver.txt      |    6 -
 .../html/_sources/api/nova..volume.manager.txt     |    6 -
 doc/build/html/_sources/api/nova..wsgi.txt         |    6 -
 doc/build/html/_sources/cloud101.txt               |   85 -
 doc/build/html/_sources/code.txt                   |   96 -
 doc/build/html/_sources/community.txt              |   84 -
 doc/build/html/_sources/devref/api.txt             |  296 -
 doc/build/html/_sources/devref/architecture.txt    |   52 -
 doc/build/html/_sources/devref/auth.txt            |  276 -
 doc/build/html/_sources/devref/cloudpipe.txt       |   95 -
 doc/build/html/_sources/devref/compute.txt         |  153 -
 doc/build/html/_sources/devref/database.txt        |   63 -
 .../_sources/devref/development.environment.txt    |   21 -
 doc/build/html/_sources/devref/fakes.txt           |   85 -
 doc/build/html/_sources/devref/glance.txt          |   28 -
 doc/build/html/_sources/devref/index.txt           |   62 -
 doc/build/html/_sources/devref/modules.txt         |   19 -
 doc/build/html/_sources/devref/network.txt         |  128 -
 doc/build/html/_sources/devref/nova.txt            |  235 -
 doc/build/html/_sources/devref/objectstore.txt     |   71 -
 doc/build/html/_sources/devref/scheduler.txt       |   71 -
 doc/build/html/_sources/devref/services.txt        |   55 -
 doc/build/html/_sources/devref/volume.txt          |   66 -
 doc/build/html/_sources/index.txt                  |   88 -
 doc/build/html/_sources/installer.txt              |   12 -
 doc/build/html/_sources/livecd.txt                 |    2 -
 doc/build/html/_sources/man/novamanage.txt         |  189 -
 doc/build/html/_sources/nova.concepts.txt          |  203 -
 doc/build/html/_sources/object.model.txt           |   53 -
 doc/build/html/_sources/quickstart.txt             |  178 -
 doc/build/html/_sources/service.architecture.txt   |   60 -
 doc/build/html/_static/basic.css                   |  509 -
 doc/build/html/_static/contents.png                |  Bin 202 -> 0 bytes
 doc/build/html/_static/doctools.js                 |  247 -
 doc/build/html/_static/file.png                    |  Bin 392 -> 0 bytes
 doc/build/html/_static/jquery.js                   |  154 -
 doc/build/html/_static/jquery.tweet.js             |  154 -
 doc/build/html/_static/minus.png                   |  Bin 199 -> 0 bytes
 doc/build/html/_static/navigation.png              |  Bin 218 -> 0 bytes
 doc/build/html/_static/plus.png                    |  Bin 199 -> 0 bytes
 doc/build/html/_static/pygments.css                |   62 -
 doc/build/html/_static/searchtools.js              |  518 -
 doc/build/html/_static/sphinxdoc.css               |  339 -
 doc/build/html/_static/tweaks.css                  |   71 -
 doc/build/html/_static/underscore.js               |   16 -
 doc/build/html/adminguide/binaries.html            |  149 -
 doc/build/html/adminguide/distros/others.html      |  208 -
 .../html/adminguide/distros/ubuntu.10.04.html      |  168 -
 .../html/adminguide/distros/ubuntu.10.10.html      |  173 -
 doc/build/html/adminguide/euca2ools.html           |  177 -
 doc/build/html/adminguide/flags.html               |  137 -
 doc/build/html/adminguide/getting.started.html     |  288 -
 doc/build/html/adminguide/index.html               |  214 -
 doc/build/html/adminguide/managing.images.html     |  136 -
 doc/build/html/adminguide/managing.instances.html  |  169 -
 doc/build/html/adminguide/managing.networks.html   |  241 -
 doc/build/html/adminguide/managing.projects.html   |  239 -
 doc/build/html/adminguide/managing.users.html      |  271 -
 doc/build/html/adminguide/managingsecurity.html    |  133 -
 doc/build/html/adminguide/monitoring.html          |  140 -
 doc/build/html/adminguide/multi.node.install.html  |  390 -
 doc/build/html/adminguide/network.flat.html        |  179 -
 doc/build/html/adminguide/network.vlan.html        |  292 -
 doc/build/html/adminguide/nova.manage.html         |  325 -
 doc/build/html/adminguide/single.node.install.html |  416 -
 doc/build/html/api/autoindex.html                  |  229 -
 doc/build/html/api/nova..adminclient.html          |  134 -
 doc/build/html/api/nova..api.cloud.html            |  134 -
 doc/build/html/api/nova..api.ec2.admin.html        |  134 -
 doc/build/html/api/nova..api.ec2.apirequest.html   |  134 -
 doc/build/html/api/nova..api.ec2.cloud.html        |  134 -
 doc/build/html/api/nova..api.ec2.images.html       |  134 -
 .../api/nova..api.ec2.metadatarequesthandler.html  |  134 -
 doc/build/html/api/nova..api.openstack.auth.html   |  134 -
 .../api/nova..api.openstack.backup_schedules.html  |  134 -
 doc/build/html/api/nova..api.openstack.faults.html |  134 -
 .../html/api/nova..api.openstack.flavors.html      |  134 -
 doc/build/html/api/nova..api.openstack.images.html |  134 -
 .../html/api/nova..api.openstack.servers.html      |  134 -
 .../api/nova..api.openstack.sharedipgroups.html    |  134 -
 doc/build/html/api/nova..auth.dbdriver.html        |  134 -
 doc/build/html/api/nova..auth.fakeldap.html        |  134 -
 doc/build/html/api/nova..auth.ldapdriver.html      |  134 -
 doc/build/html/api/nova..auth.manager.html         |  134 -
 doc/build/html/api/nova..auth.signer.html          |  134 -
 doc/build/html/api/nova..cloudpipe.pipelib.html    |  134 -
 doc/build/html/api/nova..compute.disk.html         |  134 -
 .../html/api/nova..compute.instance_types.html     |  134 -
 doc/build/html/api/nova..compute.manager.html      |  134 -
 doc/build/html/api/nova..compute.monitor.html      |  134 -
 doc/build/html/api/nova..compute.power_state.html  |  134 -
 doc/build/html/api/nova..context.html              |  134 -
 doc/build/html/api/nova..crypto.html               |  134 -
 doc/build/html/api/nova..db.api.html               |  134 -
 doc/build/html/api/nova..db.sqlalchemy.api.html    |  134 -
 doc/build/html/api/nova..db.sqlalchemy.models.html |  134 -
 .../html/api/nova..db.sqlalchemy.session.html      |  134 -
 doc/build/html/api/nova..exception.html            |  134 -
 doc/build/html/api/nova..fakerabbit.html           |  134 -
 doc/build/html/api/nova..flags.html                |  134 -
 doc/build/html/api/nova..image.service.html        |  134 -
 doc/build/html/api/nova..manager.html              |  134 -
 doc/build/html/api/nova..network.linux_net.html    |  134 -
 doc/build/html/api/nova..network.manager.html      |  134 -
 doc/build/html/api/nova..objectstore.bucket.html   |  134 -
 doc/build/html/api/nova..objectstore.handler.html  |  134 -
 doc/build/html/api/nova..objectstore.image.html    |  134 -
 doc/build/html/api/nova..objectstore.stored.html   |  134 -
 doc/build/html/api/nova..process.html              |  134 -
 doc/build/html/api/nova..quota.html                |  134 -
 doc/build/html/api/nova..rpc.html                  |  134 -
 doc/build/html/api/nova..scheduler.chance.html     |  134 -
 doc/build/html/api/nova..scheduler.driver.html     |  134 -
 doc/build/html/api/nova..scheduler.manager.html    |  134 -
 doc/build/html/api/nova..scheduler.simple.html     |  134 -
 doc/build/html/api/nova..server.html               |  134 -
 doc/build/html/api/nova..service.html              |  134 -
 doc/build/html/api/nova..test.html                 |  134 -
 .../html/api/nova..tests.access_unittest.html      |  134 -
 doc/build/html/api/nova..tests.api.fakes.html      |  134 -
 .../html/api/nova..tests.api.openstack.fakes.html  |  134 -
 .../api/nova..tests.api.openstack.test_api.html    |  134 -
 .../api/nova..tests.api.openstack.test_auth.html   |  134 -
 .../api/nova..tests.api.openstack.test_faults.html |  134 -
 .../nova..tests.api.openstack.test_flavors.html    |  134 -
 .../api/nova..tests.api.openstack.test_images.html |  134 -
 ...ova..tests.api.openstack.test_ratelimiting.html |  134 -
 .../nova..tests.api.openstack.test_servers.html    |  134 -
 ...a..tests.api.openstack.test_sharedipgroups.html |  134 -
 doc/build/html/api/nova..tests.api.test_wsgi.html  |  134 -
 .../html/api/nova..tests.api_integration.html      |  134 -
 doc/build/html/api/nova..tests.api_unittest.html   |  134 -
 doc/build/html/api/nova..tests.auth_unittest.html  |  134 -
 doc/build/html/api/nova..tests.cloud_unittest.html |  134 -
 .../html/api/nova..tests.compute_unittest.html     |  134 -
 doc/build/html/api/nova..tests.declare_flags.html  |  134 -
 doc/build/html/api/nova..tests.fake_flags.html     |  134 -
 doc/build/html/api/nova..tests.flags_unittest.html |  134 -
 .../html/api/nova..tests.network_unittest.html     |  134 -
 .../html/api/nova..tests.objectstore_unittest.html |  134 -
 .../html/api/nova..tests.process_unittest.html     |  134 -
 doc/build/html/api/nova..tests.quota_unittest.html |  134 -
 doc/build/html/api/nova..tests.real_flags.html     |  134 -
 doc/build/html/api/nova..tests.rpc_unittest.html   |  134 -
 doc/build/html/api/nova..tests.runtime_flags.html  |  134 -
 .../html/api/nova..tests.scheduler_unittest.html   |  134 -
 .../html/api/nova..tests.service_unittest.html     |  134 -
 .../html/api/nova..tests.twistd_unittest.html      |  134 -
 .../html/api/nova..tests.validator_unittest.html   |  134 -
 doc/build/html/api/nova..tests.virt_unittest.html  |  134 -
 .../html/api/nova..tests.volume_unittest.html      |  134 -
 doc/build/html/api/nova..twistd.html               |  134 -
 doc/build/html/api/nova..utils.html                |  134 -
 doc/build/html/api/nova..validate.html             |  134 -
 doc/build/html/api/nova..virt.connection.html      |  134 -
 doc/build/html/api/nova..virt.fake.html            |  134 -
 doc/build/html/api/nova..virt.images.html          |  134 -
 doc/build/html/api/nova..virt.libvirt_conn.html    |  134 -
 doc/build/html/api/nova..virt.xenapi.html          |  134 -
 doc/build/html/api/nova..volume.driver.html        |  134 -
 doc/build/html/api/nova..volume.manager.html       |  134 -
 doc/build/html/api/nova..wsgi.html                 |  134 -
 doc/build/html/cloud101.html                       |  209 -
 doc/build/html/code.html                           |  202 -
 doc/build/html/community.html                      |  188 -
 doc/build/html/devref/api.html                     |  286 -
 doc/build/html/devref/architecture.html            |  146 -
 doc/build/html/devref/auth.html                    |  347 -
 doc/build/html/devref/cloudpipe.html               |  188 -
 doc/build/html/devref/compute.html                 |  413 -
 doc/build/html/devref/database.html                |  167 -
 doc/build/html/devref/development.environment.html |  113 -
 doc/build/html/devref/fakes.html                   |  362 -
 doc/build/html/devref/glance.html                  |  143 -
 doc/build/html/devref/index.html                   |  489 -
 doc/build/html/devref/modules.html                 |  126 -
 doc/build/html/devref/network.html                 |  236 -
 doc/build/html/devref/nova.html                    |  305 -
 doc/build/html/devref/objectstore.html             |  165 -
 doc/build/html/devref/scheduler.html               |  165 -
 doc/build/html/devref/services.html                |  156 -
 doc/build/html/devref/volume.html                  |  169 -
 doc/build/html/genindex.html                       |  110 -
 doc/build/html/index.html                          |  276 -
 doc/build/html/installer.html                      |  119 -
 doc/build/html/livecd.html                         |  129 -
 doc/build/html/man/novamanage.html                 |  297 -
 doc/build/html/nova.concepts.html                  |  311 -
 doc/build/html/object.model.html                   |  168 -
 doc/build/html/objects.inv                         |    9 -
 doc/build/html/quickstart.html                     |  272 -
 doc/build/html/search.html                         |  116 -
 doc/build/html/searchindex.js                      |    1 -
 doc/build/html/service.architecture.html           |  197 -
 doc/source/.DS_Store                               |  Bin 0 -> 6148 bytes
 doc/source/images/NOVA_ARCH.png                    |  Bin 0 -> 191332 bytes
 doc/source/images/NOVA_ARCH.svg                    | 5854 +++++++
 doc/source/images/NOVA_ARCH_200dpi.png             |  Bin 0 -> 439024 bytes
 doc/source/images/NOVA_ARCH_66dpi.png              |  Bin 0 -> 110890 bytes
 doc/source/images/NOVA_clouds_A_B.png              |  Bin 0 -> 77007 bytes
 doc/source/images/NOVA_clouds_A_B.svg              |16342 ++++++++++++++++++++
 doc/source/images/NOVA_clouds_C1_C2.svg            | 9763 ++++++++++++
 doc/source/images/NOVA_clouds_C1_C2.svg.png        |  Bin 0 -> 448574 bytes
 doc/source/images/Novadiagram.png                  |  Bin 0 -> 52609 bytes
 470 files changed, 31959 insertions(+), 31738 deletions(-)

commit 7712287139c5dbd058909f205609d02065097878
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 16:02:11 2010 -0600

    adding images

 doc/build/doctrees/adminguide/network.vlan.doctree |  Bin 44409 -> 43599 bytes
 doc/build/doctrees/adminguide/nova.manage.doctree  |  Bin 40037 -> 40401 bytes
 doc/build/doctrees/environment.pickle              |  Bin 1802539 -> 1803550 bytes
 doc/build/doctrees/man/novamanage.doctree          |  Bin 38494 -> 38822 bytes
 .../html/_sources/adminguide/network.vlan.txt      |    5 +++--
 doc/build/html/_sources/adminguide/nova.manage.txt |    3 +++
 doc/build/html/_sources/man/novamanage.txt         |    3 +++
 doc/build/html/adminguide/network.vlan.html        |   11 ++++------
 doc/build/html/adminguide/nova.manage.html         |    4 ++++
 doc/build/html/index.html                          |   21 +++++++++-----------
 doc/build/html/man/novamanage.html                 |    4 ++++
 doc/build/html/objects.inv                         |    7 +++++--
 doc/build/html/searchindex.js                      |    2 +-
 doc/source/adminguide/nova.manage.rst              |    5 ++++-
 14 files changed, 40 insertions(+), 25 deletions(-)

commit 8257fcc259185e5b13f09d3e15cb81487c799c3b
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 15:58:10 2010 -0600

    Documenting all nova-manage commands

 doc/source/adminguide/network.vlan.rst |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 908f7505792408a5f0070b59325ff4c1b484e723
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 15:54:19 2010 -0600

    Documenting all nova-manage commands

 doc/build/doctrees/adminguide/nova.manage.doctree  |  Bin 22878 -> 40037 bytes
 doc/build/doctrees/api/nova..adminclient.doctree   |  Bin 4144 -> 3469 bytes
 doc/build/doctrees/api/nova..api.cloud.doctree     |  Bin 4122 -> 3449 bytes
 doc/build/doctrees/api/nova..api.ec2.admin.doctree |  Bin 4166 -> 3489 bytes
 .../doctrees/api/nova..api.ec2.apirequest.doctree  |  Bin 4221 -> 3539 bytes
 doc/build/doctrees/api/nova..api.ec2.cloud.doctree |  Bin 4166 -> 3489 bytes
 .../doctrees/api/nova..api.ec2.images.doctree      |  Bin 4177 -> 3499 bytes
 .../nova..api.ec2.metadatarequesthandler.doctree   |  Bin 4353 -> 3659 bytes
 .../doctrees/api/nova..api.openstack.auth.doctree  |  Bin 4221 -> 3539 bytes
 .../nova..api.openstack.backup_schedules.doctree   |  Bin 4353 -> 3659 bytes
 .../api/nova..api.openstack.faults.doctree         |  Bin 4243 -> 3559 bytes
 .../api/nova..api.openstack.flavors.doctree        |  Bin 4254 -> 3569 bytes
 .../api/nova..api.openstack.images.doctree         |  Bin 4243 -> 3559 bytes
 .../api/nova..api.openstack.servers.doctree        |  Bin 4254 -> 3569 bytes
 .../api/nova..api.openstack.sharedipgroups.doctree |  Bin 4331 -> 3639 bytes
 doc/build/doctrees/api/nova..auth.dbdriver.doctree |  Bin 4166 -> 3489 bytes
 doc/build/doctrees/api/nova..auth.fakeldap.doctree |  Bin 4166 -> 3489 bytes
 .../doctrees/api/nova..auth.ldapdriver.doctree     |  Bin 4188 -> 3509 bytes
 doc/build/doctrees/api/nova..auth.manager.doctree  |  Bin 4155 -> 3479 bytes
 doc/build/doctrees/api/nova..auth.signer.doctree   |  Bin 4144 -> 3469 bytes
 .../doctrees/api/nova..cloudpipe.pipelib.doctree   |  Bin 4210 -> 3529 bytes
 doc/build/doctrees/api/nova..compute.disk.doctree  |  Bin 4155 -> 3479 bytes
 .../api/nova..compute.instance_types.doctree       |  Bin 4265 -> 3579 bytes
 .../doctrees/api/nova..compute.manager.doctree     |  Bin 4188 -> 3509 bytes
 .../doctrees/api/nova..compute.monitor.doctree     |  Bin 4188 -> 3509 bytes
 .../doctrees/api/nova..compute.power_state.doctree |  Bin 4232 -> 3549 bytes
 doc/build/doctrees/api/nova..context.doctree       |  Bin 4100 -> 3429 bytes
 doc/build/doctrees/api/nova..crypto.doctree        |  Bin 4089 -> 3419 bytes
 doc/build/doctrees/api/nova..db.api.doctree        |  Bin 4089 -> 3419 bytes
 .../doctrees/api/nova..db.sqlalchemy.api.doctree   |  Bin 4210 -> 3529 bytes
 .../api/nova..db.sqlalchemy.models.doctree         |  Bin 4243 -> 3559 bytes
 .../api/nova..db.sqlalchemy.session.doctree        |  Bin 4254 -> 3569 bytes
 doc/build/doctrees/api/nova..exception.doctree     |  Bin 4122 -> 3449 bytes
 doc/build/doctrees/api/nova..fakerabbit.doctree    |  Bin 4133 -> 3459 bytes
 doc/build/doctrees/api/nova..flags.doctree         |  Bin 4078 -> 3409 bytes
 doc/build/doctrees/api/nova..image.service.doctree |  Bin 4166 -> 3489 bytes
 doc/build/doctrees/api/nova..manager.doctree       |  Bin 4100 -> 3429 bytes
 .../doctrees/api/nova..network.linux_net.doctree   |  Bin 4210 -> 3529 bytes
 .../doctrees/api/nova..network.manager.doctree     |  Bin 4188 -> 3509 bytes
 .../doctrees/api/nova..objectstore.bucket.doctree  |  Bin 4221 -> 3539 bytes
 .../doctrees/api/nova..objectstore.handler.doctree |  Bin 4232 -> 3549 bytes
 .../doctrees/api/nova..objectstore.image.doctree   |  Bin 4210 -> 3529 bytes
 .../doctrees/api/nova..objectstore.stored.doctree  |  Bin 4221 -> 3539 bytes
 doc/build/doctrees/api/nova..process.doctree       |  Bin 4100 -> 3429 bytes
 doc/build/doctrees/api/nova..quota.doctree         |  Bin 4078 -> 3409 bytes
 doc/build/doctrees/api/nova..rpc.doctree           |  Bin 4056 -> 3389 bytes
 .../doctrees/api/nova..scheduler.chance.doctree    |  Bin 4199 -> 3519 bytes
 .../doctrees/api/nova..scheduler.driver.doctree    |  Bin 4199 -> 3519 bytes
 .../doctrees/api/nova..scheduler.manager.doctree   |  Bin 4210 -> 3529 bytes
 .../doctrees/api/nova..scheduler.simple.doctree    |  Bin 4199 -> 3519 bytes
 doc/build/doctrees/api/nova..server.doctree        |  Bin 4089 -> 3419 bytes
 doc/build/doctrees/api/nova..service.doctree       |  Bin 4100 -> 3429 bytes
 doc/build/doctrees/api/nova..test.doctree          |  Bin 4067 -> 3399 bytes
 .../api/nova..tests.access_unittest.doctree        |  Bin 4254 -> 3569 bytes
 .../doctrees/api/nova..tests.api.fakes.doctree     |  Bin 4188 -> 3509 bytes
 .../api/nova..tests.api.openstack.fakes.doctree    |  Bin 4298 -> 3609 bytes
 .../api/nova..tests.api.openstack.test_api.doctree |  Bin 4331 -> 3639 bytes
 .../nova..tests.api.openstack.test_auth.doctree    |  Bin 4342 -> 3649 bytes
 .../nova..tests.api.openstack.test_faults.doctree  |  Bin 4364 -> 3669 bytes
 .../nova..tests.api.openstack.test_flavors.doctree |  Bin 4375 -> 3679 bytes
 .../nova..tests.api.openstack.test_images.doctree  |  Bin 4364 -> 3669 bytes
 .....tests.api.openstack.test_ratelimiting.doctree |  Bin 4430 -> 3729 bytes
 .../nova..tests.api.openstack.test_servers.doctree |  Bin 4375 -> 3679 bytes
 ...tests.api.openstack.test_sharedipgroups.doctree |  Bin 4452 -> 3749 bytes
 .../doctrees/api/nova..tests.api.test_wsgi.doctree |  Bin 4232 -> 3549 bytes
 .../api/nova..tests.api_integration.doctree        |  Bin 4254 -> 3569 bytes
 .../doctrees/api/nova..tests.api_unittest.doctree  |  Bin 4221 -> 3539 bytes
 .../doctrees/api/nova..tests.auth_unittest.doctree |  Bin 4232 -> 3549 bytes
 .../api/nova..tests.cloud_unittest.doctree         |  Bin 4243 -> 3559 bytes
 .../api/nova..tests.compute_unittest.doctree       |  Bin 4265 -> 3579 bytes
 .../doctrees/api/nova..tests.declare_flags.doctree |  Bin 4232 -> 3549 bytes
 .../doctrees/api/nova..tests.fake_flags.doctree    |  Bin 4199 -> 3519 bytes
 .../api/nova..tests.flags_unittest.doctree         |  Bin 4243 -> 3559 bytes
 .../api/nova..tests.network_unittest.doctree       |  Bin 4265 -> 3579 bytes
 .../api/nova..tests.objectstore_unittest.doctree   |  Bin 4309 -> 3619 bytes
 .../api/nova..tests.process_unittest.doctree       |  Bin 4265 -> 3579 bytes
 .../api/nova..tests.quota_unittest.doctree         |  Bin 4243 -> 3559 bytes
 .../doctrees/api/nova..tests.real_flags.doctree    |  Bin 4199 -> 3519 bytes
 .../doctrees/api/nova..tests.rpc_unittest.doctree  |  Bin 4221 -> 3539 bytes
 .../doctrees/api/nova..tests.runtime_flags.doctree |  Bin 4232 -> 3549 bytes
 .../api/nova..tests.scheduler_unittest.doctree     |  Bin 4287 -> 3599 bytes
 .../api/nova..tests.service_unittest.doctree       |  Bin 4265 -> 3579 bytes
 .../api/nova..tests.twistd_unittest.doctree        |  Bin 4254 -> 3569 bytes
 .../api/nova..tests.validator_unittest.doctree     |  Bin 4287 -> 3599 bytes
 .../doctrees/api/nova..tests.virt_unittest.doctree |  Bin 4232 -> 3549 bytes
 .../api/nova..tests.volume_unittest.doctree        |  Bin 4254 -> 3569 bytes
 doc/build/doctrees/api/nova..twistd.doctree        |  Bin 4089 -> 3419 bytes
 doc/build/doctrees/api/nova..utils.doctree         |  Bin 4078 -> 3409 bytes
 doc/build/doctrees/api/nova..validate.doctree      |  Bin 4111 -> 3439 bytes
 .../doctrees/api/nova..virt.connection.doctree     |  Bin 4188 -> 3509 bytes
 doc/build/doctrees/api/nova..virt.fake.doctree     |  Bin 4122 -> 3449 bytes
 doc/build/doctrees/api/nova..virt.images.doctree   |  Bin 4144 -> 3469 bytes
 .../doctrees/api/nova..virt.libvirt_conn.doctree   |  Bin 4210 -> 3529 bytes
 doc/build/doctrees/api/nova..virt.xenapi.doctree   |  Bin 4144 -> 3469 bytes
 doc/build/doctrees/api/nova..volume.driver.doctree |  Bin 4166 -> 3489 bytes
 .../doctrees/api/nova..volume.manager.doctree      |  Bin 4177 -> 3499 bytes
 doc/build/doctrees/api/nova..wsgi.doctree          |  Bin 4067 -> 3399 bytes
 doc/build/doctrees/devref/api.doctree              |  Bin 65750 -> 44655 bytes
 doc/build/doctrees/devref/auth.doctree             |  Bin 57755 -> 52150 bytes
 doc/build/doctrees/devref/cloudpipe.doctree        |  Bin 20717 -> 18597 bytes
 doc/build/doctrees/devref/compute.doctree          |  Bin 30516 -> 68876 bytes
 doc/build/doctrees/devref/database.doctree         |  Bin 13184 -> 10449 bytes
 doc/build/doctrees/devref/fakes.doctree            |  Bin 17916 -> 58479 bytes
 doc/build/doctrees/devref/glance.doctree           |  Bin 6177 -> 5457 bytes
 doc/build/doctrees/devref/network.doctree          |  Bin 24991 -> 22897 bytes
 doc/build/doctrees/devref/nova.doctree             |  Bin 46154 -> 56579 bytes
 doc/build/doctrees/devref/objectstore.doctree      |  Bin 14674 -> 11101 bytes
 doc/build/doctrees/devref/scheduler.doctree        |  Bin 14504 -> 10942 bytes
 doc/build/doctrees/devref/services.doctree         |  Bin 12171 -> 10756 bytes
 doc/build/doctrees/devref/volume.doctree           |  Bin 13881 -> 11687 bytes
 doc/build/doctrees/environment.pickle              |  Bin 1748498 -> 1802539 bytes
 doc/build/doctrees/man/novamanage.doctree          |  Bin 29090 -> 38494 bytes
 doc/build/html/_sources/adminguide/nova.manage.txt |  138 ++++++++++--
 doc/build/html/_sources/man/novamanage.txt         |  174 +++++++++++----
 doc/build/html/adminguide/binaries.html            |    6 +
 doc/build/html/adminguide/distros/others.html      |    6 +
 .../html/adminguide/distros/ubuntu.10.04.html      |    6 +
 .../html/adminguide/distros/ubuntu.10.10.html      |    6 +
 doc/build/html/adminguide/euca2ools.html           |    6 +
 doc/build/html/adminguide/flags.html               |    6 +
 doc/build/html/adminguide/getting.started.html     |    6 +
 doc/build/html/adminguide/index.html               |    6 +
 doc/build/html/adminguide/managing.images.html     |    6 +
 doc/build/html/adminguide/managing.instances.html  |    6 +
 doc/build/html/adminguide/managing.networks.html   |    6 +
 doc/build/html/adminguide/managing.projects.html   |    6 +
 doc/build/html/adminguide/managing.users.html      |    6 +
 doc/build/html/adminguide/managingsecurity.html    |    6 +
 doc/build/html/adminguide/monitoring.html          |    6 +
 doc/build/html/adminguide/multi.node.install.html  |    6 +
 doc/build/html/adminguide/network.flat.html        |    6 +
 doc/build/html/adminguide/network.vlan.html        |    6 +
 doc/build/html/adminguide/nova.manage.html         |  167 ++++++++++-----
 doc/build/html/adminguide/single.node.install.html |    6 +
 doc/build/html/api/autoindex.html                  |    6 +
 doc/build/html/api/nova..adminclient.html          |    6 +
 doc/build/html/api/nova..api.cloud.html            |    6 +
 doc/build/html/api/nova..api.ec2.admin.html        |    6 +
 doc/build/html/api/nova..api.ec2.apirequest.html   |    6 +
 doc/build/html/api/nova..api.ec2.cloud.html        |    6 +
 doc/build/html/api/nova..api.ec2.images.html       |    6 +
 .../api/nova..api.ec2.metadatarequesthandler.html  |    6 +
 doc/build/html/api/nova..api.openstack.auth.html   |    6 +
 .../api/nova..api.openstack.backup_schedules.html  |    6 +
 doc/build/html/api/nova..api.openstack.faults.html |    6 +
 .../html/api/nova..api.openstack.flavors.html      |    6 +
 doc/build/html/api/nova..api.openstack.images.html |    6 +
 .../html/api/nova..api.openstack.servers.html      |    6 +
 .../api/nova..api.openstack.sharedipgroups.html    |    6 +
 doc/build/html/api/nova..auth.dbdriver.html        |    6 +
 doc/build/html/api/nova..auth.fakeldap.html        |    6 +
 doc/build/html/api/nova..auth.ldapdriver.html      |    6 +
 doc/build/html/api/nova..auth.manager.html         |    6 +
 doc/build/html/api/nova..auth.signer.html          |    6 +
 doc/build/html/api/nova..cloudpipe.pipelib.html    |    6 +
 doc/build/html/api/nova..compute.disk.html         |    6 +
 .../html/api/nova..compute.instance_types.html     |    6 +
 doc/build/html/api/nova..compute.manager.html      |    6 +
 doc/build/html/api/nova..compute.monitor.html      |    6 +
 doc/build/html/api/nova..compute.power_state.html  |    6 +
 doc/build/html/api/nova..context.html              |    6 +
 doc/build/html/api/nova..crypto.html               |    6 +
 doc/build/html/api/nova..db.api.html               |    6 +
 doc/build/html/api/nova..db.sqlalchemy.api.html    |    6 +
 doc/build/html/api/nova..db.sqlalchemy.models.html |    6 +
 .../html/api/nova..db.sqlalchemy.session.html      |    6 +
 doc/build/html/api/nova..exception.html            |    6 +
 doc/build/html/api/nova..fakerabbit.html           |    6 +
 doc/build/html/api/nova..flags.html                |    6 +
 doc/build/html/api/nova..image.service.html        |    6 +
 doc/build/html/api/nova..manager.html              |    6 +
 doc/build/html/api/nova..network.linux_net.html    |    6 +
 doc/build/html/api/nova..network.manager.html      |    6 +
 doc/build/html/api/nova..objectstore.bucket.html   |    6 +
 doc/build/html/api/nova..objectstore.handler.html  |    6 +
 doc/build/html/api/nova..objectstore.image.html    |    6 +
 doc/build/html/api/nova..objectstore.stored.html   |    6 +
 doc/build/html/api/nova..process.html              |    6 +
 doc/build/html/api/nova..quota.html                |    6 +
 doc/build/html/api/nova..rpc.html                  |    6 +
 doc/build/html/api/nova..scheduler.chance.html     |    6 +
 doc/build/html/api/nova..scheduler.driver.html     |    6 +
 doc/build/html/api/nova..scheduler.manager.html    |    6 +
 doc/build/html/api/nova..scheduler.simple.html     |    6 +
 doc/build/html/api/nova..server.html               |    6 +
 doc/build/html/api/nova..service.html              |    6 +
 doc/build/html/api/nova..test.html                 |    6 +
 .../html/api/nova..tests.access_unittest.html      |    6 +
 doc/build/html/api/nova..tests.api.fakes.html      |    6 +
 .../html/api/nova..tests.api.openstack.fakes.html  |    6 +
 .../api/nova..tests.api.openstack.test_api.html    |    6 +
 .../api/nova..tests.api.openstack.test_auth.html   |    6 +
 .../api/nova..tests.api.openstack.test_faults.html |    6 +
 .../nova..tests.api.openstack.test_flavors.html    |    6 +
 .../api/nova..tests.api.openstack.test_images.html |    6 +
 ...ova..tests.api.openstack.test_ratelimiting.html |    6 +
 .../nova..tests.api.openstack.test_servers.html    |    6 +
 ...a..tests.api.openstack.test_sharedipgroups.html |    6 +
 doc/build/html/api/nova..tests.api.test_wsgi.html  |    6 +
 .../html/api/nova..tests.api_integration.html      |    6 +
 doc/build/html/api/nova..tests.api_unittest.html   |    6 +
 doc/build/html/api/nova..tests.auth_unittest.html  |    6 +
 doc/build/html/api/nova..tests.cloud_unittest.html |    6 +
 .../html/api/nova..tests.compute_unittest.html     |    6 +
 doc/build/html/api/nova..tests.declare_flags.html  |    6 +
 doc/build/html/api/nova..tests.fake_flags.html     |    6 +
 doc/build/html/api/nova..tests.flags_unittest.html |    6 +
 .../html/api/nova..tests.network_unittest.html     |    6 +
 .../html/api/nova..tests.objectstore_unittest.html |    6 +
 .../html/api/nova..tests.process_unittest.html     |    6 +
 doc/build/html/api/nova..tests.quota_unittest.html |    6 +
 doc/build/html/api/nova..tests.real_flags.html     |    6 +
 doc/build/html/api/nova..tests.rpc_unittest.html   |    6 +
 doc/build/html/api/nova..tests.runtime_flags.html  |    6 +
 .../html/api/nova..tests.scheduler_unittest.html   |    6 +
 .../html/api/nova..tests.service_unittest.html     |    6 +
 .../html/api/nova..tests.twistd_unittest.html      |    6 +
 .../html/api/nova..tests.validator_unittest.html   |    6 +
 doc/build/html/api/nova..tests.virt_unittest.html  |    6 +
 .../html/api/nova..tests.volume_unittest.html      |    6 +
 doc/build/html/api/nova..twistd.html               |    6 +
 doc/build/html/api/nova..utils.html                |    6 +
 doc/build/html/api/nova..validate.html             |    6 +
 doc/build/html/api/nova..virt.connection.html      |    6 +
 doc/build/html/api/nova..virt.fake.html            |    6 +
 doc/build/html/api/nova..virt.images.html          |    6 +
 doc/build/html/api/nova..virt.libvirt_conn.html    |    6 +
 doc/build/html/api/nova..virt.xenapi.html          |    6 +
 doc/build/html/api/nova..volume.driver.html        |    6 +
 doc/build/html/api/nova..volume.manager.html       |    6 +
 doc/build/html/api/nova..wsgi.html                 |    6 +
 doc/build/html/cloud101.html                       |    6 +
 doc/build/html/code.html                           |    6 +
 doc/build/html/community.html                      |    6 +
 doc/build/html/devref/api.html                     |    6 +
 doc/build/html/devref/architecture.html            |    6 +
 doc/build/html/devref/auth.html                    |    6 +
 doc/build/html/devref/cloudpipe.html               |    6 +
 doc/build/html/devref/compute.html                 |  224 +++++++++++++++++++-
 doc/build/html/devref/database.html                |    6 +
 doc/build/html/devref/development.environment.html |    6 +
 doc/build/html/devref/fakes.html                   |  205 +++++++++++++++++-
 doc/build/html/devref/glance.html                  |    6 +
 doc/build/html/devref/index.html                   |   18 +-
 doc/build/html/devref/modules.html                 |    6 +
 doc/build/html/devref/network.html                 |    6 +
 doc/build/html/devref/nova.html                    |   92 +++++++-
 doc/build/html/devref/objectstore.html             |    6 +
 doc/build/html/devref/scheduler.html               |    6 +
 doc/build/html/devref/services.html                |    6 +
 doc/build/html/devref/volume.html                  |    6 +
 doc/build/html/genindex.html                       |    6 +
 doc/build/html/index.html                          |    6 +
 doc/build/html/installer.html                      |    6 +
 doc/build/html/livecd.html                         |    6 +
 doc/build/html/man/novamanage.html                 |  174 ++++++++++-----
 doc/build/html/nova.concepts.html                  |    6 +
 doc/build/html/object.model.html                   |    6 +
 doc/build/html/objects.inv                         |    4 +-
 doc/build/html/quickstart.html                     |    6 +
 doc/build/html/search.html                         |    6 +
 doc/build/html/searchindex.js                      |    2 +-
 doc/build/html/service.architecture.html           |    6 +
 doc/source/adminguide/nova.manage.rst              |  141 ++++++++++--
 doc/source/man/novamanage.rst                      |  177 ++++++++++++----
 265 files changed, 2116 insertions(+), 246 deletions(-)

commit 279a56469dbb5b1ae0e26e70107e1f6205a8b9fc
Merge: 551fd30 1dfdd74
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 21:49:25 2010 +0000

    Fixes eventlet race condition in cloud tests.

commit 1dfdd7477647e45b96b5781789b846d5c9066663
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 21:23:12 2010 +0000

    fix greenthread race conditions in trunk and floating ip leakage

 nova/db/sqlalchemy/api.py    |    2 +-
 nova/tests/cloud_unittest.py |    4 ++++
 nova/tests/quota_unittest.py |    8 +++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

commit a777513b7cff3f49fd8eb755876e26da4bfc6686
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 14:28:09 2010 -0600

    Testing man page build through conf.py

 doc/.autogenerated                                 |   97 ++++
 doc/build/doctrees/adminguide/binaries.doctree     |  Bin 0 -> 11915 bytes
 .../doctrees/adminguide/distros/others.doctree     |  Bin 0 -> 13777 bytes
 .../adminguide/distros/ubuntu.10.04.doctree        |  Bin 0 -> 8787 bytes
 .../adminguide/distros/ubuntu.10.10.doctree        |  Bin 0 -> 9906 bytes
 doc/build/doctrees/adminguide/euca2ools.doctree    |  Bin 0 -> 15156 bytes
 doc/build/doctrees/adminguide/flags.doctree        |  Bin 0 -> 4917 bytes
 .../doctrees/adminguide/getting.started.doctree    |  Bin 0 -> 37699 bytes
 doc/build/doctrees/adminguide/index.doctree        |  Bin 0 -> 16133 bytes
 .../doctrees/adminguide/managing.images.doctree    |  Bin 0 -> 4991 bytes
 .../doctrees/adminguide/managing.instances.doctree |  Bin 0 -> 8530 bytes
 .../doctrees/adminguide/managing.networks.doctree  |  Bin 0 -> 23566 bytes
 .../doctrees/adminguide/managing.projects.doctree  |  Bin 0 -> 24817 bytes
 .../doctrees/adminguide/managing.users.doctree     |  Bin 0 -> 34523 bytes
 .../doctrees/adminguide/managingsecurity.doctree   |  Bin 0 -> 7476 bytes
 doc/build/doctrees/adminguide/monitoring.doctree   |  Bin 0 -> 5600 bytes
 .../doctrees/adminguide/multi.node.install.doctree |  Bin 0 -> 49860 bytes
 doc/build/doctrees/adminguide/network.flat.doctree |  Bin 0 -> 12519 bytes
 doc/build/doctrees/adminguide/network.vlan.doctree |  Bin 0 -> 44409 bytes
 doc/build/doctrees/adminguide/nova.manage.doctree  |  Bin 0 -> 22878 bytes
 .../adminguide/single.node.install.doctree         |  Bin 0 -> 41777 bytes
 doc/build/doctrees/api/autoindex.doctree           |  Bin 0 -> 6648 bytes
 doc/build/doctrees/api/nova..adminclient.doctree   |  Bin 0 -> 4144 bytes
 doc/build/doctrees/api/nova..api.cloud.doctree     |  Bin 0 -> 4122 bytes
 doc/build/doctrees/api/nova..api.ec2.admin.doctree |  Bin 0 -> 4166 bytes
 .../doctrees/api/nova..api.ec2.apirequest.doctree  |  Bin 0 -> 4221 bytes
 doc/build/doctrees/api/nova..api.ec2.cloud.doctree |  Bin 0 -> 4166 bytes
 .../doctrees/api/nova..api.ec2.images.doctree      |  Bin 0 -> 4177 bytes
 .../nova..api.ec2.metadatarequesthandler.doctree   |  Bin 0 -> 4353 bytes
 .../doctrees/api/nova..api.openstack.auth.doctree  |  Bin 0 -> 4221 bytes
 .../nova..api.openstack.backup_schedules.doctree   |  Bin 0 -> 4353 bytes
 .../api/nova..api.openstack.faults.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..api.openstack.flavors.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..api.openstack.images.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..api.openstack.servers.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..api.openstack.sharedipgroups.doctree |  Bin 0 -> 4331 bytes
 doc/build/doctrees/api/nova..auth.dbdriver.doctree |  Bin 0 -> 4166 bytes
 doc/build/doctrees/api/nova..auth.fakeldap.doctree |  Bin 0 -> 4166 bytes
 .../doctrees/api/nova..auth.ldapdriver.doctree     |  Bin 0 -> 4188 bytes
 doc/build/doctrees/api/nova..auth.manager.doctree  |  Bin 0 -> 4155 bytes
 doc/build/doctrees/api/nova..auth.signer.doctree   |  Bin 0 -> 4144 bytes
 .../doctrees/api/nova..cloudpipe.pipelib.doctree   |  Bin 0 -> 4210 bytes
 doc/build/doctrees/api/nova..compute.disk.doctree  |  Bin 0 -> 4155 bytes
 .../api/nova..compute.instance_types.doctree       |  Bin 0 -> 4265 bytes
 .../doctrees/api/nova..compute.manager.doctree     |  Bin 0 -> 4188 bytes
 .../doctrees/api/nova..compute.monitor.doctree     |  Bin 0 -> 4188 bytes
 .../doctrees/api/nova..compute.power_state.doctree |  Bin 0 -> 4232 bytes
 doc/build/doctrees/api/nova..context.doctree       |  Bin 0 -> 4100 bytes
 doc/build/doctrees/api/nova..crypto.doctree        |  Bin 0 -> 4089 bytes
 doc/build/doctrees/api/nova..db.api.doctree        |  Bin 0 -> 4089 bytes
 .../doctrees/api/nova..db.sqlalchemy.api.doctree   |  Bin 0 -> 4210 bytes
 .../api/nova..db.sqlalchemy.models.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..db.sqlalchemy.session.doctree        |  Bin 0 -> 4254 bytes
 doc/build/doctrees/api/nova..exception.doctree     |  Bin 0 -> 4122 bytes
 doc/build/doctrees/api/nova..fakerabbit.doctree    |  Bin 0 -> 4133 bytes
 doc/build/doctrees/api/nova..flags.doctree         |  Bin 0 -> 4078 bytes
 doc/build/doctrees/api/nova..image.service.doctree |  Bin 0 -> 4166 bytes
 doc/build/doctrees/api/nova..manager.doctree       |  Bin 0 -> 4100 bytes
 .../doctrees/api/nova..network.linux_net.doctree   |  Bin 0 -> 4210 bytes
 .../doctrees/api/nova..network.manager.doctree     |  Bin 0 -> 4188 bytes
 .../doctrees/api/nova..objectstore.bucket.doctree  |  Bin 0 -> 4221 bytes
 .../doctrees/api/nova..objectstore.handler.doctree |  Bin 0 -> 4232 bytes
 .../doctrees/api/nova..objectstore.image.doctree   |  Bin 0 -> 4210 bytes
 .../doctrees/api/nova..objectstore.stored.doctree  |  Bin 0 -> 4221 bytes
 doc/build/doctrees/api/nova..process.doctree       |  Bin 0 -> 4100 bytes
 doc/build/doctrees/api/nova..quota.doctree         |  Bin 0 -> 4078 bytes
 doc/build/doctrees/api/nova..rpc.doctree           |  Bin 0 -> 4056 bytes
 .../doctrees/api/nova..scheduler.chance.doctree    |  Bin 0 -> 4199 bytes
 .../doctrees/api/nova..scheduler.driver.doctree    |  Bin 0 -> 4199 bytes
 .../doctrees/api/nova..scheduler.manager.doctree   |  Bin 0 -> 4210 bytes
 .../doctrees/api/nova..scheduler.simple.doctree    |  Bin 0 -> 4199 bytes
 doc/build/doctrees/api/nova..server.doctree        |  Bin 0 -> 4089 bytes
 doc/build/doctrees/api/nova..service.doctree       |  Bin 0 -> 4100 bytes
 doc/build/doctrees/api/nova..test.doctree          |  Bin 0 -> 4067 bytes
 .../api/nova..tests.access_unittest.doctree        |  Bin 0 -> 4254 bytes
 .../doctrees/api/nova..tests.api.fakes.doctree     |  Bin 0 -> 4188 bytes
 .../api/nova..tests.api.openstack.fakes.doctree    |  Bin 0 -> 4298 bytes
 .../api/nova..tests.api.openstack.test_api.doctree |  Bin 0 -> 4331 bytes
 .../nova..tests.api.openstack.test_auth.doctree    |  Bin 0 -> 4342 bytes
 .../nova..tests.api.openstack.test_faults.doctree  |  Bin 0 -> 4364 bytes
 .../nova..tests.api.openstack.test_flavors.doctree |  Bin 0 -> 4375 bytes
 .../nova..tests.api.openstack.test_images.doctree  |  Bin 0 -> 4364 bytes
 .....tests.api.openstack.test_ratelimiting.doctree |  Bin 0 -> 4430 bytes
 .../nova..tests.api.openstack.test_servers.doctree |  Bin 0 -> 4375 bytes
 ...tests.api.openstack.test_sharedipgroups.doctree |  Bin 0 -> 4452 bytes
 .../doctrees/api/nova..tests.api.test_wsgi.doctree |  Bin 0 -> 4232 bytes
 .../api/nova..tests.api_integration.doctree        |  Bin 0 -> 4254 bytes
 .../doctrees/api/nova..tests.api_unittest.doctree  |  Bin 0 -> 4221 bytes
 .../doctrees/api/nova..tests.auth_unittest.doctree |  Bin 0 -> 4232 bytes
 .../api/nova..tests.cloud_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..tests.compute_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../doctrees/api/nova..tests.declare_flags.doctree |  Bin 0 -> 4232 bytes
 .../doctrees/api/nova..tests.fake_flags.doctree    |  Bin 0 -> 4199 bytes
 .../api/nova..tests.flags_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..tests.network_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.objectstore_unittest.doctree   |  Bin 0 -> 4309 bytes
 .../api/nova..tests.process_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.quota_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../doctrees/api/nova..tests.real_flags.doctree    |  Bin 0 -> 4199 bytes
 .../doctrees/api/nova..tests.rpc_unittest.doctree  |  Bin 0 -> 4221 bytes
 .../doctrees/api/nova..tests.runtime_flags.doctree |  Bin 0 -> 4232 bytes
 .../api/nova..tests.scheduler_unittest.doctree     |  Bin 0 -> 4287 bytes
 .../api/nova..tests.service_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.twistd_unittest.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..tests.validator_unittest.doctree     |  Bin 0 -> 4287 bytes
 .../doctrees/api/nova..tests.virt_unittest.doctree |  Bin 0 -> 4232 bytes
 .../api/nova..tests.volume_unittest.doctree        |  Bin 0 -> 4254 bytes
 doc/build/doctrees/api/nova..twistd.doctree        |  Bin 0 -> 4089 bytes
 doc/build/doctrees/api/nova..utils.doctree         |  Bin 0 -> 4078 bytes
 doc/build/doctrees/api/nova..validate.doctree      |  Bin 0 -> 4111 bytes
 .../doctrees/api/nova..virt.connection.doctree     |  Bin 0 -> 4188 bytes
 doc/build/doctrees/api/nova..virt.fake.doctree     |  Bin 0 -> 4122 bytes
 doc/build/doctrees/api/nova..virt.images.doctree   |  Bin 0 -> 4144 bytes
 .../doctrees/api/nova..virt.libvirt_conn.doctree   |  Bin 0 -> 4210 bytes
 doc/build/doctrees/api/nova..virt.xenapi.doctree   |  Bin 0 -> 4144 bytes
 doc/build/doctrees/api/nova..volume.driver.doctree |  Bin 0 -> 4166 bytes
 .../doctrees/api/nova..volume.manager.doctree      |  Bin 0 -> 4177 bytes
 doc/build/doctrees/api/nova..wsgi.doctree          |  Bin 0 -> 4067 bytes
 doc/build/doctrees/cloud101.doctree                |  Bin 0 -> 16806 bytes
 doc/build/doctrees/code.doctree                    |  Bin 0 -> 11873 bytes
 doc/build/doctrees/community.doctree               |  Bin 0 -> 24317 bytes
 doc/build/doctrees/devref/api.doctree              |  Bin 0 -> 65750 bytes
 doc/build/doctrees/devref/architecture.doctree     |  Bin 0 -> 11727 bytes
 doc/build/doctrees/devref/auth.doctree             |  Bin 0 -> 57755 bytes
 doc/build/doctrees/devref/cloudpipe.doctree        |  Bin 0 -> 20717 bytes
 doc/build/doctrees/devref/compute.doctree          |  Bin 0 -> 30516 bytes
 doc/build/doctrees/devref/database.doctree         |  Bin 0 -> 13184 bytes
 .../devref/development.environment.doctree         |  Bin 0 -> 5035 bytes
 doc/build/doctrees/devref/fakes.doctree            |  Bin 0 -> 17916 bytes
 doc/build/doctrees/devref/glance.doctree           |  Bin 0 -> 6177 bytes
 doc/build/doctrees/devref/index.doctree            |  Bin 0 -> 10079 bytes
 doc/build/doctrees/devref/modules.doctree          |  Bin 0 -> 3166 bytes
 doc/build/doctrees/devref/network.doctree          |  Bin 0 -> 24991 bytes
 doc/build/doctrees/devref/nova.doctree             |  Bin 0 -> 46154 bytes
 doc/build/doctrees/devref/objectstore.doctree      |  Bin 0 -> 14674 bytes
 doc/build/doctrees/devref/scheduler.doctree        |  Bin 0 -> 14504 bytes
 doc/build/doctrees/devref/services.doctree         |  Bin 0 -> 12171 bytes
 doc/build/doctrees/devref/volume.doctree           |  Bin 0 -> 13881 bytes
 doc/build/doctrees/environment.pickle              |  Bin 0 -> 1748498 bytes
 doc/build/doctrees/index.doctree                   |  Bin 0 -> 18401 bytes
 doc/build/doctrees/installer.doctree               |  Bin 0 -> 4868 bytes
 doc/build/doctrees/livecd.doctree                  |  Bin 0 -> 2484 bytes
 doc/build/doctrees/man/novamanage.doctree          |  Bin 0 -> 29090 bytes
 doc/build/doctrees/nova.concepts.doctree           |  Bin 0 -> 42051 bytes
 doc/build/doctrees/object.model.doctree            |  Bin 0 -> 6809 bytes
 doc/build/doctrees/quickstart.doctree              |  Bin 0 -> 28924 bytes
 doc/build/doctrees/service.architecture.doctree    |  Bin 0 -> 17800 bytes
 doc/build/html/.buildinfo                          |    4 +
 .../html/.doctrees/adminguide/binaries.doctree     |  Bin 0 -> 11915 bytes
 .../.doctrees/adminguide/distros/others.doctree    |  Bin 0 -> 13777 bytes
 .../adminguide/distros/ubuntu.10.04.doctree        |  Bin 0 -> 8787 bytes
 .../adminguide/distros/ubuntu.10.10.doctree        |  Bin 0 -> 9906 bytes
 .../html/.doctrees/adminguide/euca2ools.doctree    |  Bin 0 -> 15156 bytes
 doc/build/html/.doctrees/adminguide/flags.doctree  |  Bin 0 -> 4917 bytes
 .../.doctrees/adminguide/getting.started.doctree   |  Bin 0 -> 37699 bytes
 doc/build/html/.doctrees/adminguide/index.doctree  |  Bin 0 -> 16133 bytes
 .../.doctrees/adminguide/managing.images.doctree   |  Bin 0 -> 4991 bytes
 .../adminguide/managing.instances.doctree          |  Bin 0 -> 8530 bytes
 .../.doctrees/adminguide/managing.networks.doctree |  Bin 0 -> 23566 bytes
 .../.doctrees/adminguide/managing.projects.doctree |  Bin 0 -> 24817 bytes
 .../.doctrees/adminguide/managing.users.doctree    |  Bin 0 -> 34523 bytes
 .../.doctrees/adminguide/managingsecurity.doctree  |  Bin 0 -> 7476 bytes
 .../html/.doctrees/adminguide/monitoring.doctree   |  Bin 0 -> 5600 bytes
 .../adminguide/multi.node.install.doctree          |  Bin 0 -> 49860 bytes
 .../html/.doctrees/adminguide/network.flat.doctree |  Bin 0 -> 12519 bytes
 .../html/.doctrees/adminguide/network.vlan.doctree |  Bin 0 -> 44409 bytes
 .../html/.doctrees/adminguide/nova.manage.doctree  |  Bin 0 -> 22878 bytes
 .../adminguide/single.node.install.doctree         |  Bin 0 -> 41777 bytes
 doc/build/html/.doctrees/api/autoindex.doctree     |  Bin 0 -> 6648 bytes
 .../html/.doctrees/api/nova..adminclient.doctree   |  Bin 0 -> 4144 bytes
 .../html/.doctrees/api/nova..api.cloud.doctree     |  Bin 0 -> 4122 bytes
 .../html/.doctrees/api/nova..api.ec2.admin.doctree |  Bin 0 -> 4166 bytes
 .../.doctrees/api/nova..api.ec2.apirequest.doctree |  Bin 0 -> 4221 bytes
 .../html/.doctrees/api/nova..api.ec2.cloud.doctree |  Bin 0 -> 4166 bytes
 .../.doctrees/api/nova..api.ec2.images.doctree     |  Bin 0 -> 4177 bytes
 .../nova..api.ec2.metadatarequesthandler.doctree   |  Bin 0 -> 4353 bytes
 .../.doctrees/api/nova..api.openstack.auth.doctree |  Bin 0 -> 4221 bytes
 .../nova..api.openstack.backup_schedules.doctree   |  Bin 0 -> 4353 bytes
 .../api/nova..api.openstack.faults.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..api.openstack.flavors.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..api.openstack.images.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..api.openstack.servers.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..api.openstack.sharedipgroups.doctree |  Bin 0 -> 4331 bytes
 .../html/.doctrees/api/nova..auth.dbdriver.doctree |  Bin 0 -> 4166 bytes
 .../html/.doctrees/api/nova..auth.fakeldap.doctree |  Bin 0 -> 4166 bytes
 .../.doctrees/api/nova..auth.ldapdriver.doctree    |  Bin 0 -> 4188 bytes
 .../html/.doctrees/api/nova..auth.manager.doctree  |  Bin 0 -> 4155 bytes
 .../html/.doctrees/api/nova..auth.signer.doctree   |  Bin 0 -> 4144 bytes
 .../.doctrees/api/nova..cloudpipe.pipelib.doctree  |  Bin 0 -> 4210 bytes
 .../html/.doctrees/api/nova..compute.disk.doctree  |  Bin 0 -> 4155 bytes
 .../api/nova..compute.instance_types.doctree       |  Bin 0 -> 4265 bytes
 .../.doctrees/api/nova..compute.manager.doctree    |  Bin 0 -> 4188 bytes
 .../.doctrees/api/nova..compute.monitor.doctree    |  Bin 0 -> 4188 bytes
 .../api/nova..compute.power_state.doctree          |  Bin 0 -> 4232 bytes
 doc/build/html/.doctrees/api/nova..context.doctree |  Bin 0 -> 4100 bytes
 doc/build/html/.doctrees/api/nova..crypto.doctree  |  Bin 0 -> 4089 bytes
 doc/build/html/.doctrees/api/nova..db.api.doctree  |  Bin 0 -> 4089 bytes
 .../.doctrees/api/nova..db.sqlalchemy.api.doctree  |  Bin 0 -> 4210 bytes
 .../api/nova..db.sqlalchemy.models.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..db.sqlalchemy.session.doctree        |  Bin 0 -> 4254 bytes
 .../html/.doctrees/api/nova..exception.doctree     |  Bin 0 -> 4122 bytes
 .../html/.doctrees/api/nova..fakerabbit.doctree    |  Bin 0 -> 4133 bytes
 doc/build/html/.doctrees/api/nova..flags.doctree   |  Bin 0 -> 4078 bytes
 .../html/.doctrees/api/nova..image.service.doctree |  Bin 0 -> 4166 bytes
 doc/build/html/.doctrees/api/nova..manager.doctree |  Bin 0 -> 4100 bytes
 .../.doctrees/api/nova..network.linux_net.doctree  |  Bin 0 -> 4210 bytes
 .../.doctrees/api/nova..network.manager.doctree    |  Bin 0 -> 4188 bytes
 .../.doctrees/api/nova..objectstore.bucket.doctree |  Bin 0 -> 4221 bytes
 .../api/nova..objectstore.handler.doctree          |  Bin 0 -> 4232 bytes
 .../.doctrees/api/nova..objectstore.image.doctree  |  Bin 0 -> 4210 bytes
 .../.doctrees/api/nova..objectstore.stored.doctree |  Bin 0 -> 4221 bytes
 doc/build/html/.doctrees/api/nova..process.doctree |  Bin 0 -> 4100 bytes
 doc/build/html/.doctrees/api/nova..quota.doctree   |  Bin 0 -> 4078 bytes
 doc/build/html/.doctrees/api/nova..rpc.doctree     |  Bin 0 -> 4056 bytes
 .../.doctrees/api/nova..scheduler.chance.doctree   |  Bin 0 -> 4199 bytes
 .../.doctrees/api/nova..scheduler.driver.doctree   |  Bin 0 -> 4199 bytes
 .../.doctrees/api/nova..scheduler.manager.doctree  |  Bin 0 -> 4210 bytes
 .../.doctrees/api/nova..scheduler.simple.doctree   |  Bin 0 -> 4199 bytes
 doc/build/html/.doctrees/api/nova..server.doctree  |  Bin 0 -> 4089 bytes
 doc/build/html/.doctrees/api/nova..service.doctree |  Bin 0 -> 4100 bytes
 doc/build/html/.doctrees/api/nova..test.doctree    |  Bin 0 -> 4067 bytes
 .../api/nova..tests.access_unittest.doctree        |  Bin 0 -> 4254 bytes
 .../.doctrees/api/nova..tests.api.fakes.doctree    |  Bin 0 -> 4188 bytes
 .../api/nova..tests.api.openstack.fakes.doctree    |  Bin 0 -> 4298 bytes
 .../api/nova..tests.api.openstack.test_api.doctree |  Bin 0 -> 4331 bytes
 .../nova..tests.api.openstack.test_auth.doctree    |  Bin 0 -> 4342 bytes
 .../nova..tests.api.openstack.test_faults.doctree  |  Bin 0 -> 4364 bytes
 .../nova..tests.api.openstack.test_flavors.doctree |  Bin 0 -> 4375 bytes
 .../nova..tests.api.openstack.test_images.doctree  |  Bin 0 -> 4364 bytes
 .....tests.api.openstack.test_ratelimiting.doctree |  Bin 0 -> 4430 bytes
 .../nova..tests.api.openstack.test_servers.doctree |  Bin 0 -> 4375 bytes
 ...tests.api.openstack.test_sharedipgroups.doctree |  Bin 0 -> 4452 bytes
 .../api/nova..tests.api.test_wsgi.doctree          |  Bin 0 -> 4232 bytes
 .../api/nova..tests.api_integration.doctree        |  Bin 0 -> 4254 bytes
 .../.doctrees/api/nova..tests.api_unittest.doctree |  Bin 0 -> 4221 bytes
 .../api/nova..tests.auth_unittest.doctree          |  Bin 0 -> 4232 bytes
 .../api/nova..tests.cloud_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..tests.compute_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.declare_flags.doctree          |  Bin 0 -> 4232 bytes
 .../.doctrees/api/nova..tests.fake_flags.doctree   |  Bin 0 -> 4199 bytes
 .../api/nova..tests.flags_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../api/nova..tests.network_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.objectstore_unittest.doctree   |  Bin 0 -> 4309 bytes
 .../api/nova..tests.process_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.quota_unittest.doctree         |  Bin 0 -> 4243 bytes
 .../.doctrees/api/nova..tests.real_flags.doctree   |  Bin 0 -> 4199 bytes
 .../.doctrees/api/nova..tests.rpc_unittest.doctree |  Bin 0 -> 4221 bytes
 .../api/nova..tests.runtime_flags.doctree          |  Bin 0 -> 4232 bytes
 .../api/nova..tests.scheduler_unittest.doctree     |  Bin 0 -> 4287 bytes
 .../api/nova..tests.service_unittest.doctree       |  Bin 0 -> 4265 bytes
 .../api/nova..tests.twistd_unittest.doctree        |  Bin 0 -> 4254 bytes
 .../api/nova..tests.validator_unittest.doctree     |  Bin 0 -> 4287 bytes
 .../api/nova..tests.virt_unittest.doctree          |  Bin 0 -> 4232 bytes
 .../api/nova..tests.volume_unittest.doctree        |  Bin 0 -> 4254 bytes
 doc/build/html/.doctrees/api/nova..twistd.doctree  |  Bin 0 -> 4089 bytes
 doc/build/html/.doctrees/api/nova..utils.doctree   |  Bin 0 -> 4078 bytes
 .../html/.doctrees/api/nova..validate.doctree      |  Bin 0 -> 4111 bytes
 .../.doctrees/api/nova..virt.connection.doctree    |  Bin 0 -> 4188 bytes
 .../html/.doctrees/api/nova..virt.fake.doctree     |  Bin 0 -> 4122 bytes
 .../html/.doctrees/api/nova..virt.images.doctree   |  Bin 0 -> 4144 bytes
 .../.doctrees/api/nova..virt.libvirt_conn.doctree  |  Bin 0 -> 4210 bytes
 .../html/.doctrees/api/nova..virt.xenapi.doctree   |  Bin 0 -> 4144 bytes
 .../html/.doctrees/api/nova..volume.driver.doctree |  Bin 0 -> 4166 bytes
 .../.doctrees/api/nova..volume.manager.doctree     |  Bin 0 -> 4177 bytes
 doc/build/html/.doctrees/api/nova..wsgi.doctree    |  Bin 0 -> 4067 bytes
 doc/build/html/.doctrees/cloud101.doctree          |  Bin 0 -> 16806 bytes
 doc/build/html/.doctrees/code.doctree              |  Bin 0 -> 11873 bytes
 doc/build/html/.doctrees/community.doctree         |  Bin 0 -> 24317 bytes
 doc/build/html/.doctrees/devref/api.doctree        |  Bin 0 -> 65750 bytes
 .../html/.doctrees/devref/architecture.doctree     |  Bin 0 -> 11727 bytes
 doc/build/html/.doctrees/devref/auth.doctree       |  Bin 0 -> 57755 bytes
 doc/build/html/.doctrees/devref/cloudpipe.doctree  |  Bin 0 -> 20717 bytes
 doc/build/html/.doctrees/devref/compute.doctree    |  Bin 0 -> 30516 bytes
 doc/build/html/.doctrees/devref/database.doctree   |  Bin 0 -> 13184 bytes
 .../devref/development.environment.doctree         |  Bin 0 -> 5035 bytes
 doc/build/html/.doctrees/devref/fakes.doctree      |  Bin 0 -> 17916 bytes
 doc/build/html/.doctrees/devref/glance.doctree     |  Bin 0 -> 6177 bytes
 doc/build/html/.doctrees/devref/index.doctree      |  Bin 0 -> 10079 bytes
 doc/build/html/.doctrees/devref/modules.doctree    |  Bin 0 -> 3166 bytes
 doc/build/html/.doctrees/devref/network.doctree    |  Bin 0 -> 24991 bytes
 doc/build/html/.doctrees/devref/nova.doctree       |  Bin 0 -> 46154 bytes
 .../html/.doctrees/devref/objectstore.doctree      |  Bin 0 -> 14674 bytes
 doc/build/html/.doctrees/devref/scheduler.doctree  |  Bin 0 -> 14504 bytes
 doc/build/html/.doctrees/devref/services.doctree   |  Bin 0 -> 12171 bytes
 doc/build/html/.doctrees/devref/volume.doctree     |  Bin 0 -> 13881 bytes
 doc/build/html/.doctrees/environment.pickle        |  Bin 0 -> 1748540 bytes
 doc/build/html/.doctrees/index.doctree             |  Bin 0 -> 18401 bytes
 doc/build/html/.doctrees/installer.doctree         |  Bin 0 -> 4868 bytes
 doc/build/html/.doctrees/livecd.doctree            |  Bin 0 -> 2484 bytes
 doc/build/html/.doctrees/man/novamanage.doctree    |  Bin 0 -> 29090 bytes
 doc/build/html/.doctrees/nova.concepts.doctree     |  Bin 0 -> 42051 bytes
 doc/build/html/.doctrees/object.model.doctree      |  Bin 0 -> 6809 bytes
 doc/build/html/.doctrees/quickstart.doctree        |  Bin 0 -> 28924 bytes
 .../html/.doctrees/service.architecture.doctree    |  Bin 0 -> 17800 bytes
 doc/build/html/_images/cloudpipe.png               |  Bin 0 -> 89812 bytes
 doc/build/html/_images/fabric.png                  |  Bin 0 -> 125915 bytes
 doc/build/html/_sources/adminguide/binaries.txt    |   57 +++
 .../html/_sources/adminguide/distros/others.txt    |   88 ++++
 .../_sources/adminguide/distros/ubuntu.10.04.txt   |   41 ++
 .../_sources/adminguide/distros/ubuntu.10.10.txt   |   41 ++
 doc/build/html/_sources/adminguide/euca2ools.txt   |   49 ++
 doc/build/html/_sources/adminguide/flags.txt       |   23 +
 .../html/_sources/adminguide/getting.started.txt   |  168 +++++++
 doc/build/html/_sources/adminguide/index.txt       |   90 ++++
 .../html/_sources/adminguide/managing.images.txt   |   21 +
 .../_sources/adminguide/managing.instances.txt     |   59 +++
 .../html/_sources/adminguide/managing.networks.txt |   85 ++++
 .../html/_sources/adminguide/managing.projects.txt |   68 +++
 .../html/_sources/adminguide/managing.users.txt    |   82 ++++
 .../html/_sources/adminguide/managingsecurity.txt  |   39 ++
 doc/build/html/_sources/adminguide/monitoring.txt  |   27 +
 .../_sources/adminguide/multi.node.install.txt     |  298 +++++++++++
 .../html/_sources/adminguide/network.flat.txt      |   60 +++
 .../html/_sources/adminguide/network.vlan.txt      |  179 +++++++
 doc/build/html/_sources/adminguide/nova.manage.txt |  116 +++++
 .../_sources/adminguide/single.node.install.txt    |  344 +++++++++++++
 doc/build/html/_sources/api/autoindex.txt          |   99 ++++
 doc/build/html/_sources/api/nova..adminclient.txt  |    6 +
 doc/build/html/_sources/api/nova..api.cloud.txt    |    6 +
 .../html/_sources/api/nova..api.ec2.admin.txt      |    6 +
 .../html/_sources/api/nova..api.ec2.apirequest.txt |    6 +
 .../html/_sources/api/nova..api.ec2.cloud.txt      |    6 +
 .../html/_sources/api/nova..api.ec2.images.txt     |    6 +
 .../api/nova..api.ec2.metadatarequesthandler.txt   |    6 +
 .../html/_sources/api/nova..api.openstack.auth.txt |    6 +
 .../api/nova..api.openstack.backup_schedules.txt   |    6 +
 .../_sources/api/nova..api.openstack.faults.txt    |    6 +
 .../_sources/api/nova..api.openstack.flavors.txt   |    6 +
 .../_sources/api/nova..api.openstack.images.txt    |    6 +
 .../_sources/api/nova..api.openstack.servers.txt   |    6 +
 .../api/nova..api.openstack.sharedipgroups.txt     |    6 +
 .../html/_sources/api/nova..auth.dbdriver.txt      |    6 +
 .../html/_sources/api/nova..auth.fakeldap.txt      |    6 +
 .../html/_sources/api/nova..auth.ldapdriver.txt    |    6 +
 doc/build/html/_sources/api/nova..auth.manager.txt |    6 +
 doc/build/html/_sources/api/nova..auth.signer.txt  |    6 +
 .../html/_sources/api/nova..cloudpipe.pipelib.txt  |    6 +
 doc/build/html/_sources/api/nova..compute.disk.txt |    6 +
 .../_sources/api/nova..compute.instance_types.txt  |    6 +
 .../html/_sources/api/nova..compute.manager.txt    |    6 +
 .../html/_sources/api/nova..compute.monitor.txt    |    6 +
 .../_sources/api/nova..compute.power_state.txt     |    6 +
 doc/build/html/_sources/api/nova..context.txt      |    6 +
 doc/build/html/_sources/api/nova..crypto.txt       |    6 +
 doc/build/html/_sources/api/nova..db.api.txt       |    6 +
 .../html/_sources/api/nova..db.sqlalchemy.api.txt  |    6 +
 .../_sources/api/nova..db.sqlalchemy.models.txt    |    6 +
 .../_sources/api/nova..db.sqlalchemy.session.txt   |    6 +
 doc/build/html/_sources/api/nova..exception.txt    |    6 +
 doc/build/html/_sources/api/nova..fakerabbit.txt   |    6 +
 doc/build/html/_sources/api/nova..flags.txt        |    6 +
 .../html/_sources/api/nova..image.service.txt      |    6 +
 doc/build/html/_sources/api/nova..manager.txt      |    6 +
 .../html/_sources/api/nova..network.linux_net.txt  |    6 +
 .../html/_sources/api/nova..network.manager.txt    |    6 +
 .../html/_sources/api/nova..objectstore.bucket.txt |    6 +
 .../_sources/api/nova..objectstore.handler.txt     |    6 +
 .../html/_sources/api/nova..objectstore.image.txt  |    6 +
 .../html/_sources/api/nova..objectstore.stored.txt |    6 +
 doc/build/html/_sources/api/nova..process.txt      |    6 +
 doc/build/html/_sources/api/nova..quota.txt        |    6 +
 doc/build/html/_sources/api/nova..rpc.txt          |    6 +
 .../html/_sources/api/nova..scheduler.chance.txt   |    6 +
 .../html/_sources/api/nova..scheduler.driver.txt   |    6 +
 .../html/_sources/api/nova..scheduler.manager.txt  |    6 +
 .../html/_sources/api/nova..scheduler.simple.txt   |    6 +
 doc/build/html/_sources/api/nova..server.txt       |    6 +
 doc/build/html/_sources/api/nova..service.txt      |    6 +
 doc/build/html/_sources/api/nova..test.txt         |    6 +
 .../_sources/api/nova..tests.access_unittest.txt   |    6 +
 .../html/_sources/api/nova..tests.api.fakes.txt    |    6 +
 .../api/nova..tests.api.openstack.fakes.txt        |    6 +
 .../api/nova..tests.api.openstack.test_api.txt     |    6 +
 .../api/nova..tests.api.openstack.test_auth.txt    |    6 +
 .../api/nova..tests.api.openstack.test_faults.txt  |    6 +
 .../api/nova..tests.api.openstack.test_flavors.txt |    6 +
 .../api/nova..tests.api.openstack.test_images.txt  |    6 +
 ...nova..tests.api.openstack.test_ratelimiting.txt |    6 +
 .../api/nova..tests.api.openstack.test_servers.txt |    6 +
 ...va..tests.api.openstack.test_sharedipgroups.txt |    6 +
 .../_sources/api/nova..tests.api.test_wsgi.txt     |    6 +
 .../_sources/api/nova..tests.api_integration.txt   |    6 +
 .../html/_sources/api/nova..tests.api_unittest.txt |    6 +
 .../_sources/api/nova..tests.auth_unittest.txt     |    6 +
 .../_sources/api/nova..tests.cloud_unittest.txt    |    6 +
 .../_sources/api/nova..tests.compute_unittest.txt  |    6 +
 .../_sources/api/nova..tests.declare_flags.txt     |    6 +
 .../html/_sources/api/nova..tests.fake_flags.txt   |    6 +
 .../_sources/api/nova..tests.flags_unittest.txt    |    6 +
 .../_sources/api/nova..tests.network_unittest.txt  |    6 +
 .../api/nova..tests.objectstore_unittest.txt       |    6 +
 .../_sources/api/nova..tests.process_unittest.txt  |    6 +
 .../_sources/api/nova..tests.quota_unittest.txt    |    6 +
 .../html/_sources/api/nova..tests.real_flags.txt   |    6 +
 .../html/_sources/api/nova..tests.rpc_unittest.txt |    6 +
 .../_sources/api/nova..tests.runtime_flags.txt     |    6 +
 .../api/nova..tests.scheduler_unittest.txt         |    6 +
 .../_sources/api/nova..tests.service_unittest.txt  |    6 +
 .../_sources/api/nova..tests.twistd_unittest.txt   |    6 +
 .../api/nova..tests.validator_unittest.txt         |    6 +
 .../_sources/api/nova..tests.virt_unittest.txt     |    6 +
 .../_sources/api/nova..tests.volume_unittest.txt   |    6 +
 doc/build/html/_sources/api/nova..twistd.txt       |    6 +
 doc/build/html/_sources/api/nova..utils.txt        |    6 +
 doc/build/html/_sources/api/nova..validate.txt     |    6 +
 .../html/_sources/api/nova..virt.connection.txt    |    6 +
 doc/build/html/_sources/api/nova..virt.fake.txt    |    6 +
 doc/build/html/_sources/api/nova..virt.images.txt  |    6 +
 .../html/_sources/api/nova..virt.libvirt_conn.txt  |    6 +
 doc/build/html/_sources/api/nova..virt.xenapi.txt  |    6 +
 .../html/_sources/api/nova..volume.driver.txt      |    6 +
 .../html/_sources/api/nova..volume.manager.txt     |    6 +
 doc/build/html/_sources/api/nova..wsgi.txt         |    6 +
 doc/build/html/_sources/cloud101.txt               |   85 ++++
 doc/build/html/_sources/code.txt                   |   96 ++++
 doc/build/html/_sources/community.txt              |   84 ++++
 doc/build/html/_sources/devref/api.txt             |  296 +++++++++++
 doc/build/html/_sources/devref/architecture.txt    |   52 ++
 doc/build/html/_sources/devref/auth.txt            |  276 +++++++++++
 doc/build/html/_sources/devref/cloudpipe.txt       |   95 ++++
 doc/build/html/_sources/devref/compute.txt         |  153 ++++++
 doc/build/html/_sources/devref/database.txt        |   63 +++
 .../_sources/devref/development.environment.txt    |   21 +
 doc/build/html/_sources/devref/fakes.txt           |   85 ++++
 doc/build/html/_sources/devref/glance.txt          |   28 ++
 doc/build/html/_sources/devref/index.txt           |   62 +++
 doc/build/html/_sources/devref/modules.txt         |   19 +
 doc/build/html/_sources/devref/network.txt         |  128 +++++
 doc/build/html/_sources/devref/nova.txt            |  235 +++++++++
 doc/build/html/_sources/devref/objectstore.txt     |   71 +++
 doc/build/html/_sources/devref/scheduler.txt       |   71 +++
 doc/build/html/_sources/devref/services.txt        |   55 +++
 doc/build/html/_sources/devref/volume.txt          |   66 +++
 doc/build/html/_sources/index.txt                  |   88 ++++
 doc/build/html/_sources/installer.txt              |   12 +
 doc/build/html/_sources/livecd.txt                 |    2 +
 doc/build/html/_sources/man/novamanage.txt         |   98 ++++
 doc/build/html/_sources/nova.concepts.txt          |  203 ++++++++
 doc/build/html/_sources/object.model.txt           |   53 ++
 doc/build/html/_sources/quickstart.txt             |  178 +++++++
 doc/build/html/_sources/service.architecture.txt   |   60 +++
 doc/build/html/_static/basic.css                   |  509 +++++++++++++++++++
 doc/build/html/_static/contents.png                |  Bin 0 -> 202 bytes
 doc/build/html/_static/doctools.js                 |  247 ++++++++++
 doc/build/html/_static/file.png                    |  Bin 0 -> 392 bytes
 doc/build/html/_static/jquery.js                   |  154 ++++++
 doc/build/html/_static/jquery.tweet.js             |  154 ++++++
 doc/build/html/_static/minus.png                   |  Bin 0 -> 199 bytes
 doc/build/html/_static/navigation.png              |  Bin 0 -> 218 bytes
 doc/build/html/_static/plus.png                    |  Bin 0 -> 199 bytes
 doc/build/html/_static/pygments.css                |   62 +++
 doc/build/html/_static/searchtools.js              |  518 ++++++++++++++++++++
 doc/build/html/_static/sphinxdoc.css               |  339 +++++++++++++
 doc/build/html/_static/tweaks.css                  |   71 +++
 doc/build/html/_static/underscore.js               |   16 +
 doc/build/html/adminguide/binaries.html            |  143 ++++++
 doc/build/html/adminguide/distros/others.html      |  202 ++++++++
 .../html/adminguide/distros/ubuntu.10.04.html      |  162 ++++++
 .../html/adminguide/distros/ubuntu.10.10.html      |  167 +++++++
 doc/build/html/adminguide/euca2ools.html           |  171 +++++++
 doc/build/html/adminguide/flags.html               |  131 +++++
 doc/build/html/adminguide/getting.started.html     |  282 +++++++++++
 doc/build/html/adminguide/index.html               |  208 ++++++++
 doc/build/html/adminguide/managing.images.html     |  130 +++++
 doc/build/html/adminguide/managing.instances.html  |  163 ++++++
 doc/build/html/adminguide/managing.networks.html   |  235 +++++++++
 doc/build/html/adminguide/managing.projects.html   |  233 +++++++++
 doc/build/html/adminguide/managing.users.html      |  265 ++++++++++
 doc/build/html/adminguide/managingsecurity.html    |  127 +++++
 doc/build/html/adminguide/monitoring.html          |  134 +++++
 doc/build/html/adminguide/multi.node.install.html  |  384 +++++++++++++++
 doc/build/html/adminguide/network.flat.html        |  173 +++++++
 doc/build/html/adminguide/network.vlan.html        |  289 +++++++++++
 doc/build/html/adminguide/nova.manage.html         |  254 ++++++++++
 doc/build/html/adminguide/single.node.install.html |  410 ++++++++++++++++
 doc/build/html/api/autoindex.html                  |  223 +++++++++
 doc/build/html/api/nova..adminclient.html          |  128 +++++
 doc/build/html/api/nova..api.cloud.html            |  128 +++++
 doc/build/html/api/nova..api.ec2.admin.html        |  128 +++++
 doc/build/html/api/nova..api.ec2.apirequest.html   |  128 +++++
 doc/build/html/api/nova..api.ec2.cloud.html        |  128 +++++
 doc/build/html/api/nova..api.ec2.images.html       |  128 +++++
 .../api/nova..api.ec2.metadatarequesthandler.html  |  128 +++++
 doc/build/html/api/nova..api.openstack.auth.html   |  128 +++++
 .../api/nova..api.openstack.backup_schedules.html  |  128 +++++
 doc/build/html/api/nova..api.openstack.faults.html |  128 +++++
 .../html/api/nova..api.openstack.flavors.html      |  128 +++++
 doc/build/html/api/nova..api.openstack.images.html |  128 +++++
 .../html/api/nova..api.openstack.servers.html      |  128 +++++
 .../api/nova..api.openstack.sharedipgroups.html    |  128 +++++
 doc/build/html/api/nova..auth.dbdriver.html        |  128 +++++
 doc/build/html/api/nova..auth.fakeldap.html        |  128 +++++
 doc/build/html/api/nova..auth.ldapdriver.html      |  128 +++++
 doc/build/html/api/nova..auth.manager.html         |  128 +++++
 doc/build/html/api/nova..auth.signer.html          |  128 +++++
 doc/build/html/api/nova..cloudpipe.pipelib.html    |  128 +++++
 doc/build/html/api/nova..compute.disk.html         |  128 +++++
 .../html/api/nova..compute.instance_types.html     |  128 +++++
 doc/build/html/api/nova..compute.manager.html      |  128 +++++
 doc/build/html/api/nova..compute.monitor.html      |  128 +++++
 doc/build/html/api/nova..compute.power_state.html  |  128 +++++
 doc/build/html/api/nova..context.html              |  128 +++++
 doc/build/html/api/nova..crypto.html               |  128 +++++
 doc/build/html/api/nova..db.api.html               |  128 +++++
 doc/build/html/api/nova..db.sqlalchemy.api.html    |  128 +++++
 doc/build/html/api/nova..db.sqlalchemy.models.html |  128 +++++
 .../html/api/nova..db.sqlalchemy.session.html      |  128 +++++
 doc/build/html/api/nova..exception.html            |  128 +++++
 doc/build/html/api/nova..fakerabbit.html           |  128 +++++
 doc/build/html/api/nova..flags.html                |  128 +++++
 doc/build/html/api/nova..image.service.html        |  128 +++++
 doc/build/html/api/nova..manager.html              |  128 +++++
 doc/build/html/api/nova..network.linux_net.html    |  128 +++++
 doc/build/html/api/nova..network.manager.html      |  128 +++++
 doc/build/html/api/nova..objectstore.bucket.html   |  128 +++++
 doc/build/html/api/nova..objectstore.handler.html  |  128 +++++
 doc/build/html/api/nova..objectstore.image.html    |  128 +++++
 doc/build/html/api/nova..objectstore.stored.html   |  128 +++++
 doc/build/html/api/nova..process.html              |  128 +++++
 doc/build/html/api/nova..quota.html                |  128 +++++
 doc/build/html/api/nova..rpc.html                  |  128 +++++
 doc/build/html/api/nova..scheduler.chance.html     |  128 +++++
 doc/build/html/api/nova..scheduler.driver.html     |  128 +++++
 doc/build/html/api/nova..scheduler.manager.html    |  128 +++++
 doc/build/html/api/nova..scheduler.simple.html     |  128 +++++
 doc/build/html/api/nova..server.html               |  128 +++++
 doc/build/html/api/nova..service.html              |  128 +++++
 doc/build/html/api/nova..test.html                 |  128 +++++
 .../html/api/nova..tests.access_unittest.html      |  128 +++++
 doc/build/html/api/nova..tests.api.fakes.html      |  128 +++++
 .../html/api/nova..tests.api.openstack.fakes.html  |  128 +++++
 .../api/nova..tests.api.openstack.test_api.html    |  128 +++++
 .../api/nova..tests.api.openstack.test_auth.html   |  128 +++++
 .../api/nova..tests.api.openstack.test_faults.html |  128 +++++
 .../nova..tests.api.openstack.test_flavors.html    |  128 +++++
 .../api/nova..tests.api.openstack.test_images.html |  128 +++++
 ...ova..tests.api.openstack.test_ratelimiting.html |  128 +++++
 .../nova..tests.api.openstack.test_servers.html    |  128 +++++
 ...a..tests.api.openstack.test_sharedipgroups.html |  128 +++++
 doc/build/html/api/nova..tests.api.test_wsgi.html  |  128 +++++
 .../html/api/nova..tests.api_integration.html      |  128 +++++
 doc/build/html/api/nova..tests.api_unittest.html   |  128 +++++
 doc/build/html/api/nova..tests.auth_unittest.html  |  128 +++++
 doc/build/html/api/nova..tests.cloud_unittest.html |  128 +++++
 .../html/api/nova..tests.compute_unittest.html     |  128 +++++
 doc/build/html/api/nova..tests.declare_flags.html  |  128 +++++
 doc/build/html/api/nova..tests.fake_flags.html     |  128 +++++
 doc/build/html/api/nova..tests.flags_unittest.html |  128 +++++
 .../html/api/nova..tests.network_unittest.html     |  128 +++++
 .../html/api/nova..tests.objectstore_unittest.html |  128 +++++
 .../html/api/nova..tests.process_unittest.html     |  128 +++++
 doc/build/html/api/nova..tests.quota_unittest.html |  128 +++++
 doc/build/html/api/nova..tests.real_flags.html     |  128 +++++
 doc/build/html/api/nova..tests.rpc_unittest.html   |  128 +++++
 doc/build/html/api/nova..tests.runtime_flags.html  |  128 +++++
 .../html/api/nova..tests.scheduler_unittest.html   |  128 +++++
 .../html/api/nova..tests.service_unittest.html     |  128 +++++
 .../html/api/nova..tests.twistd_unittest.html      |  128 +++++
 .../html/api/nova..tests.validator_unittest.html   |  128 +++++
 doc/build/html/api/nova..tests.virt_unittest.html  |  128 +++++
 .../html/api/nova..tests.volume_unittest.html      |  128 +++++
 doc/build/html/api/nova..twistd.html               |  128 +++++
 doc/build/html/api/nova..utils.html                |  128 +++++
 doc/build/html/api/nova..validate.html             |  128 +++++
 doc/build/html/api/nova..virt.connection.html      |  128 +++++
 doc/build/html/api/nova..virt.fake.html            |  128 +++++
 doc/build/html/api/nova..virt.images.html          |  128 +++++
 doc/build/html/api/nova..virt.libvirt_conn.html    |  128 +++++
 doc/build/html/api/nova..virt.xenapi.html          |  128 +++++
 doc/build/html/api/nova..volume.driver.html        |  128 +++++
 doc/build/html/api/nova..volume.manager.html       |  128 +++++
 doc/build/html/api/nova..wsgi.html                 |  128 +++++
 doc/build/html/cloud101.html                       |  203 ++++++++
 doc/build/html/code.html                           |  196 ++++++++
 doc/build/html/community.html                      |  182 +++++++
 doc/build/html/devref/api.html                     |  280 +++++++++++
 doc/build/html/devref/architecture.html            |  140 ++++++
 doc/build/html/devref/auth.html                    |  341 +++++++++++++
 doc/build/html/devref/cloudpipe.html               |  182 +++++++
 doc/build/html/devref/compute.html                 |  207 ++++++++
 doc/build/html/devref/database.html                |  161 ++++++
 doc/build/html/devref/development.environment.html |  107 ++++
 doc/build/html/devref/fakes.html                   |  163 ++++++
 doc/build/html/devref/glance.html                  |  137 ++++++
 doc/build/html/devref/index.html                   |  483 ++++++++++++++++++
 doc/build/html/devref/modules.html                 |  120 +++++
 doc/build/html/devref/network.html                 |  230 +++++++++
 doc/build/html/devref/nova.html                    |  225 +++++++++
 doc/build/html/devref/objectstore.html             |  159 ++++++
 doc/build/html/devref/scheduler.html               |  159 ++++++
 doc/build/html/devref/services.html                |  150 ++++++
 doc/build/html/devref/volume.html                  |  163 ++++++
 doc/build/html/genindex.html                       |  104 ++++
 doc/build/html/index.html                          |  273 +++++++++++
 doc/build/html/installer.html                      |  113 +++++
 doc/build/html/livecd.html                         |  123 +++++
 doc/build/html/man/novamanage.html                 |  221 +++++++++
 doc/build/html/nova.concepts.html                  |  305 ++++++++++++
 doc/build/html/object.model.html                   |  162 ++++++
 doc/build/html/objects.inv                         |    6 +
 doc/build/html/quickstart.html                     |  266 ++++++++++
 doc/build/html/search.html                         |  110 +++++
 doc/build/html/searchindex.js                      |    1 +
 doc/build/html/service.architecture.html           |  191 ++++++++
 doc/source/api/autoindex.rst                       |   99 ++++
 doc/source/api/nova..adminclient.rst               |    6 +
 doc/source/api/nova..api.cloud.rst                 |    6 +
 doc/source/api/nova..api.ec2.admin.rst             |    6 +
 doc/source/api/nova..api.ec2.apirequest.rst        |    6 +
 doc/source/api/nova..api.ec2.cloud.rst             |    6 +
 doc/source/api/nova..api.ec2.images.rst            |    6 +
 .../api/nova..api.ec2.metadatarequesthandler.rst   |    6 +
 doc/source/api/nova..api.openstack.auth.rst        |    6 +
 .../api/nova..api.openstack.backup_schedules.rst   |    6 +
 doc/source/api/nova..api.openstack.faults.rst      |    6 +
 doc/source/api/nova..api.openstack.flavors.rst     |    6 +
 doc/source/api/nova..api.openstack.images.rst      |    6 +
 doc/source/api/nova..api.openstack.servers.rst     |    6 +
 .../api/nova..api.openstack.sharedipgroups.rst     |    6 +
 doc/source/api/nova..auth.dbdriver.rst             |    6 +
 doc/source/api/nova..auth.fakeldap.rst             |    6 +
 doc/source/api/nova..auth.ldapdriver.rst           |    6 +
 doc/source/api/nova..auth.manager.rst              |    6 +
 doc/source/api/nova..auth.signer.rst               |    6 +
 doc/source/api/nova..cloudpipe.pipelib.rst         |    6 +
 doc/source/api/nova..compute.disk.rst              |    6 +
 doc/source/api/nova..compute.instance_types.rst    |    6 +
 doc/source/api/nova..compute.manager.rst           |    6 +
 doc/source/api/nova..compute.monitor.rst           |    6 +
 doc/source/api/nova..compute.power_state.rst       |    6 +
 doc/source/api/nova..context.rst                   |    6 +
 doc/source/api/nova..crypto.rst                    |    6 +
 doc/source/api/nova..db.api.rst                    |    6 +
 doc/source/api/nova..db.sqlalchemy.api.rst         |    6 +
 doc/source/api/nova..db.sqlalchemy.models.rst      |    6 +
 doc/source/api/nova..db.sqlalchemy.session.rst     |    6 +
 doc/source/api/nova..exception.rst                 |    6 +
 doc/source/api/nova..fakerabbit.rst                |    6 +
 doc/source/api/nova..flags.rst                     |    6 +
 doc/source/api/nova..image.service.rst             |    6 +
 doc/source/api/nova..manager.rst                   |    6 +
 doc/source/api/nova..network.linux_net.rst         |    6 +
 doc/source/api/nova..network.manager.rst           |    6 +
 doc/source/api/nova..objectstore.bucket.rst        |    6 +
 doc/source/api/nova..objectstore.handler.rst       |    6 +
 doc/source/api/nova..objectstore.image.rst         |    6 +
 doc/source/api/nova..objectstore.stored.rst        |    6 +
 doc/source/api/nova..process.rst                   |    6 +
 doc/source/api/nova..quota.rst                     |    6 +
 doc/source/api/nova..rpc.rst                       |    6 +
 doc/source/api/nova..scheduler.chance.rst          |    6 +
 doc/source/api/nova..scheduler.driver.rst          |    6 +
 doc/source/api/nova..scheduler.manager.rst         |    6 +
 doc/source/api/nova..scheduler.simple.rst          |    6 +
 doc/source/api/nova..server.rst                    |    6 +
 doc/source/api/nova..service.rst                   |    6 +
 doc/source/api/nova..test.rst                      |    6 +
 doc/source/api/nova..tests.access_unittest.rst     |    6 +
 doc/source/api/nova..tests.api.fakes.rst           |    6 +
 doc/source/api/nova..tests.api.openstack.fakes.rst |    6 +
 .../api/nova..tests.api.openstack.test_api.rst     |    6 +
 .../api/nova..tests.api.openstack.test_auth.rst    |    6 +
 .../api/nova..tests.api.openstack.test_faults.rst  |    6 +
 .../api/nova..tests.api.openstack.test_flavors.rst |    6 +
 .../api/nova..tests.api.openstack.test_images.rst  |    6 +
 ...nova..tests.api.openstack.test_ratelimiting.rst |    6 +
 .../api/nova..tests.api.openstack.test_servers.rst |    6 +
 ...va..tests.api.openstack.test_sharedipgroups.rst |    6 +
 doc/source/api/nova..tests.api.test_wsgi.rst       |    6 +
 doc/source/api/nova..tests.api_integration.rst     |    6 +
 doc/source/api/nova..tests.api_unittest.rst        |    6 +
 doc/source/api/nova..tests.auth_unittest.rst       |    6 +
 doc/source/api/nova..tests.cloud_unittest.rst      |    6 +
 doc/source/api/nova..tests.compute_unittest.rst    |    6 +
 doc/source/api/nova..tests.declare_flags.rst       |    6 +
 doc/source/api/nova..tests.fake_flags.rst          |    6 +
 doc/source/api/nova..tests.flags_unittest.rst      |    6 +
 doc/source/api/nova..tests.network_unittest.rst    |    6 +
 .../api/nova..tests.objectstore_unittest.rst       |    6 +
 doc/source/api/nova..tests.process_unittest.rst    |    6 +
 doc/source/api/nova..tests.quota_unittest.rst      |    6 +
 doc/source/api/nova..tests.real_flags.rst          |    6 +
 doc/source/api/nova..tests.rpc_unittest.rst        |    6 +
 doc/source/api/nova..tests.runtime_flags.rst       |    6 +
 doc/source/api/nova..tests.scheduler_unittest.rst  |    6 +
 doc/source/api/nova..tests.service_unittest.rst    |    6 +
 doc/source/api/nova..tests.twistd_unittest.rst     |    6 +
 doc/source/api/nova..tests.validator_unittest.rst  |    6 +
 doc/source/api/nova..tests.virt_unittest.rst       |    6 +
 doc/source/api/nova..tests.volume_unittest.rst     |    6 +
 doc/source/api/nova..twistd.rst                    |    6 +
 doc/source/api/nova..utils.rst                     |    6 +
 doc/source/api/nova..validate.rst                  |    6 +
 doc/source/api/nova..virt.connection.rst           |    6 +
 doc/source/api/nova..virt.fake.rst                 |    6 +
 doc/source/api/nova..virt.images.rst               |    6 +
 doc/source/api/nova..virt.libvirt_conn.rst         |    6 +
 doc/source/api/nova..virt.xenapi.rst               |    6 +
 doc/source/api/nova..volume.driver.rst             |    6 +
 doc/source/api/nova..volume.manager.rst            |    6 +
 doc/source/api/nova..wsgi.rst                      |    6 +
 doc/source/code.rst                                |   96 ++++
 doc/source/conf.py                                 |    9 +
 doc/source/conf_back.py                            |  226 +++++++++
 doc/source/man/novamanage.rst                      |   98 ++++
 705 files changed, 31257 insertions(+)

commit 973b2d6892dfacb3d9a2f7e87514f6e18faa37e4
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Nov 17 13:56:42 2010 -0600

    Improved Pylint Score

 nova/db/sqlalchemy/api.py              |    9 ++++-----
 nova/image/services/glance/__init__.py |    1 +
 nova/network/linux_net.py              |    2 +-
 nova/objectstore/bucket.py             |    4 ++--
 nova/objectstore/image.py              |    4 ++--
 nova/virt/libvirt_conn.py              |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

commit 37fcda35e7e409b746e0d99ca4392dcb4fc8ed01
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 19:17:51 2010 +0000

    adjusting images size and bulleted list

 doc/source/devref/rabbit.rst |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit e0ad4e8dd9f73c3c1e775f3deebe5a08f2321ac6
Merge: 0c19386 551fd30
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 18:33:47 2010 +0000

    merged with trunk

commit 0c19386f7c4ca063edbf8c10ffb86b399884e457
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 16:20:50 2010 +0000

    small edit

 doc/source/devref/rabbit.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 56c2df202d89f0954ab5a10284b3ee4d6111bc8b
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 13:20:55 2010 +0000

    Further editing and added images

 doc/source/devref/index.rst        |    7 ++
 doc/source/devref/rabbit.rst       |  148 ++++++++++++++++++++++--------------
 doc/source/images/rabbit/arch.png  |  Bin 0 -> 26690 bytes
 doc/source/images/rabbit/flow1.png |  Bin 0 -> 40982 bytes
 doc/source/images/rabbit/flow2.png |  Bin 0 -> 30650 bytes
 doc/source/images/rabbit/rabt.png  |  Bin 0 -> 44964 bytes
 doc/source/images/rabbit/state.png |  Bin 0 -> 38543 bytes
 7 files changed, 99 insertions(+), 56 deletions(-)

commit fb5f32be1ce12055ea92b2ff0b846fde1d70e565
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 17 12:34:15 2010 +0100

    Update version to 2011.1 as that is the version we expect to release next.

 doc/source/conf.py |    4 ++--
 setup.py           |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 551fd309fcbfedb99555a81fac6a40f003598fd6
Merge: 9c3fa8b db8c0a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 02:54:07 2010 +0000

    ec2_api commands for describe_addresses and associate_address are broken in trunk.  This happened during the switch to ec2_id and internal_id.  We clearly didn't have any unit tests for this, so I've added a couple in addition to the three line change to actually fix the bugs.

commit db8c0a153df467c645df82b2ed6c2b282eae6850
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 02:41:04 2010 +0000

    delete floating ips after tests

 nova/tests/cloud_unittest.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit e59e7e9c3ad3e25545555986dcce0c384f9a7b6e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 02:33:09 2010 +0000

    remove extra line and ref. to LOG that doesn't exist

 bin/nova-manage      |    1 -
 nova/auth/manager.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 5bd44c890be3fa5c632897c106409ff556e6a19a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 02:23:20 2010 +0000

    fix leaking floating ip from network unittests and use of fakeldap driver

 nova/tests/network_unittest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c3fa8b6da2a5b81c989520afa9ca5fb5b90f063
Merge: 98ae92c 7c5c8bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 01:23:45 2010 +0000

    Adds nova-debug to tools directory, for debugging of instances that lose networking.

commit 7b4733b36d5351a2ba42c82b4d2b821a3b1d12cd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 16 23:38:37 2010 +0000

    fixes errors in describe address and associate address.  Adds test cases

 nova/api/ec2/cloud.py        |    6 +++---
 nova/tests/cloud_unittest.py |   29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

commit 98ae92ccecacdf33f96ae8e21275456113839330
Merge: 06118df e72ae82
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 16 19:04:35 2010 +0000

    Ryan_Lane's code to handle /etc/network not existing when we try to inject /etc/network/interfaces into an image.

commit e72ae82362fb8a93d599c0c4473aa41c96837cf5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:49:18 2010 -0500

    pep8

 nova/compute/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a1cdb02360cc18acb1b7836ce6a07dffd2481635
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 16 18:37:19 2010 +0000

    First dump of content related to Nova RPC and RabbitMQ

 doc/source/devref/rabbit.rst |  114 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 1 deletion(-)

commit 11bca7a4f07c2e7037c8b08b2383a7c6e296b15a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:32:16 2010 -0500

    Add docstrings to any methods I touch

 nova/compute/disk.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 777663e9673310880e0aaf47093ceedd153eedeb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:26:59 2010 -0500

    pep8

 nova/compute/disk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d2bb38ed4d79f7455a5b8b83c652706bdca0489
Merge: dfe9889 06118df
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:23:12 2010 -0500

    Merge from trunk

commit f0b53131569cd409a95c68b435ec56a69dcdc897
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Nov 16 05:53:21 2010 -0400

    PEP8 fixes

 nova/api/openstack/__init__.py            |    1 +
 nova/tests/api/openstack/test_adminapi.py |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 10756392157aa5e6029a50a9f38718f3024731c7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Nov 16 05:46:40 2010 -0400

    added myself to Authors file. Enjoy spiders.

 Authors |    1 +
 1 file changed, 1 insertion(+)

commit b59a36af4fae4acf3edfea094c6080458c16bfa8
Merge: 66a5ac3 6e349f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Nov 16 03:04:27 2010 -0400

    Changed from fine-grained operation control to binary admin on/off setting.

commit 66a5ac31c4a5f24da9c0335cf934bbf545c0d95f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Nov 16 02:54:13 2010 -0400

    Changed from fine-grained operation control to binary admin on/off setting.

 nova/api/openstack/__init__.py                 |   56 ++++++++-----------
 nova/tests/api/openstack/test_adminapi.py      |   60 ++++++++++++++++++++
 nova/tests/api/openstack/test_restrictedapi.py |   70 ------------------------
 3 files changed, 82 insertions(+), 104 deletions(-)

commit 06118df7b06a729e918242149119a485b9f25f7e
Merge: 98d14fc ff3ec33
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 16 02:34:47 2010 +0000

    Lots of documentation and docstring updates.

commit ff3ec33010ce8ece87523f7cf3ef2e4a0a23006e
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 21:08:08 2010 -0500

    The docs are just going to be wrong for now.  I'll file a bug upstream.

 nova/api/__init__.py |    2 --
 nova/utils.py        |    7 -------
 2 files changed, 9 deletions(-)

commit f3744b0de85a1bc5be77f37a770144d3244bca86
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 19:13:45 2010 -0500

    Change how wsgified doc wrapping happens to fix test.

 nova/utils.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 302e8448c62b2c4c7ae67527c343017a6a5f1517
Merge: f2c8480 98d14fc
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 15:10:57 2010 -0500

    merge to trunk

commit f2c84807600dd49458e7b342b70a4bb8f1bb2232
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 14:43:50 2010 -0500

    pep8

 nova/service.py |    3 ++-
 nova/utils.py   |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

commit c4a8768583bdce6af64aef6ed2563956f5c84a1a
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 15 13:15:48 2010 -0600

    Adding contributors and names

 Authors |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 18555a55d186d72d1bb2fd806790ef5a31cdfd33
Merge: 398ec32 a81547f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Nov 15 01:26:34 2010 -0400

    merge with trunk

commit 398ec325160acf039e1070718e898339a4b2d268
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Nov 15 01:25:42 2010 -0400

    base commit

 nova/api/openstack/__init__.py                 |   49 ++++++++++++-----
 nova/tests/api/openstack/test_restrictedapi.py |   70 ++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 15 deletions(-)

commit 98d14fc4799d4104b08a74286d9c76e2b5894e26
Merge: 671b712 0766a21
Author: Joe Heck <heckj@mac.com>
Date:   Sat Nov 13 20:04:00 2010 +0000

    saw a duplicate import ... statement in the code while reading through unit tests - this removes the dupe.

commit 0766a218ec80beb5194db4f618ac76210565b987
Author: Joe Heck <heckj@mac.com>
Date:   Sat Nov 13 09:59:07 2010 -0800

    removed redundant unit test import

 run_tests.py |    1 -
 1 file changed, 1 deletion(-)

commit df185d5b491e1ccfa142dea9f1e41da5ef8c741a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:53:44 2010 -0800

    add in bzr link

 doc/source/community.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c1981a53bed59ff344c552d7c6429226e0bec1da
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:49:48 2010 -0800

    adding a bit more networking documentation

 doc/source/adminguide/network.vlan.rst |    6 ++++++
 1 file changed, 6 insertions(+)

commit 2ab9ac994e146d6096956ea491129a7c7fe57996
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:43:54 2010 -0800

    remove tab

 doc/source/adminguide/multi.node.install.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 57990d59e7e2bf35deec54d69e305a75444a0c88
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:38:27 2010 -0800

    fix title

 doc/source/adminguide/multi.node.install.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e86ff2004967940659e234594d998fe57556d3f3
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:37:24 2010 -0800

    tweak

 doc/source/adminguide/single.node.install.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b1e83d89a83e73265be7c0f2dcb59d5f88e1808c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:36:14 2010 -0800

    Fix heading

 doc/source/adminguide/single.node.install.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 727e41c34ed98f271f1ab0121090590f1b311fc8
Merge: 92f09fb fa57e5a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:51:21 2010 -0800

    merge in anne's changes

commit 92f09fbe52836947861742e17c6f2ba14fc51493
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:45:55 2010 -0800

    tweak

 doc/source/adminguide/single.node.install.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fa57e5ad73b7f36c177857ca3b69267e421a8275
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 12 13:42:07 2010 -0600

    Just a few more edits, misspellings and the like

 doc/source/nova.concepts.rst        |    7 +++----
 doc/source/quickstart.rst           |   12 ++++++++++++
 doc/source/service.architecture.rst |    4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

commit 1a16e6445decfba62f3d8e3d2eb00e7aa7eb4c3c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:12:46 2010 -0800

    fix spacing to enable block

 doc/source/adminguide/distros/ubuntu.10.04.rst |    1 +
 1 file changed, 1 insertion(+)

commit 09c29649ec2b2df68b9c1c57aeff5573d3c83e4a
Merge: 028ce51 b986767
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 12 14:10:28 2010 -0500

    merge to remote

commit b9867670af8ab1e35933f60842e43db02dd66b6a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:09:07 2010 -0800

    unify env syntax

 doc/source/conf.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 028ce51f9f224d68fdeb62b7e6494e296efec31f
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 12 14:07:46 2010 -0500

    Add sample puppet scripts.

 contrib/puppet/files/etc/default/nova-compute      |    1 +
 contrib/puppet/files/etc/default/nova-volume       |    1 +
 contrib/puppet/files/etc/issue                     |    5 +
 contrib/puppet/files/etc/libvirt/qemu.conf         |  170 +++++++
 contrib/puppet/files/etc/lvm/lvm.conf              |  463 +++++++++++++++++++
 contrib/puppet/files/etc/nova.conf                 |   28 ++
 contrib/puppet/files/production/boto.cfg           |    3 +
 contrib/puppet/files/production/genvpn.sh          |   35 ++
 .../files/production/libvirt.qemu.xml.template     |   35 ++
 contrib/puppet/files/production/my.cnf             |  137 ++++++
 contrib/puppet/files/production/nova-iptables      |  185 ++++++++
 contrib/puppet/files/production/nova-iscsi-dev.sh  |   19 +
 contrib/puppet/files/production/setup_data.sh      |    6 +
 contrib/puppet/files/production/slap.sh            |  261 +++++++++++
 contrib/puppet/fileserver.conf                     |    8 +
 contrib/puppet/manifests/classes/apt.pp            |    1 +
 contrib/puppet/manifests/classes/issue.pp          |   14 +
 contrib/puppet/manifests/classes/kern_module.pp    |   34 ++
 contrib/puppet/manifests/classes/loopback.pp       |    6 +
 contrib/puppet/manifests/classes/lvm.pp            |    8 +
 contrib/puppet/manifests/classes/lvmconf.pp        |    8 +
 contrib/puppet/manifests/classes/nova.pp           |  464 ++++++++++++++++++++
 contrib/puppet/manifests/classes/swift.pp          |    7 +
 contrib/puppet/manifests/site.pp                   |  120 +++++
 contrib/puppet/manifests/templates.pp              |   21 +
 contrib/puppet/puppet.conf                         |   11 +
 contrib/puppet/templates/haproxy.cfg.erb           |   39 ++
 contrib/puppet/templates/monitrc-nova-api.erb      |  138 ++++++
 contrib/puppet/templates/nova-iptables.erb         |   10 +
 .../templates/production/nova-common.conf.erb      |   56 +++
 .../puppet/templates/production/nova-nova.conf.erb |   21 +
 31 files changed, 2315 insertions(+)

commit 0f5eddf051e7697b63d7cd9b32fc6d704dcfaf8b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:00:25 2010 -0800

    fix install guide

 doc/source/adminguide/distros/others.rst       |    4 ++--
 doc/source/adminguide/distros/ubuntu.10.04.rst |    2 ++
 doc/source/adminguide/distros/ubuntu.10.10.rst |    4 ++--
 doc/source/adminguide/single.node.install.rst  |    8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

commit 6c142b844ac3269633414d235a8a7bd83c2ecca5
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Nov 12 18:50:10 2010 +0000

    getting started

 doc/source/devref/rabbit.rst |    1 +
 1 file changed, 1 insertion(+)

commit 7915fd554ef8236589863f32a0bc0d4406e2db0b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 10:02:03 2010 -0800

    create SPHINX_DEBUG env var.  Setting this will disable aggressive autodoc generation.  Also provide some sample for P syntax

 doc/source/conf.py                  |    8 +++++++-
 doc/source/quickstart.rst           |    4 ++--
 doc/source/service.architecture.rst |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

commit eecb36c85f4a797546348801dce2f1d8d4285e61
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 09:29:40 2010 -0800

    fix conf file from earlier merge

 doc/source/conf.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1a020c27133fe74968728ad3f43dd3fe0c0283b7
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 09:25:01 2010 -0800

    notes, and add code to enable sorted "..todo:: P[1-5] xyz" syntax

 doc/ext/nova_todo.py                        |   37 +++++++++++++++++++--------
 doc/source/adminguide/managing.networks.rst |    3 ++-
 2 files changed, 28 insertions(+), 12 deletions(-)

commit dc154f98bd1aa725655de040448358558ce06356
Merge: 2b93efe e465c8b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 09:02:20 2010 -0800

    merge in more networking docs - still a work in progress

commit 2b93efeda3dfc995cb1b1bc565c53d258010221e
Merge: f0ea1ea dc957d9
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 08:05:45 2010 -0800

    anne's changes to the networking documentation

commit dc957d99b27c48310a845cf2a510ed986708651b
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 12 09:52:56 2010 -0600

    Updated Networking doc

 doc/source/adminguide/managing.networks.rst |   67 +++++++++++++++++++++++++++
 doc/source/conf.py                          |    4 +-
 2 files changed, 70 insertions(+), 1 deletion(-)

commit f0ea1ead247a5d1b4bb5bcb0b27b201151c938e5
Merge: 32cacdb c91014e
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 00:58:01 2010 -0800

    anne gentle's changes to community page

commit 32cacdbe0ed9f522652b3f8fc99e768026cd7343
Merge: a2859db d3d4755
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 00:56:08 2010 -0800

    merge in heckj's corrections  to multi-node install

commit 3b695e11da34247123ea919e71096e53393f227b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Nov 11 19:52:36 2010 -0600

    Added a .mailmap that maps addresses in bzr to people's real, preferred
    e-mail addresses. (I made a few guesses along the way, feel free to
    adjust according to what is actually the preferred e-mail)
    
    Added a couple of methods to nova.utils to parse said .mailmap and do
    the appropriate (though highly naïve) replacement.
    
    Apply mailmap replacement in changelog generation in setup.py.
    
    Add a unit test that checks everyone is properly listed in Authors.
    
    Add sleepsonthefloor to Authors. If anyone knows the real name, please
    add it.

 .mailmap                    |   24 ++++++++++++++++++++++
 Authors                     |    1 +
 nova/tests/misc_unittest.py |   48 +++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py               |   16 +++++++++++++++
 run_tests.py                |    5 +++--
 setup.py                    |   10 +++++----
 6 files changed, 98 insertions(+), 6 deletions(-)

commit c91014ee029787548918254be38138f4f73bd491
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 11 17:20:27 2010 -0600

    Updated community.rst to fix a link to the IRC logs

 doc/source/community.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3d47550abad46798a11459bc4e2f321a25881ed
Merge: 8aee999 a2859db
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:47:14 2010 -0600

    merging in changes from ~anso/nova/trunkdoc

commit 8aee9996abe4a4f36beebe9f89bce1ab64663938
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:44:40 2010 -0600

    fixed another spacing typo causing poor rendering

 doc/source/adminguide/multi.node.install.rst |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit 1c5cbfa1e9ca81034190c3f6abe6d0801085f7ce
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:40:53 2010 -0600

    fixed spacing typo causing poor rendering

 doc/source/adminguide/multi.node.install.rst |   33 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

commit a2859db379cecd670eb6ee0eb2052bf0d5f9ace5
Merge: 3515b39 c9dd8ce
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:38:41 2010 -0800

    merge in anne's work

commit 3515b39f66db141c9557098ec835d65231ac6655
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:36:25 2010 -0800

    add docs for ubuntu 4, 10, others

 doc/source/adminguide/distros/others.rst       |   89 +++++++++++++++++++++++-
 doc/source/adminguide/distros/ubuntu.10.04.rst |    2 +-
 doc/source/adminguide/distros/ubuntu.10.10.rst |   42 ++++++++++-
 3 files changed, 130 insertions(+), 3 deletions(-)

commit c9dd8ce2e4dce24ff6771a34b75465628eabb7fc
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 11 16:32:24 2010 -0600

    Updated Cloud101 and admonition color

 doc/source/_static/tweaks.css              |    6 +--
 doc/source/adminguide/managingsecurity.rst |   39 ++++++++++++++++
 doc/source/cloud101.rst                    |   67 ++++++++++++++++++++++------
 3 files changed, 95 insertions(+), 17 deletions(-)

commit 802aacac3e88ed5b5f872a2f733160373d271d02
Merge: db0ea46 6b36c32
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:19:06 2010 -0800

    merge heckj's multi install notes

commit db0ea461e746a539d44ec655341345e78a363ab9
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:17:32 2010 -0800

    working on single node install

 doc/source/adminguide/distros/others.rst       |    1 +
 doc/source/adminguide/distros/ubuntu.10.04.rst |   38 +++
 doc/source/adminguide/distros/ubuntu.10.10.rst |    1 +
 doc/source/adminguide/single.node.install.rst  |  342 +++++++++++++++++++++++-
 doc/source/quickstart.rst                      |    8 +-
 5 files changed, 380 insertions(+), 10 deletions(-)

commit 6b36c3290acb21b30fd74d6eb084ab9e41ed41bb
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:04:02 2010 -0600

    updating install notes to reference Vish' nova.sh and installing in MYSQL

 doc/source/adminguide/multi.node.install.rst |   52 ++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

commit e465c8b9a89ed6f547de4d7ee27de94712504630
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:35:06 2010 -0800

    Add Flat mode doc

 doc/source/adminguide/network.vlan.rst |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit c520235ca70e42f42cfd364c2c76343d4d12a757
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:34:58 2010 -0800

    Add Flat mode doc

 doc/source/adminguide/index.rst |    1 +
 1 file changed, 1 insertion(+)

commit 84d154a3db72092f1f40f53cec6d129eb479f4af
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:34:45 2010 -0800

    Add Flat mode doc

 doc/source/adminguide/network.flat.rst |   62 ++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

commit c9eb90c17e1edcf52a11633393d27ba5a9656381
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 12:53:35 2010 -0800

    Add VLAN Mode doc

 doc/source/adminguide/index.rst |    1 +
 1 file changed, 1 insertion(+)

commit 3888dfd3392da4d0d22cb0366974594774705564
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 12:53:16 2010 -0800

    Add VLAN Mode doc

 doc/source/adminguide/network.vlan.rst |  145 ++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)

commit f479206fa3b0db1a927d32bbe566e92e0e48d7d4
Merge: ee9fc9b ed4662d
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:47:42 2010 -0800

    merge in anne's changes

commit ee9fc9b530f03cd1087869ad0b6d520fc1438372
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:43:32 2010 -0800

    home page tweaks

 doc/source/index.rst |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit ed4662db6411df2893491f9e36806a6e5032f6f7
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 11 13:39:54 2010 -0600

    Updated CSS and community.rst file

 doc/source/_ga/layout.html    |    2 +-
 doc/source/_static/tweaks.css |   23 ++++++++++++++++++++---
 doc/source/cloud101.rst       |   25 +++++++++++++++++++++++++
 doc/source/community.rst      |   40 ++++++++++++++++++++++++++++------------
 doc/source/conf.py            |    2 +-
 5 files changed, 75 insertions(+), 17 deletions(-)

commit 30f0eb88b744839a20fcec617331e834c6cbaf43
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:07:47 2010 -0800

    modifications and additions based on doc sprint

 doc/source/adminguide/multi.node.install.rst  |  186 ++++++++++++++++++++++++-
 doc/source/adminguide/single.node.install.rst |    2 +
 doc/source/index.rst                          |   21 ++-
 doc/source/installer.rst                      |   12 ++
 doc/source/livecd.rst                         |    2 +
 5 files changed, 219 insertions(+), 4 deletions(-)

commit 4ad2e71f41a95056f8bb37209c49d17d8c7cd4d0
Author: root <sleepsonthefloor@gmail.com>
Date:   Tue Nov 9 10:11:36 2010 -0800

    incorporate some feedback from todd and anne

 doc/source/adminguide/index.rst          |   21 ++-
 doc/source/concepts.and.introduction.rst |  204 ------------------------------
 doc/source/index.rst                     |    1 +
 doc/source/nova.concepts.rst             |  204 ++++++++++++++++++++++++++++++
 doc/source/object.model.rst              |   14 +-
 5 files changed, 232 insertions(+), 212 deletions(-)

commit b78364281dc5d5090faf6da8fbdddf90d60e514b
Merge: 2a81e25 0131600
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 8 20:38:21 2010 -0800

    merge in trunk

commit 2a81e25f89c761582d8cd575566f68d3ed5754ed
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 8 18:40:21 2010 -0800

    working on novadoc structure

 doc/source/adminguide/euca2ools.rst           |   49 ++++++++++
 doc/source/adminguide/getting.started.rst     |    2 +-
 doc/source/adminguide/index.rst               |   43 +++++++--
 doc/source/adminguide/managing.images.rst     |   21 +++++
 doc/source/adminguide/managing.instances.rst  |   45 +++++++++
 doc/source/adminguide/managing.networks.rst   |   49 ++++++++++
 doc/source/adminguide/managing.projects.rst   |   57 ++++++++++++
 doc/source/adminguide/managing.users.rst      |   63 +++++++++++++
 doc/source/adminguide/multi.node.install.rst  |    4 +-
 doc/source/adminguide/nova.manage.rst         |   88 +-----------------
 doc/source/adminguide/quickstart.rst          |  103 ---------------------
 doc/source/adminguide/single.node.install.rst |   10 ++
 doc/source/cloud101.rst                       |   21 +++++
 doc/source/community.rst                      |   67 ++++++++++++++
 doc/source/conf.py                            |    2 +-
 doc/source/devguide/index.rst                 |   21 ++---
 doc/source/devguide/modules.rst               |   19 ++++
 doc/source/images/fabric.png                  |  Bin 0 -> 125915 bytes
 doc/source/index.rst                          |   35 ++++---
 doc/source/object.model.rst                   |   53 +++++++++++
 doc/source/quickstart.rst                     |  123 +++++++++++++++++++++++++
 doc/source/reaching.out.rst                   |   64 -------------
 doc/source/service.architecture.rst           |   60 ++++++++++++
 23 files changed, 703 insertions(+), 296 deletions(-)

commit 0131600277f5a2e7183640e1f0d9886315933c1a
Author: root <vishvananda@gmail.com>
Date:   Mon Nov 8 18:39:51 2010 -0800

    add some info on authentication and keys

 doc/source/adminguide/index.rst |   52 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit b04b0fb65305600415cf159a41336dfc7f7046ab
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 18:18:04 2010 -0500

    Since we're autodocumenting from a sphinx ext, we can scrap it in Makefile.

 doc/Makefile |   27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

commit a3b6e0f358871dc41516c33d237a0a61735ff84c
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 17:53:39 2010 -0500

    Use the autodoc tools in the setup.py build_sphinx toolchain.

 doc/ext/nova_autodoc.py |    9 +++++++++
 doc/source/conf.py      |    3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

commit 75841f22d39d90859c1157315c326b4e8a4a3b9c
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 17:18:41 2010 -0500

    Fix include paths so setup.py build_sphinx works again.

 doc/source/conf.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 7a501be599e79b79c8a73a9969aa7ba14212bda0
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 15:14:58 2010 -0500

    Cleanups to doc process.

 doc/source/devref/api.rst         |   31 ++++++++++++++++++++++++-
 doc/source/devref/auth.rst        |   18 ++++++++++-----
 doc/source/devref/compute.rst     |   26 +++++++++++++++------
 doc/source/devref/database.rst    |    6 ++++-
 doc/source/devref/fakes.rst       |   17 +++++++++-----
 doc/source/devref/glance.rst      |    3 ++-
 doc/source/devref/network.rst     |    3 +++
 doc/source/devref/nova.rst        |   45 +++++++++++++++++++++++++++----------
 doc/source/devref/objectstore.rst |   13 +++++++----
 doc/source/devref/scheduler.rst   |   13 +++++++----
 doc/source/devref/volume.rst      |    3 +++
 11 files changed, 137 insertions(+), 41 deletions(-)

commit 913d078469720c514a19c01ffe97838c455132b7
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:58:02 2010 -0500

    quieter doc building (less warnings).

 doc/Makefile                    |    6 ++++--
 doc/find_autodoc_modules.sh     |    2 +-
 doc/generate_autodoc_index.sh   |   23 +++++++++++++++++++++--
 doc/source/devref/cloudpipe.rst |    9 ++++++---
 doc/source/devref/services.rst  |    2 ++
 5 files changed, 34 insertions(+), 8 deletions(-)

commit 7e8e4a74f425955a82f7c087956f3e31720cb0e3
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:56:17 2010 -0500

    File moves from "merge" of termie's branch.

 doc/Makefile                     |  102 ++++++++++++++++++++++++++++++++++++++
 doc/find_autodoc_modules.sh      |   20 ++++++++
 doc/find_undocumented_classes.sh |   20 --------
 doc/source/Makefile              |  102 --------------------------------------
 4 files changed, 122 insertions(+), 122 deletions(-)

commit 2c01c325719473fc764deec607a2b634ada5579a
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:51:40 2010 -0500

    Merge lp:~termie/nova/trunkdoc (via patch, since bzr though it was already merged)

 doc/README.rst                                  |   33 +++
 doc/find_undocumented_classes.sh                |   10 +-
 doc/generate_autodoc_index.sh                   |   19 ++
 doc/source/Makefile                             |   37 +++-
 doc/source/devguide/api.rst                     |  267 -----------------------
 doc/source/devguide/architecture.rst            |   52 -----
 doc/source/devguide/auth.rst                    |  258 ----------------------
 doc/source/devguide/cloudpipe.rst               |   85 --------
 doc/source/devguide/compute.rst                 |  146 -------------
 doc/source/devguide/database.rst                |   61 ------
 doc/source/devguide/development.environment.rst |   21 --
 doc/source/devguide/fakes.rst                   |   72 ------
 doc/source/devguide/glance.rst                  |   27 ---
 doc/source/devguide/index.rst                   |   60 -----
 doc/source/devguide/network.rst                 |  124 -----------
 doc/source/devguide/nova.rst                    |  190 ----------------
 doc/source/devguide/objectstore.rst             |   62 ------
 doc/source/devguide/scheduler.rst               |   62 ------
 doc/source/devguide/services.rst                |   72 ------
 doc/source/devguide/volume.rst                  |   60 -----
 doc/source/devref/api.rst                       |    6 +-
 doc/source/devref/architecture.rst              |   52 +++++
 doc/source/devref/auth.rst                      |   74 ++++---
 doc/source/devref/cloudpipe.rst                 |   92 ++++++++
 doc/source/devref/compute.rst                   |   41 ++--
 doc/source/devref/database.rst                  |   26 +--
 doc/source/devref/development.environment.rst   |   21 ++
 doc/source/devref/fakes.rst                     |   26 ++-
 doc/source/devref/glance.rst                    |    6 +-
 doc/source/devref/index.rst                     |   61 ++++++
 doc/source/devref/network.rst                   |   15 +-
 doc/source/devref/nova.rst                      |   52 +++--
 doc/source/devref/objectstore.rst               |   16 +-
 doc/source/devref/scheduler.rst                 |   16 +-
 doc/source/devref/services.rst                  |   53 +++++
 doc/source/devref/volume.rst                    |    7 +-
 doc/source/index.rst                            |    2 +-
 nova/manager.py                                 |   34 ++-
 nova/service.py                                 |    6 +-
 39 files changed, 566 insertions(+), 1758 deletions(-)

commit a999c8de9e51da2beda13fdbb66dfb0bad42f250
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:46:17 2010 -0500

    back out stacked merge

 doc/Makefile                                    |  104 ---------
 doc/README.rst                                  |   33 ---
 doc/find_autodoc_modules.sh                     |   20 --
 doc/find_undocumented_classes.sh                |   20 ++
 doc/generate_autodoc_index.sh                   |   38 ----
 doc/source/Makefile                             |   89 ++++++++
 doc/source/devguide/api.rst                     |  267 +++++++++++++++++++++++
 doc/source/devguide/architecture.rst            |   52 +++++
 doc/source/devguide/auth.rst                    |  258 ++++++++++++++++++++++
 doc/source/devguide/cloudpipe.rst               |   85 ++++++++
 doc/source/devguide/compute.rst                 |  146 +++++++++++++
 doc/source/devguide/database.rst                |   61 ++++++
 doc/source/devguide/development.environment.rst |   21 ++
 doc/source/devguide/fakes.rst                   |   72 ++++++
 doc/source/devguide/glance.rst                  |   27 +++
 doc/source/devguide/index.rst                   |   60 +++++
 doc/source/devguide/network.rst                 |  124 +++++++++++
 doc/source/devguide/nova.rst                    |  190 ++++++++++++++++
 doc/source/devguide/objectstore.rst             |   62 ++++++
 doc/source/devguide/scheduler.rst               |   62 ++++++
 doc/source/devguide/services.rst                |   72 ++++++
 doc/source/devguide/volume.rst                  |   60 +++++
 doc/source/devref/architecture.rst              |   52 -----
 doc/source/devref/cloudpipe.rst                 |   95 --------
 doc/source/devref/development.environment.rst   |   21 --
 doc/source/devref/index.rst                     |   58 -----
 doc/source/devref/services.rst                  |   55 -----
 doc/source/index.rst                            |    2 +-
 nova/manager.py                                 |   34 +--
 nova/service.py                                 |    6 +-
 30 files changed, 1731 insertions(+), 515 deletions(-)

commit fa90bccfe96c608e114a2974ab15e4a52f798970
Merge: 12a0d66 f8e6abf
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:22:26 2010 -0500

    Merge termie's autodoc system into trunkdoc.

commit f8e6abff40da7c73efa7b79f9fab7d83169c3983
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:15:06 2010 -0500

    Doc updates:
      * quieter build (fewer warnings)
      * move api reference out of root directory
      * auto glob api reference into a TOC
      * remove old dev entries for new-fangled auto-generated docs

 doc/Makefile                      |    6 +-
 doc/find_autodoc_modules.sh       |    2 +-
 doc/generate_autodoc_index.sh     |   23 +++-
 doc/source/devref/api.rst         |  267 ------------------------------------
 doc/source/devref/auth.rst        |  268 -------------------------------------
 doc/source/devref/cloudpipe.rst   |    9 +-
 doc/source/devref/compute.rst     |  141 -------------------
 doc/source/devref/database.rst    |   59 --------
 doc/source/devref/fakes.rst       |   80 -----------
 doc/source/devref/glance.rst      |   27 ----
 doc/source/devref/index.rst       |   25 ++--
 doc/source/devref/network.rst     |  125 -----------------
 doc/source/devref/nova.rst        |  214 -----------------------------
 doc/source/devref/objectstore.rst |   66 ---------
 doc/source/devref/scheduler.rst   |   66 ---------
 doc/source/devref/services.rst    |    2 +
 doc/source/devref/volume.rst      |   63 ---------
 17 files changed, 45 insertions(+), 1398 deletions(-)

commit 7ca2d7593e7faf36bab9d6cb1c8b0ba16494679f
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 02:54:28 2010 +0900

    Normalization of Dev reference docs.

 doc/source/devref/api.rst         |    6 +--
 doc/source/devref/auth.rst        |   74 +++++++++++++++++++++----------------
 doc/source/devref/cloudpipe.rst   |   13 +++++--
 doc/source/devref/compute.rst     |   41 +++++++++-----------
 doc/source/devref/database.rst    |   26 ++++++-------
 doc/source/devref/fakes.rst       |   26 ++++++++-----
 doc/source/devref/glance.rst      |    6 +--
 doc/source/devref/index.rst       |    3 +-
 doc/source/devref/network.rst     |   15 ++++----
 doc/source/devref/nova.rst        |   52 +++++++++++++++++++-------
 doc/source/devref/objectstore.rst |   16 +++++---
 doc/source/devref/scheduler.rst   |   16 +++++---
 doc/source/devref/services.rst    |   37 +++++--------------
 doc/source/devref/volume.rst      |    7 +++-
 nova/manager.py                   |   34 ++++++++++++++++-
 nova/service.py                   |    6 ++-
 16 files changed, 225 insertions(+), 153 deletions(-)

commit 006b3ab0c7b8699e63df2a2884c53abd3ba37658
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 02:00:48 2010 +0900

    Switch to module-per-file for the module index.
    
    Rename development guide to development reference.

 doc/Makefile                                    |    7 +-
 doc/generate_autodoc_index.sh                   |   15 +-
 doc/source/devguide/api.rst                     |  267 -----------------------
 doc/source/devguide/architecture.rst            |   52 -----
 doc/source/devguide/auth.rst                    |  258 ----------------------
 doc/source/devguide/cloudpipe.rst               |   85 --------
 doc/source/devguide/compute.rst                 |  146 -------------
 doc/source/devguide/database.rst                |   61 ------
 doc/source/devguide/development.environment.rst |   21 --
 doc/source/devguide/fakes.rst                   |   72 ------
 doc/source/devguide/glance.rst                  |   27 ---
 doc/source/devguide/index.rst                   |   60 -----
 doc/source/devguide/network.rst                 |  124 -----------
 doc/source/devguide/nova.rst                    |  190 ----------------
 doc/source/devguide/objectstore.rst             |   62 ------
 doc/source/devguide/scheduler.rst               |   62 ------
 doc/source/devguide/services.rst                |   72 ------
 doc/source/devguide/volume.rst                  |   60 -----
 doc/source/devref/api.rst                       |  267 +++++++++++++++++++++++
 doc/source/devref/architecture.rst              |   52 +++++
 doc/source/devref/auth.rst                      |  258 ++++++++++++++++++++++
 doc/source/devref/cloudpipe.rst                 |   85 ++++++++
 doc/source/devref/compute.rst                   |  146 +++++++++++++
 doc/source/devref/database.rst                  |   61 ++++++
 doc/source/devref/development.environment.rst   |   21 ++
 doc/source/devref/fakes.rst                     |   72 ++++++
 doc/source/devref/glance.rst                    |   27 +++
 doc/source/devref/index.rst                     |   60 +++++
 doc/source/devref/network.rst                   |  124 +++++++++++
 doc/source/devref/nova.rst                      |  190 ++++++++++++++++
 doc/source/devref/objectstore.rst               |   62 ++++++
 doc/source/devref/scheduler.rst                 |   62 ++++++
 doc/source/devref/services.rst                  |   72 ++++++
 doc/source/devref/volume.rst                    |   60 +++++
 doc/source/index.rst                            |    2 +-
 35 files changed, 1637 insertions(+), 1625 deletions(-)

commit e54bddd0512f3c788c72f5e151868bae0be869ef
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 00:27:55 2010 +0900

    Allow case-by-case overriding of autodocs.

 doc/find_autodoc_modules.sh   |   20 ++++++++++++++++++++
 doc/find_modules.sh           |   17 -----------------
 doc/generate_autodoc_index.sh |    2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

commit 7f95dc86650963add0ac2bcc23410842fb05253f
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 00:13:47 2010 +0900

    add exec flags, apparently bzr shelve/unshelve does not keep track of them

 0 files changed

commit 9dcc76485b6fe4cf4218b9fdca45a75a392e508b
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 00:06:19 2010 +0900

    Build autodocs for all our libraries.
    
    Also updates doc build process and adds a README for it.

 doc/Makefile                     |  101 ++++++++++++++++++++++++++++++++++++++
 doc/README.rst                   |   33 +++++++++++++
 doc/find_modules.sh              |   17 +++++++
 doc/find_undocumented_classes.sh |   20 --------
 doc/generate_autodoc_index.sh    |    8 +++
 doc/source/Makefile              |   89 ---------------------------------
 6 files changed, 159 insertions(+), 109 deletions(-)

commit 79fa23620a1846eae28eaed26cd79973571d6b99
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Nov 6 00:58:05 2010 +0000

    add dmz to flags and change a couple defaults

 nova/flags.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit f127d85d7790585d6e735648dfab13416d79fbde
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Nov 6 00:02:36 2010 +0000

    Per-project vpns, certificates, and revocation

 CA/INTER/.gitignore                |    1 -
 CA/geninter.sh                     |   26 +++--
 CA/genrootca.sh                    |    1 +
 CA/openssl.cnf.tmpl                |    3 +-
 CA/projects/.gitignore             |    1 +
 bin/nova-manage                    |   75 +++++++++-----
 nova/api/__init__.py               |    2 -
 nova/api/cloudpipe/__init__.py     |   69 -------------
 nova/auth/manager.py               |   73 +++++++-------
 nova/cloudpipe/bootscript.sh       |   63 ------------
 nova/cloudpipe/bootscript.template |   50 +++++++++
 nova/cloudpipe/pipelib.py          |  123 +++++++++++++++--------
 nova/crypto.py                     |  195 ++++++++++++++++++++++++++++--------
 nova/db/api.py                     |   39 ++++++++
 nova/db/sqlalchemy/api.py          |   78 +++++++++++++++
 nova/db/sqlalchemy/models.py       |   12 ++-
 nova/tests/auth_unittest.py        |   17 ++--
 17 files changed, 533 insertions(+), 295 deletions(-)

commit 12a0d661d69281811885f9bd4e7f3b1ec3a758a8
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 19:53:31 2010 -0400

    remove finished todo

 doc/source/devguide/api.rst |    2 --
 1 file changed, 2 deletions(-)

commit a8a61d61db0b00e0b397c807ac8ca89e39a26c5b
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 19:52:12 2010 -0400

    Fix docstrings for wsigfied methods.

 doc/source/devguide/cloudpipe.rst |    8 ++++++++
 nova/api/__init__.py              |    3 +++
 nova/utils.py                     |    8 ++++++++
 3 files changed, 19 insertions(+)

commit d24c7090448ebdb9774b69490df8a983e3d27660
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:52:59 2010 -0700

    fix default twitter username

 doc/source/_theme/layout.html |    1 +
 1 file changed, 1 insertion(+)

commit 9c2af052e4ca34a14b84a9dafcb72830e3351a60
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:36:19 2010 -0700

    shrink tweet text a bit

 doc/source/_static/tweaks.css |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b0f20b89e180ab0bf08373c3371c672afbe573fd
Merge: c3054a9 9675be4
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 18:33:49 2010 -0400

    Merge remote.

commit c3054a9a55371fe3acf37589df7d81c6381d7220
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 18:31:26 2010 -0400

    Document nova.sh environment.

 doc/source/adminguide/quickstart.rst |   52 +++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 7 deletions(-)

commit 9675be4ffd54db83b7417c968943238958ace9db
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:29:54 2010 -0700

    add twitter feed to the home page

 doc/source/_static/jquery.tweet.js |  154 ++++++++++++++++++++++++++++++++++++
 doc/source/_static/tweaks.css      |   10 ++-
 doc/source/_theme/layout.html      |   83 +++++++++++++++++++
 3 files changed, 246 insertions(+), 1 deletion(-)

commit cb5ffdad03bfecd5e617016d0f9f0793a20116c5
Merge: 07f5d3a 64ce931
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 17:34:09 2010 -0400

    Merge to remote.

commit 07f5d3abe26b57ef8d82ddaab80141e0130d95ac
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 17:33:08 2010 -0400

    Community contact info.

 doc/source/reaching.out.rst |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

commit 64ce9316b694ae286ce8caaeb9c486dc9af12c50
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 13:44:22 2010 -0700

    small tweaks before context switch

 doc/source/index.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit af448fe2a944dd275d671d55551eed215b7bbe79
Merge: c5e616f dd50524
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 16:25:46 2010 -0400

    Merge to remote.

commit 3ef09f689b7f151aa9225b69d85c96fd39fd2c9c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 13:25:40 2010 -0700

    use include to grab todd's quickstart

 doc/source/index.rst |   98 +-------------------------------------------------
 1 file changed, 1 insertion(+), 97 deletions(-)

commit dd505245c27d2abd2d710a44a120b21cacb9089c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 12:49:42 2010 -0700

    add in custom todo, and custom css

 doc/ext/nova_todo.py          |   86 +++++++++++++++++++++++++++++++++++++++++
 doc/source/_static/tweaks.css |   44 +++++++++++++++++++++
 doc/source/_theme/layout.html |    2 +
 doc/source/_theme/theme.conf  |    5 +++
 doc/source/conf.py            |    8 ++--
 5 files changed, 142 insertions(+), 3 deletions(-)

commit c5e616f5908c0c5966c0a3612b9cc565387f50a9
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 15:11:04 2010 -0400

    Format TODO items for sphinx todo extension.

 doc/source/adminguide/quickstart.rst            |    9 ++++-----
 doc/source/devguide/api.rst                     |    4 +---
 doc/source/devguide/development.environment.rst |    4 +---
 doc/source/devguide/fakes.rst                   |    4 +---
 doc/source/devguide/network.rst                 |    6 +++---
 doc/source/devguide/volume.rst                  |    4 +---
 doc/source/index.rst                            |    5 +++++
 doc/source/reaching.out.rst                     |    5 +----
 8 files changed, 17 insertions(+), 24 deletions(-)

commit 0a4785be35bf1fc66e41b7565edf5e3936b70673
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 11:56:12 2010 -0700

    additions to home page

 doc/source/index.rst |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

commit f9bd8f41807a27d62b538707b9aaff44746d8933
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 14:30:46 2010 -0400

    Change order of secions so puppeting is last, add more initial setup tasks.

 doc/source/adminguide/multi.node.install.rst |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit 990f4451e7779654188afa514baef270182f8697
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 14:09:36 2010 -0400

    update types of services that may run on machines.

 doc/source/adminguide/getting.started.rst    |    1 +
 doc/source/adminguide/multi.node.install.rst |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 4ea4eac3f1a33c1f618c82c5c2312b4626aa7244
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 19:00:46 2010 -0400

    Change directory structure for great justice!

 doc/source/adminguide/binaries.rst              |   62 ++++++
 doc/source/adminguide/flags.rst                 |   23 ++
 doc/source/adminguide/getting.started.rst       |  167 ++++++++++++++
 doc/source/adminguide/index.rst                 |   36 +++
 doc/source/adminguide/monitoring.rst            |   27 +++
 doc/source/adminguide/multi.node.install.rst    |   57 +++++
 doc/source/adminguide/nova.manage.rst           |  200 +++++++++++++++++
 doc/source/adminguide/quickstart.rst            |  104 +++++++++
 doc/source/administration.guide.rst             |   35 ---
 doc/source/api.rst                              |  271 -----------------------
 doc/source/architecture.rst                     |   52 -----
 doc/source/auth.rst                             |  258 ---------------------
 doc/source/binaries.rst                         |   62 ------
 doc/source/cloudpipe.rst                        |   77 -------
 doc/source/compute.rst                          |  146 ------------
 doc/source/concepts.and.introduction.rst        |    2 +-
 doc/source/database.rst                         |   61 -----
 doc/source/development.environment.rst          |   23 --
 doc/source/development.guide.rst                |   60 -----
 doc/source/devguide/api.rst                     |  271 +++++++++++++++++++++++
 doc/source/devguide/architecture.rst            |   52 +++++
 doc/source/devguide/auth.rst                    |  258 +++++++++++++++++++++
 doc/source/devguide/cloudpipe.rst               |   77 +++++++
 doc/source/devguide/compute.rst                 |  146 ++++++++++++
 doc/source/devguide/database.rst                |   61 +++++
 doc/source/devguide/development.environment.rst |   23 ++
 doc/source/devguide/fakes.rst                   |   74 +++++++
 doc/source/devguide/glance.rst                  |   27 +++
 doc/source/devguide/index.rst                   |   60 +++++
 doc/source/devguide/network.rst                 |  124 +++++++++++
 doc/source/devguide/nova.rst                    |  190 ++++++++++++++++
 doc/source/devguide/objectstore.rst             |   62 ++++++
 doc/source/devguide/scheduler.rst               |   62 ++++++
 doc/source/devguide/services.rst                |   72 ++++++
 doc/source/devguide/volume.rst                  |   62 ++++++
 doc/source/fakes.rst                            |   74 -------
 doc/source/flags.rst                            |   23 --
 doc/source/getting.started.rst                  |  167 --------------
 doc/source/glance.rst                           |   27 ---
 doc/source/index.rst                            |    4 +-
 doc/source/modules.rst                          |   38 ----
 doc/source/monitoring.rst                       |   27 ---
 doc/source/multi.node.install.rst               |   57 -----
 doc/source/network.rst                          |  124 -----------
 doc/source/nova.manage.rst                      |  200 -----------------
 doc/source/nova.rst                             |  190 ----------------
 doc/source/objectstore.rst                      |   62 ------
 doc/source/quickstart.rst                       |  104 ---------
 doc/source/scheduler.rst                        |   62 ------
 doc/source/services.rst                         |   72 ------
 doc/source/volume.rst                           |   62 ------
 51 files changed, 2300 insertions(+), 2337 deletions(-)

commit a21c338c73c13281dfdd12ccb0c6168498855b9f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Nov 4 15:50:23 2010 -0700

    Refactored smoketests to use novarc environment and to separate user and admin specific tests

 smoketests/admin_smoketests.py |   92 +++++++
 smoketests/base.py             |  154 +++++++++++
 smoketests/flags.py            |   13 +-
 smoketests/novatestcase.py     |  130 ---------
 smoketests/smoketest.py        |  566 ----------------------------------------
 smoketests/user_smoketests.py  |  326 +++++++++++++++++++++++
 6 files changed, 575 insertions(+), 706 deletions(-)

commit 0de105e28ece8e742943abd3e6332d6e5694642c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 18:17:02 2010 -0400

    start adding info to multi-node admin guide.

 doc/source/multi.node.install.rst |   36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

commit 74762113966fb873816afa7bc7c0f2e2e9eb2ec5
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 17:49:13 2010 -0400

    document purpose of documentation.

 doc/source/getting.started.rst |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 3a8dadd4d31dd564a08a9e285cc6f3318dc243b3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 17:36:32 2010 -0400

    Getting Started Guide.

 doc/source/administration.guide.rst      |    1 +
 doc/source/concepts.and.introduction.rst |    3 +-
 doc/source/getting.started.rst           |   83 +++++++++++++++++++++++++-----
 doc/source/index.rst                     |    4 +-
 doc/source/quickstart.rst                |    8 +++
 doc/source/reaching.out.rst              |   28 ++++++++++
 6 files changed, 110 insertions(+), 17 deletions(-)

commit bbd11f550765a91af17cb200a2b857f263765918
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 14:44:22 2010 -0400

    Nova quickstart: move vish's novascript into contrib, and convert reademe.md to a quickstart.rst

 contrib/nova.sh           |  161 +++++++++++++++++++++++++++++++++++++++++++++
 doc/source/quickstart.rst |   79 +++++++++++++++++++++-
 2 files changed, 238 insertions(+), 2 deletions(-)

commit 95b041ef2ea3dc101312bbb7e1683dfd75f5f80e
Merge: d14dafe 671b712
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 14:20:15 2010 -0400

    merge trunk

commit b65b41e5957d5ded516343b3611292c9744d169f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Nov 4 12:42:14 2010 +0100

    Add a templating mechanism in the flag parsing.  Add a state_path flag that will be used as the top-level dir for all other state (such as images, instances, buckets, networks, etc). This way you only need to change one flag to put all your state in e.g. /var/lib/nova.

 nova/compute/manager.py    |    2 +-
 nova/compute/monitor.py    |    2 +-
 nova/crypto.py             |    4 ++--
 nova/flags.py              |   22 ++++++++++++++++++++--
 nova/network/linux_net.py  |    2 +-
 nova/objectstore/bucket.py |    2 +-
 nova/objectstore/image.py  |    4 ++--
 7 files changed, 28 insertions(+), 10 deletions(-)

commit d14dafebf80cfc1776be5496b44a1970167114d8
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 02:06:28 2010 -0400

    add missing file.

 doc/source/development.environment.rst |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 8ff07424548ad4d25b1653351d0bffaac7bc0642
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 02:06:10 2010 -0400

    Cleanup nova-manage section.

 doc/source/concepts.and.introduction.rst |  117 +----------------
 doc/source/nova.manage.rst               |  200 ++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+), 112 deletions(-)

commit 6b8ee54df1a77c46b692cf43cc73009684cc9033
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 00:02:56 2010 -0400

    have "contents" look the same as other headings.

 doc/source/index.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 671b712a5ad9034fa89761018203cc7c1ea0449b
Merge: ad5013d 2346361
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 23:04:01 2010 +0000

    Enables the exclusive flag for DirectConsumer queues.

commit ad5013db5a2558b695d13b0e880884b0aee4fa69
Merge: fb53f76 179d980
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 22:58:59 2010 +0000

    Ensures that keys for context from the queue are passed to the context constructor as strings.  This prevents hangs on older versions of python that can't handle unicode kwargs.

commit 23463610cb180253697b500f11f01e686b20c1e8
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 15:50:24 2010 -0700

    Fix for bug #640400, enables the exclusive flag on the temporary queues.

 nova/rpc.py |    1 +
 1 file changed, 1 insertion(+)

commit 817690b03f2e498fb08eba3ca455719229f24640
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 15:06:00 2010 -0700

    pep8 whitespace and line length fixes

 nova/adminclient.py          |    4 ++--
 nova/compute/manager.py      |    3 ++-
 nova/db/api.py               |    4 ++--
 nova/db/sqlalchemy/models.py |    4 ++--
 nova/volume/driver.py        |    4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

commit 179d980dffc03e1ee0449954eed40b1d5489f6e0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:59:35 2010 -0700

    make sure context keys are not unicode so they can be passed as kwargs

 nova/rpc.py |    3 +++
 1 file changed, 3 insertions(+)

commit 47c1ae6047e112605282b4b797b77a5d1523d358
Merge: 4c79587 fb53f76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:38:14 2010 -0700

    merged trunk

commit 4c79587a94cc7da094c54518d4e15ec2de14c567
Merge: 80a6dd7 2cbef8f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:05:09 2010 -0700

    merged source

commit 80a6dd72ef48ec4c7dc72b39073800bb7fe1e70a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:04:36 2010 -0700

    prettier theme

 doc/source/conf.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d65c35bcadc6cc4e4d1fc61502d43fd001ce2f0e
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 13:13:59 2010 -0700

    Added an extra argument to the objectstore listen to separate out the listening host from the connecting host.

 nova/objectstore/handler.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fb53f764a82dd8e6d1992c4c254e90c185fd9c53
Merge: 5983b03 2a16ae2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 3 19:44:09 2010 +0000

    Change socket type in nova.utils.get_my_ip() to SOCK_DGRAM. This way, we don't actually have to set up a connection.
    Also, change the destination host to an IP (chose one of Google's DNS's at random) rather than a hostname, so we avoid doing a DNS lookup.

commit 60c82177da9c4ebbb89e5534959d0d5a52bfa49a
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 12:38:15 2010 -0700

    Fix for bug#613264, allowing hosts to be specified for nova-api and objectstore listeners.

 bin/nova-api                |    6 ++++--
 nova/objectstore/handler.py |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 5983b0305f919ec1f99859f107c05ed812d6a641
Merge: fc8f697 3bc28df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 19:04:12 2010 +0000

    Fixes issue with security groups not being associated with instances.

commit 2cbef8ffd80546f1dcd850322621b04395591d69
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Nov 3 14:30:13 2010 -0400

    Doc cleanups.

 doc/source/auth.rst              |   21 ++++---
 doc/source/compute.rst           |    6 --
 doc/source/development.guide.rst |   10 +++-
 doc/source/network.rst           |    8 +--
 doc/source/nova.rst              |   16 ------
 nova/network/manager.py          |  116 +++++++++++++++++++++++---------------
 6 files changed, 93 insertions(+), 84 deletions(-)

commit fc8f6977baa99d62034a2792442ae6aa52f8c99a
Merge: 2baf212 67d2d35
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 18:24:16 2010 +0000

    Fix flags help display.

commit 2a16ae2f8479e469e413dfd036bac805163f3ac2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 3 15:05:10 2010 +0100

    Change socket type in nova.utils.get_my_ip() to SOCK_DGRAM. This way, we don't actually have to set up a connection.
    Also, change the destination host to an IP (chose one of Google's DNS's at random) rather than a hostname, so we avoid doing a DNS lookup.

 nova/utils.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2baf2127110929fb834042238058802dae8d725e
Merge: 56c7e77 fad337b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 08:29:03 2010 +0000

    ISCSI Volume support
    
    * Rewrite of Volume code to make VolumeManager more generic
    * AoE vs. ISCSI moved to driver layer
    * Added db support for target ids
    * Added code to re-export volumes on restart of VolumeManager
    * Includes a script to create /dev/iscsi volumes on remote hosts
    * Change libvirt_conn to use the python connection to attach disks instead of shell
    * Changed cloud and compute manager to deal with attaching, detaching, and terminating in
      a saner manner.

commit ff967253b28d54ff33176191f6424cb19c444812
Merge: 1119f7e 583d1b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:39:51 2010 -0700

    merged

commit 1119f7e0eeffc0bc2f918b0c5fb8eb87cd3e3784
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:37:11 2010 -0700

    more descriptive title for cloudpipe

 doc/source/cloudpipe.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ea79ca7e8855cf130cadb63fc42780c90a51fb15
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:36:03 2010 -0700

    update of the architecture and fix some links

 doc/source/administration.guide.rst |    3 +--
 doc/source/architecture.rst         |   46 ++++++++++++++++++-----------------
 doc/source/development.guide.rst    |    8 +++---
 doc/source/getting.started.rst      |   38 ++++++++++++++++++++---------
 4 files changed, 56 insertions(+), 39 deletions(-)

commit 583d1b1c4d039f1f9751c8a2cc0cf59bb77551e0
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 20:31:17 2010 -0400

    Fixes after trunk merge.

 doc/source/nova.rst      |   24 ------------------------
 nova/tests/fake_flags.py |    1 +
 2 files changed, 1 insertion(+), 24 deletions(-)

commit 7898451cd91821e01451ff8f65de1169eeef8ae2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 16:49:34 2010 -0700

    removed some old instructions and updated concepts

 doc/source/concepts.and.introduction.rst |   18 ++++--------
 doc/source/getting.started.rst           |   44 ++++--------------------------
 2 files changed, 11 insertions(+), 51 deletions(-)

commit 0cfeb666139b875cfe2952a67697a3d337967fbc
Merge: fbb82a4 a6f867e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:23:06 2010 -0400

    merge

commit a6f867eb72599bb0bb1fe43f99d8c4b07972e5dd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 15:16:41 2010 -0700

    Documentation on Services, Managers, and Drivers

 doc/source/services.rst |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

commit fbb82a4c2b832f9e6c86aacb664a7f1a9060e2ce
Merge: e493e32 56c7e77
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:09:52 2010 -0400

    Merge trunk.

commit e493e324eb9a9fe31e72551b34bab768b507bc1d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:05:47 2010 -0400

    Document final undocumented python modules.

 doc/source/api.rst               |  108 ++++++++++++++++++++++++++++++++++++++
 doc/source/cloudpipe.rst         |   27 ++++++++++
 doc/source/compute.rst           |    8 ++-
 doc/source/development.guide.rst |    3 ++
 doc/source/glance.rst            |   27 ++++++++++
 doc/source/network.rst           |   11 ++++
 doc/source/nova.rst              |   83 +++++++++++++++++++++++++++++
 doc/source/objectstore.rst       |   62 ++++++++++++++++++++++
 doc/source/scheduler.rst         |   11 ++++
 nova/image/service.py            |   34 +++++-------
 10 files changed, 353 insertions(+), 21 deletions(-)

commit f76e952d41e2edc0dafc96353b7222472a95747e
Merge: e50b862 56c22ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 13:58:32 2010 -0700

    merged trunk

commit e50b8627ccac7f051d4ebea8879bd8d5c083837c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 13:57:50 2010 -0700

    cloudpipe docs

 doc/source/cloudpipe.rst                 |   77 ++++++++++++++++++++++++++++++
 doc/source/concepts.and.introduction.rst |    2 +-
 2 files changed, 78 insertions(+), 1 deletion(-)

commit 67d2d35e944b10f6f1e2e6eeb0a8b33496d4d39b
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 13:51:09 2010 -0700

    Fixed --help display for non-twisted bin/* commands.

 nova/flags.py |    2 ++
 1 file changed, 2 insertions(+)

commit 56c7e7763fc07f26be40bb8c0c702fc9afe8b1e3
Merge: ab1c34f 785d60c
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 19:44:33 2010 +0000

    Adds support for multiple API ports, one for each API type (OS, EC2).

commit 785d60c9492a8d4583eb27b214abefda6c1fbcfc
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 12:02:42 2010 -0700

    Fixed tests to work with new default API argument.

 nova/tests/api/__init__.py               |    2 +-
 nova/tests/api/openstack/fakes.py        |    4 ----
 nova/tests/api/openstack/test_auth.py    |   18 +++++++++---------
 nova/tests/api/openstack/test_flavors.py |    2 +-
 nova/tests/api/openstack/test_images.py  |    4 ++--
 nova/tests/api/openstack/test_servers.py |   28 ++++++++++++++--------------
 nova/tests/api_unittest.py               |    6 +-----
 7 files changed, 28 insertions(+), 36 deletions(-)

commit 2e2dce7ebf478258f67a9122c6b158ba5e89c1ed
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 11:28:14 2010 -0700

    Added support for OpenStack and EC2 APIs to run on different ports.

 bin/nova-api         |    9 +++++++--
 nova/api/__init__.py |   34 +++++++++++++++-------------------
 nova/wsgi.py         |   25 +++++++++++++++++++++----
 3 files changed, 43 insertions(+), 25 deletions(-)

commit 56c22eab57bc1096c0cd7e6756b42d163649fae1
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 23:32:56 2010 -0400

    More docs.

 doc/source/compute.rst           |    8 +++
 doc/source/development.guide.rst |    7 ++-
 doc/source/exceptions.rst        |   27 ----------
 doc/source/nova.rst              |  101 +++++++++++++++++++++++++++++++-------
 doc/source/scheduler.rst         |   51 +++++++++++++++++++
 5 files changed, 144 insertions(+), 50 deletions(-)

commit 500f101c64a8e5db91111a7afd7c95ac360b67fb
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 22:32:41 2010 -0400

    Language change for conformity.

 doc/source/api.rst  |    4 ++--
 doc/source/auth.rst |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit e0f889443f5c0732db28871f350c45e7c8e8d031
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 21:47:16 2010 -0400

    Add ec2 api docs.

 doc/source/api.rst       |   51 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/api/ec2/__init__.py |    4 +++-
 2 files changed, 54 insertions(+), 1 deletion(-)

commit ff588ab5baf400c243daeff82e7ca2fd27d87143
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 21:13:51 2010 -0400

    Exceptions docs.

 doc/source/development.guide.rst |    4 ++--
 doc/source/exceptions.rst        |   27 +++++++++++++++++++++++++++
 doc/source/nova.rst              |    9 +--------
 3 files changed, 30 insertions(+), 10 deletions(-)

commit c8e2341c98ffacfafffbadb7d204f10ff87cf89c
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 20:33:03 2010 -0400

    API endpoint documentation.

 doc/source/api.rst               |  112 ++++++++++++++++++++++++++++++++++++++
 doc/source/development.guide.rst |   13 +----
 doc/source/index.rst             |   10 ++--
 nova/api/__init__.py             |    8 ++-
 4 files changed, 125 insertions(+), 18 deletions(-)

commit a3077cbb859a9237f9516ed0f073fe00839277c4
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 1 16:25:56 2010 -0700

    basics to get proxied ajaxterm working with virsh

 bin/nova-ajax-proxy                        |   31 +++++++++++
 nova/api/ec2/cloud.py                      |   50 +++++++++--------
 nova/boto_extensions.py                    |   40 ++++++++++++++
 nova/utils.py                              |    3 +-
 nova/virt/libvirt.qemu.xml.template        |    9 +++
 tools/euca_additions/euca-get-ajax-console |   83 ++++++++++++++++++++++++++++
 6 files changed, 192 insertions(+), 24 deletions(-)

commit 501850f3d470da646378c8e7de7657024411d2e0
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 16:26:35 2010 -0400

    :noindex: on the fakes page for virt.fakes which is included in compute.rst

 doc/source/fakes.rst |    1 +
 1 file changed, 1 insertion(+)

commit 878eb4d25075f8d78f24ad9f78eb5d43702192ca
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 16:13:18 2010 -0400

    Virt documentation.

 doc/source/compute.rst    |   53 +++++++++++++++++++++++----------------------
 nova/virt/connection.py   |   20 ++++++++++-------
 nova/virt/fake.py         |    7 ++++--
 nova/virt/libvirt_conn.py |   22 ++++++++++++++++++-
 nova/virt/xenapi.py       |   12 ++++++++++
 5 files changed, 77 insertions(+), 37 deletions(-)

commit b76286c5ef2b2182cb0c2cc42b31971656e8f70f
Merge: bf15a6e ab1c34f
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 14:13:58 2010 -0400

    Merge trunk and apply some sphinx love.

commit 3bc28df8a1369dd9a717a5986000226c2c1d8c02
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 30 20:57:18 2010 -0700

    Change retrieval of security groups from kwargs so they are associated properly and add test to verify

 nova/compute/manager.py        |    5 +++--
 nova/tests/compute_unittest.py |   21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

commit fad337b648ea887bb713aab73335aa4602746b62
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 30 19:58:15 2010 -0700

    don't check for vgroup in fake mode

 nova/volume/driver.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 94e6b454183231b2e73b42d2e634889efd777587
Merge: 7c74613 56c7e77
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 30 17:42:40 2010 -0700

    merged trunk, just in case

commit bf15a6eb3de8c688dc1364959dd3e00d3e26a563
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Oct 30 20:05:31 2010 -0400

    Update compute/disk.py docs.

 nova/compute/disk.py |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 3bc84d66d35976794b559ad305dd10eec450216f
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 16:19:57 2010 -0400

    Change volume TODO list.

 doc/source/volume.rst |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 7ca505a729ee3caae968cf25059721ab51d1327c
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 16:18:00 2010 -0400

    Volume documentation.

 nova/tests/volume_unittest.py |   21 ++++++++++++---------
 nova/volume/driver.py         |   24 +++++++++++++-----------
 nova/volume/manager.py        |   39 +++++++++++++++++++++++++++++++--------
 3 files changed, 56 insertions(+), 28 deletions(-)

commit 5ffbfdd32bda3de071f994760ab9539bed40172a
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 15:40:58 2010 -0400

    Remove fakes duplication.

 doc/source/development.guide.rst |    1 -
 1 file changed, 1 deletion(-)

commit 489ddea1668c742f62acd6fd3e9af78f2f782912
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 15:30:39 2010 -0400

    Update database docs.

 doc/source/database.rst |   12 ++++++------
 nova/db/api.py          |   10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

commit ab1c34f71745b901f40fd6a72dffc7a29a864990
Merge: d94be04 75a0182
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Oct 29 18:59:03 2010 +0000

    Add support for google analytics to only the hudson-produced docs.

commit 75a0182e9a9a3cb6732e68eb3c9965b8033e1ce1
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Oct 29 12:27:30 2010 -0500

    Changes to conf.py

 doc/source/conf.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit f42967bdc7029e5c892811d84c7dfeb39a9b9f47
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Oct 29 11:53:09 2010 -0500

    Updated location of layout.html and change conf.py to use a build variable.

 doc/source/_ga/layout.html        |   17 +++++++++++++++++
 doc/source/_templates/.DS_Store   |  Bin 0 -> 6148 bytes
 doc/source/_templates/layout.html |   17 -----------------
 3 files changed, 17 insertions(+), 17 deletions(-)

commit 3ec095bed60490c844067c8d58ed43dbedee5f0a
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 12:35:46 2010 -0400

    Update database page a bit.

 doc/source/database.rst      |   20 ++++++++++++++------
 nova/db/sqlalchemy/api.py    |    2 +-
 nova/db/sqlalchemy/models.py |    8 ++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

commit 5feb2edcc322a8d44d3d698e2d3c27d81d16fe3f
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 12:16:49 2010 -0400

    Fakes cleanup (stop duplicate autodoc of FakeAOEDriver).

 doc/source/volume.rst |    1 +
 1 file changed, 1 insertion(+)

commit 133cd9973e17458bea3594490e70ccd3c524cf12
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 11:58:57 2010 -0400

    Document Fakes

 doc/source/development.guide.rst |    1 +
 doc/source/fakes.rst             |   34 ++++++++++++++++++++++++++++++++--
 nova/auth/fakeldap.py            |    4 +---
 3 files changed, 34 insertions(+), 5 deletions(-)

commit ee4ce8a55194be3fcb1e861e4206451cc7812d46
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 11:23:49 2010 -0400

    Remove "nova Packages and Dependencies"

 doc/source/development.guide.rst |    6 ------
 doc/source/packages.rst          |   29 -----------------------------
 2 files changed, 35 deletions(-)

commit 05ada3f47a4250fb278ecc84c16f51922106b83d
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:32:32 2010 -0400

    Finished TODO item

 doc/source/database.rst |    1 -
 1 file changed, 1 deletion(-)

commit 2132c0de46fd3f1b938e4b3b01b73fb2efaf6a38
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:28:13 2010 -0400

    Pep-257

 nova/db/sqlalchemy/models.py |   47 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

commit 7cc4bcd344221d517054641171f759b88112a459
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:13:40 2010 -0400

    Pep-257 cleanups.

 nova/db/api.py |  128 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 58 deletions(-)

commit 875a1f5d88b97aa77b8a782475155b7e81f872ad
Merge: 654a61c 8a7ae49
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 19:00:12 2010 -0400

    Merge from remote

commit 654a61c26d94a719e0ea665699b8075084ad79e3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 18:59:25 2010 -0400

    Clean up todos and the like for docs.

 doc/source/auth.rst              |  131 +++++++++++++++++++-------------------
 doc/source/compute.rst           |    5 +-
 doc/source/database.rst          |    2 +
 doc/source/development.guide.rst |    9 ++-
 doc/source/network.rst           |    1 +
 doc/source/volume.rst            |    1 +
 6 files changed, 81 insertions(+), 68 deletions(-)

commit 1106d7622e9327d4db417ae8bc7a18bb5d64fa1c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 18:59:03 2010 -0400

    A shell script for showing modules that aren't documented in .rst files.

 doc/find_undocumented_classes.sh |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 8a7ae49d4efd3695a0ceeabb85138cb43120be1e
Merge: 7dedbca fce88ec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 14:28:32 2010 -0700

    merge trunkdoc

commit 7dedbca140c7e923c7b2fcaa8679a19249fb8350
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 14:27:24 2010 -0700

    link binaries section to concepts

 doc/source/binaries.rst                  |    2 ++
 doc/source/concepts.and.introduction.rst |   10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

commit fce88eca313780be0d6c964aa81048bb8ce16105
Merge: a592636 73773c2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 17:21:07 2010 -0400

    Merge to latest.  Change ^^^ to ~~~ for third-level headings, change volumes to storage, include ephemeral and swift (TODO).

commit a592636054511382105dc81d4a6b2a44df0dad9a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 17:08:13 2010 -0400

    :func: links to python functions in the documentation.

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1915bb227d1eb847a681173772f4b9a769d64331
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 15:10:15 2010 -0400

    Todo cleanups in docs.

 doc/source/auth.rst    |   24 +++++++++++++-----------
 doc/source/compute.rst |    4 ++--
 doc/source/network.rst |   39 ++++++++++++++++++++++++---------------
 3 files changed, 39 insertions(+), 28 deletions(-)

commit 828b299a5660537062b11e6e58cfdf4c840053e1
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 14:39:25 2010 -0400

    cleanup todos

 doc/source/compute.rst  |   13 +------------
 doc/source/database.rst |   10 ++++++++--
 doc/source/volume.rst   |   10 ++++++----
 3 files changed, 15 insertions(+), 18 deletions(-)

commit 73773c2897894a4b7c40268f04fa100425411824
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 11:38:43 2010 -0700

    fix title levels

 doc/source/concepts.and.introduction.rst |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 39fd6f43873e6d314504f53dc4cb1c8a3a3cfbc3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 11:33:29 2010 -0700

    wip architecture, a few auth formatting fixes, binaries, and overview

 doc/source/architecture.rst              |   20 ++++++-----
 doc/source/auth.rst                      |   45 ++++++++++++-------------
 doc/source/binaries.rst                  |   53 +++++++++++++++++++++++-------
 doc/source/concepts.and.introduction.rst |    3 ++
 doc/source/services.rst                  |   25 +++++++-------
 5 files changed, 91 insertions(+), 55 deletions(-)

commit 9321ae23a1741267bc911e70b6755ac5c3251fbc
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 14:04:11 2010 -0400

    volume cleanups

 doc/source/volume.rst |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

commit b6539d86c7217290d46682e214a9e82cfc810447
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 13:58:20 2010 -0400

    Remove objectstore, not referenced anywhere.

 doc/source/objectstore.rst |   66 --------------------------------------------
 1 file changed, 66 deletions(-)

commit 7d367e04c3e0dcdf7ce2121c464884c0825a552c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 13:23:43 2010 -0400

    Clean up volumes / storage info.

 doc/source/concepts.and.introduction.rst |    6 ++--
 doc/source/database.rst                  |   32 ++++++++++++++++----
 doc/source/development.guide.rst         |    2 +-
 doc/source/storage.rst                   |   47 ------------------------------
 doc/source/volume.rst                    |   17 +++++++++--
 5 files changed, 46 insertions(+), 58 deletions(-)

commit d94be042a54f87b7ec140b7e5d5aae8846d0805f
Merge: eb82a8a 4012860
Author: jaypipes@gmail.com <>
Date:   Thu Oct 28 17:09:07 2010 +0000

    Moves db writes into compute manager class. Cleans up sqlalchemy model/api to remove redundant calls for updating what is really a dict.

commit 4bd42d5ee9eadb9affb40ee6ed0f98b13609c895
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:26:29 2010 -0400

    Another heading was too distracting, use <strong> instead.

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 89c881d651efcbba56406048112c3cf2cb676a8e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:26:17 2010 -0400

    Fix underlining -> heading in rst file.

 doc/source/fakes.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 208da85e85131a9b60a1fadea3e4242fa70dcde2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:25:39 2010 -0400

    Whitespace and docstring cleanups

 nova/auth/fakeldap.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 6cbc507cd821d91a9ce21e78b50748fa59ddf356
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:14:50 2010 -0400

    Remove outdated endpoint documentation.

 doc/source/development.guide.rst |    6 ++-
 doc/source/endpoint.rst          |   91 --------------------------------------
 doc/source/modules.rst           |    6 ++-
 3 files changed, 10 insertions(+), 93 deletions(-)

commit 8fa3db896ca73bb8f72228afc387c9db500b9ae9
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:10:08 2010 -0400

    Clean up indentation error by preformatting.

 doc/source/concepts.and.introduction.rst |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 44885b02a6c4db9ca2cbfc4067cd37fa3c504aee
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:09:59 2010 -0400

    Add missing rst file.

 doc/source/database.rst |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit e85ba051c27ab7d50914c7bf91db74d7cf7faa97
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:00:25 2010 -0400

    clean up the compute documentation a bit.

 doc/source/compute.rst  |   78 ++++++++++++++++++++++++++++++++++++++++-------
 nova/compute/manager.py |   24 ++++++++++++---
 nova/virt/connection.py |   11 ++++++-
 3 files changed, 96 insertions(+), 17 deletions(-)

commit 4012860b57593632d1f0061099e0d211dba58a59
Author: jaypipes@gmail.com <>
Date:   Thu Oct 28 11:43:08 2010 -0400

    Remove unused updated_data variable

 nova/api/ec2/cloud.py |    3 ---
 1 file changed, 3 deletions(-)

commit 196ab5b15cb87ea5bfe70050bfa0f14c724e2676
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 10:39:51 2010 -0400

    Fix wiki link.

 doc/source/index.rst |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 938caf0eb6620599a48696e9ca14cd4013e5cffb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Oct 27 17:14:24 2010 -0700

    added nova-manage docs

 doc/source/concepts.and.introduction.rst |  113 +++++++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

commit 21d4fce6dd8cf34ca729ef39abbabc02e466429e
Merge: 0211ec7 a1287cf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 27 16:37:40 2010 -0700

    merged and fixed conflicts

commit 0211ec7d61bea7e818418b6f17fdd45770ca9337
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 27 16:33:25 2010 -0700

    updates to auth, concepts, and network, fix of docstring

 doc/source/auth.rst                      |   46 ++++++++++++++++----------
 doc/source/concepts.and.introduction.rst |   53 ++++++++++++++++++++++--------
 doc/source/conf.py                       |    2 +-
 doc/source/images/cloudpipe.png          |  Bin 0 -> 89812 bytes
 doc/source/network.rst                   |   34 +++++++++----------
 nova/auth/manager.py                     |    1 -
 6 files changed, 85 insertions(+), 51 deletions(-)

commit a1287cf4e15d469163ec6465ea5f6ce200c20543
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 17:31:46 2010 -0400

    cleanup rrd doc generation.

 doc/source/auth.rst    |   26 ++++++++++++++++++-----
 doc/source/compute.rst |   54 +++++++++++++++++++++---------------------------
 doc/source/conf.py     |    2 +-
 nova/auth/fakeldap.py  |    1 -
 nova/auth/manager.py   |    3 +--
 5 files changed, 47 insertions(+), 39 deletions(-)

commit 55a0cfc96b92bd050115244c850f4ad58791c83f
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 15:52:06 2010 -0400

    Doc skeleton from collaborative etherpad hack session.

 doc/source/administration.guide.rst      |    2 +
 doc/source/auth.rst                      |   15 +++++++
 doc/source/compute.rst                   |   21 +++++++++
 doc/source/concepts.and.introduction.rst |   70 +++++++++++++++++++++++-------
 doc/source/development.guide.rst         |   15 +++++--
 doc/source/monitoring.rst                |   27 ++++++++++++
 doc/source/multi.node.install.rst        |    4 ++
 doc/source/network.rst                   |   19 ++++++++
 doc/source/services.rst                  |   31 +++++++++++++
 doc/source/storage.rst                   |   16 +++++++
 10 files changed, 201 insertions(+), 19 deletions(-)

commit 213b9987365c4b336b63e08e1ca187a43d00fa3d
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 14:55:01 2010 -0400

    OK, let's try this one more time.

 nova/api/ec2/cloud.py         |   13 ++++++-------
 nova/api/openstack/servers.py |    4 ++--
 nova/compute/manager.py       |   16 ++++++----------
 3 files changed, 14 insertions(+), 19 deletions(-)

commit 32a75c0181524a0d369419495f9a6e3d67d0e1e2
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 13:49:27 2010 -0400

    Doc updates.

 doc/source/administration.guide.rst      |    6 ++++--
 doc/source/concepts.and.introduction.rst |   25 ++++++++++++++++++++-----
 doc/source/flags.rst                     |   23 +++++++++++++++++++++++
 doc/source/multi.node.install.rst        |   21 +++++++++++++++++++++
 doc/source/quickstart.rst                |   21 +++++++++++++++++++++
 5 files changed, 89 insertions(+), 7 deletions(-)

commit 7c74613eb801679c67f551e307265b4af1dc12a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 27 10:28:52 2010 -0700

    updates from review, fix models.get and note about exception raising

 nova/compute/manager.py      |    7 +++++--
 nova/db/sqlalchemy/models.py |    5 +----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 79acdcca7d37e81d626be7a3369394ef9dface1b
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 11:10:50 2010 -0400

    Style cleanups and review from Eric.

 nova/api/ec2/cloud.py   |   23 ++++++++++++-----------
 nova/compute/manager.py |   15 ++++++++++++---
 2 files changed, 24 insertions(+), 14 deletions(-)

commit 24e19b43af5efe193bf28bed468e85ee57ce76df
Merge: 198af0e eb82a8a
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 10:51:37 2010 -0400

    Merge trunk and resolve conflicts

commit 8e12d65af48e69f6ad211c6b880a3162e1d03e78
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 00:05:42 2010 -0400

    New structure for documentation.

 doc/source/administration.guide.rst      |   31 ++++++++
 doc/source/concepts.and.introduction.rst |  123 ++++++++++++++++++++++++++++++
 doc/source/development.guide.rst         |   49 ++++++++++++
 doc/source/index.rst                     |   52 ++++++-------
 4 files changed, 226 insertions(+), 29 deletions(-)

commit eb82a8a7d8220adf31db3afb46849f24924ec973
Merge: fd68eec d8d1254
Author: Eric Day <eday@oddments.org>
Date:   Tue Oct 26 23:53:55 2010 +0000

    Fixes PEP8 violations from the last few merges.

commit d8d12549a5e47c7c44f449f12d6b556e2c56483d
Author: Eric Day <eday@oddments.org>
Date:   Tue Oct 26 15:37:32 2010 -0700

    More PEP8 fixes that were introduced in the last couple commits.

 nova/tests/api/openstack/test_api.py |    6 ++++++
 nova/utils.py                        |    5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

commit fd68eec1364a107c92453f753681ae5096451f39
Merge: 4f05f14 cce61a2
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Oct 26 18:04:05 2010 +0000

    Adding Google Analytics code to nova.openstack.org.

commit 4f05f148e67894839a226621b298f332baf7b693
Merge: 11802b7 23ab6ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 26 16:49:10 2010 +0000

    Fixes service unit tests after tornado excision.

commit cce61a2d29fac66cdbef74517bf1ab025df33d1f
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Oct 26 09:06:37 2010 -0500

    Added Google Analytics code

 doc/source/_templates/layout.html |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 967cf1572318949a7d864e68d0b7c78de37a35dd
Merge: 60f3b00 11802b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:37:51 2010 -0700

    renamed target_id to iscsi_target

commit 23ab6ceedd7d552faf2b97c44aadeccc45c9c333
Merge: 627a968 f0d79d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:08:57 2010 -0700

    merged gundlach's excision

commit f0d79d7d602a31fff03d8d934203128a2cd8940d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 26 11:58:46 2010 -0400

    Oops, didn't mean to check this one in.  Ninja-patch

 run_tests.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit ba6d9293204284a7c74b5b0cffe63767941fd25c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 26 11:48:20 2010 -0400

    Delete BaseTestCase and with it the last reference to tornado.
    
    Requires commenting out some service_unittest tests which were silently failing under BaseTestCase and which now fail under TrialTestCase.  vishy says he wrote the code and thinks he knows what is going wrong.

 nova/test.py                   |  156 ----------------------------------
 nova/tests/api_unittest.py     |    4 +-
 nova/tests/service_unittest.py |  184 ++++++++++++++++++++--------------------
 run_tests.py                   |   16 ----
 4 files changed, 96 insertions(+), 264 deletions(-)

commit 627a968e79ed21d970225e5ece332d9100abe022
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:04:49 2010 -0700

    fix completely broken ServiceTestCase

 nova/tests/service_unittest.py |  125 ++++++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 55 deletions(-)

commit 11802b76c02ff94cde67b68ce085584f137609d6
Merge: a1d907d 8ccdae9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 26 01:38:53 2010 +0000

    Removes some cruft from sqlalchemy/models.py like unused imports and the unused str_id method.

commit a1d907d567d38f2741e2e1d633cc7b20598d0122
Merge: ebffd9c 0c7b1ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 26 00:44:23 2010 +0000

    Adds rescue and unrescue commands.

commit 8ccdae97558d9660a9a0fac8dad809a09cbd3c71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 17:20:10 2010 -0700

    actually remove the conditional

 nova/utils.py |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

commit 5318bf110019d820e6f000662194d6e29f3e315f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 17:15:56 2010 -0700

    fix tests by removing missed reference to prefix and unnecessary conditional in generate_uid

 nova/db/sqlalchemy/api.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit dfe98891b46c4f02f13ea2686979ca7ff4547bd3
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Oct 25 23:10:51 2010 +0000

    Making net injection create /etc/network if non-existant

 nova/compute/disk.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 7869876212a192e2f7953bf9ec5cc8200ae7f604
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Oct 25 22:50:32 2010 +0000

    Documentation was missing; added

 nova/auth/openssh-lpk_sun.schema |    7 +++++++
 1 file changed, 7 insertions(+)

commit 33850cb57e195e538d6e42cb6d10f8296c0d4be4
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Oct 25 22:42:49 2010 +0000

    Moving the openldap schema out of nova.sh into it's own files, and adding sun (opends/opendj/sun directory server/fedora ds) schema files

 nova/auth/nova_openldap.schema        |   84 +++++++++++++++++++++++++
 nova/auth/nova_sun.schema             |   16 +++++
 nova/auth/openssh-lpk_openldap.schema |   19 ++++++
 nova/auth/openssh-lpk_sun.schema      |    3 +
 nova/auth/slap.sh                     |  112 +--------------------------------
 5 files changed, 125 insertions(+), 109 deletions(-)

commit ebffd9cb35af4257a085f85abf64e0c2baf31ff0
Merge: 954c91e 02e0b75
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Oct 25 21:44:02 2010 +0000

    validates device parameter for attach-volume

commit 7c5c8bc2cfc90a17f88a768610fa1bb286b8c05c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 14:02:32 2010 -0700

    add nova-debug to setup.py

 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit fcb0e910458a2fde904730d719011168a8d23f32
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 13:51:09 2010 -0700

    nova-debug, relaunch an instance with a serial console

 tools/nova-debug |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

commit 954c91e315ba2745602336918a455ef3de047a8a
Merge: c3fbd2f 2e67031
Author: Andy Smith <code@term.ie>
Date:   Mon Oct 25 20:44:19 2010 +0000

    Remove the last vestigial bits of tornado code still in use.
    
    An IP lawyer may want to comment on whether we need to assign copyright for the relavent 5 lines.

commit 60f3b009f3f846539dfeb2101eec73259553f8ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 12:54:22 2010 -0700

    pep8 cleanup

 nova/compute/manager.py      |    4 ++--
 nova/db/sqlalchemy/models.py |    1 -
 nova/volume/manager.py       |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

commit 2738a380816b73f35e73f111bd9b4f3ef3101012
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 12:17:12 2010 -0700

    print the exception on fail, because it doesn't seem to reraise it

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3508fe6e6fe56d86119158d1631d624c76087bf6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 11:12:56 2010 -0700

    use libvirt connection for attaching disks and avoid the symlink

 nova/virt/libvirt_conn.py |   45 ++++++++++++++++++++++++++++++++++++---------
 nova/volume/driver.py     |    5 ++++-
 2 files changed, 40 insertions(+), 10 deletions(-)

commit 02e0b75e85f753043fc71ac2e0714ec4d4b0cca8
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Oct 25 10:43:03 2010 -0700

    update error message

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c3fbd2f09502d7436395fde3637036a44ce629a5
Merge: 81e8c52 daa2569
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 16:34:22 2010 +0000

    Exceptions in the OpenStack API will be converted to Faults as they should be, rather than barfing a stack trace to the user.

commit daa2569eda7a744113813e2fd4747c2f3e05e0c1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:25:50 2010 -0400

    pep8

 nova/tests/api/test_wsgi.py |    2 +-
 nova/tests/api_unittest.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e2746b3e4a3e07b6eea6c3db1551d4d61f2e0a97
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:23:55 2010 -0400

    pep8

 nova/api/openstack/ratelimiting/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1d5e07419f9d29d9ce7612efcd566145b41c43bf
Merge: d9deffc 81e8c52
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:22:29 2010 -0400

    Merge from trunk

commit 2e67031ffb981ae1a47043cd48d50470eb6dc0b6
Author: Andy Smith <code@term.ie>
Date:   Mon Oct 25 19:21:09 2010 +0900

    Duplicate the two trivial escaping functions remaining from tornado's code and remove the dependency.

 nova/objectstore/handler.py |   12 ++++++------
 nova/utils.py               |   25 +++++++++++++++++++++++++
 tools/pip-requires          |    1 -
 3 files changed, 31 insertions(+), 7 deletions(-)

commit 43a545a8bd8f763eba7741a240c29da447aef61e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 03:11:00 2010 -0700

    more bugfixes, flag for local volumes

 nova/api/ec2/__init__.py     |    1 +
 nova/api/ec2/cloud.py        |    7 +++++--
 nova/compute/manager.py      |    4 +++-
 nova/db/sqlalchemy/models.py |    6 ++++++
 nova/volume/driver.py        |    9 +++++----
 nova/volume/manager.py       |   12 +++++++-----
 6 files changed, 27 insertions(+), 12 deletions(-)

commit bde0d8d0f0e864d5b5d0f87e55ab23839846f71e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 01:37:01 2010 -0700

    fix bugs, describe volumes, detach on terminate

 nova/api/ec2/cloud.py   |   13 ++++++++++---
 nova/compute/manager.py |    3 +++
 nova/volume/driver.py   |   11 +++++------
 nova/volume/manager.py  |    4 ++--
 4 files changed, 20 insertions(+), 11 deletions(-)

commit 3e2715b21a51c10451e6275e649385f0a846b033
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 00:45:33 2010 -0700

    ISCSI Volume support
    
    * Rewrite of Volume code to make VolumeManager more generic
    * AoE vs. iscsi moved to driver layer
    * Added db support for target ids
    * Added code to re-export volumes on restart of VolumeManager
    * Includes a script to create /dev/iscsi volumes on remote hosts

 nova/compute/manager.py       |   25 ++++-
 nova/db/api.py                |   43 ++++++-
 nova/db/sqlalchemy/api.py     |   71 ++++++++++++
 nova/db/sqlalchemy/models.py  |   23 +++-
 nova/flags.py                 |    2 +-
 nova/tests/fake_flags.py      |    8 +-
 nova/tests/volume_unittest.py |   26 ++---
 nova/volume/driver.py         |  250 +++++++++++++++++++++++++++++++++++------
 nova/volume/manager.py        |  103 +++++++++--------
 tools/iscsidev.sh             |   41 +++++++
 10 files changed, 480 insertions(+), 112 deletions(-)

commit 0e98d027d1deb8cd46ddb9a1df4558a5c8b2edfc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 23:26:03 2010 -0700

    Removed unused imports and left over references to str_id

 nova/db/sqlalchemy/models.py |   25 +------------------------
 nova/network/manager.py      |    2 +-
 2 files changed, 2 insertions(+), 25 deletions(-)

commit 0c7b1ea7972defe67d8bebf4f23d189cc7b0422c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 19:52:02 2010 -0700

    logging.warn not raise logging.Warn

 nova/compute/manager.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 7bf0f86e5863f4943900a78f9797810b80d171e5
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:56:09 2010 -0700

    whitespace

 nova/api/ec2/admin.py |    1 +
 1 file changed, 1 insertion(+)

commit 5d0f6ac00633f622d238b49af1a0d7c566057ec5
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:54:52 2010 -0700

    move create_console to cloud.py from admin.py

 nova/api/ec2/admin.py |   30 ------------------------------
 nova/api/ec2/cloud.py |   28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 30 deletions(-)

commit 9cca66847004cda8661d420fd3582d8121f0fcc8
Merge: 4f7bbaa 81e8c52
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:41:53 2010 -0700

    merge lp:nova

commit 9ee74816c0c2a28f7d056d524111cd940513766a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 17:22:29 2010 -0700

    add NotFound to fake.py and document it

 nova/virt/fake.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit a80b06285d993696ccb90eff00bb2963df49ecc6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 17:18:24 2010 -0700

    add in the xen rescue template

 nova/virt/libvirt.rescue.xen.xml.template |   34 +++++++++++++++++++++++++++++
 nova/virt/libvirt.xen.xml.template        |    6 +----
 nova/virt/libvirt_conn.py                 |    3 +++
 3 files changed, 38 insertions(+), 5 deletions(-)

commit 4948fed24d5e16d95f237ec95c1cd305fcc4df95
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 16:04:35 2010 -0700

    pep 8 cleanup and typo in resize

 nova/api/cloud.py         |    2 ++
 nova/virt/libvirt_conn.py |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit eecef70fcdd173cc54ad8ac7edba9e9b31855134
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 15:37:55 2010 -0700

    add methods to cloud for rescue and unrescue

 nova/api/cloud.py         |   18 ++++++++++++++++++
 nova/api/ec2/cloud.py     |   17 +++++++++++++++--
 nova/virt/libvirt_conn.py |    2 +-
 3 files changed, 34 insertions(+), 3 deletions(-)

commit 5fdcbd6c831cb3ab2cb04c0eecc68e4b0b9d5a66
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 15:06:42 2010 -0700

    update tests

 nova/tests/virt_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 23e81319f88c405557bd5798bd119668983a5a98
Merge: c524508 81e8c52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 14:57:37 2010 -0700

    merged trunk and fixed conflicts/changes

commit 2337fab0979b72bbc7e7730e94518a0e835a2751
Author: Andy Smith <code@term.ie>
Date:   Mon Oct 25 03:45:19 2010 +0900

    part way through porting the codebase off of twisted
    
    this provides a very basic eventlet-based service replacement for the
    twistd-based services, a replacement for task.LoopingCall
    
    also adds nova-combined with the goal of running a single service when
    doing local testing and dev

 bin/nova-combined         |   61 ++++++++++
 bin/nova-compute          |   12 +-
 bin/nova-network          |   14 +--
 nova/compute/disk.py      |   66 +++++------
 nova/compute/manager.py   |   28 ++---
 nova/flags.py             |    7 ++
 nova/manager.py           |    1 -
 nova/network/manager.py   |    4 +-
 nova/server.py            |    6 +-
 nova/service_eventlet.py  |  288 +++++++++++++++++++++++++++++++++++++++++++++
 nova/utils.py             |   36 ++++++
 nova/virt/fake.py         |    6 +-
 nova/virt/libvirt_conn.py |  172 +++++++++++++--------------
 nova/virt/xenapi.py       |  103 +++++++---------
 14 files changed, 574 insertions(+), 230 deletions(-)

commit 81e8c5256c1e52326b6b64cf237128364d1bcb22
Merge: 8479720 a53aea8
Author: Eric Day <eday@oddments.org>
Date:   Sat Oct 23 00:04:02 2010 +0000

    Another pep8 cleanup branch for nova/tests, should be merged after lp:~eday/nova/pep8-fixes-other. After this, the pep8 violation count is 0!

commit 84797205fcc8d243d425a98d195245213eea93b7
Merge: e8ffba4 48fcb75
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 22 22:09:10 2010 +0000

    Changes block size for dd to a reasonable number.

commit e8ffba4d2384b91b154ef1f73df9afd49077386d
Merge: 685e2a1 777b14c
Author: Eric Day <eday@oddments.org>
Date:   Fri Oct 22 21:58:59 2010 +0000

    Another pep8 cleanup branch for nova/api, should be merged after lp:~eday/nova/pep8-fixes.

commit 685e2a1b4b359c1f7e8ec72817c2c420f2b26a18
Merge: 3e3407f 947203a
Author: Rick Clark <rick@openstack.org>
Date:   Fri Oct 22 19:18:52 2010 +0000

    Created Authors file.

commit 947203a467859fe9e0dea45a2a3590859611baed
Author: Rick Clark <rick@openstack.org>
Date:   Fri Oct 22 14:06:34 2010 -0500

    Actually adding Authors file.

 Authors |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 0d10dcadc1186b023e7bcce7372c722c54ffe3a3
Author: Rick Clark <rick@openstack.org>
Date:   Fri Oct 22 13:47:22 2010 -0500

    Created Authors file and added to manifest for Austin Release

 MANIFEST.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48fcb757852f6d408695a1b4467f59b4be22dbdd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 22 01:54:58 2010 -0700

    speed up disk generation by increasing block size

 nova/compute/disk.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit a53aea8fedcd9cfab8b54eaaff6a1ae1d2c60684
Author: Eric Day <eday@oddments.org>
Date:   Fri Oct 22 00:48:27 2010 -0700

    PEP8 cleanup in nova/tests, except for tests. There should be no functional changes here, just style changes to get violations down.

 nova/tests/access_unittest.py                 |    7 +-
 nova/tests/api/__init__.py                    |    4 +-
 nova/tests/api/fakes.py                       |   18 +++++
 nova/tests/api/openstack/__init__.py          |   14 ++--
 nova/tests/api/openstack/fakes.py             |   26 +++----
 nova/tests/api/openstack/test_auth.py         |   25 ++++++-
 nova/tests/api/openstack/test_faults.py       |   20 +++++-
 nova/tests/api/openstack/test_images.py       |   23 +++---
 nova/tests/api/openstack/test_ratelimiting.py |   11 ++-
 nova/tests/api/openstack/test_servers.py      |   52 +++++++-------
 nova/tests/api/test_wsgi.py                   |    4 +-
 nova/tests/api_integration.py                 |    8 +--
 nova/tests/api_unittest.py                    |   24 ++++---
 nova/tests/auth_unittest.py                   |   10 ++-
 nova/tests/cloud_unittest.py                  |   36 ++++++----
 nova/tests/flags_unittest.py                  |    5 +-
 nova/tests/network_unittest.py                |   51 ++++++++-----
 nova/tests/objectstore_unittest.py            |    7 +-
 nova/tests/process_unittest.py                |    3 +
 nova/tests/quota_unittest.py                  |    7 +-
 nova/tests/rpc_unittest.py                    |    9 ++-
 nova/tests/scheduler_unittest.py              |    2 +
 nova/tests/service_unittest.py                |    4 +-
 nova/tests/validator_unittest.py              |    3 +-
 nova/tests/virt_unittest.py                   |   96 ++++++++++++-------------
 nova/tests/volume_unittest.py                 |    9 ++-
 26 files changed, 290 insertions(+), 188 deletions(-)

commit 8c6ef1380426aca6d7c82e3489789ccde8ee047c
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 21 17:15:21 2010 -0700

    PEP8 cleanup in nova/*, except for tests. There should be no functional changes here, just style changes to get violations down.

 nova/auth/dbdriver.py                  |   51 ++++++++-------
 nova/auth/fakeldap.py                  |   11 ++--
 nova/auth/ldapdriver.py                |   12 ++--
 nova/auth/manager.py                   |    2 +-
 nova/cloudpipe/pipelib.py              |   30 +++++----
 nova/compute/disk.py                   |   15 ++---
 nova/compute/monitor.py                |  111 +++++++++++++++-----------------
 nova/compute/power_state.py            |   13 ++--
 nova/image/service.py                  |   17 ++---
 nova/image/services/glance/__init__.py |    8 +--
 nova/network/linux_net.py              |   10 ++-
 nova/network/manager.py                |    5 +-
 nova/objectstore/bucket.py             |   20 +++---
 nova/objectstore/handler.py            |   21 +++---
 nova/objectstore/image.py              |   41 ++++++------
 nova/objectstore/stored.py             |    4 +-
 nova/scheduler/driver.py               |    2 +
 nova/scheduler/manager.py              |    3 +-
 nova/scheduler/simple.py               |    1 +
 nova/virt/fake.py                      |    1 +
 nova/virt/images.py                    |    4 +-
 nova/virt/libvirt_conn.py              |   97 ++++++++++++++++------------
 nova/virt/xenapi.py                    |   28 ++++----
 nova/volume/driver.py                  |    1 -
 24 files changed, 273 insertions(+), 235 deletions(-)

commit 7af25f1476f6a30cb45b4a1a990efecc9239169e
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 21 16:15:26 2010 -0700

    PEP8 cleanup in nova/db. There should be no functional changes here, just style changes to get violations down.

 nova/db/api.py                |   12 +-
 nova/db/sqlalchemy/api.py     |  735 +++++++++++++++++++++--------------------
 nova/db/sqlalchemy/models.py  |   44 +--
 nova/db/sqlalchemy/session.py |    3 +-
 4 files changed, 408 insertions(+), 386 deletions(-)

commit 777b14c27ba9bd5ee298f62323b2170023e44ca6
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 21 15:26:06 2010 -0700

    PEP8 cleanup in nova/api. There should be no functional changes here, just style changes to get violations down.

 nova/api/__init__.py                        |   15 ++--
 nova/api/ec2/__init__.py                    |   13 ++--
 nova/api/ec2/admin.py                       |   11 +--
 nova/api/ec2/apirequest.py                  |    8 +-
 nova/api/ec2/cloud.py                       |  107 ++++++++++++---------------
 nova/api/ec2/images.py                      |    6 +-
 nova/api/ec2/metadatarequesthandler.py      |    7 +-
 nova/api/openstack/__init__.py              |   31 ++++----
 nova/api/openstack/auth.py                  |    9 ++-
 nova/api/openstack/backup_schedules.py      |    1 +
 nova/api/openstack/faults.py                |    2 +-
 nova/api/openstack/flavors.py               |    6 +-
 nova/api/openstack/images.py                |   10 +--
 nova/api/openstack/ratelimiting/__init__.py |    9 ++-
 nova/api/openstack/servers.py               |   29 ++++----
 nova/api/openstack/sharedipgroups.py        |    4 +-
 16 files changed, 135 insertions(+), 133 deletions(-)

commit e012a2b73725bded6d4ac39747d57affda545770
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 21 11:49:51 2010 -0700

    PEP8 and pylint cleanup. There should be no functional changes here, just style changes to get violations down.

 bin/nova-api                       |    1 +
 bin/nova-manage                    |   47 ++++++++---------
 bzrplugins/novalog/__init__.py     |   19 +++----
 nova/adminclient.py                |   97 +++++++++++++-----------------------
 nova/context.py                    |   11 ++--
 nova/crypto.py                     |   45 +++++++++++------
 nova/exception.py                  |    5 +-
 nova/fakerabbit.py                 |    1 -
 nova/flags.py                      |    3 +-
 nova/manager.py                    |    8 ++-
 nova/process.py                    |   23 +++++----
 nova/quota.py                      |    3 +-
 nova/rpc.py                        |    2 +
 nova/server.py                     |    7 ++-
 nova/test.py                       |   23 ++++++---
 nova/tests/api/__init__.py         |    4 +-
 nova/tests/api_unittest.py         |    2 +-
 nova/tests/compute_unittest.py     |    4 +-
 nova/tests/network_unittest.py     |    4 +-
 nova/tests/objectstore_unittest.py |    8 +--
 nova/tests/quota_unittest.py       |    4 +-
 nova/tests/rpc_unittest.py         |    2 +-
 nova/tests/scheduler_unittest.py   |    6 +--
 nova/tests/service_unittest.py     |    2 +-
 nova/tests/volume_unittest.py      |    2 +-
 nova/twistd.py                     |   19 ++++---
 nova/utils.py                      |   23 ++++++---
 nova/validate.py                   |   41 ++++++++-------
 nova/wsgi.py                       |   22 ++++----
 pylintrc                           |    2 +-
 30 files changed, 233 insertions(+), 207 deletions(-)

commit 198af0ef9e65bc4c2efe74b9d93cf40210eb77bc
Author: jaypipes@gmail.com <>
Date:   Thu Oct 21 14:29:34 2010 -0400

    Moves db writes into compute manager class. Cleans up sqlalchemy model/api to remove redundant calls for updating what is really a dict.

 nova/api/ec2/cloud.py                    |   43 ++++++++++---------
 nova/api/openstack/servers.py            |   25 +++++------
 nova/compute/manager.py                  |   35 ++++++++++++++++
 nova/db/sqlalchemy/api.py                |   66 ++++++++++--------------------
 nova/db/sqlalchemy/models.py             |   10 +++++
 nova/tests/api/openstack/fakes.py        |    1 +
 nova/tests/api/openstack/test_servers.py |    4 +-
 7 files changed, 104 insertions(+), 80 deletions(-)

commit 943e8bcda4f304caa15d689d4db0e50376860f00
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Oct 21 08:42:15 2010 -0700

    validate device in AttachDisk

 nova/api/ec2/cloud.py |    3 +++
 1 file changed, 3 insertions(+)

commit 3e3407f2e4f44e7f717bba94219bb0023695fc4d
Merge: f94bdc1 7233ed2
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Oct 21 00:49:01 2010 +0000

    Cleanup of doc for dependencies (redis optional, remove tornado, etc). Please check for accuracy.

commit f94bdc1c7b8024609f2e9b6549a60a6cef091637
Merge: 8f55f8a 08b4a4f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 21 00:39:01 2010 +0000

    Delays the creation of the looping calls that that check the queue until startService is called.

commit 7233ed2e35e3829b05a6b229af9d3a243da744fb
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Oct 20 17:06:51 2010 -0500

    Made updates based on review comments.

 doc/source/getting.started.rst |   22 ++++++++++------------
 doc/source/index.rst           |   11 ++++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

commit 8f55f8a93b0223b0e33b229ec512d87217521909
Merge: b07f04b a75eabe
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 20 21:34:27 2010 +0000

    Authorize image access instead of just blindly giving it away.

commit b07f04b806571f537357e993629b8acd1ea00446
Merge: 4de2079 d454bff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 20 21:29:03 2010 +0000

    Checks the pid of dnsmasq to make sure it is actually referring to the right process.

commit 4de2079303a25a1e6a60d3110788ebb35fcdf37e
Merge: 9ecfe3a db1ca38
Author: Rick Clark <rick@openstack.org>
Date:   Wed Oct 20 21:05:24 2010 +0000

    change boto version from 1.9b1 to 1.9b in pip-requires

commit d454bff397c29651e20fdea105b3e8cc197d0f5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 20 13:54:53 2010 -0700

    Check the pid to make sure it refers to the correct dnsmasq process

 nova/network/linux_net.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 08b4a4fb49744c9d3c499a52922a4e2cb2110e14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 20 13:46:37 2010 -0700

    make sure looping calls are created after service starts and add some tests to verify service delegation works

 nova/service.py                |   53 +++++++++++++++++++++-------------------
 nova/tests/service_unittest.py |   44 ++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 28 deletions(-)

commit db1ca38ddce690e7b46fe5901a3dda74528531d6
Author: Rick Clark <rick@openstack.org>
Date:   Wed Oct 20 15:41:32 2010 -0500

    fix typo in boto line of pip-requires

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5c2bc4a709d3b2f1785ac7fabbb2a1183d20d0d6
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Oct 20 09:50:09 2010 -0500

    Updated documentation

 doc/source/getting.started.rst |   49 ++++++++++------------------------------
 doc/source/index.rst           |   17 ++++++++------
 2 files changed, 22 insertions(+), 44 deletions(-)

commit 9ecfe3a906b43f7ba54382e1bb1c26df9cd8fbbf
Merge: 69cacad a199f1b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Oct 20 03:48:44 2010 +0000

    Update version set in setup.py to 2010.1 in preparation for Austin release.

commit a199f1ba538ba599765ca6e84384a092c0ecce81
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 19 23:41:25 2010 -0400

    Also update version in docs.

 doc/source/conf.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f9a780d9c6ab320349e0c671cea49cb7495d6db2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 19 23:36:28 2010 -0400

    Update version to 2010.1 in preparation for Austin release.

 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 69cacadad39f1b5f52da41b3cdaa3d6b0c88a3ab
Merge: 9145fee 9335784
Author: jaypipes@gmail.com <>
Date:   Wed Oct 20 02:54:21 2010 +0000

    * Fills out the Parallax/Glance API calls for update/create/delete and adds unit tests for them.
    * Modifies the ImageController and GlanceImageService/LocalImageService calls to use index and detail routes to comply perfectly with the RS/OpenStack API.

commit 9145feeed99b02a2798fde909a2abe8d900b522c
Merge: 38dd6ff 03a7459
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 20 02:49:28 2010 +0000

    Makes disk.partition resize root drive to 10G, unless it is m1.tiny which just leaves it as is.  Larger images are just used as is.

commit 38dd6ffabaaf6130b7f810f4cbf45d1cd5202205
Merge: 896f5f3 14debdd
Author: Rick Clark <rick@openstack.org>
Date:   Wed Oct 20 02:44:12 2010 +0000

    reverted python-boto version in pip-requires to 1.9b1.

commit a75eabea4800a1c10487bc2962aeb26aaea26f8d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 19 19:57:24 2010 -0400

    Construct exception instead of raising a class.

 nova/objectstore/handler.py |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

commit 8a63f8332b3abfff7862f5164d5af5882c199217
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 19 19:40:57 2010 -0400

    Authorize Image before download.

 nova/objectstore/handler.py |    2 ++
 1 file changed, 2 insertions(+)

commit d9deffcba4ff6ab3b5a6459c9d626dc4f5334336
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 19 19:39:20 2010 -0400

    Add unit test for XML requests converting errors to Faults

 nova/tests/api/openstack/test_api.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 86a8a5a2091dc0a36ccbe05f46609c82b1060291
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 19 19:37:42 2010 -0400

    Fixes https://bugs.launchpad.net/nova/+bug/663551 by catching exceptions at the top level of the API and turning them into Faults.

 nova/api/openstack/__init__.py       |   11 ++++++
 nova/tests/api/openstack/test_api.py |   65 ++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

commit 896f5f3b0e3755e7e591fee44a622ec72bf56a68
Merge: 9947da2 a5a8543
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 19 22:44:07 2010 +0000

    Adds reasonable default local storage gb to instance sizes.

commit 14debddc5dd86d90e72c29149d223ae06c1c09aa
Author: Rick Clark <rick@openstack.org>
Date:   Tue Oct 19 17:03:47 2010 -0500

    reverted python-boto version in pip-requires to 1.9b1.\

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9335784f8230df1ead63839b4ddd5dd12f665c7b
Author: jaypipes@gmail.com <>
Date:   Tue Oct 19 17:39:12 2010 -0400

    Fix typo in test case

 nova/tests/api/openstack/test_images.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 112992d5372a64b07de5188af6c2c0753981a3d6
Author: jaypipes@gmail.com <>
Date:   Tue Oct 19 16:09:12 2010 -0400

    Remember to call limited() on detail() in image controller.

 nova/api/openstack/images.py      |    7 ++++---
 nova/tests/api/openstack/fakes.py |    3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

commit 9947da22ab939f122e49857e3fd555542dae5248
Merge: 54b5c71 8e10a0e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 19 18:34:00 2010 +0000

    Makes nova-dhcpbridge notify nova-network on old network lease updates.

commit a5a85431d27db36cc5df73cde93c6731d3b2292f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 15:58:42 2010 -0700

    add reasonable gb to instance types

 nova/compute/instance_types.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 03a74592ed2dba8d82432fb7eaa76c9dce2351c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 13:40:03 2010 -0700

    it is flags.DEFINE_integer, not FLAGS.define_int

 nova/compute/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3ef13339a003d6799dd303c7764606c76c5fb1ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 13:32:45 2010 -0700

    Makes disk.partition resize root drive to 10G, unless it is m1.tiny which
    just leaves it as is.  Larger images are just used as is.

 nova/compute/disk.py      |   18 ++++++++++++++++--
 nova/virt/libvirt_conn.py |   15 +++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

commit 8e10a0ee1b5bb911f9e699a4c2039cfb22270973
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 12:46:32 2010 -0700

    update leases on old leases as well

 bin/nova-dhcpbridge |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 54b5c7161b30ea7e492525e5b2e19fb40c468fc0
Merge: 30bf86c 0b0d55c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 16 19:48:57 2010 +0000

    Adds a simple nova-manage command called scrub to deallocate the network and remove security groups for a projeect.

commit 30bf86c17a8ca833ef7ca8a0f17ff4d52d97cf30
Merge: fbe47ae 8e77d7c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 16 19:39:05 2010 +0000

    Refresh MANIFEST.in to make the tarball include all the stuff that belongs in the tarball.

commit fbe47ae3be6b18007ff8e4a74ad6efe748421dc5
Merge: 24de063 a340d3f
Author: Eric Day <eday@oddments.org>
Date:   Sat Oct 16 08:19:04 2010 +0000

    Added test case to reproduce bug #660668 and provided a fix by using the user_id from the auth layer instead of the username header.

commit 8e77d7cc6ce98ca1912dc9652244fbce3fdadf62
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 16 10:04:26 2010 +0200

    Add the last few things to MANIFEST.in.

 MANIFEST.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 85a046f1c758ff4be3a563d0707803b133ed16b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 16 10:02:17 2010 +0200

    Also add Xen template to manifest.

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 24de0631b622014323a4348ebc8408fadbafe99a
Merge: f36cfc4 b4ac1dd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 22:53:57 2010 +0000

    Fix two problems with get_console_log:
     * libvirt has this annoying "feature" where it chown()s your console to the uid running libvirt. That gets in the way of reading it. Add a call to "sudo chown ...." right before we read it to make sure it works out well.
     * We were looking in the wrong directory for console.log. *blush*

commit f36cfc4d6c0557f440572f375923c76cd7d7b1df
Merge: cbdba97 1156100
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 22:16:03 2010 +0000

    This branch converts incoming data to the api into the proper type.

commit cbdba97b592536ae1fbad15d4374684b9ffaa94f
Merge: c0f050c 6e7067f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 22:13:44 2010 +0000

    Fixes deprecated use of context in nova-manage network create.

commit ae842ac276e47a987d298cffeb480fbdaf5d2101
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 16 00:12:48 2010 +0200

    Add a bunch of stuff to MANIFEST.in that has been added to the tree over the last couple of months.

 MANIFEST.in |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit c0f050c54fad7fd714402b592b97cdc1caf8a8b7
Merge: 3b34b9f 8b2d114
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 22:04:14 2010 +0000

    Fix the --help flag for printing help on twistd-based services

commit b4ac1ddbfa0607bb75a187680b8d55006c6ea0c0
Merge: 5bb507f 3b34b9f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 23:59:23 2010 +0200

    Merge trunk

commit 5bb507fc0375e0e4dc7b8448b6751dcc52fc75eb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 23:55:43 2010 +0200

    Fix two problems with get_console_log:
    libvirt has this annoying "feature" where it chown()s your console to the uid running libvirt. That gets in the way of reading it.
    We were looking in the wrong directory for console.log. *blush*

 nova/virt/libvirt_conn.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 3b34b9f64c2f27cdc6203f8d5571246a92aa4386
Merge: d4d8a53 7013fb5
Author: Eric Day <eday@oddments.org>
Date:   Fri Oct 15 20:59:13 2010 +0000

    Fix for bug 660818 by adding the resource ID argument.

commit 3fdced0a19315732fec0ead200604e396f06823c
Merge: ff60af5 b70742c
Author: jaypipes@gmail.com <>
Date:   Fri Oct 15 16:24:19 2010 -0400

    Merge trunk

commit ff60af51cc2990c7b60ca97cc899f0719560bc6f
Author: jaypipes@gmail.com <>
Date:   Fri Oct 15 16:24:02 2010 -0400

    Reorg the image services code to push glance stuff into its own directory.

 nova/image/service.py                   |  195 ----------------------------
 nova/image/services/glance/__init__.py  |  216 +++++++++++++++++++++++++++++++
 nova/tests/api/openstack/fakes.py       |   15 ++-
 nova/tests/api/openstack/test_images.py |    4 +-
 4 files changed, 226 insertions(+), 204 deletions(-)

commit d4d8a530036d1530ba5420fb3831bc0705a604e8
Merge: b70742c a2eec04
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 20:23:59 2010 +0000

    Fix some unit tests:
     * One is a race due to the polling nature of rpc in eventlet based unit tests.
     * The other is a more real problem. It was caused by datastore.py being removed. It wasn't caught earlier because the .pyc file was still around on the tarmac box.

commit a2eec045eec52032ae8a3250120229039529ec53
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 21:49:31 2010 +0200

    Add a greenthread.sleep(0.3) in get_console_output unit test. This is needed because, for eventlet based unit tests, rpc polls, and there's a bit of a race. We need to fix this properly later on.

 nova/tests/cloud_unittest.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 203628e74ac5a63b6bd9237cf82c6452da01fe5b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 21:46:29 2010 +0200

    Perform a redisectomy on bin/nova-dhcpbridge.

 bin/nova-dhcpbridge |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 98623a160078dfed7347dcd1539b0cd27e51644a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Oct 15 11:06:16 2010 -0700

    Removed 'and True' oddity

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6e7067f435764ece7d3e6ade76eb27c19c57d450
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 10:08:49 2010 -0700

    use context for create_networks

 bin/nova-manage |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b70742cd442e8477d15c82a825641d934529bedf
Merge: 694cecb 3f737b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 15:18:40 2010 +0000

    Make Redis completely optional:
    
     * Move Redis code into fakeldap, since it's the only thing that still uses it.
     * Adjust auth unittests to skip fakeldap tests if Redis isn't around.
     * Adjust auth unittests to actually run the fakeldap tests if Redis /is/ around.

commit 8b2d1143f53bb029941a770e2611bb58a064c492
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 19:27:39 2010 +0900

    make --help work for twistd-based services

 nova/tests/twistd_unittest.py |   53 +++++++++++++++++++++++++++++++++++++++++
 nova/twistd.py                |    6 +++++
 run_tests.py                  |    1 +
 3 files changed, 60 insertions(+)

commit 38a4e415ef7e903e3c63bd584df8e4fee0163512
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 17:54:38 2010 +0900

    trivial style change

 nova/test.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e0ae19c7a911d742a7b82f90bac0fa86757eaeae
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 17:37:26 2010 +0900

    prevent leakage of FLAGS changes across tests

 nova/flags.py                |    6 +++++
 nova/test.py                 |   56 ++++++++++++++++++++----------------------
 nova/tests/flags_unittest.py |   12 +++++++++
 3 files changed, 45 insertions(+), 29 deletions(-)

commit 694cecb3d6e03a088c6c2508c0bfdcfca2d978e1
Merge: 7a5ee7e e80e91b
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 08:28:41 2010 +0000

    run_tests.sh presents a prompt:
    
    No virtual environment found...create one? (Y/n)
    
    However hitting enter to select the default (Y) actually selects 'n', this patch fixes that.
    
    In all reality this should probably be slightly smarter and not accept invalid input as invalid input will mean "no" and probably result in an unexpected error depending on what the user has installed, but for now it will at least do what is expected in the "happy" case.

commit e80e91bd653d16b069d82cb26990718daf38d0c2
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 16:06:12 2010 +0900

    Also accept 'y'

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a5ee7edf7660af00f2ad6b9c2a3273150bf4113
Merge: aec330b 951f4f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 06:28:32 2010 +0000

    A few more fixes for deprecations.

commit 68c8f2ba174a5052a5681bb55f4e21cf5f0febbf
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 15:25:29 2010 +0900

    make run_tests.sh's default perform as expected

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a340d3fe1b8e1f657351c8a32ff74b3cbcc3a8ff
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 14 18:17:56 2010 -0700

    Added test case to reproduce bug #660668 and provided a fix by using the user_id from the auth layer instead of the username header.

 nova/api/openstack/__init__.py        |    4 ++--
 nova/tests/api/openstack/test_auth.py |   35 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

commit 951f4f2f8bfcdc2fc1f638a1c568979eb01dcb1b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 16:44:58 2010 -0700

    get flags for nova-manage and fix a couple more deprecations

 bin/nova-manage         |    5 +++++
 nova/network/manager.py |   17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

commit 7013fb5c8f5883bae46c2407b3a7beb4412081bc
Author: Eric Day <eday@oddments.org>
Date:   Thu Oct 14 15:09:18 2010 -0700

    Fix for bug#660818, allows tests to pass since delete expects a resource ID.

 nova/api/openstack/backup_schedules.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aec330b34def7158f590ce855d0cd4ff5d0ed41c
Merge: 3363b13 81cdbc4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 21:18:51 2010 +0000

    This branch modifies the fixes all of the deprecation warnings about empty context.  It does this by adding the following fixes/features
      * promotes api/context.py to context.py because it is used by the whole system
      * adds more information to the context object
      * passes the context through rpc
      * adds a helper method for promoting to admin context (elevate())
      * modifies most checks to use context.project_id instead of context.project.id to avoid
        trips to the database
    
    This included a lot of merge fixing and backporting from the anso deploy branch so some stuff may be broken.  Right now it throws an Exception('die') in addition to the deprecation warning so we get a stack trace and can find any other deprecated calls.  This needs some testing, especially of the openstack api.

commit 81cdbc42d41509f629fe8ec0c7605958134e9ed0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 14:00:01 2010 -0700

    timestamps are passed as unicode

 nova/context.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f8028c0a4cd1c3cfb8a9c6b4c397fd67ce912cce
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Oct 14 13:48:34 2010 -0700

    Removed stray spaces that were causing an unnecessary diff line

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9171910ff82bd141a761ceaa4d47bdc826b7f73f
Merge: f8e41d8 3363b13
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 13:40:56 2010 -0700

    merged trunk

commit 9732c0af89f21490cc8d6bc80799bbc8b36fb441
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Oct 14 13:38:35 2010 -0700

    Minimized diff, fixed formatting

 nova/compute/disk.py               |   22 +---------------------
 nova/compute/resolv.conf.template  |    1 -
 nova/flags.py                      |    3 ++-
 nova/virt/libvirt.uml.xml.template |    2 +-
 nova/virt/libvirt.xen.xml.template |    2 +-
 nova/virt/libvirt_conn.py          |    2 ++
 6 files changed, 7 insertions(+), 25 deletions(-)

commit a58648f0ce5472e0b671d1b043fc4e0afd01658c
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 13:37:49 2010 -0700

    remove nonexistent exception

 nova/virt/hyperv.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d8643f1e15f241db96893d1ea41083a2bee65dbd
Merge: 759bab6 3363b13
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Oct 14 12:59:36 2010 -0700

    Merged with trunk, fixed broken stuff

commit b328bac09fee6ff2de6e8326e655ee648bda5e2d
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 11:56:25 2010 -0700

    revert to generic exceptions

 nova/virt/hyperv.py |   38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

commit 5a34f93790cf6fb98e9474797f5be3f231a4a6a4
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 11:27:42 2010 -0700

    fix indent

 nova/virt/images.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 3363b133a927509432cb42d77abf18d3d5248abf
Merge: 7120249 a393c7f
Author: jaypipes@gmail.com <>
Date:   Thu Oct 14 16:08:42 2010 +0000

    Fixes LP Bug#660095.

commit 3f737b0a84e0f7f14984b074b97b617c198c64bf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Oct 14 15:07:37 2010 +0200

    Move Redis code into fakeldap, since it's the only thing that still uses it.
    Adjust auth unittests to skip fakeldap tests if Redis isn't around.
    Adjust auth unittests to actually run the fakeldap tests if Redis /is/ around.

 nova/auth/fakeldap.py       |   34 +++++++++++++++++++++++----
 nova/auth/manager.py        |    2 +-
 nova/datastore.py           |   53 -------------------------------------------
 nova/tests/auth_unittest.py |   17 ++++++++++++--
 run_tests.py                |    7 ------
 5 files changed, 45 insertions(+), 68 deletions(-)

commit 1e9fdebf8ec696fc5b884c03d0c5413310c9ab3b
Merge: 38d2e2f 134b846
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Oct 14 14:12:49 2010 +0200

    Merge trunk

commit f8e41d8a1e53b7fc7f4bd91815ed5e2a17dcd7da
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 01:46:06 2010 -0700

    fix nosetests

 nova/api/openstack/servers.py |   30 ++++++++++++++++--------------
 nova/context.py               |   11 +++++++++--
 2 files changed, 25 insertions(+), 16 deletions(-)

commit 7120249b21ae56c070cd2e3d32a9502c320ebb07
Merge: 134b846 7403ece
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 08:38:37 2010 +0000

    Fixes a few concurrency issues with creating volumes and instances. Most importantly it adds retries to a number of the volume shell commands and it adds a unique constraint on export_devices and a safe create so that there aren't multiple copies of export devices in the database.

commit 1156100be1d358f5ffae58c6d892e0724f4d153c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 01:11:18 2010 -0700

    unit tests and fix

 nova/api/ec2/apirequest.py |    6 ++++--
 nova/tests/api_unittest.py |   17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

commit 0b0d55c6cb6fb10a7bdd003ffa7763d9690ee23d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 00:43:19 2010 -0700

    call stuff project_id instead of project

 bin/nova-manage |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 914786b8f9d30e2762e290ef911710efcbe6d310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 00:30:42 2010 -0700

    review fixes

 nova/api/cloud.py |    8 ++------
 nova/context.py   |    6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

commit af9910d935b7b3839774e3485b87b4a0dcdb78ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:44:04 2010 -0700

    fix context in bin files

 bin/nova-dhcpbridge |    6 ++----
 bin/nova-manage     |   26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

commit af2639ae4cc9d4e5dbb2e4f65209f9d8773137fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:38:15 2010 -0700

    add scrub command to clean up networks and sec groups

 bin/nova-manage |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 8c64516de432a70acd3e4a2cbb8f8815f4015c7d
Merge: b26531c 7120249
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:27:23 2010 -0700

    merged trunk

commit b26531c2b9c90f8d69b24821876979e9b6ff1184
Merge: 8b329b5 7403ece
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:26:58 2010 -0700

    merged concurrency

commit 9caed7b34d9b953bb8ecd306509443d076d1e4fe
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 23:21:22 2010 -0700

    review comments

 nova/compute/manager.py |    2 -
 nova/virt/hyperv.py     |  248 ++++++++++++++++++++++++++---------------------
 nova/virt/images.py     |   11 ++-
 3 files changed, 146 insertions(+), 115 deletions(-)

commit 273f5c1c5a3f2ae1f540ba2432cc8a2d0a9c1826
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 23:19:25 2010 -0700

    Added a unit test but not integrated it

 nova/tests/hyperv_unittest.py |   67 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit 7403ece82902e633fbd3f2e6f0303ad08c269541
Merge: def93d4 134b846
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:17:40 2010 -0700

    merged trunk

commit 8b329b5d1d79676f9d2d0d91426c882c0cea784a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:51:55 2010 -0700

    fix remaining tests

 nova/api/ec2/cloud.py              |   44 ++++++++++++++++++------------------
 nova/tests/compute_unittest.py     |    2 +-
 nova/tests/network_unittest.py     |   20 +++++++++++-----
 nova/tests/objectstore_unittest.py |   28 +++++++----------------
 nova/tests/virt_unittest.py        |   15 ++++++------
 nova/virt/libvirt_conn.py          |    9 +++++---
 6 files changed, 59 insertions(+), 59 deletions(-)

commit 14e956b2319821ef9d6f595347e4057413f2c0ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:18:01 2010 -0700

    cleaned up most of the issues

 nova/api/openstack/servers.py |    2 +-
 nova/auth/dbdriver.py         |   67 ++++++++++++++++++++++++-----------------
 nova/test.py                  |   13 +++++---
 nova/tests/virt_unittest.py   |    2 +-
 4 files changed, 49 insertions(+), 35 deletions(-)

commit 68e716cbb2901e8f54291aacdcf4f2dc1d0a47ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:09:29 2010 -0700

    remove accidental paste

 nova/api/ec2/cloud.py |    5 -----
 1 file changed, 5 deletions(-)

commit c40996e8b036c96079d99831a239be8df57d6ce2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:07:43 2010 -0700

    use context.project_id because it is more efficient

 nova/api/ec2/cloud.py      |   38 +++++++++++++++++++-------------------
 nova/objectstore/bucket.py |    4 ++--
 nova/objectstore/image.py  |   14 +++++++-------
 3 files changed, 28 insertions(+), 28 deletions(-)

commit 40ed78a3a4bd188e60cee1c886d4820f4a578d0c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:05:21 2010 -0700

    elevate in proper places, fix a couple of typos

 nova/api/ec2/cloud.py     |   19 ++++++++++++++-----
 nova/compute/manager.py   |    6 ++++++
 nova/context.py           |    9 +++++----
 nova/db/sqlalchemy/api.py |   25 +++++++++++++------------
 nova/network/manager.py   |   10 ++++++----
 nova/quota.py             |    9 ++++++---
 nova/scheduler/manager.py |    5 +++--
 nova/volume/manager.py    |    3 +++
 8 files changed, 56 insertions(+), 30 deletions(-)

commit 3f438d0c25b0dad2fe0fb62b8f169ba121038387
Merge: 4bab906 134b846
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 21:42:10 2010 -0700

    merged trunk

commit 134b846d23be923f7453e945e92f32dffbc54f50
Merge: a4aa672 03962c3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Oct 14 02:18:33 2010 +0000

    Fixes bug 660115.
    
    Part of the cause of the confusion that led to this problem is I think that we have 3 different 'user' objects that can be passed to different methods: a simple dict, an auth.User object, and a db.sqlalchemy.models.User object (which maps __getitem__ to getattr for good measure.)  When we sweep through and add clear docstrings to every method, explaining their inputs and outputs, I think errors like these will be less likely.

commit 03962c39bf4ecbe424d3960f7fbbd19c37911757
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Oct 13 21:55:01 2010 -0400

    Address cerberus's comment

 nova/tests/api/openstack/fakes.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit beebed574bba9ef0e7bbeedd554a13ad5ded375a
Merge: 79a2c34 a4aa672
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Oct 13 16:36:33 2010 -0400

    Merge from trunk

commit 79a2c349ca5772a69b6f7f28a768e711d6db1524
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Oct 13 16:36:05 2010 -0400

    Fix several problems keeping AuthMiddleware from functioning in the OpenStack API.

 nova/api/openstack/auth.py            |   42 ++++++++++++++++-----------------
 nova/db/api.py                        |    4 ++--
 nova/db/sqlalchemy/api.py             |    5 ++--
 nova/tests/api/openstack/fakes.py     |   13 ++++++----
 nova/tests/api/openstack/test_auth.py |   10 ++++----
 5 files changed, 41 insertions(+), 33 deletions(-)

commit 94468e73e339a850e16f8473f7c4df7d0e16bd16
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 16:34:23 2010 -0400

    Implement the REST calls for create/update/delete in Glance.

 nova/image/service.py |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

commit 52600e6bee170ac6d78eff004ecc98394c43ff6f
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 16:17:23 2010 -0400

    Adds unit test for WSGI image controller for OpenStack API using Glance Service.

 nova/api/openstack/images.py            |    9 +++-
 nova/image/service.py                   |   87 +++++++++++++++++++++++++++++--
 nova/tests/api/openstack/fakes.py       |   38 ++++++++------
 nova/tests/api/openstack/test_images.py |   87 +++++++++++++++++++++++++++++--
 4 files changed, 196 insertions(+), 25 deletions(-)

commit 088bd29f53eaac48574fa59c251b3564a380d4d9
Merge: cb61049 a393c7f
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:31:46 2010 -0400

    Merge fix for Bug 660095

commit cb6104915cc0760733a9c1fb895de8e6ca914a17
Merge: c71de09 a4aa672
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:31:32 2010 -0400

    Merge trunk

commit a393c7f4cc59111dac678d9e61daa3955e53d548
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:17:03 2010 -0400

    Fixes LP Bug#660095.

 nova/api/openstack/servers.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit a4aa6725be683e7e1f35df1e54069b755d19551b
Merge: d68528b e2b7c99
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Oct 13 17:13:35 2010 +0000

    Xen support.

commit d68528b6135b407a7ce0897769d2d6bb92ec6be4
Merge: e5c89b9 36cb0de
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 16:35:41 2010 +0000

    Adds flat networking + dhcpserver mode.

commit e5c89b94c1b4b06b2e64fb1c1e3481aca4d06a64
Merge: d0a5523 d533d64
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 16:28:46 2010 +0000

    This patch removes the ugly network_index that is used by VlanManager and turns network itself into a pool.  It adds support for creating the networks through an api command:
        nova-manage network create # creates all of the networks defined by flags
    or
        nova-manage network create 5 # create the first five networks
    
    This moves the network out of project.create, associating a network to a project lazily in project_get_network.  This allows for a bit greater control over networks.  There are a couple outstanding issues:
       1) Where do networks get disassociated?  Right now I'm not disassociating at all.  We're sharing ldap users across different deploys, whereas sql db is unique per deploy.  Perhaps the solution is to have a flag like disassociate_on_project_destroy and make it optional?
       2) How do we handle creation of networks for tests?  It is really slow to create a pool of networks and fixed_ips for each test case.  Right now I'm taking advantage of the fact that the db isn't cleaned between tests, and creating them if they don't exist in BaseTestCase.SetUp() and disassociating in TearDown().  Ideally this should be replaced with fixtures of some sort.
    
    Comments on these two issues are welcome.

commit b28c43c1f66cc111e34e9bbc45a78ff7aa60fd29
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 00:06:29 2010 -0700

    Newlines again, reorder imports

 nova/virt/images.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 01ad0a05c4f93bb5e95a1c781d492374739dce2c
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Oct 12 23:53:31 2010 -0700

    Remove extraneous newlines

 nova/virt/images.py |    3 ---
 1 file changed, 3 deletions(-)

commit f224c0ed419f885aa85065d1a27623b22721d34c
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Oct 12 23:45:30 2010 -0700

    Fix typo, fix import

 nova/virt/images.py |   54 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

commit 36cb0de8905917b0d6789e49eaecd722319458f8
Merge: 7ba0ab1 d533d64
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 20:16:23 2010 -0700

    merged upstream

commit d533d6414041437e642f2bbfbc7a86daa2527a65
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 20:13:06 2010 -0700

    cleanup leftover addresses

 nova/test.py                 |    4 ++++
 nova/tests/cloud_unittest.py |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

commit b9dc877303c13d43fb6b3e1105e9c0bd7161219d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:37:09 2010 -0700

    super teardown

 nova/tests/virt_unittest.py |    1 +
 1 file changed, 1 insertion(+)

commit b2a95bc859b3b52adb71efc4445924e1dbbdd06a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:27:48 2010 -0700

    fix tests

 nova/tests/network_unittest.py |    3 ++-
 nova/tests/virt_unittest.py    |   15 ++++++++++-----
 nova/virt/libvirt_conn.py      |    3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

commit 7ba0ab1e22b0453024b0b85be80d4e4544f95943
Merge: 924abab dbbdebb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:05:53 2010 -0700

    merged trunk

commit c829e39c5436f2c9f075713ff4b80dbdfb1239ef
Merge: 1e5724e d0a5523
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:02:04 2010 -0700

    merged trunk

commit dbbdebbcd13b08ec2afb6d0d58144eeee6ecce84
Merge: 6cc8121 d0a5523
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:00:34 2010 -0700

    merged trunk

commit def93d479f3a829c9e1bc0a4c3516ee881796456
Merge: e0da952 d0a5523
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 18:55:09 2010 -0700

    merged trunk

commit d0a55238fdf64a8da51ea1fe328a1a3dc3d17dc7
Merge: 8896e71 aa92c01
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 22:43:37 2010 +0000

    Revert the conversion to 64-bit ints stored in a PickleType column, because PickleType is incompatible with having a unique constraint.
    
    We moved away from 32 bit ints because of the chance of collision.  It turns out the existing code already checked for collisions and retried, so this wasn't an issue.

commit aa92c017ab91d7fb0ec9c2cd5fd420e625ce2dbd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 18:27:59 2010 -0400

    Revert 64 bit storage and use 32 bit again.  I didn't notice that we verify that randomly created uids don't already exist in the DB, so the chance of collision isn't really an issue until we get to tens of thousands of machines.  Even then we should only expect a few retries before finding a free ID.

 nova/db/sqlalchemy/models.py |    4 ++--
 nova/utils.py                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 20aab4195baac543d638cf9c3a1484f8f9fb3d80
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Oct 12 15:04:39 2010 -0700

    Add design doc, docstrings, document hyper-v wmi, python wmi usage. Adhere to pep-8 more closely

 nova/virt/hyperv.py |  148 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 107 insertions(+), 41 deletions(-)

commit e2b7c99c6266b24dc8b53c47db3587aebd2381fe
Merge: 5be8152 4f529fe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 22:52:10 2010 +0200

    Merge trunk

commit 8896e712e90330ae42c13367fd79b1a18b56c0a0
Merge: 4f529fe 84ec303
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 20:28:43 2010 +0000

    This patch adds support for EC2 security groups using libvirt's nwfilter mechanism, which in turn uses iptables and ebtables on the individual compute nodes.
    This has a number of benefits:
     * Inter-VM network traffic can take the fastest route through the network without our having to worry about getting it through a central firewall.
     * Not relying on a central firewall also removes a potential SPOF.
     * The filtering load is distributed, offering great scalability.
    
    Caveats:
     * It only works with libvirt and only with libvirt drivers that support nwfilter (qemu (and thus kvm) and uml, at the moment)

commit 84ec303828095fc105b287b2858021604cfcea32
Merge: e0dff86 4f529fe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 22:18:29 2010 +0200

    Merge trunk (that's 10 times now, count 'em\!)

commit 4f529fe118283164ccb2756f2001805c69c1cc4a
Merge: eeb1ac4 f97ef73
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 20:08:39 2010 +0000

    Change internal_id from a 32 bit int to a 64 bit int.
    
    Specifically, generate internal_id as a random number in [0, 2^64).  SQLAlchemy has no built-in type for big integers, so the internal_id column is a PickleType, set to non-mutable to avoid performance penalties associated with mutable column types.  Under the hood, this is stored as a Binary.
    
    In Austin+1 we'll probably be replacing internal_id with a string, but we need something bigger than 32 bits for Austin.

commit e0dff8694ed11f03760bf4dc251fccc422035acf
Merge: ac1dfd2 70b8321
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 22:04:46 2010 +0200

    Merge trunk.

commit f97ef73699e060a21ef8e64966f2429ff3dec237
Merge: 32ea289 eeb1ac4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 15:02:24 2010 -0400

    32 bit internal_ids become 64 bit.  Since there is no 64 bit native type in SqlAlchemy, we use PickleType which uses the Binary SqlAlchemy type under the hood.

commit eeb1ac483adc21616668504772620e885944b2d7
Merge: 70b8321 32ea289
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 17:48:22 2010 +0000

    Make Instance.name a string again instead of an integer.
    
    Prefix it with some characters for good measure in case any code consumes .name and can't handle strings of the form /[0-9]+/.

commit 32ea289d13a7ec9d273a57d2bf30484b80bfebec
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 13:42:43 2010 -0400

    Now that the ec2 id is not the same as the name of the instance, don't compare internal_id [nee ec2_id] to instance names provided by the virtualization driver.  Compare names directly instead.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3894e22d517447fb3d5e9c367ffd2e67162f4b0f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 13:09:35 2010 -0400

    Fix bug 659330

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70b8321347c02e9c0799cabd3e9c670f80b031a8
Merge: 775a0fc 4fa2258
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Oct 12 14:23:24 2010 +0000

    Catch exception.NotFound when getting project VPN data.

commit 775a0fca22fb1b87a6652de6dda9ef6ca466e473
Merge: ed5d6ca e0b2551
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 14:13:23 2010 +0000

    Improve the virt unit tests.

commit ac1dfd25c4b356c1725339709e535d4147feda3c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 14:29:57 2010 +0200

    Remove spurious project_id addition to KeyPair model.

 nova/db/sqlalchemy/models.py |    1 -
 1 file changed, 1 deletion(-)

commit da7fa3f388a45b3afca16dba6a59b68ea8804f7a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 09:24:33 2010 +0200

    APIRequestContext.admin is no more..

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e8a1cb4dd50b20359a9389c79564310a5d35c7bc
Merge: d13d434 ed5d6ca
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 07:21:25 2010 +0200

    Merge trunk.

commit ed5d6ca32e2996e8218a5e6d70b9952619ef6564
Merge: 414a3de 76a7624
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 11 16:01:15 2010 +0000

    Rename ec2_id_list back to instance_id to conform to EC2 argument spec

commit 414a3dee16252e2559856b92ab7ed7b1d9d60778
Merge: 8ad42bb f9b2f70
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 11 15:58:39 2010 +0000

    Fix bug 657001 (rename all Rackspace references to OpenStack references)

commit 8ad42bbc31b2900855e23d82c52b3193a433dda3
Merge: c9c04b5 3ca5499
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 11 15:53:43 2010 +0000

    Extracts the kernel and ramdisk id from manifests and puts in into images' metadata.

commit c9c04b565b3268c29bf0ce602dd08cd5b57a0884
Merge: 05e129b f447e1a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 11 15:48:22 2010 +0000

    Fix EC2 GetConsoleOutput method and add unit tests for it.

commit f9b2f70f22bdc8a9cf08ada5f7ec45eea6060866
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 11 11:43:58 2010 -0400

    Rename rsapi to osapi, and make the default subdomain for OpenStack API calls be 'api' instead of 'rs'.

 nova/api/__init__.py              |   26 +++++++++++++-------------
 nova/tests/api/__init__.py        |    4 ++--
 nova/tests/api/openstack/fakes.py |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

commit 76a76244ccee2502903a67f3f17dda97664e6687
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 11 11:21:26 2010 -0400

    Fix bug 658444

 nova/api/ec2/cloud.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 05e129b0d3e019efb5490266e05b9e157e0a50de
Merge: ba4cafc 7c8c2f5
Author: jaypipes@gmail.com <>
Date:   Mon Oct 11 14:28:37 2010 +0000

    Adds --force option to run_tests.sh to clear virtualenv. Useful when dependencies change

commit 3ca549942e96e4ff769e914f227919f3a4d98686
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 11 14:09:24 2010 +0200

    If machine manifest includes a kernel and/or ramdisk id, include it in the image's metadata.

 nova/objectstore/image.py                          |   10 +++++--
 nova/tests/bundle/1mb.manifest.xml                 |    2 +-
 .../bundle/1mb.no_kernel_or_ramdisk.manifest.xml   |    1 +
 nova/tests/objectstore_unittest.py                 |   29 ++++++++++++++++----
 4 files changed, 34 insertions(+), 8 deletions(-)

commit f447e1a3a2234e0ab3a5e281442659626f8d99bd
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 11 13:39:33 2010 +0200

    Rename ec2 get_console_output's instance ID argument to 'instance_id'. It's passed as a kwarg, based on key in the http query, so it must be named this way.

 nova/api/ec2/cloud.py        |    6 +++---
 nova/api/ec2/images.py       |    3 +++
 nova/fakerabbit.py           |   14 ++++++++++++++
 nova/rpc.py                  |    9 +++++++++
 nova/tests/cloud_unittest.py |   31 ++++++++++++++++++++-----------
 5 files changed, 49 insertions(+), 14 deletions(-)

commit 202da619d383db9e0968a1fc67acdf48101235c0
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:59:17 2010 -0700

    if using local copy (use_s3=false) we need to know where to find the image

 nova/compute/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 6669b46ca91f462c96b033c6e04618c06fecb31f
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:58:53 2010 -0700

    curl not available on Windows for s3 download. also os-agnostic local copy

 nova/virt/images.py |   36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

commit 85c890e91f493f254801edd5e5aed115d8d9c4a6
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:58:01 2010 -0700

    Register the Hyper-V module into the list of virt modules

 nova/virt/connection.py |    3 +++
 1 file changed, 3 insertions(+)

commit b578047ec26ac7d0ad26ccaab8b596ba5373b278
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:57:49 2010 -0700

    hyper-v driver created

 nova/virt/hyperv.py |  387 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 387 insertions(+)

commit 8e28dd8331f99223696ab6656cd555be12c28e85
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:57:13 2010 -0700

    Twisted pidfile and other flag parameters simply do not function on Windows.

 nova/twistd.py |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

commit ba4cafcdf5db5da1f8d7f717172bdba0fbac4353
Merge: 8e8047a c1190d5
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 21:18:37 2010 +0000

    Renames every instance of "rackspace" in the API and test code base. Also includes a minor patch for the API Servers controller to use images correctly in the absence of Glance.

commit c1190d55e130a80ac831ce15e6e30c28c5621aff
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 21:08:48 2010 +0000

    That's what I get for not using a good vimrc

 nova/api/openstack/servers.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 90f38090ecd586a39257b3efd2c86c2c60b7fdb9
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 20:39:00 2010 +0000

    Mass renaming

 nova/api/__init__.py                            |    4 +-
 nova/api/openstack/__init__.py                  |  190 +++++++++++++++
 nova/api/openstack/_id_translator.py            |   42 ++++
 nova/api/openstack/auth.py                      |  101 ++++++++
 nova/api/openstack/backup_schedules.py          |   38 +++
 nova/api/openstack/context.py                   |   33 +++
 nova/api/openstack/faults.py                    |   62 +++++
 nova/api/openstack/flavors.py                   |   58 +++++
 nova/api/openstack/images.py                    |   71 ++++++
 nova/api/openstack/notes.txt                    |   23 ++
 nova/api/openstack/ratelimiting/__init__.py     |  122 ++++++++++
 nova/api/openstack/servers.py                   |  276 ++++++++++++++++++++++
 nova/api/openstack/sharedipgroups.py            |   20 ++
 nova/api/rackspace/__init__.py                  |  190 ---------------
 nova/api/rackspace/_id_translator.py            |   42 ----
 nova/api/rackspace/auth.py                      |  101 --------
 nova/api/rackspace/backup_schedules.py          |   38 ---
 nova/api/rackspace/context.py                   |   33 ---
 nova/api/rackspace/faults.py                    |   62 -----
 nova/api/rackspace/flavors.py                   |   58 -----
 nova/api/rackspace/images.py                    |   71 ------
 nova/api/rackspace/notes.txt                    |   23 --
 nova/api/rackspace/ratelimiting/__init__.py     |  122 ----------
 nova/api/rackspace/ratelimiting/tests.py        |  237 -------------------
 nova/api/rackspace/servers.py                   |  283 -----------------------
 nova/api/rackspace/sharedipgroups.py            |   20 --
 nova/tests/api/__init__.py                      |    6 +-
 nova/tests/api/openstack/__init__.py            |  108 +++++++++
 nova/tests/api/openstack/fakes.py               |  205 ++++++++++++++++
 nova/tests/api/openstack/test_auth.py           |  108 +++++++++
 nova/tests/api/openstack/test_faults.py         |   40 ++++
 nova/tests/api/openstack/test_flavors.py        |   48 ++++
 nova/tests/api/openstack/test_images.py         |  141 +++++++++++
 nova/tests/api/openstack/test_ratelimiting.py   |  237 +++++++++++++++++++
 nova/tests/api/openstack/test_servers.py        |  249 ++++++++++++++++++++
 nova/tests/api/openstack/test_sharedipgroups.py |   39 ++++
 nova/tests/api/rackspace/__init__.py            |  108 ---------
 nova/tests/api/rackspace/fakes.py               |  205 ----------------
 nova/tests/api/rackspace/test_auth.py           |  108 ---------
 nova/tests/api/rackspace/test_faults.py         |   40 ----
 nova/tests/api/rackspace/test_flavors.py        |   48 ----
 nova/tests/api/rackspace/test_images.py         |  141 -----------
 nova/tests/api/rackspace/test_servers.py        |  249 --------------------
 nova/tests/api/rackspace/test_sharedipgroups.py |   39 ----
 44 files changed, 2216 insertions(+), 2223 deletions(-)

commit 5be81520196c21aa9b60425bca7bf49935772cd1
Merge: 5a5da05 d58da66
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 8 21:41:11 2010 +0200

    Merge trunk.

commit 25fa39ad7dc17f9e6e694006aabb4ef6b3f933fc
Merge: f1a4820 8e8047a
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 18:56:45 2010 +0000

    Merge from upstream

commit f1a48207dfc1948ba847f262d5a4ff825b02202c
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 18:56:32 2010 +0000

    Start stripping out the translators

 nova/api/rackspace/servers.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit c71de09a529b0a326265b0e401f49d4ef8ae6807
Merge: fc61a9c 8e8047a
Author: jaypipes@gmail.com <>
Date:   Fri Oct 8 12:38:05 2010 -0400

    Merge trunk

commit 8e8047abe7efdc306f619d68dbc2665425bf5606
Merge: db33124 db87fd5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Fri Oct 8 16:33:33 2010 +0000

    Remove redis dependency from RS Images API.

commit db87fd5a8145d045c4767a8d02cde5a0750113f8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Fri Oct 8 12:21:26 2010 -0400

    Remove redis dependency from Images controller.
    
    LocalImageService now works with integer ids, so there's no need for the translator.
    
    Once Glance exists we'll have to revisit this.

 nova/api/rackspace/backup_schedules.py |    1 -
 nova/api/rackspace/images.py           |   10 +---------
 nova/image/service.py                  |   16 +++++++++-------
 nova/tests/api/rackspace/fakes.py      |    1 -
 4 files changed, 10 insertions(+), 18 deletions(-)

commit db331240afdbd43d63b0a71cc284fc8d37e7989a
Merge: d58da66 b7028c0
Author: Hisaki Ohara <hisaki.ohara@intel.com>
Date:   Thu Oct 7 14:23:27 2010 +0000

    Since FLAGS.images_path was not set for nova-compute, I could not launch instances
    due to an exception at _fetch_local_image() trying to access to it.
    I think that this is the reason of Bug655217.
    
    I'm not sure whether it is global solution, because FLAGS.images_path is defined
    in nova/objectstore/image.py too.

commit b7028c0d0262d3d4395077a8bd2d95664c6bf16e
Author: Hisaki Ohara <hisaki.ohara@intel.com>
Date:   Thu Oct 7 23:03:43 2010 +0900

    Imported images_path from nova.objectstore for nova-compute. Without its setting,
    it fails to launch instances by exception at _fetch_local_image.

 nova/virt/images.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 8f524607856dbf4cecf7c7503e53e14c42888307
Author: Hisaki Ohara <hisaki.ohara@intel.com>
Date:   Wed Oct 6 18:04:18 2010 +0900

    Defined images_path for nova-compute. Without its setting, it fails
    to launch instances by exception at _fetch_local_image.

 nova/virt/images.py |    3 +++
 1 file changed, 3 insertions(+)

commit fc61a9c9fbe20e79128cc6b9b91f164c8f0e406a
Merge: fbd1bc0 d58da66
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 18:00:48 2010 -0400

    Merge trunk

commit d58da66e2958ff3bb32c8f764c90526be5c601af
Merge: 8e89d47 5f40379
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 21:08:47 2010 +0000

    Cleans up a broken servers unit test

commit 5f40379b407301c0907a72cde988197f3d18ea56
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 21:00:05 2010 +0000

    Merge prop suggestions

 nova/tests/api/rackspace/fakes.py        |   16 ----------------
 nova/tests/api/rackspace/test_servers.py |    4 +---
 2 files changed, 1 insertion(+), 19 deletions(-)

commit 684c1ed50aebaed07cf89e6f1f7ee189a1b79b9b
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 20:43:23 2010 +0000

    Huge sweeping changes

 nova/tests/api/rackspace/test_servers.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8e89d47958fc0e680582804ec07152ca05039854
Merge: 15cf922 fbd1bc0
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 20:38:43 2010 +0000

    Adds stubs and tests for GlanceImageService and LocalImageService.
    Adds basic plumbing for ParallaxClient and TellerClient and hooks that into the GlanceImageService.
    
    Fixes lp654843

commit 15cf92206627f2f56d30356ca974018d5b2244e9
Merge: 90199a2 db620f3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 20:23:35 2010 +0000

    Typo

commit fbd1bc015bd5615963b9073eefb895ea04c55a3e
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 16:19:55 2010 -0400

    Merge overwrote import_object() load of image service.

 nova/api/rackspace/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit db620f323c2fc5e65a722a33ae8a42b54817dae1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 16:16:42 2010 -0400

    Missed an ec2_id conversion to internal_id

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 17a0602726cf916bf01c3f9ecf9c328d1fb1ee82
Merge: ff1bbe1 90199a2
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 16:14:21 2010 -0400

    Merge cerberus and trunk

commit 90199a2acbf4499c7e218ec0c5c31620cbac0f07
Merge: f0db8b7 c86462d
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 20:13:50 2010 +0000

    Cleanup around the rackspace API for the ec2 to internal_id transition

commit c86462d11a6709bf9f2130056bf04712fe3db2d9
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 20:07:11 2010 +0000

    merge prop fixes

 nova/api/rackspace/servers.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 091cf4ec5851e87bf722ed0bbbbfdf64dd599389
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 19:52:12 2010 +0000

    A little more clean up

 nova/db/sqlalchemy/api.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit ff1bbe1f674dd343202ac444ea462da788573880
Merge: b61f4ce f0db8b7
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 15:48:47 2010 -0400

    Merge trunk

commit cde00c93345147f724ccb1686393e866fe732446
Merge: 6bdbb56 f0db8b7
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 19:37:15 2010 +0000

    Merge from trunk and conflict resolution

commit f0db8b74ec894631fe29c2a33748b797758ecf50
Merge: 5820cc7 8a2d7ef
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 18:58:37 2010 +0000

    Replace model.Instance.ec2_id with an integer internal_id so that both APIs can represent the ID to external users.

commit 8a2d7efa542e168fda81f703fa8e8c19467bf800
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 13:40:17 2010 -0400

    Fix clause comparing id to internal_id

 nova/db/sqlalchemy/api.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b61f4ceff6ea5dbb4d9c63b9f7345c0b31785984
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 13:29:27 2010 -0400

    Adds unit test for calling show() on a non-existing image. Changes return from real Parallax service per sirp's recommendation for actual returned dict() values.

 nova/image/service.py                    |   36 ++++++++++++++++++++++--------
 nova/tests/api/rackspace/fakes.py        |    2 +-
 nova/tests/api/rackspace/test_images.py  |   20 +++++++++++++++++
 nova/tests/api/rackspace/test_servers.py |    1 +
 4 files changed, 49 insertions(+), 10 deletions(-)

commit 92066f4da113cf84f04213dd89ebc0bf8d51e7db
Merge: 0cbe42b 5820cc7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 10:56:03 2010 -0400

    Merge from trunk

commit 0cbe42bd290b2c0d28d390820dde227b9bd0447b
Merge: dd0f365 44d9fac
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 10:55:31 2010 -0400

    Merge from trunk

commit 5a5da05a966dcdd3113a074468b37e12d406b350
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:25:50 2010 +0200

    Remove debugging code, and move import to the top.

 nova/fakerabbit.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 83430481760250e633275182d5cf4eb826f65ea2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:21:56 2010 +0200

    Make (some) cloud unit tests run without a full-blown set up.

 nova/tests/cloud_unittest.py |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

commit 10bbf9f638b5c8c9182984cc7e22f732b194476f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:21:31 2010 +0200

    Stub out ec2.images.list() for unit tests.

 nova/api/ec2/images.py |    3 +++
 1 file changed, 3 insertions(+)

commit 394c5ae180ed25f7e617f6c43f9a88f003e5d2ea
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:21:08 2010 +0200

    Make rpc calls work in unit tests by adding extra declare_consumer and consume methods on the FakeRabbit backend.

 nova/fakerabbit.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 4b9be67025c3aff4b7f5f9b31a74eb14924885cb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:20:23 2010 +0200

    Add a connect_to_eventlet method.

 nova/rpc.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 1158e1817b7d39e9655b219ede865f301153e713
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 11:17:03 2010 +0200

    Un-twistedify get_console_ouptut.

 nova/api/ec2/cloud.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit e0b255140a2bb7125bde89c6732d440cef37096b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 10:07:37 2010 +0200

    Create and destroy user appropriately. Remove security group related tests (since they haven't been merged yet).

 nova/tests/virt_unittest.py |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

commit a374efd4cc3d27c9b5389009818e45efe2f35b12
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 10:06:54 2010 +0200

    Run the virt tests by default.

 run_tests.py |    1 +
 1 file changed, 1 insertion(+)

commit d13d4343435d1e6f597c480c3c8d13ba6b47796f
Merge: a4720c0 b97660b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 09:56:58 2010 +0200

    Merge trunk.

commit 5820cc7a5c4c649c326a9da0e306298f081743ce
Merge: b97660b 4b11351
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 5 07:35:46 2010 +0000

    Keep handles to loggers open after daemonizing.

commit 6cc81214b58972c0d0e815ad340c32862be834dc
Merge: 48ff601 4d13a85
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 4 19:44:51 2010 -0700

    merged trunk and fixed tests

commit b97660b68c4c8019229921f6ee55da665f728b4a
Merge: 44d9fac bf22bbd
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 22:13:42 2010 +0000

    Cleans up the unit tests that are meant to be run with nosetests
    
        * Renames all test modules to start with test_ so that nosetests does
        not need to be run with the --all-modules flag in order to pick them up
        * Renames test_helper to fakes and removes imports in unit tests that
        did not reference the fakes
        * Adds nose to pip-requires so that run_tests.sh -V will install nose
        into the virtualenv instead of having to manually install it after running
        into import errors :)

commit bf727292794026694c37b84201172b933b41ad2d
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 17:32:01 2010 -0400

    Update Parallax default port number to match Glance

 nova/image/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6bdbb567f1a9e0a8b980ff916183d47375fe11bf
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 21:20:33 2010 +0000

    One last bad line

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ec6af5b56545a7ec62033a6574683e3b93dc862c
Merge: 7e66ee6 dd0f365
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 21:08:08 2010 +0000

    merge from gundlach ec2 conversion

commit f8c64fba51c1ca93c612d84bb9f303c8f2ff2fed
Merge: 32bd6c1 44d9fac
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 16:51:03 2010 -0400

    Merge trunk

commit 32bd6c198a4ed96768649f58628e22fb25a95855
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 16:47:08 2010 -0400

    Adds ParallaxClient and TellerClient plumbing for GlanceImageService.  Adds stubs FakeParallaxClient and unit tests for LocalImageService and GlanceImageService.

 nova/image/service.py                   |   99 +++++++++++++++++++++--
 nova/tests/api/rackspace/fakes.py       |   74 +++++++++++++++++
 nova/tests/api/rackspace/test_images.py |  132 +++++++++++++++----------------
 3 files changed, 230 insertions(+), 75 deletions(-)

commit dd0f365c98ae68afff9a0fbc75e7d5b88499b282
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 4 16:39:05 2010 -0400

    Fix broken unit tests

 nova/api/ec2/cloud.py        |   24 ++++++++++++++----------
 nova/db/sqlalchemy/api.py    |    3 +++
 nova/tests/cloud_unittest.py |    3 ++-
 nova/utils.py                |   11 +++++++++--
 4 files changed, 28 insertions(+), 13 deletions(-)

commit bdbca3bc8f2c0503915017c72f20c2bc4210ead5
Merge: 6805d7d 44d9fac
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 22:32:00 2010 +0200

    Merge trunk.

commit a4720c03a8260fb920035d072799d3ecc478db99
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 21:58:22 2010 +0200

    Merge security group related changes from lp:~anso/nova/deploy

 nova/api/ec2/cloud.py       |   31 ++++++++++---
 nova/db/sqlalchemy/api.py   |  105 ++++++++++++++++++++++++++++++++-----------
 nova/tests/virt_unittest.py |   33 +++++++++-----
 nova/virt/libvirt_conn.py   |   39 ++++++++++++++--
 4 files changed, 162 insertions(+), 46 deletions(-)

commit 44d9fac26aff296f2846b00df98ddaf646c52158
Merge: 80cf171 12e43d9
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 4 19:53:41 2010 +0000

    Matches changes in the database / model layer with corresponding fixes to nova.virt.xenapi.

commit 8fb9f78a313a43f333d20c7cc600a5085eb68915
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 21:53:22 2010 +0200

    Replace the embarrasingly crude string based tests for to_xml with some more sensible ElementTree based stuff.

 nova/tests/virt_unittest.py |   63 ++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 21 deletions(-)

commit 80cf1714a0aece216708255343315ff74f8b1ba8
Merge: ffd80e1 38d2e2f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 19:23:38 2010 +0000

    A shiny, new Auth driver backed by SQLAlchemy. Read it and weep. I did.

commit ffd80e130d9aba4ab86ec6947d18152ea79f8baf
Merge: 3301a3d 3fe309b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 19:18:24 2010 +0000

    Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new  nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted.

commit 3fe309b6f1e8a592d7b2948f4c1cdc51a62d0ff4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 21:01:31 2010 +0200

    Add pylint thingamajig for startService (name defined by Twisted).

 nova/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38d2e2f0e86ff2c402c4744d54ac2a3bd4367ae0
Merge: 50fc372 1049406
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 20:36:46 2010 +0200

    Merge trunk. Again.

commit 2a8e4a3e818f1d279a886e2e5f5ae49f3de26a4d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 4 14:26:55 2010 -0400

    Revert r312

 nova/utils.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 3301a3de3ddc8c31ec96ff69329ff60846d0d2d3
Merge: 8a526ab 65e2bbc
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 4 18:14:33 2010 +0000

    Add a context of None to the call to db.instance_get_all.

commit 8a526ab99998c68a51981a60068f5abdb7f23c47
Merge: 1049406 a049871
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 4 18:11:18 2010 +0000

    Honour the --verbose flag by setting the logging level to DEBUG.

commit 7e66ee636910763630fcf5e6ff23848389713c81
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 17:52:08 2010 +0000

    Accidentally renamed volume related stuff

 nova/compute/manager.py   |    4 ++--
 nova/db/sqlalchemy/api.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 5c4b1a38b8a82ee0a8f14f813f91d319a9715cc3
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 16:01:44 2010 +0000

    More clean up and conflict resolution

 nova/api/ec2/cloud.py   |    2 +-
 nova/compute/manager.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 3543d8430e02c1b22f1932cb9d0af028d9ef648b
Merge: 14d7889 1049406
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 12:53:55 2010 +0200

    Merge trunk

commit 077c008546123291dbc89ac31b492df6d176e339
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 11:53:27 2010 +0200

    Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new  nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted.

 nova/service.py                  |   12 +++++++++---
 nova/tests/scheduler_unittest.py |   10 ++++++++++
 nova/tests/service_unittest.py   |    3 +++
 3 files changed, 22 insertions(+), 3 deletions(-)

commit 104940614784c69ed3d17581ff2cb1ed344eaa0f
Merge: 55995ad c66d550
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Oct 4 07:38:16 2010 +0000

    Bug #653560: AttributeError in VlanManager.periodic_tasks
    
    Pass the correct context to db.fixed_ip_disassociate_all_by_timeout.

commit 55995adccc382a6441883de54cd5aedf4b6edc2a
Merge: 44134b3 5945291
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Oct 3 19:53:43 2010 +0000

    Bug #653534: NameError on session_get in sqlalchemy.api.service_update
    
    Fix function call: session_get was meant to be service_get.

commit 44134b3fb48bedc38a49ac4b516796329fd7b08a
Merge: 4d13a85 4e45f94
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Oct 3 18:33:31 2010 +0000

    Fixes to address the following issues:
    
     * nova-network no longer refrains from configuring bridges if it finds them already created. This solves a race condition with nova-network and nova-compute running on the same box. If nova-compute happened to do its network config first, nova-network would find the bridge already created and assume it was correctly setup. If nova-network got there first, it would apply the correct IP configuration to the interface. The assumption is that no harm will be done by reapplying the correct IP configuration, so we no longer make this check before doing so.
    
     * nova-network does not use persistent network configuration (like putting stuff in /etc/network/interfaces), so it needs to check at boot time whether it's already set as a network's designated network node and do the appropriate configuration.
    
     * If installed, dnsmasq wouldn't find nova-dhcpbridge properly (it would look for it in /usr/lib/python2.6/blahblahblha). Add a flag to specify its location (and make use of it in the packaging).
    
     * dnsmasq needs to be able to read the dhcp config written by nova. dnsmasq runs as user "nobody", so chmod 644 the config file so that it can be read.
    
     * dnsmasq needs to be sent a SIGHUP to reread its config. Wrap this call in sudo, because we may be running as non-root.

commit 4e45f9472a95207153d32c88df8396c633c67a5d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Oct 3 20:22:35 2010 +0200

    s/APIRequestContext/get_admin_context/ <-- sudo for request contexts.

 nova/tests/network_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a0498717e470eb6fd52a4f26101c3513d90a3974
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Oct 3 13:17:20 2010 +0100

    Bug #654034: nova-manage doesn't honour --verbose flag
    
    Honour the --verbose flag by setting the logging level to DEBUG.

 bin/nova-manage |    5 +++++
 1 file changed, 5 insertions(+)

commit 4fa2258af9fb130be1650372cf48be39e83451e5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Oct 3 13:12:32 2010 +0100

    Bug #654025: nova-manage project zip and nova-manage vpn list broken by change in DB semantics when networks are missing
    
    Catch exception.NotFound when getting project VPN data.  This is in two places:
    nova-manage as part of its vpn list command, and
    auth.manager.AuthManager.get_credentials.
    
    Also, document the behaviour of db.api.project_get_network.

 bin/nova-manage      |    9 +++++++--
 nova/auth/manager.py |    5 ++++-
 nova/db/api.py       |    6 +++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

commit 65e2bbc31a7e4ea5d8f9456c2ea5b54715305d11
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Oct 3 12:41:07 2010 +0100

    Bug #654023: nova-manage vpn commands broken, resulting in erroneous "Wrong number of arguments supplied" message
    
    Add a context of None to the call to db.instance_get_all.  This is deprecated,
    but it's what all the other calls in this file do, and it's better than
    exploding, so it will do for now.

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48ff601a3ab2d72275061135cac56557042e8e9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 12:46:12 2010 -0700

    fix typo in setup_compute_network

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4bab9061d231b93f5860023e06233fc9c82bb5e3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 12:29:58 2010 -0700

    pack and unpack context

 nova/rpc.py |   32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

commit 3b3c72fc75b5dff8a26c59b0d4bb7f8ef34a18e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 11:39:12 2010 -0700

    add missing to_dict

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 12e43d9deb3984d2b7ccc91490ffa4c13eedbe2b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Oct 2 16:55:57 2010 +0100

    Bug #653651: XenAPI support completely broken by orm-refactor merge
    
    Matches changes in the database / model layer with corresponding fixes to
    nova.virt.xenapi.

 nova/virt/xenapi.py |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

commit c66d550d208544799fdaf4646a846e9f9c0b6bc5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Oct 2 13:11:33 2010 +0100

    Bug #653560: AttributeError in VlanManager.periodic_tasks
    
    Pass the correct context to db.fixed_ip_disassociate_all_by_timeout.

 nova/network/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5945291281f239bd928cea1833ee5a5b6c3df523
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Oct 2 12:42:09 2010 +0100

    Bug #653534: NameError on session_get in sqlalchemy.api.service_update
    
    Fix function call: session_get was meant to be service_get.

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50fc372c1f4b5924b73de5c25100ce42166c4f12
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 12:56:54 2010 +0200

    Adjust db api usage according to recent refactoring.

 nova/db/sqlalchemy/api.py |   89 ++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 34 deletions(-)

commit c3d485ebbf82d92ad8b5764446d6756556121d7a
Merge: 7e020e7 4d13a85
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 12:40:30 2010 +0200

    Merge trunk.

commit 033c464882c3d74ecd863abde767f37e7ad6a956
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 12:39:47 2010 +0200

    Make _dhcp_file ensure the existence of the directory containing the files it returns.

 nova/network/linux_net.py |    3 +++
 1 file changed, 3 insertions(+)

commit 3e27f5dfae379e70af023134cbab02e18b450ce1
Merge: 6a0bf3e 4d13a85
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 11:12:46 2010 +0200

    Merge trunk.

commit 4b11351aba7e71154f82a6a76590c786b4d7a53a
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 1 21:46:36 2010 -0400

    Keep handles to loggers open after daemonizing.

 nova/server.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 0ef621d47eeea421820a2191de53dee9e83d8c44
Author: jaypipes@gmail.com <>
Date:   Fri Oct 1 16:06:14 2010 -0400

    Adds BaseImageService and flag to control image service loading.  Adds unit test for local image service.

 nova/api/rackspace/images.py            |    7 +-
 nova/flags.py                           |    4 ++
 nova/image/service.py                   |  114 +++++++++++++++++++++++++++----
 nova/tests/api/rackspace/test_images.py |  102 ++++++++++++++++++++++++---
 4 files changed, 206 insertions(+), 21 deletions(-)

commit bf22bbd2d4f4364255a306e024d1a7d316b89014
Author: jaypipes@gmail.com <>
Date:   Fri Oct 1 14:02:51 2010 -0400

    Cleans up the unit tests that are meant to be run with nosetests
    
    * Renames all test modules to start with test_ so that nosetests does
    not need to be run with the --all-modules flag in order to pick them up
    * Renames test_helper to fakes and removes imports in unit tests that
    did not reference the fakes
    * Adds nose to pip-requires so that run_tests.sh -V will install nose
    into the virtualenv instead of having to manually install it after running
    into import errors :)

 nova/tests/api/__init__.py                      |    3 +-
 nova/tests/api/fakes.py                         |    8 +
 nova/tests/api/rackspace/__init__.py            |    4 +-
 nova/tests/api/rackspace/auth.py                |  108 ----------
 nova/tests/api/rackspace/fakes.py               |  148 ++++++++++++++
 nova/tests/api/rackspace/flavors.py             |   46 -----
 nova/tests/api/rackspace/images.py              |   40 ----
 nova/tests/api/rackspace/servers.py             |  245 ----------------------
 nova/tests/api/rackspace/sharedipgroups.py      |   41 ----
 nova/tests/api/rackspace/test_auth.py           |  108 ++++++++++
 nova/tests/api/rackspace/test_faults.py         |   40 ++++
 nova/tests/api/rackspace/test_flavors.py        |   48 +++++
 nova/tests/api/rackspace/test_helper.py         |  134 ------------
 nova/tests/api/rackspace/test_images.py         |   39 ++++
 nova/tests/api/rackspace/test_servers.py        |  250 +++++++++++++++++++++++
 nova/tests/api/rackspace/test_sharedipgroups.py |   39 ++++
 nova/tests/api/rackspace/testfaults.py          |   40 ----
 nova/tests/api/test_helper.py                   |    8 -
 nova/tests/api/test_wsgi.py                     |  147 +++++++++++++
 nova/tests/api/wsgi_test.py                     |  147 -------------
 tools/pip-requires                              |    1 +
 21 files changed, 832 insertions(+), 812 deletions(-)

commit 4d13a8554459638387d772a23fffe6aaaab3348d
Merge: c9cb22f 4b3d4eb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Oct 1 15:08:19 2010 +0000

    Refactor sqlalchemy api to perform contextual authorization.
    
    All database calls now examine the context object for information about what kind of user is accessing the data.  If an administrator is accessing, full privileges are granted.  If a normal user is accessing, then checks are made to ensure that the user does indeed have the rights to the data.
    
    Also refactored NovaBase and removed several methods since they would have to be changed when we move away from sqlalchemy models and begin using sqlalchemy table definitions.

commit 1e5724e7bb7e0aa3e441ec5e017430dd7c07315b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 1 08:06:46 2010 -0700

    automatically convert strings passed into the api into their respective original values

 nova/api/ec2/apirequest.py |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

commit 5e3da5864825a12da5a1ea1102a6efb6cebe204b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 1 05:57:17 2010 -0700

    Fix the deprecation warnings for passing no context.
    
    Moved RequestContext out of nova.api, because it is used by everything
    
    Context is passed through the queue.
    
    Added some helper methods for converting to admin context.
    
    Added a few more fields to request context.

 bin/nova-dhcpbridge              |   20 ++++---
 nova/api/cloud.py                |   10 ++--
 nova/api/context.py              |   46 ----------------
 nova/api/ec2/__init__.py         |    7 ++-
 nova/api/ec2/cloud.py            |  107 +++++++++++++++++++-------------------
 nova/api/rackspace/context.py    |   33 ------------
 nova/api/rackspace/servers.py    |   58 ++++++++++-----------
 nova/auth/manager.py             |   20 ++++---
 nova/cloudpipe/pipelib.py        |    4 +-
 nova/context.py                  |  106 +++++++++++++++++++++++++++++++++++++
 nova/db/sqlalchemy/api.py        |    3 +-
 nova/network/manager.py          |    6 +--
 nova/objectstore/handler.py      |   12 ++---
 nova/rpc.py                      |   15 ++++--
 nova/scheduler/manager.py        |    4 +-
 nova/service.py                  |   40 +++++++-------
 nova/tests/access_unittest.py    |   56 +++++++-------------
 nova/tests/api_unittest.py       |    3 +-
 nova/tests/cloud_unittest.py     |   28 +++++-----
 nova/tests/compute_unittest.py   |   11 ++--
 nova/tests/network_unittest.py   |   66 ++++++++++++-----------
 nova/tests/quota_unittest.py     |   14 ++---
 nova/tests/rpc_unittest.py       |   30 +++++++++--
 nova/tests/scheduler_unittest.py |   22 ++++----
 nova/tests/service_unittest.py   |   24 +++++----
 nova/tests/volume_unittest.py    |   29 ++++++-----
 nova/virt/libvirt_conn.py        |   27 ++++++----
 27 files changed, 433 insertions(+), 368 deletions(-)

commit 7e020e743c138d542e957c24ea53c1ca7fbc757c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 13:03:57 2010 +0200

    Address a few comments from Todd.

 nova/db/api.py               |    5 -----
 nova/db/sqlalchemy/api.py    |    8 --------
 nova/db/sqlalchemy/models.py |    2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

commit 14d78899f953fa047b5fd6ad3667313f544027b8
Merge: 8a9d5a4 c9cb22f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 11:48:55 2010 +0200

    Merge trunk

commit 4b3d4eb51a5d927a8eecdca550e04fc699443d21
Merge: c9e14d6 c9cb22f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Oct 1 02:28:31 2010 -0700

    Merged trunk

commit c9e14d6257f0b488bd892c09d284091c0f612dd7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Oct 1 01:44:17 2010 -0700

    Locked down fixed ips and improved network tests

 nova/db/sqlalchemy/api.py      |   98 +++++++++++++++-------------------------
 nova/tests/network_unittest.py |   44 ++++++++++--------
 2 files changed, 60 insertions(+), 82 deletions(-)

commit 8a9d5a425ddaa8d6defac6d5dda2545363b0bb56
Merge: af2f949 ddaaebb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 09:58:33 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit 924ababfdf430f25497e617e09a7d816450a7b1e
Merge: 8cb9e73 c9d2b8b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 23:35:11 2010 -0700

    merged remove-network-index

commit c9d2b8bcb365f326a47df93920c11be2ca054b18
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 23:04:53 2010 -0700

    Fixed flat network manager with network index gone.
    
    Both managers use ips created through nova manage.
    
    Use of project_get_network is minimized to make way for managers that
    would prefer to use cluste or host based ips instead of project based ips.

 bin/nova-manage                  |   20 ++++---
 nova/api/ec2/cloud.py            |   11 ++--
 nova/api/rackspace/servers.py    |   37 ++++++------
 nova/db/api.py                   |    7 ++-
 nova/db/sqlalchemy/api.py        |   14 ++++-
 nova/network/linux_net.py        |    6 +-
 nova/network/manager.py          |  121 +++++++++++++++++++++-----------------
 nova/test.py                     |    4 +-
 nova/tests/compute_unittest.py   |    3 +-
 nova/tests/network_unittest.py   |   13 ++--
 nova/tests/scheduler_unittest.py |    1 +
 nova/virt/libvirt_conn.py        |    4 +-
 12 files changed, 140 insertions(+), 101 deletions(-)

commit afb292360319c304457a91a9285991a6b3c79af9
Merge: ecbd4df c9cb22f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 20:35:09 2010 -0700

    merged trunk

commit ddaaebb28649811d723f93a89ee46d69cc3ecabc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 20:24:42 2010 -0700

    show project ids for groups instead of user ids

 nova/api/ec2/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 444b13d0272b56a26f5bff111d268ae8a978d2e2
Merge: c92875b 06cdef0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 19:29:57 2010 -0700

    Merge from gundlach

commit 8cb9e732115d531d80c2ae13bc21a48458cd5f2a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 19:21:50 2010 -0700

    create a new manager for flat networking including dhcp

 nova/network/linux_net.py |   22 +++---
 nova/network/manager.py   |  164 ++++++++++++++++++++++++---------------------
 2 files changed, 101 insertions(+), 85 deletions(-)

commit 06cdef056b508e15869623da28ad18cc817e6848
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 30 22:09:46 2010 -0400

    First attempt at a uuid generator -- but we've lost a 'topic' input so i don't know what that did.

 nova/utils.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 39080e5f5000e0f401ff19f3fd9dd8cfbffffe69
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 30 22:05:16 2010 -0400

    Find other places in the code that used ec2_id or get_instance_by_ec2_id and use internal_id as appropriate

 nova/compute/manager.py      |    6 +++---
 nova/tests/cloud_unittest.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 58773e16ddd6f3aaa4aafefde55a3ae631e806dd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 30 21:59:52 2010 -0400

    Convert EC2 cloud.py from assuming that EC2 IDs are stored directly in the database, to assuming that EC2 IDs should be converted to internal IDs.
    
    The conversion between the internal ID and the EC2 ID is imperfect -- right now it turns internal IDs like 408 into EC2 IDs like i-408, and vice versa.  Instead, EC2 IDs are supposed to be i-[base 36 of the integer].

 nova/api/ec2/cloud.py |   58 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 17 deletions(-)

commit c92875b08ea5e2b6173880edcb9f731e0bf81399
Merge: 06f0463 c58acf2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 18:43:44 2010 -0700

    Method cleanup and fixing the servers tests

commit e0da95213631b3dc383ce69d6dff044c5841f143
Merge: e16031d c9cb22f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 18:33:23 2010 -0700

    merged trunk, removed extra quotas

commit c9cb22f87561fad4ba57865d8a614ca024393f13
Merge: 30747bb 1dda065
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 1 01:28:17 2010 +0000

    Adds support for periodic_tasks on manager that are regularly called by the service and recovers fixed_ips that didn't get disassociated properly.

commit c58acf2c59420a78f6b7195e3c1ef25e84f12e20
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 30 21:19:35 2010 -0400

    Replace database instance 'ec2_id' with 'internal_id' throughout the nova.db package.
    internal_id is now an integer -- we need to figure out how to make this a bigint or something.

 nova/db/api.py               |    4 ++--
 nova/db/sqlalchemy/api.py    |   20 +++++++++++---------
 nova/db/sqlalchemy/models.py |    4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

commit 1dda065c53cbe11a34e7ae60e11e30dfaf6bf7ac
Merge: 5d30881 30747bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 18:13:45 2010 -0700

    merged trunk

commit 06f04639dc4b1574ac3f35c955c1d6db0f84269d
Merge: 30747bb 58ae192
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 20:10:57 2010 -0500

    refactoring

commit 58ae192764b11b19f5676f9496f287a4ea2a71bd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 20:07:26 2010 -0500

    refactoring

 nova/api/cloud.py                   |    2 +-
 nova/api/rackspace/servers.py       |   25 ++++++-------------------
 nova/tests/api/rackspace/servers.py |    2 +-
 3 files changed, 8 insertions(+), 21 deletions(-)

commit 30747bba76ddc2b51b5b0bf564557e86a5d634c3
Merge: 2212683 75c5ba6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Oct 1 00:58:17 2010 +0000

    Includes changes for creating instances via the Rackspace API. Utilizes much of the existing EC2 functionality to power the Rackspace side of things, at least for now.

commit 2212683888d717d55531136cf4917da015a2bb9c
Merge: dee1e10 ae55b04
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Sep 30 23:03:26 2010 +0000

    Get rid of mention of mongo, since we are using openstack/swift.

commit ae55b04a4b25c6756311f001e36b5bbd76675e8c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Sep 30 18:48:45 2010 -0400

    Mongo bad, swift good.

 nova/objectstore/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b40696640b13e0974a29c23240f7faa79ad00912
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 00:42:09 2010 +0200

    Add a DB backend for auth manager.

 nova/auth/dbdriver.py        |  236 ++++++++++++++++++++++++++++++++++++++++++
 nova/auth/manager.py         |    2 +-
 nova/db/api.py               |  113 ++++++++++++++++++++
 nova/db/sqlalchemy/api.py    |  199 +++++++++++++++++++++++++++++++++++
 nova/db/sqlalchemy/models.py |   73 ++++++++++++-
 nova/tests/auth_unittest.py  |    9 +-
 nova/tests/fake_flags.py     |    2 +-
 7 files changed, 629 insertions(+), 5 deletions(-)

commit dee1e10bcab05f0f1ad487a7b43b16ea742727cf
Merge: 4b432dd 76d9510
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Sep 30 17:28:17 2010 +0000

      Bug #652103: NameError in exception handler in sqlalchemy API layer
    
      Fix reference to NoResultFound.

commit 76d9510ac496051697f7cdf0d693d5146e83283a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Sep 30 16:00:53 2010 +0100

    Bug #652103: NameError in exception handler in sqlalchemy API layer
    
    Fix reference to NoResultFound.

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4b432ddce0e54fab43c8352404d7be9af9677ea7
Merge: 5654c78 8c21cc5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Sep 30 14:53:40 2010 +0000

    Bug #651887: xenapi list_instances completely broken
    
      Don't just compute the result for list_instances -- return it!

commit 75c5ba6aae6a57a61771ed78b6797c90f7da6940
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 09:22:46 2010 -0500

    Grabbed the wrong copyright info

 nova/api/rackspace/context.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit ab948224a5c6ea976def30927ac7668dd765dbca
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 03:13:47 2010 -0700

    Cleaned up db/api.py

 nova/db/api.py |    4 ----
 1 file changed, 4 deletions(-)

commit cf456bdb2a767644d95599aa1c8f580279959a4e
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 02:47:05 2010 -0700

    Refactored APIRequestContext

 nova/api/context.py            |   46 ++++++++++++++++++++++++++
 nova/api/ec2/__init__.py       |    8 ++---
 nova/api/ec2/context.py        |   33 -------------------
 nova/db/sqlalchemy/api.py      |   71 ++++++++++++++++++----------------------
 nova/network/manager.py        |    2 --
 nova/tests/compute_unittest.py |    8 ++---
 6 files changed, 86 insertions(+), 82 deletions(-)

commit 8c21cc52b1ba007fc12964ea5973290a3f660662
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Sep 30 10:21:44 2010 +0100

    Bug #651887: xenapi list_instances completely broken
    
    Don't just compute the result for list_instances -- return it!

 nova/virt/xenapi.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8bd81f3ec811e19f6e7faf7a4fe271f85fbc7fc7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 02:02:14 2010 -0700

    Simplified authorization with decorators"
    "

 nova/db/sqlalchemy/api.py |  408 ++++++++++++++++-----------------------------
 1 file changed, 142 insertions(+), 266 deletions(-)

commit 336523b36ceb8f5302acd443b7f1171b67575f73
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 01:11:16 2010 -0700

    Removed deprecated bits from NovaBase

 nova/db/sqlalchemy/models.py |   38 --------------------------------------
 1 file changed, 38 deletions(-)

commit 30541d48b17ab4626791d969388871b3a1b7758f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 01:07:05 2010 -0700

    Wired up context auth for keypairs

 nova/db/sqlalchemy/api.py    |   46 +++++++++++++++++++++++++++++++++---------
 nova/db/sqlalchemy/models.py |   20 ------------------
 2 files changed, 37 insertions(+), 29 deletions(-)

commit 98cac90592658773791eb15b19ed60adf0a57d96
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 00:36:10 2010 -0700

    Completed quota context auth

 nova/db/sqlalchemy/api.py    |  103 ++++++++++++++++++++++++++++++------------
 nova/db/sqlalchemy/models.py |   12 -----
 2 files changed, 75 insertions(+), 40 deletions(-)

commit e716990fd58521f8c0166330ec9bc62c7cd91b7e
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:54:15 2010 -0700

    Finished context auth for network

 nova/db/sqlalchemy/api.py |  103 +++++++++++++++++++++++++++++++--------------
 nova/network/manager.py   |    3 +-
 2 files changed, 73 insertions(+), 33 deletions(-)

commit ea5dcda819f2656589df177331f693f945d98f4a
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:35:24 2010 -0700

    Finished instance context auth

 nova/db/sqlalchemy/api.py      |   32 +++++++++++++++++++++++++++++---
 nova/tests/network_unittest.py |    1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

commit d32d95e08d67084ea04ccd1565ce6faffb1766ce
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:29:55 2010 -0700

    Finished instance context auth

 nova/db/sqlalchemy/api.py      |  185 +++++++++++++++++++++++++++++-----------
 nova/tests/compute_unittest.py |    2 +
 nova/tests/network_unittest.py |    4 +-
 3 files changed, 141 insertions(+), 50 deletions(-)

commit 734df1fbad8195e7cd7072d0d0aeb5b94841f121
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 19:09:00 2010 -0700

    Made network tests pass again

 nova/db/api.py                 |    1 -
 nova/db/sqlalchemy/api.py      |  233 ++++++++++++++++++++++++++++------------
 nova/db/sqlalchemy/models.py   |   26 -----
 nova/network/manager.py        |    3 +-
 nova/tests/network_unittest.py |    1 +
 5 files changed, 170 insertions(+), 94 deletions(-)

commit b075b504a0a402fc4e8c24379804633139883008
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 19:28:14 2010 -0500

    Whoops, forgot the exception handling bit

 nova/api/rackspace/servers.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 13a73f2606f4b9dee4e51cccbb7e48c8ce322b76
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 18:00:24 2010 -0500

    Missed a few attributes while mirroring the ec2 instance spin up

 nova/api/rackspace/servers.py |    3 +++
 1 file changed, 3 insertions(+)

commit 6b932780b6bf10b387ad04be6ec88395cae6b564
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:52:15 2010 -0500

    pylint and pep8 cleanup

 nova/api/rackspace/context.py       |    8 +++++---
 nova/api/rackspace/servers.py       |    8 +++-----
 nova/tests/api/rackspace/flavors.py |    1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

commit 41e940a5cfa62d56e7d4f111827217c64f0ec61d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:40:46 2010 -0500

    Forgot the context module

 nova/api/rackspace/context.py |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

commit 33f101c309852f358ab30a8af64ef64a848f16ae
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:36:26 2010 -0500

    Some minor cleanup

 nova/api/rackspace/servers.py |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

commit 0030da605c30bbf3b1424aae86bbdc07ff7c50c2
Merge: 35741ff 5654c78
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:24:36 2010 -0500

    Merge from trunk and networking setup for new instances

commit 35741ff23bec2b4f301b93128fd018e9c8e70945
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:06:35 2010 -0500

    Servers stuff

 nova/api/rackspace/servers.py |   38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

commit 8657a55285e2b494cc3d82f871a84822e8fcbc1f
Merge: 128ec65 072661d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 16:29:57 2010 -0500

    merge rsapi_reboot from gundlach

commit f4cf49ec3761bdd38dd1a6cb064875b90e65ad4e
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 14:27:31 2010 -0700

    Wired up context auth for services

 nova/db/sqlalchemy/api.py    |  111 +++++++++++++++++++++++++++++++++---------
 nova/db/sqlalchemy/models.py |   15 ------
 2 files changed, 89 insertions(+), 37 deletions(-)

commit 128ec65cf39e74b53903dd9788a58c8eb513abe8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 16:21:28 2010 -0500

    Server creation up to, but not including, network configuration

 nova/api/rackspace/servers.py           |   97 ++++++++++++++++++++-----------
 nova/db/sqlalchemy/models.py            |    1 -
 nova/tests/api/rackspace/auth.py        |    8 ++-
 nova/tests/api/rackspace/servers.py     |   48 ++++++++++-----
 nova/tests/api/rackspace/test_helper.py |   17 +++++-
 nova/wsgi.py                            |   11 ++--
 6 files changed, 123 insertions(+), 59 deletions(-)

commit e258998923b7e8fa92656aa409f875b640df930c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 13:26:14 2010 -0700

    Progress on volumes
    Fixed foreign keys to respect deleted flag

 nova/db/sqlalchemy/api.py    |  130 ++++++++++++++++++++++++++++++------------
 nova/db/sqlalchemy/models.py |   35 +++++++++---
 2 files changed, 118 insertions(+), 47 deletions(-)

commit 072661db01ed196eac92ceb1e942429a0e380e4a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 15:52:02 2010 -0400

    Support reboot in api.rackspace by extracting reboot function from api.ec2 into api.cloud.

 nova/api/cloud.py                          |   42 ++++++++++++++++++++++++++++
 nova/api/ec2/cloud.py                      |    8 ++----
 nova/api/rackspace/servers.py              |   10 +++++--
 nova/tests/api/rackspace/images.py         |    1 +
 nova/tests/api/rackspace/sharedipgroups.py |    1 +
 5 files changed, 54 insertions(+), 8 deletions(-)

commit 5654c7848048ecad0aef020b96001aed3e5c1bdc
Merge: 0098362 2136f12
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 19:43:22 2010 +0000

    Make Fault raiseable, and add a test to verify that.

commit 2136f12d29cef9acc7dc6ee0a5901fa3878160f8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 15:09:39 2010 -0400

    Make Fault raiseable by inheriting from webob.exc.HTTPException.
    
    Change from using self.exception which is reserved by HTTPException to self.wrapped_exc.

 nova/api/rackspace/faults.py           |   17 +++++++++--------
 nova/tests/api/rackspace/testfaults.py |   10 ++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

commit 009836223db0fed878ca05ac45c2e6ee942efccb
Merge: dbf19c9 724c15b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 29 18:48:05 2010 +0000

    Related: https://code.launchpad.net/~anso/nova/authupdate/+merge/36925

commit 724c15b6583b47baabd2f01090580cb248ad1244
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 29 14:12:02 2010 -0400

    Remove debuggish print statement.

 bin/nova-manage |    1 -
 1 file changed, 1 deletion(-)

commit 9c4319a83a6e7d61ffa6b78e9f17ea35821c5526
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 12:58:40 2010 -0500

    Make update work correctly

 nova/api/rackspace/servers.py       |   20 ++++++++++++++------
 nova/db/sqlalchemy/models.py        |    2 +-
 nova/tests/api/rackspace/servers.py |    5 +++--
 3 files changed, 18 insertions(+), 9 deletions(-)

commit 0868bcee453665b1ce24d43a90b3addfaab8c49d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 12:16:53 2010 -0500

    Server update name and password

 nova/api/rackspace/servers.py       |   61 ++++++++++++++++++++++-------------
 nova/db/sqlalchemy/models.py        |    3 ++
 nova/tests/api/rackspace/servers.py |   36 ++++++++++++++++++---
 nova/wsgi.py                        |    9 ++++++
 4 files changed, 82 insertions(+), 27 deletions(-)

commit dbf19c9421c3537f3081d2fa8810dfc11f7d7e1f
Merge: 1ecff5b 8201ef0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 16:48:21 2010 +0000

    Support the pagination interface in RS API -- the &offset and &limit parameters are now recognized.
    
    This implementation is stupid (it just slices the full list at the last second), so in Bexar we should do this right.

commit 8201ef0b16835762fc39956e8b5e4985e94ceb4c
Merge: 29eca7e 1ecff5b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 12:27:56 2010 -0400

    Update from trunk to handle one-line merge conflict

commit 1ecff5b5766c8ac0854b80bd819f364b12f3f038
Merge: 43ce842 4c1aa3d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 16:13:18 2010 +0000

    Support fault notation in error messages in the RS API.

commit 29eca7e7992fc5c073d70f7c8ca5e5bc03f62af7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 11:37:26 2010 -0400

    Limit entity lists by &offset and &limit

 nova/api/rackspace/__init__.py       |   20 ++++++++++++++++++++
 nova/api/rackspace/flavors.py        |    5 ++++-
 nova/api/rackspace/images.py         |    2 ++
 nova/api/rackspace/servers.py        |   18 ++++++++++++------
 nova/tests/api/rackspace/__init__.py |   29 +++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 7 deletions(-)

commit 4c1aa3d96f0c44d3e01864ca3128e9b052d1d7fd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 10:17:10 2010 -0400

    After update from trunk, a few more exceptions that need to be converted to Faults

 nova/api/rackspace/backup_schedules.py |    7 ++++---
 nova/api/rackspace/servers.py          |   17 +++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

commit 0f69422a47dfc837297c4853bbcea9da9b7dd809
Merge: 05e3e18 43ce842
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 09:39:24 2010 -0400

    Merge from trunk

commit a86507b3224eb051fea97f65bd5653758fa91668
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 06:17:39 2010 -0700

    fix ordering of rules to actually allow out and drop in

 nova/virt/libvirt_conn.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit af2f94944624de0a151356086f7a311c650187c1
Merge: c43fb83 c0abb5c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 13:39:09 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit c43fb8325eb068e970df02ec99d02f37de38ecc4
Merge: e609dd8 43ce842
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 13:29:45 2010 +0200

    Merge trunk.

commit 6a0bf3e048da0f7a0c0daf8e25167452cb86bf73
Merge: 687a90d 43ce842
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 11:51:01 2010 +0200

    Merge with trunk.
    Move network initialisation code into new init_host method on the network manager.

commit 5fa5a0b0b9e13f8f44b257eac0385730c959b92f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 01:58:19 2010 -0700

    fix the primary and secondary join

 nova/db/sqlalchemy/api.py    |    4 ++--
 nova/db/sqlalchemy/models.py |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 793516d14630a82bb3592f626b753736e63955ec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 01:33:30 2010 -0700

    autocreate the models and use security_groups

 nova/db/sqlalchemy/api.py    |    4 ++--
 nova/db/sqlalchemy/models.py |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit e609dd8620796f4eadefcff6130dfeae06b97ef4
Merge: bfb01ef 84fbad8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 09:54:22 2010 +0200

    Merge patch from Vish to move creation of default security groups into the API layer. This is a temporary fix. We need to sort out for Austin+1 how to deal with things like this.

commit fe139bbdee60aadd720cb7a83d0846f2824c078f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 00:49:04 2010 -0700

    Began wiring up context authorization

 nova/db/sqlalchemy/api.py |   50 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

commit bfb01ef2e2960803feffb2a3998810b0966e1e79
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 09:46:37 2010 +0200

    Apply patch from Vish to fix a hardcoded id in the unit tests.

 nova/tests/virt_unittest.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit c0abb5cd45314e072096e173830b2e3d379bf3e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:42:18 2010 -0700

    removed a few extra items

 nova/db/sqlalchemy/api.py |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

commit ab079a5b1de6b7b2685ad74e023ae31d05c043ed
Merge: 970114e e609dd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:35:03 2010 -0700

    merged with soren's branch

commit 970114e1729c35ebcc05930659bb5dfaf5b59d3d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:30:35 2010 -0700

    fix loading to ignore deleted items

 nova/api/ec2/cloud.py        |    2 +-
 nova/db/sqlalchemy/api.py    |   65 +++++++++++++++++++++++++-----------------
 nova/db/sqlalchemy/models.py |   21 ++++++++------
 3 files changed, 53 insertions(+), 35 deletions(-)

commit 43ce84290964b433fd9d9898772d29bffc385dd8
Merge: a72406e b784836
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 29 04:13:25 2010 +0000

    Add user-editable name & notes/description to volumes, instances, and images.

commit 9b7d69b3575da4e54a7e2bcb1f13ced39b199d10
Merge: b952e1e 43ce842
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:11:11 2010 -0700

    merged trunk

commit b952e1ef61a6ed73e34c6dd0318cd4d52faf47dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:07:26 2010 -0700

    patch for test

 nova/tests/virt_unittest.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 3124cf70c6ab2bcab570f0ffbcbe31672a9556f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:03:45 2010 -0700

    fix join and misnamed method

 nova/api/ec2/cloud.py     |    2 +-
 nova/db/api.py            |    2 +-
 nova/db/sqlalchemy/api.py |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

commit d9855ba51f53a27f5475b3c0b7f669b378ccc006
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 20:53:24 2010 -0700

    fix eagerload to be joins that filter by deleted == False

 nova/db/sqlalchemy/api.py |   25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit b784836118d5900330c76863decd504ec7bd6a77
Merge: c4df3d6 3ebea53
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 23:38:32 2010 -0400

    Merge trunk and fix test.

commit a72406e72f7c16df0f6fa64631ddc51a8e47777f
Merge: 3ebea53 d2a4901
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 29 03:38:04 2010 +0000

    * Create an AuthManager#update_user method to change keys and admin status.
    * Refactor the auth_unittest to not care about test order
    * Expose the update_user method via nova-manage

commit 3ebea539c25f913a22f86e7dd500bf5d7771614f
Merge: 9b7fc3e bc88c73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 03:28:20 2010 +0000

    Updates the fix-iptables branch with a number of bugfixes.

commit d2a49012200ae963ce3403669ae4a2aa07adae7e
Merge: 08a6dc5 9b7fc3e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 23:23:41 2010 -0400

    Merge Trunk

commit 9b7fc3e3051b32bb944ef9dd0a3edfe1afcd245c
Merge: c27ec0f 3dbb3fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 03:23:09 2010 +0000

    Fixes reversed arguments in nova-manage project environment.

commit c27ec0f51d495f9547dfcd135696e839f564ded1
Merge: 1540480 9706542
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 02:38:15 2010 +0000

    Makes sure that multiple copies of nova-network don't create multiple copies of the same NetworkIndex.

commit 1540480db44f55dcee8fe1998ed58a306b03f1df
Merge: 2b65cf9 bd58166
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 02:28:09 2010 +0000

    Fix a few errors in api calls related to mistyped database methods for floating_ips: specifically describe addresses and and associate address.

commit 2b65cf963b8afbc4703f79d3057e5c19f2894baa
Merge: 493047c 808b342
Author: Eric Day <eday@oddments.org>
Date:   Wed Sep 29 02:13:12 2010 +0000

    Merged Termie's branch that starts tornado removal and fixed rpc test cases for twisted. Nothing is testing the Eventlet version of rpc.call though yet.

commit fcbdf0b4a62481b4bc0d81d45632cf26de82ec3d
Merge: 0945a88 8c51e96
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 21:11:29 2010 -0500

    Merge from trunk

commit 493047c2e475ff2c5d071e412d502081bd024078
Merge: 8c51e96 bbc00d9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 02:10:17 2010 +0000

    Adds bpython support to nova-manage shell, because it is super sexy.

commit 8c51e9623bfabad6a9b2f50e6860db6b3ce850d0
Merge: 767db36 5ebefd0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 02:08:11 2010 +0000

    Adds a disabled flag to service model and check for it when scheduling instances and volumes.

commit 767db3693d5552d6bb986e69b200ab840a5139ae
Merge: 27220e6 b68b73d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 01:58:14 2010 +0000

    Adds bpython support to nova-manage shell, because it is super sexy.

commit 27220e66e20e30304bae8491ebe90fcc968c43ca
Merge: 0945a88 e3102b6
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 01:53:14 2010 +0000

    Added random ec2 style id's for volumes and instances.

commit c53af2fc9d9803cebc7f4078b8f772476a09df81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 18:47:47 2010 -0700

    fix security group revoke

 nova/api/ec2/cloud.py |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit e3102b6b9be148597a2f502d2b2baf750ecc0a34
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 18:43:36 2010 -0700

    Fixed tests

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2327378a1e5c9fa942d56001919caaeb1be1c7cb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 18:38:19 2010 -0700

    Removed str_id from FixedIp references

 bin/nova-manage           |    2 +-
 nova/compute/manager.py   |   10 +++++-----
 nova/network/linux_net.py |    2 +-
 nova/network/manager.py   |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

commit bc88c73a4e986289be7835b95ec97ffb7a50f7d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:53:27 2010 -0700

    missed a comma

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d1c454ba4331794931e94cc2864f4e1a6ef5bf22
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:41:57 2010 -0700

    improved commenting

 tools/setup_iptables.sh |   27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

commit 05e3e188e03624884ed019fe9cd8f216c9262f98
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 28 20:36:50 2010 -0400

    Fault support

 nova/api/rackspace/__init__.py         |    9 +++--
 nova/api/rackspace/auth.py             |    7 ++--
 nova/api/rackspace/faults.py           |   61 ++++++++++++++++++++++++++++++++
 nova/api/rackspace/flavors.py          |    3 +-
 nova/api/rackspace/images.py           |    7 ++--
 nova/tests/api/rackspace/testfaults.py |   30 ++++++++++++++++
 6 files changed, 107 insertions(+), 10 deletions(-)

commit 533f72379931aa7bf67a0e7d1d7664ca151afda0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:24:25 2010 -0700

    fix flag defaults

 nova/flags.py             |    2 +-
 nova/network/linux_net.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1e4bca12e7e06698d3a13d6a208be90647f27555
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:15:59 2010 -0700

    typo s/boo/bool

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 5d30881d721bdc9e26f71fd2130bd44e7edb1d4d
Merge: bb1540d 1540480
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:08:56 2010 -0700

    merged and removed duplicated methods

commit bd5816698316f64a2df700ed361b66e533eb9a31
Merge: 669cf47 2b65cf9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 16:54:57 2010 -0700

    fixed merge conflicts

commit bbc00d9eca3b874e240e50bfa9f397afc36d0bee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 16:34:21 2010 -0700

    removed extra code that slipped in from a test branch

 nova/tests/rpc_unittest.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 116f0fc0b18c6b04a86de5123d2985205d954093
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 16:10:47 2010 -0700

    Fixed name property on instance model

 nova/api/ec2/cloud.py        |   16 ++++++++--------
 nova/db/sqlalchemy/models.py |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

commit 0945a8869fa64d466527f865ba13b6275f1649c2
Merge: 7d6687e 641b6ee
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 22:48:06 2010 +0000

    Implementation of the Rackspace servers API controller
    
    Currently, work remains on the controller, but I'm proposing a merge before the diff becomes completely unwieldy. However, all implemented tests pass.

commit 60cd2a9e292eb5a8a0bc45605d79d0a511525342
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 15:15:05 2010 -0700

    Added checks for uniqueness for ec2 id

 nova/db/sqlalchemy/api.py    |   35 +++++++++++++++++++++++++++++------
 nova/db/sqlalchemy/models.py |    4 ----
 2 files changed, 29 insertions(+), 10 deletions(-)

commit c4df3d63c83c073664a9ed0abaefe2adbe4cd061
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 14:59:32 2010 -0700

    fix test for editable image

 nova/tests/cloud_unittest.py |   31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

commit 641b6ee5630ed00ee3e921769cd408a8603ff62b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 16:46:21 2010 -0500

    Merge prop fixes and pylint/pep8 cleanup

 nova/api/rackspace/__init__.py          |    2 +-
 nova/api/rackspace/auth.py              |    8 +-
 nova/api/rackspace/backup_schedules.py  |    5 +-
 nova/api/rackspace/images.py            |    5 +-
 nova/api/rackspace/servers.py           |  141 +++++++++++++++++--------------
 nova/db/sqlalchemy/models.py            |    2 +-
 nova/tests/api/rackspace/servers.py     |    8 +-
 nova/tests/api/rackspace/test_helper.py |   10 ++-
 pylintrc                                |    3 +-
 9 files changed, 105 insertions(+), 79 deletions(-)

commit c80c0786baadf521c86ceff21288e3760aaea5bd
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 16:47:29 2010 -0400

    Add authorization info for cloud endpoints.

 nova/api/ec2/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

commit c1f7914f9d8c4f7687c67de37c5eda5a95245a0d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 16:41:39 2010 -0400

    Remove TODO, since apparently newer boto doesn't die on extra fields.

 nova/api/ec2/cloud.py |    2 --
 1 file changed, 2 deletions(-)

commit 99eb90c18bf59545d911ade376287ace4f049b58
Merge: 4b26e60 7d6687e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 16:39:52 2010 -0400

    Merge trunk.

commit 5ebefd0d5de7a7c753297bcde8ae842c4f92e33e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 13:21:24 2010 -0700

    add disabled column to services and check for it in scheduler

 nova/db/sqlalchemy/api.py    |    4 +++-
 nova/db/sqlalchemy/models.py |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 08a6dc59add5d72c6d925d1ca43868557a4b3148
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 15:54:05 2010 -0400

    Hook the AuthManger#modify_user method into nova-manage commands.

 bin/nova-manage |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 7d6687e1e2811542c288e997359a278023a4c37f
Merge: fa112f5 9f9f80a
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 19:53:21 2010 +0000

    Refactored adminclient to support multiple regions

commit ecbd4df9f63f556f6700d3c7a489adaec3ed3a93
Merge: e4cb0d3 bb1540d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:31:35 2010 -0700

    merged network-lease-fix

commit bb1540d7bf2c323d43110738e43e9b99ef49b62c
Merge: f3698b8 669cf47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:29:43 2010 -0700

    merged floating-ips

commit 84fbad82d65b837d43f138e7a5acd24f182499e2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:09:17 2010 -0700

    move default group creation to api

 nova/api/ec2/cloud.py     |   17 +++++++++++++++++
 nova/auth/manager.py      |   14 --------------
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    6 ++++++
 nova/test.py              |    2 ++
 5 files changed, 30 insertions(+), 14 deletions(-)

commit 7ebf1e292b4840e0da4190d2aaf3fa8fc5439846
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 11:49:20 2010 -0700

    Implemented random instance and volume strings for ec2 api

 nova/api/ec2/cloud.py        |   30 +++++++++++++++---------------
 nova/db/api.py               |   12 ++++++------
 nova/db/sqlalchemy/api.py    |   29 ++++++++++++++++++++++++-----
 nova/db/sqlalchemy/models.py |    7 +++++--
 nova/volume/manager.py       |   10 +++++-----
 5 files changed, 55 insertions(+), 33 deletions(-)

commit 7c8c2f57c752cd8681eef073349f9bdcaa95c868
Author: jaypipes@gmail.com <>
Date:   Tue Sep 28 14:48:03 2010 -0400

    Adds --force option to run_tests.sh to clear virtualenv. Useful when dependencies change

 run_tests.sh |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit 7ee8a0f8b2d781d758b62d2aec423a5a733d2aa7
Merge: 41e8f72 fa112f5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 13:13:36 2010 -0500

    merge from trunk

commit 4b26e60e3c84d4535fbd4ba7a3b2bf29f2121072
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 14:09:53 2010 -0400

    Instance & Image renaming fixes.

 nova/endpoint/cloud.py             |   24 ++++++++++--------------
 nova/endpoint/images.py            |    6 ++++--
 nova/objectstore/handler.py        |   18 +++++++++---------
 nova/objectstore/image.py          |   14 ++++++--------
 nova/tests/cloud_unittest.py       |    2 +-
 nova/tests/objectstore_unittest.py |    6 +++---
 6 files changed, 33 insertions(+), 37 deletions(-)

commit 41e8f72334bd7a69d86575c6fc855146e12dce59
Merge: 663ed27 fd41a78
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 13:09:25 2010 -0500

    merge from gundlach

commit 663ed27a2d7b3cb3a5290e0516eb8d602d7e65ba
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 12:56:01 2010 -0500

    Testing testing testing

 nova/api/rackspace/_id_translator.py    |    2 +-
 nova/api/rackspace/servers.py           |   22 +++++++++++++-----
 nova/tests/api/rackspace/servers.py     |   37 ++++++++++++++++++++++++++-----
 nova/tests/api/rackspace/test_helper.py |   22 ++++++++++++++++--
 4 files changed, 69 insertions(+), 14 deletions(-)

commit e4cb0d3a93ddc4cae40c4a8c570c7e7d2a0061ff
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 10:34:32 2010 -0700

    get rid of network indexes and make networks into a pool

 bin/nova-manage                |   27 ++++++++++--
 nova/auth/manager.py           |   13 ------
 nova/db/api.py                 |   35 +++++++++-------
 nova/db/sqlalchemy/api.py      |   91 +++++++++++++++++++---------------------
 nova/db/sqlalchemy/models.py   |   33 ++++++---------
 nova/network/manager.py        |   73 +++++++++++++++++---------------
 nova/test.py                   |   10 +++++
 nova/tests/network_unittest.py |   15 +++++--
 8 files changed, 158 insertions(+), 139 deletions(-)

commit fd41a784ccee500ae8a36311ad3c80963e866b31
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 28 12:54:17 2010 -0400

    Add Serializer.deserialize(xml_or_json_string)

 nova/tests/api/wsgi_test.py |   24 ++++++++++++++++++++
 nova/wsgi.py                |   51 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 69 insertions(+), 6 deletions(-)

commit e16031ddd09d668972c38372a28ec7f898f571f6
Merge: 7190ad4 cb311a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:39:18 2010 -0700

    merged trunk

commit 7190ad478b5e92a42d5109d01b5f178de2181127
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:38:58 2010 -0700

    return a value if possible from export_device_create_safe

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9febbe9188ac1e0019d362d34331f32b5f295037
Merge: 16deee5 669cf47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:28:39 2010 -0700

    merged floating-ip-by-project

commit 16deee5871be47c655c831064202068a92383152
Merge: cb311a3 f3698b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:26:36 2010 -0700

    merged network-lease-fix

commit 669cf475d11700064aa16f959077d0512e6b1531
Merge: be1b1e3 cb311a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:22:36 2010 -0700

    merged trunk

commit fa112f5aec624df7d6fc10584295a38bf440b28c
Merge: cb311a3 9abb450
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 15:23:15 2010 +0000

    Stop trying to install nova-api-new (it's gone).
    Install nova-scheduler.

commit 687a90d6a7ad947c4a5851b1766a19209bb5e46f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 11:09:40 2010 +0200

    Call out to 'sudo kill' instead of using os.kill. dnsmasq runs as root or nobody, nova may or may not be running as root, so os.kill won't work.

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit afc782e0e80a71ac8d1eb2f1d70e67375ba62aca
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 10:59:55 2010 +0200

    Make sure we also start dnsmasq on startup if we're managing networks.

 nova/network/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit f09fa50fd31ded3f2f31e020b54f2d3d2b380a35
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 10:26:29 2010 +0200

    Improve unit tests for network filtering. It now tracks recursive filter dependencies, so even if we change the filter layering, it still correctly checks for the presence of the arp, mac, and ip spoofing filters.

 nova/tests/virt_unittest.py |   45 +++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

commit 0dcf2e7e593cce4be1654fb4923ec4bb4524198f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 09:47:25 2010 +0200

    Make sure arguments to string format are in the correct order.

 nova/virt/libvirt_conn.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 886534ba4d0281afc0d169546a8d55d3a5c8ece9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 09:07:48 2010 +0200

    Make the incoming blocking rules take precedence over the output accept rules.

 nova/virt/libvirt_conn.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 7e25838ea1965231df09f29675fc3ab40e194483
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 00:44:32 2010 -0500

    db api call to get instances by user and user checking in each of the server actions

 nova/api/rackspace/servers.py       |   29 +++++++++++++++++++----------
 nova/db/api.py                      |    3 +++
 nova/db/sqlalchemy/api.py           |    7 +++++++
 nova/tests/api/rackspace/servers.py |   12 ++++++++----
 4 files changed, 37 insertions(+), 14 deletions(-)

commit 2f72b2a9fc9fee508b16c0b96285124279ef89ca
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 00:23:49 2010 -0500

    More cleanup, backup_schedules controller, server details and the beginnings of the servers action route

 nova/api/rackspace/__init__.py          |   17 +++++--
 nova/api/rackspace/backup_schedules.py  |   37 ++++++++++++++
 nova/api/rackspace/flavors.py           |    1 -
 nova/api/rackspace/images.py            |    1 -
 nova/api/rackspace/servers.py           |   22 +++++---
 nova/db/sqlalchemy/models.py            |    4 +-
 nova/tests/api/rackspace/servers.py     |   85 ++++++++++++++++++++++++++-----
 nova/tests/api/rackspace/test_helper.py |    1 +
 8 files changed, 141 insertions(+), 27 deletions(-)

commit 574aa4bb03c6e79c204d73a8f2a146460cbdb848
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 00:21:36 2010 +0200

    This is getting ridiculous.

 nova/virt/libvirt_conn.py |   50 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

commit f32e7054052f9daca7dcb92b0fb0ff0525c073be
Merge: 0e6c3b6 70516be
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 17:01:59 2010 -0500

    Merge from lp:~gundlach/nova/servers_api

commit 0e6c3b6034ef4927e381b231bf120a4980512c4e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 17:01:37 2010 -0500

    Power state mapping

 nova/api/rackspace/servers.py       |   42 ++++++++++++++++++++++-------------
 nova/tests/api/rackspace/servers.py |    1 +
 nova/tests/api/test_helper.py       |    1 +
 3 files changed, 28 insertions(+), 16 deletions(-)

commit 9140cd991e5507f65ff1d6a608bd8fd4c9956dbf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 22:00:17 2010 +0200

    Set priority of security group rules to 300 to make sure they override the defaults.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e705b666679ecccfc3e91c8029f2c646849509ee
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 21:57:13 2010 +0200

    Recreate ensure_security_group_filter. Needed for refresh.

 nova/virt/libvirt_conn.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit ab31fa628f4d9148aae8d42bbb41d721716c18e3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 21:49:53 2010 +0200

    Clean up nwfilter code. Move our filters into the ipv4 chain.

 nova/virt/libvirt_conn.py |   99 +++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 61 deletions(-)

commit 523f1c95ac12ed4782476c3273b337601ad8b6ae
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 21:49:24 2010 +0200

    If neither a security group nor a cidr has been passed, assume cidr=0.0.0.0/0

 nova/api/ec2/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 70516be4ff02cd82dce82ac1950fc55e87bab9ec
Merge: c62160e 1d83acc
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 14:18:47 2010 -0400

    Merge from upstream

commit 1d83acca365b13319bddbd628725d7b666879091
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 12:58:35 2010 -0500

    More re-work around the ORM changes and testing

 nova/api/rackspace/servers.py       |   47 ++++++++++++++++++-----------------
 nova/tests/api/rackspace/flavors.py |   15 ++++++++++-
 nova/tests/api/rackspace/servers.py |   37 +++++++++++++++++++++------
 3 files changed, 67 insertions(+), 32 deletions(-)

commit c62160eff79c082b6dc90be39229e9d8f9bf2fb1
Merge: 1c978e8 d4edbd2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 13:27:01 2010 -0400

    Merge from upstream

commit 1c978e8414b5841c4caf856c80f385026600f54e
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 12:50:20 2010 -0400

    Support content type detection in serializer

 nova/api/rackspace/__init__.py |    2 +-
 nova/api/rackspace/servers.py  |    5 ++---
 nova/tests/api/wsgi_test.py    |   33 ++++++++++++++++++++++++++++++---
 nova/wsgi.py                   |   21 ++++++++++++++-------
 4 files changed, 47 insertions(+), 14 deletions(-)

commit e6ada2403cb83070c270a96c7e371513d21e27f4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 15:13:11 2010 +0200

    If an instance never got scheduled for whatever reason, its host will turn up as None. Filter those out to make sure refresh works.

 nova/api/ec2/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 04fa25e63bf37222d2b1cf88837f1c85cf944f54
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 13:23:39 2010 +0200

    Only call _on_set_network_host on nova-network hosts.

 nova/network/manager.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 9dbdca83a8233110e94356415629ab9589b580d5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 13:13:29 2010 +0200

    Allow DHCP requests through, pass the IP of the gateway as the dhcp server.

 nova/virt/libvirt.qemu.xml.template |    1 +
 nova/virt/libvirt.uml.xml.template  |    1 +
 nova/virt/libvirt_conn.py           |    6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

commit 928df580e5973bc1fd3871a0aa31886302bb9268
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 13:03:29 2010 +0200

    Add a flag the specifies where to find nova-dhcpbridge.

 nova/network/linux_net.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 47cccfc21dfd4c1acf74b6d84ced8abba8c40e76
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 12:14:20 2010 +0200

    Ensure dnsmasq can read updates to dnsmasq conffile.

 nova/network/linux_net.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit e70948dbec0b21664739b2b7cdb1cc3da92bd01b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 12:08:40 2010 +0200

    Set up network at manager instantiation time to ensure we're ready to handle the networks we're already supposed to handle.

 nova/network/manager.py |    4 ++++
 1 file changed, 4 insertions(+)

commit b4dbc4efa576af61ddc26d1c277237ad4bcdfcfa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 12:07:55 2010 +0200

    Add db api methods for retrieving the networks for which a host is the designated network host.

 nova/db/api.py            |   12 ++++++++++++
 nova/db/sqlalchemy/api.py |   12 ++++++++++++
 2 files changed, 24 insertions(+)

commit ab2bed9ed60c5333a0f9ba3e679df9893781b72f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 10:39:52 2010 +0200

    Apply IP configuration to bridge regardless of whether it existed before. The fixes a race condition on hosts running both compute and network where, if compute got there first, it would set up the bridge, but not do IP configuration (because that's meant to happen on the network host), and when network came around, it would see the interface already there and not configure it further.

 nova/network/linux_net.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit 9f9f80a6282131ea944b6e3669527ea0c8c4705d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Sep 26 14:45:27 2010 -0700

    Removed extra logging from debugging

 nova/adminclient.py |    1 -
 1 file changed, 1 deletion(-)

commit 5d6ab2b2540743e0a53b01129df722610b3ae3b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 18:33:27 2010 -0700

    reorganize iptables clear and make sure use_nova_chains is a boolean

 nova/network/linux_net.py |    4 ++--
 tools/setup_iptables.sh   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 0d0884b2c1692d03e0994baecbb23ce24ef71e44
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 13:53:29 2010 -0700

    allow in and out for network and compute hosts

 nova/network/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e627748aec6a4747e22975d6cd59c8f20bc00c70
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Sat Sep 25 13:35:23 2010 -0500

    Modification of test stubbing to match new domain requirements for the router, and removal of the unnecessary rackspace base controller

 nova/api/rackspace/base.py              |   24 ------------------------
 nova/api/rackspace/flavors.py           |    3 ++-
 nova/api/rackspace/images.py            |    3 ++-
 nova/api/rackspace/servers.py           |   29 ++++++++++++++++-------------
 nova/api/rackspace/sharedipgroups.py    |    4 +++-
 nova/tests/api/rackspace/auth.py        |    4 ++--
 nova/tests/api/rackspace/servers.py     |    4 +++-
 nova/tests/api/rackspace/test_helper.py |   30 +++++++++++++++++++-----------
 8 files changed, 47 insertions(+), 54 deletions(-)

commit 307b16447a16e438d78b8149418c0ef728c5300e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Sat Sep 25 13:00:19 2010 -0500

    Minor changes to be committed so trunk can be merged in

 nova/api/rackspace/servers.py           |   26 +++++++++++++++++++++-----
 nova/tests/api/rackspace/servers.py     |    5 +++--
 nova/tests/api/rackspace/test_helper.py |    5 +++++
 3 files changed, 29 insertions(+), 7 deletions(-)

commit 6a3cd55a9c933c329da1117179d676e9141c5b4d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 10:47:51 2010 -0700

    disable output drop for the moment because it is too restrictive

 tools/setup_iptables.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 888a99182ca3152f68b762dab4fc95d7d3f1cadb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 09:28:05 2010 -0700

    add forwarding ACCEPT for outgoing packets on compute host

 nova/network/linux_net.py |    1 +
 1 file changed, 1 insertion(+)

commit 7ce67ea60f6e7d20665c10318b29e2659fd91513
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 08:35:16 2010 -0700

    fix a few missed calls to _confirm_rule and 80 char issues

 nova/network/linux_net.py |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit 125e69dd42f6f91f727258dc388d15ce63076d1f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 02:51:50 2010 -0700

    allow mgmt ip access to api

 tools/setup_iptables.sh |    3 +++
 1 file changed, 3 insertions(+)

commit c3fcb1b2176f4b7afbffb3555da55c0754bacaad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 01:05:39 2010 -0700

    flush the nova chains

 tools/setup_iptables.sh |    3 +++
 1 file changed, 3 insertions(+)

commit 39e06d83d265036eb0104cd55d4a828271f62e96
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Sep 25 00:35:59 2010 -0400

    Test the AuthManager interface explicitly, in case the user/project wrappers
    fail or change at some point.  Those interfaces should be tested on their own.

 nova/tests/auth_unittest.py |  113 +++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 58 deletions(-)

commit 73cc0e446297781182fab1b8e8447e7c6d100b08
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Sep 24 23:32:00 2010 -0400

    Update auth manager to have a update_user method and better tests.

 nova/auth/ldapdriver.py     |   16 +-
 nova/auth/manager.py        |    6 +
 nova/tests/auth_unittest.py |  408 ++++++++++++++++++++++++++++---------------
 3 files changed, 290 insertions(+), 140 deletions(-)

commit 41a598f09baee94125608873f4d7118000fc55ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 24 19:57:41 2010 -0700

    add a reset command

 tools/setup_iptables.sh |   74 ++++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

commit 808b3421e7cd73e9ac55bd61cedfa42e75cb9780
Merge: cb311a3 387671f
Author: Eric Day <eday@oddments.org>
Date:   Fri Sep 24 19:25:12 2010 -0700

    Merged Termie's branch and fixed rpc test cases for tesited. Nothing is testing the Eventlet version of rpc.call though yet.

commit 15c2678d3e3899e7ab6180dce457ae6d3e54937d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 24 18:21:58 2010 -0700

    improved the shell script for iptables

 tools/setup_iptables.sh |  124 +++++++++++++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 46 deletions(-)

commit aa0af4b0a43f3eff3db1b1868a82ba65c5710f87
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 24 17:42:55 2010 -0700

    Finished making admin client work for multi-region

 nova/adminclient.py |   59 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 17 deletions(-)

commit 3e8c19c42bd56dfc1cb428f3a39d0f102c65a4ac
Merge: fed57c4 cb311a3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 24 10:25:29 2010 +0200

    Merge trunk

commit 9abb45043c11125ecee36e44f939817bd03d70c4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 24 10:21:10 2010 +0200

    Install nova-scheduler.

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit ea33870fd0dee4e96b4f2aa18cdad02b66cd4f57
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 24 10:19:28 2010 +0200

    nova-api-new is no more. Don't attempt to install it.

 setup.py |    1 -
 1 file changed, 1 deletion(-)

commit e8bac42e5fb7a4bdefaf50db210777516c049166
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 23 18:00:27 2010 -0700

    Add multi region support for adminclient

 nova/adminclient.py |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

commit d4edbd26b27de3df6bf8af98486714d1cee5b594
Merge: c14fef2 be214c0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 23 16:55:51 2010 -0500

    Merging in changes from rs_auth, since I needed something modern to develop on while waiting for Hudson to right itself

commit be214c0ecece6d9cffced02f397ba9ce42be6d9f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 23 16:45:30 2010 -0500

    whatever

 nova/tests/api/rackspace/servers.py     |   13 +++++++++++--
 nova/tests/api/rackspace/test_helper.py |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

commit c14fef2fbb28bffc9a5507f2a23e0c7c0ecb6c2c
Merge: d642716 cb311a3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 23 16:42:39 2010 -0500

    Merge from trunk

commit cb311a3deb42094261b91467b7717f4eb3e9eaba
Merge: 2b2313d 203cd3f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 21:18:12 2010 +0000

    Put EC2 API -> eventlet back into trunk, fixing the bits that I missed when I put it into trunk on 9/21.
    
    Note that some of this got into trunk via r291 accidentally because r291 was a branch based off of the trunk that was reverted on 9/22.

commit 203cd3f34cf40d5597f9791083096d70c2c3edc7
Merge: 4846b63 a706328
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 17:06:46 2010 -0400

    Merge vishy's patch: admin-user-not-admin-role

commit a70632890c610ece766bfd3c31eea4bc6eb4a316
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 17:06:23 2010 -0400

    Apply vish's patch

 nova/api/ec2/__init__.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 4846b63a861ee7eafc642dc93f70fa8b85dfa625
Merge: c29c68f 2b30ffe
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 16:21:02 2010 -0400

    Merge lp:~eday/nova/endpoint-cleanup

commit 2b30ffe2f3c79e3701487d18fe1d4eef671aa335
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 13:18:40 2010 -0700

    Applied vish's fixes.

 nova/api/ec2/metadatarequesthandler.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 2b2313d5c2fad31d36ac75dbad48773e7538cf1e
Merge: 421d7a9 fc5d09f
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 20:13:23 2010 +0000

    Implementation of Rackspace token based authentication for the Openstack API.
    
    This is a re-proposal of a merge earlier that was failing to merge no matter what I tried, so this is the next option in a series of failures. All tests pass locally.

commit 065257fb0686d848fcf20235a4e04b76872a5b01
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 12:43:41 2010 -0700

    fixed a few missing params from iptables rules

 nova/network/linux_net.py |    4 ++--
 nova/service.py           |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

commit fc5d09f4d294b0c176a40632a1848a1069596375
Merge: ca854c7 378970b
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 19:31:17 2010 +0000

    Merge fix from Soren

commit 81fc2078ca3d3e07728a39b6cdec47af871f2f2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 12:20:40 2010 -0700

    removed extra line in manage

 nova/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 564105a3f0087f31a879460d70e73bc358e0e8c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 12:18:56 2010 -0700

    made use of nova_ chains a flag and fixed a few typos

 nova/network/linux_net.py |   46 +++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

commit 47a957acb176d108aac4183cbf5a882149d7462d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:58:33 2010 -0700

    put setup_iptables in the right dir

 setup_iptables.sh       |   94 -----------------------------------------------
 tools/setup_iptables.sh |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 94 deletions(-)

commit a6954efa3155868d31163236aa9e44f693f51b30
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 11:56:44 2010 -0700

    Fixed rpc consumer to use unique return connection to prevent overlap. This could be reworked to share a connection, but it should be a wait operation and not a fast poll like it was before. We could also keep a cache of opened connections to be used between requests.

 nova/rpc.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 44a3fe22d72f7359f57e7eb9ce443c974391991c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:40:09 2010 -0700

    fixed a couple of typos

 nova/manager.py         |    3 ++-
 nova/network/manager.py |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit ca854c764a21985fd07becf7b0686f5d00125851
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:29:40 2010 +0000

     Re-added the ramdisk line I accidentally removed

 nova/db/sqlalchemy/models.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 020f1a304c15db3086169efe67994ca59ca04e0c
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:29:17 2010 +0000

    Added a primary_key to AuthToken, fixed some unbound variables, and now all unit tests pass

 nova/api/rackspace/auth.py   |    5 ++++-
 nova/db/sqlalchemy/models.py |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 94b9d491d4f691f7ede3c0d5d8ca98288af1646f
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:28:49 2010 +0000

    Missed the model include, and fixed a broken test after the merge

 nova/db/sqlalchemy/models.py            |    3 ++-
 nova/tests/api/rackspace/auth.py        |    2 ++
 nova/tests/api/rackspace/test_helper.py |    8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

commit 301b4a58347d1f74a1935c0b7aa63e19b12e1ba7
Merge: 0b45eea 0880e49
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:28:15 2010 +0000

    Some more refactoring and another unit test

commit 0b45eea603c85ad0bee77c9668c1cda41eeebaa2
Merge: 4960342 64dd300
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:27:56 2010 +0000

     Refactored the auth branch based on review feedback

commit 4960342b47b3692314439f1a828e5739da1f0bcd
Merge: d6104d8 11b934f
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:26:06 2010 +0000

    Replaced the existing Rackspace Auth Mechanism with one that mirrors the implementation in the design document.

commit 6460a2e9f808c2200274fc41777b6ceaed182d82
Merge: c9ac49b c29c68f
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 11:24:26 2010 -0700

    Merged gundlach's branch.

commit 4f2edd43ca2c4a175b4d9dce23ae9e28941122e2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:23:32 2010 -0700

    renamed ipchains to iptables

 setup_iptables.sh       |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/setup_ipchains.sh |   94 -----------------------------------------------
 2 files changed, 94 insertions(+), 94 deletions(-)

commit 1afc0995bc77fbbb7f724e5086762f64ddc53c31
Merge: e74b807 e6c1c9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:22:44 2010 -0700

    merged trunk

commit c9ac49b2425b932f60a87da80887d4556806ca60
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 11:21:14 2010 -0700

    Fixed cloudpipe lib init.

 nova/api/cloudpipe/__init__.py |    1 +
 nova/cloudpipe/pipelib.py      |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit e6c1c9dcef9f57930783a64ecb0595ba8e714c4c
Merge: cb311a3 e74b807
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:20:25 2010 -0700

    merged fix-iptables

commit 421d7a90ea33e80f92039eefaf920c96ae9773cb
Merge: ce0a9b7 08622cb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 17:33:17 2010 +0000

    When calculating timedeltas make sure both timestamps are in UTC.
    For people ahead of UTC, it makes the scheduler unit tests pass.
    For people behind UTC, it makes their services time out after 60 seconds without a heart beat rather than X hours and 60 seconds without a heart beat (where X is the number of hours they're behind UTC).

commit c29c68f0fa27fa81f22ca42958bbd564f719f3ae
Merge: be28879 f3f2716
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:45:21 2010 -0400

    Merge lp:~gundlach/nova/rbac_tests_rewrite

commit be2887915623e4f071e8de9f4bd9acc299e3f078
Merge: 9066931 d98c663
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:31:06 2010 -0400

    Merge lp:~gundlach/nova/missing_ec2_url_endpoints

commit 90669318581554a72890a6fd9c6837deb86c7e4c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:19:27 2010 -0400

    Spot-fix endpoint reference

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7aae55db904f9ed648cb80f78a9d4d8f266b4eaf
Merge: 24f589d ebf71b0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:05:49 2010 -0400

    Merge lp:~soren/nova/nova-api-new-daemonize

commit ebf71b08efc6ab3c590f71715aa16b925f17c38e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 15:47:29 2010 +0200

    Wrap WSGI container in server.serve to make it properly handle command line arguments as well as daemonise properly. Moved api and wsgi imports in the main() function to delay their inclusion until after python-daemon has closed all the file descriptors. Without this, eventlet's epoll fd gets opened before daemonize is called and thus its fd gets closed leading to very, very, very confusing errors.

 bin/nova-api-new |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit 24f589d421be9a15ad941c34128b4fa0bdc28db4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 09:13:27 2010 -0400

    Apply vish's patch

 bin/nova-api-new |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d98c663d3e521d45586ed3922d93e0ca612a5639
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 09:06:45 2010 -0400

    Added FLAGS.FAKE_subdomain letting you manually set the subdomain for testing on localhost.

 nova/api/__init__.py |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

commit fed57c47da49a0457fce8fec3b59c9142e62785e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 13:59:33 2010 +0200

    Address Vishy's comments.

 nova/api/ec2/cloud.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 08622cb48c200aa27e214fb14e47a741069b9bb0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 04:24:54 2010 -0500

    All timestamps should be in UTC. Without this patch, the scheduler unit tests fail for anyone sufficiently East of Greenwich.

 nova/scheduler/driver.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 378970b1495840a2a193dbecc3f9bb8701237744
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 11:06:49 2010 +0200

    Compare project_id to '' using == (equality) rather than 'is' (identity). This is needed because '' isn't the same as u''.

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 54122c0a156d1562be76dfde41bd62006f9ed426
Author: Eric Day <eday@oddments.org>
Date:   Wed Sep 22 17:54:57 2010 -0700

    Various loose ends for endpoint and tornado removal cleanup, including cloudpipe API addition, rpc.call() cleanup by removing tornado ioloop, and fixing bin/* programs. Tornado still exists as part of some test cases and those should be reworked to not require it.

 bin/nova-api                   |   47 +++++++++------------------
 bin/nova-api-new               |   45 --------------------------
 bin/nova-manage                |    3 +-
 nova/api/__init__.py           |    2 ++
 nova/api/cloudpipe/__init__.py |   68 ++++++++++++++++++++++++++++++++++++++++
 nova/cloudpipe/api.py          |   59 ----------------------------------
 nova/cloudpipe/pipelib.py      |    3 +-
 nova/rpc.py                    |   34 ++++++++++----------
 nova/tests/cloud_unittest.py   |    1 -
 9 files changed, 105 insertions(+), 157 deletions(-)

commit f188b5a02d34751e89fae60b4d3b1ef144f138d7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 22 19:11:04 2010 -0400

    Re-add root and metadata request handlers to EC2 API

 nova/api/__init__.py                   |   56 +++++++++++++++++++++++--
 nova/api/ec2/metadatarequesthandler.py |   71 ++++++++++++++++++++++++++++++++
 nova/tests/api/__init__.py             |   30 ++++++++++++--
 3 files changed, 149 insertions(+), 8 deletions(-)

commit 9e12753508474b430c1b87fd7d59dcbc2d096042
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Sep 22 21:57:34 2010 +0000

    Re-added the ramdisk line I accidentally removed

 nova/db/sqlalchemy/models.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6f82d0f84c9474e72ef70c9ff568d68031191e0a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 22 17:35:02 2010 -0400

    Soren's patch to fix part of ec2

 nova/api/ec2/apirequest.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit efbf068936f95697d85439b10c8c12fbd5534985
Merge: 71c4133 ce0a9b7
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 22 17:04:25 2010 -0400

    Merge nova/trunk.

commit 71c41338e4aac98ec03eec1c90ee99e43d51bcb7
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 22 16:42:35 2010 -0400

    Add user display fields to instances & volumes.

 nova/db/sqlalchemy/models.py |    9 ++++++++-
 nova/endpoint/cloud.py       |   32 +++++++++++++++++++++++++++++++
 nova/tests/cloud_unittest.py |   43 +++++++++++++++++++++++++++++++++++++-----
 3 files changed, 78 insertions(+), 6 deletions(-)

commit 20691ddc29f6808652a4dd537037f464e1f869fe
Merge: 41fa605 e78273f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 22:16:12 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit f3f271644eac4ec74ce3786840a7743aac4f6032
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 22 15:57:24 2010 -0400

    Responding to eday's feedback -- make a clearer inner wsgi app

 nova/tests/access_unittest.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 41fa6058f9eecc1492833846acfc1bb8762aecc2
Merge: d42e168 d6104d8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 21:36:15 2010 +0200

    Merge trunk.

commit a8c5901faaa98b7f0c06db086a03a0d38a210986
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Sep 22 18:46:55 2010 +0000

    Added a primary_key to AuthToken, fixed some unbound variables, and now all unit tests pass

 nova/api/rackspace/auth.py   |    5 ++++-
 nova/db/sqlalchemy/models.py |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit d3e090f15df793518db274b9834a17de78f765ff
Merge: 7a19f6f d6104d8
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Sep 22 18:33:05 2010 +0000

    merge from trunk

commit d42e168763d232476407a07b79056fb745c6075e
Merge: 28336ed 4e727fa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 13:26:36 2010 +0200

    Merge trunk

commit e78273f72640eb9cbd1797d8d66dc41dcb96bee0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 16:43:32 2010 -0700

    typo in instance_get

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 169ac33d89e0721c3e5229f2c58b799b64f1b51d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 16:32:07 2010 -0700

    typo in instance_get

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b68ab98d6718d5a7237f5620e8caffc770dfe822
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 21 19:24:19 2010 -0400

    User updatable name & description for images.

 nova/endpoint/cloud.py             |   12 ++++++++++++
 nova/endpoint/images.py            |    6 ++++++
 nova/objectstore/handler.py        |   19 +++++++++++++++----
 nova/objectstore/image.py          |   12 ++++++++++++
 nova/tests/cloud_unittest.py       |   26 +++++++++++++++++++++++++-
 nova/tests/objectstore_unittest.py |    6 ++++++
 6 files changed, 76 insertions(+), 5 deletions(-)

commit 8a259380170a55a7c3180780b849c84b52f2aecf
Merge: 9196b74 d6104d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 15:57:03 2010 -0700

    merged trunk and fixed errors

commit f3698b8da4bd63abfade32c9894ac2095672344e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 15:44:49 2010 -0700

    cleaned up exception handling for fixed_ip_get

 nova/db/sqlalchemy/api.py |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

commit d642716db42b229e879f6f4673f166beb8d55faa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 17:12:53 2010 -0500

    Added server index and detail differentiation

 nova/api/rackspace/__init__.py |    3 ++-
 nova/api/rackspace/servers.py  |   18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

commit a39c49d1b2f011b022662ef483252b91800c6f2e
Merge: 892e557 d6104d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 14:57:37 2010 -0700

    merged trunk

commit 2b2d9b3190ca19fa77121faf1351c9af7ad78866
Merge: e3c7f34 ce0a9b7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 16:45:44 2010 -0500

    Merge from trunk

commit b68b73d08155483d19f4088baa6a4ffe73ef5f1d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 14:36:06 2010 -0700

    typo s/an/a

 bin/nova-manage            |    2 +-
 nova/tests/rpc_unittest.py |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

commit ffa426d68bfb3d1c2acaeef4c48d2662e88fc878
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 16:58:08 2010 -0400

    Reenable access_unittest now that it works with new rbac

 run_tests.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 84fbfe09e10b330a5668e99422247801f370d0f9
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 16:57:08 2010 -0400

    Rewrite rbac tests to use Authorizer middleware

 doc/source/auth.rst           |    8 ---
 nova/api/ec2/__init__.py      |    3 ++
 nova/auth/manager.py          |    4 +-
 nova/tests/access_unittest.py |  108 ++++++++++++++++-------------------------
 4 files changed, 47 insertions(+), 76 deletions(-)

commit 7a19f6f3978fc0942d5bc51a1ad3299968a4d215
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 15:46:19 2010 -0500

    Missed the model include, and fixed a broke test after the merge

 nova/db/sqlalchemy/models.py            |    3 ++-
 nova/tests/api/rackspace/auth.py        |    2 ++
 nova/tests/api/rackspace/test_helper.py |    8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

commit d6104d8302057d45fa150079b5911f941cc311ce
Merge: ce0a9b7 b82a9e3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 19:13:05 2010 +0000

    Delete nova.endpoint module, which used Tornado to serve up the Amazon EC2 API.
    Replace it with nova.api.ec2 module, which serves up the same API via a WSGI app in Eventlet.
    Convert relevant unit tests from Twisted to eventlet.
    
    The unit tests now pass using eventlet 0.9.12 -- you'll need to 'pip install -U eventlet' or rebuild your venv.
    
    Note that I tried to do this in discrete commits, so you may find it easier to look at each small diff than to try to grok the whole merge diff.

commit b82a9e3d3ca46e69a1583dea51a474456b867e6f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 15:00:43 2010 -0400

    Remove eventlet test, now that eventlet 0.9.10 has indeed been replaced by 0.9.12 per mtaylor

 nova/tests/api_unittest.py |    2 --
 1 file changed, 2 deletions(-)

commit e027342cc647db080ee77de53b22126caf958339
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 14:34:40 2010 -0400

    In desperation, I'm raising eventlet.__version__ so I can see why the trunk tests are failing.

 nova/tests/api_unittest.py |    2 ++
 1 file changed, 2 insertions(+)

commit 2e258a97d73aa9c08e4d6d6be364b97d1d3f97c0
Merge: 6186634 ce0a9b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 11:12:34 2010 -0700

    merged trunk

commit 6186634c0f8d6a44323fe1f7b2530528a539c64c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 11:12:04 2010 -0700

    bpython is amazing

 bin/nova-manage |   51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 9 deletions(-)

commit dff6c134cb5b540ac1344faf9f0cbe7d19a8c9e7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 14:00:17 2010 -0400

    Fix quota unittest and don't run rbac unit tests for the moment

 nova/tests/api_unittest.py   |    3 ++-
 nova/tests/cloud_unittest.py |    5 ++---
 nova/tests/quota_unittest.py |   39 ++++++++++++++++++---------------------
 run_tests.py                 |    3 ++-
 4 files changed, 24 insertions(+), 26 deletions(-)

commit 7ca89890200a8a714fb90c7c05e28c51f04e2269
Merge: 0880e49 ce0a9b7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 11:02:33 2010 -0500

    Merge from trunk and resolving merge conflicts

commit bbf17139fc7fbc9fc3acd336b3c5c5df97dcf408
Merge: 9ea2011 ce0a9b7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 12:00:44 2010 -0400

    Merge from trunk

commit 5960041b73724734de548dd279595b793e02f809
Merge: 10be00e ce0a9b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 08:30:53 2010 -0700

    merged trunk

commit 0880e49a4e9c9a246e8f4d7cc805d79947de095a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 10:07:59 2010 -0500

    Some more refactoring and another unit test

 nova/api/rackspace/auth.py              |   17 ++++++++---
 nova/db/api.py                          |    4 +--
 nova/db/sqlalchemy/api.py               |    2 +-
 nova/tests/api/rackspace/auth.py        |   51 +++++++++++++++----------------
 nova/tests/api/rackspace/test_helper.py |   29 +++++++++++-------
 5 files changed, 58 insertions(+), 45 deletions(-)

commit ce0a9b7b36ba816c347f10a1804aedf337ad35da
Merge: 4e727fa 435a78e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 13:48:25 2010 +0000

    Implements quotas with overrides for instances, volumes, and floating ips.

commit e74b8070f73d8bada01cfe2d26223e5180ab67fb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 21 00:03:53 2010 -0700

    Renamed cc_ip flag to cc_host

 nova/flags.py             |    4 ++--
 nova/network/linux_net.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 4e727faf450154d89687b1a33dae2159d5b691a0
Merge: 8a841dd 026f6f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 05:08:31 2010 +0000

    Moves keypairs out of ldap and into the common datastore.

commit 8a841dd6d5ea21e28c2396b1f7a0a24923a56202
Merge: bc09d0e 06a799d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 04:23:48 2010 +0000

    Fixes server error on get metadata when instances are started without keypairs.

commit bc09d0e99c6acae3a0f627a26f302391eea797a5
Merge: 8e3508e ce1a808
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 21 04:08:25 2010 +0000

    allows api servers to have a list of regions, allowing multi-cluster support if you have a shared image store and user database.

commit ce1a8086f7ec947dd148855910a1a5a9696e33f7
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Sep 20 23:56:17 2010 -0400

    Don't use something the shell will escape as a separator.  | is now =.

 nova/endpoint/cloud.py |    2 +-
 nova/flags.py          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 8e3508e0109973056e7fd78809ef7ea94d949168
Merge: d8861d0 9330ebc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 03:53:46 2010 +0000

    Added modify project command to auth manager to allow changing of project manager and description.

commit 435a78e48ca63297af9c15ee826dbe0c6b8e7813
Merge: 86cd30b d8861d0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 19:19:28 2010 -0700

    merged trunk

commit 026f6f2b7f5457f15a258ebed66bb8dda3263eec
Merge: c791229 d8861d0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 19:17:36 2010 -0700

    merged trunk

commit 64dd3000c4a9b88719e86d1090097e35398d3838
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 20 18:04:57 2010 -0500

    Refactored the auth branch based on review feedback

 nova/api/rackspace/__init__.py          |   33 ++-------
 nova/api/rackspace/auth.py              |  117 ++++++++++++++++++++++---------
 nova/db/api.py                          |   15 ++++
 nova/db/sqlalchemy/api.py               |   23 ++++++
 nova/db/sqlalchemy/models.py            |   14 +++-
 nova/tests/api/rackspace/auth.py        |   84 ++++++++++++++--------
 nova/tests/api/rackspace/test_helper.py |   66 +++++++++--------
 7 files changed, 225 insertions(+), 127 deletions(-)

commit 68633fadeb92a5a26d1ab613bed6094ddfa2a014
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Sep 20 15:35:44 2010 -0700

    Whitespace fixes

 nova/endpoint/api.py      |    1 -
 nova/flags.py             |    1 -
 nova/network/linux_net.py |    1 -
 nova/network/manager.py   |    1 -
 nova/service.py           |    1 -
 5 files changed, 5 deletions(-)

commit 9ea20110ae05a0bd5294774c2ee11626e9c4147f
Merge: 8fb32a9 d8861d0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 18:30:35 2010 -0400

    Merge from trunk

commit d8861d04a85044ae57ffd7eb9ab682879beecf7d
Merge: b9b65e7 fc93548
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 21:38:38 2010 +0000

    Support querying version list, per the RS API spec.  Fixes bug 613117.

commit fc93548e99dea561dbf2f198b0fccc84467dbf8b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 17:02:32 2010 -0400

    Undo run_tests.py modification in the hopes of making this merge

 run_tests.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 8fb32a956490f9de623fad12d9b2b1f08f88511a
Merge: 8e304fe cda407f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 15:36:45 2010 -0400

    Merge from trunk

commit b9b65e76858f4a154b9e6bd8ff7cb1a715696894
Merge: cda407f 5cd8cd6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 19:03:59 2010 +0000

    Add a RateLimitingMiddleware to the Rackspace API, implementing the rate limits as defined by the current Cloud Servers spec.  The Middleware can do rate counting in memory, or (for deployments that have more than one API Server) can offload to a rate limiting service.
    
    Also adds a:
     - Limiter (basic rate counting object)
     - WSGIApp (serving up a Limiter behind a standalone RESTful application)
     - WSGIAppProxy (drop-in replacement for a Limiter which the Middleware uses when configured to offload to a service)
    
    Note that the nova.api.rackspace.ratelimiting package will be moved to PyPI after Austin, which is why it contains tests in its own directory instead of in nova.tests.  We added the ratelimiting package directly into OpenStack for expediency with the approaching Austin deadline.

commit 5cd8cd6e71dd8fdc66a31f12e8a5248e81529e38
Merge: f200587 ae760b1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 14:52:49 2010 -0400

    Merge from other branch where I accidentally applied this

commit ae760b13c5382f2f4719dde445235c156cc27d18
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 14:49:05 2010 -0400

    Use assertRaises

 nova/api/rackspace/ratelimiting/tests.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit cda407fa0eff533e3aae7d3bf7276e0013a8a13d
Merge: 1c86ede 7f66623
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Sep 20 13:40:42 2010 +0000

    A small fix to the install_venv program to allow us to run it on the tarmac box as part of the tarmac build.

commit 1c86ede78e75f82825fa5d135451d5f2bed65def
Merge: bad6dcb 6cbf8b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 13:38:26 2010 +0000

    Removes second copy of ProcessExecutionError that creeped in during a bad merge.

commit bad6dcb068834a0698850a857f8835dfb66a4311
Merge: 6d06693 2774466
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 13:13:14 2010 +0000

    Adds an omitted yield in compute manager detach_volume.

commit 6805d7d4a03b977ca7ef99da2a59a486672d8995
Merge: a3d003d 6d06693
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 20 12:43:50 2010 +0200

    Merge trunk

commit a3d003d7ec92f3ae23a667954a790c71efdbfdbe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 20 11:46:18 2010 +0200

    Move the code that extracts the console output into the virt drivers. Move the code that formats it up into the API layer. Add support for Xen console.

 nova/compute/manager.py   |   18 +-----------------
 nova/endpoint/cloud.py    |   15 ++++++++++-----
 nova/virt/fake.py         |    2 ++
 nova/virt/libvirt_conn.py |   40 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/xenapi.py       |    3 +++
 5 files changed, 56 insertions(+), 22 deletions(-)

commit 75a1815aa2724d64d1f487996265ba9136017029
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 20 11:33:35 2010 +0200

    Add Xen template and use it by default if libvirt_type=xen.

 nova/virt/libvirt.xen.xml.template |   30 ++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py          |    8 +++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

commit c524508bc58aa561b81c3133526c981cce835a59
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 01:50:08 2010 -0700

    added rescue mode support and made reboot work from any state

 nova/compute/manager.py                    |   37 ++++++++---
 nova/virt/fake.py                          |   12 ++++
 nova/virt/libvirt.rescue.qemu.xml.template |   33 ++++++++++
 nova/virt/libvirt.rescue.uml.xml.template  |   26 ++++++++
 nova/virt/libvirt_conn.py                  |   94 +++++++++++++++++++++++-----
 5 files changed, 179 insertions(+), 23 deletions(-)

commit 6d0669374c64ac65dd194bec9422a638cf939cad
Merge: e432c89 5373a72
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 03:13:11 2010 +0000

    Adds timing fields to instances and volumes to track launch times and schedule times.

commit e432c89a8cec8097bd6208cb299569698e24f639
Merge: 626622b 5b9908f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 02:33:28 2010 +0000

    Fixes two errors in cloud.py in the nova_orm branch:
    a) self.network is actually called network_manager
    b) the logic for describe-instances check on is_admin was reversed

commit 626622b8982888e50c40193839c6fe9a4a0158c9
Merge: c2c1139 c7921fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 01:38:17 2010 +0000

    Adds timing fields to instances and volumes to track launch times and schedule times.

commit 5ff47a4513c3b5a7f8f90c417e1e62113797de8c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Sep 19 18:23:41 2010 -0700

    updated docstring

 nova/flags.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f7bbaa83216dfdb298f460c771806ef1071113b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 20:36:13 2010 -0700

    add in a few comments

 nova/endpoint/admin.py       |    9 +++++----
 tools/ajaxterm/ajaxterm.html |    7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

commit c0c38f3c7f66232a98ba5ccd1687d4cbcc537549
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 20:02:36 2010 -0700

    s/\t/    /g, and add some comments

 tools/ajaxterm/ajaxterm.py | 1116 ++++++++++++++++++++++----------------------
 1 file changed, 558 insertions(+), 558 deletions(-)

commit 4ee5ef25dcaa9d4235e97972acdbbcbf5067d88c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:28:10 2010 -0700

    add in support for ajaxterm console access

 nova/adminclient.py    |   22 ++++++++++++++++++++++
 nova/endpoint/admin.py |   29 +++++++++++++++++++++++++++++
 nova/utils.py          |    4 ++++
 3 files changed, 55 insertions(+)

commit 7b74343f2be9b49c0c359e00c64cf26b3da1cf44
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:10:08 2010 -0700

    add security and session timeout to ajaxterm

 tools/ajaxterm/ajaxterm.html |    1 +
 tools/ajaxterm/ajaxterm.js   |    2 +-
 tools/ajaxterm/ajaxterm.py   |   34 ++++++++++++++++++++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)

commit 81f71efdcbeabd8a67054b6e9e432175ea47d785
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:08:22 2010 -0700

    initial commit of ajaxterm

 tools/ajaxterm/README.txt             |  120 +++
 tools/ajaxterm/ajaxterm.1             |   35 +
 tools/ajaxterm/ajaxterm.css           |   64 ++
 tools/ajaxterm/ajaxterm.html          |   19 +
 tools/ajaxterm/ajaxterm.js            |  279 +++++++
 tools/ajaxterm/ajaxterm.py            |  567 ++++++++++++++
 tools/ajaxterm/configure              |   32 +
 tools/ajaxterm/configure.ajaxterm.bin |    2 +
 tools/ajaxterm/configure.initd.debian |   33 +
 tools/ajaxterm/configure.initd.gentoo |   27 +
 tools/ajaxterm/configure.initd.redhat |   75 ++
 tools/ajaxterm/configure.makefile     |   20 +
 tools/ajaxterm/qweb.py                | 1356 +++++++++++++++++++++++++++++++++
 tools/ajaxterm/sarissa.js             |  647 ++++++++++++++++
 tools/ajaxterm/sarissa_dhtml.js       |  105 +++
 15 files changed, 3381 insertions(+)

commit 11b934f75ac4359b75f246fd9babfc3363a9a396
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 16 14:41:51 2010 -0500

    Replaced the existing Rackspace Auth Mechanism with one that mirrors the implementation in the design document.

 nova/api/rackspace/__init__.py          |   52 +++++++++++++++-----
 nova/api/rackspace/auth.py              |   37 ++++++++++++++
 nova/tests/api/rackspace/auth.py        |   81 +++++++++++++++++++++++++++++++
 nova/tests/api/rackspace/test_helper.py |   52 ++++++++++++++++++++
 4 files changed, 211 insertions(+), 11 deletions(-)

commit d0708205759880e7fb78fbb1df33df939f669413
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 16 11:44:51 2010 -0700

    Whitespace fixes

 bin/nova-manage |    1 -
 nova/manager.py |    3 ---
 2 files changed, 4 deletions(-)

commit e1ddec70bc7522a75b4a50953a0f4b20ace6cce1
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 16 11:40:04 2010 -0700

    Added missing masquerade rules

 nova/network/linux_net.py |    2 ++
 1 file changed, 2 insertions(+)

commit 8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 16 12:39:35 2010 -0400

    Fix things not quite merged perfectly -- all tests now pass

 nova/api/ec2/cloud.py          |    2 +-
 nova/tests/network_unittest.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit c2c113917d3e354f85d473a6d646688b59abad17
Merge: e21c310 603c8f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 16 16:03:36 2010 +0000

    Better error message on the failure of a spawned process, and it's a ProcessExecutionException irrespective of how the process is run (twisted or not)

commit a458a5a6987f151403aa8d4fbc9440396712e3d7
Merge: 29bf1a6 e21c310
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 16 11:33:42 2010 -0400

    Merge from trunk (pulling in orm_deux)

commit bc2641148359352ed83d4190baaf1e208e00a6b9
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 15 17:49:15 2010 -0700

    Added iptables host initial configuration

 nova/network/manager.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 01a757ee7bc3624c17dbbcfd3bc65d3e2f674b03
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 15 17:40:12 2010 -0700

    Added iptables host initial configuration

 bin/nova-manage           |    1 +
 nova/endpoint/api.py      |    3 +-
 nova/flags.py             |    5 ++-
 nova/manager.py           |   10 +++++
 nova/network/linux_net.py |   44 ++++++++++++++-------
 nova/network/manager.py   |    7 ++++
 nova/service.py           |    1 +
 tools/setup_ipchains.sh   |   94 +++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 148 insertions(+), 17 deletions(-)

commit e21c310ced6992cf2eb33b372cd4e5e69a79d140
Merge: 433d83a fe78b36
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 15 21:23:26 2010 +0000

    Proposing merge to get feedback on orm refactoring.  I am very interested in feedback to all of these changes.
    
    This is a huge set of changes, that touches almost all of the files.  I'm sure I have broken quite a bit, but better to take the plunge now than to postpone this until later.  The idea is to allow for pluggable backends throughout the code.
    
    Brief Overview
    For compute/volume/network, there are multiple classes
    service - responsible for rpc
      this currently uses the existing cast and call in rpc.py and a little bit of magic
      to call public methods on the manager class.
      each service also reports its state into the database every 10 seconds
    manager - responsible for managing respective object classes
      all the business logic for the classes go here
    db (db_driver) - responsible for abstracting database access
    driver (domain_driver) - responsible for executing actual shell commands and implementation
    
    Compute hasn't been fully cleaned up, but to get an idea of how it works, take a look
    at volume and network
    
    Known issues/Things to be done:
    
    * nova-api accesses db objects directly
      It seems cleaner to have only the managers dealing with their respective objects.  This would
      mean code for 'run_instances' would move into the manager class and it would do the initial
      setup and cast out to the remote service
    
    * db code uses flat methods to define its interface
      In my mind this is a little prettier as an abstract base class, but driver loading code
      can load a module or a class.  It works, so I'm not sure it needs to be changed but feel
      free to debate it.
    
    * Service classes have no code in them
      Not sure if this is a problem for people, but the magic of calling the manager's methods is
      done in the base class.  We could remove the magic from the base class and explicitly
      wrap methods that we want to make available via rpc if this seems nasty.
    
    * AuthManager Projects/Users/Roles are not integrated into this system.
      In order for everything to live happily in the backend, we need some type
      of adaptor for LDAP
    
    * Context is not passed properly across rabbit
      Context should probably be changed to a simple dictionary so that it can be
      passed properly through the queue
    
    * No authorization checks on access to objects
      We need to decide on which layer auth checks should happen.
    
    * Some of the methods in ComputeManager need to be moved into other layers/managers
    * Compute driver layer should be abstracted more cleanly
    * Flat networking is untested and may need to be reworked
    * Some of the api commands are not working yet
    * Nova Swift Authentication needs to be refactored(Todd is working on this)

commit 7437df558f3277e21a4c34a5b517a1cae5dd5a74
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 17:17:20 2010 -0400

    Support querying version list

 nova/api/__init__.py       |   13 +++++++++++++
 nova/tests/api/__init__.py |    5 +++--
 run_tests.py               |    4 +++-
 tools/pip-requires         |    4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

commit f200587ce068482ab94e777154de3ac777269fa0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 13:54:38 2010 -0400

    Add support for middleware proxying to a ratelimiting.WSGIApp, for deployments that use more than one API Server and thus can't store ratelimiting counters in memory.

 nova/api/rackspace/__init__.py              |   29 ++++--
 nova/api/rackspace/ratelimiting/__init__.py |   21 +++-
 nova/api/rackspace/ratelimiting/tests.py    |  140 ++++++++++++++++++++++++---
 nova/tests/api/rackspace/__init__.py        |    8 ++
 4 files changed, 173 insertions(+), 25 deletions(-)

commit fd4d5787d5b6f6e550d33c13eb76f4562a87a118
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 11:23:08 2010 -0400

    Test the WSGIApp

 nova/api/rackspace/ratelimiting/__init__.py |    2 +-
 nova/api/rackspace/ratelimiting/tests.py    |   69 ++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

commit 29bf1a618658b20797bf208385bea9b92419e967
Merge: 2b87ea1 433d83a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 09:31:23 2010 -0400

    Merge from trunk

commit 63ad073efd0b20f59f02bc37182c0180cac3f405
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 09:25:53 2010 -0400

    RateLimitingMiddleware tests

 nova/api/rackspace/__init__.py           |   24 +++++++++-----
 nova/api/rackspace/ratelimiting/tests.py |    3 ++
 nova/tests/api/rackspace/__init__.py     |   51 +++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 26 deletions(-)

commit 28336ed41e0d44d7600588a6014f6253e4b87a42
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 14:27:34 2010 +0200

    Address a couple of the TODO's: We now have half-decent input validation for AuthorizeSecurityGroupIngress and RevokeDitto.

 nova/endpoint/cloud.py |   95 ++++++++++++++++++++++--------------------------
 nova/exception.py      |    3 ++
 2 files changed, 46 insertions(+), 52 deletions(-)

commit 9196b74080d5effd8dcfacce9de7d2dd37fcba1b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 14:04:07 2010 +0200

    Clean up use of ORM to remove the need for scoped_session.

 nova/db/api.py                |    6 +++---
 nova/db/sqlalchemy/api.py     |    9 +++++----
 nova/db/sqlalchemy/session.py |    4 ++--
 nova/endpoint/cloud.py        |    4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

commit 0cb25fddcad2626ce617f5c2472cea1c02f1d961
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 13:56:17 2010 +0200

    Roll back my slightly over-zealous clean up work.

 nova/auth/manager.py   |    4 ++--
 nova/endpoint/cloud.py |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 62871e83ba9b7bd8b17a7c457d8af7feb18853ea
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 12:05:37 2010 +0200

    More ORM object cleanup.

 nova/endpoint/cloud.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit faebe1ecd4aec4e2050a12f191266beadc468134
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 12:01:08 2010 +0200

    Clean up use of objects coming out of the ORM.

 nova/auth/manager.py   |   12 ++++++------
 nova/endpoint/api.py   |    1 -
 nova/endpoint/cloud.py |   18 +++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

commit 8138a35d3672e08640762b7533c1c527568d0b4f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 14 18:59:02 2010 -0400

    RateLimitingMiddleware

 nova/api/rackspace/__init__.py       |   52 ++++++++++++++++++++++++++++++-
 nova/tests/api/rackspace/__init__.py |   56 ++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)

commit 3d68f1f74cd7fe6ddb9eec003a9e31f8ad036b27
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 14 16:26:19 2010 -0400

    Add ratelimiting package into Nova.  After Austin it'll be pulled out into PyPI.

 nova/api/rackspace/ratelimiting/__init__.py |  103 +++++++++++++++++++++++++++
 nova/api/rackspace/ratelimiting/tests.py    |   60 ++++++++++++++++
 2 files changed, 163 insertions(+)

commit 433d83a7e487b41ba4caa7aa5addfc7365975f0b
Merge: 0a1ddc6 f1e45e3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Sep 14 13:53:19 2010 +0000

    When destroying a VM using the XenAPI backend, if the VM is still running (the usual case) the destroy fails. It needs to be powered-off first.

commit 587b21cc00919cc29e2f815fc9de3e3ad6e6fa30
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:23:58 2010 +0200

    Leave out the network setting from the interfaces template. It does not get passed anymore.

 nova/virt/interfaces.template |    1 -
 1 file changed, 1 deletion(-)

commit b6932a9553e45c122af8a71f6300ac62381efb94
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:23:29 2010 +0200

    Network model has network_str attribute.

 nova/network/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 85dbf6162d7b22991389db397f9aa1871464737f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:22:56 2010 +0200

    Cast process input to a str. It must not be unicode, but stuff that comes out of the database might very well be unicode, so using such a value in a template makes the whole thing unicode.

 nova/process.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65113c4aa92fa5e803bbe1ab56f7facf57753962
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:20:08 2010 +0200

    Make refresh_security_groups play well with inlineCallbacks.

 nova/compute/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 01a041dd732ae9c56533f6eac25f08c34917d733
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:17:52 2010 +0200

    Fix up rule generation. It turns out nwfilter gets very, very wonky indeed
    if you mix <ip> rules and <tcp> rules. Setting a TCP rule adds an early rule
    to ebtables that ends up overriding the <ip> rules which are last in that
    table.

 nova/db/sqlalchemy/session.py |   11 ++++++-----
 nova/endpoint/cloud.py        |    3 +--
 nova/tests/virt_unittest.py   |    6 +++---
 nova/virt/libvirt_conn.py     |   41 +++++++++++++++++++++++++++--------------
 4 files changed, 37 insertions(+), 24 deletions(-)

commit 757088eb394552b0aaee61673b0af5094f01c356
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 13:22:17 2010 +0200

    Add a bunch of TODO's to the API implementation.

 nova/endpoint/cloud.py |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

commit 3fbbc09cbe2594e816803796e22ef39bcf02b029
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 13:01:57 2010 +0200

    Multiple security group support.

 nova/endpoint/cloud.py |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 0a1ddc6daa4b0f9948291975111ca268c3158ad0
Merge: 34fd557 ddd2565
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Sep 14 09:58:29 2010 +0000

    Remove power state constants that have ended up duplicated following a bad
    merge. They were moved from nova.compute.node.Instance into
    nova.compute.power_state at the same time that Instance was moved into
    nova.compute.service. We've ended up with these constants in both places.
    
    Remove the ones from service, in favour of the ones in power_state.

commit 0936150221713d775a5cad4a2e978980c32b21c1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Sep 13 23:56:32 2010 -0700

    now we can run files - thanks vish

 bin/nova-manage |    5 +++++
 1 file changed, 5 insertions(+)

commit 34fd5575ea2af2ff903fdd6369387d476c164f80
Merge: 5a5a926 cb13f09
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 18:48:18 2010 +0000

    Move vol.destroy() call out of the _check method in test_multiple_volume_race_condition test and into a callback of the DeferredList. This should fix the intermittent failure of that test. I /think/ test_too_many_volumes's failure was caused by test_multiple_volume_race_condition failure, since I have not been able to reproduce its failure after fixing this one.

commit 5a5a926f4ec0a9c57b7f5176bc1654a62735c6b6
Merge: 30cec54 c35f096
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Sep 13 18:43:36 2010 +0000

    Adds 'shell run' to nova manage, which spawns a shell with flags properly imported.

commit 2b87ea1ab445a5a9fb089acb0220189f736d420a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 13 12:02:50 2010 -0400

    Finish pulling S3ImageService out of this mergeprop

 nova/api/ec2/images.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit 5e02ee47c0e86986bb21f67a4d6556895de5d0ef
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 13 11:53:53 2010 -0400

    Pull S3ImageService out of this mergeprop

 nova/api/ec2/images.py |   34 ++++++++++++++++++++++++-------
 nova/image/service.py  |   52 ------------------------------------------------
 2 files changed, 27 insertions(+), 59 deletions(-)

commit 9c4b6612e65d548542b1bf37373200e4e6abc98d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 14:20:32 2010 +0200

    Correctly pass ip_address to templates.

 nova/virt/libvirt.qemu.xml.template |    4 ++--
 nova/virt/libvirt.uml.xml.template  |    4 ++--
 nova/virt/libvirt_conn.py           |    4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

commit b15bde79b71e474d96674c8eae4108ac9c063731
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 14:18:08 2010 +0200

    Fix call to listNWFilters

 nova/tests/virt_unittest.py |    2 +-
 nova/virt/libvirt_conn.py   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 077fc783c4f94de427da98818d262aeb09a31044
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 12:04:06 2010 +0200

    (Untested) Make changes to security group rules propagate to the relevant compute nodes.

 nova/compute/manager.py   |    5 +++++
 nova/endpoint/cloud.py    |   20 +++++++++++++++++---
 nova/virt/libvirt_conn.py |   37 ++++++++++++++++++++++++-------------
 3 files changed, 46 insertions(+), 16 deletions(-)

commit 2a782110bc51f147bdb35264445badac3b3e8e65
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 11:45:28 2010 +0200

    Filters all get defined when running an instance.

 nova/db/api.py                      |    5 ++
 nova/db/sqlalchemy/api.py           |   16 +++++-
 nova/db/sqlalchemy/models.py        |    1 -
 nova/tests/virt_unittest.py         |  101 ++++++++++++++++++++++++++++++-----
 nova/virt/libvirt.qemu.xml.template |    2 +-
 nova/virt/libvirt.uml.xml.template  |    2 +-
 nova/virt/libvirt_conn.py           |   74 +++++++++++++++++++++++--
 7 files changed, 179 insertions(+), 22 deletions(-)

commit 2774466197a0dda3763569fe7aa1a578baf5e059
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 13 02:15:02 2010 -0700

    added missing yield in detach_volume

 nova/compute/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 970654239267fc702f767bbaff3e22207576d0cd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 13 01:58:40 2010 -0700

    multiple network controllers will not create duplicate indexes

 nova/db/api.py               |    9 ++++++---
 nova/db/sqlalchemy/api.py    |    8 ++++++--
 nova/db/sqlalchemy/models.py |    2 +-
 nova/network/manager.py      |    2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

commit 86cd30b749e6da78d4ceb6c77f2116975429a81a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 13 01:15:35 2010 -0700

    renamed _get_quota to get_quota and moved int(size) into quota.py

 bin/nova-manage        |    2 +-
 nova/endpoint/cloud.py |    1 -
 nova/quota.py          |    9 +++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 50c3fd32b83b54e79e8efb9f1215c2c711972512
Merge: 531aaca f21d851
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 09:32:36 2010 +0200

    Merge nwfilter branch.

commit c35f0961a030ebefb19c0fbf4a666a0d6ce6be4c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Sep 13 00:06:32 2010 -0700

    add a shell to nova-manage, which respects flags (taken from django)

 bin/nova-manage |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

commit 531aaca158b7685e6069178162f1d83e6a5fb9e6
Merge: fffa02a f24f209
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 09:06:14 2010 +0200

    Merge Devin's security groups branch.

commit cb13f09d7fe886bc8340770ff8c7011b6dbab0db
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 09:03:14 2010 +0200

    Move vol.destroy() call out of the _check method in test_multiple_volume_race_condition test and into a callback of the DeferredList. This should fix the intermittent failure of that test. I /think/ test_too_many_volumes's failure was caused by test_multiple_volume_race_condition failure, since I have not been able to reproduce its failure after fixing this one.

 nova/tests/volume_unittest.py |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 6cbf8b736cc2c9929c2ad69ddc8e8b4fc2d0f4ae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 23:09:15 2010 -0700

    removed second copy of ProcessExecutionError

 nova/utils.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 892e55724e8265865a1b298e478d98acd42c68d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 22:12:24 2010 -0700

    move the warnings about leasing ips

 nova/network/manager.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit dbb3358f851c245ccb5ea9a9c7ace636b4e73a80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:25:15 2010 -0700

    simplified query

 nova/db/sqlalchemy/api.py |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

commit 8e5a2ab3614da2676a3627cf62fedfedf7f3585c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:16:52 2010 -0700

    missed a space

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3f9118b2ae025cd707642b179fe58459dd39dbc3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:06:59 2010 -0700

    set leased = 0 as well on disassociate update

 nova/db/sqlalchemy/api.py |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

commit cb2a28d82210e43a221a8fa8f2a03a7dbd6e8779
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 17:56:28 2010 -0700

    speed up the query and make sure allocated is false

 nova/db/sqlalchemy/api.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit efeb5243ffd5e588748d8786ac82a04e302f0612
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 17:24:06 2010 -0700

    workaround for mysql select in update

 nova/db/sqlalchemy/api.py |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit e76fe31644ab616dbde14e1b2063ab8419410404
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 16:02:22 2010 -0700

    Periodic callback for services and managers.  Added code to automatically disassociate stale ip addresses

 nova/db/api.py                 |    5 +++++
 nova/db/sqlalchemy/api.py      |   14 ++++++++++++++
 nova/manager.py                |    6 ++++++
 nova/network/manager.py        |   37 +++++++++++++++++++++++++------------
 nova/service.py                |   24 ++++++++++++++++++++----
 nova/tests/service_unittest.py |    9 +++++++--
 6 files changed, 77 insertions(+), 18 deletions(-)

commit 10be00e16c6428bf3709590f13984246fdfaf14b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 08:16:59 2010 -0700

    fixed typo

 nova/volume/driver.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ee766c9c8164ff526a9518c668ba08be4786ac35
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 08:06:44 2010 -0700

    flag for retries on volume commands

 nova/volume/driver.py |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

commit 0fd7cb594e5482d78fed8a026a24c4e1c8dac3bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:37:03 2010 -0700

    auto all and start all exceptions should be ignored

 nova/volume/driver.py |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

commit 517348e33b8cc50e6a0d09f9112b7daab55b132c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:24:31 2010 -0700

    generalized retry into try_execute

 nova/volume/driver.py |   59 +++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

commit f201f562fe79d09b0bbad42c4630ec8e4c76bf06
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:04:36 2010 -0700

    more error handling in volume driver code

 nova/volume/driver.py |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

commit 83a6767ab7be871fd269bf409f819033378e4ea9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:37:08 2010 -0700

    handle exceptions thrown by vblade stop and vblade destroy

 nova/volume/driver.py |   29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

commit 5373a721c9115820118c5a6ccfdbab56de09aba3
Merge: c7921fd c2c1139
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:20:11 2010 -0700

    merged trunk

commit 69e30d197dc3c518528bb8d7101c496d753f2122
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:05:17 2010 -0700

    deleting is set by cloud

 nova/volume/manager.py |    3 ---
 1 file changed, 3 deletions(-)

commit fb66d1577a7c49b013f619c620c30bd4b11586e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 05:46:13 2010 -0700

    re added missing volume update

 nova/volume/manager.py |    3 +++
 1 file changed, 3 insertions(+)

commit 84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 05:31:27 2010 -0700

    Integrity error is in a different exc file

 nova/db/sqlalchemy/api.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b8516a2239658f0734299049648cbf2828b845eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 04:57:46 2010 -0700

    allow multiple volumes to run ensure_blades without creating duplicates

 nova/db/api.py            |   10 +++++++---
 nova/db/sqlalchemy/api.py |    8 +++++---
 nova/volume/manager.py    |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

commit e77e8a4c368a5c4da1f3e64938bc8940c3603418
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 04:48:49 2010 -0700

    fixed name for unique constraint

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa4c69330585ead1a1dd58b3bec4cc3f0f92082c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 04:44:57 2010 -0700

    export devices unique

 nova/db/sqlalchemy/models.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 69c21c3757a75d43e212bcebcfb59f2a4e8b91a6
Merge: c2c1139 c7921fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 03:58:03 2010 -0700

    merged instance time and added better concurrency

commit be1b1e320c17630430cfa567d8685f8cfc5773e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 23:51:28 2010 -0700

    make fixed_ip_get_by_address return the instance as well so we don't run into concurrency issues where it is disassociated in between

 nova/db/sqlalchemy/api.py |   16 ++++++++++++++--
 nova/network/manager.py   |    4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit 85876fc1fa3dc7cb289e59712ab5a2b20877fc58
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 23:34:32 2010 -0700

    disassociate floating is supposed to take floating_address

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e45a5dd2cbcfe5d43cc59c6a20e3d065d43ee161
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 23:32:03 2010 -0700

    speed up generation of dhcp_hosts and don't run into None errors if instance is deleted

 nova/db/sqlalchemy/api.py |    1 +
 nova/network/linux_net.py |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 53bba81d1e9774eefadd4f0f2b25638838a7ad07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 22:54:47 2010 -0700

    don't allocate the same floating ip multiple times

 nova/db/sqlalchemy/api.py |    1 +
 1 file changed, 1 insertion(+)

commit c7921fd14e680288c5626294105761005684b343
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 22:48:59 2010 -0700

    don't allow deletion or attachment of volume unless it is available

 nova/endpoint/cloud.py |    8 ++++++--
 nova/volume/manager.py |    7 ++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 19040b7b2b908b2816bc7aca54a8437d54badd26
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 21:12:01 2010 -0700

    fixed reference to misnamed method

 nova/endpoint/cloud.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit dff482e992b25580728955ae83ea2e38a18e7736
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:54:12 2010 -0700

    manage command for project quotas

 bin/nova-manage |   37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

commit 63a2c67fa79eda8d6182055ab2fb67e2475491a0
Merge: e19a3b2 c2c1139
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:33:13 2010 -0700

    merged trunk

commit ab0e61a1e05bdec8b39c22ff9d93845526a0a02b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:22:19 2010 -0700

    implement floating_ip_get_all_by_project and renamed db methods that get more then one to get_all_by instead of get_by

 nova/db/api.py            |   19 ++++++++++++-------
 nova/db/sqlalchemy/api.py |   14 +++++++++++---
 nova/endpoint/cloud.py    |   16 ++++++++--------
 3 files changed, 31 insertions(+), 18 deletions(-)

commit 3dbb3fa96779fbed89251a7c24455acbddc013e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:05:32 2010 -0700

    fixed reversed args in nova-manage project environment

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3aae714e4feb4a29ac7d2aed78aef37b3385300c
Merge: ef19132 15ca1fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:00:56 2010 -0700

    merged scheduler

commit ef1913292dd8a88041f603d79c09c738a7ecbb04
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:00:02 2010 -0700

    fix instance time

 nova/db/sqlalchemy/models.py   |    2 +-
 nova/tests/compute_unittest.py |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 15ca1fe1670cfd95880f2e1c2a5270be787c6035
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 19:43:02 2010 -0700

    move volume to the scheduler

 nova/endpoint/cloud.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit d05fe5d18ba3a62a1792634e7ba3c2f11d7b89bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 19:40:38 2010 -0700

    tests for volumes work

 nova/db/sqlalchemy/api.py        |    9 +--
 nova/scheduler/simple.py         |    9 ++-
 nova/tests/scheduler_unittest.py |  126 +++++++++++++++++++++++++++++++-------
 3 files changed, 114 insertions(+), 30 deletions(-)

commit 68ff059c7a6287825871f96cde8039f04aec1f37
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:57:15 2010 -0700

    update query and test

 nova/db/sqlalchemy/api.py        |   12 ++++++------
 nova/scheduler/simple.py         |    1 +
 nova/tests/scheduler_unittest.py |   10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

commit a6349713d6748614d17d41d7d64df25be37d580e
Merge: 8e4f102 e19a3b2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:45:35 2010 -0700

    merged quotas

commit 8e4f102819a1424a25f89ed34040b1298ed9563a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:45:15 2010 -0700

    use gigabytes and cores

 nova/db/sqlalchemy/api.py |    8 ++++----
 nova/scheduler/simple.py  |   26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

commit 06a799d2668723bbaead7ca2afbfb4b0cbf28abb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:16:10 2010 -0700

    use a string version of key name when constructing mpi dict because None doesn't work well in lookup

 nova/endpoint/cloud.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 023c7c018cfad28d0f53a73fa7d211427ad8339b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 17:12:43 2010 -0700

    db not self.db

 nova/endpoint/cloud.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit f24f20948cf7e6cc0e14c2b1fc41a61d8d2fa34c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Sep 11 11:19:22 2010 -0700

    Security Group API layer cleanup

 nova/db/api.py            |    5 +++
 nova/db/sqlalchemy/api.py |   11 ++++++
 nova/endpoint/cloud.py    |   84 +++++++++++++++++++++++----------------------
 3 files changed, 59 insertions(+), 41 deletions(-)

commit e19a3b21ed6bc331efeee756b1c1665d2538a263
Merge: ac27df3 e21c310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:46:35 2010 -0700

    merged trunk

commit c000a1f88141c7887943a96a8a7ced3b79d70f7e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:43:48 2010 -0700

    added terminated_at to volume and moved setting of terminated_at into cloud

 nova/compute/manager.py      |    8 ++++----
 nova/db/sqlalchemy/models.py |    2 ++
 nova/endpoint/cloud.py       |    9 +++++++++
 nova/volume/manager.py       |    3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)

commit c8a233eb971e2cce9a4fd99581645169a478c0f2
Merge: ab51f8f 6de809d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:31:16 2010 -0700

    remerged scheduler

commit 27241ee46b364fc3dfb8fb20639f1cd1004bb012
Merge: 38070f1 e21c310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:27:43 2010 -0700

    merged trunk

commit 6de809d887584bb29a7e39418a3209f1345ed01a
Merge: 0242bc5 e21c310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:24:19 2010 -0700

    merged trunk

commit c791229d11e3baf2a5828ee8efe98ed827a35dde
Merge: 66c583b e21c310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:23:23 2010 -0700

    merged trunk

commit 603c8f8c87c1b08d58ac0b240c1ad70a928e113d
Merge: fc5e1c6 e21c310
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:16:16 2010 -0700

    merged trunk

commit 5b9908ff2601adfac3565ff900ef254df27102b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 06:29:13 2010 -0700

    fixed reversed admin logic on describe instances

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 619e9fd636854b55e7f3334f93ed759ff82759f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:48:37 2010 -0700

    fixed typo network => network_manager in cloud.py

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66c583b1883af6e3452271df4b302fd32d1ee25d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:18:30 2010 -0700

    fixed old key reference and made keypair name constistent -> key_pair

 nova/auth/manager.py         |    4 ++--
 nova/cloudpipe/pipelib.py    |    4 ++--
 nova/crypto.py               |    2 +-
 nova/db/api.py               |   30 +++++++++++++++---------------
 nova/db/sqlalchemy/api.py    |   28 ++++++++++++++--------------
 nova/db/sqlalchemy/models.py |    6 +++---
 nova/endpoint/cloud.py       |   21 ++++++++++-----------
 nova/tests/cloud_unittest.py |    2 +-
 8 files changed, 48 insertions(+), 49 deletions(-)

commit fe78b3651c9064e527b8e3b74d7669d3d364daab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:06:22 2010 -0700

    typo fixes, add flag to nova-dhcpbridge

 bin/nova-dhcpbridge     |    1 +
 nova/network/manager.py |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

commit b574d88fd6b27ac59bc51867e824f4ec9e1f7632
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:01:44 2010 -0700

    fixed tests, added a flag for updating dhcp on disassociate

 nova/db/api.py                 |    6 +++---
 nova/endpoint/cloud.py         |    2 +-
 nova/network/manager.py        |   14 ++++++++++++++
 nova/tests/network_unittest.py |   37 ++++++++++++++++++-------------------
 4 files changed, 36 insertions(+), 23 deletions(-)

commit 2f3a63ac73176ed91cfcf8b011a2769fbf88201a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 03:31:40 2010 -0700

    simplified network instance association

 nova/db/api.py            |   30 ++++++++++++-------------
 nova/db/sqlalchemy/api.py |   54 ++++++++++++++++++++++++---------------------
 nova/network/manager.py   |   41 +++++++++++++---------------------
 3 files changed, 58 insertions(+), 67 deletions(-)

commit 6083273c9949b0e49a0c0af7cfc8f0fb83ea7c79
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 03:06:27 2010 -0700

    fix network association issue

 nova/db/sqlalchemy/api.py |    1 +
 nova/network/manager.py   |   27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

commit d41ebe02faadc620a5c38490f46dbf5b23b6a20f
Merge: 9003fe3 433d83a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 00:21:58 2010 -0700

    merged trunk

commit 9003fe35cfd2a6daa49d717bf256f2229171f7c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 00:16:12 2010 -0700

    improved network error case handling for fixed ips

 bin/nova-dhcpbridge            |   10 ++++++----
 nova/network/manager.py        |   27 ++++++++++++++++++++++++--
 nova/tests/network_unittest.py |   41 +++++++++++++++++++++++++++++++++-------
 3 files changed, 65 insertions(+), 13 deletions(-)

commit 38070f19036dcf24367429bcc79ffb55fad4b3cd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 22:42:51 2010 -0700

    it is called regionEndpoint, and use pipe as a separator

 nova/endpoint/cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 8e834931087c54585a7aa2716c7a0708fd658f30
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 22:13:36 2010 -0700

    move keypair generation out of auth and fix tests

 nova/auth/manager.py         |   70 ------------------------------------------
 nova/endpoint/cloud.py       |   48 ++++++++++++++++++++---------
 nova/tests/api_unittest.py   |    7 +++--
 nova/tests/auth_unittest.py  |   31 -------------------
 nova/tests/cloud_unittest.py |   53 +++++++++++++++++++++++++++-----
 5 files changed, 83 insertions(+), 126 deletions(-)

commit edccf3f6cf95a4869d7900032a5a6c8eaa65cd18
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Sep 11 02:35:25 2010 +0000

    Fixed manager_user reference in create_project

 nova/auth/manager.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 60b6b06d15ed620cf990db10277c4126b686de80
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 10 19:19:08 2010 -0700

    Finished security group / project refactor

 nova/auth/manager.py         |   20 ++++++++++++++++----
 nova/db/sqlalchemy/api.py    |    2 +-
 nova/db/sqlalchemy/models.py |   12 ++++++------
 nova/endpoint/cloud.py       |    5 ++---
 nova/tests/api_unittest.py   |    2 +-
 5 files changed, 26 insertions(+), 15 deletions(-)

commit adb9cf9e71908844fd720e6f9bab9588610878e1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 19:03:35 2010 -0700

    delete keypairs when a user is deleted

 nova/auth/manager.py      |    8 ++++++--
 nova/db/api.py            |    5 +++++
 nova/db/sqlalchemy/api.py |    8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

commit d3273e594daf5f94f09c7904bac53fbb895ffeb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 18:55:11 2010 -0700

    remove keypair from driver

 nova/auth/ldapdriver.py |   60 -----------------------------------------------
 nova/auth/manager.py    |   23 ------------------
 2 files changed, 83 deletions(-)

commit ee206cd08bd2d82bb5d64b84b6804ba51ab56b37
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 18:51:22 2010 -0700

    moved keypairs to db using the same interface

 nova/auth/manager.py         |   36 +++++++++++++++---------------------
 nova/db/api.py               |   23 +++++++++++++++++++++++
 nova/db/sqlalchemy/api.py    |   32 ++++++++++++++++++++++++++++++++
 nova/db/sqlalchemy/models.py |   36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 21 deletions(-)

commit bc265bbc9b3b42e46e044c18252218a375192123
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 17:12:49 2010 -0700

    multi-region flag for describe regions

 nova/endpoint/cloud.py |   15 ++++++++++++---
 nova/flags.py          |   15 +++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

commit ac27df3f4bea1a1a05a84de99c098dc91741a7ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 16:40:49 2010 -0700

    make api error messages more readable

 nova/endpoint/api.py   |    5 ++++-
 nova/endpoint/cloud.py |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

commit e53676bb32b70ff01ca27c310e558b651590be3d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 10 15:26:13 2010 -0700

    Refactored to security group api to support projects

 nova/auth/manager.py         |    2 -
 nova/db/api.py               |   34 ++++++++++-------
 nova/db/sqlalchemy/api.py    |   76 +++++++++++++++++++++++---------------
 nova/db/sqlalchemy/models.py |   22 +++++------
 nova/endpoint/cloud.py       |   83 ++++++++++++++++++++++++++----------------
 nova/tests/api_unittest.py   |    1 +
 nova/tests/virt_unittest.py  |    4 +-
 nova/virt/libvirt_conn.py    |    2 +-
 8 files changed, 133 insertions(+), 91 deletions(-)

commit fc666c244a8de66ac73add034df3af2544a59790
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 15:04:52 2010 -0700

    set dnsName on describe

 nova/endpoint/cloud.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 0242bc5106bb030ccf24e59d216f7017cf906a1f
Merge: 1c01b37 a5b6e1d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:27:42 2010 -0700

    merged orm and put instance in scheduling state

commit a5b6e1dc8f3aa3135f633daac2e489e5e6ee67cb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:24:35 2010 -0700

    just warn if an ip was already deallocated

 nova/network/manager.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit f16e427317f2558e74e8774b9104068b0c7e8ef8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:16:14 2010 -0700

    fix mpi 500 on fixed ip

 nova/endpoint/cloud.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit a50e419953fb0fba20246c7f1ebf9946788f3202
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 12:34:45 2010 -0700

    hostname should be string id

 nova/endpoint/cloud.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 214f15b5eac2100937473ee8990f8ec8a31fb142
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 12:25:45 2010 -0700

    dhcpbridge needed host instead of node name

 bin/nova-dhcpbridge |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f8a25024ff4a3225b3c7ba7de0927916b39126fc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 07:34:10 2010 -0700

    add a simple iterator to NovaBase to support converting into dictionary

 nova/db/sqlalchemy/models.py |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit fffa02ac32055650b2bfffff090ec7d52c86291a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 10 15:32:56 2010 +0200

    Adjust a few things to make the unit tests happy again.

 nova/endpoint/cloud.py      |    2 +-
 nova/tests/virt_unittest.py |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit d64adee4656a3044258c7dbfff93f5201c39560c
Merge: c3dd0aa 33d832e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 10 15:02:07 2010 +0200

    Merge with orm_deux (fixing up style changes in my stuff at the same time).

commit c3dd0aa79d982d8f34172e6023d4b632ea23f2b9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 10 14:56:36 2010 +0200

    First pass of nwfilter based security group implementation. It is not where it is supposed to be and it does not actually do anything yet.

 nova/auth/manager.py        |    2 +-
 nova/db/sqlalchemy/api.py   |    1 +
 nova/endpoint/cloud.py      |    1 -
 nova/tests/virt_unittest.py |   50 +++++++++++++++++++++++++++++++---
 nova/virt/libvirt_conn.py   |   63 +++++++++++++++++++++++++++++++++++++++++++
 run_tests.py                |    1 +
 6 files changed, 113 insertions(+), 5 deletions(-)

commit 953b79702500d129d40b557db668f095c303910d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:49:36 2010 -0700

    couple more errors in metadata

 nova/endpoint/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c107d10eaf4072769249441dc340c725d77c8112
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:38:59 2010 -0700

    typo in metadata call

 nova/endpoint/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 282c1263c610287f1a99d2f84db58f6dcfd03239
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:25:57 2010 -0700

    fixed messed up call in metadata

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9330ebc110aeb7591567c66939b39f4345b5778d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 04:52:48 2010 -0700

    added modify project command to allow project manager and description to be updated

 nova/auth/fakeldap.py       |    5 ++++-
 nova/auth/ldapdriver.py     |   18 ++++++++++++++++++
 nova/auth/manager.py        |   20 ++++++++++++++++++++
 nova/tests/auth_unittest.py |    6 ++++++
 4 files changed, 48 insertions(+), 1 deletion(-)

commit ddd25656fac76cfb9f6226f5843f4b452a74a75e
Merge: b049c03 30cec54
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Sep 10 10:57:58 2010 +0100

    Merge with trunk.

commit f1e45e3294622e22e6044027c1d2514f107d6134
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Sep 10 10:56:22 2010 +0100

    Change "exn" to "exc" to fit with the common style.

 nova/virt/xenapi.py |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

commit ecbbfa343edf0ca0e82b35dc655fa23701bbdf22
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 10 11:47:06 2010 +0200

    Create and delete security groups works.
    Adding and revoking rules works.
    DescribeSecurityGroups returns the groups and rules.
    So, the API seems to be done. Yay.

 nova/db/api.py               |    5 ++++
 nova/db/sqlalchemy/api.py    |    7 +++++
 nova/db/sqlalchemy/models.py |    6 ++---
 nova/endpoint/api.py         |    1 +
 nova/endpoint/cloud.py       |   43 +++++++++++++++++++++++++------
 nova/tests/api_unittest.py   |   58 ++++++++++++++++++++++++++++++++++++++----
 6 files changed, 104 insertions(+), 16 deletions(-)

commit 290e743e11ed5072e36050edfc9329b6683ba072
Merge: 6f5c16b aa4d833
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 02:18:17 2010 -0700

    merged describe_speed

commit ab51f8fa5b41566665c7c559c08311efac2b3adc
Merge: 6ccabc5 1c01b37
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 02:02:22 2010 -0700

    merged scheduler

commit 1c01b37a5f2372f4e61fdff8a16a9efe6f6b7e7b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 01:13:11 2010 -0700

    set host when item is scheduled

 nova/scheduler/simple.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 1867c2aae81e4a73374bde0169b4e16cd8e18846
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:43:51 2010 -0700

    remove print statements

 nova/scheduler/manager.py |    2 --
 1 file changed, 2 deletions(-)

commit ffb2d740a1d8fba997c043cc3066282afedebae8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:37:08 2010 -0700

    removed extra quotes around instance_type

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d534655b636563fa71ca78758340b2dd49bc2527
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:32:43 2010 -0700

    don't pass topic into schedule_run_instance

 nova/scheduler/manager.py        |    2 ++
 nova/tests/scheduler_unittest.py |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 6ccabc5afa21ad8e507d55ab6b4a7542a92862f7
Merge: b8aaebe c5bfa37
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:12:34 2010 -0700

    added scheduled_at to instances and volumes

commit a7a46ea93186ca68ca90efdcd86b4d2a7d3bd8e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:04:30 2010 -0700

    quotas working and tests passing

 nova/endpoint/cloud.py       |    1 -
 nova/tests/quota_unittest.py |    9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

commit ece1c84203890e87834bb53acaf98420fdeee6dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:53:31 2010 -0700

    address test almost works

 nova/tests/quota_unittest.py |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit 5cb90074df70daa60241930da9940e093a3812ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:13:38 2010 -0700

    quota tests

 nova/endpoint/cloud.py       |    1 +
 nova/tests/quota_unittest.py |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

commit f12de05359c7ab3edce52bd529acc6dfd55e5cb4
Merge: 56779eb 6f5c16b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:01:32 2010 -0700

    merged orm

commit c5bfa37c92bd066fa2bc3565b251edced3255438
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:59:09 2010 -0700

    fix unittest

 nova/tests/scheduler_unittest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a654c6a680020c31ba2690f7f1ce1a07512759e2
Merge: f40c194 6f5c16b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:58:02 2010 -0700

    merged orm

commit aa4d83308ef19138996c68cfa21f34f3914f50c2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:56:46 2010 -0700

    fix rare condition where describe is called before instance has an ip

 nova/endpoint/cloud.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 8ecd5206c37ba147a991aae54fd1248e877f6d0a
Merge: d4a7e6e 6f5c16b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:52:58 2010 -0700

    merged orm

commit 6f5c16b62c441c97ade4f2f4b4878e8015c9281e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:52:06 2010 -0700

    make the db creates return refs instead of ids

 nova/api/rackspace/servers.py  |    2 +-
 nova/db/sqlalchemy/api.py      |    4 ++--
 nova/endpoint/cloud.py         |    2 +-
 nova/service.py                |    9 +++++----
 nova/tests/compute_unittest.py |    2 +-
 nova/tests/network_unittest.py |    8 ++++----
 nova/tests/service_unittest.py |    4 ++--
 nova/tests/volume_unittest.py  |    2 +-
 8 files changed, 17 insertions(+), 16 deletions(-)

commit 56779ebfec9cd382f170e307a1dc6403e339807f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:42:18 2010 -0700

    add missing files for quota

 nova/quota.py                |   91 ++++++++++++++++++++++++++++++
 nova/tests/quota_unittest.py |  127 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+)

commit f40c194977b53b7b99a4234f2c1a3b3bfb39c00e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:29:00 2010 -0700

    kwargs don't work if you prepend an underscore

 nova/scheduler/simple.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 742f2936c39d99206383cb83dcae2c8308154155
Merge: c577e91 8b59df6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 20:58:12 2010 -0700

    merged orm, added database methods for getting volume and ip data for projects

commit c577e91ee3a3eb87a393da2449cab95069a785f4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 20:10:31 2010 -0700

    database support for quotas

 nova/db/api.py                 |   27 ++++++++++++++++++++
 nova/db/sqlalchemy/api.py      |   43 +++++++++++++++++++++++++++++++-
 nova/db/sqlalchemy/models.py   |   21 ++++++++++++++++
 nova/endpoint/cloud.py         |   53 +++++++++++++++++++++++++++++++++++-----
 nova/tests/compute_unittest.py |    1 +
 run_tests.py                   |    1 +
 6 files changed, 139 insertions(+), 7 deletions(-)

commit 345749f514291928913a1ecb280b92daec2c0553
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 9 19:23:27 2010 -0400

    Correct style issues brought up in termie's review

 nova/api/ec2/__init__.py   |   37 +++++++++++++++++++------------------
 nova/api/ec2/apirequest.py |    2 --
 nova/api/ec2/cloud.py      |   15 +++++++--------
 nova/api/ec2/context.py    |    1 +
 nova/api/ec2/images.py     |   21 +++++++--------------
 nova/image/service.py      |    7 +++++++
 nova/tests/api_unittest.py |    1 -
 7 files changed, 41 insertions(+), 43 deletions(-)

commit 0aabb8a6febca8d98a750d1bdc78f3160b9684fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 13:40:18 2010 -0700

    mocking out quotas

 nova/db/sqlalchemy/models.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 8b59df67277dab6533b0076569fecc50b437ec75
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 12:45:51 2010 -0700

    don't need to pass instance_id to network on associate

 nova/endpoint/cloud.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 0173a908aa35d110cdcf11822e8419b95f0de410
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 12:38:33 2010 -0700

    floating_address is the name for the cast

 nova/endpoint/cloud.py |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit d4a7e6e22fafacb031d8b951bf1608888b4d18e3
Merge: 1f1422d cb0953a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:18:13 2010 -0700

    merged support code from orm branch

commit 1f1422d5f262b20f4fa6266a3d62615d013d832c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:17:14 2010 -0700

    faster describe_addresses

 nova/endpoint/cloud.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit cb0953a578b55e873a090f2ed46e879183aa3eb0
Merge: c08c21d 4dcc4bc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:15:58 2010 -0700

    added floating ip commands and launched_at terminated_at, deleted_at for objects

commit 6f6adc5063974c721c82f7095eb1a0a619f18c91
Merge: 64d073c c08c21d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:08:26 2010 -0700

    merged orm

commit c08c21d6ceeeb2d8241ae5222b744bed64d327f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:07:10 2010 -0700

    solution that works with this version

 nova/endpoint/cloud.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit b3503ebcd7def01b523e0724ccec6fad9be12c93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:02:37 2010 -0700

    fix describe addresses

 nova/endpoint/cloud.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 9165579a501cf9e248ac5d2d43a80f4abbb58365
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 10:43:19 2010 -0700

    remove extraneous get_host calls that were requiring an extra db trip

 nova/db/api.py            |   15 ---------------
 nova/db/sqlalchemy/api.py |   15 ---------------
 nova/endpoint/cloud.py    |   12 ++++++------
 3 files changed, 6 insertions(+), 36 deletions(-)

commit 1f5524f64a09502a1d225001f4c5d3039551fa07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 10:38:32 2010 -0700

    pass volume['id'] instead of string id to delete volume

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e88cb0063157d13a590a414b6989d875c6a1ba8a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 09:59:55 2010 -0700

    fix volume delete issue and volume hostname display

 nova/endpoint/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 6c4d301eab48b841b4b6ca19a96b3e9748f27b57
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 09:52:24 2010 -0700

    fix logging for scheduler to properly display method name

 nova/scheduler/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2cd0ac795a67bb7416df8c8a6fccccf78fc5e430
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 08:55:09 2010 -0700

    fixed logic in set_state code to stop endless loops

 nova/virt/libvirt_conn.py |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 59a959299d7883c48626d8d5630974d718194960
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 9 17:35:02 2010 +0200

    Authorize and Revoke access now works.

 nova/db/api.py               |    9 ++++++++
 nova/db/sqlalchemy/api.py    |    8 +++++++
 nova/db/sqlalchemy/models.py |    7 ++++--
 nova/endpoint/cloud.py       |   51 +++++++++++++++++++++++++++++++++++++++---
 nova/tests/api_unittest.py   |   26 +++++++++++++++++----
 5 files changed, 92 insertions(+), 9 deletions(-)

commit 4dcc4bc4b459b454431ca60bec0dead2146f52af
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:53:57 2010 -0700

    list command for floating ips

 bin/nova-manage           |    9 ++++++---
 nova/db/sqlalchemy/api.py |   16 ++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

commit 8f3b0a41596c32926c62269624302cd30f943f46
Merge: 2b5bbc2 64d073c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:48:14 2010 -0700

    merged describe speed

commit 2b5bbc2570cd8ec9d56718315c8a086f4f4dd7db
Merge: 33631c2 33d832e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:47:49 2010 -0700

    merged orm

commit 33631c21e71d85910a20997881735aa43160d36a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:47:30 2010 -0700

    floating ip commands

 bin/nova-manage           |   31 +++++++++++++++++++++++++++++++
 nova/db/api.py            |   25 ++++++++++++++++++++-----
 nova/db/sqlalchemy/api.py |   32 ++++++++++++++++++++++++++------
 3 files changed, 77 insertions(+), 11 deletions(-)

commit 33d832ee798bc9530be577e3234ff8bcdac4939e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:37:03 2010 -0700

    removed extraneous rollback

 nova/db/sqlalchemy/models.py |    1 -
 1 file changed, 1 deletion(-)

commit 64d073ca080f194680c14ccdf3b2b08e50d8eade
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 06:55:54 2010 -0700

    speed up describe by loading fixed and floating ips

 nova/db/sqlalchemy/api.py |    9 ++++++++-
 nova/endpoint/cloud.py    |    8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

commit bd7ac72b9774a181e51dde5dff09ed4c47b556a7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 9 15:13:04 2010 +0200

    AuthorizeSecurityGroupIngress now works.

 nova/db/api.py               |   13 +++++++
 nova/db/sqlalchemy/api.py    |   19 ++++++++++
 nova/db/sqlalchemy/models.py |    9 ++---
 nova/endpoint/cloud.py       |   50 +++++++++++++++++++++++--
 nova/tests/api_unittest.py   |   83 ++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 161 insertions(+), 13 deletions(-)

commit b8aaebee171876ffd0e115ea3a19d4524ca16d99
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 06:06:29 2010 -0700

    switch to using utcnow

 nova/compute/manager.py        |    4 ++--
 nova/db/sqlalchemy/models.py   |    4 ++--
 nova/tests/compute_unittest.py |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit bd07d6b3b3e9ed3ef3e65e99b628c8b1aaf2f82c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 9 12:35:46 2010 +0200

    Alright, first hole poked all the way through. We can now create security groups and read them back.

 nova/auth/manager.py         |    6 +++++
 nova/db/api.py               |   22 +++++++++++++++++
 nova/db/sqlalchemy/api.py    |   38 +++++++++++++++++++++++++++++
 nova/db/sqlalchemy/models.py |   54 +++++++++++++++++++++++++++++++++++++++++-
 nova/endpoint/cloud.py       |   14 +++++++----
 nova/tests/api_unittest.py   |   34 +++++++++++++++++++++++---
 6 files changed, 160 insertions(+), 8 deletions(-)

commit e6369486f43423e9649a7b4d046d3c92bf1c85e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 03:33:12 2010 -0700

    don't fail in db if context isn't a dict, since we're still using a class based context in the api

 nova/db/sqlalchemy/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 37a8ca37db8a51455faf9b4a3bead95c453e8183
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 03:20:56 2010 -0700

    logging for backend is now info instead of error

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 37a876c5bcbf5b90b91c406d0b42629bf607c032
Merge: 010a1d2 2065678
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:36:08 2010 -0700

    merged orm

commit 4d3690fb60a3fa450672b8743cf719f92044038d
Merge: 8340281 2065678
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:35:50 2010 -0700

    merged orm

commit 20656789e919f36733ac9fd0766a56a1c96d1e34
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:35:11 2010 -0700

    set state everywhere

 nova/compute/manager.py |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

commit 83402810be11111e3f61f3a9c3771bb96161e551
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:30:07 2010 -0700

    put soren's fancy path code in scheduler bin as well

 bin/nova-scheduler |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 010a1d2b49f50d7cd763b3789bfd2d6789e2279b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:23:31 2010 -0700

    missing deleted ref

 nova/db/sqlalchemy/models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0054b12397a3962ef019a33264a8fb136f183abb
Merge: 37ca50b 4a1c4a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:17:43 2010 -0700

    merged orm

commit 68309b148f1d178f6e3abc3cf0251c59b4319215
Merge: 59e1bae 4a1c4a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:17:10 2010 -0700

    merged orm

commit 4a1c4a4925e427c639419e87e912b08fd41d7f74
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:16:06 2010 -0700

    consistent naming for instance_set_state

 nova/db/api.py            |    4 ++--
 nova/db/sqlalchemy/api.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 387671f9bc0299116ffbab7acfc47127afb989aa
Author: andy <code@term.ie>
Date:   Wed Sep 8 22:43:54 2010 +0200

    Tests turn things into inlineCallbacks.
    
    This is to duplicate the old behavior of BaseTestCase and to generally
    prevent the bad situation in that tests appear to be passing when in
    fact they haven't run because @defer.inlineCallbacks was forgotten.

 nova/rpc.py                  |    1 -
 nova/test.py                 |   51 ++++++++++++++++++++++++++++++++++++++----
 nova/tests/cloud_unittest.py |    2 +-
 nova/tests/rpc_unittest.py   |    3 +--
 4 files changed, 49 insertions(+), 8 deletions(-)

commit bd550806950bcfdcd32172a896f04bc3b1a76392
Author: andy <code@term.ie>
Date:   Wed Sep 8 20:06:27 2010 +0200

    Missed an instance of attach_to_tornado.
    
    Kind of crappy because testing didn't catch it, the test code certainly
    appears to be testing those features, however.

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9df460a5cb2de96133028949ad12ac7c16dbd7fc
Author: andy <code@term.ie>
Date:   Wed Sep 8 19:57:29 2010 +0200

    Remove tornado-related code from almost everything.
    
    Left it in api where it is still being used pending gundlach's changes.

 nova/rpc.py                        |   16 +---------------
 nova/test.py                       |    7 ++++---
 nova/tests/access_unittest.py      |    2 +-
 nova/tests/auth_unittest.py        |    2 +-
 nova/tests/cloud_unittest.py       |   14 ++++++++------
 nova/tests/objectstore_unittest.py |    2 +-
 nova/tests/rpc_unittest.py         |    4 ++--
 7 files changed, 18 insertions(+), 29 deletions(-)

commit 30cec546812799fba09a2bab2b3aa4aad712ae3c
Merge: f62e2a6 f2a3f9a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 8 17:18:35 2010 +0000

    It's annoying and confusing to have to set PYTHONPATH to point to your
    development tree before you run any of the scripts.
    
    If you're lucky, it just fails (because you don't have nova in the default
    search path (i.e.  don't have them installed in /usr/lib/blah)) so that you can
    fix it up.
    
    If you're less lucky, you spend at least a couple of minutes wondering
    why the cool changes you made to one of the nova modules don't take effect
    until you realise it's because it's using the nova stuff in /usr/lib.
    
    So, to save myself (and probably others) a bit of time, this patch adds
    a snippet to each of the scripts in bin/ to detect this and set up the PYTHONPATH.

commit 4da60c687706da55b828411cb912cc38179fffe1
Merge: 62dad84 0e40078
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 8 14:04:09 2010 +0200

    Merge orm_deux.

commit 37ca50b1731a975d3106af05cd46b02d3f7a2a06
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:02:41 2010 -0700

    deleted typo

 nova/db/sqlalchemy/models.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 86f87c2bd260b7b567811a3ce15671ea21a17459
Merge: abc139a fbe2007
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:01:25 2010 -0700

    merged orm

commit 59e1bae9547da170669fc2cca68c404b41387aa5
Merge: 1ddc8cd fbe2007
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:00:07 2010 -0700

    merged orm

commit fbe2007deb9618e497097082f2c1af1be9c07c1c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:58:59 2010 -0700

    fixed missing paren

 nova/db/sqlalchemy/models.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit abc139a08a0b006cee5c92033597d2cca69e9d7e
Merge: 607162f f8a970e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:58:04 2010 -0700

    merge orm

commit 607162ffe86d7d2b5bd9eb6f16a6ee4405892fc6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:53:07 2010 -0700

    make timestamps for instances and volumes, includes additions to get deleted objects from db using deleted flag.

 nova/compute/manager.py        |    5 +++++
 nova/db/sqlalchemy/api.py      |   42 +++++++++++++++++++++++++---------------
 nova/db/sqlalchemy/models.py   |   20 +++++++++++--------
 nova/tests/compute_unittest.py |   20 +++++++++++++++++++
 4 files changed, 63 insertions(+), 24 deletions(-)

commit 1ddc8cde319a70479bb22b4d3e7176d69e206bb2
Merge: de5af51 f8a970e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:52:10 2010 -0700

    merged orm

commit f8a970e98bcef40142dee39642320f1cab5a78aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:51:34 2010 -0700

    remove end of line slashes from models.py

 nova/db/sqlalchemy/models.py |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit f2a3f9a622613ec1575e70ac9fe9655b485d9a6d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 8 10:45:39 2010 +0200

    Make the scripts in bin/ detect if they're being run from a bzr checkout
    or an extracted release tarball or whatever and adjust PYTHONPATH
    accordingly.

 bin/nova-api                         |   10 ++++++++++
 bin/nova-api-new                     |   11 +++++++++++
 bin/nova-compute                     |   11 +++++++++++
 bin/nova-dhcpbridge                  |   11 +++++++----
 bin/nova-import-canonical-imagestore |    8 ++++++++
 bin/nova-instancemonitor             |   10 ++++++++++
 bin/nova-manage                      |    9 +++++++++
 bin/nova-network                     |   11 +++++++++++
 bin/nova-objectstore                 |   11 +++++++++++
 bin/nova-volume                      |   11 +++++++++++
 10 files changed, 99 insertions(+), 4 deletions(-)

commit 9cb96a14ed6328732ee0dbee08ad9fed5bde43d6
Merge: 7b88b73 08f3d9b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:01:35 2010 -0700

    merged orm

commit de5af510a1621d4a2f665e894f1d56189c43d818
Merge: b1cd5d5 08f3d9b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:00:12 2010 -0700

    merged orm branch

commit 08f3d9b52b3a759b64a15433e920b1a6db217288
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 00:59:09 2010 -0700

    set state moved to db layer

 nova/virt/libvirt_conn.py |   29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

commit b1cd5d52dfa4f9e4da992426250c51ed0474a955
Merge: 71566b4 7b88b73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 00:34:20 2010 -0700

    updated to the new orm code

commit 7b88b732505c27217a9e2cd823b5641ac730619e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:59:36 2010 -0700

    changed a few unused context to _context

 nova/db/sqlalchemy/api.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit fc5e1c6f0bee14fdb85ad138324062ceaa598eee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:53:40 2010 -0700

    a few formatting fixes and moved exception

 nova/exception.py |   12 ++++++++++++
 nova/process.py   |    4 ++--
 nova/utils.py     |   17 +++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

commit 920444362e998960b7cfb5ce824383e4fbd45b2c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:45:50 2010 -0700

    fixed a few bugs in volume handling

 nova/db/sqlalchemy/api.py      |   46 +++++++++++++++++++++++-----------------
 nova/db/sqlalchemy/models.py   |    1 +
 nova/tests/compute_unittest.py |    2 +-
 nova/tests/volume_unittest.py  |   15 +++++++++++--
 4 files changed, 42 insertions(+), 22 deletions(-)

commit f9c060d137ba5d30c69136d5acc99509e8f24b4b
Merge: 36dd39d 30cec54
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:19:46 2010 -0700

    merged trunk

commit 36dd39d47dfd56ff1c83edde580b3136a77e4cec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:15:22 2010 -0700

    Last of cleanup, including removing fake_storage flage

 nova/network/manager.py        |    1 +
 nova/service.py                |    2 +-
 nova/test.py                   |    6 ---
 nova/tests/access_unittest.py  |    2 -
 nova/tests/auth_unittest.py    |    3 +-
 nova/tests/cloud_unittest.py   |    3 +-
 nova/tests/compute_unittest.py |    3 +-
 nova/tests/fake_flags.py       |    5 +-
 nova/tests/network_unittest.py |    1 -
 nova/tests/real_flags.py       |    1 -
 nova/tests/service_unittest.py |   72 ++++++++++++-------------
 nova/tests/storage_unittest.py |  115 ----------------------------------------
 nova/tests/volume_unittest.py  |    3 +-
 nova/volume/driver.py          |    4 +-
 nova/volume/manager.py         |   12 ++---
 15 files changed, 50 insertions(+), 183 deletions(-)

commit 5c8e3bb887a817372191f8d830f002013f274fd7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:55:42 2010 -0700

    more fixes from code review

 nova/endpoint/admin.py    |    3 +-
 nova/endpoint/cloud.py    |   72 +++++++++++++++++++++------------------------
 nova/flags.py             |   11 ++++---
 nova/network/linux_net.py |   26 ++++++++--------
 4 files changed, 54 insertions(+), 58 deletions(-)

commit 4a446190027943e62838880c95f38127cc0fdfb2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:24:58 2010 -0700

    review db code cleanup

 nova/db/api.py            |    3 +-
 nova/db/sqlalchemy/api.py |  148 +++++++++++++++++++++++----------------------
 2 files changed, 76 insertions(+), 75 deletions(-)

commit 0f3317735edbaf76c3437c1fe5407b575927d202
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:09:42 2010 -0700

    review cleanup for compute manager

 nova/compute/manager.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit c32beae895df87b8bac9fc4fed6bf73c19924b19
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:03:07 2010 -0700

    first pass at cleanup rackspace/servers.py

 nova/api/rackspace/servers.py |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

commit 96682df90fbeb3b533aa0c351176e3ef412f5446
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:48:38 2010 -0700

    dhcpbridge fixes from review

 bin/nova-dhcpbridge |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 459db7deba825e79caa7801680df23b6f6b1c338
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:48:12 2010 -0700

    more fixes to session handling

 nova/db/sqlalchemy/api.py     |   10 +++++-----
 nova/db/sqlalchemy/session.py |    6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

commit ced5f151715c4a82c29dcc7ce71a22991be4ccef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:04:08 2010 -0700

    few typos in updates

 nova/db/sqlalchemy/api.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit fd63d8b658477b27f3962f62ba03dc90694ac737
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:58:08 2010 -0700

    don't log all sql statements

 nova/db/sqlalchemy/session.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6591ac066f1c6f7ca74c540fe5f39033fb41cd10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:32:31 2010 -0700

    one more whitespace fix

 nova/process.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c3531537aef54b2c27a6e1f28308eac98aec08ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:32:08 2010 -0700

    whitespace fixes

 nova/process.py |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

commit 691a32c171ff8e2923f7a1d4c9129dfd1f70c0a7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:14:50 2010 -0700

    fix for getting reference on service update

 nova/service.py |    1 +
 1 file changed, 1 insertion(+)

commit d64ad6ff275916a41c3b2e6972ab96464311135c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:14:19 2010 -0700

    clean up of session handling

 nova/db/sqlalchemy/api.py     |  269 ++++++++++++++++++++++-------------------
 nova/db/sqlalchemy/models.py  |  139 +++++++++------------
 nova/db/sqlalchemy/session.py |   42 ++-----
 3 files changed, 215 insertions(+), 235 deletions(-)

commit 4ddcc28c944975c6e03cccf7d360b3ec4c26e848
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 7 16:01:26 2010 -0400

    New version of eventlet handles Twisted & eventlet running at the same time

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 71566b41619166f61a3fe478524f66908364364b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 13:01:21 2010 -0700

    fix docstrings and formatting

 nova/scheduler/chance.py  |    8 ++------
 nova/scheduler/driver.py  |   25 +++++++------------------
 nova/scheduler/manager.py |    4 +---
 nova/scheduler/simple.py  |   19 ++++++-------------
 4 files changed, 16 insertions(+), 40 deletions(-)

commit 0cbde24bfc3ad13a67325e6c0e08d4650d05ea05
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 7 16:00:01 2010 -0400

    Oops, APIRequestContext's signature has changed

 nova/objectstore/handler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6de276cfd3b9809316a7c3a41f5fc3fa8cc34467
Merge: 125ee9c 8521e83
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 12:52:12 2010 -0700

    merged orm

commit 8521e83fe485c0354af6c697dbdadd9eee4d8b1c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 12:37:18 2010 -0700

    fix floating_ip to follow standard create pattern

 nova/db/api.py                 |    6 +++---
 nova/db/sqlalchemy/api.py      |    8 ++++----
 nova/tests/network_unittest.py |    7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

commit 62dad8422532af4257769bbb0e68120b3393739a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 7 14:52:38 2010 +0200

    Add stubbed out handler for AuthorizeSecurityGroupIngress EC2 API call.

 nova/endpoint/cloud.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 125ee9c675546a756f12ff2c3ec1ef07ab21999b
Merge: a983660 0e40078
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 05:38:40 2010 -0700

    merged orm_deux

commit 0e400788cedc592e40750f6fc7291970f243a218
Merge: 9db707d f62e2a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 05:34:37 2010 -0700

    Merged trunk

commit f21d8510bb3f55b2b76aab251b0427dbfa69c5d9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 7 14:34:27 2010 +0200

    Add a clean-traffic filterref to the libvirt templates to prevent spoofing and snooping attacks from the guests.

 nova/virt/libvirt.qemu.xml.template |    3 +++
 nova/virt/libvirt.uml.xml.template  |    3 +++
 2 files changed, 6 insertions(+)

commit 9db707dda70bbb11d944ab357841c9bdd5ef5b07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 05:26:08 2010 -0700

    Lots of fixes to make the nova commands work properly and make datamodel work with mysql properly

 nova/compute/manager.py       |  104 +++++++++++++++++---------------------
 nova/db/api.py                |    5 ++
 nova/db/sqlalchemy/api.py     |    6 +++
 nova/db/sqlalchemy/models.py  |  111 ++++++++++++++++++++++-------------------
 nova/db/sqlalchemy/session.py |    3 +-
 nova/endpoint/cloud.py        |   11 ++--
 nova/process.py               |   95 +++++++++++++++++------------------
 nova/service.py               |   24 +++++----
 nova/utils.py                 |   18 ++++++-
 nova/virt/fake.py             |    8 +++
 nova/virt/libvirt_conn.py     |   44 ++++++++++++----
 nova/volume/driver.py         |   25 ++++++----
 nova/volume/manager.py        |   28 ++++++++---
 13 files changed, 279 insertions(+), 203 deletions(-)

commit b049c032a9f950d67bbfe709802288a7fe28bdd6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Sep 5 05:56:53 2010 +0100

    Bug #630640: Duplicated power state constants
    
    Remove power state constants that have ended up duplicated following a bad
    merge. They were moved from nova.compute.node.Instance into
    nova.compute.power_state at the same time that Instance was moved into
    nova.compute.service. We've ended up with these constants in both places.
    
    Remove the ones from service, in favour of the ones in power_state.

 nova/compute/service.py      |    8 --------
 nova/tests/cloud_unittest.py |    3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

commit 19d4c3a6f411b3b96d4a3dffc16b9b272a01971f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Sep 5 05:33:56 2010 +0100

    Bug #630636: XenAPI VM destroy fails when the VM is still running
    
    When destroying a VM using the XenAPI backend, if the VM is still running (the usual case) the destroy fails. It needs to be powered-off first.

 nova/virt/xenapi.py |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit a983660008d09276d2749077c1141313381d6eb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 4 11:42:15 2010 -0700

    removed extra equals

 nova/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f62e2a6aafc1a3895238adce003926cca4bd3cd8
Merge: d0a353e 3afc762
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 3 17:43:52 2010 +0000

    Just a couple of UML-only fixes:
     * Due to an issue with libvirt, we need to chown the disk image to root.
     * Just point UML's console directly at a file, and don't bother with the pty. It was only used for debugging.

commit 22aa51638dc221e78de60f7e2ddb10eb0ddf4db3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:53:41 2010 -0700

    removed extra file and updated sql note

 bin/nova-listinstances    |   38 --------------------------------------
 nova/db/sqlalchemy/api.py |    1 +
 2 files changed, 1 insertion(+), 38 deletions(-)

commit bc1271761a5677280a8fc67edcb7b60419812e99
Merge: b333090 91b6fa8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:29:25 2010 -0700

    merged fixed format instances from orm

commit 91b6fa84f7fa440f1e8b426aa091fdfaa03de6ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:28:16 2010 -0700

    fixed up format_instances

 nova/endpoint/cloud.py |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit b333090284a5e2b763ea55678429808d96abb1cc
Merge: dd8c1d1 03e2ae4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:12:54 2010 -0700

    merged server.py change from orm branch

commit 03e2ae4a4237c200f5960845abf56df63239c0f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:11:59 2010 -0700

    reverting accidental search/replace change to server.py

 nova/server.py |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit dd8c1d1bc45dc1249a3c1372f6e51a0afe443d0a
Merge: cfae580 66ed706
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:13:41 2010 -0700

    merged orm

commit 66ed706a2f7ee8a6b4703de988b4d7ef0826fc2a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:13:12 2010 -0700

    removed model from nova-manage

 bin/nova-manage |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit cfae58098e6ba194cbf6ffaa7cb17c290a38fbcd
Merge: e555ce9 b080169
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:05:18 2010 -0700

    merged orm branch

commit b080169f94e9b3785a73da38a81a0ce302fcff37
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:04:41 2010 -0700

    removed references to compute.model

 nova/api/rackspace/servers.py |    2 +-
 nova/endpoint/admin.py        |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

commit e555ce94ee29013901796b570b752f39194ddb12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 17:06:01 2010 -0700

    send ultimate topic in to scheduler

 nova/endpoint/cloud.py |    1 +
 1 file changed, 1 insertion(+)

commit 9bab02f79e4f54ab909f699bcb86ff51c1a97e0a
Merge: 68d8f54 98b6a25
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 16:59:41 2010 -0700

    more scheduler tests

commit 68d8f54e00c153eccd426256a25c8a70ccce2dcc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 15:15:39 2010 -0700

    test for too many instances work

 nova/scheduler/driver.py         |   21 +++++++------
 nova/scheduler/simple.py         |   25 ++++++++-------
 nova/tests/scheduler_unittest.py |   63 +++++++++++++++-----------------------
 3 files changed, 48 insertions(+), 61 deletions(-)

commit 98b6a25ea57c43ecd400eff49e23a202dc6f9869
Merge: bcc0004 d0a353e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 15:02:07 2010 -0700

    merged trunk

commit bcc0004e0ebd1345dc3580e1cb01f7ca1222ef51
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:57:45 2010 -0700

    fix service unit tests

 nova/service.py                |   11 +++++------
 nova/tests/service_unittest.py |   26 +++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

commit 450eac9e6cc76d6a1f03f9da67b40d814e5712c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:43:02 2010 -0700

    removed dangling files

 nova/datastore.old.py        |  261 -------------------------------------
 nova/tests/model_unittest.py |  292 ------------------------------------------
 run_tests.py                 |    1 -
 3 files changed, 554 deletions(-)

commit fd2f45fb28137ddc254b6a863981bf6a3eb3b9e7
Merge: e992234 57a103b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:21:41 2010 -0700

    merged orm branch

commit e992234e1150b4c5a5ef6f12e6e729ca9e7d8e23
Merge: 57d0210 2ecde34
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:14:52 2010 -0700

    merged trunk and cleaned up test

commit 57a103b32226d633f0250812e386f6d3fe3084b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:13:22 2010 -0700

    renamed daemon to service and update db on create and destroy

 nova/db/api.py                 |   26 ++++++++++++-------------
 nova/db/sqlalchemy/api.py      |   26 ++++++++++++-------------
 nova/db/sqlalchemy/models.py   |    6 +++---
 nova/endpoint/images.py        |    2 +-
 nova/server.py                 |   30 ++++++++++++++---------------
 nova/service.py                |   41 +++++++++++++++++++++++++---------------
 nova/tests/service_unittest.py |   36 +++++++++++++++++------------------
 7 files changed, 89 insertions(+), 78 deletions(-)

commit 2ecde345023c4a509b39afb6dbd97071684b3539
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:50:14 2010 -0700

    pass all extra args from service to manager

 nova/service.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 57d02103c4d33c009fef0405e541eb30d273b21e
Merge: e55234b f6be774
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:43:39 2010 -0700

    fix test to specify host

commit f6be77447c625e16511611b74c77a4cb3baa9ee0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:42:31 2010 -0700

    inject host into manager

 nova/manager.py |    5 ++++-
 nova/service.py |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit e3c7f34bbcc09cbb169d9316c50da6d908ac623c
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Sep 2 15:34:33 2010 -0500

    Servers API remodeling and serialization handling

 nova/api/rackspace/base.py    |    8 +---
 nova/api/rackspace/servers.py |   89 +++++++++++++++++++++++++++++------------
 2 files changed, 64 insertions(+), 33 deletions(-)

commit 59adf260b59dcdcc6bc2df3260a331a4a05f535c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:59:52 2010 -0400

    Move nova.endpoint.images to api.ec2 and delete nova.endpoint

 nova/api/ec2/cloud.py     |    2 +-
 nova/api/ec2/images.py    |   80 +++++++++++++++++++++++++++++++++++++++++++++
 nova/cloudpipe/pipelib.py |    4 +--
 nova/endpoint/images.py   |   80 ---------------------------------------------
 nova/endpoint/notes.txt   |   62 -----------------------------------
 5 files changed, 83 insertions(+), 145 deletions(-)

commit 43f1e722b633945a8f5dca005e6fd60515bac4ae
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:55:30 2010 -0400

    Cloud tests pass

 nova/tests/cloud_unittest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3075cc7440a37118d7784057874887f751e1f6a3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:53:57 2010 -0400

    OMG got api_unittests to pass

 nova/api/ec2/__init__.py   |   11 +++++++----
 nova/api/ec2/apirequest.py |    6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

commit b360aded9cfeebfd7594b1b649bd2a1573203cd3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:43:55 2010 -0400

    send requests to the main API instead of to the EC2 subset -- so that it can parse out the '/services/' prefix.  Also, oops, match on path_info instead of path like we're supposed to.

 nova/api/ec2/__init__.py   |    2 +-
 nova/tests/api_unittest.py |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 0fa141a231107da931c396f113b00329d63ee430
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:10:55 2010 -0400

    Remove unused APIRequestContext.handler

 nova/api/ec2/context.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9fc2bb60f1b280e9bf28d68c20f04de2130bd398
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:07:24 2010 -0400

    Use port that boto expects

 nova/tests/api_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e55234bd86b96aa3f05b06eb1efbb1baa61a93f1
Merge: 7edff92 bb69664
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:33:06 2010 -0700

    merged orm branch

commit 7edff9298f7f01e158f90c93432384903d71e033
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:32:37 2010 -0700

    scheduler + unittests

 bin/nova-scheduler               |    4 +-
 nova/db/api.py                   |   13 +++++
 nova/db/sqlalchemy/api.py        |   31 ++++++++++++
 nova/endpoint/cloud.py           |    6 +--
 nova/flags.py                    |    2 +
 nova/scheduler/base.py           |   80 -----------------------------
 nova/scheduler/bestfit.py        |   34 -------------
 nova/scheduler/chance.py         |   37 +++++++++++---
 nova/scheduler/driver.py         |   62 +++++++++++++++++++++++
 nova/scheduler/manager.py        |   60 ++++++++++++++++++++++
 nova/scheduler/service.py        |   76 ----------------------------
 nova/scheduler/simple.py         |   81 ++++++++++++++++++++++++++++++
 nova/tests/compute_unittest.py   |    2 +-
 nova/tests/scheduler_unittest.py |  103 ++++++++++++++++++++++++++++++++++++++
 run_tests.py                     |    1 +
 15 files changed, 390 insertions(+), 202 deletions(-)

commit 09fd65ed400f8584f3289953eb54332283926b69
Merge: 8169a2a d0a353e
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 14:32:14 2010 -0400

    Merge from trunk in an attempt to figure out why signer is generating the wrong signature

commit bb69664ba0bc52a196dd3d465997966e52b0a92a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:28:50 2010 -0700

    removed underscores from used context

 nova/db/sqlalchemy/api.py |   56 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

commit 116402306e0d7703645e786b7cf0833a113b8d13
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:25:10 2010 -0700

    updated models a bit and removed service classes

 bin/nova-compute             |    4 +--
 bin/nova-network             |    8 ++----
 bin/nova-volume              |    4 +--
 nova/compute/service.py      |   31 -----------------------
 nova/db/sqlalchemy/models.py |   21 +++++++++++-----
 nova/network/service.py      |   31 -----------------------
 nova/service.py              |   56 +++++++++++++++++++++++-------------------
 nova/volume/service.py       |   31 -----------------------
 8 files changed, 52 insertions(+), 134 deletions(-)

commit 8169a2a26c5b646a4d6c63c77f15f6aaa6898cb4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 13:04:05 2010 -0400

    Small typos, plus rework api_unittest to use WSGI instead of Tornado

 nova/api/__init__.py       |    2 +-
 nova/api/ec2/__init__.py   |   10 ++--
 nova/tests/api_unittest.py |  120 ++++++++------------------------------------
 3 files changed, 29 insertions(+), 103 deletions(-)

commit d0a353e4c46773f23a25ff372ed204d17e89e049
Merge: d123703 89d8fb4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 13:43:23 2010 +0000

    Replace an if/else with a dict lookup to a factory method.

commit 89d8fb48628b6ff72a6baff1dca8772d0a7587f8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 17:53:39 2010 -0400

    Nurrr

 nova/wsgi.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7595f752137d13449b4cde5680e722582a36c1de
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 16:27:46 2010 -0400

    Abstractified generalization mechanism

 nova/wsgi.py |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

commit 3afc7623dd8bd8a3af7539f0a3eb8f0405dd002c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 1 21:00:26 2010 +0200

    Revert the changes to the qemu libvirt template and make the appropriate changes in the UML template where they belong.

 nova/virt/libvirt.qemu.xml.template |    7 ++++---
 nova/virt/libvirt.uml.xml.template  |    6 ++----
 2 files changed, 6 insertions(+), 7 deletions(-)

commit d1237038c52c1578086337f038c5b812bf6ab473
Merge: 91d88bb 58e1886
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 1 18:15:14 2010 +0000

    Create console.log ahead of time. This ensures that the user running nova-compute maintains read privileges.

commit 91d88bbad095976bf3bccb98a30d2af9aafdbd53
Merge: 937e8fa 921d9d0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 1 18:13:24 2010 +0000

    This improves the changelog generated as part of "setup.py sdist". If you look at it now, it says that Tarmac has done everything and every little commit is listed. With this patch, it only logs the "top-most" commit and credits the author rather than the committer.
    
    Example from the current output format (from current trunk):
    ##########################################
    2010-08-31  Tarmac
    
            Adjust setup.py to match nova-rsapi -> nova-api-new rename.
    
    2010-08-31  Soren Hansen  <soren.hansen@rackspace.com>
    
            Fix up setup.py to match nova-rsapi -> nova-api-new rename.
    
    2010-08-30  Tarmac
    
            Reconnect to libvirt on broken connection.
    
    2010-08-30  Soren Hansen  <soren.hansen@rackspace.com>
    
            Detect if libvirt connection has been broken and reestablish it.
    
    2010-08-30  Tarmac
    
            pylint fixes for /nova/virt/connection.py
    
    2010-08-30  jaypipes@gmail.com
    
            Merge trunk and resolve conflicts
    
    ##########################################
    
    
    
    With this patch, this is reduced to:
    
    
    ##########################################
    2010-08-31  Soren Hansen <soren.hansen@rackspace.com>
    
            Adjust setup.py to match nova-rsapi -> nova-api-new rename.
    
    2010-08-30  Soren Hansen <soren.hansen@rackspace.com>
    
            Reconnect to libvirt on broken connection.
    
    2010-08-30  jaypipes@gmail.com
    
            pylint fixes for /nova/virt/connection.py
    
    ##########################################

commit b965dde9e95e16a9a207697d5729bd146c2dfd23
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 13:55:38 2010 -0400

    Fix simple errors to the point where we can run the tests [but not pass]

 nova/api/ec2/__init__.py          |   10 +--
 nova/api/ec2/apirequestcontext.py |   33 ----------
 nova/api/ec2/cloud.py             |    2 +-
 nova/api/ec2/context.py           |   33 ++++++++++
 nova/endpoint/api.py              |  122 -------------------------------------
 nova/objectstore/handler.py       |    4 +-
 nova/tests/api_unittest.py        |    3 +-
 nova/tests/auth_unittest.py       |    2 +-
 nova/tests/cloud_unittest.py      |    6 +-
 9 files changed, 47 insertions(+), 168 deletions(-)

commit 40778d77936cb63decfc56e6b75fa4c31c13a564
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 13:28:30 2010 -0400

    notes -- conversion 'complete' except now the unit tests won't work and surely i have bugs :)

 nova/endpoint/notes.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 937e8fae0237aed835ab2a55b4d4f0885a04f1d5
Merge: d2ff9c0 aba23f9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 1 17:03:35 2010 +0000

    Moved API tests into a sub-folder of the tests/ and added a stubbed-out test declarations to mirror existing API tickets.
    
    Resubmission from earlier because of my improper file move.

commit 83df968cfb050bdb6bac981dfcc2d0b1c3dd80db
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 12:42:06 2010 -0400

    Delete rbac.py, moving @rbac decorator knowledge into api.ec2.Authorizer WSGI middleware.

 nova/api/ec2/__init__.py |   64 +++++++++++++++++++++++++++++++++++++++---
 nova/api/ec2/admin.py    |   31 ---------------------
 nova/api/ec2/cloud.py    |   30 --------------------
 nova/auth/rbac.py        |   69 ----------------------------------------------
 4 files changed, 60 insertions(+), 134 deletions(-)

commit aba23f942b36263141033f2c5c289d69d08095fc
Merge: c6100bb d2ff9c0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 1 11:41:22 2010 -0500

    Merge from trunk

commit 8de182446993ac24e7b8fba12342f8adb3e179d4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 12:02:14 2010 -0400

    Break Router() into Router() and Executor(), and put Authorizer() (currently a stub) in between them.

 nova/api/ec2/__init__.py |  101 ++++++++++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 39 deletions(-)

commit 544b73d35895ac79af910a40590095780f224abb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 10:50:31 2010 -0400

    Return error Responses properly, and don't muck with req.params -- make a copy instead

 nova/api/ec2/__init__.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

commit e7eb9443bc07a173b5885f634c80c616d9d59e9b
Merge: ad7a202 975861f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 23:21:30 2010 -0700

    merged orm branch

commit 975861fd0b8fe7c89ccb6a31b0d0c89948c18252
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 17:35:04 2010 -0700

    pylint clean of manager and service

 nova/manager.py |    6 ++----
 nova/service.py |    5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

commit 16f4faf4039ecab8119a31d77eb197a1928639ec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 17:00:48 2010 -0700

    pylint cleanup of db classes

 nova/db/api.py                |  137 +++++++++++++++++-----------------
 nova/db/sqlalchemy/api.py     |  164 +++++++++++++++++++++--------------------
 nova/db/sqlalchemy/session.py |   12 ++-
 3 files changed, 163 insertions(+), 150 deletions(-)

commit 2c16344cfea8461e96425a2c375b4dabd21f03c5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 16:48:41 2010 -0700

    rename node_name to host

 nova/compute/manager.py        |    2 +-
 nova/db/__init__.py            |   20 +++++++++
 nova/db/api.py                 |   15 ++++---
 nova/db/sqlalchemy/__init__.py |   25 ++++++++++-
 nova/db/sqlalchemy/api.py      |   28 ++++++------
 nova/db/sqlalchemy/models.py   |   92 ++++++++++++++++++++++++++--------------
 nova/endpoint/cloud.py         |    6 +--
 nova/flags.py                  |    2 +-
 nova/network/manager.py        |    4 +-
 nova/service.py                |   10 ++---
 nova/tests/model_unittest.py   |    6 +--
 nova/tests/network_unittest.py |    2 +-
 nova/tests/service_unittest.py |   36 ++++++++--------
 nova/volume/manager.py         |    4 +-
 14 files changed, 163 insertions(+), 89 deletions(-)

commit ea958aa57f3758291b6b321b5d4663cb05a5b7a0
Merge: 8e3ab21 d2ff9c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 16:16:01 2010 -0700

    merged trunk

commit d2ff9c07354666e9fad840a4e929960cc3ff3e37
Merge: 1b3afa5 871c49a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 31 19:23:53 2010 +0000

    Call getInfo() instead of getVersion() on the libvirt connection object. virConnectGetVersion was not exposed properly in the python bindings until quite recently, so this makes us rather more backwards compatible.

commit 921d9d01d731f2fda05c73775606f87b3be9aba6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 31 21:17:48 2010 +0200

    Better log formatter for Nova. It's just like gnuchangelog, but logs the author rather than the committer.

 bzrplugins/novalog/__init__.py |   59 ++++++++++++++++++++++++++++++++++++++++
 setup.py                       |    6 ++--
 2 files changed, 63 insertions(+), 2 deletions(-)

commit f22c693e4cf638ef5278d9db444da2c4a99baae4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 13:25:31 2010 -0400

    Remove all Twisted defer references from cloud.py

 nova/api/ec2/cloud.py |   86 +++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 49 deletions(-)

commit 4f3bb96df8a7e48735c078520e77a47dca7a2bd1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 12:33:49 2010 -0400

    Remove inlineCallbacks and yield from cloud.py, as eventlet doesn't need it

 nova/api/ec2/__init__.py |    1 +
 nova/api/ec2/cloud.py    |   30 ++++++++++--------------------
 nova/endpoint/notes.txt  |   16 ++++++++--------
 3 files changed, 19 insertions(+), 28 deletions(-)

commit ab43c28e583116c4885b19afc6448192aae10096
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 12:15:29 2010 -0400

    Move cloudcontroller and admincontroller into new api

 nova/api/ec2/admin.py  |  211 ++++++++++++++
 nova/api/ec2/cloud.py  |  739 ++++++++++++++++++++++++++++++++++++++++++++++++
 nova/endpoint/admin.py |  211 --------------
 nova/endpoint/cloud.py |  739 ------------------------------------------------
 4 files changed, 950 insertions(+), 950 deletions(-)

commit 1b3afa58270c1d996989f5336cc6d5c9b5a3aaaf
Merge: 9643d41 85c81f3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 31 15:08:17 2010 +0000

    Adjust setup.py to match nova-rsapi -> nova-api-new rename.

commit cb55d65827170dd9d54dbd22f32e5c2171f8e1b1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 10:55:53 2010 -0400

    small import cleanup

 nova/api/ec2/__init__.py   |    5 ++---
 nova/api/ec2/apirequest.py |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

commit 070d87df264ca949b51131df9287fbcee373d480
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 10:46:01 2010 -0400

    Get rid of some convoluted exception handling that we don't need in eventlet

 nova/api/ec2/__init__.py   |   23 +++++++----------------
 nova/api/ec2/apirequest.py |    7 ++++---
 2 files changed, 11 insertions(+), 19 deletions(-)

commit c54d6c3d1fcb0210e9f52097f1a1e85550c84bf6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 10:03:51 2010 -0400

    First steps in reworking EC2 APIRequestHandler into separate Authenticate() and Router() WSGI apps

 nova/api/__init__.py              |    4 +
 nova/api/ec2/__init__.py          |  151 +++++++++++++++++++++++++++++++++++++
 nova/api/ec2/apirequesthandler.py |  126 -------------------------------
 nova/endpoint/notes.txt           |   10 +--
 4 files changed, 160 insertions(+), 131 deletions(-)

commit 871c49adc3c824b9b1e095b0d7135c1fdab486c1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 31 10:15:20 2010 +0200

    Call getInfo() instead of getVersion() on the libvirt connection object. virConnectGetVersion was not exposed properly in the python bindings until quite recently, so this makes us rather more backwards compatible.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85c81f39e02fde5c09b12978d482151dc93a4b9e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 31 09:54:31 2010 +0200

    Fix up setup.py to match nova-rsapi -> nova-api-new rename.

 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8e3ab2119289cf082830aea39409a44cdff54e12
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 22:21:47 2010 -0700

    a little more cleanup in compute

 nova/compute/manager.py |   37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

commit e738c3995a319decbc0b8e10bf74ade794b8daa4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 22:13:22 2010 -0700

    pylint cleanup of tests

 nova/tests/compute_unittest.py |   61 +++++++++++++++-------------------------
 nova/tests/network_unittest.py |    3 +-
 nova/tests/volume_unittest.py  |   45 ++++++++++++++++-------------
 3 files changed, 50 insertions(+), 59 deletions(-)

commit e5b93d09d7095316921cd457887a8b4d8808c3c5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 21:21:31 2010 -0700

    add missing manager classes

 nova/compute/manager.py |  202 +++++++++++++++++++++++++++++
 nova/network/manager.py |  328 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 530 insertions(+)

commit ed4bcbb5fee2f7c6f27236ad196138ff7150af18
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 21:21:11 2010 -0700

    volume cleanup

 nova/volume/driver.py  |   79 +++++++++++++++++-------------------------------
 nova/volume/manager.py |    2 +-
 2 files changed, 28 insertions(+), 53 deletions(-)

commit 4374bef0536846afe9be1156b340b34e6d4c8d2d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 20:42:31 2010 -0700

    more cleanup and pylint fixes

 nova/auth/manager.py           |    2 +-
 nova/db/api.py                 |    4 +-
 nova/db/sqlalchemy/api.py      |   33 ++++++++-------
 nova/db/sqlalchemy/models.py   |   86 +++++++++++++++++++---------------------
 nova/network/linux_net.py      |    5 ++-
 nova/tests/network_unittest.py |    1 -
 nova/virt/libvirt_conn.py      |   41 ++++++++++---------
 nova/volume/driver.py          |   76 +++++++++++++++++++++--------------
 nova/volume/manager.py         |   21 +++++-----
 9 files changed, 149 insertions(+), 120 deletions(-)

commit 73c7bbce87e72b5223f11c194ff41d2da1df5c86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 18:10:52 2010 -0700

    more pep8

 nova/tests/compute_unittest.py |    3 ++-
 nova/tests/network_unittest.py |    6 ++----
 nova/tests/service_unittest.py |   27 ++++++++++++---------------
 nova/tests/volume_unittest.py  |    3 +--
 4 files changed, 17 insertions(+), 22 deletions(-)

commit b4c5c97160a6b71d37b7655c6b4039baf4ff0969
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 17:58:02 2010 -0700

    more pep8

 bin/nova-dhcpbridge  |    7 ++++---
 bin/nova-manage      |    4 ++--
 bin/nova-objectstore |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

commit a64149a8b148858414409a88f968408f9606891f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 17:53:59 2010 -0700

    pep8 cleanup

 nova/compute/model.py          |  309 ----------------------------------------
 nova/compute/service.py        |    1 -
 nova/db/sqlalchemy/__init__.py |    2 +-
 nova/db/sqlalchemy/api.py      |   17 ++-
 nova/db/sqlalchemy/models.py   |   52 +++----
 nova/db/sqlalchemy/session.py  |    2 +-
 nova/network/linux_net.py      |    6 +
 nova/volume/driver.py          |    1 -
 nova/volume/manager.py         |    6 +-
 9 files changed, 46 insertions(+), 350 deletions(-)

commit d1c7d29726bf2469dd7f05d7f460edbb613c4bb2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 17:19:04 2010 -0700

    add sqlalchemy to pip requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit ffcc019e38e61c1c3c5c2552c15259d2b8b04e5d
Merge: b9aa0da 9643d41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 16:44:30 2010 -0700

    merged trunk, fixed a couple errors

commit 1ef59040aa1304a4682c6bcdaa3333372e7f8629
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:12:31 2010 -0400

    Delete __init__.py in prep for turning apirequesthandler into __init__

 nova/api/ec2/__init__.py |   42 ------------------------------------------
 1 file changed, 42 deletions(-)

commit 4bca41506c90e779a8d4a5defdca3add79073185
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:10:17 2010 -0400

    Move APIRequestContext into its own file

 nova/api/ec2/apirequestcontext.py |   33 +++++++++++++++++++++++++++++++++
 nova/endpoint/api.py              |   12 ------------
 2 files changed, 33 insertions(+), 12 deletions(-)

commit be2b529a987627bf454f7343df74d4e8ae670761
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:08:22 2010 -0400

    Move APIRequest into its own file

 nova/api/ec2/apirequest.py |  132 ++++++++++++++++++++++++++++++++++++++++++++
 nova/endpoint/api.py       |  109 ------------------------------------
 2 files changed, 132 insertions(+), 109 deletions(-)

commit b9aa0dae0a5a64a244f1bff95ad8af22cf87f7f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 16:08:17 2010 -0700

    run and terminate work

 nova/db/sqlalchemy/api.py |    2 +-
 nova/network/linux_net.py |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

commit 909c24b9cd35d6752f9f051f4e9a80ce30eaee4d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:04:51 2010 -0400

    Move class into its own file

 nova/api/ec2/apirequesthandler.py |  126 +++++++++++++++++++++++++++++++++++++
 nova/endpoint/api.py              |  101 -----------------------------
 2 files changed, 126 insertions(+), 101 deletions(-)

commit 78b5f67153d6ef843d884ba7e94125101ab5f653
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:48:45 2010 -0700

    fix daemon get

 nova/db/sqlalchemy/models.py |   48 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

commit f0223b5135059ac6535739916a297654953751fc
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 18:38:26 2010 -0400

    Notes for converting Tornado to Eventlet

 nova/endpoint/notes.txt |   62 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

commit 6c50b37c0b60219837f940d044542f4032a4436b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:15:00 2010 -0700

    undo change to get_my_ip

 nova/utils.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit de5b1ce17a44e824f1f29ead19dac45db4e0086c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:11:46 2010 -0700

    all tests pass again

 nova/db/api.py                 |   19 ++++---
 nova/db/sqlalchemy/api.py      |  121 ++++++++++++++++++++++++++--------------
 nova/db/sqlalchemy/models.py   |   40 +++++++------
 nova/db/sqlalchemy/session.py  |    9 ++-
 nova/endpoint/cloud.py         |    4 +-
 nova/tests/compute_unittest.py |   30 +++++-----
 nova/tests/network_unittest.py |    7 +--
 nova/tests/volume_unittest.py  |    7 ++-
 8 files changed, 144 insertions(+), 93 deletions(-)

commit 4cdb0cdc6ef069287cba8a687001deee8ed23280
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 13:06:07 2010 -0700

    rollback on exit

 nova/db/sqlalchemy/session.py |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 2107ed58b1e7fccb4e1b22d4d76ebbe4b7a7bd74
Merge: fd039ee 7756a1d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 12:58:52 2010 -0700

    merged session from devin

commit 7756a1d269946f72e76bae7a8015c3d72063b2c6
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Aug 30 12:49:31 2010 -0700

    Added session.py

 nova/db/sqlalchemy/session.py |   53 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit c6100bb1b16722807a583eae2312c4d6653e5643
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Aug 30 14:04:47 2010 -0500

    Removed get_backup_schedules from the image test

 nova/tests/api/rackspace/images.py |    3 ---
 1 file changed, 3 deletions(-)

commit fd039eef503eaa65d0b0415b56ef4c975aabdd2d
Merge: 4089925 db59c27
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 11:27:31 2010 -0700

    merged devin's sqlalchemy changes

commit db59c270cd4a3a3f32e73c2ab4bf8f8e1226dd66
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Aug 30 10:51:54 2010 -0700

    Making tests pass

 nova/db/sqlalchemy/api.py      |   11 ++++++++---
 nova/db/sqlalchemy/models.py   |   10 +++++-----
 nova/tests/network_unittest.py |    1 -
 3 files changed, 13 insertions(+), 9 deletions(-)

commit 2049188559fa657703153b137182dcd3b508a95f
Merge: a6bd6f8 c9d3b7c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 12:56:33 2010 -0400

    Merge from parent

commit 9643d417c539f3e21beed743cb2f427c6ab5a469
Merge: 50498eb f277663
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 30 16:53:28 2010 +0000

    Reconnect to libvirt on broken connection.

commit 50498eb2815981f771662abcc11cb11ebb4f4451
Merge: d11bd98 3d06a37
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 16:49:52 2010 +0000

    pylint fixes for /nova/virt/connection.py

commit d11bd9863684cf9234a19b48325ee282485ce688
Merge: ca37c1a a1791cd
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 16:48:12 2010 +0000

    pylint fixes for nova/objectstore/handler.py

commit 40899259205561b43791f1540ec3f9100a4869d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 09:03:43 2010 -0700

    ip addresses work now

 bin/nova-dhcpbridge          |    4 ++--
 nova/db/api.py               |    4 ++--
 nova/db/sqlalchemy/api.py    |   10 +++++++++-
 nova/db/sqlalchemy/models.py |   15 +++++++++++++--
 nova/network/linux_net.py    |    2 --
 nova/utils.py                |    2 +-
 6 files changed, 27 insertions(+), 10 deletions(-)

commit ca37c1aba4fd83652c68094c74d22c27ee094e99
Merge: 5f14a79 c9d3b7c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 16:03:22 2010 +0000

    Add Flavors controller supporting
    
    GET /flavors
    
    GET /flavors/detail
    
    GET /flavors/<id>
    
    Also add GET /images/detail
    
    Turn the RackspaceAPIImageIdTranslator into a RackspaceAPIIdTranslator, so that it can be used to translate IDs for other rackspace API components as well (servers, backup schedules.)  I thought I'd need it for flavors but it turns out flavors are so simple I could hard code their ids into compute.instance_types.INSTANCE_TYPES.

commit a1791cdca8dbca8f9bf3555b21324503aba58fda
Merge: bf25492 5f14a79
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 10:36:59 2010 -0400

    Resolve conflicts and merge trunk

commit 3d06a37b40e68abea78175555b489a7aa5a2f7f4
Merge: 7b90671 5f14a79
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 09:19:14 2010 -0400

    Merge trunk and resolve conflicts

commit f2776632fb94bd55a428bfb9272472e4bd2517bb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 30 14:50:50 2010 +0200

    Detect if libvirt connection has been broken and reestablish it.

 nova/virt/libvirt_conn.py |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 9c98cfb47175ca9ace5c0bd731085896303e3e7b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 00:55:19 2010 -0700

    instance runs

 bin/nova-compute             |    2 +-
 bin/nova-network             |    3 +-
 bin/nova-volume              |    2 +-
 nova/db/sqlalchemy/api.py    |    2 +-
 nova/db/sqlalchemy/models.py |    1 -
 nova/endpoint/cloud.py       |   84 +++++++++++++++++++++++-------------------
 nova/service.py              |    7 ++--
 nova/utils.py                |    8 ++--
 8 files changed, 59 insertions(+), 50 deletions(-)

commit 5f14a7955b9ef90afed91bda0343130d83e15a73
Merge: 75eaa1b 47e98cd
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 30 06:23:17 2010 +0000

    Dead code removal.

commit 7639fe7cb6220f0393e6ee5ec43cd6b9ac35e5a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 29 22:41:43 2010 -0700

    remove creation of volume groups on boot

 nova/volume/driver.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit fab0bbaca8d6cf34f131c4426463bf5c76a0477f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 29 18:53:47 2010 -0700

    tests pass

 bin/nova-dhcpbridge            |   21 ++---
 nova/auth/manager.py           |    4 +-
 nova/compute/service.py        |  174 +---------------------------------------
 nova/db/api.py                 |   30 +++----
 nova/db/sqlalchemy/api.py      |    7 ++
 nova/endpoint/cloud.py         |    2 +-
 nova/manager.py                |    2 +-
 nova/service.py                |   10 +--
 nova/tests/cloud_unittest.py   |    4 +-
 nova/tests/compute_unittest.py |    3 +-
 nova/tests/fake_flags.py       |   10 ++-
 nova/tests/network_unittest.py |   14 ++--
 nova/tests/service_unittest.py |   19 +++--
 nova/tests/volume_unittest.py  |   39 ++++-----
 nova/volume/driver.py          |    5 --
 nova/volume/manager.py         |    4 +-
 16 files changed, 103 insertions(+), 245 deletions(-)

commit 6012ea583426bf76979448e4262a24a6b8fb2f5d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 23:20:06 2010 -0700

    Making tests pass

 nova/db/sqlalchemy/models.py |   34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

commit 5425a3252f6e91d842a891fbd93ee51f490bddce
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 23:06:40 2010 -0700

    Making tests pass

 nova/db/sqlalchemy/__init__.py |    3 +++
 nova/db/sqlalchemy/api.py      |   58 +++++++++++++++++++++-------------------
 nova/db/sqlalchemy/models.py   |   31 ++++++++++++++-------
 nova/tests/network_unittest.py |    1 +
 4 files changed, 55 insertions(+), 38 deletions(-)

commit ae6905b9f1ef97206ee3c8722cec3b26fc064f38
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 20:32:48 2010 -0700

    Refactored orm to support atomic actions

 nova/db/sqlalchemy/api.py    |  305 ++++++++++++++++++++++++------------------
 nova/db/sqlalchemy/models.py |  173 +++++++++++-------------
 2 files changed, 249 insertions(+), 229 deletions(-)

commit 74e5e817905322e609870e60ce55863f35ce7893
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 28 02:02:07 2010 -0700

    moved network code into business layer

 nova/db/api.py            |   46 ++++-------
 nova/db/sqlalchemy/api.py |  113 +++++---------------------
 nova/endpoint/cloud.py    |   19 ++---
 nova/flags.py             |    8 ++
 nova/network/service.py   |  192 ++-------------------------------------------
 nova/volume/service.py    |    6 --
 6 files changed, 56 insertions(+), 328 deletions(-)

commit d3f55cffc903af8250993efc58fb67d84510c8c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 23:16:31 2010 -0700

    move None context up into cloud

 nova/endpoint/cloud.py |    6 ++++--
 nova/volume/manager.py |    8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

commit 8d0f96432b7b07fa608cae433459645880f4a44c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 23:10:57 2010 -0700

    split volume into service/manager/driver

 nova/db/api.py            |   25 ++++----
 nova/db/sqlalchemy/api.py |   32 +++++-----
 nova/endpoint/cloud.py    |   10 ++-
 nova/manager.py           |   38 +++++++++++
 nova/service.py           |   32 ++++++++--
 nova/utils.py             |   23 ++++---
 nova/volume/driver.py     |  120 +++++++++++++++++++++++++++++++++++
 nova/volume/manager.py    |  122 +++++++++++++++++++++++++++++++++++
 nova/volume/service.py    |  155 ++-------------------------------------------
 9 files changed, 359 insertions(+), 198 deletions(-)

commit ff72e7baff179bb814e3b9df9fc50659a48249f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 13:46:27 2010 -0700

    moved models.py

 nova/db/sqlalchemy/api.py    |    2 +-
 nova/db/sqlalchemy/models.py |  368 ++++++++++++++++++++++++++++++++++++++++++
 nova/models.py               |  368 ------------------------------------------
 3 files changed, 369 insertions(+), 369 deletions(-)

commit 974573b738cea3b1125cb8498cb97eb79714db32
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 13:45:05 2010 -0700

    removed the last few references to models.py

 nova/db/api.py                 |   53 ++++++++++++++++++++++++++++----
 nova/db/sqlalchemy/api.py      |   66 +++++++++++++++++++++++++++++++++++-----
 nova/tests/compute_unittest.py |   39 +++++++++++-------------
 nova/tests/fake_flags.py       |    2 ++
 nova/tests/network_unittest.py |   50 +++++++++---------------------
 nova/tests/volume_unittest.py  |   32 +++++++------------
 nova/volume/service.py         |    3 --
 7 files changed, 150 insertions(+), 95 deletions(-)

commit d2a0d2ceabac76ed3069bf265335b3e857093959
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 27 20:20:49 2010 +0200

    chown disk images to root for uml. Due to libvirt dropping CAP_DAC_OVERRIDE for uml, root needs to have explicit access to the disk images for stuff to work.

 nova/virt/libvirt_conn.py |    3 +++
 1 file changed, 3 insertions(+)

commit 58e1886113e6408d502d095d382a250d33fa0195
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 27 20:17:30 2010 +0200

    Create console.log ahead of time. This ensures that the user running nova-compute maintains read privileges.

 nova/virt/libvirt_conn.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e401280bb88672017e621c82e6d3d611887c1002
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 26 12:56:07 2010 -0700

    fixed service mox test cases

 nova/tests/service_unittest.py |   56 +++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 23 deletions(-)

commit 0d20ee4894f5f8566b00f7a28fabc630ca3195aa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Aug 26 13:38:29 2010 -0500

    Renamed test.py and moved a test as per merge proposal feedback

 nova/tests/api/__init__.py          |   59 +++++++++++++++++++++++++++++++++++
 nova/tests/api/rackspace/servers.py |    3 ++
 nova/tests/api/test.py              |   59 -----------------------------------
 3 files changed, 62 insertions(+), 59 deletions(-)

commit 0e09d6fd283673cc9bd5499410cc0b0c7dbea1e9
Merge: 8b58c72 75eaa1b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Aug 26 13:35:13 2010 -0500

    Merge from trunk

commit 00ecd70fa6ec5a6d4f8444472f7fab20174815b3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 26 11:28:05 2010 -0700

    fixed volume unit tests

 nova/db/api.py                |    1 +
 nova/service.py               |    1 +
 nova/tests/fake_flags.py      |    2 ++
 nova/tests/volume_unittest.py |   63 +++++++++++++++++++++++------------------
 nova/volume/service.py        |    6 ++--
 5 files changed, 41 insertions(+), 32 deletions(-)

commit a6bd6f8581b9c03da9aceed7d87f4664410d0998
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 26 14:09:14 2010 -0400

    work endpoint/images.py into an S3ImageService.  The translation isn't perfect, but it's a start.

 nova/endpoint/images.py |   30 +++++-------------------------
 nova/image/service.py   |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 25 deletions(-)

commit 2e2a180f02a262f73097bea5f48b6572af4851bb
Merge: 428b325 75eaa1b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 26 12:45:20 2010 -0400

    get to look like trunk

commit d3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 26 15:20:01 2010 +0200

    Set UML guests to use a file as their console. This halfway fixes get-console-output for them.

 nova/virt/libvirt.qemu.xml.template |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a6784ba13821dccfb852cff3ca16f7db30bb3c05
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 16:44:10 2010 -0700

    network tests pass again

 bin/nova-dhcpbridge            |    4 --
 nova/db/api.py                 |    4 +-
 nova/flags.py                  |   19 ++++--
 nova/models.py                 |    5 --
 nova/network/service.py        |    2 -
 nova/tests/network_unittest.py |  137 ++++++++++++++++++++--------------------
 6 files changed, 83 insertions(+), 88 deletions(-)

commit 75eaa1b8f871753b9bd61c2ccd93efd813d651f9
Merge: 686ad09 af959df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 23:28:12 2010 +0000

    Fixes issue with the same ip being assigned to multiple instances.

commit af959df4076d41d950baa27905d15fbda017e0cb
Merge: 70112ea 686ad09
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 16:22:49 2010 -0700

    merged trunk and fixed tests

commit c9d3b7c3ae71bbbe6f3077dcee13be41a14a6733
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 17:48:08 2010 -0400

    Support GET /<controller>/detail

 nova/api/rackspace/__init__.py |    6 ++++--
 nova/api/rackspace/flavors.py  |    7 ++++++-
 nova/api/rackspace/images.py   |   11 ++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

commit 8b58c7296ae394772dab82fbb76469722798cc29
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Aug 25 16:37:22 2010 -0500

    Moved API tests into a sub-folder of the tests/ and added a stubbed-out test declarations to mirror existing API tickets

 nova/api/test.py                           |   61 ------------------
 nova/tests/api/rackspace/flavors.py        |   34 ++++++++++
 nova/tests/api/rackspace/images.py         |   42 ++++++++++++
 nova/tests/api/rackspace/servers.py        |   55 ++++++++++++++++
 nova/tests/api/rackspace/sharedipgroups.py |   40 ++++++++++++
 nova/tests/api/test.py                     |   59 +++++++++++++++++
 nova/tests/api/test_helper.py              |    7 ++
 nova/tests/api/wsgi_test.py                |   96 ++++++++++++++++++++++++++++
 nova/wsgi_test.py                          |   96 ----------------------------
 9 files changed, 333 insertions(+), 157 deletions(-)

commit 0aa2eceba81e569dcde8bca318b696d121fe9f81
Merge: cf0b5de 686ad09
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 16:49:32 2010 -0400

    Merge from trunk

commit cf0b5de1f78fd81ada2bada8c84e26b3238b8596
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 16:46:53 2010 -0400

    Turn imageid translator into general translator for rackspace api ids

 nova/api/rackspace/_id_translator.py |   42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

commit 35c589d18651f576935bf6d742fcfac00f61433b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 13:33:25 2010 -0700

    move network_type flag so it is accesible in data layer

 nova/db/api.py          |    3 +++
 nova/network/service.py |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 0828326898e3bc219c8205e27a3cc942e2790934
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 16:27:01 2010 -0400

    Use compute.instance_types for flavor data instead of a FlavorService

 nova/api/rackspace/flavors.py  |   27 +++++++++++++--------------
 nova/compute/instance_types.py |   14 +++++++-------
 2 files changed, 20 insertions(+), 21 deletions(-)

commit 674a5dae7c0630aef346e22950706db0caeb244b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 13:14:49 2010 -0700

    more data layer breakouts, lots of fixes to cloud.py

 nova/compute/service.py        |   10 +-
 nova/db/api.py                 |   39 +++++--
 nova/db/sqlalchemy/api.py      |   54 +++++++---
 nova/endpoint/cloud.py         |  221 +++++++++++++++++-----------------------
 nova/models.py                 |   37 +++++--
 nova/tests/network_unittest.py |    2 +-
 6 files changed, 197 insertions(+), 166 deletions(-)

commit 199b9b828d75ec6fa08481585aa5df462497c50f
Merge: 548ae49 9fa4543
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 13:14:02 2010 -0700

    merged jesse

commit 686ad09fe4416bb578661a42f6f083528d4a7ca9
Merge: 90ca9b3 428b325
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 17:52:52 2010 +0000

    Initial support for Rackspace API /image requests.  They will eventually be backed by Glance.
    
    Because we don't expect Glance to support non-public images for the Austin release, all we support is index() and show().
    
    The WSGI controller uses a service to interact with the image store (the "ImageService").  Eventually it will use a GlanceImageService, but since Glance isn't implemented yet it's hard coded to use a LocalImageService for testing.
    
    The ImageService maps URIs to image data (because Glance will be the canonical backend and that's how Glance does it), but the Rackspace API maps ids to image data.  So the images.Controller stores a mapping in the global Redis service to convert from URIs to ids.
    
    Courtesy of whatthecommit.com:
    
    (\ /)
    (O.o)
    (> <) Bunny approves these changes.

commit 90ca9b373935f2e2bddedf1f33befb35f89aaab4
Merge: e185a95 ad3bda4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 17:36:03 2010 +0000

    Fix a pep8 violation.

commit 9fa4543e9f6c6c5bb0954954649b7c691e462e3c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 25 13:27:36 2010 -0400

    improve the volume export - sleep & check export

 nova/volume/service.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit f3796786629d9374ba4813917694419a63dfb197
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 25 13:11:30 2010 -0400

    missing context and move volume_update to before the export

 nova/volume/service.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 736e4d1112247553c048798761fc41f26fc27456
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 25 12:59:54 2010 -0400

    update volume create code

 nova/volume/service.py |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

commit 7f666230e37745b174998a485fe1d7626c4862ae
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Aug 25 16:45:59 2010 +0000

    A few small changes to install_venv to let venv builds work on the tarmac box.

 tools/install_venv.py |    4 ++++
 tools/pip-requires    |    1 +
 2 files changed, 5 insertions(+)

commit 428b3256ad7e47e9f389ac8ce0ff70cc3d720e9e
Merge: 96ae5e2 e185a95
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 10:38:25 2010 -0400

    Merge from trunk

commit 3647e375a34565140e033704c496895761fef1c9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 23:09:00 2010 -0400

    small tweaks

 nova/endpoint/cloud.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit df7f1cb26261a454e6885d151a0970c93d884163
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:51:48 2010 -0400

    move create volume to work like instances

 nova/endpoint/cloud.py |   35 +++++++++++++++++++++--------------
 nova/volume/service.py |   23 +++++++++--------------
 2 files changed, 30 insertions(+), 28 deletions(-)

commit ac48bf5c1b4701640e69747c43ca10cf3442e6ff
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:41:34 2010 -0400

    work towards volumes using db layer

 nova/db/api.py            |   11 ++++++++++-
 nova/db/sqlalchemy/api.py |   12 ++++++++++++
 nova/endpoint/cloud.py    |   12 +++++++-----
 3 files changed, 29 insertions(+), 6 deletions(-)

commit ffa1fa54e3c15c12b2b92fab0f2456a2631734b7
Merge: 09bd4fa 548ae49
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:29:36 2010 -0400

    merge vish

commit 548ae499c29341d58ad18ed5262f965ad0b5b0a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 19:15:35 2010 -0700

    fix setup compute network

 nova/compute/service.py |    5 +----
 nova/network/service.py |   16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

commit 09bd4fafdba2216e0cf7e0771f0c2bc261c2ef02
Merge: affa938 3760ea4
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 21:59:41 2010 -0400

    merge vish

commit affa9384e8f948f61d51672c42e131e34193b87d
Merge: a05a53c 393eef4
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 21:59:04 2010 -0400

    merge vish

commit 3760ea4635174c26baeb5ba906621ff1abb2459f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 18:56:07 2010 -0700

    use vlan for network type since it works

 nova/network/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a05a53cbcdef571b2bb3652932078616a6a74699
Merge: 304495e 625cff4
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:33:16 2010 -0400

    merge vish

commit 304495ea8e7584a19b0e3738cf0069eb30b1ec01
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:30:06 2010 -0400

    more work on getting running instances to work

 nova/endpoint/cloud.py |   49 +++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

commit 2169e5566e5da69140dcb97ccd29fb4c1d3f93e6
Merge: f4ff329 ce658b7
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:08:16 2010 -0400

    merge vish

commit f4ff3290f86edfde896248ff5adaaed5f67dd963
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:01:32 2010 -0400

    more cleanup

 nova/db/api.py            |    5 +++
 nova/db/sqlalchemy/api.py |    4 +++
 nova/endpoint/cloud.py    |   81 ++++++++++++++-------------------------------
 nova/endpoint/images.py   |   10 +++++-
 4 files changed, 43 insertions(+), 57 deletions(-)

commit 3b70003d932607ccc13fe4cd9381475035603a70
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 17:03:03 2010 -0400

    Flavors work

 nova/api/rackspace/flavors.py |   34 +++++++++++++++++++++-
 nova/api/rackspace/images.py  |   62 ++++-------------------------------------
 2 files changed, 38 insertions(+), 58 deletions(-)

commit 96ae5e2776218adfee2cb22a4c0d7358a498a451
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:24:24 2010 -0400

    pep8

 nova/api/rackspace/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5f832cd5ea9fb858f5e8b09992cbd47d8d16f665
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:17:06 2010 -0400

    Delete unused directory

 0 files changed

commit 09bc71460b976f28c7bc6a507006d6c7c12c5824
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:16:41 2010 -0400

    Move imageservice to its own directory

 nova/api/rackspace/images.py |    4 +-
 nova/api/services/image.py   |   90 ------------------------------------------
 nova/image/service.py        |   90 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 92 deletions(-)

commit 4a28728cac1d94b3ec88f83ac4dbcfad11b08b02
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 15:23:52 2010 -0400

    getting run/terminate/describe to work

 nova/db/api.py            |   25 +++++++-
 nova/db/sqlalchemy/api.py |   26 ++++++++
 nova/endpoint/cloud.py    |  156 ++++++++++++++++++++++-----------------------
 3 files changed, 126 insertions(+), 81 deletions(-)

commit 4d1b2539d2d2f39ca53e9383e317af76dbc71905
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 13:37:18 2010 -0400

    OK, break out ternary operator (good to know that it slowed you down to read it)

 nova/wsgi.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d94eec3d2995c97c38006e4d6177740375860f8f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 11:19:51 2010 -0400

    Style fixes

 nova/api/rackspace/images.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 393eef48ce792206a3e2a678933aa120b535309e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:54:16 2010 -0700

    fix some errors with networking rules

 nova/network/linux_net.py |   18 +++++++++---------
 nova/network/service.py   |    3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

commit d832003f1743ab0e1c4ef935f3e4f1d02691bc39
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:30:48 2010 -0700

    typo in release_ip

 bin/nova-dhcpbridge |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5860a54bff6852af9eb5d02a8351ac6cb648ecd3
Merge: 91892a5 a05a53c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:14:10 2010 -0700

    run instances works

commit e185a95ae6396e86e92b4a5e7ec92b5b422847d5
Merge: 4f6cc65 200daa3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 24 06:04:36 2010 +0000

    Ensure that --gid and --uid options work for both twisted and non-twisted daemons.

commit 4f6cc65e630f71435be9032d10e08a92c5937e81
Merge: b2e3c6b a39a155
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 05:58:58 2010 +0000

    Fixes an error in setup_compute_network that was causing network setup to fail.

commit 91892a5e3f51957d858fe34e64758526515a4824
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:48:16 2010 -0700

    add back in the needed calls for dhcpbridge

 nova/network/service.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit a2cb9dee1d041bb60b3e61cb4b94308ff200fe7e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:35:46 2010 -0700

    removed old imports and moved flags

 nova/db/api.py          |   14 ++++++++++++++
 nova/network/service.py |   15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

commit 625cff41325cef39bb69b960ce993c15943431cb
Merge: ea471ab 2169e55
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:32:49 2010 -0700

    merge and fixes to creates to all return id

commit ea471ab48c50555a938b9d0d11330f6ee14b9b10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:25:09 2010 -0700

    bunch more fixes

 nova/db/api.py            |    5 ++++
 nova/db/sqlalchemy/api.py |    5 ++++
 nova/endpoint/cloud.py    |    2 +-
 nova/network/service.py   |   72 +++++++++++----------------------------------
 4 files changed, 28 insertions(+), 56 deletions(-)

commit ce658b72aebe3d2caf41d5250c56e40474501014
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:06:49 2010 -0700

    moving network code and fixing run_instances

 nova/db/api.py            |   25 ++++++++++++++++++-----
 nova/db/sqlalchemy/api.py |   26 ++++++++++++++++++------
 nova/endpoint/cloud.py    |   49 +++++++++++++++++++++++++++------------------
 nova/network/service.py   |   12 +++++------
 4 files changed, 76 insertions(+), 36 deletions(-)

commit 14055e979fcfd7f085c16416f7344d146dd714dc
Merge: 4b5c1b9 4a28728
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 20:40:35 2010 -0700

    jesse's run_instances changes

commit 4b5c1b9137f46f811be8f7e55cc540c5898b3369
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 20:39:19 2010 -0700

    fix daemons and move network code

 nova/auth/manager.py           |    8 ++++---
 nova/db/api.py                 |   25 ++++++++++++++++----
 nova/db/sqlalchemy/api.py      |   51 ++++++++++++++++++++++++++--------------
 nova/network/service.py        |   16 +------------
 nova/service.py                |   21 +++++------------
 nova/tests/network_unittest.py |   11 ++++-----
 6 files changed, 72 insertions(+), 60 deletions(-)

commit b2e3c6bce6f1de3630886534c764817a7060905b
Merge: cfe3b2a 4a23d5d
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 24 00:18:22 2010 +0000

    Rework virt.xenapi's concurrency model.  There were many places where we were
    inadvertently blocking the reactor thread.  The reworking puts all calls to
    XenAPI on background threads, so that they won't block the reactor thread.
    
    Long-lived operations (VM start, reboot, etc) are invoked asynchronously
    at the XenAPI level (Async.VM.start, etc).  These return a XenAPI task.  We
    relinquish the background thread at this point, so as not to hold threads in
    the pool for too long, and use reactor.callLater to poll the task.
    
    This combination of techniques means that we don't block the reactor thread at
    all, and at the same time we don't hold lots of threads waiting for
    long-running operations.
    
    There is a FIXME in here: get_info does not conform to these new rules.
    Changes are required in compute.service before we can make get_info
    non-blocking.

commit 157ef10b3048f0bb26ce0909d77698ffb37e45df
Merge: 78c2175 cfe3b2a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 14:36:14 2010 -0700

    merged trunk and fixed merge errors

commit 78c2175898a468ae734e27dfbc8f5b70f90fd477
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 13:55:16 2010 -0700

    Refactored network model access into data abstraction layer.
    
    Also changed the name to floating_ip.

 bin/nova-dhcpbridge            |   23 +--
 nova/db/api.py                 |  112 +++++++++++++-
 nova/db/sqlalchemy/api.py      |  187 ++++++++++++++++++++++-
 nova/endpoint/cloud.py         |   28 ++--
 nova/models.py                 |    8 +-
 nova/network/linux_net.py      |   24 +--
 nova/network/service.py        |  328 +++++++++++++++-------------------------
 nova/tests/network_unittest.py |   70 ++++-----
 8 files changed, 497 insertions(+), 283 deletions(-)

commit 41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 16:43:25 2010 -0400

    Merge fail

 nova/api/rackspace/base.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35a08780c41ece1b47b2ded98c061b103a400fea
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 13:26:10 2010 -0400

    Get the output formatting correct.

 nova/api/rackspace/images.py |    9 ++++++---
 nova/api/services/image.py   |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

commit c49c725e43cfbc9d90b5e9ebbf93a32e71c7e6a9
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 13:07:43 2010 -0400

    Typo

 nova/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f5c03fdd78a3bb8233e465c7624ed1fdb8f400fe
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 13:06:40 2010 -0400

    Don't serialize in Controller subclass now that wsgi.Controller handles it for us

 nova/api/rackspace/images.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit a50a200bc2547439a3da17e695224d3d434e14dd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:55:57 2010 -0400

    Move serialize() to wsgi.Controller so __call__ can serialize() action return values if they are dicts.

 nova/api/rackspace/base.py |   10 ----------
 nova/wsgi.py               |   16 ++++++++++++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

commit 776e34c572e6b74c54994905573c1540b6e3a9ba
Merge: 030d01f cfe3b2a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:47:12 2010 -0400

    Merge from trunk

commit 030d01fd10f7f65cdafbea49e04f3b6b147a7348
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:46:29 2010 -0400

    Serialize properly

 nova/api/rackspace/base.py   |    3 ++-
 nova/api/rackspace/images.py |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit e3727d6d88a0631d3b896c4fcdcfec05510dad36
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:07:20 2010 -0400

    Support opaque id to rs int id as well

 nova/api/rackspace/images.py |   42 ++++++++++++++++++++++++++++++++----------
 nova/api/services/image.py   |    8 ++++----
 2 files changed, 36 insertions(+), 14 deletions(-)

commit d38f21e0fb382bd8f01cfbc79cb34ea8710cd639
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 10:27:59 2010 -0400

    License

 nova/api/services/image.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 152baf34247c5a4b76f643cac0d33c0158de0bfa
Author: andy <code@term.ie>
Date:   Sat Aug 21 15:37:00 2010 +0200

    Moves auth.manager to the data layer.
    
    A couple weird things are going on, I added a try-except in
    Manager.delete_project because it seems to have an issue finding the
    network to delete, I think something is probably deleting it before the
    tests get a chance to.
    
    Also stubbed out task.LoopingCall in service_unittest because there
    wasn't a good way to kill the task from outside of
    service.Service.create()

 nova/auth/manager.py           |   35 +++++++++++++++++++----------------
 nova/db/api.py                 |    8 ++++++++
 nova/db/sqlalchemy/api.py      |   13 ++++++++++++-
 nova/network/service.py        |    7 ++++---
 nova/tests/network_unittest.py |    4 ++++
 nova/tests/service_unittest.py |   11 +++++++++++
 6 files changed, 58 insertions(+), 20 deletions(-)

commit 6f5aa18747384f46f8d89ac0d6c82a710849ce59
Author: andy <code@term.ie>
Date:   Sat Aug 21 14:10:36 2010 +0200

    Add db abstraction and unittets for service.py.
    
    Also cleans up some style pieces.

 nova/db/api.py                 |   15 +++++
 nova/db/sqlalchemy/api.py      |   28 +++++++-
 nova/service.py                |   55 +++++++++-------
 nova/tests/service_unittest.py |  139 ++++++++++++++++++++++++++++++++++++++++
 run_tests.py                   |    1 +
 5 files changed, 213 insertions(+), 25 deletions(-)

commit 759bab6059ef2e4c463a73e12fe85fe4b147eba7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Aug 21 13:07:03 2010 +0100

    Clarified what the 'Mapped device not found' exception really means.
    Fixed TODO.
    Some formatting to be closer to 80 chars

 nova/compute/disk.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit c4bf107b7e4fd64376dab7ebe39e4531f64879c5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Aug 21 11:54:03 2010 +0100

    Added missing "self."

 nova/process.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0d61264b578fe4be91828cd13d93372835ff8764
Author: andy <code@term.ie>
Date:   Sat Aug 21 12:47:21 2010 +0200

    Alphabetize the methods in the db layer.
    
    There are enough of them in there that it is probably useful to keep
    them organized.
    
    Also moved the NoMoreBlades to db, it is likely to be shared by any
    implementation.

 nova/db/api.py                |  100 +++++++++++++++++-------------
 nova/db/sqlalchemy/api.py     |  135 ++++++++++++++++++++++-------------------
 nova/models.py                |   12 ++--
 nova/tests/volume_unittest.py |    2 +-
 nova/volume/service.py        |    2 +-
 5 files changed, 139 insertions(+), 112 deletions(-)

commit 70112ea9941b92aa98e32c0c37f0208877953557
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 20 13:05:46 2010 -0700

    fix concurrency issue with multiple instances getting the same ip

 nova/network/model.py |   39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

commit a39a155342ad5aa9d8c7b115fb6fe7498ef00f23
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 20 10:08:05 2010 -0700

    small fixes to network

 nova/network/service.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 41864e2653286fd46c7b69ee992d4be492b014c6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Aug 20 14:50:43 2010 +0100

    Fixed typo

 nova/process.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ae66c595d4f85802045734ed1b230a292f9c953
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Aug 20 13:26:24 2010 +0100

    Better error message on subprocess spawn fail, and it's a ProcessExecutionException irrespective of how the process is run.

 nova/process.py |   65 ++++++++++++++++++++++++++-----------------------------
 nova/utils.py   |   17 +++++++++++++--
 2 files changed, 46 insertions(+), 36 deletions(-)

commit cfe3b2a6dd73e56652f99a573c1bb0abe5a648d4
Merge: 49ef2b2 e5a448a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Aug 20 01:24:59 2010 +0000

    Check exit codes when spawning processes by default
    Also pass --fail to curl so that it sets exit code when download fails

commit 49ef2b293429c9f9b3d7444402e3f7d3d0570d48
Merge: 6dc6d94 59c43ba
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 20 01:23:32 2010 +0000

    PEP8/pylint cleanup in bin and nova/auth.

commit a5a1ba53fdd122f85e61d74756d19d732805a357
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 19 13:58:43 2010 -0700

    move volume code into datalayer and cleanup

 nova/compute/service.py       |   17 +++--
 nova/db/api.py                |   91 ++++++++++++++++++++++++---
 nova/db/sqlalchemy/api.py     |  114 +++++++++++++++++++++++++++++++--
 nova/models.py                |    1 -
 nova/tests/volume_unittest.py |   11 ++--
 nova/volume/service.py        |  140 +++++++++++++----------------------------
 6 files changed, 247 insertions(+), 127 deletions(-)

commit b651008e7e4f60f2ccb07497c27d866814156209
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 19 16:05:27 2010 -0400

    Complete the Image API against a LocalImageService until Glance's API exists (at which point we'll make a GlanceImageService and make the choice of ImageService plugin configurable.)

 nova/api/rackspace/images.py |   83 ++++++++++++++++++++++++++++--------------
 nova/api/rackspace/notes.txt |   23 ++++++++++++
 nova/api/services/image.py   |   72 ++++++++++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+), 27 deletions(-)

commit 6dc6d94035b17d81951a4c180c97ecd3f7e7a5ab
Merge: 2af3bad 24c7080
Author: Eric Day <eday@oddments.org>
Date:   Thu Aug 19 18:53:44 2010 +0000

    Added unit tests for WSGI helpers and base WSGI API.

commit cde815009cc1637b2abb58d5919b356453d122c2
Merge: a74f2a3 a924659
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 19 11:13:53 2010 -0700

    merged termies abstractions

commit 4a23d5d9091823e9b4dc364383a14b566af80cd6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 19 15:12:46 2010 +0100

    Move deferredToThread into utils, as suggested by termie.

 nova/utils.py       |    8 ++++++++
 nova/virt/xenapi.py |   18 ++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

commit 567aa0ac862f0cb18786f20d949ab75bd800c3c7
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 19 15:05:13 2010 +0100

    Remove whitespace to match style guide.

 nova/virt/xenapi.py |   15 ---------------
 1 file changed, 15 deletions(-)

commit a92465922fb74ca2c9b392e1c1b7ed5b5e306a76
Author: andy <code@term.ie>
Date:   Thu Aug 19 12:28:45 2010 +0200

    Data abstraction for compute service

 nova/compute/service.py   |  144 +++++++++++++++++++++++----------------------
 nova/db/__init__.py       |    3 +
 nova/db/api.py            |   53 +++++++++++++++++
 nova/db/sqlalchemy/api.py |   43 ++++++++++++++
 nova/models.py            |    6 ++
 nova/utils.py             |   33 +++++++++++
 6 files changed, 211 insertions(+), 71 deletions(-)

commit f996ec188776ffcae62bcafc1925653a1602880f
Author: andy <code@term.ie>
Date:   Thu Aug 19 11:12:44 2010 +0200

    this file isn't being used

 nova/auth.py |  741 ----------------------------------------------------------
 1 file changed, 741 deletions(-)

commit 59c43ba5b8213e39f726acbe2b137998cae39a26
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 22:14:34 2010 -0700

    Cleaned up pep8/pylint style issues in nova/auth. There are still a few pylint warnings in manager.py, but the patch is already fairly large.

 nova/auth/fakeldap.py   |   37 +++++++++++++----------
 nova/auth/ldapdriver.py |   62 +++++++++++++++++++-------------------
 nova/auth/manager.py    |   76 +++++++++++++++++++++++++----------------------
 nova/auth/rbac.py       |   38 ++++++++++++++++--------
 nova/auth/signer.py     |   51 ++++++++++++++++++-------------
 5 files changed, 149 insertions(+), 115 deletions(-)

commit 24c7080249113fc6c87a58d97405f5d32c6db5e2
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 18:38:34 2010 -0700

    More pylintrc updates.

 pylintrc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit a74f2a3ca4e26c451a002f9a89f3ba4ac4a083c4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 18:32:08 2010 -0700

    fix report state

 nova/compute/service.py |   26 --------------------------
 nova/models.py          |    2 +-
 nova/service.py         |   13 +++++++------
 3 files changed, 8 insertions(+), 33 deletions(-)

commit 47e98cdae2a6233cb475c34207758a29c0ef7a4c
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 18:25:16 2010 -0700

    Removed old cloud_topic queue setup, it is no longer used.

 bin/nova-api                 |    8 --------
 nova/endpoint/cloud.py       |    1 -
 nova/flags.py                |    1 -
 nova/tests/cloud_unittest.py |    4 ----
 4 files changed, 14 deletions(-)

commit 9ab034f8b0cb0946e1fdf44937cce58b53e7530b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 18:03:58 2010 -0700

    last few test fixes

 bin/nova-dhcpbridge            |   14 ++++++++----
 nova/network/service.py        |    9 ++++----
 nova/tests/fake_flags.py       |    3 ++-
 nova/tests/network_unittest.py |   48 ++++++++++++++++------------------------
 4 files changed, 35 insertions(+), 39 deletions(-)

commit b8747fb38eb1234744cdda85cb20bd27cd7fa9e8
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 17:39:12 2010 -0700

    More bin/ pep8/pylint cleanup.

 bin/nova-compute                     |    2 +-
 bin/nova-dhcpbridge                  |   14 +++++++-------
 bin/nova-import-canonical-imagestore |    4 ++--
 bin/nova-instancemonitor             |    5 +++--
 bin/nova-manage                      |    6 +++---
 bin/nova-network                     |    1 +
 bin/nova-objectstore                 |    2 +-
 bin/nova-volume                      |    2 +-
 8 files changed, 19 insertions(+), 17 deletions(-)

commit f7c556324d52095323ec18296c4064e5bb626c96
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 17:38:51 2010 -0700

    fixing more network issues

 bin/nova-dhcpbridge            |   10 ++--
 nova/auth/manager.py           |   20 ++++---
 nova/models.py                 |  125 +++++++++++++++++++++++++---------------
 nova/network/service.py        |   20 +++++--
 nova/service.py                |   23 ++++++--
 nova/tests/auth_unittest.py    |    1 -
 nova/tests/network_unittest.py |   28 +++++----
 nova/tests/volume_unittest.py  |    1 -
 run_tests.py                   |    2 +-
 9 files changed, 147 insertions(+), 83 deletions(-)

commit bde9618560665392b00dd320b22804020d411b8a
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 17:38:00 2010 -0700

    Added '-' as possible charater in module rgx.

 pylintrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b824cfc50f793ea2caf867999cbadc61ad4a02d8
Merge: 2524dde e5a448a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 23:27:18 2010 +0100

    Merged with trunk

commit 02592d584cc21e536574d20b01d8dbf82474bcd3
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 15:00:20 2010 -0700

    Updated the tests to use webob, removed the 'called' thing and just use return values instead.

 nova/api/test.py  |   43 +++++++++++----------------
 nova/wsgi_test.py |   83 +++++++++++++++--------------------------------------
 2 files changed, 40 insertions(+), 86 deletions(-)

commit e5a448a616173cd391aaf458f5e0e5ff94a42c89
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 22:33:11 2010 +0100

    Fix unit test bug this uncovered: don't release_ip that we haven't got from issue_ip

 nova/tests/network_unittest.py |    1 -
 1 file changed, 1 deletion(-)

commit 7e403e381612e5678aa8f2b9e714d472ba4b3ef0
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 22:19:39 2010 +0100

    Fix to better reflect (my believed intent) as to the meaning of error_ok (ignore stderr vs accept failure)

 nova/volume/service.py |   10 +++++-----
 tools/install_venv.py  |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

commit d8f8d121a00173cb3f5fb5e496cc010dc179cf19
Merge: 993563b 2af3bad
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 22:14:24 2010 +0100

    Merged with trunk

commit 50b8aea8c775a2a16da579291f69daf313441a81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 13:11:49 2010 -0700

    use with_lockmode for concurrency issues

 nova/models.py                |   87 +++++++++++++++++++++--------------------
 nova/network/service.py       |   85 +++++++++++++++++++---------------------
 nova/tests/volume_unittest.py |    8 +++-
 nova/volume/service.py        |   28 +++++--------
 4 files changed, 101 insertions(+), 107 deletions(-)

commit 8336a7cc6f9cd3a8b82e8b2cd5017d23b7da387f
Merge: 2eb1287 2af3bad
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 16:04:54 2010 -0400

    Merge from trunk

commit 2af3bad97be40c135fb73f2e595e7fda86f17900
Merge: 663667c 4e5e72d
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 19:43:18 2010 +0000

    First in a series of patches to port the API from Tornado to WSGI. Also includes a few small style fixes in the new API code.

commit 2eb1287f8d8c88eada2a14bed06ed1613c9beed2
Merge: 24a6fd4 4e5e72d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 13:09:34 2010 -0400

    Pull in ~eday/nova/api-port

commit fd56f6ad60651f8efe045e4ec4e4cefda5cb0c88
Merge: 9f394be 663667c
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 09:38:30 2010 -0700

    Merged trunk.

commit 9f394bedb63970b0a3cc90cfc5ba4afbb2f2e5d0
Merge: 67ea462 4e5e72d
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 09:36:28 2010 -0700

    Merged api-port into api-port-1.

commit 663667cdcf1bd16be33dc9b993123b7fc566caed
Merge: 018ce9a 7cd16b5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 16:28:27 2010 +0000

    Since pylint=0.19 is our version, force everyone to use the disable-msg syntax.

commit 7cd16b5754a38257d6b492bc29e6f99f2537f11a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 12:09:29 2010 -0400

    Missed one

 pylintrc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4e5e72da2e3242026d757c8d5143e16f9d00cb6a
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 08:56:33 2010 -0700

    Removed the 'controllers' directory under 'rackspace' due to full class name redundancy.

 nova/api/rackspace/__init__.py                   |    8 +--
 nova/api/rackspace/base.py                       |   30 ++++++++
 nova/api/rackspace/controllers/base.py           |   30 --------
 nova/api/rackspace/controllers/flavors.py        |   18 -----
 nova/api/rackspace/controllers/images.py         |   18 -----
 nova/api/rackspace/controllers/servers.py        |   83 ----------------------
 nova/api/rackspace/controllers/sharedipgroups.py |   18 -----
 nova/api/rackspace/flavors.py                    |   18 +++++
 nova/api/rackspace/images.py                     |   18 +++++
 nova/api/rackspace/servers.py                    |   83 ++++++++++++++++++++++
 nova/api/rackspace/sharedipgroups.py             |   18 +++++
 11 files changed, 171 insertions(+), 171 deletions(-)

commit ad3bda4b1a81ee60230869a3d207141f7315a3ca
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 11:53:41 2010 -0400

    pep8 typo

 tools/install_venv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b380e4a93f6d8ebc772c3989d27f9549b730eee5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 11:44:24 2010 -0400

    Changed our minds: keep pylint equal to Ubuntu Lucid version, and use disable-msg throughout.

 bin/nova-rsapi                     |    2 +-
 nova/network/linux_net.py          |    4 ++--
 nova/network/model.py              |    8 ++++----
 nova/network/service.py            |    2 +-
 nova/network/vpn.py                |    2 +-
 nova/rpc.py                        |    8 ++++----
 nova/test.py                       |   10 +++++-----
 nova/tests/network_unittest.py     |    4 ++--
 nova/tests/objectstore_unittest.py |   16 ++++++++--------
 nova/tests/rpc_unittest.py         |    2 +-
 nova/wsgi.py                       |    4 ++--
 tools/pip-requires                 |    2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

commit 43d2310f87a2f78f342b171de403f3db74a98295
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 08:39:28 2010 -0700

    Fixed typo.

 nova/api/rackspace/controllers/servers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 24a6fd40f657896fb20249392be6ed41c30ca679
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 11:19:40 2010 -0400

    Image API work

 nova/endpoint/newapi.py                       |    4 ---
 nova/endpoint/rackspace/controllers/base.py   |    9 +++++
 nova/endpoint/rackspace/controllers/images.py |   48 ++++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 5 deletions(-)

commit 738bcb7d381a67b0884d861c7ad48fa08e37106a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 10:39:59 2010 -0400

    Newest pylint supports 'disable=', not 'disable-msg='

 bin/nova-rsapi                     |    2 +-
 nova/test.py                       |   10 +++++-----
 nova/tests/objectstore_unittest.py |   16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

commit 23e9600fc69541e132f36e27296104442df7ba41
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 10:09:11 2010 -0400

    Fix pep8 violation

 tools/install_venv.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 142f6f6d3e7ce63e0a34cf68c8473d047766e093
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 04:08:32 2010 -0700

    tests pass

 nova/models.py                |   10 +++++--
 nova/network/service.py       |    6 ++--
 nova/tests/volume_unittest.py |   26 ++++++++++++-----
 nova/volume/service.py        |   62 +++++++++++++++++++++++------------------
 4 files changed, 65 insertions(+), 39 deletions(-)

commit 62e3bab39fcd9628325c3a16d4b76b5e82e35099
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 02:07:04 2010 -0700

    network tests pass

 bin/nova-dhcpbridge            |    6 +-
 nova/auth/manager.py           |    5 +-
 nova/network/exception.py      |    5 +
 nova/network/service.py        |   15 +--
 nova/tests/network_unittest.py |  257 +++++++++++++++++++++-------------------
 5 files changed, 158 insertions(+), 130 deletions(-)

commit 67ea462eadcc02ca2f8244062c786bd98871e9e8
Author: Eric Day <eday@oddments.org>
Date:   Tue Aug 17 23:46:16 2010 -0700

    Added unittests for wsgi and api.

 nova/api/__init__.py |    5 +-
 nova/api/test.py     |   70 ++++++++++++++++++++++++++
 nova/wsgi.py         |   17 ++++---
 nova/wsgi_test.py    |  133 ++++++++++++++++++++++++++++++++++++++++++++++++++
 pylintrc             |   14 ++++--
 5 files changed, 224 insertions(+), 15 deletions(-)

commit 8eb531becb7e67169fddb8f7d1547589ab733dc7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 20:33:37 2010 -0700

    almost there

 bin/nova-dhcpbridge            |   17 +++++-----
 nova/models.py                 |    9 +++--
 nova/network/linux_net.py      |   28 +++++++++-------
 nova/network/service.py        |    3 +-
 nova/tests/network_unittest.py |   71 +++++++++++++++++++---------------------
 5 files changed, 65 insertions(+), 63 deletions(-)

commit c41d9601555c78e3c91fb481fdfb3d50ffdf440b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 19:41:17 2010 -0700

    progress on tests passing

 nova/compute/service.py        |   11 ++-----
 nova/models.py                 |   50 +++++++++++++++++++++++++-----
 nova/network/service.py        |   46 +++++++++++++++++----------
 nova/tests/fake_flags.py       |    1 +
 nova/tests/network_unittest.py |   67 +++++++++++++++++++++++-----------------
 nova/virt/fake.py              |   16 +++++-----
 6 files changed, 121 insertions(+), 70 deletions(-)

commit f9214212f1aed4e574f6be6c32a6002a3621625e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 18:10:11 2010 -0700

    remove references to deleted files so tests run

 nova/endpoint/cloud.py         |    1 -
 nova/tests/network_unittest.py |    2 --
 2 files changed, 3 deletions(-)

commit 49f391642639fd0f5bdcc5e791b839eb3a702850
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 18:08:39 2010 -0700

    fix vpn access for auth

 nova/auth/manager.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit cdcbd516f62290697643eecc56550460bd48ff14
Merge: 1cd448f 018ce9a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 17:58:52 2010 -0700

    merged trunk

commit 1cd448f907e132c451d6b27c64d16c17b7530952
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 16:56:16 2010 -0700

    removed extra files

 nova/network/model.py |  609 -------------------------------------------------
 nova/network/vpn.py   |  127 -----------
 2 files changed, 736 deletions(-)

commit f8f8bc61e0a87b5b72b4539ea3c7b219235a0693
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 16:55:45 2010 -0700

    network datamodel code

 nova/models.py            |   84 +++++++++--
 nova/network/linux_net.py |   14 +-
 nova/network/model.py     |   18 ---
 nova/network/service.py   |  354 ++++++++++++++++++++++++++++-----------------
 4 files changed, 297 insertions(+), 173 deletions(-)

commit 1e403e56dc1147ce3feea1b8931948bc35f23a44
Author: Eric Day <eday@oddments.org>
Date:   Tue Aug 17 16:43:37 2010 -0700

    In an effort to keep new and old API code separate, I've created a nova.api to put all new API code under. This means nova.endpoint only contains the old Tornado implementation. I also cleaned up a few pep8 and other style nits in the new API code.

 bin/nova-api-new                                   |   34 ++++++++
 bin/nova-rsapi                                     |   34 --------
 nova/api/__init__.py                               |   38 +++++++++
 nova/api/ec2/__init__.py                           |   42 ++++++++++
 nova/api/rackspace/__init__.py                     |   81 +++++++++++++++++++
 nova/api/rackspace/controllers/base.py             |   30 +++++++
 nova/api/rackspace/controllers/flavors.py          |   18 +++++
 nova/api/rackspace/controllers/images.py           |   18 +++++
 nova/api/rackspace/controllers/servers.py          |   83 ++++++++++++++++++++
 nova/api/rackspace/controllers/sharedipgroups.py   |   18 +++++
 nova/endpoint/aws/__init__.py                      |   22 ------
 nova/endpoint/newapi.py                            |   51 ------------
 nova/endpoint/rackspace/__init__.py                |   83 --------------------
 nova/endpoint/rackspace/controllers/__init__.py    |    5 --
 nova/endpoint/rackspace/controllers/base.py        |    9 ---
 nova/endpoint/rackspace/controllers/flavors.py     |    1 -
 nova/endpoint/rackspace/controllers/images.py      |    1 -
 nova/endpoint/rackspace/controllers/servers.py     |   63 ---------------
 .../rackspace/controllers/sharedipgroups.py        |    1 -
 19 files changed, 362 insertions(+), 270 deletions(-)

commit 018ce9abbfb7047eff1e99379fba098a365e89eb
Merge: 1d47c19 3d15adb
Author: jaypipes@gmail.com <>
Date:   Tue Aug 17 22:33:46 2010 +0000

    No longer installs a virtualenv automatically and adds new options to bypass the interactive prompt.

commit 200daa3e5d5571add6c2937cf847641d065e87b8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 18 00:05:06 2010 +0200

    Stylistic improvements.

 nova/flags.py  |    2 --
 nova/twistd.py |    6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 3ef3c2681f04ca9e9beb6a7187447549454fb8c8
Merge: fb6bf33 1d47c19
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 17 22:54:34 2010 +0100

    Merge with trunk, in particular merging with the style cleanup that caused
    conflicts with this branch.

commit 1d47c190ea90ab34e98e7a76104f919d6bcd5be0
Merge: f87fb14 d1185ad
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 17 21:28:25 2010 +0000

    Add documentation to spawn, reboot, and destroy stating that those functions
    should return Deferreds.  Update the fake implementations to do so (the
    libvirt ones already do, and making the xenapi ones do so is the subject of
    a current merge request).

commit 8a8a1400426ca5355fa778ee34edc7b72ae74566
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 13:02:11 2010 -0700

    start with model code

 nova/models.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 383764fb36858f5f7f2b36ca283563d2581dabdb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 13:00:46 2010 -0700

    clean up linux_net

 nova/network/linux_net.py |  243 ++++++++++++++++++++++++++-------------------
 nova/network/service.py   |   22 ++--
 2 files changed, 155 insertions(+), 110 deletions(-)

commit 832d47435ce7f95310c5e88d763026413b041865
Merge: 9ead059 665ef27
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 11:11:36 2010 -0700

    merged refresh from sleepsonthefloor

commit f87fb14dcbbe6c9e15c19a4ef37da4dc9c67943d
Merge: 8828722 e8be36d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 17:33:50 2010 +0000

    See description of change... what's the difference between that message and this message again?

commit e8be36d7a7be2ebbf5493766ce909d7913bf61e0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 13:23:20 2010 -0400

    Move eventlet-using class out of endpoint/__init__.py into its own submodule, so that twisted-related code using endpoint.[other stuff] wouldn't run eventlet and make unit tests throw crazy errors about eventlet 0.9.10 not playing nicely with twisted.

 bin/nova-rsapi            |    5 ++---
 nova/endpoint/__init__.py |   51 ---------------------------------------------
 nova/endpoint/newapi.py   |   51 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 54 deletions(-)

commit f92851ba8ffcb530f6f3c4ea354dd89d29146f6c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 13:03:38 2010 -0400

    Remove duplicate definition of flag

 nova/endpoint/rackspace/__init__.py |    4 ----
 1 file changed, 4 deletions(-)

commit 882872200487e9d4f560157f1e43d9f6ef7df81b
Merge: de6576d 9878a6b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 15:38:31 2010 +0000

    The file that I create automates this step in http://wiki.openstack.org/InstallationNova20100729 :
    
    # is there an easier way to do this? automation? Relative paths?
    echo "/path/to/bzr/branch" > /path/to/bzr/branch/.nova-venv/lib/python2.6/site-packages/nova.pth

commit 9878a6b8b4691e206dc5d35c39313880db34f229
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 11:03:15 2010 -0400

    Simpler installation, and, can run install_venv from anywhere instead of just from checkout root

 tools/install_venv.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 31c08591793311606551bf0e6bfc14b155b491a6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 17 16:46:19 2010 +0200

    Use the argument handler specified by twistd, if any.

 nova/flags.py  |    3 +++
 nova/server.py |    6 +++++-
 nova/twistd.py |   12 +++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

commit de6576d289e15935fc6ccafe9703191a01deb6c5
Merge: b07a851 d508418
Author: andy <code@term.ie>
Date:   Tue Aug 17 11:53:30 2010 +0000

    Fixes quite a few style issues across the entire nova codebase bringing it much closer to the guide described in HACKING.

commit ad7a20231a8fb11bf7c75f2e180735e2de450102
Merge: d1982a5 b07a851
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 16 15:56:28 2010 -0500

    merge from trunk

commit 9ead059cf4dfc951fa52671f26c6b10a823b2cb8
Merge: b80a555 b07a851
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 12:10:08 2010 -0700

    merged trunk

commit b80a555549d4380b29d1aa0c8ac267111544cc4e
Merge: fa70aef adcde1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 12:08:31 2010 -0700

    merged trunk and fixed conflicts

commit b07a85167ffde07747fc6e892df46686b95529e8
Merge: adcde1a a96b4c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 19:03:50 2010 +0000

    Fixes issues with allocation and deallocation of fixed and elastic addresses.

commit adcde1a3d8d9fb50e45b794ad90217c03a0aac23
Merge: 627356d 4c39eca
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 16 18:18:16 2010 +0000

    Added documentation for the nova.virt connection interface, a note about the need to chmod the objectstore script, and a reference for the XenAPI module.

commit bf2549282067a7a824ea97e66a5b2f0ca06416bd
Author: jaypipes@gmail.com <>
Date:   Mon Aug 16 13:56:29 2010 -0400

    Make individual disables for R0201 instead of file-level.

 nova/objectstore/handler.py |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

commit f78a8936b1a401f07fc0a09d4bd150d2793e436e
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 16 13:22:41 2010 -0400

    All controller actions receive a 'req' parameter containing the webob Request.

 nova/endpoint/__init__.py                      |   10 ++---
 nova/endpoint/aws/__init__.py                  |    6 +--
 nova/endpoint/rackspace/__init__.py            |   23 +++++-------
 nova/endpoint/rackspace/controllers/servers.py |    2 +-
 nova/wsgi.py                                   |   48 ++++++++++++------------
 5 files changed, 41 insertions(+), 48 deletions(-)

commit 627356d9dbe1bd8c7af53191a999ad77eec7f30e
Merge: c395dd7 b50107e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 16 17:13:28 2010 +0000

    improve compatibility with ec2 clients

commit 5c4a806c852a1c7180bc1c7e2ea8f065198e36d2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 16 10:57:42 2010 -0400

    PEP8 and name corrections

 bin/nova-rsapi                              |    2 +-
 nova/endpoint/aws/__init__.py               |    4 ++--
 nova/endpoint/rackspace/__init__.py         |   10 +++++-----
 nova/endpoint/rackspace/controllers/base.py |    4 ++--
 nova/wsgi.py                                |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

commit d508418214016d5c00aa8d304f9498f5b99a960b
Author: andy <code@term.ie>
Date:   Mon Aug 16 14:16:21 2010 +0200

    rather comprehensive style fixes

 nova/adminclient.py         |    7 +++++++
 nova/auth/fakeldap.py       |    1 -
 nova/auth/ldapdriver.py     |    1 +
 nova/auth/manager.py        |   12 +++++++-----
 nova/auth/rbac.py           |    2 ++
 nova/auth/signer.py         |   10 +++++++---
 nova/cloudpipe/api.py       |    3 ++-
 nova/cloudpipe/pipelib.py   |    2 +-
 nova/compute/disk.py        |    4 ++++
 nova/compute/model.py       |    2 ++
 nova/compute/monitor.py     |   35 +++++++++++++++++++++--------------
 nova/compute/service.py     |    1 +
 nova/crypto.py              |    8 +++++++-
 nova/endpoint/admin.py      |    4 ++++
 nova/endpoint/api.py        |    7 +++++--
 nova/endpoint/cloud.py      |    3 +--
 nova/endpoint/images.py     |    7 ++++++-
 nova/exception.py           |    8 ++++++++
 nova/fakerabbit.py          |    5 +++--
 nova/flags.py               |   40 +++++++++++++++++-----------------------
 nova/network/exception.py   |   12 ++++++------
 nova/network/linux_net.py   |    6 +++---
 nova/network/model.py       |    3 ++-
 nova/network/service.py     |   16 ++++++++--------
 nova/network/vpn.py         |    3 +--
 nova/objectstore/bucket.py  |    1 +
 nova/objectstore/handler.py |   38 ++++++++++++++++++++++++++------------
 nova/objectstore/image.py   |    1 +
 nova/objectstore/stored.py  |    4 ++--
 nova/process.py             |    3 +++
 nova/rpc.py                 |    5 +++--
 nova/test.py                |    5 ++---
 nova/utils.py               |   12 +++++++++---
 nova/validate.py            |    1 +
 nova/virt/images.py         |    8 ++++++--
 nova/virt/libvirt_conn.py   |   23 +++++------------------
 nova/virt/xenapi.py         |   39 +++++++++++++++++----------------------
 nova/volume/service.py      |    4 +++-
 run_tests.py                |    9 ++++-----
 39 files changed, 209 insertions(+), 146 deletions(-)

commit fa70aefb00e487102564b92f6d32047dd8998054
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 01:51:28 2010 -0700

    fix launching and describing instances to work with sqlalchemy

 nova/compute/libvirt.xml.template |    3 +-
 nova/compute/service.py           |   77 +++-----------------------
 nova/endpoint/cloud.py            |  106 ++++++++++++++++++------------------
 nova/models.py                    |   18 +++++-
 nova/virt/libvirt_conn.py         |  109 ++++++++++++++++++-------------------
 nova/volume/service.py            |    1 -
 6 files changed, 131 insertions(+), 183 deletions(-)

commit c395dd793d84d1e9a3e0ac9c9c4044c50eea6399
Merge: 1d2351f 7bbf2f7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 16 08:43:31 2010 +0000

    Add new libvirt_type option "uml" for user-mode-linux.. This switches the libvirt URI to uml:///system and uses a different template for the libvirt xml.

commit 0c5b2dc5e2f215ab6b8023e571c5b537e7fa730e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 15 16:37:06 2010 -0700

    typos

 nova/tests/volume_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 11aa7a7c959783d48e624707d59d30ccdd8b2733
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 15 16:20:50 2010 -0700

    don't try to create and destroy lvs in fake mode

 nova/volume/service.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 33de18633fc6bb5fae64869dfe9963bf81f7f167
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 15 15:55:53 2010 -0700

    refactoring volume and some cleanup in model and compute

 nova/compute/service.py       |   24 ++--
 nova/models.py                |   38 ++++--
 nova/tests/volume_unittest.py |   47 +++----
 nova/volume/service.py        |  280 ++++++++++++++---------------------------
 4 files changed, 155 insertions(+), 234 deletions(-)

commit d1185adcf6f060c125274d31cf11a4f750521d24
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 15 23:11:52 2010 +0100

    Add documentation to spawn, reboot, and destroy stating that those functions
    should return Deferreds.  Update the fake implementations to do so (the
    libvirt ones already do, and making the xenapi ones do so is the subject of
    a current merge request).

 nova/virt/fake.py |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit fb6bf337bc2fe702307842b57e33b9f5f9011147
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Aug 15 22:48:54 2010 +0100

    Rework virt.xenapi's concurrency model.  There were many places where we were
    inadvertently blocking the reactor thread.  The reworking puts all calls to
    XenAPI on background threads, so that they won't block the reactor thread.
    
    Long-lived operations (VM start, reboot, etc) are invoked asynchronously
    at the XenAPI level (Async.VM.start, etc).  These return a XenAPI task.  We
    relinquish the background thread at this point, so as not to hold threads in
    the pool for too long, and use reactor.callLater to poll the task.
    
    This combination of techniques means that we don't block the reactor thread at
    all, and at the same time we don't hold lots of threads waiting for
    long-running operations.
    
    There is a FIXME in here: get_info does not conform to these new rules.
    Changes are required in compute.service before we can make get_info
    non-blocking.

 nova/virt/xenapi.py |  178 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 147 insertions(+), 31 deletions(-)

commit 665ef27e95d89c518154bfc6b2d9a53929dfeaef
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sun Aug 15 13:36:01 2010 -0700

    add refresh on model

 nova/models.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 90a403c04d561179e6b1113a9b994353c14ee965
Merge: 295a56c 9ead059
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sun Aug 15 13:29:47 2010 -0700

    merge in latedt from vish

commit 1d2351f7bfd997be8b2a25ec74999a17b2b508ee
Merge: 2dc2c9d 517e887
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 23:37:51 2010 +0000

    Catches and logs exceptions for rpc calls and raises a RemoteError exception on the caller side.

commit 2dc2c9dc71bb50a5e322c8fdc5af3f831d41ddba
Merge: 25f97fb 8d70245
Author: Joel Moore joelbm24@gmail.com <>
Date:   Sat Aug 14 22:42:49 2010 +0000

    Removes requirement of internet connectivity to run api server.

commit 25f97fbe3acd4765965e402ae4ed72a041610447
Merge: 0a7121e 8dad7d1
Author: Joel Moore joelbm24@gmail.com <>
Date:   Sat Aug 14 22:28:05 2010 +0000

    Fixed path to keys directory.

commit b50107ec739bc40e29d76ff56587ddbb478bd878
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Aug 14 23:23:03 2010 +0100

    Update cloud_unittest to match renamed internal function.

 nova/tests/cloud_unittest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a7121efbef13ce832b2930baf61c07b66dc5e9a
Merge: cecfc6a 4d7fe55
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 22:17:53 2010 +0000

    Removes the workaround for syslog-ng of removing newlines.

commit cecfc6a60dbdefaab8bcc549f09e7e88aa3b29d5
Merge: 24644fb d744a5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 22:03:38 2010 +0000

    Fixes bug lp:616312 by reversing the order of args in nova-manage when it calls AuthManager.get_credentials.

commit 517e887a804905a20cee0ced0c37b93432814f47
Merge: 7f5c505 24644fb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 15:01:42 2010 -0700

    merged trunk

commit 24644fb29835a5f83b5060d86baa471974715af0
Merge: 39b592c 24f8cb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 21:52:51 2010 +0000

    Sets a hostname for instances that properly resolves and cleans up network classes

commit 7f5c50502815c31b3c609cf26caa02063b823294
Merge: 8bdc9ec 24f8cb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 14:38:00 2010 -0700

    merged fix-hostname and fixed conflict

commit 39b592cbb3cad456146ffc7178f418db9f19894e
Merge: 8d6a125 cf20024
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 14 21:19:32 2010 +0000

    Implemented admin client / admin api for fetching user roles.

commit 8d6a1256aef713138ff706bb7b542dc32598db84
Merge: a947cc3 47bf3ed
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 21:13:44 2010 +0000

    Improves pep8 compliance and pylint score in network code.

commit a947cc3ee5ff960ce8308dc615106c5f0c637a9a
Merge: 2bbb2b8 b7ffb21
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Aug 14 20:42:23 2010 +0000

    Bug #617776: DescribeImagesResponse contains type element, when it should be called imageType
    
    Make the objectstore respond with the field 'imageType' as well as 'type'.
    The former is the correct one, according to the EC2 API specification for
    the DescribeImages response.  The latter is for compatibility with euca2ools
    and other clients.

commit b323a5fc6d08b52bde18c64fea70a7b3421cadc3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Aug 14 19:04:19 2010 +0100

    Bug 617913: RunInstances response doesn't meet EC2 specification
    
    Fix the RunInstances response to match the EC2 specification.  This involved moving
    the instance details from
    <RunInstancesResponse><reservationSet><item><instancesSet><item> to
    <RunInstancesResponse><instancesSet><item>.

 nova/endpoint/cloud.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 295a56c665be7b7461ff41141a93cffb79ab4909
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sat Aug 14 07:08:34 2010 -0700

    remove more direct session interactions

 nova/compute/service.py |   16 ++++++----------
 nova/models.py          |   12 ++++++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

commit 08a7da895690757a17fdab5e4aadeaf6ba9133d3
Merge: a860a07 3ee748b
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sat Aug 14 06:44:45 2010 -0700

    refactor to have base helper class with shared session and engine

commit 3ee748bb6f55ad341606919901c4c17a82d069fd
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 22:55:04 2010 -0700

    ComputeConnectionTestCase is almost working again

 nova/auth/manager.py           |    6 +-
 nova/compute/service.py        |  187 ++++++++++++++--------------------------
 nova/models.py                 |   18 ++--
 nova/network/service.py        |   21 ++---
 nova/tests/compute_unittest.py |   38 +++-----
 nova/virt/fake.py              |    4 +-
 6 files changed, 106 insertions(+), 168 deletions(-)

commit 5cc8d5839cdb20d588c808c2eac52889365e4454
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 21:24:26 2010 -0700

    more work on trying to get compute tests passing

 nova/auth/manager.py           |   10 ++-
 nova/compute/service.py        |   16 ++---
 nova/models.py                 |  148 ++++++++++++----------------------------
 nova/network/service.py        |    9 +--
 nova/tests/compute_unittest.py |   37 ++++++----
 5 files changed, 83 insertions(+), 137 deletions(-)

commit 8b344451f06f96e846cb4fe87131fd23b5c386cc
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 18:39:00 2010 -0700

    re-add redis clearing

 run_tests.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit d64d0fccca94b073760bcfc19b763b2ab64abf08
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 18:31:23 2010 -0700

    make the fake-ldap system work again

 nova/datastore.py |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

commit 1395690e99c41aa14e776e4b94054fde29856c60
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 18:04:43 2010 -0700

    got run_tests.py to run (with many failed tests)

 nova/compute/model.py  |   12 +--
 nova/datastore.old.py  |  261 +++++++++++++++++++++++++++++++++++++++++++++++
 nova/datastore.py      |  262 ------------------------------------------------
 nova/network/model.py  |   12 +--
 nova/network/vpn.py    |    2 +-
 nova/test.py           |    6 ++
 nova/volume/service.py |    2 +-
 run_tests.py           |   10 +-
 8 files changed, 281 insertions(+), 286 deletions(-)

commit b7ffb210f010baa94495fcd4e9a9dca1ddc3ffe4
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Aug 14 11:46:10 2010 +0100

    Bug #617776: DescribeImagesResponse contains type element, when it should be called imageType
    
    Make the objectstore respond with the field 'imageType' as well as 'type'.
    The former is the correct one, according to the EC2 API specification for
    the DescribeImages response.  The latter is for compatibility with euca2ools
    and other clients.

 nova/objectstore/handler.py |   18 +++++++++++++++++-
 nova/objectstore/image.py   |    4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

commit a860a07068d4d643c42973625c454c6b09e883cb
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sat Aug 14 02:13:12 2010 -0700

    initial commit for orm based models

 nova/auth.py   |  741 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nova/models.py |  198 +++++++++++++++
 2 files changed, 939 insertions(+)

commit 7bbf2f7f9f7c7c49287519207e56932e28061514
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:46:44 2010 +0200

    Add a few unit tests for libvirt_conn.

 nova/tests/virt_unittest.py |   69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

commit 49a20981634e880fa14420f0b18b3c64b1f6c06f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:45:26 2010 +0200

    Move interfaces template into virt/, too.

 nova/compute/interfaces.template |   18 ------------------
 nova/virt/interfaces.template    |   18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

commit 2dd318827965f20d9a64e624e15dc1a1fee7bf5e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:45:05 2010 +0200

    Refactor LibvirtConnection a little bit for easier testing.

 nova/virt/libvirt_conn.py |   35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

commit 8aa4d9c2f9f3f7cadda334a1161d66c2303e2979
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:44:14 2010 +0200

    Remove extra "uml" from os.type.

 nova/virt/libvirt.uml.xml.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d744a5e7bd7aef545def85d54c9e1fc3480c55fc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 13 14:09:30 2010 -0700

    Fixes out of order arguments in get_credentials

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8bdc9ec6f90341ed1a3890af283addc7c0a053c9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 13 12:51:38 2010 -0700

    pep8 and pylint cleanup

 nova/rpc.py                |  123 +++++++++++++++++++++++++++++++++-----------
 nova/tests/rpc_unittest.py |   37 ++++++++++---
 2 files changed, 122 insertions(+), 38 deletions(-)

commit bfb906cb0235a6e0b037d387aadc4abc2280fea0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Fri Aug 13 11:09:27 2010 -0400

    Support JSON and XML in Serializer

 nova/wsgi.py |   56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 10 deletions(-)

commit 3d15adb40c5fc569bd29d4779fca792263338e54
Author: jaypipes@gmail.com <>
Date:   Fri Aug 13 10:14:34 2010 -0400

    Merge case statement options

 run_tests.sh |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 4c39eca0c90fc798e9980b8fe750d66208fecae5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Aug 13 14:33:07 2010 +0100

    Added note regarding dependency upon XenAPI.py.

 doc/source/getting.started.rst |    1 +
 1 file changed, 1 insertion(+)

commit ea2805d372a0d4a480667058e96288bf15844828
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Aug 13 11:51:33 2010 +0100

    Added documentation to the nova.virt interface.

 nova/virt/connection.py   |    9 ++++
 nova/virt/fake.py         |  129 ++++++++++++++++++++++++++++++++++++++++++++-
 nova/virt/libvirt_conn.py |   20 -------
 3 files changed, 137 insertions(+), 21 deletions(-)

commit 087980a0520c898d944d99a2193f84cf8fccf725
Merge: 6eba59b 2bbb2b8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 11:16:24 2010 +0200

    Merge with trunk

commit a679cab031ec91dd719b9ba887cdae4f595b2ca4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 21:27:53 2010 -0700

    make rpc.call propogate exception info.  Includes tests

 nova/endpoint/cloud.py     |   15 +++++------
 nova/rpc.py                |   38 ++++++++++++++++++++-------
 nova/tests/rpc_unittest.py |   62 ++++++++++++++++++++++++++++++++++++++++++++
 run_tests.py               |    1 +
 4 files changed, 98 insertions(+), 18 deletions(-)

commit 4391b7362eeab2cd976309696be1209ac771ce24
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 18:41:31 2010 -0400

    Undo the changes to cloud.py that somehow diverged from trunk

 nova/endpoint/cloud.py |  105 ++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 53 deletions(-)

commit 39d12bf518e284183d1debd52fe7081ecf1c633d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 18:36:56 2010 -0400

    Mergeprop cleanup

 nova/endpoint/rackspace/__init__.py  |   90 ++++++++++++++++++++++++++++++++++
 nova/endpoint/rackspace/rackspace.py |   90 ----------------------------------
 2 files changed, 90 insertions(+), 90 deletions(-)

commit 11c47dd12adcbf2a5011510f01081db858b057db
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 18:36:46 2010 -0400

    Mergeprop cleanup

 0 files changed

commit b998da0c46bdccf1dc6d9d44bb5943bf69568d1a
Merge: c00ae20 2e753b0 2bbb2b8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 15:19:33 2010 -0700

    Make WSGI routing support routing to WSGI apps or to controller+action
    
    Support the beginnings of serialization format detection (aka did the request ask for JSON or XML)

commit 6eba59be8ef6ea47e1d9657fed72fafbc7c9d6ef
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 23:41:32 2010 +0200

    Make --libvirt_type=uml do the right thing: Sets the correct libvirt URI and use a special template for the XML.

 nova/virt/libvirt.qemu.xml.template |   30 ++++++++++++++++++++++++++++++
 nova/virt/libvirt.uml.xml.template  |   25 +++++++++++++++++++++++++
 nova/virt/libvirt.xml.template      |   30 ------------------------------
 nova/virt/libvirt_conn.py           |   32 +++++++++++++++++++++-----------
 4 files changed, 76 insertions(+), 41 deletions(-)

commit a96b4c1470ee4e73382178206d8728d2a2ba89cf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 14:18:59 2010 -0700

    renamed missed reference to Address

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 63c2fd9d4fe17f06e80a5d9674b58cb65ee491d9
Merge: ef48a72 eeda6e0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:43:14 2010 -0700

    die classmethod

commit eeda6e0970d6f19b985719a04b06fda0b3514c24
Merge: 8d4dd09 ef48a72
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:37:28 2010 -0700

    merged fix-dhcpbridge

commit ef48a727d1c6b824170995fffa59949960ea5d11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:36:10 2010 -0700

    remove class method

 nova/network/model.py |    1 -
 1 file changed, 1 deletion(-)

commit 773390a4daa633b8a54b4fc29600182b6bfb915d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:33:22 2010 -0700

    typo allocated should be relased

 nova/endpoint/cloud.py |    4 ++--
 nova/network/model.py  |   28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

commit 8d4dd0924bfd45b7806e6a29018de45d58ee6339
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 12:44:23 2010 -0700

    rename address stuff to avoid name collision and make the .all() iterator work again

 nova/endpoint/cloud.py |    4 ++--
 nova/network/model.py  |   26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

commit e14d70d7be58ac99f98b66620320c453fa79c8c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 12:12:38 2010 -0700

    keep track of leasing state so we can delete ips that didn't ever get leased

 nova/network/model.py |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

commit 4d7fe5555de3c7e475a436af11559b00d7af5790
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 11:52:32 2010 -0700

    remove syslog-ng workaround

 nova/twistd.py |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

commit b4b399b9986a8db34fa7277285698e22e2031938
Merge: 57bcfcc 2bbb2b8
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 19:17:51 2010 +0100

    Merged with trunk.

commit 2bbb2b86272c89b35a1042ab2866bbe4863bc3e3
Merge: 923b08a e3f8aa5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 16:52:20 2010 +0000

    Implement the same fix as lp:~vishvananda/nova/fix-curl-project, but for virt.xenapi.

commit 923b08a2a45f9d1b05ee870f627a2102208efaef
Merge: f65d2ef 57beed3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 16:37:18 2010 +0000

    Fix exception in get_info.

commit 32f524abb689ed824747e7871ddf315d05a35cb6
Merge: 0493f4b f65d2ef
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:34:59 2010 +0200

    Merge with trunk.

commit 0493f4bc5786a4d253e7f73092443117b158071a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:32:11 2010 +0200

    Move libvirt.xml template into nova/virt

 nova/compute/libvirt.xml.template |   30 ------------------------------
 nova/virt/libvirt.xml.template    |   30 ++++++++++++++++++++++++++++++
 nova/virt/libvirt_conn.py         |    2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

commit f8fc15c645216483ac20280af0e6e6bb92b6be0b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:30:54 2010 +0200

    Parameterise libvirt URI.

 nova/virt/libvirt_conn.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 57bcfccc4781511a76351edf1749422bc2e9f02d
Merge: 4130a50 f65d2ef
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 11:42:56 2010 +0100

    Merged with trunk.

commit 6664c960e08e31fa8b464b0ccbbf489da271e033
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 15:29:14 2010 -0700

    fix dhcpbridge issues

 bin/nova-dhcpbridge       |    2 +-
 nova/network/linux_net.py |    8 ++------
 nova/network/service.py   |    8 ++++----
 3 files changed, 7 insertions(+), 11 deletions(-)

commit fb382c8e705e1803abb5de77a1fd11e6f913af75
Author: jaypipes@gmail.com <>
Date:   Wed Aug 11 17:40:28 2010 -0400

    Adapts the run_tests.sh script to allow interactive or automated creation of virtualenv, or to run tests outside of a virtualenv

 run_tests.sh |   63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 3 deletions(-)

commit 2e753b033dae6270674c0397be8e01bd2ff47980
Author: Matthew Dietz <matt.dietz@rackspace.com>
Date:   Wed Aug 11 15:27:27 2010 -0500

    Prototype implementation of Servers controller

 nova/endpoint/aws/cloud.py                     |  729 ++++++++++++++++++++++++
 nova/endpoint/aws/images.py                    |   95 +++
 nova/endpoint/cloud.py                         |  729 ------------------------
 nova/endpoint/images.py                        |   95 ---
 nova/endpoint/rackspace.py                     |  186 ------
 nova/endpoint/rackspace/controllers/base.py    |    9 +
 nova/endpoint/rackspace/controllers/servers.py |   72 +++
 nova/endpoint/rackspace/rackspace.py           |  183 ++++++
 8 files changed, 1088 insertions(+), 1010 deletions(-)

commit a0fb0fdf1e899488f0717bea6ee2cad58120070b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 11 14:46:43 2010 -0400

    Working router that can target WSGI middleware or a standard controller+action

 nova/wsgi.py |  205 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 98 insertions(+), 107 deletions(-)

commit f65d2ef299eb077ae164c3e6c44e67a42c631727
Merge: 57f834b d1977a8
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 11 17:17:37 2010 +0000

    Added a xapi plugin that can pull images from nova-objectstore, and use that
    to get a disk, kernel, and ramdisk for the VM.

commit 1637c33927672a6edc9ad7a994787669ea47f602
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 11 09:46:08 2010 -0400

    Serializing in middleware after all... by tying to the router.  maybe a good idea?

 nova/wsgi.py |  113 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 72 insertions(+), 41 deletions(-)

commit 57beed337d3c267b69eaf73f166fd00ea29f2498
Merge: 035f93a 57f834b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 11 14:23:59 2010 +0100

    Merged with trunk.

commit 24f8cb89f8b92563d364186b80c7d73d28b26bea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 01:20:21 2010 -0700

    Actually pass in hostname and create a proper model for data in network code

 bin/nova-dhcpbridge            |    4 +-
 nova/compute/model.py          |   10 +--
 nova/datastore.py              |   12 ++-
 nova/endpoint/cloud.py         |   18 ++--
 nova/network/linux_net.py      |   20 ++---
 nova/network/model.py          |  181 ++++++++++++++++++++--------------------
 nova/network/service.py        |   26 ++++--
 nova/tests/network_unittest.py |    7 +-
 8 files changed, 145 insertions(+), 133 deletions(-)

commit 57f834ba7881c116adedfa3b3f1065bf0f0c072e
Merge: 87856a8 2955018
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 05:02:34 2010 +0000

    Improved roles functionality (listing & improved test coverage)

commit 0ccd10283b922cb9822872b89713aad1a5da214e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 21:51:18 2010 -0700

    support a hostname that can be looked up

 bin/nova-dhcpbridge       |    6 ++----
 nova/compute/model.py     |   10 +++++++++-
 nova/endpoint/cloud.py    |    6 +++---
 nova/network/linux_net.py |   21 +++++++++++----------
 4 files changed, 25 insertions(+), 18 deletions(-)

commit 87856a8e37067828f5599f9254ee3b7c7f0aacfe
Merge: 49e5701 538fe86
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 11 02:07:11 2010 +0000

    updated virtualenv to add eventlet, which is now a requirement

commit 49e5701d23f4a474dedfb8fbca3c1620b4d96699
Merge: 21d0023 f569542
Author: jaypipes@gmail.com <>
Date:   Wed Aug 11 02:02:17 2010 +0000

    Changes the run_tests.sh and /tools/install_venv.py scripts to be
    more user-friendly and not depend on PIP while not in the virtual
    environment.

commit cf2002486d651576a28a4c53c6b49bb30c047108
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 19:01:40 2010 -0700

    Fixed admin api for user roles

 nova/adminclient.py    |   13 +++++++++----
 nova/endpoint/admin.py |    6 ++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

commit 0117c94275567cee6183aa7b257e886b88714680
Merge: 253cc1f cff3ccc
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 19:01:05 2010 -0700

    Merged list_roles

commit 2955018b58a731f48dcdee64d889b4be104250f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 19:00:35 2010 -0700

    fix spacing issue in ldapdriver

 nova/auth/ldapdriver.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 21d0023d70e88d0a707caed841c876cafd2b9c0d
Merge: ce68310 7a17095
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 01:57:12 2010 +0000

    Fixes bug lp:615857 by changing the name of the zip export method in nova-manage

commit 253cc1f683dfcfe75b1a5c1eb3a93f07e85bb041
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 18:46:49 2010 -0700

    Wired up admin api for user roles

 nova/adminclient.py    |   36 +++++++++++++++++++++++++++++++++++-
 nova/endpoint/admin.py |   13 +++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

commit cff3cccc342c7d09cd2ec6c95431e1b373eba620
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 18:04:23 2010 -0700

    change get_roles to have a flag for project_roles or not. Don't show 'projectmanager' in list of roles

 nova/auth/manager.py        |   15 +++++++--------
 nova/tests/auth_unittest.py |    2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

commit 19b9164c4eaae0c2c9144f9e839fbafcac7c3ed3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 17:42:58 2010 -0700

    Throw exceptions for illegal roles on role add

 nova/auth/manager.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 14c7bca9cb8451e2ec8224fb5699c6f2ad480dac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 17:34:20 2010 -0700

    Adds get_roles commands to manager and driver classes

 nova/auth/ldapdriver.py     |   34 +++++++++++++++++++++++++++-------
 nova/auth/manager.py        |   18 ++++++++++++++++++
 nova/tests/auth_unittest.py |   18 +++++++++++++++++-
 3 files changed, 62 insertions(+), 8 deletions(-)

commit d1982a50561f7b35ffc76ce5d45aaec11e76a23c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 10 18:48:33 2010 -0500

    more pylint fixes

 nova/scheduler/base.py    |   23 +++++++++++++++++++----
 nova/scheduler/bestfit.py |    4 ++++
 nova/scheduler/chance.py  |    4 ++++
 nova/scheduler/service.py |    3 ++-
 4 files changed, 29 insertions(+), 5 deletions(-)

commit ce683104ace24e986f6c4b911ff63952355235f0
Merge: f48ef5e 1c73770
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 10 23:13:40 2010 +0000

    Implement VIF creation in the xenapi module.

commit 47bf3ed11f2f372a07ea3b1b8deb9f7684cc2e5d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 15:45:24 2010 -0700

    lots more pylint fixes

 nova/network/linux_net.py      |    2 +-
 nova/network/model.py          |  131 +++++++++++++++++++++++------------
 nova/tests/network_unittest.py |  147 +++++++++++++++++++---------------------
 3 files changed, 160 insertions(+), 120 deletions(-)

commit 049b89babe10068d3976f3f3a99b7dce120e2962
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 10 18:17:44 2010 -0400

    work on a router that works with wsgi and non-wsgi routing

 nova/endpoint/rackspace.py |   27 +++++++++-------
 nova/wsgi.py               |   76 ++++++++++++++++++++++++++++++++++++++++++++
 tools/pip-requires         |    3 ++
 3 files changed, 94 insertions(+), 12 deletions(-)

commit 712b6e41d40303a7a3e9d0ce21dde628361417ae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:51:42 2010 -0700

    Pylint clean of vpn.py

 nova/network/vpn.py |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

commit e0983caad1c3ff7ca451094f8778b1a62bf91531
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:46:40 2010 -0700

    Further pylint cleanup

 nova/endpoint/cloud.py    |   10 +++++-----
 nova/network/linux_net.py |    4 ++--
 nova/network/service.py   |   24 ++++++++++++++++--------
 3 files changed, 23 insertions(+), 15 deletions(-)

commit 538fe868a8c89f892bffbfc0001b64e3bf1c9cf5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 10 15:28:35 2010 -0400

    Oops, we need eventlet as well.

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit c4f6500a4c33d4ad093d29f971c139b63984a0a5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:27:06 2010 -0700

    pylint cleanup

 bin/nova-dhcpbridge       |    5 ++--
 nova/network/exception.py |    5 ++++
 nova/network/linux_net.py |   66 ++++++++++++++++++++++++---------------------
 3 files changed, 44 insertions(+), 32 deletions(-)

commit fadaf1d9842abb991b093b04c031fa9947d82fbc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 11:48:14 2010 -0700

    pep8 cleanup

 nova/network/exception.py      |    5 +++-
 nova/network/linux_net.py      |   46 ++++++++++++++++++++++++++----------
 nova/network/model.py          |   39 +++++++++++++++++++------------
 nova/network/service.py        |   13 +++++++----
 nova/network/vpn.py            |    2 +-
 nova/tests/network_unittest.py |   50 ++++++++++++++++++++++------------------
 6 files changed, 100 insertions(+), 55 deletions(-)

commit 899a94a84c09d50e90d4b5620ec4d0157816bfd2
Merge: 1f31289 f48ef5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 11:25:53 2010 -0700

    merged trunk

commit 1d414f6bddbae33bcbec799e29ab904d86811869
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 14:20:15 2010 -0400

    pylint fixes for nova/objectstore/handler.py

 nova/objectstore/handler.py |  133 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 100 insertions(+), 33 deletions(-)

commit 7a1709561f1fed6e46a1c31aaa8e3ac54b9eebd3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 10:25:52 2010 -0700

    rename create_zip to zipfile so lazy match works

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f5695429db27110d8a95df3b66e4045c59d88c6a
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 12:51:03 2010 -0400

    Quick fix on location of printouts when trying to install virtualenv.

 tools/install_venv.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 8c7558ed5ae7dd0b78a91a385dbd9b044ec7c8db
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 12:44:38 2010 -0400

    Changes the run_tests.sh and /tools/install_venv.py scripts to be more user-friendly and not depend on PIP while not in the virtual environment.  Running run_tests.sh should not just work out of the box on all systems supporting easy_install...

 run_tests.sh          |    7 +++---
 tools/install_venv.py |   59 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 19 deletions(-)

commit f48ef5ef4d3ca39084c66d874bf1e99ff81e9f48
Merge: b13f064 b17c705
Author: Joe Heck <heckj@mac.com>
Date:   Tue Aug 10 16:27:13 2010 +0000

    2 changes in doing PEP8 & Pylint cleaning:
     * adding pep8 and pylint to the PIP requirements files for Tools
     * light cleaning work (mostly formatting) on nova/endpoints/cloud.py
    
    Note: On my laptop, I had two tests failing just with a basic setup. I checked against all the tests again after cleanup, and had no additional or different failures.

commit b13f0646a186b915fccacdce1f9d7a03add56e32
Merge: c00ae20 a33dce2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 15:37:07 2010 +0000

    More changes to volume to fix concurrency issues.  Also testing updates.
    
    volumes now store a set of available shelf/blades in the datastore, instead of depending on a filesystem glob.  This avoids a race condition that occurs where two different volumes are attempting to export to the same location.
    
    The general idea of pooled resources needs to be abstracted out into the datamodel.  It is used for vpn ports and volumes now, and should be uses for ip addresses as well.

commit c00ae202b93da7c6f9b407adfb099586863d9a6f
Merge: e119914 09b5be1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 10 14:57:14 2010 +0000

    Merge.

commit 7b9067192fc3afc755759ff46b94671794034499
Merge: abfd82d 599fb1e
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:57:39 2010 -0400

    Merged nova-tests-apitest into pylint.

commit 599fb1e082a55c92ab0f83e01d6f5ca0cb4247d1
Merge: 3357600 abfd82d
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:57:24 2010 -0400

    Merged nova-virt-connection into nova-tests-apitest.

commit 33576003f68498371f0761aaa3ca5c9a08d1c452
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:55:00 2010 -0400

    Pylint fixes for /nova/tests/api_unittest.py

 nova/tests/api_unittest.py |   83 +++++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 25 deletions(-)

commit abfd82d89653482e21e1139fb8ce8bf89c2b4d2c
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:54:13 2010 -0400

    pylint fixes for nova/virt/connection.py

 nova/virt/connection.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit 1f3128922d3c973f308e82101b1010e316562733
Merge: d8c1a74 e119914
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 23:44:13 2010 -0700

    merged trunk, fixed an error with releasing ip

commit d8c1a74342af9af442e4ef0508fa1f66eac48bb5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 23:02:06 2010 -0700

    fix releasing to work properly

 nova/network/model.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit e1199140315e7cc85249820e92ab8b7998e50ae2
Merge: 7b6c053 6dde6fd
Author: andy <code@term.ie>
Date:   Tue Aug 10 04:54:09 2010 +0000

    Add some useful features to our flags
    
    * No longer dies if there are unknown flags.
    * Allows you to declare that you will use a flag from another file
    * Allows you to import new flags at runtime and reparses the original arguments to fill them once they are accessed.
    
    This hopefully gets around the issues described by vish in this thread:
    
    https://lists.launchpad.net/nova/msg00009.html

commit 7b6c053a92edaf1183308fc05f6ce46849703f27
Merge: 7623685 c6c2228
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 04:52:54 2010 +0000

    pylint fixes for /nova/test.py

commit 76236851efdfaf98d5630ae003d70825bbd9a523
Merge: 05b87ac 2a069ab
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 04:52:06 2010 +0000

    Fixes pylint issues in /nova/server.py

commit b17c70543e76667389835d3e322b09038ec93c8c
Merge: 8990a62 05b87ac
Author: Joe Heck <heckj@mac.com>
Date:   Mon Aug 9 17:59:46 2010 -0700

    importing merges from hudson branch

commit 8990a62b0e654dcacac06246733a17fa0502bcc7
Author: Joe Heck <heckj@mac.com>
Date:   Mon Aug 9 17:53:10 2010 -0700

    fixing - removing unused imports per Eric & Jay review

 nova/auth/manager.py |    4 ----
 1 file changed, 4 deletions(-)

commit bd0645153fb1b60a551c50c657a7837713da54a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 15:34:05 2010 -0700

    initial cleanup of tests for network

 nova/network/model.py          |   39 ++++++++-------
 nova/network/vpn.py            |   26 ++++++----
 nova/tests/network_unittest.py |  106 ++++++++++++++++++++++++++--------------
 3 files changed, 107 insertions(+), 64 deletions(-)

commit e3f8aa57873b7de69980c57cd05e3f1bdf6f7d08
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 23:22:59 2010 +0100

    Implement the same fix as lp:~vishvananda/nova/fix-curl-project, but for
    virt.xenapi.

 nova/virt/xenapi.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 09b5be11e7b61aa0ae344cec669e4f62dd18c0b2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 9 17:45:00 2010 -0400

    Run correctly even if called while in tools/ directory, as 'python install_venv.py'

 tools/install_venv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05b87ac8e743221ed4c0c73a03612674e2416b24
Merge: ccd5de2 850acbd
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 9 20:37:15 2010 +0000

    This branch builds off of Todd and Michael's API branches to rework the Rackspace API endpoint and WSGI layers.

commit 3e01acd4e70f9e850487c5ac4067ab2c2c1a18eb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 9 12:56:32 2010 -0500

    separated scheduler types into own modules

 nova/scheduler/base.py      |   65 +++++++++++++++++++++++++++++++
 nova/scheduler/bestfit.py   |   30 +++++++++++++++
 nova/scheduler/chance.py    |   33 ++++++++++++++++
 nova/scheduler/scheduler.py |   89 -------------------------------------------
 nova/scheduler/service.py   |   10 ++---
 5 files changed, 133 insertions(+), 94 deletions(-)

commit c6c222800ccc1203fc0edd7716dd808ec8f6bdc4
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 12:37:15 2010 -0400

    Fix up variable names instead of disabling pylint naming rule.  Makes variables able to be a single letter in pylintrc

 nova/test.py |   29 ++++++++++++++---------------
 pylintrc     |    6 ++++++
 2 files changed, 20 insertions(+), 15 deletions(-)

commit 948162e3bdd96cdbe5db9a0c25722ac63c04e264
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 12:20:47 2010 -0400

    Disables warning about TODO in code comments in pylintrc

 nova/test.py |    1 -
 pylintrc     |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit ccd5de200140d70be81a72345037683b705ade8c
Merge: c0c2f58 46c0f66
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 9 14:52:10 2010 +0000

    More pylint/pep8 cleanup, this time in bin/* files.

commit 2a069abf622029c3f3e7273ad1cc3fb17b529e63
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 10:46:33 2010 -0400

    pylint fixes for nova/server.py

 nova/server.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 795b32fc66f243239d05a5434f939a76800c0052
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 9 09:37:50 2010 -0500

    remove duplicated report_state that exists in the base class
    more pylint fixes

 nova/scheduler/service.py |   36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

commit 850acbdd9521cda8600235259fa68b8f2ab488ef
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 9 07:31:41 2010 -0700

    Fixed docstring format per Jay's review.

 nova/endpoint/rackspace.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a31fe618b94f87cf03a090db04dace732c58951c
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 09:47:08 2010 -0400

    pylint fixes for /nova/test.py

 nova/test.py |   74 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

commit d1977a820db3dad7e907e976c5502ffd37e1b719
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 13:23:19 2010 +0100

    Move the xenapi top level directory under plugins, as suggested by Jay Pipes.

 plugins/xenapi/README                              |    2 +
 plugins/xenapi/etc/xapi.d/plugins/objectstore      |  231 ++++++++++++++++++++
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |  216 ++++++++++++++++++
 xenapi/README                                      |    2 -
 xenapi/etc/xapi.d/plugins/objectstore              |  231 --------------------
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py        |  216 ------------------
 6 files changed, 449 insertions(+), 449 deletions(-)

commit 1c73770660055cf697096b1526230a65edcc0d86
Merge: 89e057c a9e4864
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 13:10:06 2010 +0100

    Pull trunk merge through lp:~ewanmellor/nova/add-contains.

commit a9e48649cc35d6451692a1193ee1159c95f5b1fb
Merge: b31d4f7 88d238c
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 13:08:02 2010 +0100

    Pull trunk merge through lp:~ewanmellor/nova/xapi-plugin.

commit 88d238c603d209c1d318f16b9d7a305d015f3daf
Merge: c6fbcd8 c0c2f58
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 12:10:27 2010 +0100

    Merged with trunk again.

commit 21c1d379199c528024c5e85571609e77e53c6ee7
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 13:31:40 2010 -0700

    light cleanup - convention stuff mostly

 nova/auth/manager.py |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 86150042191005a9bf04ef243396667cb9dad1b0
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 13:20:50 2010 -0700

    convention and variable naming cleanup for pylint/pep8

 nova/network/model.py |   34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

commit 993563b6cc9db9f24480678cf8b2d0750aee7a92
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 13:05:24 2010 -0700

    Used new (clearer) flag names when calling processes

 nova/process.py        |   10 +++++++---
 nova/volume/service.py |    3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 00b5a4a1cb3b35aa07972ef93f12e86808111812
Merge: 0ee7d2f c0c2f58
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 13:02:12 2010 -0700

    Merged with trunk

commit 0ee7d2f74a959bcf1cf611f63842302866774475
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 12:57:33 2010 -0700

    Greater compliance with pep8/pylint style checks

 bin/nova-manage           |    4 +-
 nova/objectstore/image.py |   15 +++++--
 nova/process.py           |  108 +++++++++++++++++++++++----------------------
 nova/utils.py             |   12 ++---
 nova/virt/libvirt_conn.py |    4 +-
 tools/install_venv.py     |    2 +-
 6 files changed, 80 insertions(+), 65 deletions(-)

commit 3fe167e1e398b3d602699b8219dcbfc8fec86859
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 11:40:03 2010 -0700

    removing what appears to be an unused try/except statement - nova.auth.manager.UserError
    doesn't exist in this codebase. Leftover? Something intended to be there but never added?

 nova/endpoint/cloud.py |   28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

commit e59b769cf1ad12f63788d2e90fd3a4412f9db6f4
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 11:39:14 2010 -0700

    variable name cleanup

 nova/endpoint/cloud.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit abd9bed8f7f88617c0a402faef47da13963ccea7
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 09:50:22 2010 -0700

    attempting some cleanup work

 nova/endpoint/cloud.py |   77 +++++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

commit 86a7e62f0b72763088b0a34516ffc30f22ca937e
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 09:49:47 2010 -0700

    adding pep8 and pylint for regular cleanup tasks

 tools/pip-requires |    2 ++
 1 file changed, 2 insertions(+)

commit 46c0f66d123e2b4af101bb12408ad6de5eb6855b
Author: Eric Day <eday@oddments.org>
Date:   Sat Aug 7 19:51:17 2010 -0700

    Cleaned up pep8/pylint for bin/* files. I did not fix rsapi since this is already cleaned up in another branch.

 bin/nova-api                         |    6 +-
 bin/nova-dhcpbridge                  |   42 ++++++-----
 bin/nova-import-canonical-imagestore |   33 ++++----
 bin/nova-instancemonitor             |   18 ++---
 bin/nova-manage                      |  138 +++++++++++++++++++---------------
 bin/nova-objectstore                 |    8 +-
 pylintrc                             |    3 +
 run_tests.py                         |    3 +-
 8 files changed, 131 insertions(+), 120 deletions(-)

commit ff47d384a4be8627a32ee8e34dddc5bd005ac063
Merge: b77d261 c0c2f58
Author: Eric Day <eday@oddments.org>
Date:   Sat Aug 7 14:45:36 2010 -0700

    Merged trunk.

commit fd625a55c3725b5cff4449a687b0d54d0d49bd2e
Author: Eric Day <eday@oddments.org>
Date:   Sat Aug 7 12:12:10 2010 -0700

    Reworked WSGI helper module and converted rackspace API endpoint to use it.

 bin/nova-rsapi                  |   21 +--
 nova/endpoint/eventletserver.py |    7 -
 nova/endpoint/new_wsgi.py       |  136 ------------------
 nova/endpoint/rackspace.py      |  302 ++++++++++++---------------------------
 nova/endpoint/wsgi.py           |   40 ------
 nova/wsgi.py                    |  173 ++++++++++++++++++++++
 6 files changed, 271 insertions(+), 408 deletions(-)

commit 91e085b2c272ebd30955a83d3871c402f6749316
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 6 18:06:57 2010 -0700

    Changed the network imports to use new network layout.

 nova/endpoint/rackspace.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d079b2fee754868743aaf4224322fbd517dc7705
Merge: ba3b5ac c0c2f58
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 19:20:13 2010 -0500

    merged with trunk

commit c0c2f5851ab70ee91f1a271a6c32a84315c1e831
Merge: 9586d64 6370875
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Aug 7 00:17:02 2010 +0000

    Change nova/virt/images.py's _fetch_local_image to accept 4 args, since fetch() tries to call it with that many.

commit 91aa06266889354e0be8fd86f66267f417c81440
Merge: 1cf1dc1 f27d775
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 6 16:56:56 2010 -0700

    Merged Todd and Michael's changes.

commit ba3b5ac30d9cd72e1cb757919ea76843112b307e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 18:54:45 2010 -0500

    pep8 and pylint cleanups

 nova/scheduler/scheduler.py |   29 +++++++++++++++++++----------
 nova/scheduler/service.py   |   18 +++++++++---------
 2 files changed, 28 insertions(+), 19 deletions(-)

commit 9586d648f458606b5ef78c58bbe64de0dcbf1419
Merge: 1cf1dc1 b77d261
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 6 23:47:15 2010 +0000

    Some pylink and pep8 cleanups. Added a pylintrc file.

commit 094d64334e419d86a550c913ea4f0b8f086777bd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 18:10:41 2010 -0500

    fix copyrights for new files, etc

 bin/nova-listinstances      |   21 ++++++++++++++++++++-
 nova/scheduler/__init__.py  |   12 ++----------
 nova/scheduler/scheduler.py |    4 +---
 nova/scheduler/service.py   |    4 +---
 4 files changed, 24 insertions(+), 17 deletions(-)

commit a33dce2da8dc8e25d0943732adfa6b14b1e48c7b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 15:48:46 2010 -0700

    a few more commands were putting output on stderr.  In general, exceptions on stderr output seems like a bad idea

 nova/volume/service.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 6c4e257b6df94b8c8e0745e8c3d0701293ae588e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 17:40:10 2010 -0500

    Moved Scheduler classes into scheduler.py.  Created a way to specify scheduler class that the SchedulerService uses...

 nova/scheduler/scheduler.py |   82 +++++++++++++++++++++++++++++++++++++++++++
 nova/scheduler/service.py   |   52 ++++++++-------------------
 2 files changed, 96 insertions(+), 38 deletions(-)

commit 1cf1dc1c78e7c94d50ec58cdd7605302d894b44f
Merge: 98b5e89 66c8abf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 21:52:17 2010 +0000

    Make network its own worker! This separates the network logic from the api server, allowing us to have multiple network controllers. There a lot of stuff in networking that is ugly and should be modified with the datamodel changes. I've attempted not to mess with those things too much to keep the changeset small(ha!).

commit 98b5e8959fe9c937de380b9e0428306a703b47fe
Merge: efd563f 8261e26
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 21:35:55 2010 +0000

    Fixed instance model associations to host (node) and added association to ip.

commit efd563f110b91befdca62321e8d0b2f575ba2884
Merge: c9ba760 778e815
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Aug 6 21:34:37 2010 +0000

    Fixed write authorization for public images

commit c9ba760425f9b03505633de6aa2b0a8d84a2fb16
Merge: 85b7319 5cda993
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 21:32:50 2010 +0000

    Fixes a bug where if a user was removed from a group after he had a role, he could not be re-added.

commit 66c8abfb9f00ea06517e102f02ef8bdc9469aae8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 14:31:03 2010 -0700

    fix search/replace error

 nova/tests/network_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b
Merge: 024ad99 85b7319
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 14:27:48 2010 -0700

    merged trunk

commit 869f33c9bf4a70e2a4ca4d1034114890d458f983
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 14:40:24 2010 -0500

    Start breaking out scheduler classes...

 nova/scheduler/service.py |   34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

commit f27d775bee0089e0c86f9a0421a57ab41d0a3a57
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 5 23:35:16 2010 -0400

    WsgiStack class, eventletserver.serve.
    Trying to work toward a simple API that anyone can use to start an eventlet-based server composed of several WSGI apps.

 nova/endpoint/eventletserver.py |    7 +++++++
 nova/endpoint/new_wsgi.py       |   30 ++++++++++++++++++++++--------
 nova/endpoint/rackspace.py      |    2 --
 3 files changed, 29 insertions(+), 10 deletions(-)

commit 64e34d8004662879708f69e476881adc9d6ba45b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 5 22:54:08 2010 -0400

    Use webob to simplify wsgi middleware

 nova/endpoint/new_wsgi.py |  122 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

commit 5cda99300a437feefac39131bb714e9f85d765ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 16:56:23 2010 -0700

    Made group membership check only search group instead of subtree.  Roles in a group are removed when a user is removed from that group.  Added test

 nova/auth/fakeldap.py       |   11 ++++++++---
 nova/auth/ldapdriver.py     |   25 +++++++++++++++++--------
 nova/tests/auth_unittest.py |   10 +++++++++-
 3 files changed, 34 insertions(+), 12 deletions(-)

commit 63708752366300b4267a9dfbf926f89f9df3f4df
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 18:26:39 2010 -0500

    Fixes bug#614090 -- nova.virt.images._fetch_local_image being called with 4 args but only has 3

 nova/virt/images.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 778e8152751ebdbb2adad544cc705691395d335d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Aug 5 16:20:26 2010 -0700

    Fixed image modification authorization, API cleanup

 nova/endpoint/cloud.py      |    2 ++
 nova/objectstore/handler.py |    3 ++-
 nova/objectstore/image.py   |    8 ++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

commit c7e5faf0aa97ae8f0894b19a9f851d3868e578c3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 15:10:56 2010 -0700

    fixed doc string

 nova/scheduler/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd5000e70a724d9bea69754d4e7b99630d2d5ea2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 16:19:21 2010 -0500

    compute topic for a node is compute.node not compute:node!

 nova/scheduler/service.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f42be0875d06a5d3ec0d5304d2f01a41b1f6a477
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 16:11:59 2010 -0500

    almost there on random scheduler.  not pushing to correct compute node topic, yet, apparently...

 bin/nova-scheduler         |   32 ++++++++++++++++
 nova/endpoint/cloud.py     |    2 +-
 nova/flags.py              |    1 +
 nova/scheduler/__init__.py |   33 +++++++++++++++++
 nova/scheduler/service.py  |   87 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 154 insertions(+), 1 deletion(-)

commit b77d261b0288f89d2b25a52e7ad7c8073e357cb1
Author: Eric Day <eday@oddments.org>
Date:   Thu Aug 5 13:51:44 2010 -0700

    First pass at making a file pass pep8 and pylint tests as an example.

 nova/tests/objectstore_unittest.py |  237 +++++++++++++++++++++---------------
 pylintrc                           |    6 +
 2 files changed, 142 insertions(+), 101 deletions(-)

commit 98ea9c02f60dc6734707bfc3827e6fe82dfde127
Merge: d79fd0d 85b7319
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 12:34:22 2010 -0700

    merged trunk

commit 024ad9951dcf33f5a3468e9a790f1636770b2837
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 12:29:50 2010 -0700

    rename networkdata to vpn

 nova/auth/manager.py           |    6 +--
 nova/network/networkdata.py    |  116 ----------------------------------------
 nova/network/service.py        |    4 +-
 nova/network/vpn.py            |  116 ++++++++++++++++++++++++++++++++++++++++
 nova/tests/network_unittest.py |   10 ++--
 5 files changed, 126 insertions(+), 126 deletions(-)

commit bf0ea2deaf24419d85cae684e0700241e4c03f8c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 12:54:13 2010 -0500

    remove extra line accidentally added

 nova/compute/model.py |    1 -
 1 file changed, 1 deletion(-)

commit 5f41e9c764d2d064590e61018e655b9da8b17e9c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 12:52:55 2010 -0500

    compute nodes should store total memory and disk space available for VMs

 nova/compute/model.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit c373066601a746d91de989ca4de775db9542012e
Merge: ceaa125 85b7319
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 10:31:14 2010 -0500

    merged from trunk

commit ceaa125915c4f1432ba802396a84a6204a6678df
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 10:30:06 2010 -0500

    added bin/nova-listinstances, which is mostly just a duplication of euca-describe-instances but doesn't go through the API.

 bin/nova-listinstances |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 85b73194c2f8432a7e9ab5d24574746f209846ee
Merge: 79b8e33 a3cc377
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 11:32:42 2010 +0000

    Fixes various concurrency issues in volume worker.

commit d79fd0df0bf9c59483b30c0d8c3a811580a1ee39
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 04:31:21 2010 -0700

    Changed volumes to use a pool instead of globbing filesystem for concurrency reasons.  Fixed broken tests.

 nova/tests/volume_unittest.py |   77 +++++++++++++++++++++++--------
 nova/volume/service.py        |  102 ++++++++++++++++++++++-------------------
 2 files changed, 114 insertions(+), 65 deletions(-)

commit d1709793045de2f77f4a1fb06f63d27cbcf640d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 18:37:00 2010 -0700

    clean up nova-manage. If vpn data isn't set for user it skips it

 bin/nova-manage      |   23 +++++++++++------------
 nova/auth/manager.py |   39 ++++++++++++++++++++++++++-------------
 2 files changed, 37 insertions(+), 25 deletions(-)

commit cc64a872c685b931bf76e2323986b427cad777c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 18:12:19 2010 -0700

    method is called set_network_host

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c1e0abd5be3ac8473aaf255f77fb2357b5771ea9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 18:00:13 2010 -0700

    fixed circular reference and tests

 nova/auth/manager.py           |    4 +-
 nova/network/model.py          |   89 ------------------------------
 nova/network/networkdata.py    |  116 ++++++++++++++++++++++++++++++++++++++++
 nova/network/service.py        |    5 +-
 nova/tests/auth_unittest.py    |   14 -----
 nova/tests/network_unittest.py |   15 ++++++
 6 files changed, 136 insertions(+), 107 deletions(-)

commit 6b70951e5b7cb8cabe5d6eb50fce7ae0a6e55d52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 17:40:16 2010 -0700

    renamed Vpn to NetworkData, moved the creation of data to inside network

 nova/auth/manager.py    |  100 +++--------------------------------------------
 nova/network/model.py   |   90 ++++++++++++++++++++++++++++++++++++++++++
 nova/network/service.py |   20 ++++++++--
 3 files changed, 112 insertions(+), 98 deletions(-)

commit aa84936cb63cd1913a1640944a9353d018ace13f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 16:51:48 2010 -0700

    fix rpc command line call, remove useless deferreds

 nova/network/service.py |   34 ++++++++++++++++------------------
 nova/rpc.py             |    4 ++--
 2 files changed, 18 insertions(+), 20 deletions(-)

commit de456585b67f3eb46bcae5869af4ac83c6d95908
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 15:53:24 2010 -0700

    fix error on terminate instance relating to elastic ip

 nova/endpoint/cloud.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 4130a506900c833dba831cabbd0197b7d4b59dc0
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 23:45:41 2010 +0100

    Move the xenapi top level directory under plugins, as suggested by Jay Pipes.

 plugins/xenapi/README                              |    6 +
 plugins/xenapi/etc/xapi.d/plugins/objectstore      |  231 ++++++++++++++++++++
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    |  216 ++++++++++++++++++
 xenapi/README                                      |    6 -
 xenapi/etc/xapi.d/plugins/objectstore              |  231 --------------------
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py        |  216 ------------------
 6 files changed, 453 insertions(+), 453 deletions(-)

commit 9a038d2b81163d3e658e4fb3be4f8c14aa3b5fab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 15:44:23 2010 -0700

    fixed tests, moved compute network config call, added notes, made inject option into a boolean

 bin/nova-network               |    7 +---
 nova/compute/service.py        |   19 ++++++----
 nova/network/service.py        |   75 +++++++++++++++++++++++++++++++---------
 nova/tests/network_unittest.py |   18 +++++-----
 nova/virt/libvirt_conn.py      |    2 +-
 5 files changed, 81 insertions(+), 40 deletions(-)

commit 1bdde8e521eb25203139d807033450a819057d5c
Merge: 570dffd 79b8e33
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 23:23:13 2010 +0100

    Merge with trunk.

commit a0eb1b9cc2e33c1a90501daeb3776738689e328f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 14:08:23 2010 -0700

    fix extra reference, method passing to network, various errors in elastic_ips

 nova/endpoint/cloud.py  |   12 +++++++-----
 nova/network/model.py   |    6 +++++-
 nova/network/service.py |    7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

commit 4f6d71411ca23a4f92654f000e24fe008f0a00da
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:54:21 2010 -0700

    use iteritems

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bfe90c9c26a0c477386f3143c1e9f0563b6a1a97
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:51:05 2010 -0700

    reference to self.project instead of context.project + self.network_model instead of network_model

 nova/endpoint/cloud.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 148f319759fc9f566e0e9020ceb8ea00081ff8c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:48:16 2010 -0700

    fixes in get public address and extra references to self.network

 nova/endpoint/cloud.py |   18 ++++++++++--------
 nova/network/model.py  |   12 ++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

commit c821709a48eb22db4db182f25f1e405039294d2c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:18:52 2010 -0700

    method should return network topic instead of  network host

 nova/endpoint/cloud.py  |   32 ++++++++++++++++----------------
 nova/network/service.py |    2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

commit e816e7923582d7ac11b7f7a554eec815ea61496e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:02:23 2010 -0700

    use deferreds in network

 nova/network/service.py |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

commit 311daf14758d8a04c5f73fa4e2911e469a716c1f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:44:25 2010 -0700

    don't __ module methods

 nova/network/service.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b2e220c976b7689a2c5d924395c57012c6b99212
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:18:46 2010 -0700

    inline commands use returnValue

 nova/endpoint/cloud.py |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

commit d0ca78ea900d71492212ac531ec75616b02300b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:12:58 2010 -0700

    it helps to save files BEFORE committing

 nova/endpoint/cloud.py    |   60 +++++++++++++++++++++++++--------------------
 nova/virt/libvirt_conn.py |   25 ++++++++++---------
 2 files changed, 47 insertions(+), 38 deletions(-)

commit 570dffd7168d73d7a550b4fa4573532d3fe19294
Merge: 24d5113 490a977
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 11:32:43 2010 +0100

    Merge lp:~vishvananda/nova/fix-curl-project, fix conflicts with changes
    to images.image_url, and add the same fix to xenapi.

commit 24d5113636a92df386fa076cc89cea5b1c8b2580
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 11:14:11 2010 +0100

    Added note to README.

 xenapi/README |    4 ++++
 1 file changed, 4 insertions(+)

commit 79b8e33557a52454d55f17d6687a2d175e7555a9
Merge: a0ffc53 490a977
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 06:17:35 2010 +0000

    Fixes the curl to pass in the project properly

commit a0ffc53e1dd542797b1e1498b269fab25766d746
Merge: 4154e24 80b79a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 06:07:48 2010 +0000

    Adds flag for libvirt type (hvm, qemu, etc)

commit 4154e24f582e743b30ed0a6099d7b91558f6cdd2
Merge: c091115 f8e7f79
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 05:57:29 2010 +0000

    Fix deprecation warning in AuthManager. __new__ isn't allowed to take args.

commit 13ec179c99012ed3d579e19094c0039ccb630796
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 17:27:29 2010 -0700

    created assocaition between project and host, modified commands to get host async, simplified calls to network

 nova/network/service.py        |   72 ++++++++++++++++++++++------------------
 nova/tests/network_unittest.py |   30 ++++++++---------
 2 files changed, 54 insertions(+), 48 deletions(-)

commit 8261e26f78f061de5f5e98f8066da33f9b4e3a23
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:48:49 2010 -0700

    use get to retrieve node_name from initial_state

 nova/compute/model.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 576dade1d53814416977522637bea9e3c32e5483
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:13:07 2010 -0700

    change network_service flag to network_type and don't take full class name

 bin/nova-network        |   10 ++++++----
 nova/network/service.py |    3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 6187529119ab51a6df7e30ef5190757ee0feca5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:04:38 2010 -0700

    vblade commands randomly toss stuff into stderr, ignore it

 nova/volume/service.py |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

commit 28a00e18d3e868c80d88af7f4a1fb1832e83c058
Merge: c091115 a3cc377
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:02:33 2010 -0700

    delete instance doesn't fail if instances dir doesn't exist

commit ecf8608a84960496c6c8e350f99d53537e4581c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 14:31:47 2010 -0700

    Huge network refactor, Round I
    
    Made network into its own binary
    Made simple network a plugabble class
    Fixed unittests
    Moved various classes around
    Moved mac generation into network class

 bin/nova-dhcpbridge            |   22 +-
 bin/nova-network               |   11 +-
 nova/compute/exception.py      |   40 ---
 nova/compute/linux_net.py      |  181 ------------
 nova/compute/network.py        |  597 ----------------------------------------
 nova/compute/service.py        |    6 +-
 nova/endpoint/cloud.py         |  129 +++++----
 nova/network/exception.py      |   40 +++
 nova/network/linux_net.py      |  181 ++++++++++++
 nova/network/model.py          |  549 ++++++++++++++++++++++++++++++++++++
 nova/network/service.py        |  135 ++++++++-
 nova/tests/network_unittest.py |   99 ++++---
 12 files changed, 1050 insertions(+), 940 deletions(-)

commit c0911155c14f4f54865532ea24ad128794fd6b57
Merge: 75c8cca 04d6595
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 18:17:54 2010 +0000

    Fixes boto imports to support both beta and older versions of boto.

commit 8d70245cc78075356ec1ebabc4810df8b07428f6
Author: Joel Moore joelbm24@gmail.com <>
Date:   Tue Aug 3 11:02:58 2010 -0700

    Get IP doesn't fail of you not connected to the intetnet
    
    ------------- This line and the following will be ignored --------------
    
    modified:
      nova/utils.py
    unknown:
      CA/cacert.pem
      CA/index.txt
      CA/openssl.cnf
      CA/serial
      CA/private/cakey.pem
      bin/nova@

 nova/utils.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit 3cb4226d7edba4889d7db7ac541a1949df35ea17
Merge: 4044051 75c8cca
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Aug 3 12:58:58 2010 -0400

    Merge from trunk.

commit 6dde6fdc10bdb6f75fabce1b0e7a6c4e031937ea
Author: andy <code@term.ie>
Date:   Tue Aug 3 18:00:11 2010 +0200

    updated doc string and wrapper

 nova/flags.py |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

commit e95aac3ac93dabd35eb86951fdc270e06d2b2622
Author: andy <code@term.ie>
Date:   Tue Aug 3 16:51:37 2010 +0200

    add copyright headers

 nova/tests/declare_flags.py |   18 ++++++++++++++++++
 nova/tests/runtime_flags.py |   18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

commit 035f93aa7dc19656bf22de9b7ccfe12b28cde61b
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 15:42:17 2010 +0100

    Fix exception in get_info.

 nova/virt/xenapi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 89e057cf2f008ebb7ec1c99605ff99f5849d9b40
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 15:41:35 2010 +0100

    Implement VIF creation.

 nova/virt/xenapi.py |   57 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 7 deletions(-)

commit b31d4f795dbd94bae2c3d8f01aea3b15ed9684b2
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 15:37:31 2010 +0100

    Define __contains__ on BasicModel, so that we can use "x in datamodel".

 nova/datastore.py |    3 +++
 1 file changed, 3 insertions(+)

commit 83c4a429d29b7d69128d90504f6febc2efe1d3a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 01:29:31 2010 -0700

    Fixed instance model associations to host (node) and added association to ip

 nova/compute/model.py        |   44 +++++++-------
 nova/datastore.py            |   12 ++--
 nova/tests/model_unittest.py |  135 ++++++++++++++++++++----------------------
 3 files changed, 95 insertions(+), 96 deletions(-)

commit c6fbcd864a2728996f23cac547c97caa04e0c449
Merge: 4c8ae5e 75c8cca
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 00:54:02 2010 +0100

    Merge with trunk.

commit 4c8ae5e0a5b30039075a87ba39aec6da64fdd138
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 00:52:06 2010 +0100

    Added a xapi plugin that can pull images from nova-objectstore, and use that
    to get a disk, kernel, and ramdisk for the VM.  The VM actually boots!

 nova/virt/xenapi.py                         |  105 +++++++++++-
 xenapi/README                               |    2 +
 xenapi/etc/xapi.d/plugins/objectstore       |  231 +++++++++++++++++++++++++++
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py |  216 +++++++++++++++++++++++++
 4 files changed, 547 insertions(+), 7 deletions(-)

commit 75c8ccaadedd59b8b7671c3802b8bcfd6368a998
Merge: 1db9c94 099feef
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Aug 2 16:37:29 2010 +0000

    Added project as parameter to admin client x509 zip file download.

commit 40b2bbcfe6274aca9fd4361c56b2b042ba22e3c2
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 2 08:31:19 2010 +0100

    Turn the private _image_url(path) into a public image_url(image).  This will
    be used by virt.xenapi to instruct xapi as to which images to download.
    
    As part of this, the value returned became a complete URL, with http:// on the
    front.  This caused the URL parsing to be adjusted.

 nova/virt/images.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 2524ddec2541e416151b0bf876509e2e728126d5
Merge: 6227cb1 6c32e87
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Jul 31 21:36:28 2010 -0700

    Merged in configurable libvirt_uri, and fixes to raw disk images from the virtualbox branch

commit 6c32e87c1be80230cf058586cee5a94cd25670b8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Jul 31 21:35:58 2010 -0700

    Fixed up some of the raw disk stuff that broke in the abstraction out of libvirt

 nova/compute/disk.py      |    3 +++
 nova/virt/libvirt_conn.py |   48 +++++++++++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 13 deletions(-)

commit 08f8bb4183a5a44f71c4c447a46668ecff6a03fb
Merge: 7985f5f 6227cb1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Jul 31 20:51:09 2010 -0700

    Merged with raw disk image

commit 6227cb13c311624998b9c2c6e55fc0d261cfcb6c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Jul 31 20:49:21 2010 -0700

    Recognize 'magic' kernel value that means "don't use a kernel" - currently aki-00000000

 nova/endpoint/cloud.py |   10 ++++++++--
 nova/flags.py          |    3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

commit a3cc377f9dbe57195ef5f49f3f02a2178dc50cb1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 19:33:07 2010 -0700

    Fix Tests

 nova/tests/volume_unittest.py |   20 ++++++++++----------
 nova/volume/service.py        |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

commit ed76ee9e823071c1c94db10907cc6a2bd725a999
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 18:32:12 2010 -0700

    Fixes nova volumes.  The async commands yield properly.  Simplified the call to create volume in cloud.  Added some notes

 nova/endpoint/cloud.py |   11 +++++------
 nova/volume/service.py |   43 ++++++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

commit 04d6595d9b4c77f1fcaf01a7763caf11046ab164
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 16:15:09 2010 -0700

    another try on fix boto

 nova/auth/signer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 490a97783b97c5753692099c4d7f609e29a8f74e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 15:36:11 2010 -0700

    use user.access instead of user.id

 nova/auth/manager.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 1934cbb0413f074213b1aeeda605d9b49055c581
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 15:19:41 2010 -0700

    Fixes access key passing in curl statement.

 nova/auth/manager.py      |    4 ++++
 nova/endpoint/images.py   |   18 +++++++++++-------
 nova/virt/images.py       |   14 +++++++++-----
 nova/virt/libvirt_conn.py |   16 ++++++++--------
 4 files changed, 32 insertions(+), 20 deletions(-)

commit 7985f5fb32432630b3fef775f601900f89346ed2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 13:35:21 2010 -0700

    Accept a configurable libvirt_uri

 nova/virt/libvirt_conn.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 6526f21d9bf5a53546240ec29099d68933165500
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 13:13:00 2010 -0700

    Added Cheetah to pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit c599914304b262067c19b2968ab50826b4d9bcd3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:54:03 2010 -0700

    Removed duplicate toXml method

 nova/virt/libvirt_conn.py |   14 --------------
 1 file changed, 14 deletions(-)

commit dc9f6bc448b62941187305663f7099f07ad69fbe
Merge: 5bb1d8d 1db9c94
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:49:54 2010 -0700

    Merged with trunk

commit 9b6f4346b575d9a20d94293e9352a7c09a8d2a7a
Merge: 3897047 1db9c94
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:13:20 2010 -0700

    Merged with trunk, added note about suspicious behaviour

commit 3897047a2c0f8906c99418ddad6e2c68f0dec5c7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:05:32 2010 -0700

    Added exit code checking to process.py (twisted process utils).  A bit of class refactoring to make it work & cleaner.
    Also added some more instructive messages to install_venv.py, because otherwise people that don't know what they're doing will install the wrong pip... i.e. I did :-)

 nova/process.py                |   90 +++++++++++++++-------------------------
 nova/tests/process_unittest.py |    2 +-
 nova/virt/libvirt_conn.py      |    2 +-
 tools/install_venv.py          |   15 ++++---
 4 files changed, 44 insertions(+), 65 deletions(-)

commit 1db9c94a78bcbefaaa59ee5ee0de4efe5fc1c790
Merge: 10d79c8 912a6bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 19:03:15 2010 +0000

    Make nodaemon twistd processes log to stdout.

commit 912a6bd28adb2a17c4d0508ee44b1d19ae2624f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 11:29:13 2010 -0700

    Make nodaemon twistd processes log to stdout

 bin/nova-objectstore |    5 -----
 nova/twistd.py       |    3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 80b79a923bc6fb331daaf6960e6353c700b89c41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 11:19:03 2010 -0700

    use the right tag

 nova/compute/libvirt.xml.template |    5 ++---
 nova/virt/libvirt_conn.py         |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

commit 16e89bad15f5665a5f46c0bdcdfab1b7f3df4039
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 29 17:58:44 2010 -0700

    flag for libvirt type

 nova/compute/libvirt.xml.template |    2 +-
 nova/virt/libvirt_conn.py         |   13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

commit 10d79c8ffef8e0c5f42b0dde490acbafa3c1776d
Merge: 73a47df fc43398
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 00:32:35 2010 +0000

    boto.s3 no longer imports connection, so we need to explicitly import it.

commit 099feefbbd1f9b0db70f1a4bcc90da57f902af9d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 29 17:18:39 2010 -0700

    Added project param to admin client zip download

 nova/adminclient.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit fc433987e6adbca086bd2fa3d416658e9d3f04ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 29 17:10:28 2010 -0700

    boto.utils import doesn't work with new boto, import boto instead

 nova/auth/signer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4cf1001fa37c00daea40e9f68be7c95ab0e41e4d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 29 16:52:08 2010 -0700

    fix imports in endpoint/images.py boto.s3 no longer imports connection, so we need to explicitly import it.

 nova/endpoint/images.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 93aee19fa2f24c4f9c1fd59c0666e024c6891565
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 29 14:48:10 2010 -0700

    Added --fail argument to curl invocations, so that HTTP request fails get surfaced as non-zero exit codes

 bin/nova-import-canonical-imagestore |    6 +++---
 nova/cloudpipe/bootscript.sh         |    4 ++--
 nova/utils.py                        |    2 +-
 nova/virt/images.py                  |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

commit 251e41ff51178d4485863f716ea1c67725725e20
Merge: 4a9bc4c 73a47df
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 29 14:35:41 2010 -0700

    Merged with trunk

commit e588b82a991107720137d21d89f0fb24f55fdf50
Merge: 04a6a02 73a47df
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 22:06:17 2010 +0100

    Merged with trunk.

commit fe64d63240ee05e972731dbd97f76fcac3e1c5aa
Author: andy <code@term.ie>
Date:   Thu Jul 29 20:05:22 2010 +0200

    strip out some useless imports

 nova/tests/flags_unittest.py |    7 -------
 1 file changed, 7 deletions(-)

commit 9dfdbe11b89ae1f490257b6f687c2a5f5c90bb14
Author: andy <code@term.ie>
Date:   Thu Jul 29 19:53:00 2010 +0200

    Add some useful features to our flags
    
    * No longer dies if there are unknown flags.
    * Allows you to declare that you will use a flag from another file
    * Allows you to import new flags at runtime and reparses the original
      arguments to fill them once they are accessed.

 nova/flags.py                |  133 ++++++++++++++++++++++++++++++++++++++++--
 nova/tests/declare_flags.py  |    5 ++
 nova/tests/flags_unittest.py |   94 +++++++++++++++++++++++++++++
 nova/tests/runtime_flags.py  |    5 ++
 run_tests.py                 |    1 +
 run_tests.sh                 |    2 +-
 6 files changed, 233 insertions(+), 7 deletions(-)

commit 73a47dfecf4b1ba66a45421bbd925f3e0db054c5
Merge: 37b9de9 77fdb42
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 29 15:39:26 2010 +0000

    Fixed pep8 in run_test.py.

commit 77fdb426f15fa21f5700da6416f2b479a5f01541
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 29 08:30:09 2010 -0700

    Blank commit to get tarmac merge to pick up the tags.

commit 37b9de911f1c5100aa3c9fd18f07c9ebd5ee5560
Merge: efc6317 bc96d6d
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 12:37:30 2010 +0000

    Fixed assertion "Someone released me too many times: too many tokens!"

commit bc96d6daa425f7c38d67ad43b8cf46f3ba5989c3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 09:08:31 2010 +0100

    Replace the second singleton unit test, lost during a merge.

 nova/tests/process_unittest.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit c3ad356680c011f1efc551601da392a252b6c0fa
Merge: 77117b6 efc6317
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 09:04:54 2010 +0100

    Merged with trunk to resolve merge conflicts.

commit f8e7f79833b545a2812d0161f769271621fdf33c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 23:19:07 2010 -0700

    oops retry and add extra exception check

 nova/auth/manager.py |    2 +-
 nova/utils.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 5326d7f76b48e93bd74d9539febe1f41bbf3f286
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:41:49 2010 -0700

    Fix deprecation warning in AuthManager. __new__ isn't allowed to take args.

 nova/auth/manager.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit efc6317108b09311d6830b333a36714feeb2532b
Merge: f9569be 49dd0c5
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 29 03:25:03 2010 +0000

    Added ChangeLog generation

commit f9569be64be5dbc909ac8dcb594d361aea12c97c
Merge: 7847a02 bb375bb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 29 03:23:51 2010 +0000

    Implemented admin api for rbac

commit 7847a029e00f089297f0446267bf818eaef3e1f5
Merge: e45b95a b01c531
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 03:22:42 2010 +0000

    Move the reading of API parameters above the call to _get_image, so that
    they have a chance to take effect.

commit b01c531ba5cb408a630e992beda769032b135f6a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 01:21:50 2010 +0100

    Move the reading of API parameters above the call to _get_image, so that
    they have a chance to take effect.

 nova/endpoint/cloud.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit e45b95aa993e577323893406b97e4de55d1ad330
Merge: 4e57378 04a6a02
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 00:07:43 2010 +0000

    Adds initial support for XenAPI (not yet finished)

commit 04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 00:58:33 2010 +0100

    More merges from trunk.  Not everything came over the first time.

 nova/auth/ldapdriver.py        |    7 +++++--
 nova/auth/manager.py           |    6 +++---
 nova/compute/linux_net.py      |    7 ++++---
 nova/datastore.py              |    2 +-
 nova/endpoint/api.py           |    2 +-
 nova/endpoint/cloud.py         |    8 ++++++--
 nova/objectstore/handler.py    |   10 +++++-----
 nova/process.py                |   13 +++++++------
 nova/tests/auth_unittest.py    |    6 ++++++
 nova/tests/process_unittest.py |    7 -------
 setup.py                       |    2 +-
 11 files changed, 39 insertions(+), 31 deletions(-)

commit 4e5737815bd62e0d78add8932ceb220b1ac3787d
Merge: 9699545 a7e5d47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 23:42:35 2010 +0000

    Allow driver specification in AuthManager creation.

commit bb375bbeffb1249c653d3589acb521a25f8824c7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 23:41:43 2010 +0000

    pep8

 nova/adminclient.py    |   37 +++++++++++++++----------------------
 nova/endpoint/admin.py |   14 +++++---------
 2 files changed, 20 insertions(+), 31 deletions(-)

commit 9f4996e8738991a95a23cba2caa660f7002f94cd
Merge: c5edaa2 f61b629
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 00:11:02 2010 +0100

    Merge with trunk, including fixing up conflicts with the removal of fake_users
    and the reworking of node.py -> service.py.

commit 49dd0c52c143d86dcdd562ffd764a9f7e3ee8ce0
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 16:05:17 2010 -0700

    Fixed pep8 issues in setup.py - thanks redbo.

 setup.py |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 96995456ccd24ec46f703bfa3e784eb193858bbb
Merge: c0e3fd6 a46e9ae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:50:33 2010 +0000

    Use default kernel and ramdisk properly by default.

commit c0e3fd6d728abe012f10a55c4f2bf2c895a6c724
Merge: d32e41b 2ecdf8c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:49:11 2010 +0000

    Adds optional user param to the get projects command.

commit d32e41bc6237f1413e663144ab72d4a89627b71a
Merge: 1098d57 47408dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:47:52 2010 +0000

    Ensures default redis keys are lowercase like they were in prior versions of the code.

commit 1098d571bd29aad8b64a9d941d47339a67524e58
Merge: 2349a7d 2c6bf00
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:44:08 2010 +0000

    Pass in environment to dnsmasq properly

commit 2349a7dd9ab6ff772b17e4c76e9e1223fd1f68d3
Merge: f61b629 10f3255
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 22:42:59 2010 +0000

    Releaed 0.9.0, now on 0.9.1

commit 82345d6338fa9418551f40547694e73b660a6e37
Merge: 93236b6 f61b629
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 21:40:08 2010 +0000

    Merged trunk

commit 7c39435df527126411ccaf5f95c1f9d0828af107
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 14:37:58 2010 -0700

    Added ChangeLog generation.

 .bzrignore  |    1 +
 MANIFEST.in |    1 +
 setup.py    |   18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

commit 93236b6b5f4f18fabf0852c6cbb9540578935961
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 21:04:05 2010 +0000

    Wired up get/add/remove project members

 nova/adminclient.py    |   79 ++++++++++++++++++++++++++++++++++++++++--------
 nova/endpoint/admin.py |   15 ++++++---
 2 files changed, 78 insertions(+), 16 deletions(-)

commit 77117b6a3b89ea9e2cd8a7422a6268784f930168
Merge: 1a53eae 5c3d352
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jul 28 21:23:11 2010 +0100

    Merged lp:~vishvananda/nova/lp609749.

commit f61b62983f62aa10d7bed3bc1c406717663be923
Merge: a72fb79 8901564
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 20:22:34 2010 +0000

    Removes logging when associating a model to something that isn't a model class.

commit a7e5d47d8e49f8fc10900ede3376ddc515799811
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 12:53:27 2010 -0700

    allow driver to be passed in to auth manager instead of depending solely on flag

 nova/auth/manager.py |   24 ++++++++++--------------
 nova/utils.py        |   10 ++++++++++
 2 files changed, 20 insertions(+), 14 deletions(-)

commit 47408dc8c901a431e358cad0420b756439d93a80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 11:33:11 2010 -0700

    make redis name default to lower case

 nova/datastore.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d55466d84039c5f9ae9a9bdb181f101a23757cc6
Merge: d425ee8 2ecdf8c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:30:21 2010 +0000

    Merged get-projects-by-user

commit d425ee86d389e8972a4e30ce5d26f1b3de96ebb7
Merge: e53cacc a72fb79
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:24:52 2010 +0000

    Merged trunk

commit e53caccb7a242bdabd4ea6aed914ab77cb1fca32
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:16:09 2010 +0000

    Fixed project api

 nova/adminclient.py    |    6 +++++-
 nova/endpoint/admin.py |    1 +
 nova/endpoint/cloud.py |    3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

commit 2ecdf8cdd81df36ef34fc7522aae3f5f1b217d81
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 10:47:53 2010 -0700

    Specify a filter by user for get projects

 nova/auth/ldapdriver.py     |    7 +++++--
 nova/auth/manager.py        |    6 +++---
 nova/tests/auth_unittest.py |    6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

commit a72fb79080df79306d947347e0ceb9be238c5cd8
Merge: 3133db0 0963599
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 16:55:02 2010 +0000

    Create a model for storing session tokens.

commit 3133db01e98e3e1a2f358de1a6ef5f70fc5121f2
Merge: b17c551 c13b2fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 16:53:39 2010 +0000

    Fixed a typo from the the refactor of auth code

commit b17c5512b8116a8ef3da632444ec849533b6e42a
Merge: 3187d55 0465cd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 16:52:30 2010 +0000

    Makes ldap flags work again.

commit 096359951f403d2b553d0ad73cf6a02872783f00
Merge: ad7f099 3187d55
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 12:13:02 2010 -0400

    bzr merge lp:nova/trunk.

commit 10f32554c93020dc409a326b4a4f1d4ea5f672c7
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 08:21:57 2010 -0700

    Tagged 0.9.0 and bumped the version to 0.9.1

 doc/source/conf.py |    4 ++--
 setup.py           |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 8901564edfaca072d6b9b2cf3f146aac1821017b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 10:09:42 2010 -0400

    Silence logs when associated models aren't found.  Also document methods used ofr associating things.  And get rid of some duplicated code.

 nova/datastore.py |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

commit 2c6bf00a35c45cb63a0c8688bbf2504dd8610bb1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 02:21:11 2010 -0700

    Fix dnsmasq commands to pass in environment properly

 nova/compute/linux_net.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 3187d555c43a2c8360244d7cfef06bb5bf786ad1
Merge: 0d32008 90ffbc2
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 08:32:40 2010 +0000

    Got the tree set for debian packaging.

commit a46e9aecb9a0de4d06dc00979795b33f788959fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 01:12:14 2010 -0700

    use default kernel and ramdisk and check for legal access

 nova/endpoint/cloud.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 0465cd87fd767fbf421e77bdabb023c980242adb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 00:18:20 2010 -0700

    import ldapdriver for flags

 nova/auth/manager.py |    2 ++
 1 file changed, 2 insertions(+)

commit 90ffbc240ffc68154816d2237dc04ea33f5066cb
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 23:23:23 2010 -0700

    Removed extra include.

 MANIFEST.in |    1 -
 1 file changed, 1 deletion(-)

commit 25de868554bbf1a9c6e5f9ed295bef6c37194352
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 23:18:27 2010 -0700

    Added the gitignore files back in for the folks who are still on the git.

 .gitignore          |   12 ++++++++++++
 CA/.gitignore       |   11 +++++++++++
 CA/INTER/.gitignore |    1 +
 CA/reqs/.gitignore  |    1 +
 4 files changed, 25 insertions(+)

commit 67711b8aa4ed0ec80d407fecea5b4bf5ffc22322
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:52:01 2010 -0700

    Added a few more missing files to MANIFEST.in and added some placeholder
    files so that setup.py would carry the empty dir.

 MANIFEST.in |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit ea89153b930eed70c7586eae56636b648e4e7252
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:41:07 2010 -0700

    Updated setup.py file to install stuff on a python setup.py install command.

 setup.cfg |   10 ++++++++--
 setup.py  |   19 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

commit 9587bd8ce817d71a8581ac16d0820714fbb10d02
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:40:06 2010 -0700

    Removed gitignore files.

 .gitignore          |   12 ------------
 CA/.gitignore       |   11 -----------
 CA/INTER/.gitignore |    1 -
 CA/reqs/.gitignore  |    1 -
 4 files changed, 25 deletions(-)

commit 464311c787d3d3176a89ec44791a03034ccb2851
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:39:58 2010 -0700

    Made run_tests.sh executable.

 0 files changed

commit 26113f6b1379aa81941169b858aee37493bad63a
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:39:23 2010 -0700

    Put in a single MANIFEST.in file that takes care of things.

 MANIFEST.in |    5 +++++
 1 file changed, 5 insertions(+)

commit 849a4062cdf8af50b8c3d44611f10857fedf6813
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:35:55 2010 -0700

    Changed Makefile to shell script. The Makefile approach completely broke
    debhelper's ability to figure out that this was a python package.

 Makefile     |   40 ----------------------------------------
 run_tests.sh |   13 +++++++++++++
 2 files changed, 13 insertions(+), 40 deletions(-)

commit c13b2fedb3cb6260fe132677a012a913c7249458
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 19:51:07 2010 -0700

    fixed typo from auth refactor

 nova/endpoint/cloud.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0d32008ea944071b99dea5a88805d78736e5f21e
Merge: 81b74bc 0cdc13f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jul 28 02:32:59 2010 +0000

    Add sdist make target to build the MANIFEST.in file.

commit 81b74bcb5d3fc2b6e6f0d7a0fef1da4209220155
Merge: 4041902 253b000
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jul 28 02:31:45 2010 +0000

    Removes debian dir from main tree. We'll add it back in in a different branch.

commit 96a643709211df2196f5cbc0a193a0d0ec4e0f06
Merge: 40dfe63 4041902
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 00:32:17 2010 +0000

    Merged trunk

commit 40dfe6316fae4b14f9fa694653341349a86d55ab
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 00:28:56 2010 +0000

    Wired up user:project auth calls

 nova/adminclient.py    |    5 +++--
 nova/auth/manager.py   |    1 +
 nova/endpoint/admin.py |   13 ++++---------
 3 files changed, 8 insertions(+), 11 deletions(-)

commit 4041902703576d955b2d4b9fd78b6961c0c03377
Merge: c1e3a87 56da5a4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 22:52:37 2010 +0000

    Bump version to 0.9.0.

commit c1e3a87253dac25140422068efa923907c8bd52c
Merge: 8d0ab70 fe4ba7d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 22:42:40 2010 +0000

    Makes the compute and volume daemon workers use a common base class called Service. Adds a NetworkService in preparation for splitting out networking code.  General cleanup and standardizarion of naming.

commit 8dad7d1d45599880571689d62857cb437dea182e
Author: Joel Moore joelbm24@gmail.com <>
Date:   Tue Jul 27 15:35:20 2010 -0700

    fixed path to keys directory

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8d0ab705f9432106ec6725be5270081ee9f5a3df
Merge: becf600 9718f52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 22:22:36 2010 +0000

    Fixes Bug lp:610611: deleted project vlans are deleted from the datastore before they are reused.

commit 0cdc13f0f0bcdcd085d58a78b7aa7dbb856cdc79
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 23:56:24 2010 +0200

    Add a 'sdist' make target. It first generates a MANIFEST.in based on what's in bzr, then calls python setup.py sdist.

 Makefile |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 9718f5216ce9423c002c47f86e05b2b2eb08e551
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 14:16:49 2010 -0700

    properly delete old vlans assigned to deleted projects

 nova/compute/network.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 253b0005670d80ec4d953330a7dbd74b8a33b148
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 23:06:03 2010 +0200

    Remove debian/ from main branch.

 debian/changelog                    |  232 -----------------------------------
 debian/compat                       |    1 -
 debian/control                      |  136 --------------------
 debian/nova-api.conf                |    5 -
 debian/nova-api.init                |   69 -----------
 debian/nova-api.install             |    3 -
 debian/nova-common.dirs             |   11 --
 debian/nova-common.install          |    9 --
 debian/nova-compute.conf            |    7 --
 debian/nova-compute.init            |   69 -----------
 debian/nova-compute.install         |    2 -
 debian/nova-dhcpbridge.conf         |    1 -
 debian/nova-instancemonitor.init    |   69 -----------
 debian/nova-instancemonitor.install |    1 -
 debian/nova-manage.conf             |    4 -
 debian/nova-objectstore.conf        |    5 -
 debian/nova-objectstore.init        |   69 -----------
 debian/nova-objectstore.install     |    2 -
 debian/nova-volume.conf             |    4 -
 debian/nova-volume.init             |   69 -----------
 debian/nova-volume.install          |    2 -
 debian/pycompat                     |    1 -
 debian/pyversions                   |    1 -
 debian/rules                        |    4 -
 24 files changed, 776 deletions(-)

commit 56da5a45f6b7e511d3adc2f7ce12e1c9a9dc3665
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 22:38:09 2010 +0200

    Bump version to 0.9.0.
    Change author to "OpenStack".
    Change author_email to nova@lists.launchpad.net.
    Change url to http://www.openstack.org/.
    Change description to "cloud computing fabric controller".

 setup.py |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit becf6003c016992b21d50e503b7c20f223d0c308
Merge: a5f4a86 3365987
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 20:22:41 2010 +0000

    Make "make test" detect whether to use virtualenv or not, thus making virtualenv optional.

commit fe4ba7d896347485347306b9702ebb5daa2afebf
Merge: 754db8e a5f4a86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 13:08:22 2010 -0700

    merged trunk

commit a5f4a865b537d95acf5f02458824f95d30aac261
Merge: fae70b1 c4ffa57
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 17:42:41 2010 +0000

    Makes the objectstore require authorization, checks it properly, and makes nova-compute provide it when fetching images.

commit 3365987ee5bc8ec66676f838d7eeefce377a76b9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 12:26:53 2010 +0200

    Automatically choose the correct type of test (virtualenv or system).

 Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit c4ffa57d4076b4aa5ed6262cdc2fece731b6875d
Merge: 9641dac fae70b1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 11:10:19 2010 +0200

    Merge with trunk.

commit 9641dac5d0cbfd8d1f3026e1bae5749b9d8e00fc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 10:30:00 2010 +0200

    Ensure that boto's config has a "Boto" section before attempting to set
    a value in it.

 nova/tests/objectstore_unittest.py |    2 ++
 1 file changed, 2 insertions(+)

commit fae70b1a769f52cc4730e04fcec8fe82cc8bd1c6
Merge: 8dd0097 cb874bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 06:32:48 2010 +0000

    fixes buildpackage failing with dh_install: missing files

commit cb874bbe6d73007bfad8be750f6b57555adac7b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 22:48:57 2010 -0700

    removed old reference from nova-common.install and fixed spacing

 debian/nova-common.install |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit ad7f099aefc17d04a2a04deb7fd3055adc8cd84a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jul 27 01:03:05 2010 -0400

    Flag for SessionToken ttl setting.

 nova/compute/model.py        |   12 ++++++++++--
 nova/flags.py                |    2 ++
 nova/tests/model_unittest.py |   11 ++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

commit 8dd0097778599b45bc304a2d7709e0b6f1ef3415
Merge: 0082ae2 4199dab
Author: Paul Voccio <paul@openstack.org>
Date:   Tue Jul 27 04:32:37 2010 +0000

    resolving conflict w/ merge, cleaning up virtenv setups

commit 4199dab2e761efc6cb2d9af353f5f09c943a2d2f
Author: Paul Voccio <paul@openstack.org>
Date:   Mon Jul 26 23:23:44 2010 -0500

    resolving conflict w/ merge, cleaning up virtenv setups

 tools/activate_venv.sh |    4 ----
 tools/install_venv.py  |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

commit 0082ae2ac4af5e2bf90ef8c0e49481987fd00b8e
Merge: 01e481f a2cf8a6
Author: jaypipes@gmail.com <>
Date:   Tue Jul 27 04:07:28 2010 +0000

    Fixes bug#610140. Thanks to Vish and Muharem for the patch

commit 01e481f508bb6f297949b4d1a3499239dcfb069e
Merge: 6c4a09b 4373ca8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 03:52:34 2010 +0000

    A few minor fixes to the virtualenv installer that were breaking on ubuntu.

commit 74ce3aef4dafca8b0fc6bf0404725afdefe335ec
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 23:49:49 2010 -0400

    Give SessionToken an is_expired method

 nova/compute/model.py        |    5 +++++
 nova/tests/model_unittest.py |   11 +++++++++++
 2 files changed, 16 insertions(+)

commit 6c4a09b925907a6e4bc1d1a8df929e22227b2c37
Merge: 00c2791 be176f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 03:42:37 2010 +0000

    Refactor of auth code
    
    projects are not created or destroyed automatically
    users and projects have an id that may not always == name
    users.py was renamed to manager.py
    manager singleton was changed from UserManager.instance() to AuthManager()
    the ldap backend was split into ldapdriver.py own file to support other backends
    lots of docstrings added
    ugly import fixed
    vpn ip and port returns none if vpn isn't allocated
    get_credentials returns exception if vpn isn't allocated
    flag for using vpns
    flag for auth_driver
    added exception for missing auth_driver

commit a2cf8a6f6038062cf343322acdbde66456b73dfb
Author: jaypipes@gmail.com <>
Date:   Mon Jul 26 23:28:59 2010 -0400

    Fixes bug#610140.  Thanks to Vish and Muharem for the patch

 nova/tests/api_unittest.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 4044051266d97ffe05fbe75b642759d2e604da4d
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 23:19:51 2010 -0400

    Share my updates to the Rackspace API.

 bin/nova-rsapi             |   13 +---
 exercise_rsapi.py          |   51 ---------------
 nova/endpoint/rackspace.py |  149 ++++++++++++++++++++++++++++++++------------
 3 files changed, 110 insertions(+), 103 deletions(-)

commit 4373ca830fe93ddff70cf02bc366303d6b001ae9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 18:57:24 2010 -0700

    Fixes to the virtualenv installer

 Makefile               |    2 +-
 tools/activate_venv.sh |    1 +
 tools/install_venv.py  |    3 +--
 tools/with_venv.sh     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 00c2791230a89a89b53090d9c09c0e515c45823a
Merge: 8dfabba ffe52b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 00:17:37 2010 +0000

    Ensure consistent use of filename for dhcp bridge flag file.

commit 754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 17:14:28 2010 -0700

    renamed xxxservice to service

 bin/nova-compute               |    4 +-
 bin/nova-network               |    4 +-
 bin/nova-volume                |    4 +-
 nova/compute/computeservice.py |  581 ----------------------------------------
 nova/compute/service.py        |  581 ++++++++++++++++++++++++++++++++++++++++
 nova/endpoint/cloud.py         |   12 +-
 nova/network/networkservice.py |   35 ---
 nova/network/service.py        |   35 +++
 nova/tests/cloud_unittest.py   |    4 +-
 nova/tests/compute_unittest.py |    4 +-
 nova/tests/volume_unittest.py  |   20 +-
 nova/volume/service.py         |  304 +++++++++++++++++++++
 nova/volume/volumeservice.py   |  304 ---------------------
 13 files changed, 946 insertions(+), 946 deletions(-)

commit c42b214c61342089401b5191e70c0c6b09fb5a4a
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jul 27 00:11:18 2010 +0000

    Began wiring up rbac admin api

 nova/adminclient.py    |  102 ++++++++++++++++++++++++++++++++++++++++++++++++
 nova/endpoint/admin.py |   71 +++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

commit be176f06fd03ddb6c25b40e4f2ee71981f47c724
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 16:03:33 2010 -0700

    fix auth_driver flag to default to usable driver

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8dfabba6dcd767f03ad7cbb66fe083af68ae69de
Merge: ce0d73f 6d3331e
Author: andy <code@term.ie>
Date:   Mon Jul 26 22:32:57 2010 +0000

    Adds support scripts for installing deps into a virtualenv.

commit 7588ae06e8d6a7d526b12e0f15f3e5be522f16d0
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 18:02:00 2010 -0400

    In fact, it should delete them.

 nova/compute/model.py |    1 +
 1 file changed, 1 insertion(+)

commit 58b41fde4c8639577b738d0f57f10acda4c63c0e
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 18:00:39 2010 -0400

    Lookup should only not return expired tokens.

 nova/compute/model.py        |    9 +++++++++
 nova/tests/model_unittest.py |   16 +++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

commit ce0d73f0f62e07cf52efa06ab24158fe53bb857d
Merge: 340f9fc a766736
Author: andy <code@term.ie>
Date:   Mon Jul 26 21:57:32 2010 +0000

    Adds support scripts for installing deps into a virtualenv.

commit ffe52b8660123335e425c52eb3bebba2e3d2e42f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 14:48:08 2010 -0700

    default flag file full path

 nova/compute/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0f5b95575afeb14fea80bead6720bf510f5358f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 14:41:51 2010 -0700

    moved misnamed nova-dchp file

 debian/nova-dhcp.conf       |    2 --
 debian/nova-dhcpbridge.conf |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 69cbb1ac3559c44f6640939cd2e1db64e82073fe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 26 23:27:42 2010 +0200

    Make _fetch_s3_image pass proper AWS Authorization headers so that image downloads work again.

 nova/compute/node.py |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

commit bed760dcc4dbdf1927c41cfff325cc56102ef962
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 26 23:26:54 2010 +0200

    Make image downloads work again in S3 handler. Listing worked, but fetching the images failed because I wasn't clever enough to use twisted.web.static.File correctly.

 nova/objectstore/handler.py |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit 6d3331e831ec147916d0d605958f61ca69eee9a8
Author: andy <code@term.ie>
Date:   Mon Jul 26 23:16:49 2010 +0200

    Move virtualenv installation out of the makefile.
    
    Also adds some tools for dealing with virtualenvs to the tools
    directory.

 .bzrignore             |    1 +
 .gitignore             |    1 +
 Makefile               |   28 +++++++-------
 tools/activate_venv.sh |    3 ++
 tools/install_venv.py  |   95 ++++++++++++++++++++++++++++++++++++++++++++++++
 tools/pip-requires     |    3 +-
 tools/with_venv.sh     |    4 ++
 7 files changed, 120 insertions(+), 15 deletions(-)

commit fd2d4e3f3dba426eedc22b326d2bb0cb6a19eb76
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 17:00:50 2010 -0400

    Expiry awareness for SessionToken.

 nova/compute/model.py        |   33 ++++++++++++++++++++++++---------
 nova/tests/model_unittest.py |    9 +++++++++
 nova/utils.py                |    9 ++++++---
 3 files changed, 39 insertions(+), 12 deletions(-)

commit 5c3d352cee5003395d078dcfe01e8f4743027074
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 12:49:21 2010 -0700

    class based singleton for SharedPool

 nova/process.py                |   13 +++++++------
 nova/tests/process_unittest.py |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

commit d6e74751fa156f3879ff2136caccf2a40d4b9e8c
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 15:01:42 2010 -0400

    Basic standup of SessionToken model for shortlived auth tokens.

 nova/compute/model.py        |   36 +++++++++++++++++++++++++++++
 nova/exception.py            |    3 +++
 nova/tests/model_unittest.py |   52 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)

commit cacca7df569e396d76112693aab62c95d51ff035
Merge: 35fda70 340f9fc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 11:06:45 2010 -0700

    merged trunk

commit b1bc1e2edc9fdafabfc27b5ea313dbb934c374eb
Merge: 3233f7a 340f9fc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 11:02:28 2010 -0700

    merged trunk

commit 340f9fc8d63ec931485aba1dcfeccdc1cb3849fa
Merge: fd9d15f 87e27af
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Jul 26 17:58:36 2010 +0000

    Updated doc layout to the Sphinx two-dir layout.

commit fd9d15fc6097a60e57f818cee231e4feedb7b856
Merge: 17096b0 ad2250a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 26 17:57:31 2010 +0000

    Replace hardcoded "nova" with FLAGS.control_exchange.

commit 1bef8168b66a33033a9181d3e180d1c9718ebb55
Merge: d5051bf 17096b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 26 16:05:31 2010 +0200

    Merge with trunk

commit d5051bf90909f693a74ea0f2bdc3db341460a5a3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 26 16:03:23 2010 +0200

    Add a simple set of tests for S3 API (using boto).

 nova/objectstore/handler.py        |   14 ++--
 nova/tests/objectstore_unittest.py |  131 +++++++++++++++++++++++++++---------
 2 files changed, 105 insertions(+), 40 deletions(-)

commit 17096b0eef78680164746303d65f9f9a50a91562
Merge: b6f604c 0278767
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 26 08:27:27 2010 +0000

    Fix references to image_object. This caused an internal error when using
    euca-deregister.

commit b6f604ccccd86d2c6d4ba99bae09159f18afe631
Merge: 3a9fffc fdea01a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 26 00:14:03 2010 +0000

    Set durable=False on TopicPublisher

commit 3a9fffca3e795c1789ac8bb10d84f5bbaea1a609
Merge: ef641ef 480d1b6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 23:51:55 2010 +0000

    Added missing import

commit c5edaa2186add12947185cb1fd47e0a48eccafa9
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 20:32:33 2010 +0100

    Replace hardcoded example URL, username, and password with flags called
    xenapi_connection_url, xenapi_connection_username, xenapi_connection_password.

 nova/virt/xenapi.py |   21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

commit 6d636cd416d4a0f8a778ea9cb04c41de6299714e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 20:31:53 2010 +0100

    Fix instance cleanup.

 nova/virt/libvirt_conn.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0278767e0dc41444b889f904e6e49d26be5a54c4
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 19:25:42 2010 +0100

    Fix references to image_object.  This caused an internal error when using
    euca-deregister.

 nova/objectstore/handler.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3233f7a964564fba9ec88c277d566eebed50d12a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 11:23:24 2010 -0700

    removed unused assignment

 nova/auth/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f7962c73aa9835c76857005ab56f512fbc9eebfd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 11:20:09 2010 -0700

    More Cleanup of code
    
    Moved code in AuthManager init to new so it isn't called multiple times
    Changed AuthManager flag to specify class name as well as module name
    Added exception for missing auth_driver
    Changed import to use "recommended" style for nested imports
      http://docs.python.org/dev/library/functions.html#__import__

 bin/nova-dhcpbridge            |    2 +-
 nova/auth/fakeldapdriver.py    |   32 --------------------------------
 nova/auth/ldapdriver.py        |   12 ++++++++++--
 nova/auth/manager.py           |   22 ++++++++++++++++------
 nova/tests/fake_flags.py       |    2 +-
 nova/tests/network_unittest.py |    2 +-
 6 files changed, 29 insertions(+), 43 deletions(-)

commit a8c8aed28ce5d1d9eadcbecab03f6bc3bec8e622
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 19:09:12 2010 +0100

    Fix references to get_argument, fixing internal error when calling
    euca-deregister.

 nova/objectstore/handler.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ef641ef88c739b2bb8808245116ed6902747a958
Merge: ca1a4e8 2d49a87
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 16:45:17 2010 +0000

    Changes nova-volume to use twisted.

commit ca1a4e81feea5a811b50a96f87829ac381a40222
Merge: 3e39781 2c7e49d
Author: jaypipes@gmail.com <>
Date:   Sun Jul 25 16:44:35 2010 +0000

    Fixes up Bucket to throw proper NotFound and NotEmpty exceptions
    in constructor and delete() method, and fixes up objectstore_unittest
    to properly use assertRaises() to check for proper exceptions and
    remove the assert_ calls.

commit 3e39781e12645388327dbccfb023c282fa3c4563
Merge: 7050e7e a0c29a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 16:44:09 2010 +0000

    Adds missing yield statement that was causing partitioning to intermittently fail.

commit f42c5d96a0256883334cb7c8127d76214ee0bc02
Merge: 67f4760 ad2250a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:43:45 2010 +0100

    Merged lp:~ewanmellor/nova/lp609792

commit 67f476009dc476eb3b40605f9fbb0d97ae5158b5
Merge: 2b4b7c5 fdea01a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:43:34 2010 +0100

    Merged lp:~ewanmellor/nova/lp609791

commit ad2250ac0080ca35b1fd2747e3f4d0ff07bc90be
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:40:41 2010 +0100

    Replace hardcoded "nova" with FLAGS.control_exchange.

 nova/rpc.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fdea01a233e72551e750a5beaca0739ec8173ac3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:28:39 2010 +0100

    Set durable=False on TopicPublisher, so that it matches the flag on
    TopicConsumer.  This ensures that either redeclaration of the control_exchange
    will use the same flag, and avoid AMQPChannelException.

 nova/rpc.py |    1 +
 1 file changed, 1 insertion(+)

commit 2b4b7c59fb7e41e576b5941c2683f8e2d2056ea7
Merge: 605bfc4 480d1b6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:38:31 2010 +0100

    Merge lp:~ewanmellor/nova/lp609757.

commit 480d1b6d5dd12490298b2b4d3e62f40917390bde
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:32:10 2010 +0100

    Add an import so that nova-compute sees the images_path flag, so that it
    can be used on the command line.

 bin/nova-compute |    1 +
 1 file changed, 1 insertion(+)

commit dd17c810029d142abaa8f0c97e30a8ae1dc13b5c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 25 16:17:55 2010 +0200

    Return a 404 when attempting to access a bucket that does not exist.

 nova/objectstore/handler.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 605bfc4990a67aae4a644f961cd881461d09cf2f
Merge: b2d769c 1a53eae
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:11:20 2010 +0100

    Merge ~ewanmellor/nova/lp609749.

commit b2d769cb92dce5be26288c8e389491cf554b5703
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:08:48 2010 +0100

    Removed creation of process pools.  We don't use these any more now that
    we're using process.simple_execute.

 nova/virt/libvirt_conn.py |    1 -
 nova/virt/xenapi.py       |    1 -
 2 files changed, 2 deletions(-)

commit 1a53eaeed901f3c789ebdb867b73996ccac608c3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:00:37 2010 +0100

    Fix assertion "Someone released me too many times: too many tokens!" when more
    than one process was running at the same time.  This
    was caused by the override of SharedPool.__new__ not stopping
    ProcessPool.__init__ from being run whenever process.simple_execute is called.
    
    When __init__ ran for the second time, the DeferredSemaphore was replaced,
    and this meant that we ended up releasing a different semaphore to the one
    that was acquired.

 nova/process.py                |   13 ++++++-------
 nova/tests/process_unittest.py |    7 +++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

commit c611ee25e1c30965d6521386c2966584f0cb6d6f
Merge: 01dffdd 7050e7e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 25 14:29:37 2010 +0200

    Merge with trunk.

commit 01dffdd79098429a448cf283119d9026ae1231c2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 25 14:29:20 2010 +0200

    Always make sure to set a Date headers, since it's needed to calculate the S3 Auth header.

 nova/compute/node.py |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 7050e7e49e8aad3ff3f5d0060c96ff97d9c2852f
Merge: 4efa1cd eb10c8f
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sun Jul 25 01:45:17 2010 +0000

    Updated the README file

commit 87e27afec0c7b683ee35f842abdaccea954f2fba
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Jul 24 18:06:22 2010 -0700

    Updated sphinx layout to a two-dir layout like swift.
    Updated a doc string to get rid of a Sphinx warning.

 doc/.gitignore                 |    1 +
 doc/build/.gitignore           |    1 +
 doc/source/Makefile            |   89 +++++++++++++++++
 doc/source/architecture.rst    |   48 +++++++++
 doc/source/auth.rst            |  215 ++++++++++++++++++++++++++++++++++++++++
 doc/source/binaries.rst        |   31 ++++++
 doc/source/compute.rst         |   74 ++++++++++++++
 doc/source/conf.py             |  202 +++++++++++++++++++++++++++++++++++++
 doc/source/endpoint.rst        |   91 +++++++++++++++++
 doc/source/fakes.rst           |   43 ++++++++
 doc/source/getting.started.rst |  148 +++++++++++++++++++++++++++
 doc/source/index.rst           |   55 ++++++++++
 doc/source/modules.rst         |   34 +++++++
 doc/source/network.rst         |   88 ++++++++++++++++
 doc/source/nova.rst            |   91 +++++++++++++++++
 doc/source/objectstore.rst     |   66 ++++++++++++
 doc/source/packages.rst        |   29 ++++++
 doc/source/storage.rst         |   31 ++++++
 doc/source/volume.rst          |   45 +++++++++
 docs/.gitignore                |    1 -
 docs/Makefile                  |   89 -----------------
 docs/_build/.gitignore         |    1 -
 docs/architecture.rst          |   48 ---------
 docs/auth.rst                  |  215 ----------------------------------------
 docs/binaries.rst              |   31 ------
 docs/compute.rst               |   74 --------------
 docs/conf.py                   |  202 -------------------------------------
 docs/endpoint.rst              |   91 -----------------
 docs/fakes.rst                 |   43 --------
 docs/getting.started.rst       |  148 ---------------------------
 docs/index.rst                 |   56 -----------
 docs/modules.rst               |   34 -------
 docs/network.rst               |   88 ----------------
 docs/nova.rst                  |   91 -----------------
 docs/objectstore.rst           |   66 ------------
 docs/packages.rst              |   29 ------
 docs/storage.rst               |   31 ------
 docs/volume.rst                |   45 ---------
 nova/compute/disk.py           |    3 +-
 setup.cfg                      |    4 +-
 40 files changed, 1386 insertions(+), 1386 deletions(-)

commit eb10c8f1ea41564b5ee2d19054eeb8b65bfc0b33
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Jul 24 16:22:17 2010 -0700

    Updated URLs in the README file to point to current locations.

 README |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit 4c536de1732c531bfb87018826a92de2744e8d1a
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Jul 24 14:45:35 2010 +0100

    Add missing import following merge from trunk (cset 150).

 nova/virt/images.py |    1 +
 1 file changed, 1 insertion(+)

commit 7601a422395c4609260f452d09008bdc3fb98201
Merge: effbd4b f6ae05f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Jul 24 12:29:47 2010 +0100

    Merge ~justin-fathomdb/nova/bug607541, since it's impossible to upload
    bundles to new buckets without it.

commit effbd4b4c7077043c0ff2ddcb91607b4e79796f6
Merge: 1046fd2 809a1fe
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Jul 24 02:49:20 2010 +0100

    Merged with trunk, since a lot of useful things have gone in there recently.

commit a0c29a822aaed756728f2619e176d8c54bb1d4e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 23 17:20:21 2010 -0700

    fixed bug where partition code was sometimes failing due to initial dd not being yielded properly

 nova/compute/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 4efa1cd41b5366f5bb528c0db21908a66f785557
Merge: 809a1fe 3142fec
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 23 23:22:26 2010 +0000

    Fixed bug 608505 - was freeing the wrong address (should have freed 'secondaddress', was freeing 'address')

commit 35fda702abf91792d3c4753a1bbccdb119eaf6eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 23 15:27:18 2010 -0700

    renamed xxxnode to xxservice

 bin/nova-compute               |    4 +-
 bin/nova-network               |    4 +-
 bin/nova-volume                |    4 +-
 nova/compute/computenode.py    |  582 ----------------------------------------
 nova/compute/computeservice.py |  581 +++++++++++++++++++++++++++++++++++++++
 nova/endpoint/cloud.py         |   15 +-
 nova/network/networknode.py    |   35 ---
 nova/network/networkservice.py |   35 +++
 nova/node.py                   |  103 -------
 nova/service.py                |  103 +++++++
 nova/test.py                   |    8 +-
 nova/tests/cloud_unittest.py   |   18 +-
 nova/tests/compute_unittest.py |   36 +--
 nova/tests/volume_unittest.py  |   46 ++--
 nova/volume/volumenode.py      |  305 ---------------------
 nova/volume/volumeservice.py   |  304 +++++++++++++++++++++
 16 files changed, 1090 insertions(+), 1093 deletions(-)

commit abac2033b4aeb399786735a94ce2ddf5c64e6e9e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 23 23:55:39 2010 +0200

    Add (completely untested) code to include an Authorization header for the S3 request to fetch an image.

 nova/compute/node.py |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit f3350750a7c68b191c3a85ac9caa5eff59b182a6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 23 08:03:26 2010 -0500

    Check signature for S3 requests.

 nova/auth/signer.py         |    8 ++++++++
 nova/auth/users.py          |   13 +++++++++++--
 nova/objectstore/handler.py |   14 +++++++-------
 3 files changed, 26 insertions(+), 9 deletions(-)

commit 809a1fe80b9922a36c64bce948588a5797cae87b
Merge: 295eff7 1b6efa8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 23 02:57:21 2010 +0000

    Fixes problem with describe-addresses returning all public ips instead of the ones for just the user's project

commit 295eff7794d2d04c65760513baf7927067c61a6e
Merge: 47d859a 0506cce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 23 02:52:31 2010 +0000

    Fix for extra spaces in export statements in scripts relating to x509 certs

commit a766736b79f794f745438dd597f2aa529ad62ddc
Author: Andy Smith <code@term.ie>
Date:   Fri Jul 23 04:44:23 2010 +0200

    Adds a Makefile to fill dependencies for testing.
    
    Depends upon pip being installed, but pip is pretty much
    the standard nowadays and is just an easy_install away if
    it isn't there.
    
    The only dependency installed on to the system is
    virtualenv which is used to make the other dependencies
    local to the current environment.
    
    Does not remove the need to install redis by hand, though
    I am in favor of making that possible (using aptitude on
    linux and brew on os x)
    
    I look forward to cutting away at some of these
    dependencies in further commits.

 Makefile           |   27 +++++++++++++++++++++++++++
 tools/pip-requires |   14 ++++++++++++++
 2 files changed, 41 insertions(+)

commit d0f3ad141b848a927c452ba6c71180b21047bef8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 22 17:45:18 2010 -0500

    Fix syslogging of exceptions by stripping newlines from the exception info

 nova/twistd.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 4a9bc4c92aaedf28ab167bdbf7ca4f81b75a0add
Merge: f5e1927 3142fec
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 22 12:30:28 2010 -0700

    Merged fix for bug 608505 so unit tests pass

commit f5e19272844f2f0d2c72bf55a2bdf533f40d1ea5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 22 12:28:47 2010 -0700

    Check exit codes when spawning processes by default

 bin/nova-manage           |    2 +-
 nova/objectstore/image.py |    6 +++---
 nova/utils.py             |   11 ++++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

commit f6ae05f993016f45af2c19718a6e84e50e4a775e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 22 11:49:13 2010 -0700

    Nobody wants to take on this twisted cleanup.  It works for now, but could be much nicer if twisted has a nice hook-point for exception mapping

 nova/objectstore/handler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 700f668b58911afe2b98ae8cab79910ae817657b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 22 09:03:28 2010 -0500

    syslog changes

 nova/twistd.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

commit b03f05a0eb321350297e2f86a05ec4593bfc4049
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 22 07:51:03 2010 -0500

    typo fixes and extra print statements removed

 bin/nova-compute |    4 ++--
 bin/nova-network |    4 ++--
 bin/nova-volume  |    4 ++--
 nova/twistd.py   |    2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

commit 5066e1f55fa672f6b6eec1523b5334e6fe9609a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 21:54:50 2010 -0500

    added todo for ABC

 nova/auth/ldapdriver.py |    4 ++++
 1 file changed, 4 insertions(+)

commit 3142fec2c908689f02e4e24a5174a3dcf2260c4c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Jul 21 18:20:04 2010 -0700

    Fixed bug 608505 - was freeing the wrong address (should have freed 'secondaddress', was freeing 'address')

 nova/tests/network_unittest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96b86e93b5c0c9377165e53ddbab5a2952cdd026
Merge: 8981025 47d859a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 20:15:28 2010 -0500

    Merged trunk, fixed extra references to fake_users

commit 898102508a1c2a1087b3ffce36b3fb890f5d3775
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 19:56:08 2010 -0500

    refactoring of imports for fakeldapdriver

 nova/auth/fakeldapdriver.py        |   32 ++++++++++++++++++++++++
 nova/auth/ldapdriver.py            |   27 ++++++++++-----------
 nova/auth/manager.py               |   47 +++++++++++++++++++-----------------
 nova/flags.py                      |    1 -
 nova/tests/cloud_unittest.py       |    3 +--
 nova/tests/fake_flags.py           |    2 +-
 nova/tests/model_unittest.py       |    3 +--
 nova/tests/node_unittest.py        |    3 +--
 nova/tests/objectstore_unittest.py |    3 +--
 nova/tests/real_flags.py           |    1 -
 10 files changed, 75 insertions(+), 47 deletions(-)

commit 80d03bbeb1f1acb82c495747dcf5cc9390df025a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 14:55:16 2010 -0500

    make nova-network executable

 0 files changed

commit 3b982f62bb7cb92cbe9e96a1bde4410b3d06f997
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 14:42:22 2010 -0500

    refactor daemons to use common base class in preparation for network refactor

 bin/nova-compute               |   68 +----
 bin/nova-network               |   32 +++
 bin/nova-volume                |   68 +----
 nova/compute/computenode.py    |  582 ++++++++++++++++++++++++++++++++++++++++
 nova/compute/node.py           |  581 ---------------------------------------
 nova/endpoint/cloud.py         |   18 +-
 nova/endpoint/rackspace.py     |    1 -
 nova/flags.py                  |    4 +-
 nova/network/__init__.py       |   32 +++
 nova/network/networknode.py    |   35 +++
 nova/node.py                   |  103 +++++++
 nova/tests/cloud_unittest.py   |    4 +-
 nova/tests/compute_unittest.py |  128 +++++++++
 nova/tests/future_unittest.py  |   75 ------
 nova/tests/model_unittest.py   |    1 -
 nova/tests/node_unittest.py    |  128 ---------
 nova/tests/storage_unittest.py |  115 --------
 nova/tests/volume_unittest.py  |  115 ++++++++
 nova/twistd.py                 |   12 +-
 nova/volume/storage.py         |  321 ----------------------
 nova/volume/volumenode.py      |  305 +++++++++++++++++++++
 run_tests.py                   |    4 +-
 22 files changed, 1363 insertions(+), 1369 deletions(-)

commit 2c7e49ddeba2e9015c541712e5c52e0d902804b0
Author: jaypipes@gmail.com <>
Date:   Wed Jul 21 15:28:43 2010 -0400

    reorder import statement and remove commented-out test case that is the same as api_unittest in objectstore_unittest

 nova/tests/objectstore_unittest.py |   35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

commit 302afc13da7a83dcdf8bde0d6370b675c9b14218
Author: jaypipes@gmail.com <>
Date:   Wed Jul 21 14:35:39 2010 -0400

    Fixes up Bucket to throw proper NotFound and NotEmpty exceptions
    in constructor and delete() method, and fixes up objectstore_unittest
    to properly use assertRaises() to check for proper exceptions and
    remove the assert_ calls.

 nova/exception.py                  |    3 +++
 nova/objectstore/bucket.py         |    4 ++--
 nova/tests/objectstore_unittest.py |   35 ++++++++++++-----------------------
 3 files changed, 17 insertions(+), 25 deletions(-)

commit 47d859a5720e3062f202a593fb2b6cb06c5beffc
Merge: d44943d 8625275
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Jul 21 18:12:27 2010 +0000

    Fix bug 607501.  Raise 403, not exception if Authorization header not passed. Also added missing call to request.finish() & Python exception-handling style tweak

commit 9fd52c84f029b9b2a7c2203591bed1b49a1917f4
Merge: d44943d 2d49a87
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 09:35:55 2010 -0500

    merge with twisted-volume

commit 2d49a870fe89b3266f908a5711a5d412fa6d7a19
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 08:46:53 2010 -0500

    remove all of the unused saved return values from attach_to_twisted

 bin/nova-compute |    4 ++--
 bin/nova-volume  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 1b6efa80e19a60d71a762683fa1edee02645355c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 22:28:23 2010 -0500

    fix for describe addresses showing everyone's public ips

 nova/endpoint/cloud.py |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit d44943d84db793937185b044ecb72c52522cfe72
Merge: c771ef0 c39b3ad
Author: jaypipes@gmail.com <>
Date:   Wed Jul 21 02:57:31 2010 +0000

    update the logic for calculating network sizes

commit c771ef02cdbae6a9f409a1ec9fb8aed965f13639
Merge: 2108578 8f9d5a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 02:32:32 2010 +0000

    Locally administered mac addresses have the second least significant bit of the most significant byte set. If this byte is set then udev on ubuntu doesn't set persistent net rules.
    
    This patch changes the generate_mac to generate a locally administered mac address.

commit 8f9d5a66fdebe2bdd41bfbb7d20fbab531cd3b3f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 20:28:34 2010 -0500

    use a locally administered mac address so it isn't saved by udev

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 210857830586ea1fabee284d85b2a2646dc81029
Merge: a232ba0 52f0ec0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 01:17:27 2010 +0000

    Convert processpool to a singleton, and switch node.py calls to use it. (Replaces passing a processpool object around all the time.)

commit 0506cce7d934ad093f5808606627aa19f43428ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 17:55:38 2010 -0500

    Fixed the broken reference to

 CA/geninter.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fd25c2699867e16908aaadc3380236f84cc3cc5a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 17:05:02 2010 -0500

    remove spaces from export statements in scripts relating to certs

 CA/geninter.sh               |    2 +-
 nova/cloudpipe/bootscript.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 5bb1d8d5ab8581696a98a159b293b992e72eec49
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Jul 20 14:31:55 2010 -0700

    Cleanups

 nova/compute/node.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9cf32d6d65035299ecfcb0563cef8ddab3c0ee4c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Jul 20 14:25:43 2010 -0700

    Able to set up DNS, and remove udev network rules

 nova/compute/disk.py              |   29 +++++++++++++++----
 nova/compute/libvirt.xml.template |    1 +
 nova/compute/network.py           |    3 ++
 nova/compute/node.py              |   57 ++++++++++++++++++++++++-------------
 nova/compute/resolv.conf.template |    1 +
 5 files changed, 66 insertions(+), 25 deletions(-)

commit aea63a32542ea2534513532b645491687e48367b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 14:29:49 2010 -0500

    Move self.ldap to global ldap to make changes easier if we ever implement settings

 nova/auth/ldapdriver.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit cb702cb1a88ec94577c5871ab0402471dac0ec7c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 14:09:53 2010 -0500

    Cleanup per suggestions
    
    Move ugly import statement to avoid try except
    Vpn ip and port returns none if vpn isn't allocated
    get_credentials returns exception if vpn isn't allocated
    Flag for using vpns

 nova/auth/ldapdriver.py |   32 +++++++++++---------------------
 nova/auth/manager.py    |   37 +++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 31 deletions(-)

commit 79b5ab9a9e18fdee3d65311b6ff16cc39d7d2513
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 09:22:53 2010 -0500

    network unittest clean up

 nova/tests/network_unittest.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 0f9be756f44e831545bf5c31606e0419b61d6ddd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 09:15:36 2010 -0500

    Test cleanup, make driver return dictionaries and construct objects in manager

 nova/auth/ldapdriver.py        |   45 +++++++++--------
 nova/auth/manager.py           |  105 +++++++++++++++++++++++++---------------
 nova/tests/api_unittest.py     |   23 ++++-----
 nova/tests/auth_unittest.py    |   95 ++++++++++++++++++------------------
 nova/tests/network_unittest.py |   79 +++++++++++++++---------------
 5 files changed, 187 insertions(+), 160 deletions(-)

commit 63513736b0340efd197a7b905208fa90d63ab260
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Jul 20 00:32:42 2010 -0700

    Able to boot without kernel or ramdisk.  libvirt.xml.template is now a Cheetah template

 nova/compute/libvirt.xml.template |   26 +++++++++++++++-----------
 nova/compute/node.py              |   26 ++++++++++++++++++++++----
 nova/endpoint/cloud.py            |    4 ++--
 3 files changed, 39 insertions(+), 17 deletions(-)

commit 76b16a8c618f18da62ceea4c9a0e794c15c2d2bb
Merge: 6626df2 35dc27b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:57:31 2010 -0700

    Merged https://code.launchpad.net/~justin-fathomdb/nova/copy-error-handling

commit 6626df2934cd317badd0db87401acaf8792568ed
Merge: a232ba0 8b0c70c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:48:01 2010 -0700

    Merged bug fixes

commit 8b0c70cce2dd914f1ab4caca8883d616c7c669d6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:39:33 2010 -0700

    Map exceptions to 404 / 403 codes, as was done before the move to twisted.
    However, I don't think this is the right way to do this in Twisted.  For example, exceptions thrown after the render method returns will not be mapped

 nova/objectstore/handler.py |   22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

commit f507cdf99d0bd5adfc2c1c1b265f192de119160f
Merge: a232ba0 8625275
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:38:57 2010 -0700

    Merged lp:~justin-fathomdb/nova/bug607501

commit 8ef16679e06c227f782fffdd0640b426af19a5c6
Merge: 57ff625 a232ba0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 20:27:44 2010 -0500

    Merged trunk. Fixed new references to UserManager

commit 8625275e14d40dd82d19d2273e14f82334c6b5ac
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 18:26:19 2010 -0700

    I put the call to request.finish() in the wrong place. :-(

 nova/objectstore/handler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 57ff625ec300bcc10b701b57aa75f989fbaf1679
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 20:20:41 2010 -0500

    More docstrings, don't autocreate projects

 nova/auth/ldapdriver.py |    8 ++--
 nova/auth/manager.py    |   96 +++++++++++++++++++++++------------------------
 2 files changed, 52 insertions(+), 52 deletions(-)

commit 248f297da74b6353b9589b2887c9ab5edad8dc22
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 17:07:52 2010 -0700

    Raise 401, not exception if Authorization header not passed.  Also minor fixes & Python exception-handling style tweak

 nova/objectstore/handler.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit bc524d362391c22ece2c2b24d11239837fe5db39
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 17:10:25 2010 -0500

    LdapDriver cleanup: docstrings and parameter ordering

 nova/auth/ldapdriver.py |   61 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

commit 35dc27bbcb3a29ae662a0f8ccfed7a0f76a49c13
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 14:17:43 2010 -0700

    Ask curl to set exit code if resource was not found

 nova/compute/node.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a232ba0fda12a98e9da4345a6911a86b68f91826
Merge: d52925f 19a8556
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 20:07:39 2010 +0000

    Fixes to dhcp lease code to use a flagfile

commit 19a8556917ffebf9f85e68df4a841e1ea97124d2
Merge: 5d64782 d52925f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 14:45:39 2010 -0500

    merged trunk

commit a3ca587654095ffd4b97103302fb0744e505e332
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 13:19:26 2010 -0500

    Massive refactor of users.py
    
    Split users.py into manager.py and ldpadriver.py
    Added tons of docstrings
    Cleaned up public methods
    Simplified manager singleton handling

 bin/nova-api                       |    2 +-
 bin/nova-manage                    |   10 +-
 bin/nova-objectstore               |    6 +-
 bin/nova-rsapi                     |   12 +-
 nova/auth/ldapdriver.py            |  428 ++++++++++++++++
 nova/auth/manager.py               |  741 +++++++++++++++++++++++++++
 nova/auth/rbac.py                  |    2 +-
 nova/auth/users.py                 |  974 ------------------------------------
 nova/cloudpipe/api.py              |    2 +-
 nova/cloudpipe/pipelib.py          |    4 +-
 nova/compute/network.py            |   14 +-
 nova/endpoint/admin.py             |   14 +-
 nova/endpoint/api.py               |    4 +-
 nova/endpoint/cloud.py             |    6 +-
 nova/endpoint/rackspace.py         |    6 +-
 nova/tests/access_unittest.py      |    6 +-
 nova/tests/api_unittest.py         |    4 +-
 nova/tests/auth_unittest.py        |  207 ++++++++
 nova/tests/cloud_unittest.py       |   12 +-
 nova/tests/network_unittest.py     |    4 +-
 nova/tests/objectstore_unittest.py |    6 +-
 nova/tests/users_unittest.py       |  207 --------
 run_tests.py                       |    2 +-
 23 files changed, 1434 insertions(+), 1239 deletions(-)

commit c39b3add4b3db1c027c32ea0f145c3d3ab3f4d1c
Author: jaypipes@gmail.com <>
Date:   Mon Jul 19 09:50:22 2010 -0500

    Hmm, serves me right for not understanding the request, eh? :) Now too_many_addresses test case is idempotent in regards to running in isolation and uses self.flags.network_size instead of the magic number 32.

 nova/tests/network_unittest.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit d52925f1f3293a4ad1692bd1aab846c713f7c3de
Merge: 9580058 c350550
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Mon Jul 19 08:37:28 2010 +0000

    Redirect STDERR to output to an errlog file when running run_tests.py.
    
    Adds a flag option for specifying the output file and adds a bzr ignore rule to disregard the generated logfile.

commit 9580058f1e15f6503de2ad6e80236481d9ff698f
Merge: 29a01c3 f6aeb0a
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Mon Jul 19 03:38:46 2010 +0000

    Send message ack in rpc.call and make queues durable.

commit 29a01c315bb5e3ba28e0b244ae4467c30779a8d7
Merge: 92d4d4b d5309ef
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 19 03:37:29 2010 +0000

    Fixed name change caused by remove-vendor merge.

commit 92d4d4b691cbc0bffee1dcac93a7f9b77464204d
Merge: b09e69c c5c09a8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 18 20:32:53 2010 +0000

    Replace tornado objectstore with twisted web.

commit c5c09a83b709e370d023254d3fd08b992784d885
Merge: 2d5124c b09e69c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 18 11:26:50 2010 -0700

    Merge with trunk.

commit 5d647826d6345bfdd87bad10995319679f39679f
Merge: 0b396e1 b09e69c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 18 13:25:43 2010 -0500

    merged in trunk and fixed import merge errors

commit 1046fd21fad35fdb9922f667017937ec94774498
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 18 18:28:21 2010 +0100

    First commit of XenAPI-specific code (i.e. connections to the open-source
    community project Xen Cloud Platform, or the open-source commercial product
    Citrix XenServer).
    
    A new connection type has been added (xenapi) which means that libvirt calls
    will be replaced with calls to XenAPI.
    
    This support depends upon the XenAPI library (available from xen.org).
    However, the library is loaded on-demand, so there is no need for the library
    to be present unless you actually want to use XenAPI.  The same is true of
    libvirt, so there is no need to have libvirt present if you are only using
    XenAPI.
    
    This work is incomplete.  The VMs don't actually start yet, and won't
    until we settle on the proposed refactoring for bootable volumes.  Also,
    VM console support is not yet refactored.
    
    Finally, xenapi.py does not support the metrics monitoring calls used by
    monitor.py (block_stats, interface_stats).  XenAPI already includes HTTP
    access to RRDs for retrieving aggregated stats, so there is no need for
    monitor.py at all (xapi does it for you).  The plan is to arrange for those
    RRDs to be passed straight to the reporting layer without the need for
    the aggregation code in nova-monitorinstance.

 nova/flags.py           |    2 +-
 nova/virt/connection.py |    3 ++
 nova/virt/xenapi.py     |  138 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 1 deletion(-)

commit 2dd9438e192b5d760db0c5cee5bb5ded1ec5a9cc
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 18 18:24:17 2010 +0100

    Remove the tight coupling between nova.compute.monitor and libvirt.  The
    libvirt-specific code was placed in nova.virt.libvirt_conn by the last
    changeset.  This greatly simplifies the monitor code, and puts the
    libvirt-specific XML record parsing in a libvirt-specific place.

 nova/compute/monitor.py |  127 +++++++++--------------------------------------
 1 file changed, 23 insertions(+), 104 deletions(-)

commit f39d6549d4e57941b14f328fa5a52a3a5f925d42
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 18 18:15:12 2010 +0100

    In preparation for XenAPI support, refactor the interface between
    nova.compute and the hypervisor (i.e. libvirt).
    
    compute.node is no longer coupled tightly with libvirt.  Instead, hypervisor
    connections are handled through a simple abstract interface.   This has the
    additional advantage that there is no need to riddle the code with
    FLAGS.fake_libvirt checks, as we now have an interface behind which we can mock.
    
    The libvirt-specific code, and the fakevirt code used for unit tests, have
    moved into nova.virt.
    
    The fake_libvirt flag has been replaced with a connection_type flag, that will
    allow us to specify different connection types.
    
    The disk image handling (S3 or local disk image fetch) has moved into
    nova.virt.images, where it will be easier to share between connection types.
    
    The power_state values (Instance.RUNNING etc) and the INSTANCE_TYPES dictionary
    have moved into their own files (nova.compute.instance_types and
    nova.compute.power_state) so that we can share them without mutual
    dependencies between nova.compute.node and nova.virt.libvirt_conn.

 bin/dhcpleasor.py                  |    2 +-
 docs/fakes.rst                     |    4 +-
 nova/compute/instance_types.py     |   30 +++
 nova/compute/node.py               |  276 +++-------------------------
 nova/compute/power_state.py        |   41 +++++
 nova/endpoint/cloud.py             |    3 +-
 nova/fakevirt.py                   |  112 ------------
 nova/flags.py                      |    3 +-
 nova/tests/access_unittest.py      |    2 +-
 nova/tests/cloud_unittest.py       |    8 +-
 nova/tests/fake_flags.py           |    2 +-
 nova/tests/future_unittest.py      |    2 +-
 nova/tests/model_unittest.py       |    2 +-
 nova/tests/network_unittest.py     |    2 +-
 nova/tests/node_unittest.py        |    2 +-
 nova/tests/objectstore_unittest.py |    2 +
 nova/tests/real_flags.py           |    2 +-
 nova/tests/storage_unittest.py     |    2 +-
 nova/tests/users_unittest.py       |    2 +-
 nova/virt/__init__.py              |   15 ++
 nova/virt/connection.py            |   42 +++++
 nova/virt/fake.py                  |   81 +++++++++
 nova/virt/images.py                |   55 ++++++
 nova/virt/libvirt_conn.py          |  353 ++++++++++++++++++++++++++++++++++++
 24 files changed, 667 insertions(+), 378 deletions(-)

commit d5309eff30b1a826f075b28935de2a4b89eede6e
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 18 18:02:04 2010 +0100

    Fixed references to nova.utils that were broken by a change of import
    statement in the remove-vendor merge.

 nova/compute/linux_net.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jul 17 23:04:46 2010 -0700

    Remove s3_internal_port setting.
    Objectstore should be able to handle the beatings now.
    As such, nginx is no longer needed, so it's removed from the dependencies and the configuration files are removed.

 bin/nova-objectstore               |    2 +-
 debian/control                     |    2 +-
 debian/nova-objectstore.install    |    1 -
 debian/nova-objectstore.links      |    1 -
 debian/nova-objectstore.nginx.conf |   17 -----------------
 nova/flags.py                      |    1 -
 6 files changed, 2 insertions(+), 22 deletions(-)

commit 9e023095e303f096ac0d2914ed427d2a37d1444d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jul 17 23:00:53 2010 -0700

    Replace nova-objectstore with a twistd style wrapper.
    Add a get_application method to objectstore handler.

 bin/nova-objectstore        |   25 +++++++++++--------------
 nova/objectstore/handler.py |   29 ++++++++++++++---------------
 2 files changed, 25 insertions(+), 29 deletions(-)

commit b09e69c5579526fcc1a08c7e3c3a3c880fa09297
Merge: 3b6910c c954657
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jul 16 22:42:40 2010 +0000

    Minor post-merge fixes

commit 3b6910c5aef1bca9cc43094da9e70598ea88fc99
Merge: eb76e1a 4e2fdcb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 16 22:37:28 2010 +0000

    Fixed _redis_name and _redis_key

commit eb76e1ac03629be2fa0123e8e0965d1b7182dacb
Merge: 63c5ab9 c510e7e
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jul 16 22:27:24 2010 +0000

    Add build_sphinx support.

commit 0cf417c9e9c48352ea11c2333794545467585542
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 21:53:17 2010 +0000

    fix conf file to no longer have daemonize=1 because twistd daemonizes by default

 debian/nova-volume.conf |    1 -
 1 file changed, 1 deletion(-)

commit 73af1a84eb682423bf40323387d739778765e138
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 21:52:10 2010 +0000

    make nova-volume start with twisteds daemonize stuff

 bin/nova-compute       |    9 +++----
 bin/nova-volume        |   61 ++++++++++++++++++++++++++++++++++--------------
 nova/volume/storage.py |   25 +++++++++++++++-----
 3 files changed, 65 insertions(+), 30 deletions(-)

commit f6aeb0a121e76aefa8b6af6ae602df76c2419b2e
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Fri Jul 16 14:07:57 2010 -0700

    Makin the queues non-durable by default

 nova/rpc.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 6892ff871b1a154bbe669bf5cb10eab638fb181b
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Fri Jul 16 14:02:37 2010 -0700

    Ack messages during call so rabbit leaks less.

 nova/rpc.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 382381f74ca3423958add26b2578c4e77282a9a0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:50:08 2010 +0000

    simplify call to simple_execute

 nova/compute/node.py   |    8 ++++----
 nova/volume/storage.py |   18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

commit c0437edb3fa7fef892aa43b749398bf0fd1ee3e7
Merge: 049f27d 52f0ec0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:46:15 2010 +0000

    merge extra singleton-pool changes

commit c510e7e830961e593f86dbe9dbb5d031dedef5e8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jul 16 15:33:24 2010 -0500

    Added a config file to let setup.py drive building the sphinx docs.

 docs/auth.rst  |    4 ++--
 docs/index.rst |    2 ++
 setup.cfg      |    4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

commit 52f0ec017c04ad9356eb45d96bcab90a0807d914
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:32:51 2010 +0000

    make simple method wrapper for process pool simple_execute

 nova/compute/node.py |   12 ++++++------
 nova/process.py      |    3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

commit 049f27d00900f4b6e810d35f8e0e1ec3520d053b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:58:50 2010 +0000

    change volume code to use twisted

 nova/volume/storage.py |   39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

commit b3feee7425334f4f2369edc100ed4422e60e2288
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:58:12 2010 +0000

    remove calls to runthis from node

 nova/compute/node.py |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit ef6d3f3be8e83cbfe417ba5fe221464acfba5588
Merge: 1047fed ae9e4e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:57:27 2010 +0000

    merge with singleton pool

commit ae9e4e81d992fb81c01acd2dfcb1cb3d32956041
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:12:36 2010 +0000

    Removed unused Pool from process.py, added a singleton pool called SharedPool, changed calls in node to use singleton pool

 nova/compute/node.py           |   41 ++++++++++++++++++-----------------
 nova/process.py                |   46 ++++++++++------------------------------
 nova/tests/process_unittest.py |   44 +++++++++++++++++++++-----------------
 3 files changed, 57 insertions(+), 74 deletions(-)

commit c954657ba018dbeda5db6ef39dc68a0fe48f421f
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jul 16 15:11:48 2010 -0400

    Fixes things that were not quite right after big merge party.

 nova/auth/users.py      |   25 +++++++++++++------------
 nova/compute/network.py |   10 ++++++++--
 2 files changed, 21 insertions(+), 14 deletions(-)

commit 4b15a647f8153c493fb697eebc4ab17412142d67
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 16 13:39:17 2010 -0500

    Make S3 API handler more idiomatic Twisted Web-y.

 nova/objectstore/handler.py |  389 ++++++++++++++++++-------------------------
 1 file changed, 158 insertions(+), 231 deletions(-)

commit 4e2fdcb6e82d9fab4ea37749fc3f380430ffb0ff
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 16 18:33:46 2010 +0000

    _redis_name wasn't picking up override_type correctly, and _redis_key wasn't using it

 nova/datastore.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a5668a0e8ebc96d01ec7a26229079ccda6032e75
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Fri Jul 16 12:41:13 2010 -0500

    Quick fix to variable names for consistency in documentation...

 nova/tests/network_unittest.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 680446f0acd8aa7820974d32b5b4093a6d4e7a10
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Fri Jul 16 12:00:15 2010 -0500

    Adds a fix to the idempotency of the test_too_many_addresses test case
    by adding a simple property to the BaseNetwork class and calculating
    the number of available IPs by asking the network class to tell the
    test how many static and preallocated IP addresses are in use before
    entering the loop to "blow up" the address allocation...

 nova/compute/network.py        |    7 ++++++-
 nova/tests/network_unittest.py |   29 +++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

commit 63c5ab9806aeb732dc8a8cb7b902592fb5db9363
Merge: 47b8106 3ce6ec1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 16 11:09:15 2010 -0500

    Merge lp:~anotherjesse/nova/remove-vendor

commit 47b81061d6282c2b8173e9fc1177098d94b5a1bd
Merge: 67d4e16 76ad7b8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 16 11:07:00 2010 -0500

    Merge lp:~vishvananda/nova/remove-print

commit c3505507a5b4c0d88164e8e6dfea405c902004ff
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Fri Jul 16 10:03:22 2010 -0500

    Adds a flag to redirect STDERR when running run_tests.py.  Defaults to a truncate-on-write logfile named run_tests.err.log.  Adds ignore rule for generated errlog file.

 .bzrignore   |    1 +
 run_tests.py |    9 +++++++++
 2 files changed, 10 insertions(+)

commit 76ad7b8d40352ba39f5da9bb19ad1ab52ab3986e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 15 23:16:09 2010 +0000

    no more print in storage unittest

 nova/tests/storage_unittest.py |    2 --
 1 file changed, 2 deletions(-)

commit 3ce6ec1a83731da868c5a77c4684808a54ffd8fd
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jul 15 18:13:48 2010 -0500

    reorder imports spacing

 HACKING                              |    1 -
 bin/dhcpleasor.py                    |    5 ++---
 bin/nova-api                         |    2 --
 bin/nova-import-canonical-imagestore |    2 +-
 bin/nova-instancemonitor             |    2 --
 bin/nova-manage                      |    3 ++-
 bin/nova-objectstore                 |    2 --
 bin/nova-rsapi                       |    4 +---
 bin/nova-volume                      |    2 --
 nova/adminclient.py                  |    2 --
 nova/auth/signer.py                  |    5 +++--
 nova/auth/users.py                   |    3 ---
 nova/cloudpipe/api.py                |    5 ++---
 nova/cloudpipe/pipelib.py            |    9 +++++----
 nova/compute/disk.py                 |    3 +--
 nova/compute/exception.py            |    1 +
 nova/compute/linux_net.py            |    3 ++-
 nova/compute/model.py                |    2 --
 nova/compute/monitor.py              |   14 +++++++-------
 nova/compute/network.py              |   11 ++++-------
 nova/compute/node.py                 |    6 +++---
 nova/crypto.py                       |    4 +---
 nova/datastore.py                    |    2 --
 nova/endpoint/api.py                 |    9 ++++-----
 nova/endpoint/cloud.py               |    5 ++---
 nova/endpoint/images.py              |    7 +++----
 nova/endpoint/rackspace.py           |    6 ++----
 nova/exception.py                    |    2 +-
 nova/fakerabbit.py                   |    3 +--
 nova/objectstore/bucket.py           |    3 ++-
 nova/objectstore/handler.py          |    5 +----
 nova/objectstore/stored.py           |    5 +++--
 nova/process.py                      |    2 --
 nova/rpc.py                          |    6 ++----
 nova/server.py                       |    6 ++----
 nova/test.py                         |    6 ++----
 nova/tests/access_unittest.py        |    5 +++--
 nova/tests/api_integration.py        |    3 ++-
 nova/tests/api_unittest.py           |    6 ++----
 nova/tests/cloud_unittest.py         |    6 ++----
 nova/tests/future_unittest.py        |    8 +++-----
 nova/tests/model_unittest.py         |    2 --
 nova/tests/network_unittest.py       |    4 +---
 nova/tests/node_unittest.py          |    6 ++----
 nova/tests/objectstore_unittest.py   |    4 +---
 nova/tests/process_unittest.py       |    4 +---
 nova/tests/users_unittest.py         |    4 +---
 nova/tests/validator_unittest.py     |    2 --
 nova/twistd.py                       |    7 +++----
 nova/utils.py                        |    2 +-
 nova/volume/storage.py               |    4 +---
 51 files changed, 83 insertions(+), 142 deletions(-)

commit 0b396e1315a76112ab978a677e96d7b3a371faa9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 15 23:11:33 2010 +0000

    Fixes to dhcp lease code to use a flagfile

 bin/dhcpleasor.py              |   90 --------------------------------------
 bin/nova-dhcpbridge            |   94 ++++++++++++++++++++++++++++++++++++++++
 debian/nova-api.conf           |    3 +-
 debian/nova-api.install        |    1 +
 debian/nova-compute.conf       |    2 -
 debian/nova-dhcp.conf          |    2 +
 debian/nova-objectstore.conf   |    1 -
 debian/nova-volume.conf        |    1 -
 nova/compute/linux_net.py      |   16 ++++---
 nova/compute/network.py        |    6 +--
 nova/tests/network_unittest.py |   23 ++++++----
 11 files changed, 127 insertions(+), 112 deletions(-)

commit 889dea96c40211d56278bae42e38353562687952
Merge: 67d4e16 b81b0f2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 15:58:34 2010 -0500

    Merge with trunk.

commit 1047fed400501e31a3c938bf56bb9aea683c0000
Merge: 122fe2b 67d4e16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 15 20:25:49 2010 +0000

    merged trunk

commit 67d4e16a8c18989e73456f79220b97faa7374d92
Merge: 122fe2b 8629432
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 15:09:19 2010 -0500

    This branch fixes some unfortunate interaction between Nova and boto.

commit 8629432ccb62f44a1920f9b2f432e49219a81eda
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 12:04:57 2010 -0500

    Make sure we pass str objects instead of unicode objects to boto as our credentials.

 nova/endpoint/images.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c8fdce011092f23efd55385b45db8e6f3886beb1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jul 15 11:07:40 2010 -0500

    remove import of vendor since we have PPA now

 HACKING                            |    3 ---
 bin/nova-api                       |    2 +-
 bin/nova-compute                   |    2 +-
 bin/nova-instancemonitor           |    2 +-
 bin/nova-objectstore               |    2 +-
 bin/nova-rsapi                     |    2 +-
 bin/nova-volume                    |    2 +-
 docs/conf.py                       |    2 +-
 nova/adminclient.py                |    2 +-
 nova/cloudpipe/api.py              |    2 +-
 nova/compute/disk.py               |    2 +-
 nova/compute/model.py              |    2 +-
 nova/compute/monitor.py            |    2 +-
 nova/compute/network.py            |    2 +-
 nova/compute/node.py               |    2 +-
 nova/crypto.py                     |    2 +-
 nova/datastore.py                  |    2 +-
 nova/endpoint/api.py               |    2 +-
 nova/endpoint/cloud.py             |    2 +-
 nova/endpoint/images.py            |    2 +-
 nova/endpoint/rackspace.py         |    2 +-
 nova/flags.py                      |    2 +-
 nova/objectstore/handler.py        |    2 +-
 nova/process.py                    |    2 +-
 nova/rpc.py                        |    2 +-
 nova/server.py                     |    2 +-
 nova/test.py                       |    2 +-
 nova/tests/api_unittest.py         |    2 +-
 nova/tests/cloud_unittest.py       |    2 +-
 nova/tests/future_unittest.py      |    2 +-
 nova/tests/model_unittest.py       |    2 +-
 nova/tests/network_unittest.py     |    2 +-
 nova/tests/node_unittest.py        |    2 +-
 nova/tests/objectstore_unittest.py |    2 +-
 nova/tests/process_unittest.py     |    2 +-
 nova/tests/users_unittest.py       |    2 +-
 nova/tests/validator_unittest.py   |    2 +-
 nova/twistd.py                     |    2 +-
 nova/vendor.py                     |   24 ------------------------
 nova/volume/storage.py             |    2 +-
 run_tests.py                       |    2 +-
 smoketests/flags.py                |    2 +-
 smoketests/novatestcase.py         |    2 +-
 smoketests/smoketest.py            |    2 +-
 44 files changed, 42 insertions(+), 69 deletions(-)

commit 122fe2b75f635df0aa3858d05ed6775b76a9776e
Merge: 89157b2 97665db
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 10:52:11 2010 -0500

    Merge with -core's diverged trunk.

commit 97665db528eecc3892beaaaacba2b9d1c3b7c5ea
Merge: ea9b913 718c6ce
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 15 14:07:51 2010 +0000

    Updates the test suite to work.

commit 718c6ce2edeb3dbb96c8353200181f4a6b06a4d3
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 15 08:44:25 2010 -0500

    Disabled a tmpdir cleanup.

 nova/tests/objectstore_unittest.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 89157b250032e5a819742e4ed537222898bcdf25
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 01:31:16 2010 -0400

    remove vendor

 nova/vendor.py                                     |   24 +-
 vendor/IPy.py                                      | 1304 -----
 vendor/Twisted-10.0.0/INSTALL                      |   32 -
 vendor/Twisted-10.0.0/LICENSE                      |   57 -
 vendor/Twisted-10.0.0/NEWS                         | 1416 -----
 vendor/Twisted-10.0.0/README                       |  118 -
 vendor/Twisted-10.0.0/bin/.twistd.swp              |  Bin 12288 -> 0 bytes
 vendor/Twisted-10.0.0/bin/conch/cftp               |   20 -
 vendor/Twisted-10.0.0/bin/conch/ckeygen            |   20 -
 vendor/Twisted-10.0.0/bin/conch/conch              |   20 -
 vendor/Twisted-10.0.0/bin/conch/tkconch            |   20 -
 vendor/Twisted-10.0.0/bin/lore/lore                |   21 -
 vendor/Twisted-10.0.0/bin/mail/mailmail            |   25 -
 vendor/Twisted-10.0.0/bin/manhole                  |   21 -
 vendor/Twisted-10.0.0/bin/mktap                    |   18 -
 vendor/Twisted-10.0.0/bin/pyhtmlizer               |   17 -
 vendor/Twisted-10.0.0/bin/tap2deb                  |   20 -
 vendor/Twisted-10.0.0/bin/tap2rpm                  |   22 -
 vendor/Twisted-10.0.0/bin/tapconvert               |   18 -
 vendor/Twisted-10.0.0/bin/trial                    |   22 -
 vendor/Twisted-10.0.0/bin/twistd                   |   19 -
 vendor/Twisted-10.0.0/doc/conch/benchmarks/README  |   15 -
 .../doc/conch/benchmarks/buffering_mixin.py        |  182 -
 vendor/Twisted-10.0.0/doc/conch/examples/demo.tac  |   25 -
 .../doc/conch/examples/demo_draw.tac               |   80 -
 .../doc/conch/examples/demo_insults.tac            |  252 -
 .../doc/conch/examples/demo_manhole.tac            |   56 -
 .../doc/conch/examples/demo_recvline.tac           |   77 -
 .../doc/conch/examples/demo_scroll.tac             |  100 -
 .../Twisted-10.0.0/doc/conch/examples/index.html   |   40 -
 .../doc/conch/examples/sshsimpleclient.py          |  111 -
 .../doc/conch/examples/sshsimpleserver.py          |  117 -
 .../doc/conch/examples/telnet_echo.tac             |   37 -
 .../Twisted-10.0.0/doc/conch/examples/window.tac   |  190 -
 .../doc/conch/howto/conch_client.html              |  318 --
 vendor/Twisted-10.0.0/doc/conch/howto/index.html   |   28 -
 vendor/Twisted-10.0.0/doc/conch/index.html         |   25 -
 vendor/Twisted-10.0.0/doc/conch/man/cftp-man.html  |   87 -
 vendor/Twisted-10.0.0/doc/conch/man/cftp.1         |   89 -
 .../Twisted-10.0.0/doc/conch/man/ckeygen-man.html  |  107 -
 vendor/Twisted-10.0.0/doc/conch/man/ckeygen.1      |   58 -
 vendor/Twisted-10.0.0/doc/conch/man/conch-man.html |  148 -
 vendor/Twisted-10.0.0/doc/conch/man/conch.1        |  206 -
 .../Twisted-10.0.0/doc/conch/man/tkconch-man.html  |  129 -
 vendor/Twisted-10.0.0/doc/conch/man/tkconch.1      |   72 -
 .../Twisted-10.0.0/doc/core/benchmarks/banana.py   |   10 -
 .../doc/core/benchmarks/deferreds.py               |  145 -
 .../Twisted-10.0.0/doc/core/benchmarks/failure.py  |   66 -
 .../doc/core/benchmarks/linereceiver.py            |   47 -
 vendor/Twisted-10.0.0/doc/core/benchmarks/task.py  |   26 -
 vendor/Twisted-10.0.0/doc/core/benchmarks/timer.py |   24 -
 .../Twisted-10.0.0/doc/core/benchmarks/tpclient.py |   60 -
 .../doc/core/benchmarks/tpclient_nt.py             |   22 -
 .../Twisted-10.0.0/doc/core/benchmarks/tpserver.py |   19 -
 .../doc/core/benchmarks/tpserver_nt.py             |   22 -
 .../Twisted-10.0.0/doc/core/development/index.html |   27 -
 .../development/listings/new_module_template.py    |   12 -
 .../doc/core/development/naming.html               |   38 -
 .../doc/core/development/philosophy.html           |   58 -
 .../core/development/policy/coding-standard.html   |  809 ---
 .../doc/core/development/policy/doc-standard.html  |  188 -
 .../doc/core/development/policy/index.html         |   33 -
 .../doc/core/development/policy/svn-dev.html       |  227 -
 .../doc/core/development/policy/test-standard.html |  362 --
 .../core/development/policy/writing-standard.html  |  313 --
 .../doc/core/development/security.html             |   43 -
 .../Twisted-10.0.0/doc/core/examples/ampclient.py  |   26 -
 .../Twisted-10.0.0/doc/core/examples/ampserver.py  |   40 -
 .../doc/core/examples/bananabench.py               |   79 -
 .../Twisted-10.0.0/doc/core/examples/chatserver.py |   37 -
 vendor/Twisted-10.0.0/doc/core/examples/courier.py |  111 -
 vendor/Twisted-10.0.0/doc/core/examples/cred.py    |  163 -
 vendor/Twisted-10.0.0/doc/core/examples/dbcred.py  |  179 -
 .../Twisted-10.0.0/doc/core/examples/echoclient.py |   41 -
 .../doc/core/examples/echoclient_ssl.py            |   46 -
 .../doc/core/examples/echoclient_udp.py            |   38 -
 .../Twisted-10.0.0/doc/core/examples/echoserv.py   |   27 -
 .../doc/core/examples/echoserv_ssl.py              |   30 -
 .../doc/core/examples/echoserv_udp.py              |   19 -
 .../Twisted-10.0.0/doc/core/examples/filewatch.py  |   17 -
 .../Twisted-10.0.0/doc/core/examples/ftpclient.py  |  113 -
 .../Twisted-10.0.0/doc/core/examples/ftpserver.py  |   55 -
 vendor/Twisted-10.0.0/doc/core/examples/gpsfix.py  |   78 -
 vendor/Twisted-10.0.0/doc/core/examples/index.html |  127 -
 vendor/Twisted-10.0.0/doc/core/examples/longex.py  |   66 -
 vendor/Twisted-10.0.0/doc/core/examples/longex2.py |  101 -
 vendor/Twisted-10.0.0/doc/core/examples/mouse.py   |   80 -
 .../doc/core/examples/pb_exceptions.py             |   36 -
 .../doc/core/examples/pbbenchclient.py             |   42 -
 .../doc/core/examples/pbbenchserver.py             |   54 -
 vendor/Twisted-10.0.0/doc/core/examples/pbecho.py  |   51 -
 .../doc/core/examples/pbechoclient.py              |   32 -
 vendor/Twisted-10.0.0/doc/core/examples/pbgtk2.py  |  122 -
 .../doc/core/examples/pbgtk2login.glade            |  330 --
 .../Twisted-10.0.0/doc/core/examples/pbinterop.py  |   71 -
 .../Twisted-10.0.0/doc/core/examples/pbsimple.py   |   16 -
 .../doc/core/examples/pbsimpleclient.py            |   18 -
 vendor/Twisted-10.0.0/doc/core/examples/postfix.py |   29 -
 vendor/Twisted-10.0.0/doc/core/examples/ptyserv.py |   32 -
 .../Twisted-10.0.0/doc/core/examples/pyui_bg.png   |  Bin 29913 -> 0 bytes
 .../Twisted-10.0.0/doc/core/examples/pyuidemo.py   |   31 -
 .../doc/core/examples/rotatinglog.py               |   26 -
 .../doc/core/examples/row_example.py               |  105 -
 .../doc/core/examples/row_schema.sql               |   65 -
 .../Twisted-10.0.0/doc/core/examples/row_util.py   |  103 -
 vendor/Twisted-10.0.0/doc/core/examples/server.pem |   36 -
 vendor/Twisted-10.0.0/doc/core/examples/shaper.py  |   52 -
 .../Twisted-10.0.0/doc/core/examples/shoutcast.py  |   26 -
 vendor/Twisted-10.0.0/doc/core/examples/simple.tac |   39 -
 .../doc/core/examples/simpleclient.py              |   49 -
 .../Twisted-10.0.0/doc/core/examples/simpleserv.py |   26 -
 vendor/Twisted-10.0.0/doc/core/examples/stdin.py   |   30 -
 .../Twisted-10.0.0/doc/core/examples/stdiodemo.py  |   78 -
 .../doc/core/examples/testlogging.py               |   41 -
 .../English.lproj/MainMenu.nib/classes.nib         |   13 -
 .../English.lproj/MainMenu.nib/info.nib            |   24 -
 .../English.lproj/MainMenu.nib/keyedobjects.nib    |  Bin 14896 -> 0 bytes
 .../Cocoa/SimpleWebClient/README.txt               |    6 -
 .../Cocoa/SimpleWebClient/Twistzilla.py            |   79 -
 .../threadedselect/Cocoa/SimpleWebClient/setup.py  |   14 -
 .../doc/core/examples/threadedselect/README        |   15 -
 .../core/examples/threadedselect/blockingdemo.py   |   92 -
 .../doc/core/examples/threadedselect/pygamedemo.py |   78 -
 .../doc/core/examples/twistd-logging.tac           |   33 -
 .../doc/core/examples/wxacceptance.py              |  113 -
 vendor/Twisted-10.0.0/doc/core/examples/wxdemo.py  |   64 -
 .../Twisted-10.0.0/doc/core/howto/application.html |  376 --
 vendor/Twisted-10.0.0/doc/core/howto/basics.html   |   99 -
 vendor/Twisted-10.0.0/doc/core/howto/book.tex      |  116 -
 .../doc/core/howto/choosing-reactor.html           |  355 --
 vendor/Twisted-10.0.0/doc/core/howto/clients.html  |  635 ---
 .../Twisted-10.0.0/doc/core/howto/components.html  |  600 --
 vendor/Twisted-10.0.0/doc/core/howto/cred.html     |  566 --
 .../doc/core/howto/debug-with-emacs.html           |   65 -
 vendor/Twisted-10.0.0/doc/core/howto/defer.html    |  840 ---
 .../doc/core/howto/deferredindepth.html            | 2183 --------
 vendor/Twisted-10.0.0/doc/core/howto/design.html   |  257 -
 vendor/Twisted-10.0.0/doc/core/howto/dirdbm.html   |   77 -
 vendor/Twisted-10.0.0/doc/core/howto/gendefer.html |  415 --
 vendor/Twisted-10.0.0/doc/core/howto/glossary.html |  347 --
 vendor/Twisted-10.0.0/doc/core/howto/howto.tidyrc  |    6 -
 vendor/Twisted-10.0.0/doc/core/howto/index.html    |  198 -
 .../doc/core/howto/internet-overview.html          |   48 -
 .../core/howto/listings/TwistedQuotes/__init__.py  |    3 -
 .../core/howto/listings/TwistedQuotes/pbquote.py   |   10 -
 .../howto/listings/TwistedQuotes/pbquoteclient.py  |   32 -
 .../howto/listings/TwistedQuotes/quoteproto.py     |   36 -
 .../core/howto/listings/TwistedQuotes/quoters.py   |   39 -
 .../core/howto/listings/TwistedQuotes/quotes.txt   |   15 -
 .../core/howto/listings/TwistedQuotes/quotetap.py  |   29 -
 .../core/howto/listings/TwistedQuotes/quotetap2.py |   36 -
 .../core/howto/listings/TwistedQuotes/webquote.rpy |   12 -
 .../core/howto/listings/application/service.tac    |   34 -
 .../core/howto/listings/deferred/deferred_ex.py    |   60 -
 .../core/howto/listings/deferred/deferred_ex1a.py  |   73 -
 .../core/howto/listings/deferred/deferred_ex1b.py  |   79 -
 .../core/howto/listings/deferred/deferred_ex2.py   |   91 -
 .../core/howto/listings/deferred/deferred_ex3.py   |  100 -
 .../core/howto/listings/deferred/deferred_ex4.py   |  104 -
 .../core/howto/listings/deferred/deferred_ex5.py   |  136 -
 .../core/howto/listings/deferred/deferred_ex6.py   |  148 -
 .../core/howto/listings/deferred/deferred_ex7.py   |   61 -
 .../core/howto/listings/deferred/deferred_ex8.py   |   66 -
 .../howto/listings/deferred/synch-validation.py    |    5 -
 .../doc/core/howto/listings/pb/cache_classes.py    |   43 -
 .../doc/core/howto/listings/pb/cache_receiver.py   |   28 -
 .../doc/core/howto/listings/pb/cache_sender.py     |   50 -
 .../doc/core/howto/listings/pb/chatclient.py       |   40 -
 .../doc/core/howto/listings/pb/chatserver.py       |   65 -
 .../doc/core/howto/listings/pb/copy2_classes.py    |   29 -
 .../doc/core/howto/listings/pb/copy2_receiver.py   |   21 -
 .../doc/core/howto/listings/pb/copy2_sender.py     |   44 -
 .../doc/core/howto/listings/pb/copy_receiver.tac   |   41 -
 .../doc/core/howto/listings/pb/copy_sender.py      |   57 -
 .../doc/core/howto/listings/pb/exc_client.py       |   33 -
 .../doc/core/howto/listings/pb/exc_server.py       |   32 -
 .../doc/core/howto/listings/pb/pb1client.py        |   31 -
 .../doc/core/howto/listings/pb/pb1server.py        |   20 -
 .../doc/core/howto/listings/pb/pb2client.py        |   36 -
 .../doc/core/howto/listings/pb/pb2server.py        |   30 -
 .../doc/core/howto/listings/pb/pb3client.py        |   26 -
 .../doc/core/howto/listings/pb/pb3server.py        |   16 -
 .../doc/core/howto/listings/pb/pb4client.py        |   58 -
 .../doc/core/howto/listings/pb/pb5client.py        |   22 -
 .../doc/core/howto/listings/pb/pb5server.py        |   29 -
 .../doc/core/howto/listings/pb/pb6client1.py       |   22 -
 .../doc/core/howto/listings/pb/pb6client2.py       |   25 -
 .../doc/core/howto/listings/pb/pb6server.py        |   30 -
 .../doc/core/howto/listings/pb/pb7client.py        |   29 -
 .../doc/core/howto/listings/pb/pbAnonClient.py     |   70 -
 .../doc/core/howto/listings/pb/pbAnonServer.py     |   91 -
 .../doc/core/howto/listings/pb/trap_client.py      |   88 -
 .../doc/core/howto/listings/pb/trap_server.py      |   21 -
 .../doc/core/howto/listings/process/process.py     |   46 -
 .../doc/core/howto/listings/process/quotes.py      |   25 -
 .../core/howto/listings/process/trueandfalse.py    |   14 -
 .../doc/core/howto/listings/udp/MulticastClient.py |   13 -
 .../doc/core/howto/listings/udp/MulticastServer.py |   25 -
 vendor/Twisted-10.0.0/doc/core/howto/logging.html  |  181 -
 vendor/Twisted-10.0.0/doc/core/howto/options.html  |  533 --
 vendor/Twisted-10.0.0/doc/core/howto/overview.html |   18 -
 .../Twisted-10.0.0/doc/core/howto/pb-copyable.html | 1195 ----
 vendor/Twisted-10.0.0/doc/core/howto/pb-cred.html  | 1723 ------
 vendor/Twisted-10.0.0/doc/core/howto/pb-intro.html |  320 --
 vendor/Twisted-10.0.0/doc/core/howto/pb-usage.html | 1158 ----
 vendor/Twisted-10.0.0/doc/core/howto/pb.html       |   52 -
 vendor/Twisted-10.0.0/doc/core/howto/pclients.html |  364 --
 vendor/Twisted-10.0.0/doc/core/howto/plugin.html   |  292 -
 vendor/Twisted-10.0.0/doc/core/howto/process.html  |  725 ---
 .../Twisted-10.0.0/doc/core/howto/producers.html   |   88 -
 vendor/Twisted-10.0.0/doc/core/howto/quotes.html   |  214 -
 vendor/Twisted-10.0.0/doc/core/howto/rdbms.html    |  228 -
 .../doc/core/howto/reactor-basics.html             |   92 -
 vendor/Twisted-10.0.0/doc/core/howto/row.html      |  279 -
 vendor/Twisted-10.0.0/doc/core/howto/servers.html  |  429 --
 vendor/Twisted-10.0.0/doc/core/howto/ssl.html      |  550 --
 .../doc/core/howto/stylesheet-unprocessed.css      |   20 -
 .../Twisted-10.0.0/doc/core/howto/stylesheet.css   |  189 -
 vendor/Twisted-10.0.0/doc/core/howto/tap.html      |  346 --
 vendor/Twisted-10.0.0/doc/core/howto/telnet.html   |   83 -
 vendor/Twisted-10.0.0/doc/core/howto/template.tpl  |   23 -
 vendor/Twisted-10.0.0/doc/core/howto/testing.html  |  168 -
 .../Twisted-10.0.0/doc/core/howto/threading.html   |  213 -
 vendor/Twisted-10.0.0/doc/core/howto/time.html     |  118 -
 .../doc/core/howto/tutorial/backends.html          | 1207 -----
 .../doc/core/howto/tutorial/client.html            |  260 -
 .../doc/core/howto/tutorial/components.html        | 1068 ----
 .../doc/core/howto/tutorial/configuration.html     |  792 ---
 .../doc/core/howto/tutorial/factory.html           |  633 ---
 .../doc/core/howto/tutorial/index.html             |   83 -
 .../doc/core/howto/tutorial/intro.html             |  716 ---
 .../doc/core/howto/tutorial/library.html           |  269 -
 .../core/howto/tutorial/listings/finger/etc.users  |    2 -
 .../tutorial/listings/finger/finger/__init__.py    |    3 -
 .../tutorial/listings/finger/finger/finger.py      |  331 --
 .../howto/tutorial/listings/finger/finger/tap.py   |   20 -
 .../howto/tutorial/listings/finger/finger01.py     |    2 -
 .../howto/tutorial/listings/finger/finger02.py     |   10 -
 .../howto/tutorial/listings/finger/finger03.py     |   11 -
 .../howto/tutorial/listings/finger/finger04.py     |   12 -
 .../howto/tutorial/listings/finger/finger05.py     |   13 -
 .../howto/tutorial/listings/finger/finger06.py     |   18 -
 .../howto/tutorial/listings/finger/finger07.py     |   21 -
 .../howto/tutorial/listings/finger/finger08.py     |   30 -
 .../howto/tutorial/listings/finger/finger09.py     |   26 -
 .../howto/tutorial/listings/finger/finger10.py     |   30 -
 .../howto/tutorial/listings/finger/finger11.tac    |   34 -
 .../howto/tutorial/listings/finger/finger12.tac    |   55 -
 .../howto/tutorial/listings/finger/finger13.tac    |   59 -
 .../howto/tutorial/listings/finger/finger14.tac    |   55 -
 .../howto/tutorial/listings/finger/finger15.tac    |   76 -
 .../howto/tutorial/listings/finger/finger16.tac    |   91 -
 .../howto/tutorial/listings/finger/finger17.tac    |   91 -
 .../howto/tutorial/listings/finger/finger18.tac    |  137 -
 .../howto/tutorial/listings/finger/finger19.tac    |  238 -
 .../howto/tutorial/listings/finger/finger19a.tac   |  231 -
 .../tutorial/listings/finger/finger19a_changes.py  |   29 -
 .../howto/tutorial/listings/finger/finger19b.tac   |  257 -
 .../tutorial/listings/finger/finger19b_changes.py  |   19 -
 .../howto/tutorial/listings/finger/finger19c.tac   |  269 -
 .../tutorial/listings/finger/finger19c_changes.py  |   32 -
 .../howto/tutorial/listings/finger/finger20.tac    |  251 -
 .../howto/tutorial/listings/finger/finger21.tac    |  280 -
 .../howto/tutorial/listings/finger/finger22.py     |  297 -
 .../tutorial/listings/finger/fingerPBclient.py     |   26 -
 .../tutorial/listings/finger/fingerXRclient.py     |    5 -
 .../tutorial/listings/finger/finger_config.py      |   38 -
 .../howto/tutorial/listings/finger/fingerproxy.tac |  110 -
 .../tutorial/listings/finger/organized-finger.tac  |   31 -
 .../tutorial/listings/finger/simple-finger.tac     |   17 -
 .../finger/twisted/plugins/finger_tutorial.py      |    5 -
 .../Twisted-10.0.0/doc/core/howto/tutorial/pb.html |  650 ---
 .../doc/core/howto/tutorial/protocol.html          | 1055 ----
 .../doc/core/howto/tutorial/style.html             |  313 --
 .../doc/core/howto/tutorial/web.html               |  537 --
 vendor/Twisted-10.0.0/doc/core/howto/udp.html      |  275 -
 .../Twisted-10.0.0/doc/core/howto/upgrading.html   |  331 --
 vendor/Twisted-10.0.0/doc/core/howto/vision.html   |   43 -
 .../doc/core/howto/website-template.tpl            |   22 -
 vendor/Twisted-10.0.0/doc/core/img/TwistedLogo.bmp |  Bin 55494 -> 0 bytes
 vendor/Twisted-10.0.0/doc/core/img/cred-login.dia  |  Bin 2369 -> 0 bytes
 vendor/Twisted-10.0.0/doc/core/img/cred-login.png  |  Bin 34148 -> 0 bytes
 .../doc/core/img/deferred-attach.dia               |  Bin 2234 -> 0 bytes
 .../doc/core/img/deferred-attach.png               |  Bin 9356 -> 0 bytes
 .../doc/core/img/deferred-process.dia              |  Bin 2099 -> 0 bytes
 .../doc/core/img/deferred-process.png              |  Bin 10809 -> 0 bytes
 vendor/Twisted-10.0.0/doc/core/img/deferred.dia    |  Bin 4348 -> 0 bytes
 vendor/Twisted-10.0.0/doc/core/img/deferred.png    |  Bin 33282 -> 0 bytes
 .../doc/core/img/twisted-overview.dia              |  Bin 5984 -> 0 bytes
 .../doc/core/img/twisted-overview.png              |  Bin 50929 -> 0 bytes
 vendor/Twisted-10.0.0/doc/core/index.html          |   33 -
 .../Twisted-10.0.0/doc/core/man/manhole-man.html   |   50 -
 vendor/Twisted-10.0.0/doc/core/man/manhole.1       |   16 -
 vendor/Twisted-10.0.0/doc/core/man/mktap-man.html  |  328 --
 vendor/Twisted-10.0.0/doc/core/man/mktap.1         |  219 -
 .../doc/core/man/pyhtmlizer-man.html               |   51 -
 vendor/Twisted-10.0.0/doc/core/man/pyhtmlizer.1    |   22 -
 .../Twisted-10.0.0/doc/core/man/tap2deb-man.html   |  106 -
 vendor/Twisted-10.0.0/doc/core/man/tap2deb.1       |   57 -
 .../Twisted-10.0.0/doc/core/man/tap2rpm-man.html   |  107 -
 vendor/Twisted-10.0.0/doc/core/man/tap2rpm.1       |   58 -
 .../doc/core/man/tapconvert-man.html               |   82 -
 vendor/Twisted-10.0.0/doc/core/man/tapconvert.1    |   40 -
 vendor/Twisted-10.0.0/doc/core/man/trial-man.html  |  194 -
 vendor/Twisted-10.0.0/doc/core/man/trial.1         |  132 -
 vendor/Twisted-10.0.0/doc/core/man/twistd-man.html |  194 -
 vendor/Twisted-10.0.0/doc/core/man/twistd.1        |  123 -
 .../doc/core/specifications/banana.html            |  199 -
 .../doc/core/specifications/index.html             |   21 -
 .../doc/core/upgrades/2.0/components.html          |  115 -
 .../doc/core/upgrades/2.0/index.html               |   31 -
 .../doc/core/upgrades/2.0/split.html               |  163 -
 vendor/Twisted-10.0.0/doc/core/upgrades/index.html |   29 -
 vendor/Twisted-10.0.0/doc/fun/Twisted.Quotes       | 5722 --------------------
 vendor/Twisted-10.0.0/doc/fun/lightbulb            |    7 -
 vendor/Twisted-10.0.0/doc/fun/register.html        |   77 -
 .../ipc10/twisted-network-framework/errata.html    |  256 -
 .../ipc10/twisted-network-framework/index.html     | 1568 ------
 .../doc/historic/2003/europython/doanddont.html    |  508 --
 .../doc/historic/2003/europython/index.html        |   35 -
 .../doc/historic/2003/europython/lore.html         |  502 --
 .../historic/2003/europython/slides-template.tpl   |   19 -
 .../doc/historic/2003/europython/tw-deploy.html    | 1106 ----
 .../doc/historic/2003/europython/twisted.html      |  608 ---
 .../doc/historic/2003/europython/webclients.html   |  482 --
 .../doc/historic/2003/haifux/haifux.html           | 2235 --------
 .../doc/historic/2003/haifux/notes.html            |   60 -
 .../historic/2003/pycon/applications/applications  |  257 -
 .../2003/pycon/applications/applications.html      |  343 --
 .../2003/pycon/applications/pynfo-chart.png        |  Bin 13018 -> 0 bytes
 .../doc/historic/2003/pycon/conch/conch            |   98 -
 .../doc/historic/2003/pycon/conch/conch.html       |  165 -
 .../doc/historic/2003/pycon/conch/conchtalk.txt    |  144 -
 .../doc/historic/2003/pycon/conch/smalltwisted.png |  Bin 1472 -> 0 bytes
 .../doc/historic/2003/pycon/conch/twistedlogo.png  |  Bin 7256 -> 0 bytes
 .../2003/pycon/deferex/deferex-bad-adding.py       |    8 -
 .../2003/pycon/deferex/deferex-chaining.py         |   13 -
 .../2003/pycon/deferex/deferex-complex-failure.py  |   30 -
 .../2003/pycon/deferex/deferex-complex-raise.py    |   12 -
 .../2003/pycon/deferex/deferex-forwarding.py       |    9 -
 .../2003/pycon/deferex/deferex-listing0.py         |   18 -
 .../2003/pycon/deferex/deferex-listing1.py         |    6 -
 .../2003/pycon/deferex/deferex-listing2.py         |    8 -
 .../2003/pycon/deferex/deferex-simple-failure.py   |    9 -
 .../2003/pycon/deferex/deferex-simple-raise.py     |    3 -
 .../doc/historic/2003/pycon/deferex/deferex.html   |  499 --
 .../doc/historic/2003/pycon/deferex/deferexex.py   |   16 -
 .../intrinsics-lightning/intrinsics-lightning      |   97 -
 .../doc/historic/2003/pycon/lore/lore-presentation |  108 -
 .../doc/historic/2003/pycon/lore/lore-slides.html  |  187 -
 .../doc/historic/2003/pycon/lore/lore.html         |  791 ---
 .../doc/historic/2003/pycon/pb/pb-client1.py       |   46 -
 .../doc/historic/2003/pycon/pb/pb-server1.py       |   16 -
 .../doc/historic/2003/pycon/pb/pb-slides.py        |  240 -
 .../doc/historic/2003/pycon/pb/pb.html             |  966 ----
 .../2003/pycon/releasing/releasing-twisted         |  151 -
 .../historic/2003/pycon/releasing/releasing.html   |  491 --
 .../doc/historic/2003/pycon/tw-deploy/tw-deploy    |  184 -
 .../2003/pycon/tw-deploy/twisted-overview.png      |  Bin 12722 -> 0 bytes
 .../historic/2003/pycon/tw-deploy/twistedlogo.png  |  Bin 7256 -> 0 bytes
 .../pycon/twisted-internet/twisted-internet.py     |  541 --
 .../2003/pycon/twisted-reality/componentized.svg   |  254 -
 .../pycon/twisted-reality/twisted-reality.html     |  578 --
 .../Twisted-10.0.0/doc/historic/2004/ibm/talk.html |  495 --
 vendor/Twisted-10.0.0/doc/historic/index.html      |  128 -
 .../Twisted-10.0.0/doc/historic/ipc10errata.html   |  256 -
 vendor/Twisted-10.0.0/doc/historic/ipc10paper.html | 1568 ------
 vendor/Twisted-10.0.0/doc/historic/stylesheet.css  |  178 -
 .../Twisted-10.0.0/doc/historic/template-notoc.tpl |   14 -
 vendor/Twisted-10.0.0/doc/historic/template.tpl    |   20 -
 .../doc/historic/twisted-debian.html               |   96 -
 .../Twisted-10.0.0/doc/lore/examples/example.html  |   60 -
 vendor/Twisted-10.0.0/doc/lore/examples/index.html |   22 -
 .../doc/lore/examples/slides-template.tpl          |   21 -
 .../Twisted-10.0.0/doc/lore/howto/extend-lore.html |  425 --
 vendor/Twisted-10.0.0/doc/lore/howto/index.html    |   23 -
 .../doc/lore/howto/listings/lore/1st_example.html  |   12 -
 .../doc/lore/howto/listings/lore/a_lore_plugin.py  |   11 -
 .../doc/lore/howto/listings/lore/factory.py-1      |    9 -
 .../doc/lore/howto/listings/lore/factory.py-2      |   20 -
 .../doc/lore/howto/listings/lore/factory.py-3      |   21 -
 .../doc/lore/howto/listings/lore/spitters.py-1     |   18 -
 .../doc/lore/howto/listings/lore/spitters.py-2     |   26 -
 vendor/Twisted-10.0.0/doc/lore/howto/lore.html     |  366 --
 .../Twisted-10.0.0/doc/lore/img/myhtml-output.png  |  Bin 23124 -> 0 bytes
 vendor/Twisted-10.0.0/doc/lore/index.html          |   25 -
 vendor/Twisted-10.0.0/doc/lore/man/lore-man.html   |  124 -
 vendor/Twisted-10.0.0/doc/lore/man/lore.1          |   74 -
 .../doc/mail/examples/emailserver.tac              |   72 -
 .../doc/mail/examples/imap4client.py               |  181 -
 vendor/Twisted-10.0.0/doc/mail/examples/index.html |   35 -
 .../doc/mail/examples/smtpclient_tls.py            |  157 -
 vendor/Twisted-10.0.0/doc/mail/index.html          |   25 -
 .../Twisted-10.0.0/doc/mail/man/mailmail-man.html  |   55 -
 vendor/Twisted-10.0.0/doc/mail/man/mailmail.1      |   21 -
 .../doc/mail/tutorial/smtpclient/smtpclient-1.tac  |    3 -
 .../doc/mail/tutorial/smtpclient/smtpclient-10.tac |   56 -
 .../doc/mail/tutorial/smtpclient/smtpclient-11.tac |   58 -
 .../doc/mail/tutorial/smtpclient/smtpclient-2.tac  |   10 -
 .../doc/mail/tutorial/smtpclient/smtpclient-3.tac  |   10 -
 .../doc/mail/tutorial/smtpclient/smtpclient-4.tac  |   12 -
 .../doc/mail/tutorial/smtpclient/smtpclient-5.tac  |   14 -
 .../doc/mail/tutorial/smtpclient/smtpclient-6.tac  |   18 -
 .../doc/mail/tutorial/smtpclient/smtpclient-7.tac  |   46 -
 .../doc/mail/tutorial/smtpclient/smtpclient-8.tac  |   49 -
 .../doc/mail/tutorial/smtpclient/smtpclient-9.tac  |   53 -
 .../doc/mail/tutorial/smtpclient/smtpclient.html   |  752 ---
 .../doc/mail/tutorial/smtpserver/smtpserver-1.tac  |    3 -
 .../doc/mail/tutorial/smtpserver/smtpserver-2.tac  |   10 -
 .../doc/mail/tutorial/smtpserver/smtpserver-3.tac  |   12 -
 .../doc/mail/tutorial/smtpserver/smtpserver-4.tac  |   14 -
 .../doc/mail/tutorial/smtpserver/smtpserver-5.tac  |   50 -
 .../doc/mail/tutorial/smtpserver/smtpserver-6.tac  |   57 -
 .../doc/mail/tutorial/smtpserver/smtpserver-7.tac  |   57 -
 .../doc/mail/tutorial/smtpserver/smtpserver-8.tac  |   63 -
 .../doc/names/examples/dns-service.py              |   36 -
 .../doc/names/examples/gethostbyname.py            |   21 -
 .../Twisted-10.0.0/doc/names/examples/index.html   |   24 -
 .../Twisted-10.0.0/doc/names/examples/testdns.py   |   38 -
 vendor/Twisted-10.0.0/doc/names/howto/index.html   |   22 -
 .../names/howto/listings/names/example-domain.com  |   37 -
 vendor/Twisted-10.0.0/doc/names/howto/names.html   |  134 -
 vendor/Twisted-10.0.0/doc/names/index.html         |   25 -
 vendor/Twisted-10.0.0/doc/pair/examples/index.html |   23 -
 vendor/Twisted-10.0.0/doc/pair/examples/pairudp.py |   18 -
 vendor/Twisted-10.0.0/doc/pair/howto/index.html    |   27 -
 .../doc/pair/howto/twisted-pair.html               |   79 -
 vendor/Twisted-10.0.0/doc/pair/index.html          |   23 -
 vendor/Twisted-10.0.0/doc/web/examples/advogato.py |   45 -
 vendor/Twisted-10.0.0/doc/web/examples/dlpage.py   |    9 -
 .../Twisted-10.0.0/doc/web/examples/fortune.rpy.py |   17 -
 vendor/Twisted-10.0.0/doc/web/examples/getpage.py  |    9 -
 vendor/Twisted-10.0.0/doc/web/examples/google.py   |    9 -
 .../Twisted-10.0.0/doc/web/examples/hello.rpy.py   |   28 -
 .../Twisted-10.0.0/doc/web/examples/httpclient.py  |   54 -
 vendor/Twisted-10.0.0/doc/web/examples/index.html  |   96 -
 vendor/Twisted-10.0.0/doc/web/examples/lj.rpy.py   |   35 -
 vendor/Twisted-10.0.0/doc/web/examples/proxy.py    |   11 -
 .../Twisted-10.0.0/doc/web/examples/report.rpy.py  |   28 -
 .../Twisted-10.0.0/doc/web/examples/rootscript.py  |    9 -
 .../Twisted-10.0.0/doc/web/examples/silly-web.py   |   18 -
 vendor/Twisted-10.0.0/doc/web/examples/simple.rtl  |   23 -
 vendor/Twisted-10.0.0/doc/web/examples/soap.py     |   41 -
 .../Twisted-10.0.0/doc/web/examples/users.rpy.py   |   18 -
 .../Twisted-10.0.0/doc/web/examples/vhost.rpy.py   |    4 -
 vendor/Twisted-10.0.0/doc/web/examples/web.py      |   27 -
 vendor/Twisted-10.0.0/doc/web/examples/webguard.py |   54 -
 vendor/Twisted-10.0.0/doc/web/examples/xmlrpc.py   |   67 -
 .../doc/web/examples/xmlrpcclient.py               |   23 -
 vendor/Twisted-10.0.0/doc/web/howto/client.html    |  469 --
 .../Twisted-10.0.0/doc/web/howto/formindepth.html  |   20 -
 vendor/Twisted-10.0.0/doc/web/howto/glossary.html  |   42 -
 vendor/Twisted-10.0.0/doc/web/howto/index.html     |   50 -
 .../doc/web/howto/listings/client/request.py       |   21 -
 .../doc/web/howto/listings/client/response.py      |   47 -
 .../doc/web/howto/listings/client/sendbody.py      |   24 -
 .../doc/web/howto/listings/client/stringprod.py    |   21 -
 .../Twisted-10.0.0/doc/web/howto/listings/soap.rpy |   13 -
 .../doc/web/howto/listings/webquote.rtl            |   20 -
 .../doc/web/howto/listings/xmlAndSoapQuote.py      |   25 -
 .../doc/web/howto/listings/xmlquote.rpy            |   12 -
 .../doc/web/howto/resource-templates.html          |  103 -
 .../doc/web/howto/using-twistedweb.html            |  972 ----
 .../doc/web/howto/web-development.html             |  106 -
 .../web/howto/web-in-60/asynchronous-deferred.html |  161 -
 .../doc/web/howto/web-in-60/asynchronous.html      |  121 -
 .../doc/web/howto/web-in-60/custom-codes.html      |  118 -
 .../doc/web/howto/web-in-60/dynamic-content.html   |  120 -
 .../doc/web/howto/web-in-60/dynamic-dispatch.html  |  142 -
 .../doc/web/howto/web-in-60/error-handling.html    |  129 -
 .../doc/web/howto/web-in-60/handling-posts.html    |  137 -
 .../doc/web/howto/web-in-60/http-auth.html         |  250 -
 .../doc/web/howto/web-in-60/index.html             |   44 -
 .../doc/web/howto/web-in-60/interrupted.html       |  141 -
 .../doc/web/howto/web-in-60/logging-errors.html    |  104 -
 .../doc/web/howto/web-in-60/rpy-scripts.html       |   86 -
 .../doc/web/howto/web-in-60/session-basics.html    |  120 -
 .../doc/web/howto/web-in-60/session-endings.html   |  170 -
 .../doc/web/howto/web-in-60/session-store.html     |  180 -
 .../doc/web/howto/web-in-60/static-content.html    |  102 -
 .../doc/web/howto/web-in-60/static-dispatch.html   |  118 -
 .../doc/web/howto/web-in-60/wsgi.html              |  123 -
 .../Twisted-10.0.0/doc/web/howto/web-overview.html |   67 -
 vendor/Twisted-10.0.0/doc/web/howto/xmlrpc.html    |  457 --
 vendor/Twisted-10.0.0/doc/web/img/controller.png   |  Bin 14934 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/livepage.png     |  Bin 9363 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/model.png        |  Bin 14971 -> 0 bytes
 .../doc/web/img/plone_root_model.png               |  Bin 11214 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/view.png         |  Bin 14703 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-overview.dia |  Bin 1630 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-overview.png |  Bin 7330 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-process.png  |  Bin 30404 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-process.svg  |  594 --
 vendor/Twisted-10.0.0/doc/web/img/web-session.png  |  Bin 8966 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-widgets.dia  |  Bin 1326 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-widgets.png  |  Bin 3147 -> 0 bytes
 vendor/Twisted-10.0.0/doc/web/index.html           |   25 -
 vendor/Twisted-10.0.0/doc/words/examples/aimbot.py |   62 -
 .../doc/words/examples/cursesclient.py             |  188 -
 .../Twisted-10.0.0/doc/words/examples/index.html   |   30 -
 .../Twisted-10.0.0/doc/words/examples/ircLogBot.py |  156 -
 .../doc/words/examples/jabber_client.py            |   29 -
 .../Twisted-10.0.0/doc/words/examples/minchat.py   |  126 -
 .../doc/words/examples/msn_example.py              |   67 -
 .../Twisted-10.0.0/doc/words/examples/oscardemo.py |  100 -
 .../Twisted-10.0.0/doc/words/examples/pb_client.py |  102 -
 .../doc/words/examples/xmpp_client.py              |   82 -
 vendor/Twisted-10.0.0/doc/words/howto/im.html      |  115 -
 vendor/Twisted-10.0.0/doc/words/howto/index.html   |   22 -
 vendor/Twisted-10.0.0/doc/words/index.html         |   25 -
 vendor/Twisted-10.0.0/doc/words/man/im-man.html    |   50 -
 vendor/Twisted-10.0.0/doc/words/man/im.1           |   16 -
 vendor/Twisted-10.0.0/setup.py                     |  100 -
 vendor/Twisted-10.0.0/twisted/__init__.py          |   24 -
 vendor/Twisted-10.0.0/twisted/_version.py          |    3 -
 .../Twisted-10.0.0/twisted/application/__init__.py |    7 -
 vendor/Twisted-10.0.0/twisted/application/app.py   |  730 ---
 .../Twisted-10.0.0/twisted/application/internet.py |  270 -
 .../Twisted-10.0.0/twisted/application/reactors.py |   83 -
 .../Twisted-10.0.0/twisted/application/service.py  |  398 --
 .../Twisted-10.0.0/twisted/application/strports.py |  200 -
 vendor/Twisted-10.0.0/twisted/conch/__init__.py    |   18 -
 vendor/Twisted-10.0.0/twisted/conch/_version.py    |    3 -
 vendor/Twisted-10.0.0/twisted/conch/avatar.py      |   37 -
 vendor/Twisted-10.0.0/twisted/conch/checkers.py    |  266 -
 .../twisted/conch/client/__init__.py               |    9 -
 .../Twisted-10.0.0/twisted/conch/client/agent.py   |   73 -
 .../Twisted-10.0.0/twisted/conch/client/connect.py |   21 -
 .../Twisted-10.0.0/twisted/conch/client/default.py |  256 -
 .../Twisted-10.0.0/twisted/conch/client/direct.py  |  107 -
 .../twisted/conch/client/knownhosts.py             |  474 --
 .../Twisted-10.0.0/twisted/conch/client/options.py |   90 -
 vendor/Twisted-10.0.0/twisted/conch/error.py       |  102 -
 .../twisted/conch/insults/__init__.py              |    4 -
 .../Twisted-10.0.0/twisted/conch/insults/client.py |  138 -
 .../Twisted-10.0.0/twisted/conch/insults/colors.py |   29 -
 .../Twisted-10.0.0/twisted/conch/insults/helper.py |  450 --
 .../twisted/conch/insults/insults.py               | 1087 ----
 .../Twisted-10.0.0/twisted/conch/insults/text.py   |  186 -
 .../Twisted-10.0.0/twisted/conch/insults/window.py |  864 ---
 vendor/Twisted-10.0.0/twisted/conch/interfaces.py  |  402 --
 vendor/Twisted-10.0.0/twisted/conch/ls.py          |   60 -
 vendor/Twisted-10.0.0/twisted/conch/manhole.py     |  336 --
 vendor/Twisted-10.0.0/twisted/conch/manhole_ssh.py |  146 -
 vendor/Twisted-10.0.0/twisted/conch/manhole_tap.py |  128 -
 vendor/Twisted-10.0.0/twisted/conch/mixin.py       |   49 -
 .../twisted/conch/openssh_compat/__init__.py       |   11 -
 .../twisted/conch/openssh_compat/factory.py        |   73 -
 .../twisted/conch/openssh_compat/primes.py         |   26 -
 vendor/Twisted-10.0.0/twisted/conch/recvline.py    |  328 --
 .../twisted/conch/scripts/__init__.py              |    1 -
 .../Twisted-10.0.0/twisted/conch/scripts/cftp.py   |  811 ---
 .../twisted/conch/scripts/ckeygen.py               |  188 -
 .../Twisted-10.0.0/twisted/conch/scripts/conch.py  |  510 --
 .../twisted/conch/scripts/tkconch.py               |  572 --
 .../Twisted-10.0.0/twisted/conch/ssh/__init__.py   |   10 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/agent.py   |  294 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/asn1.py    |   34 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/channel.py |  281 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/common.py  |  130 -
 .../Twisted-10.0.0/twisted/conch/ssh/connection.py |  613 ---
 vendor/Twisted-10.0.0/twisted/conch/ssh/factory.py |  131 -
 .../twisted/conch/ssh/filetransfer.py              |  927 ----
 .../Twisted-10.0.0/twisted/conch/ssh/forwarding.py |  181 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/keys.py    |  941 ----
 vendor/Twisted-10.0.0/twisted/conch/ssh/service.py |   48 -
 vendor/Twisted-10.0.0/twisted/conch/ssh/session.py |  310 --
 vendor/Twisted-10.0.0/twisted/conch/ssh/sexpy.py   |   42 -
 .../Twisted-10.0.0/twisted/conch/ssh/transport.py  | 1404 -----
 .../Twisted-10.0.0/twisted/conch/ssh/userauth.py   |  846 ---
 vendor/Twisted-10.0.0/twisted/conch/stdio.py       |   95 -
 vendor/Twisted-10.0.0/twisted/conch/tap.py         |   48 -
 vendor/Twisted-10.0.0/twisted/conch/telnet.py      | 1017 ----
 .../Twisted-10.0.0/twisted/conch/test/__init__.py  |    1 -
 .../Twisted-10.0.0/twisted/conch/test/keydata.py   |  174 -
 .../twisted/conch/test/test_agent.py               |  399 --
 .../Twisted-10.0.0/twisted/conch/test/test_cftp.py |  881 ---
 .../twisted/conch/test/test_channel.py             |  279 -
 .../twisted/conch/test/test_checkers.py            |  280 -
 .../twisted/conch/test/test_ckeygen.py             |   80 -
 .../twisted/conch/test/test_conch.py               |  437 --
 .../twisted/conch/test/test_connection.py          |  623 ---
 .../twisted/conch/test/test_default.py             |  171 -
 .../twisted/conch/test/test_filetransfer.py        |  677 ---
 .../twisted/conch/test/test_helper.py              |  560 --
 .../twisted/conch/test/test_insults.py             |  460 --
 .../Twisted-10.0.0/twisted/conch/test/test_keys.py |  961 ----
 .../twisted/conch/test/test_knownhosts.py          |  979 ----
 .../twisted/conch/test/test_manhole.py             |  348 --
 .../twisted/conch/test/test_mixin.py               |   47 -
 .../twisted/conch/test/test_openssh_compat.py      |  102 -
 .../twisted/conch/test/test_recvline.py            |  649 ---
 .../twisted/conch/test/test_session.py             | 1210 -----
 .../Twisted-10.0.0/twisted/conch/test/test_ssh.py  |  886 ---
 .../Twisted-10.0.0/twisted/conch/test/test_tap.py  |   95 -
 .../twisted/conch/test/test_telnet.py              |  710 ---
 .../Twisted-10.0.0/twisted/conch/test/test_text.py |  101 -
 .../twisted/conch/test/test_transport.py           | 1953 -------
 .../twisted/conch/test/test_userauth.py            | 1062 ----
 .../twisted/conch/test/test_window.py              |   49 -
 vendor/Twisted-10.0.0/twisted/conch/topfiles/NEWS  |  206 -
 .../Twisted-10.0.0/twisted/conch/topfiles/README   |    4 -
 .../Twisted-10.0.0/twisted/conch/topfiles/setup.py |   48 -
 vendor/Twisted-10.0.0/twisted/conch/ttymodes.py    |  121 -
 vendor/Twisted-10.0.0/twisted/conch/ui/__init__.py |   11 -
 vendor/Twisted-10.0.0/twisted/conch/ui/ansi.py     |  240 -
 vendor/Twisted-10.0.0/twisted/conch/ui/tkvt100.py  |  197 -
 vendor/Twisted-10.0.0/twisted/conch/unix.py        |  457 --
 vendor/Twisted-10.0.0/twisted/copyright.py         |   39 -
 vendor/Twisted-10.0.0/twisted/cred/__init__.py     |   13 -
 vendor/Twisted-10.0.0/twisted/cred/_digest.py      |  129 -
 vendor/Twisted-10.0.0/twisted/cred/checkers.py     |  268 -
 vendor/Twisted-10.0.0/twisted/cred/credentials.py  |  483 --
 vendor/Twisted-10.0.0/twisted/cred/error.py        |   41 -
 vendor/Twisted-10.0.0/twisted/cred/pamauth.py      |   79 -
 vendor/Twisted-10.0.0/twisted/cred/portal.py       |  121 -
 vendor/Twisted-10.0.0/twisted/cred/strcred.py      |  270 -
 vendor/Twisted-10.0.0/twisted/cred/util.py         |   46 -
 .../Twisted-10.0.0/twisted/enterprise/__init__.py  |    9 -
 vendor/Twisted-10.0.0/twisted/enterprise/adbapi.py |  488 --
 .../Twisted-10.0.0/twisted/enterprise/reflector.py |  167 -
 vendor/Twisted-10.0.0/twisted/enterprise/row.py    |  127 -
 .../twisted/enterprise/sqlreflector.py             |  327 --
 vendor/Twisted-10.0.0/twisted/enterprise/util.py   |  200 -
 vendor/Twisted-10.0.0/twisted/internet/__init__.py |   12 -
 .../twisted/internet/_baseprocess.py               |   62 -
 .../twisted/internet/_dumbwin32proc.py             |  340 --
 .../twisted/internet/_javaserialport.py            |   78 -
 .../twisted/internet/_pollingfile.py               |  279 -
 .../twisted/internet/_posixserialport.py           |   60 -
 .../Twisted-10.0.0/twisted/internet/_posixstdio.py |  173 -
 vendor/Twisted-10.0.0/twisted/internet/_sigchld.c  |  101 -
 vendor/Twisted-10.0.0/twisted/internet/_signals.py |  184 -
 .../Twisted-10.0.0/twisted/internet/_sslverify.py  |  748 ---
 .../twisted/internet/_threadedselect.py            |  362 --
 .../twisted/internet/_win32serialport.py           |  112 -
 .../Twisted-10.0.0/twisted/internet/_win32stdio.py |  124 -
 vendor/Twisted-10.0.0/twisted/internet/abstract.py |  378 --
 vendor/Twisted-10.0.0/twisted/internet/address.py  |  113 -
 vendor/Twisted-10.0.0/twisted/internet/base.py     | 1169 ----
 .../Twisted-10.0.0/twisted/internet/cfreactor.py   |  342 --
 .../twisted/internet/cfsupport/cfdate.pxi          |    2 -
 .../twisted/internet/cfsupport/cfdecl.pxi          |  227 -
 .../twisted/internet/cfsupport/cfrunloop.pxi       |  104 -
 .../twisted/internet/cfsupport/cfsocket.pxi        |  111 -
 .../twisted/internet/cfsupport/cfsupport.c         | 2136 --------
 .../twisted/internet/cfsupport/cfsupport.pyx       |    6 -
 .../twisted/internet/cfsupport/python.pxi          |    5 -
 .../twisted/internet/cfsupport/setup.py            |   50 -
 vendor/Twisted-10.0.0/twisted/internet/default.py  |   21 -
 vendor/Twisted-10.0.0/twisted/internet/defer.py    | 1264 -----
 .../twisted/internet/epollreactor.py               |  235 -
 vendor/Twisted-10.0.0/twisted/internet/error.py    |  319 --
 vendor/Twisted-10.0.0/twisted/internet/fdesc.py    |  118 -
 .../twisted/internet/glib2reactor.py               |   49 -
 .../Twisted-10.0.0/twisted/internet/gtk2reactor.py |  398 --
 .../Twisted-10.0.0/twisted/internet/gtkreactor.py  |  232 -
 .../Twisted-10.0.0/twisted/internet/interfaces.py  | 1693 ------
 .../twisted/internet/iocpreactor/__init__.py       |   10 -
 .../twisted/internet/iocpreactor/abstract.py       |  456 --
 .../twisted/internet/iocpreactor/build.bat         |    4 -
 .../twisted/internet/iocpreactor/const.py          |   26 -
 .../twisted/internet/iocpreactor/interfaces.py     |   33 -
 .../internet/iocpreactor/iocpsupport/acceptex.pxi  |   38 -
 .../internet/iocpreactor/iocpsupport/connectex.pxi |   34 -
 .../internet/iocpreactor/iocpsupport/iocpsupport.c | 2003 -------
 .../iocpreactor/iocpsupport/iocpsupport.pyx        |  250 -
 .../iocpreactor/iocpsupport/winsock_pointers.c     |   62 -
 .../iocpreactor/iocpsupport/winsock_pointers.h     |   51 -
 .../internet/iocpreactor/iocpsupport/wsarecv.pxi   |   61 -
 .../internet/iocpreactor/iocpsupport/wsasend.pxi   |   27 -
 .../twisted/internet/iocpreactor/notes.txt         |   24 -
 .../twisted/internet/iocpreactor/reactor.py        |  267 -
 .../twisted/internet/iocpreactor/setup.py          |   23 -
 .../twisted/internet/iocpreactor/tcp.py            |  639 ---
 .../twisted/internet/iocpreactor/udp.py            |  389 --
 .../Twisted-10.0.0/twisted/internet/kqreactor.py   |  221 -
 vendor/Twisted-10.0.0/twisted/internet/main.py     |   28 -
 .../Twisted-10.0.0/twisted/internet/pollreactor.py |  208 -
 .../Twisted-10.0.0/twisted/internet/posixbase.py   |  513 --
 vendor/Twisted-10.0.0/twisted/internet/process.py  |  931 ----
 vendor/Twisted-10.0.0/twisted/internet/protocol.py |  699 ---
 .../Twisted-10.0.0/twisted/internet/pyuisupport.py |   37 -
 .../Twisted-10.0.0/twisted/internet/qtreactor.py   |   19 -
 vendor/Twisted-10.0.0/twisted/internet/reactor.py  |   38 -
 .../twisted/internet/selectreactor.py              |  204 -
 .../Twisted-10.0.0/twisted/internet/serialport.py  |   65 -
 vendor/Twisted-10.0.0/twisted/internet/ssl.py      |  233 -
 vendor/Twisted-10.0.0/twisted/internet/stdio.py    |   32 -
 vendor/Twisted-10.0.0/twisted/internet/task.py     |  750 ---
 vendor/Twisted-10.0.0/twisted/internet/tcp.py      | 1019 ----
 .../twisted/internet/test/__init__.py              |    6 -
 .../twisted/internet/test/inlinecb_tests.py        |   92 -
 .../twisted/internet/test/process_helper.py        |   33 -
 .../twisted/internet/test/reactormixins.py         |  198 -
 .../twisted/internet/test/test_base.py             |  179 -
 .../twisted/internet/test/test_baseprocess.py      |   73 -
 .../twisted/internet/test/test_core.py             |  275 -
 .../twisted/internet/test/test_fdset.py            |  209 -
 .../twisted/internet/test/test_inlinecb.py         |   13 -
 .../twisted/internet/test/test_iocp.py             |  105 -
 .../twisted/internet/test/test_pollingfile.py      |   39 -
 .../twisted/internet/test/test_posixbase.py        |  259 -
 .../twisted/internet/test/test_process.py          |  520 --
 .../twisted/internet/test/test_qtreactor.py        |   35 -
 .../twisted/internet/test/test_sigchld.py          |  194 -
 .../twisted/internet/test/test_tcp.py              |  143 -
 .../twisted/internet/test/test_threads.py          |  163 -
 .../twisted/internet/test/test_time.py             |   26 -
 .../twisted/internet/test/test_tls.py              |  163 -
 .../twisted/internet/test/test_unix.py             |  137 -
 vendor/Twisted-10.0.0/twisted/internet/threads.py  |  117 -
 .../Twisted-10.0.0/twisted/internet/tksupport.py   |   68 -
 vendor/Twisted-10.0.0/twisted/internet/udp.py      |  297 -
 vendor/Twisted-10.0.0/twisted/internet/unix.py     |  297 -
 vendor/Twisted-10.0.0/twisted/internet/utils.py    |  219 -
 .../twisted/internet/win32eventreactor.py          |  244 -
 .../Twisted-10.0.0/twisted/internet/wxreactor.py   |  181 -
 .../Twisted-10.0.0/twisted/internet/wxsupport.py   |   61 -
 vendor/Twisted-10.0.0/twisted/lore/__init__.py     |   21 -
 vendor/Twisted-10.0.0/twisted/lore/_version.py     |    3 -
 vendor/Twisted-10.0.0/twisted/lore/default.py      |   56 -
 vendor/Twisted-10.0.0/twisted/lore/docbook.py      |   68 -
 vendor/Twisted-10.0.0/twisted/lore/htmlbook.py     |   47 -
 vendor/Twisted-10.0.0/twisted/lore/indexer.py      |   50 -
 vendor/Twisted-10.0.0/twisted/lore/latex.py        |  463 --
 vendor/Twisted-10.0.0/twisted/lore/lint.py         |  204 -
 vendor/Twisted-10.0.0/twisted/lore/lmath.py        |   85 -
 vendor/Twisted-10.0.0/twisted/lore/man2lore.py     |  295 -
 vendor/Twisted-10.0.0/twisted/lore/numberer.py     |   33 -
 vendor/Twisted-10.0.0/twisted/lore/process.py      |  120 -
 .../twisted/lore/scripts/__init__.py               |    1 -
 vendor/Twisted-10.0.0/twisted/lore/scripts/lore.py |  159 -
 vendor/Twisted-10.0.0/twisted/lore/slides.py       |  359 --
 vendor/Twisted-10.0.0/twisted/lore/template.mgp    |   24 -
 .../Twisted-10.0.0/twisted/lore/test/__init__.py   |    1 -
 .../twisted/lore/test/lore_index_file_out.html     |    2 -
 .../lore/test/lore_index_file_out_multiple.html    |    5 -
 .../lore/test/lore_index_file_unnumbered_out.html  |    2 -
 .../twisted/lore/test/lore_index_test.xhtml        |   21 -
 .../twisted/lore/test/lore_index_test2.xhtml       |   22 -
 .../twisted/lore/test/lore_numbering_test_out.html |    2 -
 .../lore/test/lore_numbering_test_out2.html        |    2 -
 .../Twisted-10.0.0/twisted/lore/test/simple.html   |    9 -
 .../Twisted-10.0.0/twisted/lore/test/simple3.html  |    9 -
 .../Twisted-10.0.0/twisted/lore/test/simple4.html  |    9 -
 .../Twisted-10.0.0/twisted/lore/test/template.tpl  |   13 -
 .../twisted/lore/test/test_docbook.py              |   35 -
 .../Twisted-10.0.0/twisted/lore/test/test_latex.py |  146 -
 .../Twisted-10.0.0/twisted/lore/test/test_lint.py  |  132 -
 .../Twisted-10.0.0/twisted/lore/test/test_lmath.py |   53 -
 .../Twisted-10.0.0/twisted/lore/test/test_lore.py  | 1228 -----
 .../twisted/lore/test/test_man2lore.py             |  169 -
 .../twisted/lore/test/test_slides.py               |   85 -
 vendor/Twisted-10.0.0/twisted/lore/texi.py         |  109 -
 vendor/Twisted-10.0.0/twisted/lore/topfiles/NEWS   |  103 -
 vendor/Twisted-10.0.0/twisted/lore/topfiles/README |    3 -
 .../Twisted-10.0.0/twisted/lore/topfiles/setup.py  |   29 -
 vendor/Twisted-10.0.0/twisted/lore/tree.py         | 1152 ----
 vendor/Twisted-10.0.0/twisted/lore/xhtml-lat1.ent  |  196 -
 .../Twisted-10.0.0/twisted/lore/xhtml-special.ent  |   80 -
 .../Twisted-10.0.0/twisted/lore/xhtml-symbol.ent   |  237 -
 .../Twisted-10.0.0/twisted/lore/xhtml1-strict.dtd  |  978 ----
 .../twisted/lore/xhtml1-transitional.dtd           | 1201 ----
 vendor/Twisted-10.0.0/twisted/mail/__init__.py     |   15 -
 vendor/Twisted-10.0.0/twisted/mail/_version.py     |    3 -
 vendor/Twisted-10.0.0/twisted/mail/alias.py        |  435 --
 vendor/Twisted-10.0.0/twisted/mail/bounce.py       |   61 -
 vendor/Twisted-10.0.0/twisted/mail/imap4.py        | 5670 -------------------
 vendor/Twisted-10.0.0/twisted/mail/mail.py         |  333 --
 vendor/Twisted-10.0.0/twisted/mail/maildir.py      |  517 --
 vendor/Twisted-10.0.0/twisted/mail/pb.py           |  115 -
 vendor/Twisted-10.0.0/twisted/mail/pop3.py         | 1072 ----
 vendor/Twisted-10.0.0/twisted/mail/pop3client.py   |  706 ---
 vendor/Twisted-10.0.0/twisted/mail/protocols.py    |  225 -
 vendor/Twisted-10.0.0/twisted/mail/relay.py        |  114 -
 vendor/Twisted-10.0.0/twisted/mail/relaymanager.py |  631 ---
 .../twisted/mail/scripts/__init__.py               |    1 -
 .../twisted/mail/scripts/mailmail.py               |  360 --
 vendor/Twisted-10.0.0/twisted/mail/smtp.py         | 2023 -------
 vendor/Twisted-10.0.0/twisted/mail/tap.py          |  185 -
 .../Twisted-10.0.0/twisted/mail/test/__init__.py   |    1 -
 .../twisted/mail/test/pop3testserver.py            |  314 --
 .../twisted/mail/test/rfc822.message               |   86 -
 .../twisted/mail/test/test_bounce.py               |   32 -
 .../Twisted-10.0.0/twisted/mail/test/test_imap.py  | 4244 ---------------
 .../Twisted-10.0.0/twisted/mail/test/test_mail.py  | 1968 -------
 .../twisted/mail/test/test_mailmail.py             |   75 -
 .../twisted/mail/test/test_options.py              |   44 -
 .../Twisted-10.0.0/twisted/mail/test/test_pop3.py  | 1069 ----
 .../twisted/mail/test/test_pop3client.py           |  573 --
 .../Twisted-10.0.0/twisted/mail/test/test_smtp.py  | 1530 ------
 vendor/Twisted-10.0.0/twisted/mail/topfiles/NEWS   |  191 -
 vendor/Twisted-10.0.0/twisted/mail/topfiles/README |    3 -
 .../Twisted-10.0.0/twisted/mail/topfiles/setup.py  |   50 -
 vendor/Twisted-10.0.0/twisted/manhole/__init__.py  |    8 -
 .../Twisted-10.0.0/twisted/manhole/_inspectro.py   |  369 --
 vendor/Twisted-10.0.0/twisted/manhole/explorer.py  |  655 ---
 .../twisted/manhole/gladereactor.glade             |  342 --
 .../Twisted-10.0.0/twisted/manhole/gladereactor.py |  219 -
 .../Twisted-10.0.0/twisted/manhole/inspectro.glade |  510 --
 .../Twisted-10.0.0/twisted/manhole/logview.glade   |   39 -
 vendor/Twisted-10.0.0/twisted/manhole/service.py   |  399 --
 vendor/Twisted-10.0.0/twisted/manhole/telnet.py    |  117 -
 .../Twisted-10.0.0/twisted/manhole/ui/__init__.py  |    7 -
 .../twisted/manhole/ui/gtk2manhole.glade           |  268 -
 .../twisted/manhole/ui/gtk2manhole.py              |  375 --
 .../twisted/manhole/ui/test/__init__.py            |    4 -
 .../twisted/manhole/ui/test/test_gtk2manhole.py    |   48 -
 vendor/Twisted-10.0.0/twisted/names/__init__.py    |    7 -
 vendor/Twisted-10.0.0/twisted/names/_version.py    |    3 -
 vendor/Twisted-10.0.0/twisted/names/authority.py   |  322 --
 vendor/Twisted-10.0.0/twisted/names/cache.py       |   96 -
 vendor/Twisted-10.0.0/twisted/names/client.py      |  928 ----
 vendor/Twisted-10.0.0/twisted/names/common.py      |  265 -
 vendor/Twisted-10.0.0/twisted/names/dns.py         | 1822 -------
 vendor/Twisted-10.0.0/twisted/names/error.py       |   95 -
 vendor/Twisted-10.0.0/twisted/names/hosts.py       |   61 -
 vendor/Twisted-10.0.0/twisted/names/resolve.py     |   59 -
 vendor/Twisted-10.0.0/twisted/names/root.py        |  446 --
 vendor/Twisted-10.0.0/twisted/names/secondary.py   |  102 -
 vendor/Twisted-10.0.0/twisted/names/server.py      |  205 -
 vendor/Twisted-10.0.0/twisted/names/srvconnect.py  |  186 -
 vendor/Twisted-10.0.0/twisted/names/tap.py         |  119 -
 .../Twisted-10.0.0/twisted/names/test/__init__.py  |    1 -
 .../twisted/names/test/test_cache.py               |   14 -
 .../twisted/names/test/test_client.py              |  655 ---
 .../twisted/names/test/test_common.py              |   71 -
 .../Twisted-10.0.0/twisted/names/test/test_dns.py  | 1200 ----
 .../twisted/names/test/test_names.py               |  752 ---
 .../twisted/names/test/test_rootresolve.py         |  705 ---
 .../twisted/names/test/test_srvconnect.py          |  133 -
 vendor/Twisted-10.0.0/twisted/names/topfiles/NEWS  |  131 -
 .../Twisted-10.0.0/twisted/names/topfiles/README   |    3 -
 .../Twisted-10.0.0/twisted/names/topfiles/setup.py |   50 -
 vendor/Twisted-10.0.0/twisted/news/__init__.py     |   11 -
 vendor/Twisted-10.0.0/twisted/news/_version.py     |    3 -
 vendor/Twisted-10.0.0/twisted/news/database.py     |  998 ----
 vendor/Twisted-10.0.0/twisted/news/news.py         |   90 -
 vendor/Twisted-10.0.0/twisted/news/nntp.py         | 1069 ----
 vendor/Twisted-10.0.0/twisted/news/tap.py          |  134 -
 .../Twisted-10.0.0/twisted/news/test/__init__.py   |    1 -
 .../Twisted-10.0.0/twisted/news/test/test_news.py  |  107 -
 .../Twisted-10.0.0/twisted/news/test/test_nntp.py  |  124 -
 vendor/Twisted-10.0.0/twisted/news/topfiles/NEWS   |   54 -
 vendor/Twisted-10.0.0/twisted/news/topfiles/README |    4 -
 .../Twisted-10.0.0/twisted/news/topfiles/setup.py  |   28 -
 vendor/Twisted-10.0.0/twisted/pair/__init__.py     |   20 -
 vendor/Twisted-10.0.0/twisted/pair/_version.py     |    3 -
 vendor/Twisted-10.0.0/twisted/pair/ethernet.py     |   56 -
 vendor/Twisted-10.0.0/twisted/pair/ip.py           |   72 -
 vendor/Twisted-10.0.0/twisted/pair/raw.py          |   35 -
 vendor/Twisted-10.0.0/twisted/pair/rawudp.py       |   55 -
 .../Twisted-10.0.0/twisted/pair/test/__init__.py   |    1 -
 .../twisted/pair/test/test_ethernet.py             |  226 -
 vendor/Twisted-10.0.0/twisted/pair/test/test_ip.py |  417 --
 .../twisted/pair/test/test_rawudp.py               |  327 --
 vendor/Twisted-10.0.0/twisted/pair/topfiles/NEWS   |   20 -
 vendor/Twisted-10.0.0/twisted/pair/topfiles/README |    1 -
 .../Twisted-10.0.0/twisted/pair/topfiles/setup.py  |   28 -
 vendor/Twisted-10.0.0/twisted/pair/tuntap.py       |  170 -
 .../Twisted-10.0.0/twisted/persisted/__init__.py   |   10 -
 vendor/Twisted-10.0.0/twisted/persisted/aot.py     |  560 --
 .../Twisted-10.0.0/twisted/persisted/crefutil.py   |  167 -
 vendor/Twisted-10.0.0/twisted/persisted/dirdbm.py  |  358 --
 .../twisted/persisted/journal/__init__.py          |   10 -
 .../twisted/persisted/journal/base.py              |  226 -
 .../twisted/persisted/journal/picklelog.py         |   48 -
 .../twisted/persisted/journal/rowjournal.py        |   99 -
 vendor/Twisted-10.0.0/twisted/persisted/sob.py     |  227 -
 vendor/Twisted-10.0.0/twisted/persisted/styles.py  |  257 -
 vendor/Twisted-10.0.0/twisted/plugin.py            |  246 -
 vendor/Twisted-10.0.0/twisted/plugins/__init__.py  |   17 -
 .../twisted/plugins/cred_anonymous.py              |   40 -
 vendor/Twisted-10.0.0/twisted/plugins/cred_file.py |   60 -
 .../Twisted-10.0.0/twisted/plugins/cred_memory.py  |   68 -
 vendor/Twisted-10.0.0/twisted/plugins/cred_unix.py |  138 -
 .../twisted/plugins/twisted_conch.py               |   18 -
 .../Twisted-10.0.0/twisted/plugins/twisted_ftp.py  |   10 -
 .../Twisted-10.0.0/twisted/plugins/twisted_inet.py |   10 -
 .../Twisted-10.0.0/twisted/plugins/twisted_lore.py |   38 -
 .../Twisted-10.0.0/twisted/plugins/twisted_mail.py |   10 -
 .../twisted/plugins/twisted_manhole.py             |   10 -
 .../twisted/plugins/twisted_names.py               |   10 -
 .../Twisted-10.0.0/twisted/plugins/twisted_news.py |   10 -
 .../twisted/plugins/twisted_portforward.py         |   10 -
 .../twisted/plugins/twisted_qtstub.py              |   45 -
 .../twisted/plugins/twisted_reactors.py            |   38 -
 .../twisted/plugins/twisted_socks.py               |   10 -
 .../twisted/plugins/twisted_telnet.py              |   10 -
 .../twisted/plugins/twisted_trial.py               |   59 -
 .../Twisted-10.0.0/twisted/plugins/twisted_web.py  |   11 -
 .../twisted/plugins/twisted_words.py               |   48 -
 .../Twisted-10.0.0/twisted/protocols/__init__.py   |    7 -
 .../Twisted-10.0.0/twisted/protocols/_c_urlarg.c   |  147 -
 vendor/Twisted-10.0.0/twisted/protocols/amp.py     | 2394 --------
 vendor/Twisted-10.0.0/twisted/protocols/basic.py   |  519 --
 vendor/Twisted-10.0.0/twisted/protocols/dict.py    |  362 --
 vendor/Twisted-10.0.0/twisted/protocols/finger.py  |   43 -
 vendor/Twisted-10.0.0/twisted/protocols/ftp.py     | 2814 ----------
 .../twisted/protocols/gps/__init__.py              |    1 -
 .../Twisted-10.0.0/twisted/protocols/gps/nmea.py   |  209 -
 .../twisted/protocols/gps/rockwell.py              |  268 -
 vendor/Twisted-10.0.0/twisted/protocols/htb.py     |  269 -
 vendor/Twisted-10.0.0/twisted/protocols/ident.py   |  227 -
 .../Twisted-10.0.0/twisted/protocols/loopback.py   |  397 --
 .../Twisted-10.0.0/twisted/protocols/memcache.py   |  758 ---
 .../twisted/protocols/mice/__init__.py             |    1 -
 .../twisted/protocols/mice/mouseman.py             |  127 -
 vendor/Twisted-10.0.0/twisted/protocols/pcp.py     |  204 -
 .../Twisted-10.0.0/twisted/protocols/policies.py   |  645 ---
 .../twisted/protocols/portforward.py               |   76 -
 vendor/Twisted-10.0.0/twisted/protocols/postfix.py |  112 -
 .../Twisted-10.0.0/twisted/protocols/shoutcast.py  |  111 -
 vendor/Twisted-10.0.0/twisted/protocols/sip.py     | 1334 -----
 vendor/Twisted-10.0.0/twisted/protocols/socks.py   |  240 -
 .../Twisted-10.0.0/twisted/protocols/stateful.py   |   52 -
 vendor/Twisted-10.0.0/twisted/protocols/telnet.py  |  325 --
 .../twisted/protocols/test/__init__.py             |    6 -
 .../twisted/protocols/test/test_tls.py             |  566 --
 vendor/Twisted-10.0.0/twisted/protocols/tls.py     |  345 --
 vendor/Twisted-10.0.0/twisted/protocols/wire.py    |   90 -
 vendor/Twisted-10.0.0/twisted/python/__init__.py   |   13 -
 vendor/Twisted-10.0.0/twisted/python/_epoll.c      |  925 ----
 vendor/Twisted-10.0.0/twisted/python/_epoll.pyx    |  181 -
 vendor/Twisted-10.0.0/twisted/python/_initgroups.c |   66 -
 vendor/Twisted-10.0.0/twisted/python/_release.py   | 1265 -----
 .../twisted/python/_twisted_zsh_stub               |   89 -
 vendor/Twisted-10.0.0/twisted/python/compat.py     |  173 -
 vendor/Twisted-10.0.0/twisted/python/components.py |  448 --
 vendor/Twisted-10.0.0/twisted/python/context.py    |   90 -
 vendor/Twisted-10.0.0/twisted/python/deprecate.py  |  375 --
 vendor/Twisted-10.0.0/twisted/python/dispatch.py   |   42 -
 vendor/Twisted-10.0.0/twisted/python/dist.py       |  361 --
 vendor/Twisted-10.0.0/twisted/python/dxprofile.py  |   56 -
 vendor/Twisted-10.0.0/twisted/python/failure.py    |  557 --
 vendor/Twisted-10.0.0/twisted/python/fakepwd.py    |  112 -
 vendor/Twisted-10.0.0/twisted/python/filepath.py   |  802 ---
 vendor/Twisted-10.0.0/twisted/python/finalize.py   |   46 -
 vendor/Twisted-10.0.0/twisted/python/formmethod.py |  363 --
 vendor/Twisted-10.0.0/twisted/python/hashlib.py    |   24 -
 vendor/Twisted-10.0.0/twisted/python/hook.py       |  177 -
 vendor/Twisted-10.0.0/twisted/python/htmlizer.py   |   91 -
 vendor/Twisted-10.0.0/twisted/python/lockfile.py   |  212 -
 vendor/Twisted-10.0.0/twisted/python/log.py        |  665 ---
 vendor/Twisted-10.0.0/twisted/python/logfile.py    |  324 --
 vendor/Twisted-10.0.0/twisted/python/modules.py    |  747 ---
 vendor/Twisted-10.0.0/twisted/python/monkey.py     |   73 -
 vendor/Twisted-10.0.0/twisted/python/otp.py        |  496 --
 vendor/Twisted-10.0.0/twisted/python/procutils.py  |   45 -
 vendor/Twisted-10.0.0/twisted/python/randbytes.py  |  177 -
 vendor/Twisted-10.0.0/twisted/python/rebuild.py    |  264 -
 vendor/Twisted-10.0.0/twisted/python/reflect.py    |  812 ---
 vendor/Twisted-10.0.0/twisted/python/release.py    |   57 -
 vendor/Twisted-10.0.0/twisted/python/roots.py      |  248 -
 vendor/Twisted-10.0.0/twisted/python/runtime.py    |   97 -
 vendor/Twisted-10.0.0/twisted/python/shortcut.py   |   76 -
 vendor/Twisted-10.0.0/twisted/python/syslog.py     |  107 -
 .../Twisted-10.0.0/twisted/python/test/__init__.py |    3 -
 .../twisted/python/test/deprecatedattributes.py    |   21 -
 .../twisted/python/test/test_components.py         |  741 ---
 .../twisted/python/test/test_deprecate.py          |  399 --
 .../twisted/python/test/test_dist.py               |  173 -
 .../twisted/python/test/test_fakepwd.py            |  216 -
 .../twisted/python/test/test_hashlib.py            |   90 -
 .../twisted/python/test/test_htmlizer.py           |   41 -
 .../twisted/python/test/test_release.py            | 2476 ---------
 .../twisted/python/test/test_runtime.py            |   29 -
 .../twisted/python/test/test_syslog.py             |  151 -
 .../twisted/python/test/test_util.py               |  834 ---
 .../twisted/python/test/test_versions.py           |  323 --
 .../twisted/python/test/test_win32.py              |   35 -
 .../twisted/python/test/test_zipstream.py          |  455 --
 vendor/Twisted-10.0.0/twisted/python/text.py       |  227 -
 vendor/Twisted-10.0.0/twisted/python/threadable.py |  120 -
 vendor/Twisted-10.0.0/twisted/python/threadpool.py |  308 --
 .../Twisted-10.0.0/twisted/python/timeoutqueue.py  |   49 -
 vendor/Twisted-10.0.0/twisted/python/urlpath.py    |  122 -
 vendor/Twisted-10.0.0/twisted/python/usage.py      |  631 ---
 vendor/Twisted-10.0.0/twisted/python/util.py       |  968 ----
 vendor/Twisted-10.0.0/twisted/python/versions.py   |  249 -
 vendor/Twisted-10.0.0/twisted/python/win32.py      |  163 -
 vendor/Twisted-10.0.0/twisted/python/zippath.py    |  217 -
 vendor/Twisted-10.0.0/twisted/python/zipstream.py  |  377 --
 vendor/Twisted-10.0.0/twisted/python/zsh/README    |    8 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_cftp     |   48 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_ckeygen  |   25 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_conch    |   58 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_lore     |   28 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_manhole  |   19 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_mktap    |  304 --
 .../Twisted-10.0.0/twisted/python/zsh/_pyhtmlizer  |    8 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_tap2deb  |   23 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_tap2rpm  |   23 -
 .../Twisted-10.0.0/twisted/python/zsh/_tapconvert  |   17 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_tkconch  |   38 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_trial    |   40 -
 vendor/Twisted-10.0.0/twisted/python/zsh/_twistd   |  328 --
 vendor/Twisted-10.0.0/twisted/python/zshcomp.py    |  780 ---
 vendor/Twisted-10.0.0/twisted/runner/__init__.py   |   15 -
 vendor/Twisted-10.0.0/twisted/runner/_version.py   |    3 -
 vendor/Twisted-10.0.0/twisted/runner/inetd.py      |   70 -
 vendor/Twisted-10.0.0/twisted/runner/inetdconf.py  |  194 -
 vendor/Twisted-10.0.0/twisted/runner/inetdtap.py   |  160 -
 vendor/Twisted-10.0.0/twisted/runner/portmap.c     |   57 -
 vendor/Twisted-10.0.0/twisted/runner/procmon.py    |  264 -
 vendor/Twisted-10.0.0/twisted/runner/procutils.py  |    5 -
 .../Twisted-10.0.0/twisted/runner/test/__init__.py |    6 -
 .../twisted/runner/test/test_procmon.py            |   55 -
 vendor/Twisted-10.0.0/twisted/runner/topfiles/NEWS |   49 -
 .../Twisted-10.0.0/twisted/runner/topfiles/README  |    2 -
 .../twisted/runner/topfiles/setup.py               |   35 -
 vendor/Twisted-10.0.0/twisted/scripts/__init__.py  |   12 -
 .../Twisted-10.0.0/twisted/scripts/_twistd_unix.py |  317 --
 vendor/Twisted-10.0.0/twisted/scripts/_twistw.py   |   50 -
 vendor/Twisted-10.0.0/twisted/scripts/htmlizer.py  |   66 -
 vendor/Twisted-10.0.0/twisted/scripts/manhole.py   |   65 -
 vendor/Twisted-10.0.0/twisted/scripts/mktap.py     |  182 -
 vendor/Twisted-10.0.0/twisted/scripts/tap2deb.py   |  281 -
 vendor/Twisted-10.0.0/twisted/scripts/tap2rpm.py   |  273 -
 .../Twisted-10.0.0/twisted/scripts/tapconvert.py   |   53 -
 .../twisted/scripts/test/__init__.py               |    6 -
 .../twisted/scripts/test/test_mktap.py             |  122 -
 vendor/Twisted-10.0.0/twisted/scripts/tkunzip.py   |  286 -
 vendor/Twisted-10.0.0/twisted/scripts/trial.py     |  370 --
 vendor/Twisted-10.0.0/twisted/scripts/twistd.py    |   30 -
 vendor/Twisted-10.0.0/twisted/spread/__init__.py   |   12 -
 vendor/Twisted-10.0.0/twisted/spread/banana.py     |  358 --
 vendor/Twisted-10.0.0/twisted/spread/flavors.py    |  600 --
 vendor/Twisted-10.0.0/twisted/spread/interfaces.py |   28 -
 vendor/Twisted-10.0.0/twisted/spread/jelly.py      | 1134 ----
 vendor/Twisted-10.0.0/twisted/spread/pb.py         | 1380 -----
 vendor/Twisted-10.0.0/twisted/spread/publish.py    |  142 -
 vendor/Twisted-10.0.0/twisted/spread/refpath.py    |   95 -
 .../Twisted-10.0.0/twisted/spread/ui/__init__.py   |   12 -
 .../Twisted-10.0.0/twisted/spread/ui/gtk2util.py   |  215 -
 .../Twisted-10.0.0/twisted/spread/ui/login2.glade  |  461 --
 vendor/Twisted-10.0.0/twisted/spread/ui/tktree.py  |  204 -
 vendor/Twisted-10.0.0/twisted/spread/ui/tkutil.py  |  397 --
 vendor/Twisted-10.0.0/twisted/spread/util.py       |  215 -
 vendor/Twisted-10.0.0/twisted/tap/__init__.py      |   10 -
 vendor/Twisted-10.0.0/twisted/tap/ftp.py           |   51 -
 vendor/Twisted-10.0.0/twisted/tap/manhole.py       |   51 -
 vendor/Twisted-10.0.0/twisted/tap/portforward.py   |   24 -
 vendor/Twisted-10.0.0/twisted/tap/socks.py         |   34 -
 vendor/Twisted-10.0.0/twisted/tap/telnet.py        |   29 -
 vendor/Twisted-10.0.0/twisted/test/__init__.py     |   10 -
 .../twisted/test/crash_test_dummy.py               |   34 -
 .../twisted/test/generator_failure_tests.py        |  169 -
 vendor/Twisted-10.0.0/twisted/test/iosim.py        |  270 -
 .../twisted/test/mock_win32process.py              |   48 -
 vendor/Twisted-10.0.0/twisted/test/myrebuilder1.py |   15 -
 vendor/Twisted-10.0.0/twisted/test/myrebuilder2.py |   16 -
 vendor/Twisted-10.0.0/twisted/test/plugin_basic.py |   57 -
 .../Twisted-10.0.0/twisted/test/plugin_extra1.py   |   23 -
 .../Twisted-10.0.0/twisted/test/plugin_extra2.py   |   35 -
 .../Twisted-10.0.0/twisted/test/process_cmdline.py |    5 -
 .../Twisted-10.0.0/twisted/test/process_echoer.py  |   11 -
 vendor/Twisted-10.0.0/twisted/test/process_fds.py  |   40 -
 .../Twisted-10.0.0/twisted/test/process_linger.py  |   17 -
 .../Twisted-10.0.0/twisted/test/process_reader.py  |   12 -
 .../Twisted-10.0.0/twisted/test/process_signal.py  |    8 -
 .../twisted/test/process_stdinreader.py            |   23 -
 .../Twisted-10.0.0/twisted/test/process_tester.py  |   37 -
 vendor/Twisted-10.0.0/twisted/test/process_tty.py  |    6 -
 .../Twisted-10.0.0/twisted/test/process_twisted.py |   43 -
 .../Twisted-10.0.0/twisted/test/proto_helpers.py   |  299 -
 vendor/Twisted-10.0.0/twisted/test/raiser.c        |  316 --
 vendor/Twisted-10.0.0/twisted/test/raiser.pyx      |   21 -
 .../twisted/test/reflect_helper_IE.py              |    4 -
 .../twisted/test/reflect_helper_VE.py              |    4 -
 .../twisted/test/reflect_helper_ZDE.py             |    4 -
 vendor/Twisted-10.0.0/twisted/test/server.pem      |   36 -
 vendor/Twisted-10.0.0/twisted/test/ssl_helpers.py  |   26 -
 .../twisted/test/stdio_test_consumer.py            |   39 -
 .../twisted/test/stdio_test_hostpeer.py            |   32 -
 .../twisted/test/stdio_test_lastwrite.py           |   45 -
 .../twisted/test/stdio_test_loseconn.py            |   48 -
 .../twisted/test/stdio_test_producer.py            |   55 -
 .../twisted/test/stdio_test_write.py               |   32 -
 .../twisted/test/stdio_test_writeseq.py            |   30 -
 .../Twisted-10.0.0/twisted/test/test_abstract.py   |   83 -
 vendor/Twisted-10.0.0/twisted/test/test_adbapi.py  |  774 ---
 vendor/Twisted-10.0.0/twisted/test/test_amp.py     | 2555 ---------
 .../twisted/test/test_application.py               |  867 ---
 vendor/Twisted-10.0.0/twisted/test/test_banana.py  |  278 -
 vendor/Twisted-10.0.0/twisted/test/test_compat.py  |  199 -
 vendor/Twisted-10.0.0/twisted/test/test_context.py |   15 -
 .../Twisted-10.0.0/twisted/test/test_cooperator.py |  634 ---
 vendor/Twisted-10.0.0/twisted/test/test_defer.py   |  950 ----
 vendor/Twisted-10.0.0/twisted/test/test_defgen.py  |  283 -
 vendor/Twisted-10.0.0/twisted/test/test_dict.py    |   22 -
 .../Twisted-10.0.0/twisted/test/test_digestauth.py |  671 ---
 vendor/Twisted-10.0.0/twisted/test/test_dirdbm.py  |  176 -
 vendor/Twisted-10.0.0/twisted/test/test_doc.py     |   92 -
 .../Twisted-10.0.0/twisted/test/test_enterprise.py |   41 -
 vendor/Twisted-10.0.0/twisted/test/test_epoll.py   |  159 -
 vendor/Twisted-10.0.0/twisted/test/test_error.py   |  170 -
 .../Twisted-10.0.0/twisted/test/test_explorer.py   |  236 -
 .../Twisted-10.0.0/twisted/test/test_extensions.py |   18 -
 .../Twisted-10.0.0/twisted/test/test_factories.py  |  162 -
 vendor/Twisted-10.0.0/twisted/test/test_failure.py |  318 --
 vendor/Twisted-10.0.0/twisted/test/test_fdesc.py   |  235 -
 vendor/Twisted-10.0.0/twisted/test/test_finger.py  |   67 -
 .../Twisted-10.0.0/twisted/test/test_formmethod.py |   77 -
 vendor/Twisted-10.0.0/twisted/test/test_ftp.py     | 2671 ---------
 vendor/Twisted-10.0.0/twisted/test/test_hook.py    |  150 -
 vendor/Twisted-10.0.0/twisted/test/test_htb.py     |   96 -
 vendor/Twisted-10.0.0/twisted/test/test_ident.py   |  194 -
 vendor/Twisted-10.0.0/twisted/test/test_import.py  |   78 -
 .../Twisted-10.0.0/twisted/test/test_internet.py   | 1396 -----
 vendor/Twisted-10.0.0/twisted/test/test_iutils.py  |  296 -
 vendor/Twisted-10.0.0/twisted/test/test_jelly.py   |  618 ---
 vendor/Twisted-10.0.0/twisted/test/test_journal.py |  169 -
 .../Twisted-10.0.0/twisted/test/test_lockfile.py   |  445 --
 vendor/Twisted-10.0.0/twisted/test/test_log.py     |  559 --
 vendor/Twisted-10.0.0/twisted/test/test_logfile.py |  314 --
 .../Twisted-10.0.0/twisted/test/test_loopback.py   |  433 --
 vendor/Twisted-10.0.0/twisted/test/test_manhole.py |   75 -
 .../Twisted-10.0.0/twisted/test/test_memcache.py   |  663 ---
 vendor/Twisted-10.0.0/twisted/test/test_modules.py |  391 --
 vendor/Twisted-10.0.0/twisted/test/test_monkey.py  |  161 -
 vendor/Twisted-10.0.0/twisted/test/test_newcred.py |  487 --
 vendor/Twisted-10.0.0/twisted/test/test_nmea.py    |  115 -
 vendor/Twisted-10.0.0/twisted/test/test_paths.py   |  896 ---
 vendor/Twisted-10.0.0/twisted/test/test_pb.py      | 1775 ------
 .../Twisted-10.0.0/twisted/test/test_pbfailure.py  |  424 --
 vendor/Twisted-10.0.0/twisted/test/test_pcp.py     |  368 --
 .../Twisted-10.0.0/twisted/test/test_persisted.py  |  314 --
 vendor/Twisted-10.0.0/twisted/test/test_plugin.py  |  694 ---
 .../Twisted-10.0.0/twisted/test/test_policies.py   |  683 ---
 vendor/Twisted-10.0.0/twisted/test/test_postfix.py |  108 -
 vendor/Twisted-10.0.0/twisted/test/test_process.py | 2410 ---------
 .../Twisted-10.0.0/twisted/test/test_protocols.py  |  811 ---
 .../Twisted-10.0.0/twisted/test/test_randbytes.py  |  178 -
 vendor/Twisted-10.0.0/twisted/test/test_rebuild.py |  252 -
 vendor/Twisted-10.0.0/twisted/test/test_reflect.py |  756 ---
 .../Twisted-10.0.0/twisted/test/test_reflector.py  |  401 --
 vendor/Twisted-10.0.0/twisted/test/test_roots.py   |   63 -
 .../Twisted-10.0.0/twisted/test/test_shortcut.py   |   26 -
 vendor/Twisted-10.0.0/twisted/test/test_sip.py     |  942 ----
 vendor/Twisted-10.0.0/twisted/test/test_sob.py     |  172 -
 vendor/Twisted-10.0.0/twisted/test/test_socks.py   |  498 --
 vendor/Twisted-10.0.0/twisted/test/test_ssl.py     |  664 ---
 .../Twisted-10.0.0/twisted/test/test_sslverify.py  |  558 --
 .../Twisted-10.0.0/twisted/test/test_stateful.py   |   77 -
 vendor/Twisted-10.0.0/twisted/test/test_stdio.py   |  287 -
 vendor/Twisted-10.0.0/twisted/test/test_strcred.py |  622 ---
 .../Twisted-10.0.0/twisted/test/test_strerror.py   |  145 -
 .../twisted/test/test_stringtransport.py           |  160 -
 .../Twisted-10.0.0/twisted/test/test_strports.py   |   84 -
 vendor/Twisted-10.0.0/twisted/test/test_task.py    |  627 ---
 vendor/Twisted-10.0.0/twisted/test/test_tcp.py     | 1908 -------
 .../twisted/test/test_tcp_internals.py             |  240 -
 vendor/Twisted-10.0.0/twisted/test/test_text.py    |  156 -
 .../Twisted-10.0.0/twisted/test/test_threadable.py |  103 -
 .../Twisted-10.0.0/twisted/test/test_threadpool.py |  583 --
 vendor/Twisted-10.0.0/twisted/test/test_threads.py |  412 --
 .../twisted/test/test_timehelpers.py               |   31 -
 .../twisted/test/test_timeoutqueue.py              |   73 -
 vendor/Twisted-10.0.0/twisted/test/test_tpfile.py  |   52 -
 vendor/Twisted-10.0.0/twisted/test/test_twistd.py  | 1378 -----
 vendor/Twisted-10.0.0/twisted/test/test_udp.py     |  661 ---
 vendor/Twisted-10.0.0/twisted/test/test_unix.py    |  405 --
 vendor/Twisted-10.0.0/twisted/test/test_usage.py   |  372 --
 vendor/Twisted-10.0.0/twisted/test/test_zshcomp.py |  210 -
 vendor/Twisted-10.0.0/twisted/test/testutils.py    |   55 -
 vendor/Twisted-10.0.0/twisted/test/time_helpers.py |   72 -
 vendor/Twisted-10.0.0/twisted/topfiles/733.bugfix  |    4 -
 vendor/Twisted-10.0.0/twisted/topfiles/CREDITS     |   60 -
 .../Twisted-10.0.0/twisted/topfiles/ChangeLog.Old  | 3888 -------------
 vendor/Twisted-10.0.0/twisted/topfiles/NEWS        |  942 ----
 vendor/Twisted-10.0.0/twisted/topfiles/README      |   14 -
 vendor/Twisted-10.0.0/twisted/topfiles/setup.py    |   99 -
 vendor/Twisted-10.0.0/twisted/trial/__init__.py    |   52 -
 vendor/Twisted-10.0.0/twisted/trial/itrial.py      |  251 -
 vendor/Twisted-10.0.0/twisted/trial/reporter.py    | 1204 ----
 vendor/Twisted-10.0.0/twisted/trial/runner.py      |  905 ----
 .../Twisted-10.0.0/twisted/trial/test/__init__.py  |    1 -
 .../Twisted-10.0.0/twisted/trial/test/detests.py   |  195 -
 .../Twisted-10.0.0/twisted/trial/test/erroneous.py |  130 -
 .../twisted/trial/test/mockcustomsuite.py          |   21 -
 .../twisted/trial/test/mockcustomsuite2.py         |   21 -
 .../twisted/trial/test/mockcustomsuite3.py         |   28 -
 .../twisted/trial/test/mockdoctest.py              |  104 -
 .../twisted/trial/test/moduleself.py               |    7 -
 .../twisted/trial/test/moduletest.py               |   11 -
 vendor/Twisted-10.0.0/twisted/trial/test/notpython |    2 -
 vendor/Twisted-10.0.0/twisted/trial/test/novars.py |    6 -
 .../Twisted-10.0.0/twisted/trial/test/packages.py  |  134 -
 vendor/Twisted-10.0.0/twisted/trial/test/sample.py |   40 -
 .../twisted/trial/test/scripttest.py               |   14 -
 .../twisted/trial/test/suppression.py              |   57 -
 .../twisted/trial/test/test_assertions.py          |  742 ---
 .../twisted/trial/test/test_deferred.py            |  220 -
 .../twisted/trial/test/test_doctest.py             |   81 -
 .../twisted/trial/test/test_keyboard.py            |  113 -
 .../twisted/trial/test/test_loader.py              |  541 --
 .../Twisted-10.0.0/twisted/trial/test/test_log.py  |  197 -
 .../twisted/trial/test/test_output.py              |  162 -
 .../twisted/trial/test/test_plugins.py             |   46 -
 .../twisted/trial/test/test_pyunitcompat.py        |  222 -
 .../twisted/trial/test/test_reporter.py            | 1561 ------
 .../twisted/trial/test/test_runner.py              |  914 ----
 .../twisted/trial/test/test_script.py              |  390 --
 .../twisted/trial/test/test_test_visitor.py        |   82 -
 .../twisted/trial/test/test_testcase.py            |   51 -
 .../twisted/trial/test/test_tests.py               | 1056 ----
 .../Twisted-10.0.0/twisted/trial/test/test_util.py |  533 --
 .../twisted/trial/test/test_warning.py             |  436 --
 vendor/Twisted-10.0.0/twisted/trial/test/weird.py  |   20 -
 vendor/Twisted-10.0.0/twisted/trial/unittest.py    | 1597 ------
 vendor/Twisted-10.0.0/twisted/trial/util.py        |  378 --
 vendor/Twisted-10.0.0/twisted/web/__init__.py      |   13 -
 .../Twisted-10.0.0/twisted/web/_auth/__init__.py   |    7 -
 vendor/Twisted-10.0.0/twisted/web/_auth/basic.py   |   59 -
 vendor/Twisted-10.0.0/twisted/web/_auth/digest.py  |   54 -
 vendor/Twisted-10.0.0/twisted/web/_auth/wrapper.py |  222 -
 vendor/Twisted-10.0.0/twisted/web/_newclient.py    | 1413 -----
 vendor/Twisted-10.0.0/twisted/web/_version.py      |    3 -
 vendor/Twisted-10.0.0/twisted/web/client.py        |  644 ---
 vendor/Twisted-10.0.0/twisted/web/demo.py          |   29 -
 vendor/Twisted-10.0.0/twisted/web/distrib.py       |  374 --
 vendor/Twisted-10.0.0/twisted/web/domhelpers.py    |  268 -
 vendor/Twisted-10.0.0/twisted/web/error.py         |  230 -
 vendor/Twisted-10.0.0/twisted/web/google.py        |   75 -
 vendor/Twisted-10.0.0/twisted/web/guard.py         |   17 -
 vendor/Twisted-10.0.0/twisted/web/html.py          |   49 -
 vendor/Twisted-10.0.0/twisted/web/http.py          | 1797 ------
 vendor/Twisted-10.0.0/twisted/web/http_headers.py  |  260 -
 vendor/Twisted-10.0.0/twisted/web/iweb.py          |  421 --
 vendor/Twisted-10.0.0/twisted/web/microdom.py      | 1028 ----
 vendor/Twisted-10.0.0/twisted/web/proxy.py         |  302 --
 vendor/Twisted-10.0.0/twisted/web/resource.py      |  300 -
 vendor/Twisted-10.0.0/twisted/web/rewrite.py       |   52 -
 vendor/Twisted-10.0.0/twisted/web/script.py        |  169 -
 vendor/Twisted-10.0.0/twisted/web/server.py        |  527 --
 vendor/Twisted-10.0.0/twisted/web/soap.py          |  154 -
 vendor/Twisted-10.0.0/twisted/web/static.py        | 1104 ----
 vendor/Twisted-10.0.0/twisted/web/sux.py           |  657 ---
 vendor/Twisted-10.0.0/twisted/web/tap.py           |  234 -
 vendor/Twisted-10.0.0/twisted/web/test/__init__.py |    7 -
 vendor/Twisted-10.0.0/twisted/web/test/_util.py    |   24 -
 vendor/Twisted-10.0.0/twisted/web/test/test_cgi.py |  190 -
 .../twisted/web/test/test_distrib.py               |  361 --
 .../twisted/web/test/test_domhelpers.py            |  306 --
 .../Twisted-10.0.0/twisted/web/test/test_error.py  |  151 -
 .../Twisted-10.0.0/twisted/web/test/test_http.py   | 1531 ------
 .../twisted/web/test/test_http_headers.py          |  585 --
 .../twisted/web/test/test_httpauth.py              |  586 --
 .../twisted/web/test/test_newclient.py             | 2082 -------
 .../Twisted-10.0.0/twisted/web/test/test_proxy.py  |  541 --
 .../twisted/web/test/test_resource.py              |  144 -
 .../Twisted-10.0.0/twisted/web/test/test_script.py |   70 -
 .../Twisted-10.0.0/twisted/web/test/test_soap.py   |  114 -
 .../Twisted-10.0.0/twisted/web/test/test_static.py | 1507 ------
 vendor/Twisted-10.0.0/twisted/web/test/test_tap.py |  251 -
 .../Twisted-10.0.0/twisted/web/test/test_vhost.py  |  105 -
 vendor/Twisted-10.0.0/twisted/web/test/test_web.py |  863 ---
 .../twisted/web/test/test_webclient.py             | 1060 ----
 .../Twisted-10.0.0/twisted/web/test/test_wsgi.py   | 1572 ------
 vendor/Twisted-10.0.0/twisted/web/test/test_xml.py | 1105 ----
 .../Twisted-10.0.0/twisted/web/test/test_xmlrpc.py |  510 --
 vendor/Twisted-10.0.0/twisted/web/topfiles/NEWS    |  309 --
 vendor/Twisted-10.0.0/twisted/web/topfiles/README  |    1 -
 .../Twisted-10.0.0/twisted/web/topfiles/setup.py   |   30 -
 vendor/Twisted-10.0.0/twisted/web/trp.py           |   23 -
 vendor/Twisted-10.0.0/twisted/web/twcgi.py         |  253 -
 vendor/Twisted-10.0.0/twisted/web/util.py          |  380 --
 vendor/Twisted-10.0.0/twisted/web/vhost.py         |  135 -
 vendor/Twisted-10.0.0/twisted/web/wsgi.py          |  401 --
 vendor/Twisted-10.0.0/twisted/web/xmlrpc.py        |  427 --
 vendor/Twisted-10.0.0/twisted/words/__init__.py    |   10 -
 vendor/Twisted-10.0.0/twisted/words/_version.py    |    3 -
 vendor/Twisted-10.0.0/twisted/words/ewords.py      |   34 -
 vendor/Twisted-10.0.0/twisted/words/im/__init__.py |    8 -
 .../Twisted-10.0.0/twisted/words/im/baseaccount.py |   62 -
 vendor/Twisted-10.0.0/twisted/words/im/basechat.py |  316 --
 .../Twisted-10.0.0/twisted/words/im/basesupport.py |  270 -
 .../twisted/words/im/instancemessenger.glade       | 3165 -----------
 .../Twisted-10.0.0/twisted/words/im/interfaces.py  |  364 --
 .../Twisted-10.0.0/twisted/words/im/ircsupport.py  |  261 -
 vendor/Twisted-10.0.0/twisted/words/im/locals.py   |   26 -
 .../Twisted-10.0.0/twisted/words/im/pbsupport.py   |  260 -
 vendor/Twisted-10.0.0/twisted/words/im/proxyui.py  |   24 -
 vendor/Twisted-10.0.0/twisted/words/im/tap.py      |   15 -
 .../Twisted-10.0.0/twisted/words/im/tocsupport.py  |  220 -
 vendor/Twisted-10.0.0/twisted/words/iwords.py      |  266 -
 .../twisted/words/protocols/__init__.py            |    1 -
 .../Twisted-10.0.0/twisted/words/protocols/irc.py  | 3166 -----------
 .../twisted/words/protocols/jabber/__init__.py     |    8 -
 .../twisted/words/protocols/jabber/client.py       |  369 --
 .../twisted/words/protocols/jabber/component.py    |  474 --
 .../twisted/words/protocols/jabber/error.py        |  336 --
 .../twisted/words/protocols/jabber/ijabber.py      |  199 -
 .../twisted/words/protocols/jabber/jid.py          |  249 -
 .../twisted/words/protocols/jabber/jstrports.py    |   31 -
 .../twisted/words/protocols/jabber/sasl.py         |  243 -
 .../words/protocols/jabber/sasl_mechanisms.py      |  240 -
 .../twisted/words/protocols/jabber/xmlstream.py    | 1136 ----
 .../words/protocols/jabber/xmpp_stringprep.py      |  248 -
 .../Twisted-10.0.0/twisted/words/protocols/msn.py  | 2449 ---------
 .../twisted/words/protocols/oscar.py               | 1235 -----
 .../Twisted-10.0.0/twisted/words/protocols/toc.py  | 1622 ------
 vendor/Twisted-10.0.0/twisted/words/service.py     | 1223 -----
 vendor/Twisted-10.0.0/twisted/words/tap.py         |   72 -
 .../Twisted-10.0.0/twisted/words/test/__init__.py  |    1 -
 .../twisted/words/test/test_basesupport.py         |   97 -
 .../twisted/words/test/test_domish.py              |  421 --
 .../Twisted-10.0.0/twisted/words/test/test_irc.py  | 1566 ------
 .../twisted/words/test/test_irc_service.py         |  110 -
 .../twisted/words/test/test_jabberclient.py        |  414 --
 .../twisted/words/test/test_jabbercomponent.py     |  422 --
 .../twisted/words/test/test_jabbererror.py         |  308 --
 .../twisted/words/test/test_jabberjid.py           |  225 -
 .../twisted/words/test/test_jabbersasl.py          |  272 -
 .../words/test/test_jabbersaslmechanisms.py        |   90 -
 .../twisted/words/test/test_jabberxmlstream.py     | 1287 -----
 .../words/test/test_jabberxmppstringprep.py        |   84 -
 .../Twisted-10.0.0/twisted/words/test/test_msn.py  |  503 --
 .../twisted/words/test/test_oscar.py               |   24 -
 .../twisted/words/test/test_service.py             |  992 ----
 .../Twisted-10.0.0/twisted/words/test/test_tap.py  |   78 -
 .../Twisted-10.0.0/twisted/words/test/test_toc.py  |  340 --
 .../twisted/words/test/test_xishutil.py            |  345 --
 .../twisted/words/test/test_xmlstream.py           |  201 -
 .../twisted/words/test/test_xmpproutertap.py       |   86 -
 .../twisted/words/test/test_xpath.py               |  260 -
 vendor/Twisted-10.0.0/twisted/words/toctap.py      |   20 -
 vendor/Twisted-10.0.0/twisted/words/topfiles/NEWS  |  230 -
 .../Twisted-10.0.0/twisted/words/topfiles/README   |    4 -
 .../Twisted-10.0.0/twisted/words/topfiles/setup.py |   53 -
 .../Twisted-10.0.0/twisted/words/xish/__init__.py  |   10 -
 vendor/Twisted-10.0.0/twisted/words/xish/domish.py |  848 ---
 .../Twisted-10.0.0/twisted/words/xish/utility.py   |  372 --
 .../Twisted-10.0.0/twisted/words/xish/xmlstream.py |  261 -
 vendor/Twisted-10.0.0/twisted/words/xish/xpath.py  |  333 --
 .../twisted/words/xish/xpathparser.g               |  375 --
 .../twisted/words/xish/xpathparser.py              |  508 --
 .../Twisted-10.0.0/twisted/words/xmpproutertap.py  |   30 -
 vendor/amqplib/__init__.py                         |    1 -
 vendor/amqplib/client_0_8/__init__.py              |   35 -
 vendor/amqplib/client_0_8/abstract_channel.py      |  114 -
 vendor/amqplib/client_0_8/basic_message.py         |  137 -
 vendor/amqplib/client_0_8/channel.py               | 2602 ---------
 vendor/amqplib/client_0_8/connection.py            |  826 ---
 vendor/amqplib/client_0_8/exceptions.py            |  105 -
 vendor/amqplib/client_0_8/method_framing.py        |  244 -
 vendor/amqplib/client_0_8/serialization.py         |  530 --
 vendor/amqplib/client_0_8/transport.py             |  220 -
 vendor/anyjson/__init__.py                         |  124 -
 vendor/boto/README                                 |   53 -
 vendor/boto/bin/bundle_image                       |   27 -
 vendor/boto/bin/cfadmin                            |   70 -
 vendor/boto/bin/elbadmin                           |  179 -
 vendor/boto/bin/fetch_file                         |   37 -
 vendor/boto/bin/kill_instance                      |   12 -
 vendor/boto/bin/launch_instance                    |  138 -
 vendor/boto/bin/list_instances                     |   10 -
 vendor/boto/bin/pyami_sendmail                     |   47 -
 vendor/boto/bin/s3put                              |  196 -
 vendor/boto/bin/sdbadmin                           |  168 -
 vendor/boto/bin/taskadmin                          |  116 -
 vendor/boto/boto/__init__.py                       |  292 -
 vendor/boto/boto/cloudfront/__init__.py            |  223 -
 vendor/boto/boto/cloudfront/distribution.py        |  470 --
 vendor/boto/boto/cloudfront/exception.py           |   26 -
 vendor/boto/boto/cloudfront/identity.py            |  122 -
 vendor/boto/boto/cloudfront/logging.py             |   38 -
 vendor/boto/boto/cloudfront/object.py              |   48 -
 vendor/boto/boto/cloudfront/signers.py             |   60 -
 vendor/boto/boto/connection.py                     |  644 ---
 vendor/boto/boto/contrib/__init__.py               |   22 -
 vendor/boto/boto/contrib/m2helpers.py              |   52 -
 vendor/boto/boto/contrib/ymlmessage.py             |   52 -
 vendor/boto/boto/ec2/__init__.py                   |   52 -
 vendor/boto/boto/ec2/address.py                    |   58 -
 vendor/boto/boto/ec2/autoscale/__init__.py         |  203 -
 vendor/boto/boto/ec2/autoscale/activity.py         |   55 -
 vendor/boto/boto/ec2/autoscale/group.py            |  189 -
 vendor/boto/boto/ec2/autoscale/instance.py         |   53 -
 vendor/boto/boto/ec2/autoscale/launchconfig.py     |   98 -
 vendor/boto/boto/ec2/autoscale/request.py          |   38 -
 vendor/boto/boto/ec2/autoscale/trigger.py          |  137 -
 vendor/boto/boto/ec2/blockdevicemapping.py         |   98 -
 vendor/boto/boto/ec2/bundleinstance.py             |   78 -
 vendor/boto/boto/ec2/buyreservation.py             |   81 -
 vendor/boto/boto/ec2/cloudwatch/__init__.py        |  213 -
 vendor/boto/boto/ec2/cloudwatch/datapoint.py       |   37 -
 vendor/boto/boto/ec2/cloudwatch/metric.py          |   71 -
 vendor/boto/boto/ec2/connection.py                 | 1605 ------
 vendor/boto/boto/ec2/ec2object.py                  |   41 -
 vendor/boto/boto/ec2/elb/__init__.py               |  238 -
 vendor/boto/boto/ec2/elb/healthcheck.py            |   68 -
 vendor/boto/boto/ec2/elb/instancestate.py          |   54 -
 vendor/boto/boto/ec2/elb/listelement.py            |   31 -
 vendor/boto/boto/ec2/elb/listener.py               |   64 -
 vendor/boto/boto/ec2/elb/loadbalancer.py           |  142 -
 vendor/boto/boto/ec2/image.py                      |  250 -
 vendor/boto/boto/ec2/instance.py                   |  294 -
 vendor/boto/boto/ec2/instanceinfo.py               |   47 -
 vendor/boto/boto/ec2/keypair.py                    |  111 -
 vendor/boto/boto/ec2/launchspecification.py        |   96 -
 vendor/boto/boto/ec2/regioninfo.py                 |   60 -
 vendor/boto/boto/ec2/reservedinstance.py           |   97 -
 vendor/boto/boto/ec2/securitygroup.py              |  282 -
 vendor/boto/boto/ec2/snapshot.py                   |  127 -
 vendor/boto/boto/ec2/spotdatafeedsubscription.py   |   63 -
 vendor/boto/boto/ec2/spotinstancerequest.py        |  109 -
 vendor/boto/boto/ec2/spotpricehistory.py           |   52 -
 vendor/boto/boto/ec2/volume.py                     |  208 -
 vendor/boto/boto/ec2/zone.py                       |   47 -
 vendor/boto/boto/emr/__init__.py                   |   29 -
 vendor/boto/boto/emr/connection.py                 |  236 -
 vendor/boto/boto/emr/emrobject.py                  |   34 -
 vendor/boto/boto/emr/jobflow.py                    |   89 -
 vendor/boto/boto/emr/step.py                       |  168 -
 vendor/boto/boto/exception.py                      |  293 -
 vendor/boto/boto/fps/__init__.py                   |   23 -
 vendor/boto/boto/fps/connection.py                 |  172 -
 vendor/boto/boto/handler.py                        |   46 -
 vendor/boto/boto/manage/__init__.py                |   23 -
 vendor/boto/boto/manage/cmdshell.py                |  169 -
 vendor/boto/boto/manage/propget.py                 |   64 -
 vendor/boto/boto/manage/server.py                  |  548 --
 vendor/boto/boto/manage/task.py                    |  175 -
 vendor/boto/boto/manage/test_manage.py             |   34 -
 vendor/boto/boto/manage/volume.py                  |  420 --
 vendor/boto/boto/mapreduce/__init__.py             |   23 -
 vendor/boto/boto/mapreduce/lqs.py                  |  152 -
 vendor/boto/boto/mapreduce/partitiondb.py          |  175 -
 vendor/boto/boto/mapreduce/pdb_delete              |  135 -
 vendor/boto/boto/mapreduce/pdb_describe            |  124 -
 vendor/boto/boto/mapreduce/pdb_revert              |  135 -
 vendor/boto/boto/mapreduce/pdb_upload              |  172 -
 vendor/boto/boto/mapreduce/queuetools.py           |   66 -
 vendor/boto/boto/mashups/__init__.py               |   23 -
 vendor/boto/boto/mashups/interactive.py            |   97 -
 vendor/boto/boto/mashups/iobject.py                |  115 -
 vendor/boto/boto/mashups/order.py                  |  211 -
 vendor/boto/boto/mashups/server.py                 |  395 --
 vendor/boto/boto/mturk/__init__.py                 |   23 -
 vendor/boto/boto/mturk/connection.py               |  515 --
 vendor/boto/boto/mturk/notification.py             |   95 -
 vendor/boto/boto/mturk/price.py                    |   48 -
 vendor/boto/boto/mturk/qualification.py            |  118 -
 vendor/boto/boto/mturk/question.py                 |  336 --
 vendor/boto/boto/mturk/test/all_tests.py           |    8 -
 vendor/boto/boto/mturk/test/cleanup_tests.py       |   67 -
 .../test/create_free_text_question_regex.doctest   |   92 -
 vendor/boto/boto/mturk/test/create_hit.doctest     |   86 -
 .../boto/boto/mturk/test/create_hit_binary.doctest |   87 -
 vendor/boto/boto/mturk/test/create_hit_external.py |   14 -
 .../mturk/test/create_hit_from_hit_type.doctest    |   97 -
 .../mturk/test/create_hit_with_qualifications.py   |   18 -
 .../boto/boto/mturk/test/reviewable_hits.doctest   |   71 -
 vendor/boto/boto/mturk/test/search_hits.doctest    |   16 -
 vendor/boto/boto/pyami/__init__.py                 |   22 -
 vendor/boto/boto/pyami/bootstrap.py                |  121 -
 vendor/boto/boto/pyami/config.py                   |  203 -
 vendor/boto/boto/pyami/copybot.cfg                 |   60 -
 vendor/boto/boto/pyami/copybot.py                  |   97 -
 vendor/boto/boto/pyami/helloworld.py               |   28 -
 vendor/boto/boto/pyami/installers/__init__.py      |   64 -
 .../boto/boto/pyami/installers/ubuntu/__init__.py  |   22 -
 vendor/boto/boto/pyami/installers/ubuntu/apache.py |   43 -
 vendor/boto/boto/pyami/installers/ubuntu/ebs.py    |  206 -
 .../boto/boto/pyami/installers/ubuntu/installer.py |   96 -
 vendor/boto/boto/pyami/installers/ubuntu/mysql.py  |  109 -
 vendor/boto/boto/pyami/installers/ubuntu/trac.py   |  139 -
 vendor/boto/boto/pyami/launch_ami.py               |  178 -
 vendor/boto/boto/pyami/scriptbase.py               |   44 -
 vendor/boto/boto/pyami/startup.py                  |   59 -
 vendor/boto/boto/rds/__init__.py                   |  810 ---
 vendor/boto/boto/rds/dbinstance.py                 |  136 -
 vendor/boto/boto/rds/dbsecuritygroup.py            |  159 -
 vendor/boto/boto/rds/dbsnapshot.py                 |   74 -
 vendor/boto/boto/rds/event.py                      |   49 -
 vendor/boto/boto/rds/parametergroup.py             |  201 -
 vendor/boto/boto/resultset.py                      |  136 -
 vendor/boto/boto/s3/__init__.py                    |   31 -
 vendor/boto/boto/s3/acl.py                         |  162 -
 vendor/boto/boto/s3/bucket.py                      |  721 ---
 vendor/boto/boto/s3/bucketlistresultset.py         |   99 -
 vendor/boto/boto/s3/connection.py                  |  350 --
 vendor/boto/boto/s3/deletemarker.py                |   56 -
 vendor/boto/boto/s3/key.py                         |  804 ---
 vendor/boto/boto/s3/prefix.py                      |   35 -
 vendor/boto/boto/s3/user.py                        |   49 -
 vendor/boto/boto/sdb/__init__.py                   |   41 -
 vendor/boto/boto/sdb/connection.py                 |  441 --
 vendor/boto/boto/sdb/db/__init__.py                |   21 -
 vendor/boto/boto/sdb/db/blob.py                    |   64 -
 vendor/boto/boto/sdb/db/key.py                     |   59 -
 vendor/boto/boto/sdb/db/manager/__init__.py        |   88 -
 vendor/boto/boto/sdb/db/manager/pgmanager.py       |  389 --
 vendor/boto/boto/sdb/db/manager/sdbmanager.py      |  599 --
 vendor/boto/boto/sdb/db/manager/xmlmanager.py      |  517 --
 vendor/boto/boto/sdb/db/model.py                   |  234 -
 vendor/boto/boto/sdb/db/property.py                |  556 --
 vendor/boto/boto/sdb/db/query.py                   |   79 -
 vendor/boto/boto/sdb/db/sequence.py                |  224 -
 vendor/boto/boto/sdb/db/test_db.py                 |  225 -
 vendor/boto/boto/sdb/domain.py                     |  337 --
 vendor/boto/boto/sdb/item.py                       |  105 -
 vendor/boto/boto/sdb/persist/__init__.py           |   83 -
 vendor/boto/boto/sdb/persist/checker.py            |  302 --
 vendor/boto/boto/sdb/persist/object.py             |  207 -
 vendor/boto/boto/sdb/persist/property.py           |  371 --
 vendor/boto/boto/sdb/persist/test_persist.py       |  141 -
 vendor/boto/boto/sdb/queryresultset.py             |   92 -
 vendor/boto/boto/sdb/regioninfo.py                 |   40 -
 vendor/boto/boto/services/__init__.py              |   23 -
 vendor/boto/boto/services/bs.py                    |  179 -
 vendor/boto/boto/services/message.py               |   58 -
 vendor/boto/boto/services/result.py                |  137 -
 vendor/boto/boto/services/service.py               |  161 -
 vendor/boto/boto/services/servicedef.py            |   91 -
 vendor/boto/boto/services/sonofmmm.cfg             |   43 -
 vendor/boto/boto/services/sonofmmm.py              |   81 -
 vendor/boto/boto/services/submit.py                |   88 -
 vendor/boto/boto/sns/__init__.py                   |  353 --
 vendor/boto/boto/sqs/__init__.py                   |   42 -
 vendor/boto/boto/sqs/attributes.py                 |   46 -
 vendor/boto/boto/sqs/connection.py                 |  286 -
 vendor/boto/boto/sqs/jsonmessage.py                |   42 -
 vendor/boto/boto/sqs/message.py                    |  251 -
 vendor/boto/boto/sqs/queue.py                      |  414 --
 vendor/boto/boto/sqs/regioninfo.py                 |   40 -
 vendor/boto/boto/tests/__init__.py                 |   23 -
 vendor/boto/boto/tests/devpay_s3.py                |  177 -
 vendor/boto/boto/tests/test.py                     |   85 -
 vendor/boto/boto/tests/test_ec2connection.py       |  154 -
 vendor/boto/boto/tests/test_s3connection.py        |  175 -
 vendor/boto/boto/tests/test_s3versioning.py        |  143 -
 vendor/boto/boto/tests/test_sdbconnection.py       |  104 -
 vendor/boto/boto/tests/test_sqsconnection.py       |  142 -
 vendor/boto/boto/utils.py                          |  561 --
 vendor/boto/boto/vpc/__init__.py                   |  473 --
 vendor/boto/boto/vpc/customergateway.py            |   54 -
 vendor/boto/boto/vpc/dhcpoptions.py                |   69 -
 vendor/boto/boto/vpc/subnet.py                     |   54 -
 vendor/boto/boto/vpc/vpc.py                        |   54 -
 vendor/boto/boto/vpc/vpnconnection.py              |   60 -
 vendor/boto/boto/vpc/vpngateway.py                 |   80 -
 vendor/boto/cq.py                                  |   82 -
 vendor/boto/docs/Makefile                          |   89 -
 vendor/boto/docs/make.bat                          |  113 -
 vendor/boto/docs/source/_templates/layout.html     |    3 -
 vendor/boto/docs/source/autoscale_tut.rst          |  140 -
 .../boto/docs/source/boto_theme/static/boto.css_t  |  239 -
 .../docs/source/boto_theme/static/pygments.css     |   61 -
 vendor/boto/docs/source/boto_theme/theme.conf      |    3 -
 vendor/boto/docs/source/conf.py                    |   30 -
 vendor/boto/docs/source/documentation.rst          |   59 -
 vendor/boto/docs/source/ec2_tut.rst                |  420 --
 vendor/boto/docs/source/elb_tut.rst                |  202 -
 vendor/boto/docs/source/index.rst                  |   52 -
 vendor/boto/docs/source/ref/boto.rst               |   47 -
 vendor/boto/docs/source/ref/cloudfront.rst         |  108 -
 vendor/boto/docs/source/ref/contrib.rst            |   32 -
 vendor/boto/docs/source/ref/ec2.rst                |  223 -
 vendor/boto/docs/source/ref/fps.rst                |   19 -
 vendor/boto/docs/source/ref/index.rst              |   25 -
 vendor/boto/docs/source/ref/manage.rst             |   47 -
 vendor/boto/docs/source/ref/mapreduce.rst          |   38 -
 vendor/boto/docs/source/ref/mashups.rst            |   40 -
 vendor/boto/docs/source/ref/mturk.rst              |   47 -
 vendor/boto/docs/source/ref/pyami.rst              |  103 -
 vendor/boto/docs/source/ref/rds.rst                |   47 -
 vendor/boto/docs/source/ref/s3.rst                 |   54 -
 vendor/boto/docs/source/ref/sdb.rst                |  144 -
 vendor/boto/docs/source/ref/services.rst           |   61 -
 vendor/boto/docs/source/ref/sqs.rst                |   54 -
 vendor/boto/docs/source/ref/vpc.rst                |   54 -
 vendor/boto/docs/source/s3_tut.rst                 |  213 -
 vendor/boto/docs/source/sqs_tut.rst                |  230 -
 vendor/boto/docs/source/vpc_tut.rst                |   88 -
 vendor/boto/pylintrc                               |  305 --
 vendor/boto/setup.py                               |   56 -
 vendor/carrot/__init__.py                          |    7 -
 vendor/carrot/backends/__init__.py                 |   54 -
 vendor/carrot/backends/base.py                     |  185 -
 vendor/carrot/backends/pikachu.py                  |  209 -
 vendor/carrot/backends/pyamqplib.py                |  328 --
 vendor/carrot/backends/pystomp.py                  |  192 -
 vendor/carrot/backends/queue.py                    |   76 -
 vendor/carrot/connection.py                        |  229 -
 vendor/carrot/messaging.py                         |  981 ----
 vendor/carrot/serialization.py                     |  253 -
 vendor/carrot/utils.py                             |   56 -
 vendor/lockfile/2.4.diff                           |   99 -
 vendor/lockfile/ACKS                               |    6 -
 vendor/lockfile/LICENSE                            |   21 -
 vendor/lockfile/MANIFEST                           |   19 -
 vendor/lockfile/PKG-INFO                           |   47 -
 vendor/lockfile/README                             |   23 -
 vendor/lockfile/RELEASE-NOTES                      |   42 -
 vendor/lockfile/doc/Makefile                       |   73 -
 vendor/lockfile/doc/conf.py                        |  179 -
 vendor/lockfile/doc/glossary.rst                   |   15 -
 vendor/lockfile/doc/index.rst                      |   22 -
 vendor/lockfile/doc/lockfile.rst                   |  257 -
 vendor/lockfile/lockfile/__init__.py               |  286 -
 vendor/lockfile/lockfile/linklockfile.py           |   71 -
 vendor/lockfile/lockfile/mkdirlockfile.py          |   79 -
 vendor/lockfile/lockfile/pidlockfile.py            |  181 -
 vendor/lockfile/lockfile/sqlitelockfile.py         |  142 -
 vendor/lockfile/setup.py                           |   32 -
 vendor/lockfile/test/compliancetest.py             |  228 -
 vendor/lockfile/test/test_lockfile.py              |   30 -
 vendor/pymox/COPYING                               |  202 -
 vendor/pymox/MANIFEST.in                           |    5 -
 vendor/pymox/README                                |   56 -
 vendor/pymox/mox.py                                | 1729 ------
 vendor/pymox/mox_test.py                           | 1853 -------
 vendor/pymox/mox_test_helper.py                    |   95 -
 vendor/pymox/setup.py                              |   14 -
 vendor/pymox/stubout.py                            |  142 -
 vendor/pymox/stubout_test.py                       |   47 -
 vendor/pymox/stubout_testee.py                     |    2 -
 vendor/python-daemon/ChangeLog                     |  187 -
 vendor/python-daemon/LICENSE.GPL-2                 |  339 --
 vendor/python-daemon/LICENSE.PSF-2                 |   48 -
 vendor/python-daemon/MANIFEST.in                   |    4 -
 vendor/python-daemon/PKG-INFO                      |   37 -
 vendor/python-daemon/README.nova                   |    4 -
 vendor/python-daemon/daemon/__init__.py            |   47 -
 vendor/python-daemon/daemon/daemon.py              |  776 ---
 vendor/python-daemon/daemon/pidlockfile.py         |  195 -
 vendor/python-daemon/daemon/runner.py              |  229 -
 vendor/python-daemon/daemon/version/__init__.py    |   36 -
 .../python-daemon/daemon/version/version_info.py   |   23 -
 .../python-daemon/python_daemon.egg-info/PKG-INFO  |   37 -
 .../python_daemon.egg-info/SOURCES.txt             |   22 -
 .../python_daemon.egg-info/dependency_links.txt    |    1 -
 .../python_daemon.egg-info/not-zip-safe            |    1 -
 .../python_daemon.egg-info/requires.txt            |    2 -
 .../python_daemon.egg-info/top_level.txt           |    1 -
 vendor/python-daemon/setup.cfg                     |    5 -
 vendor/python-daemon/setup.py                      |   64 -
 vendor/python-gflags/AUTHORS                       |    2 -
 vendor/python-gflags/COPYING                       |   28 -
 vendor/python-gflags/ChangeLog                     |    5 -
 vendor/python-gflags/README                        |   23 -
 vendor/python-gflags/debian/README                 |    7 -
 vendor/python-gflags/debian/changelog              |   11 -
 vendor/python-gflags/debian/compat                 |    1 -
 vendor/python-gflags/debian/control                |   26 -
 vendor/python-gflags/debian/copyright              |   41 -
 vendor/python-gflags/debian/docs                   |    2 -
 vendor/python-gflags/debian/rules                  |   62 -
 vendor/python-gflags/gflags.py                     | 2340 --------
 vendor/python-gflags/gflags2man.py                 |  536 --
 vendor/python-gflags/gflags_helpxml_test.py        |  563 --
 vendor/python-gflags/gflags_unittest.py            | 1679 ------
 vendor/python-gflags/setup.py                      |   44 -
 vendor/python-gflags/test_module_bar.py            |  135 -
 vendor/python-gflags/test_module_foo.py            |  120 -
 vendor/redis-py/.gitignore                         |    5 -
 vendor/redis-py/CHANGES                            |   58 -
 vendor/redis-py/INSTALL                            |    6 -
 vendor/redis-py/LICENSE                            |   22 -
 vendor/redis-py/MANIFEST.in                        |    4 -
 vendor/redis-py/README.md                          |   33 -
 vendor/redis-py/redis/__init__.py                  |   10 -
 vendor/redis-py/redis/client.py                    | 1259 -----
 vendor/redis-py/redis/exceptions.py                |   20 -
 vendor/redis-py/setup.py                           |   42 -
 vendor/redis-py/tests/__init__.py                  |   11 -
 vendor/redis-py/tests/connection_pool.py           |   53 -
 vendor/redis-py/tests/pipeline.py                  |   61 -
 vendor/redis-py/tests/server_commands.py           | 1092 ----
 vendor/tornado/MANIFEST.in                         |    2 -
 vendor/tornado/README                              |   27 -
 vendor/tornado/demos/appengine/README              |   48 -
 vendor/tornado/demos/appengine/app.yaml            |   11 -
 vendor/tornado/demos/appengine/blog.py             |  169 -
 vendor/tornado/demos/appengine/markdown.py         | 1877 -------
 vendor/tornado/demos/appengine/static/blog.css     |  153 -
 .../tornado/demos/appengine/templates/archive.html |   31 -
 vendor/tornado/demos/appengine/templates/base.html |   29 -
 .../tornado/demos/appengine/templates/compose.html |   42 -
 .../tornado/demos/appengine/templates/entry.html   |    5 -
 vendor/tornado/demos/appengine/templates/feed.xml  |   26 -
 vendor/tornado/demos/appengine/templates/home.html |    8 -
 .../demos/appengine/templates/modules/entry.html   |    8 -
 vendor/tornado/demos/auth/authdemo.py              |   79 -
 vendor/tornado/demos/blog/README                   |   57 -
 vendor/tornado/demos/blog/blog.py                  |  195 -
 vendor/tornado/demos/blog/markdown.py              | 1877 -------
 vendor/tornado/demos/blog/schema.sql               |   44 -
 vendor/tornado/demos/blog/static/blog.css          |  153 -
 vendor/tornado/demos/blog/templates/archive.html   |   31 -
 vendor/tornado/demos/blog/templates/base.html      |   27 -
 vendor/tornado/demos/blog/templates/compose.html   |   42 -
 vendor/tornado/demos/blog/templates/entry.html     |    5 -
 vendor/tornado/demos/blog/templates/feed.xml       |   26 -
 vendor/tornado/demos/blog/templates/home.html      |    8 -
 .../demos/blog/templates/modules/entry.html        |    8 -
 vendor/tornado/demos/chat/chatdemo.py              |  156 -
 vendor/tornado/demos/chat/static/chat.css          |   56 -
 vendor/tornado/demos/chat/static/chat.js           |  135 -
 vendor/tornado/demos/chat/templates/index.html     |   37 -
 vendor/tornado/demos/chat/templates/message.html   |    1 -
 vendor/tornado/demos/facebook/README               |    8 -
 vendor/tornado/demos/facebook/facebook.py          |  127 -
 vendor/tornado/demos/facebook/static/facebook.css  |   97 -
 .../demos/facebook/templates/modules/post.html     |   29 -
 .../tornado/demos/facebook/templates/stream.html   |   22 -
 vendor/tornado/demos/facebook/uimodules.py         |   22 -
 vendor/tornado/demos/helloworld/helloworld.py      |   43 -
 vendor/tornado/setup.py                            |   44 -
 vendor/tornado/tornado/__init__.py                 |   17 -
 vendor/tornado/tornado/auth.py                     |  883 ---
 vendor/tornado/tornado/autoreload.py               |   95 -
 vendor/tornado/tornado/database.py                 |  180 -
 vendor/tornado/tornado/epoll.c                     |  112 -
 vendor/tornado/tornado/escape.py                   |  112 -
 vendor/tornado/tornado/httpclient.py               |  465 --
 vendor/tornado/tornado/httpserver.py               |  450 --
 vendor/tornado/tornado/ioloop.py                   |  483 --
 vendor/tornado/tornado/iostream.py                 |  229 -
 vendor/tornado/tornado/locale.py                   |  457 --
 vendor/tornado/tornado/options.py                  |  386 --
 vendor/tornado/tornado/s3server.py                 |  255 -
 vendor/tornado/tornado/template.py                 |  576 --
 vendor/tornado/tornado/test/README                 |    4 -
 vendor/tornado/tornado/test/test_ioloop.py         |   38 -
 vendor/tornado/tornado/web.py                      | 1445 -----
 vendor/tornado/tornado/websocket.py                |  138 -
 vendor/tornado/tornado/win32_support.py            |  123 -
 vendor/tornado/tornado/wsgi.py                     |  311 --
 vendor/tornado/website/app.yaml                    |   15 -
 vendor/tornado/website/markdown/__init__.py        |  603 ---
 vendor/tornado/website/markdown/blockparser.py     |   95 -
 vendor/tornado/website/markdown/blockprocessors.py |  460 --
 vendor/tornado/website/markdown/commandline.py     |   96 -
 vendor/tornado/website/markdown/etree_loader.py    |   33 -
 vendor/tornado/website/markdown/extensions/toc.py  |  140 -
 vendor/tornado/website/markdown/html4.py           |  274 -
 vendor/tornado/website/markdown/inlinepatterns.py  |  371 --
 vendor/tornado/website/markdown/odict.py           |  162 -
 vendor/tornado/website/markdown/postprocessors.py  |   77 -
 vendor/tornado/website/markdown/preprocessors.py   |  214 -
 vendor/tornado/website/markdown/treeprocessors.py  |  329 --
 vendor/tornado/website/static/base.css             |  120 -
 vendor/tornado/website/static/facebook.png         |  Bin 7457 -> 0 bytes
 vendor/tornado/website/static/friendfeed.png       |  Bin 7906 -> 0 bytes
 vendor/tornado/website/static/robots.txt           |    2 -
 vendor/tornado/website/static/tornado-0.1.tar.gz   |  Bin 106878 -> 0 bytes
 vendor/tornado/website/static/tornado-0.2.tar.gz   |  Bin 200680 -> 0 bytes
 vendor/tornado/website/static/tornado.png          |  Bin 7101 -> 0 bytes
 vendor/tornado/website/static/twitter.png          |  Bin 7197 -> 0 bytes
 vendor/tornado/website/templates/base.html         |   27 -
 .../tornado/website/templates/documentation.html   |    9 -
 vendor/tornado/website/templates/documentation.txt |  866 ---
 vendor/tornado/website/templates/index.html        |   51 -
 vendor/tornado/website/website.py                  |   63 -
 1759 files changed, 1 insertion(+), 420366 deletions(-)

commit c88d1f033bd600e855c57d9a65d9d832b1b0ab85
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 01:28:51 2010 -0400

    update copyrights

 CA/geninter.sh                       |   27 ++++++++++++++-------------
 CA/genrootca.sh                      |   20 +++++++++++---------
 CA/openssl.cnf.tmpl                  |   26 ++++++++++++++------------
 bin/dhcpleasor.py                    |    2 --
 bin/nova-api                         |    2 --
 bin/nova-compute                     |    2 --
 bin/nova-import-canonical-imagestore |   16 ++++++++++++++++
 bin/nova-instancemonitor             |    2 --
 bin/nova-manage                      |    2 --
 bin/nova-objectstore                 |    2 --
 bin/nova-rsapi                       |    4 +++-
 bin/nova-volume                      |    2 --
 builddeb.sh                          |    4 +---
 docs/architecture.rst                |    2 --
 docs/auth.rst                        |    2 --
 docs/binaries.rst                    |    4 +---
 docs/compute.rst                     |    2 --
 docs/conf.py                         |    2 +-
 docs/endpoint.rst                    |    2 --
 docs/fakes.rst                       |    2 --
 docs/getting.started.rst             |   17 +++++++++++++++++
 docs/index.rst                       |    2 --
 docs/modules.rst                     |    2 --
 docs/network.rst                     |    4 +---
 docs/nova.rst                        |    2 --
 docs/objectstore.rst                 |    2 --
 docs/packages.rst                    |    2 --
 docs/storage.rst                     |    4 +---
 docs/volume.rst                      |    2 --
 exercise_rsapi.py                    |   18 ++++++++++++++++++
 nova/__init__.py                     |    4 +---
 nova/adminclient.py                  |    2 --
 nova/auth/__init__.py                |    4 +---
 nova/auth/fakeldap.py                |    2 --
 nova/auth/novarc.template            |   20 --------------------
 nova/auth/rbac.py                    |    2 --
 nova/auth/signer.py                  |    2 --
 nova/auth/slap.sh                    |    2 --
 nova/auth/users.py                   |    3 ---
 nova/cloudpipe/__init__.py           |    2 --
 nova/cloudpipe/api.py                |    2 --
 nova/cloudpipe/bootscript.sh         |    2 --
 nova/cloudpipe/client.ovpn.template  |    2 --
 nova/cloudpipe/pipelib.py            |    2 --
 nova/compute/__init__.py             |    4 +---
 nova/compute/disk.py                 |    2 --
 nova/compute/exception.py            |    2 --
 nova/compute/fakevirtinstance.xml    |   21 +--------------------
 nova/compute/libvirt.xml.template    |   19 -------------------
 nova/compute/linux_net.py            |    2 --
 nova/compute/model.py                |    2 --
 nova/compute/monitor.py              |    2 --
 nova/compute/network.py              |    2 --
 nova/compute/node.py                 |    2 --
 nova/crypto.py                       |    2 --
 nova/datastore.py                    |    2 --
 nova/endpoint/__init__.py            |    4 +---
 nova/endpoint/admin.py               |    2 --
 nova/endpoint/api.py                 |    2 --
 nova/endpoint/cloud.py               |    2 --
 nova/endpoint/images.py              |    2 --
 nova/endpoint/rackspace.py           |   21 ++++++++++++---------
 nova/endpoint/wsgi.py                |   17 +++++++++++++++++
 nova/exception.py                    |    2 --
 nova/fakerabbit.py                   |    2 --
 nova/fakevirt.py                     |    2 --
 nova/flags.py                        |    2 --
 nova/objectstore/__init__.py         |    4 +---
 nova/objectstore/bucket.py           |    2 --
 nova/objectstore/handler.py          |    2 --
 nova/objectstore/image.py            |    2 --
 nova/objectstore/stored.py           |    2 --
 nova/process.py                      |    2 --
 nova/rpc.py                          |    2 --
 nova/server.py                       |    2 --
 nova/test.py                         |    2 --
 nova/tests/__init__.py               |    4 +---
 nova/tests/access_unittest.py        |    2 --
 nova/tests/api_integration.py        |    2 --
 nova/tests/api_unittest.py           |    2 --
 nova/tests/cloud_unittest.py         |    2 --
 nova/tests/fake_flags.py             |    2 --
 nova/tests/future_unittest.py        |    2 --
 nova/tests/model_unittest.py         |   21 ++++++++++++---------
 nova/tests/network_unittest.py       |    2 --
 nova/tests/node_unittest.py          |    2 --
 nova/tests/objectstore_unittest.py   |    2 --
 nova/tests/process_unittest.py       |    2 --
 nova/tests/real_flags.py             |    2 --
 nova/tests/storage_unittest.py       |    2 --
 nova/tests/users_unittest.py         |    2 --
 nova/tests/validator_unittest.py     |    2 --
 nova/twistd.py                       |    2 --
 nova/utils.py                        |    2 --
 nova/validate.py                     |    2 --
 nova/vendor.py                       |    2 --
 nova/volume/__init__.py              |    4 +---
 nova/volume/storage.py               |    2 --
 run_tests.py                         |    2 --
 setup.py                             |    2 --
 smoketests/__init__.py               |    4 +---
 smoketests/flags.py                  |    2 --
 smoketests/novatestcase.py           |    2 --
 smoketests/smoketest.py              |    2 --
 tools/clean-vlans                    |    2 --
 105 files changed, 148 insertions(+), 308 deletions(-)

commit 46865fb45484794b14fe280be08529f023dcea3b
Merge: 15646df 31b5462
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 22:11:48 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 15646df51286999e251ada3e526ebe2b6e6a39cc
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 22:11:21 2010 -0700

    Volume_ID identifier needed a return in the property. Also looking for race conditions in the destructor.

 nova/tests/storage_unittest.py |    8 +++++++-
 nova/volume/storage.py         |    8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

commit 31b546231174237be027147cb9807034b52fcedc
Merge: c7f2835 4253dd0
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:48:44 2010 -0400

    Merge branch 'master' into rackspace_api

commit 4253dd01389358a945ceb30c37a93865366c1783
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:48:02 2010 -0400

    bin to import images from canonical image store

 bin/nova-import-canonical-imagestore |   82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

commit e6603bf8eee1641f91649ae573529bd882bb71e6
Merge: 2b09635 6bed8cd
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:31:28 2010 -0400

    Merge remote branch 'origin/uec'

commit 2b09635a385c05bdb1479fd93671d49e6d5f9b24
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:28:30 2010 -0400

    add logging import to datastore

 nova/datastore.py |    2 ++
 1 file changed, 2 insertions(+)

commit fbf23a4f5f7d10429f26b2f43d2d203a39712acd
Merge: 9ef046e 892ca58
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:21:17 2010 -0400

    fix merge errors

commit 892ca58c0642db19e57a89d7a2ae5466971249cf
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:12:12 2010 -0400

    change default vpn ports and remove complex vpn ip iteration

 nova/auth/users.py |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

commit b8306f37fc53e59b744f00637d0e74ebe8f6b0e6
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:51:52 2010 -0400

    fix reference to BasicModel and imports

 nova/auth/users.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 69bb10a9f3258be06e34dbb2b051ed2bdd31c1d7
Merge: 702391e 1624e2a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:46:23 2010 -0400

    Merge branch 'master' into vpnredis
    
    Conflicts:
    	nova/auth/users.py

commit 1624e2aa51d6a77fbcbbf75f756aa88d27d1c474
Merge: b0b2d60 ebb56bc
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:42:55 2010 -0400

    Merge branch 'master' into apply_api
    
    Conflicts:
    	nova/compute/network.py
    	nova/utils.py

commit b0b2d607b4f2db8ffbb5d091c4a3cd33ea6ed672
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:34:10 2010 -0400

    Cleanups related to BasicModel (whitespace, names, etc).

 nova/compute/model.py   |    3 +--
 nova/compute/network.py |    7 ++++++-
 nova/datastore.py       |   13 ++++---------
 nova/volume/storage.py  |    3 +--
 4 files changed, 12 insertions(+), 14 deletions(-)

commit ebb56bcf492dc1ae132757f59f4ad82e1bf53d6e
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 19:55:52 2010 -0700

    Updating buildbot address

 README |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c16d8b5a4b1f6874a83cd34872ed10957207e8d3
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 19:35:13 2010 -0700

    Fixed buildbot

 README |    7 -------
 1 file changed, 7 deletions(-)

commit 6bed8cde37af2614367f2ecb45bbc43d412ccd4c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Jul 14 21:26:10 2010 -0500

    work on importing images

 nova/endpoint/cloud.py             |   21 ++++++++----
 nova/objectstore/handler.py        |    4 +--
 nova/objectstore/image.py          |   64 +++++++++++++++++++++++++++++++++++-
 nova/tests/objectstore_unittest.py |    2 +-
 4 files changed, 81 insertions(+), 10 deletions(-)

commit 975f6f75111102d85c45a4e57f30255ececc9133
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 22:02:15 2010 -0400

    When destroying an Instance, disassociate with Node.

 nova/compute/model.py |    1 +
 1 file changed, 1 insertion(+)

commit 6bae57730e5567e4f6a69b3eecf1684f15246a0a
Merge: 3003222 a1f6127
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:55:45 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 30032221e6cee3c04efade0fd2aae17c58a6fa14
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:55:37 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit 0bb71df533d9d5b9338ea04f34e5ef0ff2234cc7
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:41:45 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit 02fa700c4595344287a66ccbcca7510f0f4071af
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:39:48 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit a0ff8345db0d71bc1d72ae68e2fa3773cdf2cfe8
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:18:19 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit 5ff20ec381ca6d051d5052efe99c142da602622f
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 20:14:25 2010 -0400

    Move BasicModel into datastore.

 nova/compute/model.py   |  213 ++---------------------------------------------
 nova/compute/network.py |   43 +++++-----
 nova/datastore.py       |  202 ++++++++++++++++++++++++++++++++++++++++++++
 nova/volume/storage.py  |    2 +-
 4 files changed, 230 insertions(+), 230 deletions(-)

commit 65f5341a425b9a818172b8c618427c0c78ff8c96
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:13:02 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit 2f808cd3bfd65b828ebf4d4e4e8aeb2f221433ce
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:07:37 2010 -0700

    Smiteme

 README |    1 +
 1 file changed, 1 insertion(+)

commit 70783d594c15f1aafd6b1a6ba28ae6bd25102285
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 20:04:49 2010 -0400

    Whitespace change.

 nova/adminclient.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1b2eaa8fd1dd8a68de956a1a15c67499f96da88d
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:57:41 2010 -0400

    unhardcode the binary name

 bin/nova-compute |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 849ddba7e459412709590ffb2269c254437960c5
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:51:57 2010 -0700

    Fooish

 README |    1 +
 1 file changed, 1 insertion(+)

commit ced951677c72307f173d37ef6d119d3202ace355
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:51:38 2010 -0400

    Finish singletonizing UserManager usage.

 bin/nova-api                     |    6 ++----
 nova/endpoint/admin.py           |   23 +++++++++++------------
 nova/endpoint/api.py             |    3 +--
 nova/tests/api_unittest.py       |    2 +-
 nova/tests/validator_unittest.py |    3 +--
 5 files changed, 16 insertions(+), 21 deletions(-)

commit a1f6127369e8cdf1dc1ad056a138060be79dcf9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 18:48:05 2010 -0500

    Debian package additions for simple network template

 debian/nova-common.install |    1 +
 debian/nova-compute.conf   |    1 +
 2 files changed, 2 insertions(+)

commit 780903507333cb33a0cce31fbc4a1b62549263bf
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:39:56 2010 -0700

    Foo

 README |    2 --
 1 file changed, 2 deletions(-)

commit 09f69254b5af4b9ee40f9848e47f1b2187599cb5
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:38:41 2010 -0400

    Whitespace fix.

 bin/nova-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 115fa2319d6ff7dd4494ecc81829fa04d13d5bcd
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:33:12 2010 -0400

    Remove debug statement.

 nova/compute/node.py |    5 -----
 1 file changed, 5 deletions(-)

commit c9a14a90fbcc66da08dc29b0f314c3b5eeef2e3a
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:32:11 2010 -0700

    Foo

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b01f71ae7ba387a5e7ff2c6ad4a4775f9ab6e22b
Merge: 6bba6d3 5e8337a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:32:07 2010 -0400

    Merge branch 'master' into apply_api
    
    Conflicts:
    	nova/compute/node.py
    	nova/volume/storage.py

commit 6bba6d3b7c63054acf7828cba7eb87b0f1d84d1c
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:28:57 2010 -0400

    fix a typo.

 nova/compute/network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b41bb8cefa3a03e820375871e8411039f23f6b45
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 14 22:04:27 2010 +0000

    Added build-deps to debian/control that are needed to run test suite.
    Fixed an error in a test case.

 debian/control |    2 +-
 nova/crypto.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 56e601cb758347262fb2dcc3e980fe50dfeeb9f2
Merge: 3326f48 faada06
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 16:27:18 2010 -0500

    Merge of DHCP changes including dnsmasq callbacks
    
    Conflicts:
    	nova/utils.py

commit 3326f48e9871dc9e19b516e7541a70e6aa329e74
Merge: ab366c9 e2530d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 18:16:24 2010 -0500

    Merge remote branch 'origin/master'

commit e2530d85d24fa01518e2f6bf94afe949ee847972
Merge: 69104d5 5a0d45e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Jul 14 18:03:42 2010 -0500

    Merge remote branch 'origin/master'

commit 69104d57f95b8d6609490af8ed981add3fc0a98b
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Jul 14 18:03:19 2010 -0500

    optimization to not load all instances when describe instances is called

 nova/endpoint/cloud.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 5a0d45ed4729bc14078c74af127d238032f43bfc
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:01:09 2010 -0700

    More buildbot testing

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5b532b3ed455d8642c0d0655316151855c4cc58b
Merge: 7a1e797 9d737a1
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:59:23 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 7a1e7977484c89364c3cc15e53fffb207031f868
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:59:15 2010 -0700

    More buildbot testing

 README |    1 +
 1 file changed, 1 insertion(+)

commit ab366c9b73ac469289306e63c50092404fcc4279
Merge: 45c192a 9d737a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 17:53:25 2010 -0500

    Merge branch 'master' into simplenet

commit 9d737a1f875d8e0bb387f9c251bc6d26041c49ad
Merge: 67f7815 88eee6d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 17:51:59 2010 -0500

    Merge remote branch 'origin/master'

commit 88eee6d5adbb62c635b4a3d65e8c4b0cae0de279
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:44:42 2010 -0700

    More buildbot testing

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a2bb34ceb02b111b10eaacea8ab326e0b1f461f8
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:42:32 2010 -0700

    More buildbot testing

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 615963a41c60a9d5bdd3653fd6e76203dd177c1c
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:41:02 2010 -0700

    More buildbot testing

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 58611ce6ba790ea1a7638108b4cee05cb77dd2c4
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:39:24 2010 -0700

    More buildbot testing

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f7bd0b724f16090d5d8e6fbaafabe62e910a25a6
Merge: 502e804 67c05d0
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:34:56 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 502e804d14059c8f9c306d02dd15b26574d0d4ec
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:34:46 2010 -0700

    Addin buildbot

 README |    3 +++
 1 file changed, 3 insertions(+)

commit 67f781530c73f4962117434da097b0d3ae71b351
Merge: 67c05d0 dfdb094
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 14:39:51 2010 -0500

    Fix merge changelog and merge errors in utils.py

commit cd1510785f94ee7b3b76570ead8b73ccac7f8dd0
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 12:43:57 2010 -0400

    Fixes from code review.

 nova/adminclient.py   |    7 +++----
 nova/compute/model.py |   14 +++++---------
 nova/compute/node.py  |    3 +--
 3 files changed, 9 insertions(+), 15 deletions(-)

commit 67c05d0e4605fb7eb6ede4d0dc461e9260ec5510
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 13 19:01:14 2010 -0700

    release 0.2.2-10

 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

commit c17dcd9db1afeef79263f5d8d1bd2a52de8f87a5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 13 20:52:13 2010 -0500

    fix for extra space in vblade-persist

 nova/volume/storage.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dfdb094956acce5f0d459203a9f95067f989d68d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 12 16:28:19 2010 -0500

    Avoid using s-expr, pkcs1-conv, and lsh-export-key.
    
    Instead we now use M2Crypto and struct.pack to construct it on our own.
    
    This removes a dependency on nettle-bin and lsh-utils (which were never
    specified in debian/control).

 nova/crypto.py |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

commit 6e2bf301515da33b6709feb04b70d41bf02eeb63
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 12 13:23:22 2010 -0700

    release 0.2.2-9

 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

commit 732707903f65fc126c147fc0a0839a3639b8d976
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 12 15:11:41 2010 -0500

    fixed bug in auth group_exists
    
    it was using the name instead of the dn

 nova/auth/users.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 730faa785921f43b342e27e9a40ebe88a68a35d8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 12 10:39:01 2010 -0500

    Move nova related configuration files into /etc/nova/.

 bin/nova-manage                 |    2 +-
 debian/changelog                |    1 +
 debian/nova-api.init            |    2 +-
 debian/nova-api.install         |    2 +-
 debian/nova-common.dirs         |    1 +
 debian/nova-common.install      |    2 +-
 debian/nova-compute.init        |    2 +-
 debian/nova-compute.install     |    2 +-
 debian/nova-objectstore.init    |    2 +-
 debian/nova-objectstore.install |    2 +-
 debian/nova-volume.init         |    2 +-
 debian/nova-volume.install      |    2 +-
 12 files changed, 12 insertions(+), 10 deletions(-)

commit ddc4a0970d9e98a45b820ed740f3ed8e696a4972
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 9 16:17:45 2010 -0700

    move check for none before get mpi data

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ca5488297818239589968d5ea69cd3e5a124d7f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jul 9 08:21:32 2010 +0000

    Refactored smoketests flags

 smoketests/flags.py        |   47 ++++++++++++++++++++++++++++++++++++++++++++
 smoketests/novatestcase.py |   27 +++++++++++--------------
 smoketests/smoketest.py    |   35 +++++++++++++++------------------
 3 files changed, 74 insertions(+), 35 deletions(-)

commit 43a393587c5578aa3270b42b4b30e614c9fd0c09
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 8 21:48:43 2010 +0000

    Fixes to smoketest flags

 smoketests/flags.py        |   33 ---------------------------------
 smoketests/novatestcase.py |    7 +++++++
 smoketests/smoketest.py    |   24 ++++++++++++++----------
 3 files changed, 21 insertions(+), 43 deletions(-)

commit b6166936d6ff5a9a1d9019b912b0027909ec3f29
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 8 14:05:45 2010 -0700

    Minor smoketest refactoring

 smoketests/flags.py        |   24 ++++---------
 smoketests/novatestcase.py |   10 +++---
 smoketests/smoketest.py    |   82 +++++++++++++++++++++++++++-----------------
 3 files changed, 62 insertions(+), 54 deletions(-)

commit 702391e5d3f3cee5fe1d5e34d175f0fe0b5d0d7a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 12:19:50 2010 -0700

    fixes from code review

 nova/auth/users.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 0f375589c2c6c32de9530a9075eba224a041c697
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 11:03:43 2010 -0700

    typo in exception in crypto

 nova/crypto.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6e5d2139cbe46992370b0f2b107532a2b55b62e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 11:00:53 2010 -0700

    datetime import typo

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6993e9fb1aca0c238a78c3948eb19d4fbb7963eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 10:53:27 2010 -0700

    added missing isotime method from utils

 nova/utils.py |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 34e0c553d670829dbeffdbb25415bc7635899ae1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 10:06:25 2010 -0700

    release 0.2.2-8

 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

commit f5ce5b5750120012287d78ea0a40598ec0eefd47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 09:42:11 2010 -0700

    missed a comma

 nova/auth/users.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b7a32c827fbef659a24a398da5eee73920c745b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 18:45:41 2010 -0700

    release 0.2.2-7

 debian/changelog |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 082c228f98e1d7545a9d5d7abe10bd35691d85c9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 18:29:19 2010 -0700

    use a flag for cert subject

 nova/auth/users.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit faada0612d8e8580a2a932626c8972b7c2a4ef59
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 12:25:22 2010 -0700

    whitespace fixes and header changes

 bin/dhcpleasor.py              |   42 +++++++++++++++++++++++-----------------
 nova/tests/network_unittest.py |   36 +++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 36 deletions(-)

commit 6d695e8410ad40b886cf6aff3a1e41598dcdfc66
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:24:24 2010 -0700

    Fixed the os.environ patch (bogus)

 nova/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b9a8bd2d55f016fba305a00c985c7f6769afddd2
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:24:22 2010 -0700

    Fixes as per Vish review (whitespace, import statements)

 nova/endpoint/cloud.py |    2 +-
 nova/utils.py          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 84c69c32297a1f79e8630102497e1e7e0041a324
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:24:17 2010 -0700

    Off by one error in the allocation test (can someone check my subnet math?)

 nova/tests/network_unittest.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit d831ef39e2d84aa3e39bc3861085d563575efa43
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:15:11 2010 -0700

    Adding more tests, refactoring for dhcp logic.

 nova/tests/network_unittest.py |  106 +++++++++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 44 deletions(-)

commit dbe324f7254dd3e01de44bb908150fb8397fe118
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:15:11 2010 -0700

    Got dhcpleasor working, with test ENV for testing, and rpc.cast for real world.

 bin/dhcpleasor.py              |   36 +++++++++++++++++++++++++++---------
 docs/conf.py                   |    2 +-
 nova/compute/linux_net.py      |    7 +++----
 nova/compute/network.py        |   25 +++++++++++++++++++++----
 nova/endpoint/cloud.py         |    8 ++++++++
 nova/tests/network_unittest.py |   40 +++++++++++++++++++++++++++++++---------
 nova/utils.py                  |    2 --
 7 files changed, 91 insertions(+), 29 deletions(-)

commit b7ea2f70581f6acd927ea7b65adaffeeb4b8d2ba
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:06:34 2010 -0700

    Capture signals from dnsmasq and use them to update network state.

 bin/dhcpleasor.py              |   68 ++++++++++++++++++++++++++++++++++++++++
 nova/compute/linux_net.py      |    9 +++++-
 nova/compute/network.py        |   14 +++++++--
 nova/tests/fake_flags.py       |    2 +-
 nova/tests/network_unittest.py |   34 ++++++++++++++++++++
 nova/utils.py                  |   10 ++++--
 6 files changed, 129 insertions(+), 8 deletions(-)

commit 0a252e2009fb770fb34d90322665bc41326a8caa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 22:28:55 2010 +0200

    Relax the Twisted dependency to python-twisted-core (rather than the
    full stack).

 debian/changelog |    7 +++++++
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit 0ed127010775afce3ccd6b97d13ee7cad09722dc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 17:49:05 2010 +0200

    releasing version 0.3.0+really0.2.2-0ubuntu0ppa3

 debian/changelog         |    4 ++--
 debian/nova-compute.conf |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 6e77201cbab22d0c4b383b245d5957946a229e4c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 17:35:33 2010 +0200

    If set, pass KernelId and RamdiskId from RunInstances call to the
    target compute node.

 debian/changelog       |    2 ++
 nova/endpoint/cloud.py |    4 ++++
 2 files changed, 6 insertions(+)

commit ccd01c6975070ad67e895e805c1a2048440b5f70
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 17:34:43 2010 +0200

    Add a default flag file for nova-manage to help it find the CA.

 bin/nova-manage            |    2 +-
 debian/changelog           |    1 +
 debian/nova-common.install |    1 +
 debian/nova-manage.conf    |    4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)

commit fa529458f64a3a97a26b49cf7f9dab1fad8acf0b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 14:06:55 2010 +0200

    Ship the CA directory in nova-common.

 debian/changelog           |    1 +
 debian/nova-common.dirs    |    4 ++++
 debian/nova-common.install |    3 +++
 3 files changed, 8 insertions(+)

commit b9522da2bd64fb15c86e46c47ac37f345fa2c73d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 6 13:34:08 2010 +0200

    Add a dependency on nginx from nova-objectsstore and install a
    suitable configuration file.

 debian/changelog                   |    7 +++++++
 debian/control                     |    2 +-
 debian/nova-objectstore.install    |    1 +
 debian/nova-objectstore.links      |    1 +
 debian/nova-objectstore.nginx.conf |   17 +++++++++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

commit ee8ed818c182e4a34864aa4a9339c6f7a046063e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 22:07:41 2010 +0200

    releasing version 0.3.0+really0.2.2-0ubuntu0ppa2

 debian/changelog |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 497e8dcde780d668f311e18817f11a0d15b735d2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 22:03:13 2010 +0200

    Don't pass --daemonize=1 to nova-compute. It's already daemonising
    by default.

 debian/changelog         |    2 ++
 debian/nova-compute.conf |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

commit f49dfd507a48a1617822ba8543408fa8ad18a21e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 21:49:39 2010 +0200

    Add debian/nova-common.dirs to create
    var/lib/nova/{buckets,CA,images,instances,keys,networks}

 debian/changelog        |    2 ++
 debian/nova-common.dirs |    6 ++++++
 2 files changed, 8 insertions(+)

commit b989170b398fbb73512a9be376196495cf4a086b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 15:37:52 2010 +0200

    keeper_path is really caled datastore_path.

 debian/nova-api.conf         |    2 +-
 debian/nova-compute.conf     |    2 +-
 debian/nova-objectstore.conf |    2 +-
 debian/nova-volume.conf      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 3675c47d0874c9da4d0318e1dd158708af597255
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 13:35:16 2010 +0200

    Fixed package version.

 debian/changelog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 249910ed23062463ea8346956848bcc54a4d740d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 13:34:44 2010 +0200

    Move templates from python directories to /usr/share/nova.

 debian/changelog           |    1 +
 debian/nova-common.install |    6 +++---
 debian/nova-compute.conf   |    3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

commit fe2da208c24ec2cec0f1209729ce42a6cab315c2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 13:20:13 2010 +0200

    Added --network_path setting to nova-compute's flagfile.

 debian/changelog         |    6 ++++++
 debian/nova-compute.conf |    1 +
 2 files changed, 7 insertions(+)

commit 6f92a690a8728ed690c5220b6a745919ff4605ec
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 13:19:34 2010 +0200

    releasing version 0.3.0+really0.2.2-0ubuntu0ppa1

 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

commit baea119aefe8e939eb5796b17fab29f5ae283449
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 12:46:26 2010 +0200

    Use rmdir instead of rm -rf to remove a tempdir.

 nova/compute/disk.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit ecae60acde6853b1c49f0fbaca6ca7e8c1412b29
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 12:45:35 2010 +0200

    Set better defaults in flagfiles.

 debian/nova-api.conf         |    4 +++-
 debian/nova-compute.conf     |    4 +++-
 debian/nova-objectstore.conf |    4 +++-
 debian/nova-volume.conf      |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

commit 45c192aee681eb684599ac2cacd9c38996ca2bb5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Fixes and add interface template

 nova/compute/disk.py             |    2 +-
 nova/compute/interfaces.template |   18 ++++++++++++++++++
 nova/compute/network.py          |    2 +-
 nova/endpoint/cloud.py           |   13 ++++++++-----
 4 files changed, 28 insertions(+), 7 deletions(-)

commit 04b7b42bde70c53e251f795a1d71cd7cd341b5dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Simple network injection

 nova/compute/disk.py    |   23 +++++++++++++++++------
 nova/compute/network.py |   19 ++++++++++++++++---
 nova/compute/node.py    |   23 +++++++++++++++++------
 3 files changed, 50 insertions(+), 15 deletions(-)

commit 95e7571a597abdafc638747e2d28c725df96bb17
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Simple Network avoids vlans

 nova/compute/network.py |   21 +++++++++++++++++++++
 nova/compute/node.py    |    9 +++++----
 nova/endpoint/cloud.py  |   24 ++++++++++++++++++------
 3 files changed, 44 insertions(+), 10 deletions(-)

commit f8a19693b5d4172ce3207c63acf0209ed8b3d636
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:38:15 2010 -0500

    clean a few merge errors from network

 nova/compute/network.py |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

commit 5e8337aec03f5a697c90779eb66a457aae4e7ae0
Merge: 7897135 6d61273
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:31:44 2010 -0500

    Merge patch 30001

commit 7897135ec1f365b70db3df7411058b779005a1fe
Merge: 2dc33d5 3a90ce2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:29:55 2010 -0500

    Merge patch 16002

commit 2dc33d52d64194082190922d3273a3c3a1b43406
Merge: b85c7f9 78e7700
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:27:59 2010 -0500

    Merge patch 21001

commit b85c7f94d64d3617c40d596dd48c7e258c4195a7
Merge: 626257d 543d979
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:25:56 2010 -0500

    Merge patch 28001

commit 626257d822ecd4e4257a73c96378b21f077c46f8
Merge: 0650b5d c3dea0b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:23:57 2010 -0500

    Merge branch 'describe'
    
    Conflicts:
    	nova/endpoint/cloud.py

commit 0650b5dacb3cb71e83f78bd3c921f1b064e59793
Merge: cc15e8a 4b3a0ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:22:22 2010 -0500

    Merge branch 'vpnkey'

commit cc15e8a55f8ce3ef70b93b4cc079c7fcc7a5bf66
Merge: 5a93cc0 884ed0c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:55:41 2010 -0500

    Merge branch 'extra_reference'

commit 5a93cc008aeba52530930c99be3f1eb5ac3c912e
Merge: 48572fe badef85
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:51:32 2010 -0500

    Merge branch 'comment_fix'

commit 48572fe220372322d52f6c28fc1003015b60eb50
Merge: a0cb58a d40990e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:41:57 2010 -0500

    Merge branch 'master' into fixrbac

commit d40990eceecb0eae4906ad5c923b421d4f4c1075
Merge: 55def9c ea9b913
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:38:03 2010 -0500

    Merge remote branch 'nova/master'
    
    Conflicts:
    	docs/getting.started.rst

commit f322f02728136e19b2a6503861a312b7548dbc68
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 1 13:14:08 2010 +0200

    Add curl as a dependency of nova-compute.

 debian/control |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6fa632d9ed6f7f897a0ac7f9dc85dab17154f59
Merge: 3b916f6 ea9b913
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 1 13:13:52 2010 +0200

    Merge with trunk.

commit ea9b913ccceda5944c881f3ce9cadde39b0e0344
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 15:07:52 2010 -0500

    getting started update

 docs/getting.started.rst |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 55def9c6b99514655330eb9c4d70fe09146ce36a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 15:04:23 2010 -0500

    getting started update

 docs/getting.started.rst |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 183d86aae30c9f9ab452153acdc32e0f24847574
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:24:41 2010 -0500

    Remove _s errors from merge

 nova/compute/node.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit a7a5212cbd31ced0bbb30c6c5e60dc1a24cca1d3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:17:56 2010 -0500

    fix typos in node from merge

 nova/compute/node.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit e57b10fdfd01edfb83758218f9972da1dc1fbbe3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:16:54 2010 -0500

    remove spaces from default cert

 nova/auth/users.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b916f690ce332ac15e1ec50d5e511ec6a9895ab
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jun 30 16:47:12 2010 +0200

    Make sure get_assigned_vlans and BaseNetwork.hosts always return a dict, even if the key is currently empty in the KVS.

 nova/compute/network.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7ce77bfffca575e0136807779d98140280c7fa90
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jun 30 16:46:47 2010 +0200

    Add _s instance attribute to Instance class. It's referenced in a bunch of places, but is never set. This is unlikely to be the right fix (why have two attributes pointing to the same object?), but it seems to make ends meet.

 nova/compute/node.py |    1 +
 1 file changed, 1 insertion(+)

commit 00971feed32d22ae9bc63aea716ecf4e972aee32
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jun 30 16:46:26 2010 +0200

    Replace spaces in x509 cert subject with underscores. It ends up getting split(' ')'ed and passed to subprocess.Popen, so it needs to not have spaces in it, otherwise openssl gets very upset.

 nova/auth/users.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4bdc2f061ca1855a56391acc994b637dc2f73bc6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jun 30 16:46:02 2010 +0200

    Expand somewhat on the short and long descriptions in debian/control.

 debian/control |  111 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 101 insertions(+), 10 deletions(-)

commit 05afafab71a5c99a99b3a069bcc6145dd4aeab40
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jun 30 16:45:41 2010 +0200

    Use separate configuration files for the different daemons.

 debian/nova-api.conf            |    3 +++
 debian/nova-api.init            |    4 ++--
 debian/nova-api.install         |    1 +
 debian/nova-compute.conf        |    3 +++
 debian/nova-compute.init        |    4 ++--
 debian/nova-compute.install     |    1 +
 debian/nova-objectstore.conf    |    5 +++++
 debian/nova-objectstore.init    |    4 ++--
 debian/nova-objectstore.install |    1 +
 debian/nova-volume.conf         |    5 +++++
 debian/nova-volume.init         |    4 ++--
 debian/nova-volume.install      |    1 +
 12 files changed, 28 insertions(+), 8 deletions(-)

commit 10b8e5bdaa8ca601b1e0b0268a6acfec6f5712ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 21:25:59 2010 -0500

    Removed trailing whitespace from header

 bin/nova-api                        |    2 +-
 bin/nova-compute                    |    2 +-
 bin/nova-instancemonitor            |    2 +-
 bin/nova-manage                     |    2 +-
 bin/nova-objectstore                |    2 +-
 bin/nova-volume                     |    2 +-
 builddeb.sh                         |    2 +-
 nova/__init__.py                    |    2 +-
 nova/adminclient.py                 |    2 +-
 nova/auth/__init__.py               |    2 +-
 nova/auth/fakeldap.py               |    2 +-
 nova/auth/novarc.template           |    2 +-
 nova/auth/rbac.py                   |    2 +-
 nova/auth/signer.py                 |    2 +-
 nova/auth/slap.sh                   |    2 +-
 nova/auth/users.py                  |    2 +-
 nova/cloudpipe/__init__.py          |    2 +-
 nova/cloudpipe/api.py               |    2 +-
 nova/cloudpipe/bootscript.sh        |    2 +-
 nova/cloudpipe/client.ovpn.template |    2 +-
 nova/cloudpipe/pipelib.py           |    2 +-
 nova/compute/__init__.py            |    2 +-
 nova/compute/disk.py                |    2 +-
 nova/compute/exception.py           |    2 +-
 nova/compute/fakevirtinstance.xml   |    2 +-
 nova/compute/libvirt.xml.template   |    2 +-
 nova/compute/linux_net.py           |    2 +-
 nova/compute/model.py               |    2 +-
 nova/compute/monitor.py             |    2 +-
 nova/compute/network.py             |    2 +-
 nova/compute/node.py                |    2 +-
 nova/crypto.py                      |    2 +-
 nova/datastore.py                   |    2 +-
 nova/endpoint/__init__.py           |    2 +-
 nova/endpoint/admin.py              |    2 +-
 nova/endpoint/api.py                |    2 +-
 nova/endpoint/cloud.py              |    2 +-
 nova/endpoint/images.py             |    2 +-
 nova/exception.py                   |    2 +-
 nova/fakerabbit.py                  |    2 +-
 nova/fakevirt.py                    |    2 +-
 nova/flags.py                       |    2 +-
 nova/objectstore/__init__.py        |    2 +-
 nova/objectstore/bucket.py          |    2 +-
 nova/objectstore/handler.py         |    2 +-
 nova/objectstore/image.py           |    2 +-
 nova/objectstore/stored.py          |    2 +-
 nova/process.py                     |    2 +-
 nova/rpc.py                         |    2 +-
 nova/server.py                      |    2 +-
 nova/test.py                        |    2 +-
 nova/tests/__init__.py              |    2 +-
 nova/tests/access_unittest.py       |    2 +-
 nova/tests/api_integration.py       |    2 +-
 nova/tests/api_unittest.py          |    2 +-
 nova/tests/cloud_unittest.py        |    2 +-
 nova/tests/datastore_unittest.py    |    2 +-
 nova/tests/fake_flags.py            |    2 +-
 nova/tests/future_unittest.py       |    2 +-
 nova/tests/keeper_unittest.py       |    2 +-
 nova/tests/network_unittest.py      |    2 +-
 nova/tests/node_unittest.py         |    2 +-
 nova/tests/objectstore_unittest.py  |    2 +-
 nova/tests/process_unittest.py      |    2 +-
 nova/tests/real_flags.py            |    2 +-
 nova/tests/storage_unittest.py      |    2 +-
 nova/tests/users_unittest.py        |    2 +-
 nova/tests/validator_unittest.py    |    2 +-
 nova/twistd.py                      |    2 +-
 nova/utils.py                       |    2 +-
 nova/validate.py                    |    2 +-
 nova/vendor.py                      |    2 +-
 nova/volume/__init__.py             |    2 +-
 nova/volume/storage.py              |    2 +-
 run_tests.py                        |    2 +-
 setup.py                            |    2 +-
 smoketests/__init__.py              |    2 +-
 smoketests/flags.py                 |    2 +-
 smoketests/novatestcase.py          |    2 +-
 smoketests/smoketest.py             |    2 +-
 tools/clean-vlans                   |    2 +-
 81 files changed, 81 insertions(+), 81 deletions(-)

commit 5a1f5839b8850e32dbdd2a74f6176f37a3e36254
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 29 21:25:39 2010 -0500

    Updated licenses

 bin/nova-api                        |   29 +++++++++++++++++------------
 bin/nova-compute                    |   23 ++++++++++++++---------
 bin/nova-instancemonitor            |   29 +++++++++++++++++------------
 bin/nova-manage                     |   23 ++++++++++++++---------
 bin/nova-objectstore                |   29 +++++++++++++++++------------
 bin/nova-volume                     |   33 +++++++++++++++++++--------------
 builddeb.sh                         |   30 ++++++++++++++++++------------
 docs/architecture.rst               |   26 +++++++++++++++-----------
 docs/auth.rst                       |   26 +++++++++++++++-----------
 docs/binaries.rst                   |   26 +++++++++++++++-----------
 docs/compute.rst                    |   26 +++++++++++++++-----------
 docs/endpoint.rst                   |   26 +++++++++++++++-----------
 docs/fakes.rst                      |   26 +++++++++++++++-----------
 docs/index.rst                      |   27 +++++++++++++++------------
 docs/modules.rst                    |   26 +++++++++++++++-----------
 docs/network.rst                    |   26 +++++++++++++++-----------
 docs/nova.rst                       |   26 +++++++++++++++-----------
 docs/objectstore.rst                |   26 +++++++++++++++-----------
 docs/packages.rst                   |   26 +++++++++++++++-----------
 docs/storage.rst                    |   26 +++++++++++++++-----------
 docs/volume.rst                     |   26 +++++++++++++++-----------
 nova/__init__.py                    |   30 ++++++++++++++++++------------
 nova/adminclient.py                 |   25 +++++++++++++++----------
 nova/auth/__init__.py               |   31 ++++++++++++++++++-------------
 nova/auth/fakeldap.py               |   24 ++++++++++++++----------
 nova/auth/novarc.template           |   24 +++++++++++++++---------
 nova/auth/rbac.py                   |   20 ++++++++++++++++++++
 nova/auth/signer.py                 |   32 +++++++++++++++++++-------------
 nova/auth/slap.sh                   |   25 +++++++++++++++----------
 nova/auth/users.py                  |   23 ++++++++++++++---------
 nova/cloudpipe/__init__.py          |   23 ++++++++++++++---------
 nova/cloudpipe/api.py               |   24 ++++++++++++++----------
 nova/cloudpipe/bootscript.sh        |   24 +++++++++++++++---------
 nova/cloudpipe/client.ovpn.template |   24 +++++++++++++++---------
 nova/cloudpipe/pipelib.py           |   24 +++++++++++++++---------
 nova/compute/__init__.py            |   30 ++++++++++++++++++------------
 nova/compute/disk.py                |   23 ++++++++++++++---------
 nova/compute/exception.py           |   30 ++++++++++++++++++------------
 nova/compute/fakevirtinstance.xml   |   30 +++++++++++++++++-------------
 nova/compute/libvirt.xml.template   |   30 +++++++++++++++++-------------
 nova/compute/linux_net.py           |   18 ++++++++++++++++++
 nova/compute/model.py               |   23 ++++++++++++++---------
 nova/compute/monitor.py             |   23 ++++++++++++++---------
 nova/compute/network.py             |   23 ++++++++++++++---------
 nova/compute/node.py                |   23 ++++++++++++++---------
 nova/crypto.py                      |   23 ++++++++++++++---------
 nova/datastore.py                   |   22 +++++++++++++---------
 nova/endpoint/__init__.py           |   30 ++++++++++++++++++------------
 nova/endpoint/admin.py              |   23 ++++++++++++++---------
 nova/endpoint/api.py                |   24 ++++++++++++++----------
 nova/endpoint/cloud.py              |   23 ++++++++++++++---------
 nova/endpoint/images.py             |   23 ++++++++++++++---------
 nova/exception.py                   |   23 ++++++++++++++---------
 nova/fakerabbit.py                  |   23 ++++++++++++++---------
 nova/fakevirt.py                    |   23 ++++++++++++++---------
 nova/flags.py                       |   23 ++++++++++++++---------
 nova/objectstore/__init__.py        |   30 ++++++++++++++++++------------
 nova/objectstore/bucket.py          |   23 ++++++++++++++---------
 nova/objectstore/handler.py         |   26 ++++++++++++++++----------
 nova/objectstore/image.py           |   23 ++++++++++++++---------
 nova/objectstore/stored.py          |   30 ++++++++++++++++++------------
 nova/process.py                     |   23 ++++++++++++++---------
 nova/rpc.py                         |   23 ++++++++++++++---------
 nova/server.py                      |   29 +++++++++++++++++------------
 nova/test.py                        |   23 ++++++++++++++---------
 nova/tests/__init__.py              |   30 ++++++++++++++++++------------
 nova/tests/access_unittest.py       |   23 ++++++++++++++---------
 nova/tests/api_integration.py       |   24 +++++++++++++++---------
 nova/tests/api_unittest.py          |   23 ++++++++++++++---------
 nova/tests/cloud_unittest.py        |   23 ++++++++++++++---------
 nova/tests/datastore_unittest.py    |   20 ++++++++++++++++++++
 nova/tests/fake_flags.py            |   30 ++++++++++++++++++------------
 nova/tests/future_unittest.py       |   29 +++++++++++++++++------------
 nova/tests/keeper_unittest.py       |   19 +++++++++++++++++++
 nova/tests/network_unittest.py      |   23 ++++++++++++++---------
 nova/tests/node_unittest.py         |   23 ++++++++++++++---------
 nova/tests/objectstore_unittest.py  |   23 ++++++++++++++---------
 nova/tests/process_unittest.py      |   23 ++++++++++++++---------
 nova/tests/real_flags.py            |   30 ++++++++++++++++++------------
 nova/tests/storage_unittest.py      |   23 ++++++++++++++---------
 nova/tests/users_unittest.py        |   23 ++++++++++++++---------
 nova/tests/validator_unittest.py    |   23 ++++++++++++++---------
 nova/twistd.py                      |   29 +++++++++++++++++------------
 nova/utils.py                       |   29 +++++++++++++++++------------
 nova/validate.py                    |   23 ++++++++++++++---------
 nova/vendor.py                      |   29 +++++++++++++++++------------
 nova/volume/__init__.py             |   30 ++++++++++++++++++------------
 nova/volume/storage.py              |   23 ++++++++++++++---------
 run_tests.py                        |   23 ++++++++++++++---------
 setup.py                            |   31 ++++++++++++++++++-------------
 smoketests/__init__.py              |   25 ++++++++++++++-----------
 smoketests/flags.py                 |   25 ++++++++++++++-----------
 smoketests/novatestcase.py          |   25 ++++++++++++++-----------
 smoketests/smoketest.py             |   25 ++++++++++++++-----------
 tools/clean-vlans                   |   19 +++++++++++++++++++
 95 files changed, 1470 insertions(+), 935 deletions(-)

commit 18abcde86b524278f1b8275496d5fe26c6368805
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 29 21:23:29 2010 -0500

    Added flags to smoketests. General cleanup

 smoketests/README          |    6 --
 smoketests/__init__.py     |   30 ++++++++++
 smoketests/flags.py        |   42 ++++++++++++++
 smoketests/novatestcase.py |   74 ++++++++++++++-----------
 smoketests/smoketest.py    |  132 +++++++++++++++++++++++++++-----------------
 5 files changed, 195 insertions(+), 89 deletions(-)

commit 9ef046e77e18806264c92e90b20dc84fb2a9d369
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 18:02:00 2010 -0500

    removed all references to keeper

 nova/auth/users.py               |    1 -
 nova/datastore.py                |  257 +-------------------------------------
 nova/test.py                     |    5 -
 nova/tests/datastore_unittest.py |   80 ------------
 nova/tests/fake_flags.py         |    2 -
 nova/tests/keeper_unittest.py    |   76 -----------
 6 files changed, 3 insertions(+), 418 deletions(-)

commit 7559c5b9f2f7f0e5c36156326a1cc123459c0a81
Merge: 6152e3a 8767608
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Jun 29 16:59:07 2010 -0500

    Merge commit '56443020bcd20894c13eb73bd04a0a5eab4ba960'
    
    Conflicts:
    	docs/getting.started.rst

commit c41bcdf19c9e5be4ba19a814132af0534d604555
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 14:27:55 2010 -0700

    reformatting

 nova/auth/users.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit 1dac03ffc58cf519a4a1c9b3c286dd13d9bbbe31
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 14:01:13 2010 -0700

    Vpn ips and ports use redis

 nova/auth/users.py           |  132 +++++++++++++++++++++++++++++++-----------
 nova/tests/users_unittest.py |   11 ++++
 2 files changed, 109 insertions(+), 34 deletions(-)

commit 3a90ce226f886b8ec5c002cf0e6803857e45a07b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 08:55:27 2010 -0700

    review reformat

 nova/auth/fakeldap.py |   62 +++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

commit 6d612730c5e57d495dc281326c0169e8116ecd86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 08:46:10 2010 -0700

    code review reformat

 nova/volume/storage.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit a013a801246bed9302303c304b90c748e2d7aec0
Merge: c363f32 c7f7e1b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 22:47:02 2010 -0700

    Merge remote branch 'angst/apply_api' into diekeeper

commit c7f7e1bc4185be38ff792bfd82a74e35ecbeda12
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 29 01:20:43 2010 -0400

    We need to be able to look up Instance by Node (live migration).

 nova/compute/model.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 3972cf90c2982ea906fe91c6ae461d3fab7c8958
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 29 01:02:48 2010 -0400

    Get rid of RedisModel

 nova/compute/model.py   |    2 ++
 nova/compute/network.py |   36 +++++++++++---------
 nova/datastore.py       |   86 -----------------------------------------------
 nova/volume/storage.py  |   21 +++++++-----
 4 files changed, 36 insertions(+), 109 deletions(-)

commit c363f3239168081d5b87f9ef4690a6123784a024
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 20:31:06 2010 -0700

    formatting fixes and refactoring from code review

 nova/auth/fakeldap.py |  184 ++++++++++++++++++++++++++++---------------------
 1 file changed, 105 insertions(+), 79 deletions(-)

commit bbaa17c262fc7bcea19b641a9e239e595d76d964
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 19:52:06 2010 -0700

    reformatting to fit within 80 characters

 nova/auth/users.py |  159 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 107 insertions(+), 52 deletions(-)

commit 286c0a6b7ae5d28792ed4e3377ecfb8f9e66aa5b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 16:01:09 2010 -0700

    simplified handling of tempdir for Fakes

 nova/volume/storage.py |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

commit 72ccc08d22aadd596a413900b6086a6f7d1a044d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 15:36:59 2010 -0700

    fix for multiple shelves for each volume node

 nova/tests/storage_unittest.py |   17 +++++--
 nova/volume/storage.py         |   98 +++++++++++++++++++++++-----------------
 2 files changed, 70 insertions(+), 45 deletions(-)

commit e6f3a97bb4ae2729c2c6e9b9f4129a30dd84cc9b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:09:54 2010 -0700

    add object class violation exception to fakeldap

 nova/auth/fakeldap.py |    2 ++
 1 file changed, 2 insertions(+)

commit 11a818b6dd71593b63fc922d898d802bd0538e4b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:09:01 2010 -0700

    remove spaces from default cert

 nova/auth/users.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8d42324bf9a3d8ddde5942503892051721f061b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:08:24 2010 -0700

    remove silly default from generate cert

 nova/crypto.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit daada4adb23e65ddf69ede0f52827d4d80312d3a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:00:56 2010 -0700

    fix of fakeldap imports and exceptions

 nova/auth/users.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 974ecad2092502cc6825ed5c4c7daa1b362f8a41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:47:04 2010 -0700

    More Comments, cleanup, and reformatting

 nova/auth/fakeldap.py |  173 ++++++++++++++++++++++++++++---------------------
 1 file changed, 98 insertions(+), 75 deletions(-)

commit a0cb58ad4f821bc2ca1d07f2da5c07866ba92783
Merge: 6a97550 8a2f176
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:21:52 2010 -0700

    Merge branch 'master' into fixrbac

commit 4bb9e67582b2e2b6302b889011baffb69cff79c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:20:38 2010 -0700

    users.py cleanup for exception handling and typo

 nova/auth/users.py |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

commit 973e45e62df73138d53600bc44a51ac1be409e07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:19:14 2010 -0700

    Make fakeldap use redis

 nova/auth/fakeldap.py |  132 +++++++++++++++++++++++++++----------------------
 1 file changed, 74 insertions(+), 58 deletions(-)

commit 715d33de15beb594c8d6271929a957ce7f5f2e2a
Merge: 8a2f176 6a97550
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 22:56:47 2010 -0700

    Merge branch 'fixrbac' into fakeldap

commit fcab63e31676938e6a691499caa1a3c3c5a84037
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 27 00:43:03 2010 -0400

    Refactor network.Vlan to be a BasicModel, since it touched Redis.

 nova/compute/model.py   |   26 ++++++-
 nova/compute/network.py |  185 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 162 insertions(+), 49 deletions(-)

commit 6d680f41f8ce4f41eca07425139c8abe485835c7
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 27 00:33:49 2010 -0400

    bugfix: rename _s to datamodel in Node in some places it was overlooked.

 nova/compute/node.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit 543d9792b48909eefe1b3a67e83e0412800c60d7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 26 14:50:33 2010 -0700

    fix key injection script

 nova/compute/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c05da9848cdf3390694dfc548c7d09b874c93520
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 25 22:03:45 2010 -0400

    Fixes based on code review 27001.

 nova/adminclient.py          |    4 ++
 nova/auth/users.py           |    3 +-
 nova/compute/model.py        |  141 ++++++++++++++++++------------------
 nova/compute/node.py         |    6 +-
 nova/endpoint/admin.py       |   21 +++---
 nova/tests/model_unittest.py |  164 ++++++++++++++++++++----------------------
 nova/utils.py                |    8 +--
 run_tests.py                 |    2 +-
 8 files changed, 170 insertions(+), 179 deletions(-)

commit 78e7700e15e75545bd5d85199ab6e126bc7d4a59
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 17:36:48 2010 -0700

    added TODO

 nova/rpc.py |    2 ++
 1 file changed, 2 insertions(+)

commit 849282175c38ec419fc037b1698cb4de4efdb833
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 25 18:55:14 2010 -0400

    Admin API + Worker Tracking.

 bin/nova-api                 |    6 +-
 bin/nova-compute             |    4 +-
 nova/adminclient.py          |   33 ++++-
 nova/auth/users.py           |    2 +-
 nova/compute/model.py        |  281 ++++++++++++++++++++++++++++++++++++------
 nova/compute/node.py         |   16 ++-
 nova/endpoint/admin.py       |   43 +++----
 nova/tests/model_unittest.py |  213 ++++++++++++++++++++++++++++++++
 nova/utils.py                |    6 +
 run_tests.py                 |    1 +
 10 files changed, 534 insertions(+), 71 deletions(-)

commit 4b3a0ad09056c8cc6159b0781b558d2636666629
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 10:15:42 2010 -0700

    fixed typo

 nova/flags.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 6a97550633a0ec266be08f8cba4f8d515778c4f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 10:09:21 2010 -0700

    style cleanup

 nova/auth/users.py |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit d2974163b721159ad0f283ff3e3e167366be339c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 21:17:23 2010 -0700

    add more info to vpn list

 bin/nova-manage |    2 ++
 1 file changed, 2 insertions(+)

commit 70099adaab238d34c68947e00350df84e83d2270
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 21:04:55 2010 -0700

    Use flag for vpn key suffix instead of hardcoded string

 nova/cloudpipe/pipelib.py |    2 +-
 nova/endpoint/cloud.py    |    7 ++++---
 nova/flags.py             |    4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

commit 6d8d59180088ec8855e088a217b58b741f34aac4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 20:59:16 2010 -0700

    don't fail to create vpn key if dir exists

 nova/cloudpipe/pipelib.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8a2f1763cbadd47f6ce26467ac9f82bc9b436d2a
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 13:50:59 2010 -0700

    Create Volume should only take an integer between 0 and 1000

 nova/volume/storage.py  |    2 +-
 smoketests/smoketest.py |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

commit c3dea0b61fc38e9a42d2d0966afbe5386a9ba2da
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 11:16:11 2010 -0700

    Placeholders for missing describe commands

 nova/endpoint/cloud.py |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

commit 344b03071e3b3e56b689ea6e1fb5a0bc2242089c
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 09:47:51 2010 -0700

    Set forward delay to zero (partial fix to bug #518)

 nova/compute/linux_net.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit badef85b2ceb7121068da8f86507bdee863df44c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:50:33 2010 -0700

    more comment reformatting

 nova/rpc.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 8384fe99a75552cb8aa7ae3c4d4b7f7318770d41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:30:14 2010 -0700

    fit comment within 80 lines

 nova/rpc.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 884ed0c43130a49ce8f230833ff5d9dd830d4a8a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:28:32 2010 -0700

    removed extraneous reference to rpc in objectstore unit test

 nova/tests/objectstore_unittest.py |    2 --
 1 file changed, 2 deletions(-)

commit 6242413372d5b4540bfdeb33eaaa852fa689fd6f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:24:38 2010 -0700

    Fix queue connection bugs
    
    Fix logging if queue disconnects
    Reconnect if queue comes back

 nova/rpc.py |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

commit f119ca5798ab9c5d1190a125fce1aa25c24967ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:16:25 2010 -0700

    Fix deletion of user when he is the last member of the group

 nova/auth/users.py |   41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

commit fb783d7fde342901db25733f917c666811fe30b2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:16:25 2010 -0700

    Fix error message for checking for projectmanager role

 nova/auth/users.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit a90ca32ab9c75927efe6e92bd4add05ef57c2cb1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:16:25 2010 -0700

    Installer now creates global developer role

 nova/auth/slap.sh |    6 ++++++
 1 file changed, 6 insertions(+)

commit 4ba6802ae5d6fb4e0d8ed7bbbaf2cca94a6d1118
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:15:06 2010 -0700

    Removed trailing whitespace from header

 bin/nova-api                        |    2 +-
 bin/nova-compute                    |    2 +-
 bin/nova-instancemonitor            |    2 +-
 bin/nova-manage                     |    2 +-
 bin/nova-objectstore                |    2 +-
 bin/nova-volume                     |    2 +-
 builddeb.sh                         |    2 +-
 nova/__init__.py                    |    2 +-
 nova/adminclient.py                 |    2 +-
 nova/auth/__init__.py               |    2 +-
 nova/auth/fakeldap.py               |    2 +-
 nova/auth/novarc.template           |    2 +-
 nova/auth/rbac.py                   |    2 +-
 nova/auth/signer.py                 |    2 +-
 nova/auth/slap.sh                   |    2 +-
 nova/auth/users.py                  |    2 +-
 nova/cloudpipe/__init__.py          |    2 +-
 nova/cloudpipe/api.py               |    2 +-
 nova/cloudpipe/bootscript.sh        |    2 +-
 nova/cloudpipe/client.ovpn.template |    2 +-
 nova/cloudpipe/pipelib.py           |    2 +-
 nova/compute/__init__.py            |    2 +-
 nova/compute/disk.py                |    2 +-
 nova/compute/exception.py           |    2 +-
 nova/compute/fakevirtinstance.xml   |    2 +-
 nova/compute/libvirt.xml.template   |    2 +-
 nova/compute/linux_net.py           |    2 +-
 nova/compute/model.py               |    2 +-
 nova/compute/monitor.py             |    2 +-
 nova/compute/network.py             |    2 +-
 nova/compute/node.py                |    2 +-
 nova/crypto.py                      |    2 +-
 nova/datastore.py                   |    2 +-
 nova/endpoint/__init__.py           |    2 +-
 nova/endpoint/admin.py              |    2 +-
 nova/endpoint/api.py                |    2 +-
 nova/endpoint/cloud.py              |    2 +-
 nova/endpoint/images.py             |    2 +-
 nova/exception.py                   |    2 +-
 nova/fakerabbit.py                  |    2 +-
 nova/fakevirt.py                    |    2 +-
 nova/flags.py                       |    2 +-
 nova/objectstore/__init__.py        |    2 +-
 nova/objectstore/bucket.py          |    2 +-
 nova/objectstore/handler.py         |    2 +-
 nova/objectstore/image.py           |    2 +-
 nova/objectstore/stored.py          |    2 +-
 nova/process.py                     |    2 +-
 nova/rpc.py                         |    2 +-
 nova/server.py                      |    2 +-
 nova/test.py                        |    2 +-
 nova/tests/__init__.py              |    2 +-
 nova/tests/access_unittest.py       |    2 +-
 nova/tests/api_integration.py       |    2 +-
 nova/tests/api_unittest.py          |    2 +-
 nova/tests/cloud_unittest.py        |    2 +-
 nova/tests/datastore_unittest.py    |    2 +-
 nova/tests/fake_flags.py            |    2 +-
 nova/tests/future_unittest.py       |    2 +-
 nova/tests/keeper_unittest.py       |    2 +-
 nova/tests/network_unittest.py      |    2 +-
 nova/tests/node_unittest.py         |    2 +-
 nova/tests/objectstore_unittest.py  |    2 +-
 nova/tests/process_unittest.py      |    2 +-
 nova/tests/real_flags.py            |    2 +-
 nova/tests/storage_unittest.py      |    2 +-
 nova/tests/users_unittest.py        |    2 +-
 nova/tests/validator_unittest.py    |    2 +-
 nova/twistd.py                      |    2 +-
 nova/utils.py                       |    2 +-
 nova/validate.py                    |    2 +-
 nova/vendor.py                      |    2 +-
 nova/volume/__init__.py             |    2 +-
 nova/volume/storage.py              |    2 +-
 run_tests.py                        |    2 +-
 setup.py                            |    2 +-
 smoketests/__init__.py              |    2 +-
 smoketests/flags.py                 |    2 +-
 smoketests/novatestcase.py          |    2 +-
 smoketests/smoketest.py             |    2 +-
 tools/clean-vlans                   |    2 +-
 81 files changed, 81 insertions(+), 81 deletions(-)

commit 8726fc061b53b361207cb38e88cd5b1d2e401637
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 22:56:50 2010 -0700

    added nova-instancemonitor debian config

 debian/control                      |    5 +++
 debian/nova-instancemonitor.init    |   69 +++++++++++++++++++++++++++++++++++
 debian/nova-instancemonitor.install |    1 +
 3 files changed, 75 insertions(+)

commit caeece6e3783692dd6af6e3bec092eddb2b3e2fc
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 22:04:16 2010 -0700

    Updated licenses

 bin/nova-api                                  |   29 +++++++++++++---------
 bin/nova-compute                              |   23 ++++++++++-------
 bin/nova-instancemonitor                      |   29 +++++++++++++---------
 bin/nova-manage                               |   23 ++++++++++-------
 bin/nova-objectstore                          |   29 +++++++++++++---------
 bin/nova-volume                               |   33 ++++++++++++++-----------
 builddeb.sh                                   |   30 +++++++++++++---------
 docs/architecture.rst                         |   26 ++++++++++---------
 docs/auth.rst                                 |   26 ++++++++++---------
 docs/binaries.rst                             |   26 ++++++++++---------
 docs/compute.rst                              |   26 ++++++++++---------
 docs/endpoint.rst                             |   26 ++++++++++---------
 docs/fakes.rst                                |   26 ++++++++++---------
 docs/getting.started.rst                      |   20 +++++++++------
 docs/index.rst                                |   27 +++++++++++---------
 docs/modules.rst                              |   26 ++++++++++---------
 docs/network.rst                              |   26 ++++++++++---------
 docs/nova.rst                                 |   26 ++++++++++---------
 docs/objectstore.rst                          |   26 ++++++++++---------
 docs/packages.rst                             |   26 ++++++++++---------
 docs/storage.rst                              |   26 ++++++++++---------
 docs/volume.rst                               |   26 ++++++++++---------
 nova/__init__.py                              |   30 +++++++++++++---------
 nova/adminclient.py                           |   25 +++++++++++--------
 nova/auth/__init__.py                         |   31 +++++++++++++----------
 nova/auth/fakeldap.py                         |   24 ++++++++++--------
 nova/auth/novarc.template                     |   24 +++++++++++-------
 nova/auth/rbac.py                             |   20 +++++++++++++++
 nova/auth/signer.py                           |   32 ++++++++++++++----------
 nova/auth/slap.sh                             |   25 +++++++++++--------
 nova/auth/users.py                            |   23 ++++++++++-------
 nova/cloudpipe/__init__.py                    |   23 ++++++++++-------
 nova/cloudpipe/api.py                         |   24 ++++++++++--------
 nova/cloudpipe/bootscript.sh                  |   24 +++++++++++-------
 nova/cloudpipe/client.ovpn.template           |   24 +++++++++++-------
 nova/cloudpipe/pipelib.py                     |   24 +++++++++++-------
 nova/compute/__init__.py                      |   30 +++++++++++++---------
 nova/compute/disk.py                          |   23 ++++++++++-------
 nova/compute/exception.py                     |   30 +++++++++++++---------
 nova/compute/fakevirtinstance.xml             |   30 ++++++++++++----------
 nova/compute/libvirt.xml.template             |   30 ++++++++++++----------
 nova/compute/linux_net.py                     |   18 ++++++++++++++
 nova/compute/model.py                         |   23 ++++++++++-------
 nova/compute/monitor.py                       |   23 ++++++++++-------
 nova/compute/network.py                       |   23 ++++++++++-------
 nova/compute/node.py                          |   23 ++++++++++-------
 nova/crypto.py                                |   23 ++++++++++-------
 nova/datastore.py                             |   22 ++++++++++-------
 nova/endpoint/__init__.py                     |   30 +++++++++++++---------
 nova/endpoint/admin.py                        |   23 ++++++++++-------
 nova/endpoint/api.py                          |   24 ++++++++++--------
 nova/endpoint/cloud.py                        |   23 ++++++++++-------
 nova/endpoint/images.py                       |   23 ++++++++++-------
 nova/exception.py                             |   23 ++++++++++-------
 nova/fakerabbit.py                            |   23 ++++++++++-------
 nova/fakevirt.py                              |   23 ++++++++++-------
 nova/flags.py                                 |   23 ++++++++++-------
 nova/objectstore/__init__.py                  |   30 +++++++++++++---------
 nova/objectstore/bucket.py                    |   23 ++++++++++-------
 nova/objectstore/handler.py                   |   26 +++++++++++--------
 nova/objectstore/image.py                     |   23 ++++++++++-------
 nova/objectstore/stored.py                    |   30 +++++++++++++---------
 nova/process.py                               |   23 ++++++++++-------
 nova/rpc.py                                   |   23 ++++++++++-------
 nova/server.py                                |   29 +++++++++++++---------
 nova/test.py                                  |   23 ++++++++++-------
 nova/tests/__init__.py                        |   30 +++++++++++++---------
 nova/tests/access_unittest.py                 |   23 ++++++++++-------
 nova/tests/api_integration.py                 |   24 +++++++++++-------
 nova/tests/api_unittest.py                    |   23 ++++++++++-------
 nova/tests/cloud_unittest.py                  |   23 ++++++++++-------
 nova/tests/datastore_unittest.py              |   20 +++++++++++++++
 nova/tests/fake_flags.py                      |   30 +++++++++++++---------
 nova/tests/future_unittest.py                 |   29 +++++++++++++---------
 nova/tests/keeper_unittest.py                 |   19 ++++++++++++++
 nova/tests/network_unittest.py                |   23 ++++++++++-------
 nova/tests/node_unittest.py                   |   23 ++++++++++-------
 nova/tests/objectstore_unittest.py            |   23 ++++++++++-------
 nova/tests/process_unittest.py                |   23 ++++++++++-------
 nova/tests/real_flags.py                      |   30 +++++++++++++---------
 nova/tests/storage_unittest.py                |   23 ++++++++++-------
 nova/tests/users_unittest.py                  |   23 ++++++++++-------
 nova/tests/validator_unittest.py              |   23 ++++++++++-------
 nova/twistd.py                                |   29 +++++++++++++---------
 nova/utils.py                                 |   29 +++++++++++++---------
 nova/validate.py                              |   23 ++++++++++-------
 nova/vendor.py                                |   29 +++++++++++++---------
 nova/volume/__init__.py                       |   30 +++++++++++++---------
 nova/volume/storage.py                        |   23 ++++++++++-------
 run_tests.py                                  |   23 ++++++++++-------
 setup.py                                      |   31 +++++++++++++----------
 smoketests/__init__.py                        |   25 ++++++++++---------
 smoketests/flags.py                           |   25 ++++++++++---------
 smoketests/novatestcase.py                    |   25 ++++++++++---------
 smoketests/smoketest.py                       |   25 ++++++++++---------
 tools/clean-vlans                             |   19 ++++++++++++++
 vendor/tornado/demos/appengine/blog.py        |   18 +++++++-------
 vendor/tornado/demos/auth/authdemo.py         |   18 +++++++-------
 vendor/tornado/demos/blog/blog.py             |   18 +++++++-------
 vendor/tornado/demos/chat/chatdemo.py         |   18 +++++++-------
 vendor/tornado/demos/facebook/facebook.py     |   18 +++++++-------
 vendor/tornado/demos/facebook/uimodules.py    |   18 +++++++-------
 vendor/tornado/demos/helloworld/helloworld.py |   18 +++++++-------
 vendor/tornado/setup.py                       |   18 +++++++-------
 vendor/tornado/tornado/__init__.py            |   18 +++++++-------
 vendor/tornado/tornado/auth.py                |   18 +++++++-------
 vendor/tornado/tornado/autoreload.py          |   18 +++++++-------
 vendor/tornado/tornado/database.py            |   18 +++++++-------
 vendor/tornado/tornado/escape.py              |   18 +++++++-------
 vendor/tornado/tornado/httpclient.py          |   18 +++++++-------
 vendor/tornado/tornado/httpserver.py          |   18 +++++++-------
 vendor/tornado/tornado/ioloop.py              |   18 +++++++-------
 vendor/tornado/tornado/iostream.py            |   18 +++++++-------
 vendor/tornado/tornado/locale.py              |   18 +++++++-------
 vendor/tornado/tornado/options.py             |   18 +++++++-------
 vendor/tornado/tornado/s3server.py            |   18 +++++++-------
 vendor/tornado/tornado/template.py            |   18 +++++++-------
 vendor/tornado/tornado/web.py                 |   18 +++++++-------
 vendor/tornado/tornado/websocket.py           |   18 +++++++-------
 vendor/tornado/tornado/wsgi.py                |   18 +++++++-------
 vendor/tornado/website/website.py             |   18 +++++++-------
 121 files changed, 1707 insertions(+), 1168 deletions(-)

commit 8572e639ac681b9efe408821d9da19aa8d6e0bc9
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 21:19:08 2010 -0700

    Added flags to smoketests. General cleanup

 smoketests/README          |    6 --
 smoketests/__init__.py     |   30 ++++++++++
 smoketests/flags.py        |   42 ++++++++++++++
 smoketests/novatestcase.py |   74 ++++++++++++++-----------
 smoketests/smoketest.py    |  132 +++++++++++++++++++++++++++-----------------
 5 files changed, 195 insertions(+), 89 deletions(-)

commit 8767608e335752fea4be6bebd6298bb49782f6d6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:01 2010 +0100

    A few missing files from the twisted patch

 vendor/Twisted-10.0.0/twisted/internet/_sigchld.c  |  101 ++++++++++
 vendor/Twisted-10.0.0/twisted/internet/_signals.py |  184 +++++++++++++++++++
 .../twisted/internet/test/test_sigchld.py          |  194 ++++++++++++++++++++
 vendor/Twisted-10.0.0/twisted/topfiles/733.bugfix  |    4 +
 4 files changed, 483 insertions(+)

commit 487bb6abc3a66c93f440ae532ae92d5192624ffd
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jun 24 04:12:01 2010 +0100

    Tweaks to get instancemonitor running

 bin/nova-instancemonitor |    1 -
 1 file changed, 1 deletion(-)

commit 9b5c06c339a68046a8eef399583778892eed75bd
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:01 2010 +0100

    Initial commit of nodemonitor
    
    Conflicts:
    
    	bin/nova-instancemonitor
    	nova/compute/monitor.py

 bin/nova-instancemonitor |    1 +
 1 file changed, 1 insertion(+)

commit 029a5510f69fa71b1a520cb5e9468b653dcde6dc
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:01 2010 +0100

    Create DescribeImageAttribute api method
    
    Conflicts:
    
    	nova/endpoint/cloud.py

 nova/endpoint/cloud.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 59bfa3a64d46b8a625e3b288f50a2f521c19e329
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    release 0.2.2-6

 debian/changelog |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:00 2010 +0100

    disk.py needed input for key injection to work
    
    Conflicts:
    
    	nova/compute/node.py

 nova/compute/node.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b3417505c28d7205c726715ebf231cb4c291a88a
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    release 2.2-5

 debian/changelog |    7 +++++++
 1 file changed, 7 insertions(+)

commit bace12d17abcbb0a972e4e29cc4275925bb03153
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    message checking callbacks only need to run 10 times a second

 nova/rpc.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9cf1fe03b121db1682dda4941b4d4b6d010829b4
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    release 2.2-4

 debian/changelog |    9 +++++++++
 debian/control   |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

commit b21e811048b272576ea209b8706abea05041f062
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    Merge of fix to stop twisted threads from interuppting system calls
    http://twistedmatrix.com/trac/changeset/28447

 vendor/Twisted-10.0.0/twisted/internet/base.py     |   34 +----
 .../Twisted-10.0.0/twisted/internet/gtk2reactor.py |   27 +++-
 .../Twisted-10.0.0/twisted/internet/posixbase.py   |  140 +++++++++++++++++---
 .../twisted/internet/test/reactormixins.py         |   15 ++-
 .../twisted/internet/test/test_process.py          |   49 ++++++-
 vendor/Twisted-10.0.0/twisted/topfiles/setup.py    |    8 +-
 6 files changed, 209 insertions(+), 64 deletions(-)

commit 3c8efde48753e005e0103fcc9d837163477103db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    trackback formatting isn't logging correctly

 nova/exception.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 57c7bb9f45251d36b95d81a55ce60cf9e57ec602
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:00 2010 +0100

    documentation updates
    
    Conflicts:
    
    	README

 docs/getting.started.rst |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 89e184767130fcdc8fd7c471eda9945ed71ce598
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    fix missing tab in nova-manage

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c04e43bece8f996345e4dd07f308bca6d6e85fed
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    Release 2.2-3

 debian/changelog |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit b1f4c7b2d3956fd4eec318d7d8a0defcb96e8355
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    use logger to print trace of unhandled exceptions

 nova/exception.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 86f813862069d58963540222730dce5ad89974a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    add exit status to nova-manage

 bin/nova-manage |    2 ++
 1 file changed, 2 insertions(+)

commit 3dcc46bc5cea6011e578bf67391daef2789a8505
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    fix fakeldap so it can use redis keeper

 nova/auth/fakeldap.py |    2 +-
 nova/test.py          |   37 +++++++++++++++----------------------
 run_tests.py          |    8 ++++++++
 3 files changed, 24 insertions(+), 23 deletions(-)

commit c4c3167178819fdf3e34fc9e81a6d2361aef7605
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    fix is_running failing because state was stored as a string

 nova/compute/node.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit c32625c4bd6862797ff8432a946dd097462e78b8
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:59 2010 +0100

    more commands in nova-manage for projects and roles
    
    Conflicts:
    
    	bin/nova-manage

 bin/nova-manage |   35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

commit fc5492bf3fff5360f6ffe85c85540e1f0d6a7a10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    More volume test fixes

 smoketests/smoketest.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 20bc71348d67c361af04de7cff7517573fe5f366
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    typo in reboot instances

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1c9c2ce22726dd460f486f10a2fcb9f14cc23286
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Fix mount of drive for test image

 smoketests/smoketest.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

commit f8f408c06a0cd670a87dbe114f3bca212549b825
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    don't need sudo anymore

 smoketests/smoketest.py |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit 4bc38342cbb5424f0b32145d1c068ef342ef047f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Cleaning up smoketests

 smoketests/novatestcase.py |    2 +-
 smoketests/smoketest.py    |   31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

commit 042eba030857cf36462c0f8c24d45094935e9c52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    boto uses instance_type not size

 smoketests/smoketest.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4338f30114407049874112cfaef8e8ea6d9f32b3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Fix to volume smoketests

 smoketests/novatestcase.py |    4 +-
 smoketests/smoketest.py    |  101 ++++++++++++++++----------------------------
 2 files changed, 38 insertions(+), 67 deletions(-)

commit 2793fc76e92a8779b5789f7b5f5b5918fa20eda8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    fix display of project name for admin in describe instances

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 08619dd37a1bc00423a1f09859f7e5d8ba4f3ced
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    make sure to deexpress before we remove the host since deexpress uses the host

 nova/compute/network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e9e767ac1b4e42d77b6ecc025e48a5505c040aa2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    fix error in disassociate address

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9862d03914a60359b7823bc4dec6d5449931dfad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    fixed reversed filtering logic

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 933157bdc595b093d89de0da2cca5b021fadf0f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    filter keypairs for vpn keys

 nova/endpoint/cloud.py |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

commit fe4f0d3ffd0ba1730598cb4b592e2c6a07719ef3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    allow multiple vpn connections with the same credentials

 nova/cloudpipe/bootscript.sh |    1 +
 1 file changed, 1 insertion(+)

commit 4f36ee72cb13ad4416cbdd891bb1c43638c17f1b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    Added admin command to restart networks

 bin/nova-manage |    6 ++++++
 1 file changed, 6 insertions(+)

commit 8475e0b590da9f2ef602005d2e8a51b2286c5052
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    hide vpn instances unless you are an admin and allow run_instances to launch vpn image even if it is private

 nova/endpoint/cloud.py |   78 ++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 35 deletions(-)

commit 97c372a3fe288729fe6cd3692c8899ba5a831c8a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    typo in my ping call

 bin/nova-manage |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4fb44e9d9e33953e383e4116f6d0a5c1906a08c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    try to ping vpn instances

 bin/nova-manage |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit 3eaab92123f4da98c3b0330653c190604281bc68
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    sensible defaults for instance types

 nova/cloudpipe/pipelib.py |    1 +
 nova/endpoint/cloud.py    |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit fb36a6ffa6d9835ca5c85c46d7729c755d1627e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    add missing import to pipelib

 nova/cloudpipe/pipelib.py |    1 +
 1 file changed, 1 insertion(+)

commit 24a68b54d9956c5a8d65d8057aaa8fd58f670a52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    Give vpns the proper ip address

 nova/endpoint/cloud.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 46337d36816634a45f2cb7611566bf551ca3bba7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Fix format addresses

 nova/endpoint/cloud.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 5718e8fca3c4224b529a3403bc9842e156df77b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Release 0.2.2-2

 debian/changelog |    9 +++++++++
 1 file changed, 9 insertions(+)

commit e3b6e0537eadad7587d68aa144e35743bd8a6dcf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix more casing errors and make attachment set print

 nova/endpoint/cloud.py |    2 +-
 nova/volume/storage.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 79549993f658c054a519d36d0b9a7c822802c69c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    removed extraneous .volume_id

 nova/endpoint/cloud.py |    2 +-
 nova/volume/storage.py |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

commit 9ebd49fa098c8e5fc21244b1bc6254b39d38752f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    don't allow volumes to be attached to the same mountpoint

 nova/endpoint/cloud.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix case for volume attributes

 nova/endpoint/cloud.py |   12 ++++++------
 nova/volume/storage.py |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 090186c12f3b6985fea6e01e23c3366bf130e5ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix sectors off by one

 nova/compute/disk.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 49acf8b49accca3f43249e11f3c665b1245f6572
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Don't use keeper for instances

 nova/compute/model.py |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

commit bb2af5d05e1d5aae3ac643ea110cf51c9702b37c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix default state to be 0 instead of pending

 nova/compute/model.py |    7 ++++---
 nova/datastore.py     |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

commit f7464875752b60b1c1713d7034478bc5e6b83aac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Release 0.2.2

 debian/changelog |    9 +++++++++
 1 file changed, 9 insertions(+)

commit 3007901ba821839b94bb163ef7889f4a87fdba93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Fix for mpi cpu reporting

 nova/endpoint/cloud.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 38e92818f378ba8a8d9a09791e139d2fdae10ef4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix detach volume

 nova/endpoint/cloud.py |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

commit 1bdd2b01de885a8f4d3a62cd1008f067f93c39ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    fix status code printing in cloud

 nova/endpoint/cloud.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit d658b59128c8b9a6671cc3cb157249d5a9d2c9eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    add project ids to volumes

 nova/endpoint/cloud.py         |    3 ++-
 nova/tests/storage_unittest.py |   34 ++++++++++++++--------------------
 nova/volume/storage.py         |   19 ++++++++++---------
 3 files changed, 26 insertions(+), 30 deletions(-)

commit ab7c9651539dd88f7e545641bdc5a16f69d5dfb0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    add back accidentally removed bridge name.
    str is reserved, so don't use it as a variable name

 nova/endpoint/cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 011a27455441f2fb5260aa8821b52b553ea40ba4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    whitespace fixes and format instances set of object fixes

 nova/compute/node.py   |   10 +++++-----
 nova/endpoint/cloud.py |    2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

commit f2a507ad6d0d99e046ffa7dbca624b2699141c57
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Use instdir to iterate through instances

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f02df04fb0de76f9051c184ce98e81ed1a7e3f6c
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:56 2010 +0100

    fix bridge name
    
    Conflicts:
    
    	nova/endpoint/cloud.py

 nova/endpoint/cloud.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 0912a1c2d55e031287ca5dd5c8df0597667ad12d
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Adding basic validation of volume size on creation, plus tests for it.

 nova/tests/storage_unittest.py |    7 +++++++
 nova/validate.py               |    8 ++++----
 nova/volume/storage.py         |    2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

commit a17abe20d34336d0642bbf2b49cb37f6b9d0a197
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    finished gutting keeper from volume

 nova/endpoint/cloud.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 108f97f5d7854cfed2c006112a91873ac4f2ed1a
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    First pass at validation unit tests. Haven't figured out class methods yet.

 nova/tests/validator_unittest.py |   41 ++++++++++++++++++++++++++++++++++++++
 nova/validate.py                 |   14 ++++++-------
 2 files changed, 48 insertions(+), 7 deletions(-)

commit 6ebd60377382a23d37eea9e65df38f0f581252fa
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Removing keeper sludge.

 nova/volume/storage.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit c168754e1a822c98c9574946986113d4f827e9d7
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Set volume status properly, first pass at validation decorators.

 nova/endpoint/cloud.py |    2 +-
 nova/validate.py       |   83 ++++++++++++++++++++++++++++++++++++++++++++++++
 nova/volume/storage.py |    1 +
 run_tests.py           |    1 +
 4 files changed, 86 insertions(+), 1 deletion(-)

commit 8c535fae46a6944e1ca5fd8bb44db739befb0054
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Adding missing default values and fixing bare Redis fetch for volume list.

 nova/endpoint/cloud.py |    2 +-
 nova/volume/storage.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 9526e1b3f14a7d9b8b2dcf7012e099a13e6fc80e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    one more handler typo

 nova/objectstore/handler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 316435cce05c5506972d70f5894b0ea67880d3b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    fix objectstore handler typo

 nova/objectstore/handler.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4d81110e10e186c3b72a5cc60073a2cba8a98696
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:55 2010 +0100

    fix modify image attribute typo
    
    Conflicts:
    
    	nova/endpoint/cloud.py

 nova/endpoint/cloud.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit bf9b83278f7b8f54f58b03b4cb0b4d0d6182f1fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    NetworkNode doesn't exist anymore

 bin/nova-compute |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 5d5e460ac841763f8e8a3ebc30ecd23821d9a351
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Added back in missing gateway property on networks.

 nova/compute/network.py |    3 +++
 1 file changed, 3 insertions(+)

commit ec621ee9a72ab2c154c6a6e82960d1d0dc3619d1
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Refactored Instance to get rid of _s bits, and fixed some bugs in state management.
    
    Conflicts:
    
    	nova/compute/node.py

 nova/auth/fakeldap.py         |    6 +-
 nova/compute/model.py         |   18 ++++
 nova/compute/node.py          |  196 ++++++++++++++++++++++-------------------
 nova/datastore.py             |    2 +-
 nova/test.py                  |    9 +-
 nova/tests/access_unittest.py |    7 +-
 nova/tests/api_unittest.py    |   11 ++-
 nova/tests/fake_flags.py      |    2 +-
 nova/tests/node_unittest.py   |    4 +
 nova/tests/users_unittest.py  |    2 +
 10 files changed, 153 insertions(+), 104 deletions(-)

commit 0ae67b85338a7f28cb230fc271f7cb632e98844a
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Delete instance files on shutdown.

 nova/compute/node.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 347eebe09199c70b93e07e8cf8c9344846e2fe00
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Flush redis db in setup and teardown of tests.

 nova/test.py                   |    5 +++++
 nova/tests/cloud_unittest.py   |    3 +--
 nova/tests/network_unittest.py |    3 +--
 nova/tests/node_unittest.py    |    3 +--
 nova/tests/storage_unittest.py |    3 +--
 nova/tests/users_unittest.py   |    3 +--
 6 files changed, 10 insertions(+), 10 deletions(-)

commit 4a273bbbff2aaad5c83f9cb65bbab2c89fd643e4
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Cleaning up my accidental merge of the docs branch

 0 files changed

commit c0983f71f25bbe9a3a4d94c5ee79bbbdf8f57884
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    change pipelib to work with projects

 bin/nova-manage           |   26 +++++++++++++-------------
 nova/auth/users.py        |    3 ---
 nova/cloudpipe/api.py     |   25 ++++++-------------------
 nova/cloudpipe/pipelib.py |   34 ++++++++++++++++++++++------------
 4 files changed, 41 insertions(+), 47 deletions(-)

commit 32850264fdec24971683f06ff4d1420691d0bf0d
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Volumes support intermediate state. Don't have to cast to storage nodes for attach/detach anymore, just let node update redis with state.

 nova/compute/model.py          |   14 --------
 nova/compute/node.py           |   18 ++++++----
 nova/datastore.py              |   13 ++++++--
 nova/endpoint/cloud.py         |   65 +++++++++++++++++++++---------------
 nova/tests/storage_unittest.py |   19 ++++++-----
 nova/volume/storage.py         |   72 +++++++++++++++++++---------------------
 6 files changed, 108 insertions(+), 93 deletions(-)

commit c02283d077c667fa406d7e43d7a312c0f1fbdd86
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Adding nojekyll for directories

 0 files changed

commit 7b8747024d1711c6a45dd05ae397f26bd054a2d1
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Fix for #437 (deleting attached volumes), plus some >9 blade_id fixes.

 nova/endpoint/cloud.py         |    2 --
 nova/tests/storage_unittest.py |   28 +++++++++++------
 nova/volume/storage.py         |   66 ++++++++++++++++++++++++----------------
 3 files changed, 59 insertions(+), 37 deletions(-)

commit 384742d65d756412f75df727b32f6c06754ef494
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:54 2010 +0100

    fix instance iteration to use self.instdir.all instead of older iterators
    
    Conflicts:
    
    	nova/endpoint/cloud.py

 nova/endpoint/cloud.py |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

commit 1183f3ebc8ace74f8413b80d23b67b2d14094432
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    nasa ldap defaults

 nova/auth/slap.sh  |   26 ++++++++++++++++++++++++++
 nova/auth/users.py |    6 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

commit bf448e27a31a93f65d01001ccfad1511b9557afa
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:54 2010 +0100

    sensible rbac defaults
    
    Conflicts:
    
    	nova/endpoint/cloud.py

 nova/endpoint/cloud.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 28cd0ed991bb7f31495797e25969d325872cd542
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Tests for rbac code

 nova/auth/users.py            |    4 ++
 nova/tests/access_unittest.py |  160 +++++++++++++++++++++++++++++++++++++++++
 nova/tests/users_unittest.py  |   26 +++++++
 run_tests.py                  |    1 +
 4 files changed, 191 insertions(+)

commit 23733a44c152d6998e5ab3a7a96db9728030f627
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Patch to allow rbac
    
    Conflicts:
    
    	nova/auth/users.py

 nova/auth/rbac.py  |   35 +++++++++++++
 nova/auth/users.py |  138 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 172 insertions(+), 1 deletion(-)

commit 2cf40bb3b21d33f4025f80d175a4c2ec7a2f8414
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Adding mpi data

 nova/endpoint/cloud.py |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit 34f4fa8495bca4d971872e59d358195263e72bf7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Adding cloudpipe and vpn data back in to network.py

 nova/compute/network.py |   27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

commit 426f5777cc65a6e7ec2a539bf5def80aaf21cd75
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    how we build our debs

 builddeb.sh |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 0ba3f01c66e9eb016311339cd1a23b4f8710c265
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Revert "fix a bug with AOE number generation"
    
    This reverts commit 7e8b5bcbad634cd4eabd0387d70beb25115bb680.

 nova/volume/storage.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

commit c910b470e61a35230bc7ddaced13c3d51fac32fd
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:53 2010 +0100

    re-added cloudpipe
    
    Conflicts:
    
    	bin/nova-manage
    	nova/auth/users.py
    	nova/compute/network.py

 CA/geninter.sh                      |    6 +-
 bin/nova-manage                     |   41 +++++++++++
 debian/changelog                    |  127 ++++++++++++++++++++++++++++++++++-
 debian/nova-common.install          |    1 +
 nova/auth/users.py                  |   25 ++++++-
 nova/cloudpipe/__init__.py          |   26 +++++++
 nova/cloudpipe/api.py               |   70 +++++++++++++++++++
 nova/cloudpipe/bootscript.sh        |   58 ++++++++++++++++
 nova/cloudpipe/client.ovpn.template |   41 +++++++++++
 nova/cloudpipe/pipelib.py           |   83 +++++++++++++++++++++++
 nova/compute/network.py             |   10 +++
 nova/endpoint/api.py                |    3 +
 nova/flags.py                       |    2 +
 13 files changed, 487 insertions(+), 6 deletions(-)

commit 6dc4d23e01d1fcd8aa27d34d8b3b2cba5eac9573
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:53 2010 +0100

    devin's smoketests

 smoketests/README                 |    6 +
 smoketests/novatestcase.py        |  117 ++++++++
 smoketests/openwrt-x86-ext2.image |  Bin 0 -> 4612608 bytes
 smoketests/openwrt-x86-vmlinuz    |  Bin 0 -> 1169948 bytes
 smoketests/smoketest.py           |  543 +++++++++++++++++++++++++++++++++++++
 5 files changed, 666 insertions(+)

commit 5a40f59be9214821e150cff8232cebde54bc6012
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:49 2010 +0100

    tools to clean vlans and run our old install script

 tools/clean-vlans |    6 ++++++
 1 file changed, 6 insertions(+)

commit a57ae2808fd983f4f5e36a0b5cac527f54b72265
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 01:46:02 2010 +0100

    fix a bug with AOE number generation

 nova/volume/storage.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit ef3dc9f148b711d6b5ffe15f4761ad87e1cb6617
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 12:18:36 2010 -0700

    Initial commit of nodemonitor

 bin/nova-instancemonitor |   50 +++++
 nova/compute/monitor.py  |  511 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 561 insertions(+)

commit 267894aeb275d008cec1420be62a2b7ba502d271
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 22 21:42:58 2010 -0700

    Create DescribeImageAttribute api method

 nova/endpoint/cloud.py |   10 ----------
 1 file changed, 10 deletions(-)

commit 64f42387406b15aeeef30a6b439c24d3c36f7726
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 22 21:36:37 2010 -0700

    Create DescribeImageAttribute api method

 nova/endpoint/cloud.py |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit c7f28358ad01e069ac60e4ee85c450c35c628dde
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jun 21 12:44:39 2010 -0400

    More rackspace API.

 bin/nova-compute           |    2 +-
 exercise_rsapi.py          |   33 ++++++++++
 nova/endpoint/rackspace.py |  157 ++++++++++++++++++++++++++++++++++++++------
 3 files changed, 170 insertions(+), 22 deletions(-)

commit 79964253e910dd2884de56138bbe6fa75a3bf283
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 20:18:56 2010 -0400

    git checkpoint commit post-wsgi

 bin/nova-rsapi             |   41 +++----
 nova/endpoint/rackspace.py |  253 +++++++++-----------------------------------
 nova/endpoint/wsgi.py      |   23 ++++
 3 files changed, 88 insertions(+), 229 deletions(-)

commit 6ad8e8f8a6aa23b4d439db0a053f6b9c7c87fe19
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:09:58 2010 -0700

    update spacing

 docs/getting.started.rst |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

commit 5a4e4ecb28b338715c1b69a70887b9cf740cb0f7
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    implement image serving in objectstore so nginx isn't required in development
    
    reviewed by yosh

 nova/objectstore/handler.py |   26 ++++++++++++++++++++++++++
 nova/objectstore/image.py   |    4 ++++
 2 files changed, 30 insertions(+)

commit 13aef6666a17dbbe0c4645a30654ba023b9a434e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    update twitter username

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a34f3b8d57354dad42c048de939b97a14a93f8fa
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    make a "Running" topic instead of having it flow under "Configuration".

 docs/getting.started.rst |    3 +++
 1 file changed, 3 insertions(+)

commit e27df0af7b832d2daf8020e09ee26bb9ae3a2455
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    Make nginx config be in a code block.

 docs/getting.started.rst |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 605b3ea799053a15006ba70a202e0d303836acee
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    More doc updates: nginx & pycurl.

 docs/getting.started.rst |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 8d06bb6a6adbbe355b3c656fcd807ecc4bbe79af
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    Add a README, because GitHub loves them.  Update the getting started docs.

 README                   |   17 +++++++++++
 docs/getting.started.rst |   70 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 75 insertions(+), 12 deletions(-)

commit b81b0f2ecf3ef9bcba71a581ccd0ed3729398fba
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:08:25 2010 -0700

    update spacing

 docs/getting.started.rst |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

commit d6c78d600091f476e360371df033be7eda1b749b
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 19 22:05:28 2010 -0400

    Commit what I have almost working before diverging.

 bin/nova-rsapi             |   65 +++++++++++
 nova/endpoint/rackspace.py |  268 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 333 insertions(+)

commit aabc316aa734107e82a6dd0317028f9a254f24bc
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Jun 15 10:42:34 2010 -0700

    first go at moving from tornado to twisted

 nova/objectstore/handler.py |  169 +++++++++++++++++++++++++++++--------------
 1 file changed, 114 insertions(+), 55 deletions(-)

commit 0a5c5f8130fce42b1edcfb67c702e25f51aefa13
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Jun 12 18:24:27 2010 -0700

    implement image serving in objectstore so nginx isn't required in development
    
    reviewed by yosh

 nova/objectstore/handler.py |   26 ++++++++++++++++++++++++++
 nova/objectstore/image.py   |    4 ++++
 2 files changed, 30 insertions(+)

commit 6152e3ab712fd38789ea73515f3957c9817a4dfa
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Jun 12 17:06:35 2010 -0700

    update twitter username

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b10dac3ae0e8be0f12538d9d2c06064878fa24d6
Merge: 56a58cc 1c61272
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Jun 12 17:05:20 2010 -0700

    Update documentation

commit 7275c83c5c0e56e041ba3f81a6176bc86156b02a
Merge: a53546a a690001
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:07:07 2010 -0700

    Merge branch 'loop' into combined

commit a53546aa6b6120abacce5dc91d66b5c9b19bb693
Merge: 37f0d53 1a712d9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:07:04 2010 -0700

    Merge branch 'deprecation' into combined

commit 37f0d53b9313eed057a2ed8c1677a8c815a8636f
Merge: 42b3dd5 d1312e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:06:35 2010 -0700

    Merge branch '4001' into combined

commit 42b3dd56aa14f2ac626fdc79320053a62ec13171
Merge: 835c985 146e8c9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:06:14 2010 -0700

    Merge branch 'gateway' into combined

commit 1a712d9c44aa8124524245ce4744a9c39cee03a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 11:13:23 2010 -0700

    fix for reactor.spawnProcess sending deprecation warning

 nova/process.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit d1312e964d7b4dfe854837e68fb03cb4aa9723a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 11:09:45 2010 -0700

    patch from issue 4001

 nova/compute/disk.py |   85 +++++++++++++---------
 nova/compute/node.py |  193 +++++++++++++++++++++++++-------------------------
 2 files changed, 150 insertions(+), 128 deletions(-)

commit a690001006d852b19f7ba32367b1113046a3eb96
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 11:07:52 2010 -0700

    Fix for LoopingCall failing
    Added in exception logging around amqp calls
    Creating deferred in receive before ack() message
    was causing IOError (interrupted system calls), probably
    because the same message was getting processed twice
    in some situations, causing the system calls to be doubled.
    Moving the ack() earlier fixed the problem.
    The code works now with an interval of 0 but that causes heavy
    processor usage.
    An interval of 0.01 keeps the cpu usage within reasonable limits

 nova/rpc.py |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 9c6e1d664843b4f9d8cf2c942d7cf1db21ad3bbc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:48:16 2010 -0700

    get rid of anyjson in rpc and fix bad reference to rpc.Connection

 nova/rpc.py |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

commit 146e8c99cd2214c2d59534e6e7ecfc4e0679863a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:46:41 2010 -0700

    gateway undefined

 nova/compute/network.py |    3 +++
 1 file changed, 3 insertions(+)

commit 835c985b448954dfde4492acf5900e83c1f32923
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:45:31 2010 -0700

    fix cloud instances method

 nova/endpoint/cloud.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 8f06d9b2eddb3cffc627b874de2c9e0f1348f30b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:45:12 2010 -0700

    Various cloud fixes

 nova/endpoint/cloud.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 713dd94f51a1bf8fd147a71f92a518ba26f9b22b
Merge: 716673f 56a58cc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:08:40 2010 -0700

    Merge remote branch 'nova/master'

commit 716673f9bb09a61aa0136aeac0c6ca5b3d91d141
Author: andy <code@term.ie>
Date:   Fri Jun 11 10:08:13 2010 +0100

    make get_my_ip return 127.0.0.1 for testing

 nova/utils.py |    2 ++
 1 file changed, 2 insertions(+)

commit b07af87974052abcbb12c0531b22fe9be416a498
Author: andy <code@term.ie>
Date:   Fri Jun 11 10:04:06 2010 +0100

    Adds a Twisted implementation of a process pool
    
    Meant for use instead of utils.execute()

 nova/process.py                |  113 ++++++++++++++++++++++++++++++++++++---
 nova/tests/process_unittest.py |  115 ++++++++++++++++++++++++++++++++++++++++
 run_tests.py                   |    1 +
 3 files changed, 223 insertions(+), 6 deletions(-)

commit 1c61272d29f30a73f701c219a7b669c67f4cb447
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 10 22:14:23 2010 -0400

    make a "Running" topic instead of having it flow under "Configuration".

 docs/getting.started.rst |    3 +++
 1 file changed, 3 insertions(+)

commit 701f7fd6e1eac0c18c87d794dc762f39eaa74a09
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 10 22:12:51 2010 -0400

    Make nginx config be in a code block.

 docs/getting.started.rst |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 0da7b9b0e50f049980ca1eef637d0a056f55fdb1
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 10 20:41:41 2010 -0400

    More doc updates: nginx & pycurl.

 docs/getting.started.rst |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

commit 93395272def228fd9721a770fc585e414827f129
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 10 17:43:44 2010 -0400

    Add a README, because GitHub loves them.  Update the getting started docs.

 README                   |   17 +++++++++++
 docs/getting.started.rst |   71 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 12 deletions(-)

commit 3b594c7cd3c8054ca3b210198162d895aacee179
Author: andy <code@term.ie>
Date:   Thu Jun 10 18:39:07 2010 +0100

    whitespace fixes for nova/utils.py

 nova/utils.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 56a58cc42100ffdc5287e153ce6bf6d10f52637b
Merge: 9b11ac0 79bda65
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 14:36:03 2010 -0700

    Merge branch 'master' into net

commit 79bda65d4e529b132cf2fd599d41d0643f694c52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 13:48:06 2010 -0700

    Add project methods to nova-manage

 bin/nova-manage |   33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

commit df1a4c618b56ff611ab1a7c117f68a162b324db1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 13:47:10 2010 -0700

    Fix novarc to use project when creating access key

 nova/auth/novarc.template |    8 ++++----
 nova/auth/users.py        |   16 ++++++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

commit 9b11ac06cbc0f7af75a87b163b35009e4062d0b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 08:21:31 2010 -0700

    removed reference to nonexistent flag

 nova/compute/network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f04c6ab2d082ce8fe48ec58cb5c7cc64ed2a282b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon May 31 18:56:20 2010 -0700

    Josh's networking refactor, modified to work with projects

 nova/compute/linux_net.py      |   69 ++---
 nova/compute/network.py        |  644 +++++++++++++++++-----------------------
 nova/compute/node.py           |   38 +--
 nova/datastore.py              |    4 +-
 nova/endpoint/cloud.py         |   45 +--
 nova/tests/network_unittest.py |   77 ++---
 6 files changed, 362 insertions(+), 515 deletions(-)

commit 94518726fbb850ad5e81a7f937e197052f26bef2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun May 30 15:21:34 2010 -0700

    Merged Vish's work on adding projects to nova

 nova/auth/access.py                |   69 -----
 nova/auth/fakeldap.py              |   70 ++++-
 nova/auth/rbac.ldif                |   60 ----
 nova/auth/signer.py                |   32 +--
 nova/auth/slap.sh                  |   56 ++--
 nova/auth/users.py                 |  542 +++++++++++++++++++++++++-----------
 nova/compute/linux_net.py          |   34 ++-
 nova/compute/model.py              |   61 ++--
 nova/compute/network.py            |  101 ++++---
 nova/compute/node.py               |   18 +-
 nova/crypto.py                     |   23 +-
 nova/datastore.py                  |   10 +
 nova/endpoint/admin.py             |   29 +-
 nova/endpoint/api.py               |   45 +--
 nova/endpoint/cloud.py             |  221 ++++++++-------
 nova/endpoint/images.py            |   39 ++-
 nova/exception.py                  |   23 +-
 nova/fakerabbit.py                 |   18 +-
 nova/objectstore/bucket.py         |   20 +-
 nova/objectstore/handler.py        |   44 +--
 nova/objectstore/image.py          |    8 +-
 nova/tests/access_unittest.py      |   60 ----
 nova/tests/api_integration.py      |   13 +-
 nova/tests/cloud_unittest.py       |   38 +--
 nova/tests/network_unittest.py     |   88 +++---
 nova/tests/node_unittest.py        |   36 ++-
 nova/tests/objectstore_unittest.py |   57 ++--
 nova/tests/users_unittest.py       |   53 +++-
 nova/volume/storage.py             |   13 +-
 run_tests.py                       |    1 -
 30 files changed, 1018 insertions(+), 864 deletions(-)

commit fd278ade0bf19ba9deba65976ce6af7c59c4443a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun May 30 14:12:04 2010 -0700

    missed the gitignore

 .gitignore |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit bf6e6e718cdc7488e2da87b21e258ccc065fe499
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu May 27 23:05:26 2010 -0700

    initial commit

 CA/.gitignore                                      |   11 +
 CA/INTER/.gitignore                                |    1 +
 CA/geninter.sh                                     |   30 +
 CA/genrootca.sh                                    |   26 +
 CA/openssl.cnf.tmpl                                |   87 +
 CA/reqs/.gitignore                                 |    1 +
 HACKING                                            |   53 +
 LICENSE                                            |  176 +
 bin/nova-api                                       |   63 +
 bin/nova-compute                                   |   97 +
 bin/nova-manage                                    |  158 +
 bin/nova-objectstore                               |   49 +
 bin/nova-volume                                    |   68 +
 debian/changelog                                   |    6 +
 debian/compat                                      |    1 +
 debian/control                                     |   40 +
 debian/nova-api.init                               |   69 +
 debian/nova-api.install                            |    1 +
 debian/nova-common.install                         |    4 +
 debian/nova-compute.init                           |   69 +
 debian/nova-compute.install                        |    1 +
 debian/nova-objectstore.init                       |   69 +
 debian/nova-objectstore.install                    |    1 +
 debian/nova-volume.init                            |   69 +
 debian/nova-volume.install                         |    1 +
 debian/pycompat                                    |    1 +
 debian/pyversions                                  |    1 +
 debian/rules                                       |    4 +
 docs/.gitignore                                    |    1 +
 docs/Makefile                                      |   89 +
 docs/_build/.gitignore                             |    1 +
 docs/architecture.rst                              |   46 +
 docs/auth.rst                                      |  213 +
 docs/binaries.rst                                  |   29 +
 docs/compute.rst                                   |   72 +
 docs/conf.py                                       |  202 +
 docs/endpoint.rst                                  |   89 +
 docs/fakes.rst                                     |   41 +
 docs/getting.started.rst                           |   70 +
 docs/index.rst                                     |   53 +
 docs/modules.rst                                   |   32 +
 docs/network.rst                                   |   86 +
 docs/nova.rst                                      |   89 +
 docs/objectstore.rst                               |   64 +
 docs/packages.rst                                  |   27 +
 docs/storage.rst                                   |   29 +
 docs/volume.rst                                    |   43 +
 nova/__init__.py                                   |   30 +
 nova/adminclient.py                                |  113 +
 nova/auth/__init__.py                              |   25 +
 nova/auth/access.py                                |   69 +
 nova/auth/fakeldap.py                              |   81 +
 nova/auth/novarc.template                          |   26 +
 nova/auth/rbac.ldif                                |   60 +
 nova/auth/signer.py                                |  127 +
 nova/auth/slap.sh                                  |  226 +
 nova/auth/users.py                                 |  454 ++
 nova/compute/__init__.py                           |   28 +
 nova/compute/disk.py                               |  122 +
 nova/compute/exception.py                          |   35 +
 nova/compute/fakevirtinstance.xml                  |   43 +
 nova/compute/libvirt.xml.template                  |   46 +
 nova/compute/linux_net.py                          |  146 +
 nova/compute/model.py                              |  203 +
 nova/compute/network.py                            |  520 ++
 nova/compute/node.py                               |  549 ++
 nova/crypto.py                                     |  224 +
 nova/datastore.py                                  |  367 ++
 nova/endpoint/__init__.py                          |   28 +
 nova/endpoint/admin.py                             |  131 +
 nova/endpoint/api.py                               |  337 ++
 nova/endpoint/cloud.py                             |  572 ++
 nova/endpoint/images.py                            |   92 +
 nova/exception.py                                  |   53 +
 nova/fakerabbit.py                                 |  131 +
 nova/fakevirt.py                                   |  109 +
 nova/flags.py                                      |   78 +
 nova/objectstore/__init__.py                       |   28 +
 nova/objectstore/bucket.py                         |  174 +
 nova/objectstore/handler.py                        |  285 +
 nova/objectstore/image.py                          |  177 +
 nova/objectstore/stored.py                         |   58 +
 nova/process.py                                    |  131 +
 nova/rpc.py                                        |  222 +
 nova/server.py                                     |  139 +
 nova/test.py                                       |  246 +
 nova/tests/CA/cacert.pem                           |   17 +
 nova/tests/CA/private/cakey.pem                    |   15 +
 nova/tests/__init__.py                             |   27 +
 nova/tests/access_unittest.py                      |   60 +
 nova/tests/api_integration.py                      |   50 +
 nova/tests/api_unittest.py                         |  189 +
 nova/tests/bundle/1mb.manifest.xml                 |    1 +
 nova/tests/bundle/1mb.part.0                       |  Bin 0 -> 1024 bytes
 nova/tests/bundle/1mb.part.1                       |    1 +
 nova/tests/cloud_unittest.py                       |  161 +
 nova/tests/datastore_unittest.py                   |   60 +
 nova/tests/fake_flags.py                           |   26 +
 nova/tests/future_unittest.py                      |   74 +
 nova/tests/keeper_unittest.py                      |   57 +
 nova/tests/network_unittest.py                     |  113 +
 nova/tests/node_unittest.py                        |  128 +
 nova/tests/objectstore_unittest.py                 |  190 +
 nova/tests/real_flags.py                           |   24 +
 nova/tests/storage_unittest.py                     |   86 +
 nova/tests/users_unittest.py                       |  137 +
 nova/twistd.py                                     |  249 +
 nova/utils.py                                      |   96 +
 nova/vendor.py                                     |   43 +
 nova/volume/__init__.py                            |   27 +
 nova/volume/storage.py                             |  250 +
 run_tests.py                                       |   99 +
 setup.py                                           |   32 +
 vendor/IPy.py                                      | 1304 +++++
 vendor/Twisted-10.0.0/INSTALL                      |   32 +
 vendor/Twisted-10.0.0/LICENSE                      |   57 +
 vendor/Twisted-10.0.0/NEWS                         | 1416 +++++
 vendor/Twisted-10.0.0/README                       |  118 +
 vendor/Twisted-10.0.0/bin/.twistd.swp              |  Bin 0 -> 12288 bytes
 vendor/Twisted-10.0.0/bin/conch/cftp               |   20 +
 vendor/Twisted-10.0.0/bin/conch/ckeygen            |   20 +
 vendor/Twisted-10.0.0/bin/conch/conch              |   20 +
 vendor/Twisted-10.0.0/bin/conch/tkconch            |   20 +
 vendor/Twisted-10.0.0/bin/lore/lore                |   21 +
 vendor/Twisted-10.0.0/bin/mail/mailmail            |   25 +
 vendor/Twisted-10.0.0/bin/manhole                  |   21 +
 vendor/Twisted-10.0.0/bin/mktap                    |   18 +
 vendor/Twisted-10.0.0/bin/pyhtmlizer               |   17 +
 vendor/Twisted-10.0.0/bin/tap2deb                  |   20 +
 vendor/Twisted-10.0.0/bin/tap2rpm                  |   22 +
 vendor/Twisted-10.0.0/bin/tapconvert               |   18 +
 vendor/Twisted-10.0.0/bin/trial                    |   22 +
 vendor/Twisted-10.0.0/bin/twistd                   |   19 +
 vendor/Twisted-10.0.0/doc/conch/benchmarks/README  |   15 +
 .../doc/conch/benchmarks/buffering_mixin.py        |  182 +
 vendor/Twisted-10.0.0/doc/conch/examples/demo.tac  |   25 +
 .../doc/conch/examples/demo_draw.tac               |   80 +
 .../doc/conch/examples/demo_insults.tac            |  252 +
 .../doc/conch/examples/demo_manhole.tac            |   56 +
 .../doc/conch/examples/demo_recvline.tac           |   77 +
 .../doc/conch/examples/demo_scroll.tac             |  100 +
 .../Twisted-10.0.0/doc/conch/examples/index.html   |   40 +
 .../doc/conch/examples/sshsimpleclient.py          |  111 +
 .../doc/conch/examples/sshsimpleserver.py          |  117 +
 .../doc/conch/examples/telnet_echo.tac             |   37 +
 .../Twisted-10.0.0/doc/conch/examples/window.tac   |  190 +
 .../doc/conch/howto/conch_client.html              |  318 ++
 vendor/Twisted-10.0.0/doc/conch/howto/index.html   |   28 +
 vendor/Twisted-10.0.0/doc/conch/index.html         |   25 +
 vendor/Twisted-10.0.0/doc/conch/man/cftp-man.html  |   87 +
 vendor/Twisted-10.0.0/doc/conch/man/cftp.1         |   89 +
 .../Twisted-10.0.0/doc/conch/man/ckeygen-man.html  |  107 +
 vendor/Twisted-10.0.0/doc/conch/man/ckeygen.1      |   58 +
 vendor/Twisted-10.0.0/doc/conch/man/conch-man.html |  148 +
 vendor/Twisted-10.0.0/doc/conch/man/conch.1        |  206 +
 .../Twisted-10.0.0/doc/conch/man/tkconch-man.html  |  129 +
 vendor/Twisted-10.0.0/doc/conch/man/tkconch.1      |   72 +
 .../Twisted-10.0.0/doc/core/benchmarks/banana.py   |   10 +
 .../doc/core/benchmarks/deferreds.py               |  145 +
 .../Twisted-10.0.0/doc/core/benchmarks/failure.py  |   66 +
 .../doc/core/benchmarks/linereceiver.py            |   47 +
 vendor/Twisted-10.0.0/doc/core/benchmarks/task.py  |   26 +
 vendor/Twisted-10.0.0/doc/core/benchmarks/timer.py |   24 +
 .../Twisted-10.0.0/doc/core/benchmarks/tpclient.py |   60 +
 .../doc/core/benchmarks/tpclient_nt.py             |   22 +
 .../Twisted-10.0.0/doc/core/benchmarks/tpserver.py |   19 +
 .../doc/core/benchmarks/tpserver_nt.py             |   22 +
 .../Twisted-10.0.0/doc/core/development/index.html |   27 +
 .../development/listings/new_module_template.py    |   12 +
 .../doc/core/development/naming.html               |   38 +
 .../doc/core/development/philosophy.html           |   58 +
 .../core/development/policy/coding-standard.html   |  809 +++
 .../doc/core/development/policy/doc-standard.html  |  188 +
 .../doc/core/development/policy/index.html         |   33 +
 .../doc/core/development/policy/svn-dev.html       |  227 +
 .../doc/core/development/policy/test-standard.html |  362 ++
 .../core/development/policy/writing-standard.html  |  313 ++
 .../doc/core/development/security.html             |   43 +
 .../Twisted-10.0.0/doc/core/examples/ampclient.py  |   26 +
 .../Twisted-10.0.0/doc/core/examples/ampserver.py  |   40 +
 .../doc/core/examples/bananabench.py               |   79 +
 .../Twisted-10.0.0/doc/core/examples/chatserver.py |   37 +
 vendor/Twisted-10.0.0/doc/core/examples/courier.py |  111 +
 vendor/Twisted-10.0.0/doc/core/examples/cred.py    |  163 +
 vendor/Twisted-10.0.0/doc/core/examples/dbcred.py  |  179 +
 .../Twisted-10.0.0/doc/core/examples/echoclient.py |   41 +
 .../doc/core/examples/echoclient_ssl.py            |   46 +
 .../doc/core/examples/echoclient_udp.py            |   38 +
 .../Twisted-10.0.0/doc/core/examples/echoserv.py   |   27 +
 .../doc/core/examples/echoserv_ssl.py              |   30 +
 .../doc/core/examples/echoserv_udp.py              |   19 +
 .../Twisted-10.0.0/doc/core/examples/filewatch.py  |   17 +
 .../Twisted-10.0.0/doc/core/examples/ftpclient.py  |  113 +
 .../Twisted-10.0.0/doc/core/examples/ftpserver.py  |   55 +
 vendor/Twisted-10.0.0/doc/core/examples/gpsfix.py  |   78 +
 vendor/Twisted-10.0.0/doc/core/examples/index.html |  127 +
 vendor/Twisted-10.0.0/doc/core/examples/longex.py  |   66 +
 vendor/Twisted-10.0.0/doc/core/examples/longex2.py |  101 +
 vendor/Twisted-10.0.0/doc/core/examples/mouse.py   |   80 +
 .../doc/core/examples/pb_exceptions.py             |   36 +
 .../doc/core/examples/pbbenchclient.py             |   42 +
 .../doc/core/examples/pbbenchserver.py             |   54 +
 vendor/Twisted-10.0.0/doc/core/examples/pbecho.py  |   51 +
 .../doc/core/examples/pbechoclient.py              |   32 +
 vendor/Twisted-10.0.0/doc/core/examples/pbgtk2.py  |  122 +
 .../doc/core/examples/pbgtk2login.glade            |  330 ++
 .../Twisted-10.0.0/doc/core/examples/pbinterop.py  |   71 +
 .../Twisted-10.0.0/doc/core/examples/pbsimple.py   |   16 +
 .../doc/core/examples/pbsimpleclient.py            |   18 +
 vendor/Twisted-10.0.0/doc/core/examples/postfix.py |   29 +
 vendor/Twisted-10.0.0/doc/core/examples/ptyserv.py |   32 +
 .../Twisted-10.0.0/doc/core/examples/pyui_bg.png   |  Bin 0 -> 29913 bytes
 .../Twisted-10.0.0/doc/core/examples/pyuidemo.py   |   31 +
 .../doc/core/examples/rotatinglog.py               |   26 +
 .../doc/core/examples/row_example.py               |  105 +
 .../doc/core/examples/row_schema.sql               |   65 +
 .../Twisted-10.0.0/doc/core/examples/row_util.py   |  103 +
 vendor/Twisted-10.0.0/doc/core/examples/server.pem |   36 +
 vendor/Twisted-10.0.0/doc/core/examples/shaper.py  |   52 +
 .../Twisted-10.0.0/doc/core/examples/shoutcast.py  |   26 +
 vendor/Twisted-10.0.0/doc/core/examples/simple.tac |   39 +
 .../doc/core/examples/simpleclient.py              |   49 +
 .../Twisted-10.0.0/doc/core/examples/simpleserv.py |   26 +
 vendor/Twisted-10.0.0/doc/core/examples/stdin.py   |   30 +
 .../Twisted-10.0.0/doc/core/examples/stdiodemo.py  |   78 +
 .../doc/core/examples/testlogging.py               |   41 +
 .../English.lproj/MainMenu.nib/classes.nib         |   13 +
 .../English.lproj/MainMenu.nib/info.nib            |   24 +
 .../English.lproj/MainMenu.nib/keyedobjects.nib    |  Bin 0 -> 14896 bytes
 .../Cocoa/SimpleWebClient/README.txt               |    6 +
 .../Cocoa/SimpleWebClient/Twistzilla.py            |   79 +
 .../threadedselect/Cocoa/SimpleWebClient/setup.py  |   14 +
 .../doc/core/examples/threadedselect/README        |   15 +
 .../core/examples/threadedselect/blockingdemo.py   |   92 +
 .../doc/core/examples/threadedselect/pygamedemo.py |   78 +
 .../doc/core/examples/twistd-logging.tac           |   33 +
 .../doc/core/examples/wxacceptance.py              |  113 +
 vendor/Twisted-10.0.0/doc/core/examples/wxdemo.py  |   64 +
 .../Twisted-10.0.0/doc/core/howto/application.html |  376 ++
 vendor/Twisted-10.0.0/doc/core/howto/basics.html   |   99 +
 vendor/Twisted-10.0.0/doc/core/howto/book.tex      |  116 +
 .../doc/core/howto/choosing-reactor.html           |  355 ++
 vendor/Twisted-10.0.0/doc/core/howto/clients.html  |  635 +++
 .../Twisted-10.0.0/doc/core/howto/components.html  |  600 ++
 vendor/Twisted-10.0.0/doc/core/howto/cred.html     |  566 ++
 .../doc/core/howto/debug-with-emacs.html           |   65 +
 vendor/Twisted-10.0.0/doc/core/howto/defer.html    |  840 +++
 .../doc/core/howto/deferredindepth.html            | 2183 ++++++++
 vendor/Twisted-10.0.0/doc/core/howto/design.html   |  257 +
 vendor/Twisted-10.0.0/doc/core/howto/dirdbm.html   |   77 +
 vendor/Twisted-10.0.0/doc/core/howto/gendefer.html |  415 ++
 vendor/Twisted-10.0.0/doc/core/howto/glossary.html |  347 ++
 vendor/Twisted-10.0.0/doc/core/howto/howto.tidyrc  |    6 +
 vendor/Twisted-10.0.0/doc/core/howto/index.html    |  198 +
 .../doc/core/howto/internet-overview.html          |   48 +
 .../core/howto/listings/TwistedQuotes/__init__.py  |    3 +
 .../core/howto/listings/TwistedQuotes/pbquote.py   |   10 +
 .../howto/listings/TwistedQuotes/pbquoteclient.py  |   32 +
 .../howto/listings/TwistedQuotes/quoteproto.py     |   36 +
 .../core/howto/listings/TwistedQuotes/quoters.py   |   39 +
 .../core/howto/listings/TwistedQuotes/quotes.txt   |   15 +
 .../core/howto/listings/TwistedQuotes/quotetap.py  |   29 +
 .../core/howto/listings/TwistedQuotes/quotetap2.py |   36 +
 .../core/howto/listings/TwistedQuotes/webquote.rpy |   12 +
 .../core/howto/listings/application/service.tac    |   34 +
 .../core/howto/listings/deferred/deferred_ex.py    |   60 +
 .../core/howto/listings/deferred/deferred_ex1a.py  |   73 +
 .../core/howto/listings/deferred/deferred_ex1b.py  |   79 +
 .../core/howto/listings/deferred/deferred_ex2.py   |   91 +
 .../core/howto/listings/deferred/deferred_ex3.py   |  100 +
 .../core/howto/listings/deferred/deferred_ex4.py   |  104 +
 .../core/howto/listings/deferred/deferred_ex5.py   |  136 +
 .../core/howto/listings/deferred/deferred_ex6.py   |  148 +
 .../core/howto/listings/deferred/deferred_ex7.py   |   61 +
 .../core/howto/listings/deferred/deferred_ex8.py   |   66 +
 .../howto/listings/deferred/synch-validation.py    |    5 +
 .../doc/core/howto/listings/pb/cache_classes.py    |   43 +
 .../doc/core/howto/listings/pb/cache_receiver.py   |   28 +
 .../doc/core/howto/listings/pb/cache_sender.py     |   50 +
 .../doc/core/howto/listings/pb/chatclient.py       |   40 +
 .../doc/core/howto/listings/pb/chatserver.py       |   65 +
 .../doc/core/howto/listings/pb/copy2_classes.py    |   29 +
 .../doc/core/howto/listings/pb/copy2_receiver.py   |   21 +
 .../doc/core/howto/listings/pb/copy2_sender.py     |   44 +
 .../doc/core/howto/listings/pb/copy_receiver.tac   |   41 +
 .../doc/core/howto/listings/pb/copy_sender.py      |   57 +
 .../doc/core/howto/listings/pb/exc_client.py       |   33 +
 .../doc/core/howto/listings/pb/exc_server.py       |   32 +
 .../doc/core/howto/listings/pb/pb1client.py        |   31 +
 .../doc/core/howto/listings/pb/pb1server.py        |   20 +
 .../doc/core/howto/listings/pb/pb2client.py        |   36 +
 .../doc/core/howto/listings/pb/pb2server.py        |   30 +
 .../doc/core/howto/listings/pb/pb3client.py        |   26 +
 .../doc/core/howto/listings/pb/pb3server.py        |   16 +
 .../doc/core/howto/listings/pb/pb4client.py        |   58 +
 .../doc/core/howto/listings/pb/pb5client.py        |   22 +
 .../doc/core/howto/listings/pb/pb5server.py        |   29 +
 .../doc/core/howto/listings/pb/pb6client1.py       |   22 +
 .../doc/core/howto/listings/pb/pb6client2.py       |   25 +
 .../doc/core/howto/listings/pb/pb6server.py        |   30 +
 .../doc/core/howto/listings/pb/pb7client.py        |   29 +
 .../doc/core/howto/listings/pb/pbAnonClient.py     |   70 +
 .../doc/core/howto/listings/pb/pbAnonServer.py     |   91 +
 .../doc/core/howto/listings/pb/trap_client.py      |   88 +
 .../doc/core/howto/listings/pb/trap_server.py      |   21 +
 .../doc/core/howto/listings/process/process.py     |   46 +
 .../doc/core/howto/listings/process/quotes.py      |   25 +
 .../core/howto/listings/process/trueandfalse.py    |   14 +
 .../doc/core/howto/listings/udp/MulticastClient.py |   13 +
 .../doc/core/howto/listings/udp/MulticastServer.py |   25 +
 vendor/Twisted-10.0.0/doc/core/howto/logging.html  |  181 +
 vendor/Twisted-10.0.0/doc/core/howto/options.html  |  533 ++
 vendor/Twisted-10.0.0/doc/core/howto/overview.html |   18 +
 .../Twisted-10.0.0/doc/core/howto/pb-copyable.html | 1195 ++++
 vendor/Twisted-10.0.0/doc/core/howto/pb-cred.html  | 1723 ++++++
 vendor/Twisted-10.0.0/doc/core/howto/pb-intro.html |  320 ++
 vendor/Twisted-10.0.0/doc/core/howto/pb-usage.html | 1158 ++++
 vendor/Twisted-10.0.0/doc/core/howto/pb.html       |   52 +
 vendor/Twisted-10.0.0/doc/core/howto/pclients.html |  364 ++
 vendor/Twisted-10.0.0/doc/core/howto/plugin.html   |  292 +
 vendor/Twisted-10.0.0/doc/core/howto/process.html  |  725 +++
 .../Twisted-10.0.0/doc/core/howto/producers.html   |   88 +
 vendor/Twisted-10.0.0/doc/core/howto/quotes.html   |  214 +
 vendor/Twisted-10.0.0/doc/core/howto/rdbms.html    |  228 +
 .../doc/core/howto/reactor-basics.html             |   92 +
 vendor/Twisted-10.0.0/doc/core/howto/row.html      |  279 +
 vendor/Twisted-10.0.0/doc/core/howto/servers.html  |  429 ++
 vendor/Twisted-10.0.0/doc/core/howto/ssl.html      |  550 ++
 .../doc/core/howto/stylesheet-unprocessed.css      |   20 +
 .../Twisted-10.0.0/doc/core/howto/stylesheet.css   |  189 +
 vendor/Twisted-10.0.0/doc/core/howto/tap.html      |  346 ++
 vendor/Twisted-10.0.0/doc/core/howto/telnet.html   |   83 +
 vendor/Twisted-10.0.0/doc/core/howto/template.tpl  |   23 +
 vendor/Twisted-10.0.0/doc/core/howto/testing.html  |  168 +
 .../Twisted-10.0.0/doc/core/howto/threading.html   |  213 +
 vendor/Twisted-10.0.0/doc/core/howto/time.html     |  118 +
 .../doc/core/howto/tutorial/backends.html          | 1207 +++++
 .../doc/core/howto/tutorial/client.html            |  260 +
 .../doc/core/howto/tutorial/components.html        | 1068 ++++
 .../doc/core/howto/tutorial/configuration.html     |  792 +++
 .../doc/core/howto/tutorial/factory.html           |  633 +++
 .../doc/core/howto/tutorial/index.html             |   83 +
 .../doc/core/howto/tutorial/intro.html             |  716 +++
 .../doc/core/howto/tutorial/library.html           |  269 +
 .../core/howto/tutorial/listings/finger/etc.users  |    2 +
 .../tutorial/listings/finger/finger/__init__.py    |    3 +
 .../tutorial/listings/finger/finger/finger.py      |  331 ++
 .../howto/tutorial/listings/finger/finger/tap.py   |   20 +
 .../howto/tutorial/listings/finger/finger01.py     |    2 +
 .../howto/tutorial/listings/finger/finger02.py     |   10 +
 .../howto/tutorial/listings/finger/finger03.py     |   11 +
 .../howto/tutorial/listings/finger/finger04.py     |   12 +
 .../howto/tutorial/listings/finger/finger05.py     |   13 +
 .../howto/tutorial/listings/finger/finger06.py     |   18 +
 .../howto/tutorial/listings/finger/finger07.py     |   21 +
 .../howto/tutorial/listings/finger/finger08.py     |   30 +
 .../howto/tutorial/listings/finger/finger09.py     |   26 +
 .../howto/tutorial/listings/finger/finger10.py     |   30 +
 .../howto/tutorial/listings/finger/finger11.tac    |   34 +
 .../howto/tutorial/listings/finger/finger12.tac    |   55 +
 .../howto/tutorial/listings/finger/finger13.tac    |   59 +
 .../howto/tutorial/listings/finger/finger14.tac    |   55 +
 .../howto/tutorial/listings/finger/finger15.tac    |   76 +
 .../howto/tutorial/listings/finger/finger16.tac    |   91 +
 .../howto/tutorial/listings/finger/finger17.tac    |   91 +
 .../howto/tutorial/listings/finger/finger18.tac    |  137 +
 .../howto/tutorial/listings/finger/finger19.tac    |  238 +
 .../howto/tutorial/listings/finger/finger19a.tac   |  231 +
 .../tutorial/listings/finger/finger19a_changes.py  |   29 +
 .../howto/tutorial/listings/finger/finger19b.tac   |  257 +
 .../tutorial/listings/finger/finger19b_changes.py  |   19 +
 .../howto/tutorial/listings/finger/finger19c.tac   |  269 +
 .../tutorial/listings/finger/finger19c_changes.py  |   32 +
 .../howto/tutorial/listings/finger/finger20.tac    |  251 +
 .../howto/tutorial/listings/finger/finger21.tac    |  280 +
 .../howto/tutorial/listings/finger/finger22.py     |  297 +
 .../tutorial/listings/finger/fingerPBclient.py     |   26 +
 .../tutorial/listings/finger/fingerXRclient.py     |    5 +
 .../tutorial/listings/finger/finger_config.py      |   38 +
 .../howto/tutorial/listings/finger/fingerproxy.tac |  110 +
 .../tutorial/listings/finger/organized-finger.tac  |   31 +
 .../tutorial/listings/finger/simple-finger.tac     |   17 +
 .../finger/twisted/plugins/finger_tutorial.py      |    5 +
 .../Twisted-10.0.0/doc/core/howto/tutorial/pb.html |  650 +++
 .../doc/core/howto/tutorial/protocol.html          | 1055 ++++
 .../doc/core/howto/tutorial/style.html             |  313 ++
 .../doc/core/howto/tutorial/web.html               |  537 ++
 vendor/Twisted-10.0.0/doc/core/howto/udp.html      |  275 +
 .../Twisted-10.0.0/doc/core/howto/upgrading.html   |  331 ++
 vendor/Twisted-10.0.0/doc/core/howto/vision.html   |   43 +
 .../doc/core/howto/website-template.tpl            |   22 +
 vendor/Twisted-10.0.0/doc/core/img/TwistedLogo.bmp |  Bin 0 -> 55494 bytes
 vendor/Twisted-10.0.0/doc/core/img/cred-login.dia  |  Bin 0 -> 2369 bytes
 vendor/Twisted-10.0.0/doc/core/img/cred-login.png  |  Bin 0 -> 34148 bytes
 .../doc/core/img/deferred-attach.dia               |  Bin 0 -> 2234 bytes
 .../doc/core/img/deferred-attach.png               |  Bin 0 -> 9356 bytes
 .../doc/core/img/deferred-process.dia              |  Bin 0 -> 2099 bytes
 .../doc/core/img/deferred-process.png              |  Bin 0 -> 10809 bytes
 vendor/Twisted-10.0.0/doc/core/img/deferred.dia    |  Bin 0 -> 4348 bytes
 vendor/Twisted-10.0.0/doc/core/img/deferred.png    |  Bin 0 -> 33282 bytes
 .../doc/core/img/twisted-overview.dia              |  Bin 0 -> 5984 bytes
 .../doc/core/img/twisted-overview.png              |  Bin 0 -> 50929 bytes
 vendor/Twisted-10.0.0/doc/core/index.html          |   33 +
 .../Twisted-10.0.0/doc/core/man/manhole-man.html   |   50 +
 vendor/Twisted-10.0.0/doc/core/man/manhole.1       |   16 +
 vendor/Twisted-10.0.0/doc/core/man/mktap-man.html  |  328 ++
 vendor/Twisted-10.0.0/doc/core/man/mktap.1         |  219 +
 .../doc/core/man/pyhtmlizer-man.html               |   51 +
 vendor/Twisted-10.0.0/doc/core/man/pyhtmlizer.1    |   22 +
 .../Twisted-10.0.0/doc/core/man/tap2deb-man.html   |  106 +
 vendor/Twisted-10.0.0/doc/core/man/tap2deb.1       |   57 +
 .../Twisted-10.0.0/doc/core/man/tap2rpm-man.html   |  107 +
 vendor/Twisted-10.0.0/doc/core/man/tap2rpm.1       |   58 +
 .../doc/core/man/tapconvert-man.html               |   82 +
 vendor/Twisted-10.0.0/doc/core/man/tapconvert.1    |   40 +
 vendor/Twisted-10.0.0/doc/core/man/trial-man.html  |  194 +
 vendor/Twisted-10.0.0/doc/core/man/trial.1         |  132 +
 vendor/Twisted-10.0.0/doc/core/man/twistd-man.html |  194 +
 vendor/Twisted-10.0.0/doc/core/man/twistd.1        |  123 +
 .../doc/core/specifications/banana.html            |  199 +
 .../doc/core/specifications/index.html             |   21 +
 .../doc/core/upgrades/2.0/components.html          |  115 +
 .../doc/core/upgrades/2.0/index.html               |   31 +
 .../doc/core/upgrades/2.0/split.html               |  163 +
 vendor/Twisted-10.0.0/doc/core/upgrades/index.html |   29 +
 vendor/Twisted-10.0.0/doc/fun/Twisted.Quotes       | 5722 ++++++++++++++++++++
 vendor/Twisted-10.0.0/doc/fun/lightbulb            |    7 +
 vendor/Twisted-10.0.0/doc/fun/register.html        |   77 +
 .../ipc10/twisted-network-framework/errata.html    |  256 +
 .../ipc10/twisted-network-framework/index.html     | 1568 ++++++
 .../doc/historic/2003/europython/doanddont.html    |  508 ++
 .../doc/historic/2003/europython/index.html        |   35 +
 .../doc/historic/2003/europython/lore.html         |  502 ++
 .../historic/2003/europython/slides-template.tpl   |   19 +
 .../doc/historic/2003/europython/tw-deploy.html    | 1106 ++++
 .../doc/historic/2003/europython/twisted.html      |  608 +++
 .../doc/historic/2003/europython/webclients.html   |  482 ++
 .../doc/historic/2003/haifux/haifux.html           | 2235 ++++++++
 .../doc/historic/2003/haifux/notes.html            |   60 +
 .../historic/2003/pycon/applications/applications  |  257 +
 .../2003/pycon/applications/applications.html      |  343 ++
 .../2003/pycon/applications/pynfo-chart.png        |  Bin 0 -> 13018 bytes
 .../doc/historic/2003/pycon/conch/conch            |   98 +
 .../doc/historic/2003/pycon/conch/conch.html       |  165 +
 .../doc/historic/2003/pycon/conch/conchtalk.txt    |  144 +
 .../doc/historic/2003/pycon/conch/smalltwisted.png |  Bin 0 -> 1472 bytes
 .../doc/historic/2003/pycon/conch/twistedlogo.png  |  Bin 0 -> 7256 bytes
 .../2003/pycon/deferex/deferex-bad-adding.py       |    8 +
 .../2003/pycon/deferex/deferex-chaining.py         |   13 +
 .../2003/pycon/deferex/deferex-complex-failure.py  |   30 +
 .../2003/pycon/deferex/deferex-complex-raise.py    |   12 +
 .../2003/pycon/deferex/deferex-forwarding.py       |    9 +
 .../2003/pycon/deferex/deferex-listing0.py         |   18 +
 .../2003/pycon/deferex/deferex-listing1.py         |    6 +
 .../2003/pycon/deferex/deferex-listing2.py         |    8 +
 .../2003/pycon/deferex/deferex-simple-failure.py   |    9 +
 .../2003/pycon/deferex/deferex-simple-raise.py     |    3 +
 .../doc/historic/2003/pycon/deferex/deferex.html   |  499 ++
 .../doc/historic/2003/pycon/deferex/deferexex.py   |   16 +
 .../intrinsics-lightning/intrinsics-lightning      |   97 +
 .../doc/historic/2003/pycon/lore/lore-presentation |  108 +
 .../doc/historic/2003/pycon/lore/lore-slides.html  |  187 +
 .../doc/historic/2003/pycon/lore/lore.html         |  791 +++
 .../doc/historic/2003/pycon/pb/pb-client1.py       |   46 +
 .../doc/historic/2003/pycon/pb/pb-server1.py       |   16 +
 .../doc/historic/2003/pycon/pb/pb-slides.py        |  240 +
 .../doc/historic/2003/pycon/pb/pb.html             |  966 ++++
 .../2003/pycon/releasing/releasing-twisted         |  151 +
 .../historic/2003/pycon/releasing/releasing.html   |  491 ++
 .../doc/historic/2003/pycon/tw-deploy/tw-deploy    |  184 +
 .../2003/pycon/tw-deploy/twisted-overview.png      |  Bin 0 -> 12722 bytes
 .../historic/2003/pycon/tw-deploy/twistedlogo.png  |  Bin 0 -> 7256 bytes
 .../pycon/twisted-internet/twisted-internet.py     |  541 ++
 .../2003/pycon/twisted-reality/componentized.svg   |  254 +
 .../pycon/twisted-reality/twisted-reality.html     |  578 ++
 .../Twisted-10.0.0/doc/historic/2004/ibm/talk.html |  495 ++
 vendor/Twisted-10.0.0/doc/historic/index.html      |  128 +
 .../Twisted-10.0.0/doc/historic/ipc10errata.html   |  256 +
 vendor/Twisted-10.0.0/doc/historic/ipc10paper.html | 1568 ++++++
 vendor/Twisted-10.0.0/doc/historic/stylesheet.css  |  178 +
 .../Twisted-10.0.0/doc/historic/template-notoc.tpl |   14 +
 vendor/Twisted-10.0.0/doc/historic/template.tpl    |   20 +
 .../doc/historic/twisted-debian.html               |   96 +
 .../Twisted-10.0.0/doc/lore/examples/example.html  |   60 +
 vendor/Twisted-10.0.0/doc/lore/examples/index.html |   22 +
 .../doc/lore/examples/slides-template.tpl          |   21 +
 .../Twisted-10.0.0/doc/lore/howto/extend-lore.html |  425 ++
 vendor/Twisted-10.0.0/doc/lore/howto/index.html    |   23 +
 .../doc/lore/howto/listings/lore/1st_example.html  |   12 +
 .../doc/lore/howto/listings/lore/a_lore_plugin.py  |   11 +
 .../doc/lore/howto/listings/lore/factory.py-1      |    9 +
 .../doc/lore/howto/listings/lore/factory.py-2      |   20 +
 .../doc/lore/howto/listings/lore/factory.py-3      |   21 +
 .../doc/lore/howto/listings/lore/spitters.py-1     |   18 +
 .../doc/lore/howto/listings/lore/spitters.py-2     |   26 +
 vendor/Twisted-10.0.0/doc/lore/howto/lore.html     |  366 ++
 .../Twisted-10.0.0/doc/lore/img/myhtml-output.png  |  Bin 0 -> 23124 bytes
 vendor/Twisted-10.0.0/doc/lore/index.html          |   25 +
 vendor/Twisted-10.0.0/doc/lore/man/lore-man.html   |  124 +
 vendor/Twisted-10.0.0/doc/lore/man/lore.1          |   74 +
 .../doc/mail/examples/emailserver.tac              |   72 +
 .../doc/mail/examples/imap4client.py               |  181 +
 vendor/Twisted-10.0.0/doc/mail/examples/index.html |   35 +
 .../doc/mail/examples/smtpclient_tls.py            |  157 +
 vendor/Twisted-10.0.0/doc/mail/index.html          |   25 +
 .../Twisted-10.0.0/doc/mail/man/mailmail-man.html  |   55 +
 vendor/Twisted-10.0.0/doc/mail/man/mailmail.1      |   21 +
 .../doc/mail/tutorial/smtpclient/smtpclient-1.tac  |    3 +
 .../doc/mail/tutorial/smtpclient/smtpclient-10.tac |   56 +
 .../doc/mail/tutorial/smtpclient/smtpclient-11.tac |   58 +
 .../doc/mail/tutorial/smtpclient/smtpclient-2.tac  |   10 +
 .../doc/mail/tutorial/smtpclient/smtpclient-3.tac  |   10 +
 .../doc/mail/tutorial/smtpclient/smtpclient-4.tac  |   12 +
 .../doc/mail/tutorial/smtpclient/smtpclient-5.tac  |   14 +
 .../doc/mail/tutorial/smtpclient/smtpclient-6.tac  |   18 +
 .../doc/mail/tutorial/smtpclient/smtpclient-7.tac  |   46 +
 .../doc/mail/tutorial/smtpclient/smtpclient-8.tac  |   49 +
 .../doc/mail/tutorial/smtpclient/smtpclient-9.tac  |   53 +
 .../doc/mail/tutorial/smtpclient/smtpclient.html   |  752 +++
 .../doc/mail/tutorial/smtpserver/smtpserver-1.tac  |    3 +
 .../doc/mail/tutorial/smtpserver/smtpserver-2.tac  |   10 +
 .../doc/mail/tutorial/smtpserver/smtpserver-3.tac  |   12 +
 .../doc/mail/tutorial/smtpserver/smtpserver-4.tac  |   14 +
 .../doc/mail/tutorial/smtpserver/smtpserver-5.tac  |   50 +
 .../doc/mail/tutorial/smtpserver/smtpserver-6.tac  |   57 +
 .../doc/mail/tutorial/smtpserver/smtpserver-7.tac  |   57 +
 .../doc/mail/tutorial/smtpserver/smtpserver-8.tac  |   63 +
 .../doc/names/examples/dns-service.py              |   36 +
 .../doc/names/examples/gethostbyname.py            |   21 +
 .../Twisted-10.0.0/doc/names/examples/index.html   |   24 +
 .../Twisted-10.0.0/doc/names/examples/testdns.py   |   38 +
 vendor/Twisted-10.0.0/doc/names/howto/index.html   |   22 +
 .../names/howto/listings/names/example-domain.com  |   37 +
 vendor/Twisted-10.0.0/doc/names/howto/names.html   |  134 +
 vendor/Twisted-10.0.0/doc/names/index.html         |   25 +
 vendor/Twisted-10.0.0/doc/pair/examples/index.html |   23 +
 vendor/Twisted-10.0.0/doc/pair/examples/pairudp.py |   18 +
 vendor/Twisted-10.0.0/doc/pair/howto/index.html    |   27 +
 .../doc/pair/howto/twisted-pair.html               |   79 +
 vendor/Twisted-10.0.0/doc/pair/index.html          |   23 +
 vendor/Twisted-10.0.0/doc/web/examples/advogato.py |   45 +
 vendor/Twisted-10.0.0/doc/web/examples/dlpage.py   |    9 +
 .../Twisted-10.0.0/doc/web/examples/fortune.rpy.py |   17 +
 vendor/Twisted-10.0.0/doc/web/examples/getpage.py  |    9 +
 vendor/Twisted-10.0.0/doc/web/examples/google.py   |    9 +
 .../Twisted-10.0.0/doc/web/examples/hello.rpy.py   |   28 +
 .../Twisted-10.0.0/doc/web/examples/httpclient.py  |   54 +
 vendor/Twisted-10.0.0/doc/web/examples/index.html  |   96 +
 vendor/Twisted-10.0.0/doc/web/examples/lj.rpy.py   |   35 +
 vendor/Twisted-10.0.0/doc/web/examples/proxy.py    |   11 +
 .../Twisted-10.0.0/doc/web/examples/report.rpy.py  |   28 +
 .../Twisted-10.0.0/doc/web/examples/rootscript.py  |    9 +
 .../Twisted-10.0.0/doc/web/examples/silly-web.py   |   18 +
 vendor/Twisted-10.0.0/doc/web/examples/simple.rtl  |   23 +
 vendor/Twisted-10.0.0/doc/web/examples/soap.py     |   41 +
 .../Twisted-10.0.0/doc/web/examples/users.rpy.py   |   18 +
 .../Twisted-10.0.0/doc/web/examples/vhost.rpy.py   |    4 +
 vendor/Twisted-10.0.0/doc/web/examples/web.py      |   27 +
 vendor/Twisted-10.0.0/doc/web/examples/webguard.py |   54 +
 vendor/Twisted-10.0.0/doc/web/examples/xmlrpc.py   |   67 +
 .../doc/web/examples/xmlrpcclient.py               |   23 +
 vendor/Twisted-10.0.0/doc/web/howto/client.html    |  469 ++
 .../Twisted-10.0.0/doc/web/howto/formindepth.html  |   20 +
 vendor/Twisted-10.0.0/doc/web/howto/glossary.html  |   42 +
 vendor/Twisted-10.0.0/doc/web/howto/index.html     |   50 +
 .../doc/web/howto/listings/client/request.py       |   21 +
 .../doc/web/howto/listings/client/response.py      |   47 +
 .../doc/web/howto/listings/client/sendbody.py      |   24 +
 .../doc/web/howto/listings/client/stringprod.py    |   21 +
 .../Twisted-10.0.0/doc/web/howto/listings/soap.rpy |   13 +
 .../doc/web/howto/listings/webquote.rtl            |   20 +
 .../doc/web/howto/listings/xmlAndSoapQuote.py      |   25 +
 .../doc/web/howto/listings/xmlquote.rpy            |   12 +
 .../doc/web/howto/resource-templates.html          |  103 +
 .../doc/web/howto/using-twistedweb.html            |  972 ++++
 .../doc/web/howto/web-development.html             |  106 +
 .../web/howto/web-in-60/asynchronous-deferred.html |  161 +
 .../doc/web/howto/web-in-60/asynchronous.html      |  121 +
 .../doc/web/howto/web-in-60/custom-codes.html      |  118 +
 .../doc/web/howto/web-in-60/dynamic-content.html   |  120 +
 .../doc/web/howto/web-in-60/dynamic-dispatch.html  |  142 +
 .../doc/web/howto/web-in-60/error-handling.html    |  129 +
 .../doc/web/howto/web-in-60/handling-posts.html    |  137 +
 .../doc/web/howto/web-in-60/http-auth.html         |  250 +
 .../doc/web/howto/web-in-60/index.html             |   44 +
 .../doc/web/howto/web-in-60/interrupted.html       |  141 +
 .../doc/web/howto/web-in-60/logging-errors.html    |  104 +
 .../doc/web/howto/web-in-60/rpy-scripts.html       |   86 +
 .../doc/web/howto/web-in-60/session-basics.html    |  120 +
 .../doc/web/howto/web-in-60/session-endings.html   |  170 +
 .../doc/web/howto/web-in-60/session-store.html     |  180 +
 .../doc/web/howto/web-in-60/static-content.html    |  102 +
 .../doc/web/howto/web-in-60/static-dispatch.html   |  118 +
 .../doc/web/howto/web-in-60/wsgi.html              |  123 +
 .../Twisted-10.0.0/doc/web/howto/web-overview.html |   67 +
 vendor/Twisted-10.0.0/doc/web/howto/xmlrpc.html    |  457 ++
 vendor/Twisted-10.0.0/doc/web/img/controller.png   |  Bin 0 -> 14934 bytes
 vendor/Twisted-10.0.0/doc/web/img/livepage.png     |  Bin 0 -> 9363 bytes
 vendor/Twisted-10.0.0/doc/web/img/model.png        |  Bin 0 -> 14971 bytes
 .../doc/web/img/plone_root_model.png               |  Bin 0 -> 11214 bytes
 vendor/Twisted-10.0.0/doc/web/img/view.png         |  Bin 0 -> 14703 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-overview.dia |  Bin 0 -> 1630 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-overview.png |  Bin 0 -> 7330 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-process.png  |  Bin 0 -> 30404 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-process.svg  |  594 ++
 vendor/Twisted-10.0.0/doc/web/img/web-session.png  |  Bin 0 -> 8966 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-widgets.dia  |  Bin 0 -> 1326 bytes
 vendor/Twisted-10.0.0/doc/web/img/web-widgets.png  |  Bin 0 -> 3147 bytes
 vendor/Twisted-10.0.0/doc/web/index.html           |   25 +
 vendor/Twisted-10.0.0/doc/words/examples/aimbot.py |   62 +
 .../doc/words/examples/cursesclient.py             |  188 +
 .../Twisted-10.0.0/doc/words/examples/index.html   |   30 +
 .../Twisted-10.0.0/doc/words/examples/ircLogBot.py |  156 +
 .../doc/words/examples/jabber_client.py            |   29 +
 .../Twisted-10.0.0/doc/words/examples/minchat.py   |  126 +
 .../doc/words/examples/msn_example.py              |   67 +
 .../Twisted-10.0.0/doc/words/examples/oscardemo.py |  100 +
 .../Twisted-10.0.0/doc/words/examples/pb_client.py |  102 +
 .../doc/words/examples/xmpp_client.py              |   82 +
 vendor/Twisted-10.0.0/doc/words/howto/im.html      |  115 +
 vendor/Twisted-10.0.0/doc/words/howto/index.html   |   22 +
 vendor/Twisted-10.0.0/doc/words/index.html         |   25 +
 vendor/Twisted-10.0.0/doc/words/man/im-man.html    |   50 +
 vendor/Twisted-10.0.0/doc/words/man/im.1           |   16 +
 vendor/Twisted-10.0.0/setup.py                     |  100 +
 vendor/Twisted-10.0.0/twisted/__init__.py          |   24 +
 vendor/Twisted-10.0.0/twisted/_version.py          |    3 +
 .../Twisted-10.0.0/twisted/application/__init__.py |    7 +
 vendor/Twisted-10.0.0/twisted/application/app.py   |  730 +++
 .../Twisted-10.0.0/twisted/application/internet.py |  270 +
 .../Twisted-10.0.0/twisted/application/reactors.py |   83 +
 .../Twisted-10.0.0/twisted/application/service.py  |  398 ++
 .../Twisted-10.0.0/twisted/application/strports.py |  200 +
 vendor/Twisted-10.0.0/twisted/conch/__init__.py    |   18 +
 vendor/Twisted-10.0.0/twisted/conch/_version.py    |    3 +
 vendor/Twisted-10.0.0/twisted/conch/avatar.py      |   37 +
 vendor/Twisted-10.0.0/twisted/conch/checkers.py    |  266 +
 .../twisted/conch/client/__init__.py               |    9 +
 .../Twisted-10.0.0/twisted/conch/client/agent.py   |   73 +
 .../Twisted-10.0.0/twisted/conch/client/connect.py |   21 +
 .../Twisted-10.0.0/twisted/conch/client/default.py |  256 +
 .../Twisted-10.0.0/twisted/conch/client/direct.py  |  107 +
 .../twisted/conch/client/knownhosts.py             |  474 ++
 .../Twisted-10.0.0/twisted/conch/client/options.py |   90 +
 vendor/Twisted-10.0.0/twisted/conch/error.py       |  102 +
 .../twisted/conch/insults/__init__.py              |    4 +
 .../Twisted-10.0.0/twisted/conch/insults/client.py |  138 +
 .../Twisted-10.0.0/twisted/conch/insults/colors.py |   29 +
 .../Twisted-10.0.0/twisted/conch/insults/helper.py |  450 ++
 .../twisted/conch/insults/insults.py               | 1087 ++++
 .../Twisted-10.0.0/twisted/conch/insults/text.py   |  186 +
 .../Twisted-10.0.0/twisted/conch/insults/window.py |  864 +++
 vendor/Twisted-10.0.0/twisted/conch/interfaces.py  |  402 ++
 vendor/Twisted-10.0.0/twisted/conch/ls.py          |   60 +
 vendor/Twisted-10.0.0/twisted/conch/manhole.py     |  336 ++
 vendor/Twisted-10.0.0/twisted/conch/manhole_ssh.py |  146 +
 vendor/Twisted-10.0.0/twisted/conch/manhole_tap.py |  128 +
 vendor/Twisted-10.0.0/twisted/conch/mixin.py       |   49 +
 .../twisted/conch/openssh_compat/__init__.py       |   11 +
 .../twisted/conch/openssh_compat/factory.py        |   73 +
 .../twisted/conch/openssh_compat/primes.py         |   26 +
 vendor/Twisted-10.0.0/twisted/conch/recvline.py    |  328 ++
 .../twisted/conch/scripts/__init__.py              |    1 +
 .../Twisted-10.0.0/twisted/conch/scripts/cftp.py   |  811 +++
 .../twisted/conch/scripts/ckeygen.py               |  188 +
 .../Twisted-10.0.0/twisted/conch/scripts/conch.py  |  510 ++
 .../twisted/conch/scripts/tkconch.py               |  572 ++
 .../Twisted-10.0.0/twisted/conch/ssh/__init__.py   |   10 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/agent.py   |  294 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/asn1.py    |   34 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/channel.py |  281 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/common.py  |  130 +
 .../Twisted-10.0.0/twisted/conch/ssh/connection.py |  613 +++
 vendor/Twisted-10.0.0/twisted/conch/ssh/factory.py |  131 +
 .../twisted/conch/ssh/filetransfer.py              |  927 ++++
 .../Twisted-10.0.0/twisted/conch/ssh/forwarding.py |  181 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/keys.py    |  941 ++++
 vendor/Twisted-10.0.0/twisted/conch/ssh/service.py |   48 +
 vendor/Twisted-10.0.0/twisted/conch/ssh/session.py |  310 ++
 vendor/Twisted-10.0.0/twisted/conch/ssh/sexpy.py   |   42 +
 .../Twisted-10.0.0/twisted/conch/ssh/transport.py  | 1404 +++++
 .../Twisted-10.0.0/twisted/conch/ssh/userauth.py   |  846 +++
 vendor/Twisted-10.0.0/twisted/conch/stdio.py       |   95 +
 vendor/Twisted-10.0.0/twisted/conch/tap.py         |   48 +
 vendor/Twisted-10.0.0/twisted/conch/telnet.py      | 1017 ++++
 .../Twisted-10.0.0/twisted/conch/test/__init__.py  |    1 +
 .../Twisted-10.0.0/twisted/conch/test/keydata.py   |  174 +
 .../twisted/conch/test/test_agent.py               |  399 ++
 .../Twisted-10.0.0/twisted/conch/test/test_cftp.py |  881 +++
 .../twisted/conch/test/test_channel.py             |  279 +
 .../twisted/conch/test/test_checkers.py            |  280 +
 .../twisted/conch/test/test_ckeygen.py             |   80 +
 .../twisted/conch/test/test_conch.py               |  437 ++
 .../twisted/conch/test/test_connection.py          |  623 +++
 .../twisted/conch/test/test_default.py             |  171 +
 .../twisted/conch/test/test_filetransfer.py        |  677 +++
 .../twisted/conch/test/test_helper.py              |  560 ++
 .../twisted/conch/test/test_insults.py             |  460 ++
 .../Twisted-10.0.0/twisted/conch/test/test_keys.py |  961 ++++
 .../twisted/conch/test/test_knownhosts.py          |  979 ++++
 .../twisted/conch/test/test_manhole.py             |  348 ++
 .../twisted/conch/test/test_mixin.py               |   47 +
 .../twisted/conch/test/test_openssh_compat.py      |  102 +
 .../twisted/conch/test/test_recvline.py            |  649 +++
 .../twisted/conch/test/test_session.py             | 1210 +++++
 .../Twisted-10.0.0/twisted/conch/test/test_ssh.py  |  886 +++
 .../Twisted-10.0.0/twisted/conch/test/test_tap.py  |   95 +
 .../twisted/conch/test/test_telnet.py              |  710 +++
 .../Twisted-10.0.0/twisted/conch/test/test_text.py |  101 +
 .../twisted/conch/test/test_transport.py           | 1953 +++++++
 .../twisted/conch/test/test_userauth.py            | 1062 ++++
 .../twisted/conch/test/test_window.py              |   49 +
 vendor/Twisted-10.0.0/twisted/conch/topfiles/NEWS  |  206 +
 .../Twisted-10.0.0/twisted/conch/topfiles/README   |    4 +
 .../Twisted-10.0.0/twisted/conch/topfiles/setup.py |   48 +
 vendor/Twisted-10.0.0/twisted/conch/ttymodes.py    |  121 +
 vendor/Twisted-10.0.0/twisted/conch/ui/__init__.py |   11 +
 vendor/Twisted-10.0.0/twisted/conch/ui/ansi.py     |  240 +
 vendor/Twisted-10.0.0/twisted/conch/ui/tkvt100.py  |  197 +
 vendor/Twisted-10.0.0/twisted/conch/unix.py        |  457 ++
 vendor/Twisted-10.0.0/twisted/copyright.py         |   39 +
 vendor/Twisted-10.0.0/twisted/cred/__init__.py     |   13 +
 vendor/Twisted-10.0.0/twisted/cred/_digest.py      |  129 +
 vendor/Twisted-10.0.0/twisted/cred/checkers.py     |  268 +
 vendor/Twisted-10.0.0/twisted/cred/credentials.py  |  483 ++
 vendor/Twisted-10.0.0/twisted/cred/error.py        |   41 +
 vendor/Twisted-10.0.0/twisted/cred/pamauth.py      |   79 +
 vendor/Twisted-10.0.0/twisted/cred/portal.py       |  121 +
 vendor/Twisted-10.0.0/twisted/cred/strcred.py      |  270 +
 vendor/Twisted-10.0.0/twisted/cred/util.py         |   46 +
 .../Twisted-10.0.0/twisted/enterprise/__init__.py  |    9 +
 vendor/Twisted-10.0.0/twisted/enterprise/adbapi.py |  488 ++
 .../Twisted-10.0.0/twisted/enterprise/reflector.py |  167 +
 vendor/Twisted-10.0.0/twisted/enterprise/row.py    |  127 +
 .../twisted/enterprise/sqlreflector.py             |  327 ++
 vendor/Twisted-10.0.0/twisted/enterprise/util.py   |  200 +
 vendor/Twisted-10.0.0/twisted/internet/__init__.py |   12 +
 .../twisted/internet/_baseprocess.py               |   62 +
 .../twisted/internet/_dumbwin32proc.py             |  340 ++
 .../twisted/internet/_javaserialport.py            |   78 +
 .../twisted/internet/_pollingfile.py               |  279 +
 .../twisted/internet/_posixserialport.py           |   60 +
 .../Twisted-10.0.0/twisted/internet/_posixstdio.py |  173 +
 .../Twisted-10.0.0/twisted/internet/_sslverify.py  |  748 +++
 .../twisted/internet/_threadedselect.py            |  362 ++
 .../twisted/internet/_win32serialport.py           |  112 +
 .../Twisted-10.0.0/twisted/internet/_win32stdio.py |  124 +
 vendor/Twisted-10.0.0/twisted/internet/abstract.py |  378 ++
 vendor/Twisted-10.0.0/twisted/internet/address.py  |  113 +
 vendor/Twisted-10.0.0/twisted/internet/base.py     | 1191 ++++
 .../Twisted-10.0.0/twisted/internet/cfreactor.py   |  342 ++
 .../twisted/internet/cfsupport/cfdate.pxi          |    2 +
 .../twisted/internet/cfsupport/cfdecl.pxi          |  227 +
 .../twisted/internet/cfsupport/cfrunloop.pxi       |  104 +
 .../twisted/internet/cfsupport/cfsocket.pxi        |  111 +
 .../twisted/internet/cfsupport/cfsupport.c         | 2136 ++++++++
 .../twisted/internet/cfsupport/cfsupport.pyx       |    6 +
 .../twisted/internet/cfsupport/python.pxi          |    5 +
 .../twisted/internet/cfsupport/setup.py            |   50 +
 vendor/Twisted-10.0.0/twisted/internet/default.py  |   21 +
 vendor/Twisted-10.0.0/twisted/internet/defer.py    | 1264 +++++
 .../twisted/internet/epollreactor.py               |  235 +
 vendor/Twisted-10.0.0/twisted/internet/error.py    |  319 ++
 vendor/Twisted-10.0.0/twisted/internet/fdesc.py    |  118 +
 .../twisted/internet/glib2reactor.py               |   49 +
 .../Twisted-10.0.0/twisted/internet/gtk2reactor.py |  377 ++
 .../Twisted-10.0.0/twisted/internet/gtkreactor.py  |  232 +
 .../Twisted-10.0.0/twisted/internet/interfaces.py  | 1693 ++++++
 .../twisted/internet/iocpreactor/__init__.py       |   10 +
 .../twisted/internet/iocpreactor/abstract.py       |  456 ++
 .../twisted/internet/iocpreactor/build.bat         |    4 +
 .../twisted/internet/iocpreactor/const.py          |   26 +
 .../twisted/internet/iocpreactor/interfaces.py     |   33 +
 .../internet/iocpreactor/iocpsupport/acceptex.pxi  |   38 +
 .../internet/iocpreactor/iocpsupport/connectex.pxi |   34 +
 .../internet/iocpreactor/iocpsupport/iocpsupport.c | 2003 +++++++
 .../iocpreactor/iocpsupport/iocpsupport.pyx        |  250 +
 .../iocpreactor/iocpsupport/winsock_pointers.c     |   62 +
 .../iocpreactor/iocpsupport/winsock_pointers.h     |   51 +
 .../internet/iocpreactor/iocpsupport/wsarecv.pxi   |   61 +
 .../internet/iocpreactor/iocpsupport/wsasend.pxi   |   27 +
 .../twisted/internet/iocpreactor/notes.txt         |   24 +
 .../twisted/internet/iocpreactor/reactor.py        |  267 +
 .../twisted/internet/iocpreactor/setup.py          |   23 +
 .../twisted/internet/iocpreactor/tcp.py            |  639 +++
 .../twisted/internet/iocpreactor/udp.py            |  389 ++
 .../Twisted-10.0.0/twisted/internet/kqreactor.py   |  221 +
 vendor/Twisted-10.0.0/twisted/internet/main.py     |   28 +
 .../Twisted-10.0.0/twisted/internet/pollreactor.py |  208 +
 .../Twisted-10.0.0/twisted/internet/posixbase.py   |  417 ++
 vendor/Twisted-10.0.0/twisted/internet/process.py  |  931 ++++
 vendor/Twisted-10.0.0/twisted/internet/protocol.py |  699 +++
 .../Twisted-10.0.0/twisted/internet/pyuisupport.py |   37 +
 .../Twisted-10.0.0/twisted/internet/qtreactor.py   |   19 +
 vendor/Twisted-10.0.0/twisted/internet/reactor.py  |   38 +
 .../twisted/internet/selectreactor.py              |  204 +
 .../Twisted-10.0.0/twisted/internet/serialport.py  |   65 +
 vendor/Twisted-10.0.0/twisted/internet/ssl.py      |  233 +
 vendor/Twisted-10.0.0/twisted/internet/stdio.py    |   32 +
 vendor/Twisted-10.0.0/twisted/internet/task.py     |  750 +++
 vendor/Twisted-10.0.0/twisted/internet/tcp.py      | 1019 ++++
 .../twisted/internet/test/__init__.py              |    6 +
 .../twisted/internet/test/inlinecb_tests.py        |   92 +
 .../twisted/internet/test/process_helper.py        |   33 +
 .../twisted/internet/test/reactormixins.py         |  193 +
 .../twisted/internet/test/test_base.py             |  179 +
 .../twisted/internet/test/test_baseprocess.py      |   73 +
 .../twisted/internet/test/test_core.py             |  275 +
 .../twisted/internet/test/test_fdset.py            |  209 +
 .../twisted/internet/test/test_inlinecb.py         |   13 +
 .../twisted/internet/test/test_iocp.py             |  105 +
 .../twisted/internet/test/test_pollingfile.py      |   39 +
 .../twisted/internet/test/test_posixbase.py        |  259 +
 .../twisted/internet/test/test_process.py          |  475 ++
 .../twisted/internet/test/test_qtreactor.py        |   35 +
 .../twisted/internet/test/test_tcp.py              |  143 +
 .../twisted/internet/test/test_threads.py          |  163 +
 .../twisted/internet/test/test_time.py             |   26 +
 .../twisted/internet/test/test_tls.py              |  163 +
 .../twisted/internet/test/test_unix.py             |  137 +
 vendor/Twisted-10.0.0/twisted/internet/threads.py  |  117 +
 .../Twisted-10.0.0/twisted/internet/tksupport.py   |   68 +
 vendor/Twisted-10.0.0/twisted/internet/udp.py      |  297 +
 vendor/Twisted-10.0.0/twisted/internet/unix.py     |  297 +
 vendor/Twisted-10.0.0/twisted/internet/utils.py    |  219 +
 .../twisted/internet/win32eventreactor.py          |  244 +
 .../Twisted-10.0.0/twisted/internet/wxreactor.py   |  181 +
 .../Twisted-10.0.0/twisted/internet/wxsupport.py   |   61 +
 vendor/Twisted-10.0.0/twisted/lore/__init__.py     |   21 +
 vendor/Twisted-10.0.0/twisted/lore/_version.py     |    3 +
 vendor/Twisted-10.0.0/twisted/lore/default.py      |   56 +
 vendor/Twisted-10.0.0/twisted/lore/docbook.py      |   68 +
 vendor/Twisted-10.0.0/twisted/lore/htmlbook.py     |   47 +
 vendor/Twisted-10.0.0/twisted/lore/indexer.py      |   50 +
 vendor/Twisted-10.0.0/twisted/lore/latex.py        |  463 ++
 vendor/Twisted-10.0.0/twisted/lore/lint.py         |  204 +
 vendor/Twisted-10.0.0/twisted/lore/lmath.py        |   85 +
 vendor/Twisted-10.0.0/twisted/lore/man2lore.py     |  295 +
 vendor/Twisted-10.0.0/twisted/lore/numberer.py     |   33 +
 vendor/Twisted-10.0.0/twisted/lore/process.py      |  120 +
 .../twisted/lore/scripts/__init__.py               |    1 +
 vendor/Twisted-10.0.0/twisted/lore/scripts/lore.py |  159 +
 vendor/Twisted-10.0.0/twisted/lore/slides.py       |  359 ++
 vendor/Twisted-10.0.0/twisted/lore/template.mgp    |   24 +
 .../Twisted-10.0.0/twisted/lore/test/__init__.py   |    1 +
 .../twisted/lore/test/lore_index_file_out.html     |    2 +
 .../lore/test/lore_index_file_out_multiple.html    |    5 +
 .../lore/test/lore_index_file_unnumbered_out.html  |    2 +
 .../twisted/lore/test/lore_index_test.xhtml        |   21 +
 .../twisted/lore/test/lore_index_test2.xhtml       |   22 +
 .../twisted/lore/test/lore_numbering_test_out.html |    2 +
 .../lore/test/lore_numbering_test_out2.html        |    2 +
 .../Twisted-10.0.0/twisted/lore/test/simple.html   |    9 +
 .../Twisted-10.0.0/twisted/lore/test/simple3.html  |    9 +
 .../Twisted-10.0.0/twisted/lore/test/simple4.html  |    9 +
 .../Twisted-10.0.0/twisted/lore/test/template.tpl  |   13 +
 .../twisted/lore/test/test_docbook.py              |   35 +
 .../Twisted-10.0.0/twisted/lore/test/test_latex.py |  146 +
 .../Twisted-10.0.0/twisted/lore/test/test_lint.py  |  132 +
 .../Twisted-10.0.0/twisted/lore/test/test_lmath.py |   53 +
 .../Twisted-10.0.0/twisted/lore/test/test_lore.py  | 1228 +++++
 .../twisted/lore/test/test_man2lore.py             |  169 +
 .../twisted/lore/test/test_slides.py               |   85 +
 vendor/Twisted-10.0.0/twisted/lore/texi.py         |  109 +
 vendor/Twisted-10.0.0/twisted/lore/topfiles/NEWS   |  103 +
 vendor/Twisted-10.0.0/twisted/lore/topfiles/README |    3 +
 .../Twisted-10.0.0/twisted/lore/topfiles/setup.py  |   29 +
 vendor/Twisted-10.0.0/twisted/lore/tree.py         | 1152 ++++
 vendor/Twisted-10.0.0/twisted/lore/xhtml-lat1.ent  |  196 +
 .../Twisted-10.0.0/twisted/lore/xhtml-special.ent  |   80 +
 .../Twisted-10.0.0/twisted/lore/xhtml-symbol.ent   |  237 +
 .../Twisted-10.0.0/twisted/lore/xhtml1-strict.dtd  |  978 ++++
 .../twisted/lore/xhtml1-transitional.dtd           | 1201 ++++
 vendor/Twisted-10.0.0/twisted/mail/__init__.py     |   15 +
 vendor/Twisted-10.0.0/twisted/mail/_version.py     |    3 +
 vendor/Twisted-10.0.0/twisted/mail/alias.py        |  435 ++
 vendor/Twisted-10.0.0/twisted/mail/bounce.py       |   61 +
 vendor/Twisted-10.0.0/twisted/mail/imap4.py        | 5670 +++++++++++++++++++
 vendor/Twisted-10.0.0/twisted/mail/mail.py         |  333 ++
 vendor/Twisted-10.0.0/twisted/mail/maildir.py      |  517 ++
 vendor/Twisted-10.0.0/twisted/mail/pb.py           |  115 +
 vendor/Twisted-10.0.0/twisted/mail/pop3.py         | 1072 ++++
 vendor/Twisted-10.0.0/twisted/mail/pop3client.py   |  706 +++
 vendor/Twisted-10.0.0/twisted/mail/protocols.py    |  225 +
 vendor/Twisted-10.0.0/twisted/mail/relay.py        |  114 +
 vendor/Twisted-10.0.0/twisted/mail/relaymanager.py |  631 +++
 .../twisted/mail/scripts/__init__.py               |    1 +
 .../twisted/mail/scripts/mailmail.py               |  360 ++
 vendor/Twisted-10.0.0/twisted/mail/smtp.py         | 2023 +++++++
 vendor/Twisted-10.0.0/twisted/mail/tap.py          |  185 +
 .../Twisted-10.0.0/twisted/mail/test/__init__.py   |    1 +
 .../twisted/mail/test/pop3testserver.py            |  314 ++
 .../twisted/mail/test/rfc822.message               |   86 +
 .../twisted/mail/test/test_bounce.py               |   32 +
 .../Twisted-10.0.0/twisted/mail/test/test_imap.py  | 4244 +++++++++++++++
 .../Twisted-10.0.0/twisted/mail/test/test_mail.py  | 1968 +++++++
 .../twisted/mail/test/test_mailmail.py             |   75 +
 .../twisted/mail/test/test_options.py              |   44 +
 .../Twisted-10.0.0/twisted/mail/test/test_pop3.py  | 1069 ++++
 .../twisted/mail/test/test_pop3client.py           |  573 ++
 .../Twisted-10.0.0/twisted/mail/test/test_smtp.py  | 1530 ++++++
 vendor/Twisted-10.0.0/twisted/mail/topfiles/NEWS   |  191 +
 vendor/Twisted-10.0.0/twisted/mail/topfiles/README |    3 +
 .../Twisted-10.0.0/twisted/mail/topfiles/setup.py  |   50 +
 vendor/Twisted-10.0.0/twisted/manhole/__init__.py  |    8 +
 .../Twisted-10.0.0/twisted/manhole/_inspectro.py   |  369 ++
 vendor/Twisted-10.0.0/twisted/manhole/explorer.py  |  655 +++
 .../twisted/manhole/gladereactor.glade             |  342 ++
 .../Twisted-10.0.0/twisted/manhole/gladereactor.py |  219 +
 .../Twisted-10.0.0/twisted/manhole/inspectro.glade |  510 ++
 .../Twisted-10.0.0/twisted/manhole/logview.glade   |   39 +
 vendor/Twisted-10.0.0/twisted/manhole/service.py   |  399 ++
 vendor/Twisted-10.0.0/twisted/manhole/telnet.py    |  117 +
 .../Twisted-10.0.0/twisted/manhole/ui/__init__.py  |    7 +
 .../twisted/manhole/ui/gtk2manhole.glade           |  268 +
 .../twisted/manhole/ui/gtk2manhole.py              |  375 ++
 .../twisted/manhole/ui/test/__init__.py            |    4 +
 .../twisted/manhole/ui/test/test_gtk2manhole.py    |   48 +
 vendor/Twisted-10.0.0/twisted/names/__init__.py    |    7 +
 vendor/Twisted-10.0.0/twisted/names/_version.py    |    3 +
 vendor/Twisted-10.0.0/twisted/names/authority.py   |  322 ++
 vendor/Twisted-10.0.0/twisted/names/cache.py       |   96 +
 vendor/Twisted-10.0.0/twisted/names/client.py      |  928 ++++
 vendor/Twisted-10.0.0/twisted/names/common.py      |  265 +
 vendor/Twisted-10.0.0/twisted/names/dns.py         | 1822 +++++++
 vendor/Twisted-10.0.0/twisted/names/error.py       |   95 +
 vendor/Twisted-10.0.0/twisted/names/hosts.py       |   61 +
 vendor/Twisted-10.0.0/twisted/names/resolve.py     |   59 +
 vendor/Twisted-10.0.0/twisted/names/root.py        |  446 ++
 vendor/Twisted-10.0.0/twisted/names/secondary.py   |  102 +
 vendor/Twisted-10.0.0/twisted/names/server.py      |  205 +
 vendor/Twisted-10.0.0/twisted/names/srvconnect.py  |  186 +
 vendor/Twisted-10.0.0/twisted/names/tap.py         |  119 +
 .../Twisted-10.0.0/twisted/names/test/__init__.py  |    1 +
 .../twisted/names/test/test_cache.py               |   14 +
 .../twisted/names/test/test_client.py              |  655 +++
 .../twisted/names/test/test_common.py              |   71 +
 .../Twisted-10.0.0/twisted/names/test/test_dns.py  | 1200 ++++
 .../twisted/names/test/test_names.py               |  752 +++
 .../twisted/names/test/test_rootresolve.py         |  705 +++
 .../twisted/names/test/test_srvconnect.py          |  133 +
 vendor/Twisted-10.0.0/twisted/names/topfiles/NEWS  |  131 +
 .../Twisted-10.0.0/twisted/names/topfiles/README   |    3 +
 .../Twisted-10.0.0/twisted/names/topfiles/setup.py |   50 +
 vendor/Twisted-10.0.0/twisted/news/__init__.py     |   11 +
 vendor/Twisted-10.0.0/twisted/news/_version.py     |    3 +
 vendor/Twisted-10.0.0/twisted/news/database.py     |  998 ++++
 vendor/Twisted-10.0.0/twisted/news/news.py         |   90 +
 vendor/Twisted-10.0.0/twisted/news/nntp.py         | 1069 ++++
 vendor/Twisted-10.0.0/twisted/news/tap.py          |  134 +
 .../Twisted-10.0.0/twisted/news/test/__init__.py   |    1 +
 .../Twisted-10.0.0/twisted/news/test/test_news.py  |  107 +
 .../Twisted-10.0.0/twisted/news/test/test_nntp.py  |  124 +
 vendor/Twisted-10.0.0/twisted/news/topfiles/NEWS   |   54 +
 vendor/Twisted-10.0.0/twisted/news/topfiles/README |    4 +
 .../Twisted-10.0.0/twisted/news/topfiles/setup.py  |   28 +
 vendor/Twisted-10.0.0/twisted/pair/__init__.py     |   20 +
 vendor/Twisted-10.0.0/twisted/pair/_version.py     |    3 +
 vendor/Twisted-10.0.0/twisted/pair/ethernet.py     |   56 +
 vendor/Twisted-10.0.0/twisted/pair/ip.py           |   72 +
 vendor/Twisted-10.0.0/twisted/pair/raw.py          |   35 +
 vendor/Twisted-10.0.0/twisted/pair/rawudp.py       |   55 +
 .../Twisted-10.0.0/twisted/pair/test/__init__.py   |    1 +
 .../twisted/pair/test/test_ethernet.py             |  226 +
 vendor/Twisted-10.0.0/twisted/pair/test/test_ip.py |  417 ++
 .../twisted/pair/test/test_rawudp.py               |  327 ++
 vendor/Twisted-10.0.0/twisted/pair/topfiles/NEWS   |   20 +
 vendor/Twisted-10.0.0/twisted/pair/topfiles/README |    1 +
 .../Twisted-10.0.0/twisted/pair/topfiles/setup.py  |   28 +
 vendor/Twisted-10.0.0/twisted/pair/tuntap.py       |  170 +
 .../Twisted-10.0.0/twisted/persisted/__init__.py   |   10 +
 vendor/Twisted-10.0.0/twisted/persisted/aot.py     |  560 ++
 .../Twisted-10.0.0/twisted/persisted/crefutil.py   |  167 +
 vendor/Twisted-10.0.0/twisted/persisted/dirdbm.py  |  358 ++
 .../twisted/persisted/journal/__init__.py          |   10 +
 .../twisted/persisted/journal/base.py              |  226 +
 .../twisted/persisted/journal/picklelog.py         |   48 +
 .../twisted/persisted/journal/rowjournal.py        |   99 +
 vendor/Twisted-10.0.0/twisted/persisted/sob.py     |  227 +
 vendor/Twisted-10.0.0/twisted/persisted/styles.py  |  257 +
 vendor/Twisted-10.0.0/twisted/plugin.py            |  246 +
 vendor/Twisted-10.0.0/twisted/plugins/__init__.py  |   17 +
 .../twisted/plugins/cred_anonymous.py              |   40 +
 vendor/Twisted-10.0.0/twisted/plugins/cred_file.py |   60 +
 .../Twisted-10.0.0/twisted/plugins/cred_memory.py  |   68 +
 vendor/Twisted-10.0.0/twisted/plugins/cred_unix.py |  138 +
 .../twisted/plugins/twisted_conch.py               |   18 +
 .../Twisted-10.0.0/twisted/plugins/twisted_ftp.py  |   10 +
 .../Twisted-10.0.0/twisted/plugins/twisted_inet.py |   10 +
 .../Twisted-10.0.0/twisted/plugins/twisted_lore.py |   38 +
 .../Twisted-10.0.0/twisted/plugins/twisted_mail.py |   10 +
 .../twisted/plugins/twisted_manhole.py             |   10 +
 .../twisted/plugins/twisted_names.py               |   10 +
 .../Twisted-10.0.0/twisted/plugins/twisted_news.py |   10 +
 .../twisted/plugins/twisted_portforward.py         |   10 +
 .../twisted/plugins/twisted_qtstub.py              |   45 +
 .../twisted/plugins/twisted_reactors.py            |   38 +
 .../twisted/plugins/twisted_socks.py               |   10 +
 .../twisted/plugins/twisted_telnet.py              |   10 +
 .../twisted/plugins/twisted_trial.py               |   59 +
 .../Twisted-10.0.0/twisted/plugins/twisted_web.py  |   11 +
 .../twisted/plugins/twisted_words.py               |   48 +
 .../Twisted-10.0.0/twisted/protocols/__init__.py   |    7 +
 .../Twisted-10.0.0/twisted/protocols/_c_urlarg.c   |  147 +
 vendor/Twisted-10.0.0/twisted/protocols/amp.py     | 2394 ++++++++
 vendor/Twisted-10.0.0/twisted/protocols/basic.py   |  519 ++
 vendor/Twisted-10.0.0/twisted/protocols/dict.py    |  362 ++
 vendor/Twisted-10.0.0/twisted/protocols/finger.py  |   43 +
 vendor/Twisted-10.0.0/twisted/protocols/ftp.py     | 2814 ++++++++++
 .../twisted/protocols/gps/__init__.py              |    1 +
 .../Twisted-10.0.0/twisted/protocols/gps/nmea.py   |  209 +
 .../twisted/protocols/gps/rockwell.py              |  268 +
 vendor/Twisted-10.0.0/twisted/protocols/htb.py     |  269 +
 vendor/Twisted-10.0.0/twisted/protocols/ident.py   |  227 +
 .../Twisted-10.0.0/twisted/protocols/loopback.py   |  397 ++
 .../Twisted-10.0.0/twisted/protocols/memcache.py   |  758 +++
 .../twisted/protocols/mice/__init__.py             |    1 +
 .../twisted/protocols/mice/mouseman.py             |  127 +
 vendor/Twisted-10.0.0/twisted/protocols/pcp.py     |  204 +
 .../Twisted-10.0.0/twisted/protocols/policies.py   |  645 +++
 .../twisted/protocols/portforward.py               |   76 +
 vendor/Twisted-10.0.0/twisted/protocols/postfix.py |  112 +
 .../Twisted-10.0.0/twisted/protocols/shoutcast.py  |  111 +
 vendor/Twisted-10.0.0/twisted/protocols/sip.py     | 1334 +++++
 vendor/Twisted-10.0.0/twisted/protocols/socks.py   |  240 +
 .../Twisted-10.0.0/twisted/protocols/stateful.py   |   52 +
 vendor/Twisted-10.0.0/twisted/protocols/telnet.py  |  325 ++
 .../twisted/protocols/test/__init__.py             |    6 +
 .../twisted/protocols/test/test_tls.py             |  566 ++
 vendor/Twisted-10.0.0/twisted/protocols/tls.py     |  345 ++
 vendor/Twisted-10.0.0/twisted/protocols/wire.py    |   90 +
 vendor/Twisted-10.0.0/twisted/python/__init__.py   |   13 +
 vendor/Twisted-10.0.0/twisted/python/_epoll.c      |  925 ++++
 vendor/Twisted-10.0.0/twisted/python/_epoll.pyx    |  181 +
 vendor/Twisted-10.0.0/twisted/python/_initgroups.c |   66 +
 vendor/Twisted-10.0.0/twisted/python/_release.py   | 1265 +++++
 .../twisted/python/_twisted_zsh_stub               |   89 +
 vendor/Twisted-10.0.0/twisted/python/compat.py     |  173 +
 vendor/Twisted-10.0.0/twisted/python/components.py |  448 ++
 vendor/Twisted-10.0.0/twisted/python/context.py    |   90 +
 vendor/Twisted-10.0.0/twisted/python/deprecate.py  |  375 ++
 vendor/Twisted-10.0.0/twisted/python/dispatch.py   |   42 +
 vendor/Twisted-10.0.0/twisted/python/dist.py       |  361 ++
 vendor/Twisted-10.0.0/twisted/python/dxprofile.py  |   56 +
 vendor/Twisted-10.0.0/twisted/python/failure.py    |  557 ++
 vendor/Twisted-10.0.0/twisted/python/fakepwd.py    |  112 +
 vendor/Twisted-10.0.0/twisted/python/filepath.py   |  802 +++
 vendor/Twisted-10.0.0/twisted/python/finalize.py   |   46 +
 vendor/Twisted-10.0.0/twisted/python/formmethod.py |  363 ++
 vendor/Twisted-10.0.0/twisted/python/hashlib.py    |   24 +
 vendor/Twisted-10.0.0/twisted/python/hook.py       |  177 +
 vendor/Twisted-10.0.0/twisted/python/htmlizer.py   |   91 +
 vendor/Twisted-10.0.0/twisted/python/lockfile.py   |  212 +
 vendor/Twisted-10.0.0/twisted/python/log.py        |  665 +++
 vendor/Twisted-10.0.0/twisted/python/logfile.py    |  324 ++
 vendor/Twisted-10.0.0/twisted/python/modules.py    |  747 +++
 vendor/Twisted-10.0.0/twisted/python/monkey.py     |   73 +
 vendor/Twisted-10.0.0/twisted/python/otp.py        |  496 ++
 vendor/Twisted-10.0.0/twisted/python/procutils.py  |   45 +
 vendor/Twisted-10.0.0/twisted/python/randbytes.py  |  177 +
 vendor/Twisted-10.0.0/twisted/python/rebuild.py    |  264 +
 vendor/Twisted-10.0.0/twisted/python/reflect.py    |  812 +++
 vendor/Twisted-10.0.0/twisted/python/release.py    |   57 +
 vendor/Twisted-10.0.0/twisted/python/roots.py      |  248 +
 vendor/Twisted-10.0.0/twisted/python/runtime.py    |   97 +
 vendor/Twisted-10.0.0/twisted/python/shortcut.py   |   76 +
 vendor/Twisted-10.0.0/twisted/python/syslog.py     |  107 +
 .../Twisted-10.0.0/twisted/python/test/__init__.py |    3 +
 .../twisted/python/test/deprecatedattributes.py    |   21 +
 .../twisted/python/test/test_components.py         |  741 +++
 .../twisted/python/test/test_deprecate.py          |  399 ++
 .../twisted/python/test/test_dist.py               |  173 +
 .../twisted/python/test/test_fakepwd.py            |  216 +
 .../twisted/python/test/test_hashlib.py            |   90 +
 .../twisted/python/test/test_htmlizer.py           |   41 +
 .../twisted/python/test/test_release.py            | 2476 +++++++++
 .../twisted/python/test/test_runtime.py            |   29 +
 .../twisted/python/test/test_syslog.py             |  151 +
 .../twisted/python/test/test_util.py               |  834 +++
 .../twisted/python/test/test_versions.py           |  323 ++
 .../twisted/python/test/test_win32.py              |   35 +
 .../twisted/python/test/test_zipstream.py          |  455 ++
 vendor/Twisted-10.0.0/twisted/python/text.py       |  227 +
 vendor/Twisted-10.0.0/twisted/python/threadable.py |  120 +
 vendor/Twisted-10.0.0/twisted/python/threadpool.py |  308 ++
 .../Twisted-10.0.0/twisted/python/timeoutqueue.py  |   49 +
 vendor/Twisted-10.0.0/twisted/python/urlpath.py    |  122 +
 vendor/Twisted-10.0.0/twisted/python/usage.py      |  631 +++
 vendor/Twisted-10.0.0/twisted/python/util.py       |  968 ++++
 vendor/Twisted-10.0.0/twisted/python/versions.py   |  249 +
 vendor/Twisted-10.0.0/twisted/python/win32.py      |  163 +
 vendor/Twisted-10.0.0/twisted/python/zippath.py    |  217 +
 vendor/Twisted-10.0.0/twisted/python/zipstream.py  |  377 ++
 vendor/Twisted-10.0.0/twisted/python/zsh/README    |    8 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_cftp     |   48 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_ckeygen  |   25 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_conch    |   58 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_lore     |   28 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_manhole  |   19 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_mktap    |  304 ++
 .../Twisted-10.0.0/twisted/python/zsh/_pyhtmlizer  |    8 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_tap2deb  |   23 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_tap2rpm  |   23 +
 .../Twisted-10.0.0/twisted/python/zsh/_tapconvert  |   17 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_tkconch  |   38 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_trial    |   40 +
 vendor/Twisted-10.0.0/twisted/python/zsh/_twistd   |  328 ++
 vendor/Twisted-10.0.0/twisted/python/zshcomp.py    |  780 +++
 vendor/Twisted-10.0.0/twisted/runner/__init__.py   |   15 +
 vendor/Twisted-10.0.0/twisted/runner/_version.py   |    3 +
 vendor/Twisted-10.0.0/twisted/runner/inetd.py      |   70 +
 vendor/Twisted-10.0.0/twisted/runner/inetdconf.py  |  194 +
 vendor/Twisted-10.0.0/twisted/runner/inetdtap.py   |  160 +
 vendor/Twisted-10.0.0/twisted/runner/portmap.c     |   57 +
 vendor/Twisted-10.0.0/twisted/runner/procmon.py    |  264 +
 vendor/Twisted-10.0.0/twisted/runner/procutils.py  |    5 +
 .../Twisted-10.0.0/twisted/runner/test/__init__.py |    6 +
 .../twisted/runner/test/test_procmon.py            |   55 +
 vendor/Twisted-10.0.0/twisted/runner/topfiles/NEWS |   49 +
 .../Twisted-10.0.0/twisted/runner/topfiles/README  |    2 +
 .../twisted/runner/topfiles/setup.py               |   35 +
 vendor/Twisted-10.0.0/twisted/scripts/__init__.py  |   12 +
 .../Twisted-10.0.0/twisted/scripts/_twistd_unix.py |  317 ++
 vendor/Twisted-10.0.0/twisted/scripts/_twistw.py   |   50 +
 vendor/Twisted-10.0.0/twisted/scripts/htmlizer.py  |   66 +
 vendor/Twisted-10.0.0/twisted/scripts/manhole.py   |   65 +
 vendor/Twisted-10.0.0/twisted/scripts/mktap.py     |  182 +
 vendor/Twisted-10.0.0/twisted/scripts/tap2deb.py   |  281 +
 vendor/Twisted-10.0.0/twisted/scripts/tap2rpm.py   |  273 +
 .../Twisted-10.0.0/twisted/scripts/tapconvert.py   |   53 +
 .../twisted/scripts/test/__init__.py               |    6 +
 .../twisted/scripts/test/test_mktap.py             |  122 +
 vendor/Twisted-10.0.0/twisted/scripts/tkunzip.py   |  286 +
 vendor/Twisted-10.0.0/twisted/scripts/trial.py     |  370 ++
 vendor/Twisted-10.0.0/twisted/scripts/twistd.py    |   30 +
 vendor/Twisted-10.0.0/twisted/spread/__init__.py   |   12 +
 vendor/Twisted-10.0.0/twisted/spread/banana.py     |  358 ++
 vendor/Twisted-10.0.0/twisted/spread/flavors.py    |  600 ++
 vendor/Twisted-10.0.0/twisted/spread/interfaces.py |   28 +
 vendor/Twisted-10.0.0/twisted/spread/jelly.py      | 1134 ++++
 vendor/Twisted-10.0.0/twisted/spread/pb.py         | 1380 +++++
 vendor/Twisted-10.0.0/twisted/spread/publish.py    |  142 +
 vendor/Twisted-10.0.0/twisted/spread/refpath.py    |   95 +
 .../Twisted-10.0.0/twisted/spread/ui/__init__.py   |   12 +
 .../Twisted-10.0.0/twisted/spread/ui/gtk2util.py   |  215 +
 .../Twisted-10.0.0/twisted/spread/ui/login2.glade  |  461 ++
 vendor/Twisted-10.0.0/twisted/spread/ui/tktree.py  |  204 +
 vendor/Twisted-10.0.0/twisted/spread/ui/tkutil.py  |  397 ++
 vendor/Twisted-10.0.0/twisted/spread/util.py       |  215 +
 vendor/Twisted-10.0.0/twisted/tap/__init__.py      |   10 +
 vendor/Twisted-10.0.0/twisted/tap/ftp.py           |   51 +
 vendor/Twisted-10.0.0/twisted/tap/manhole.py       |   51 +
 vendor/Twisted-10.0.0/twisted/tap/portforward.py   |   24 +
 vendor/Twisted-10.0.0/twisted/tap/socks.py         |   34 +
 vendor/Twisted-10.0.0/twisted/tap/telnet.py        |   29 +
 vendor/Twisted-10.0.0/twisted/test/__init__.py     |   10 +
 .../twisted/test/crash_test_dummy.py               |   34 +
 .../twisted/test/generator_failure_tests.py        |  169 +
 vendor/Twisted-10.0.0/twisted/test/iosim.py        |  270 +
 .../twisted/test/mock_win32process.py              |   48 +
 vendor/Twisted-10.0.0/twisted/test/myrebuilder1.py |   15 +
 vendor/Twisted-10.0.0/twisted/test/myrebuilder2.py |   16 +
 vendor/Twisted-10.0.0/twisted/test/plugin_basic.py |   57 +
 .../Twisted-10.0.0/twisted/test/plugin_extra1.py   |   23 +
 .../Twisted-10.0.0/twisted/test/plugin_extra2.py   |   35 +
 .../Twisted-10.0.0/twisted/test/process_cmdline.py |    5 +
 .../Twisted-10.0.0/twisted/test/process_echoer.py  |   11 +
 vendor/Twisted-10.0.0/twisted/test/process_fds.py  |   40 +
 .../Twisted-10.0.0/twisted/test/process_linger.py  |   17 +
 .../Twisted-10.0.0/twisted/test/process_reader.py  |   12 +
 .../Twisted-10.0.0/twisted/test/process_signal.py  |    8 +
 .../twisted/test/process_stdinreader.py            |   23 +
 .../Twisted-10.0.0/twisted/test/process_tester.py  |   37 +
 vendor/Twisted-10.0.0/twisted/test/process_tty.py  |    6 +
 .../Twisted-10.0.0/twisted/test/process_twisted.py |   43 +
 .../Twisted-10.0.0/twisted/test/proto_helpers.py   |  299 +
 vendor/Twisted-10.0.0/twisted/test/raiser.c        |  316 ++
 vendor/Twisted-10.0.0/twisted/test/raiser.pyx      |   21 +
 .../twisted/test/reflect_helper_IE.py              |    4 +
 .../twisted/test/reflect_helper_VE.py              |    4 +
 .../twisted/test/reflect_helper_ZDE.py             |    4 +
 vendor/Twisted-10.0.0/twisted/test/server.pem      |   36 +
 vendor/Twisted-10.0.0/twisted/test/ssl_helpers.py  |   26 +
 .../twisted/test/stdio_test_consumer.py            |   39 +
 .../twisted/test/stdio_test_hostpeer.py            |   32 +
 .../twisted/test/stdio_test_lastwrite.py           |   45 +
 .../twisted/test/stdio_test_loseconn.py            |   48 +
 .../twisted/test/stdio_test_producer.py            |   55 +
 .../twisted/test/stdio_test_write.py               |   32 +
 .../twisted/test/stdio_test_writeseq.py            |   30 +
 .../Twisted-10.0.0/twisted/test/test_abstract.py   |   83 +
 vendor/Twisted-10.0.0/twisted/test/test_adbapi.py  |  774 +++
 vendor/Twisted-10.0.0/twisted/test/test_amp.py     | 2555 +++++++++
 .../twisted/test/test_application.py               |  867 +++
 vendor/Twisted-10.0.0/twisted/test/test_banana.py  |  278 +
 vendor/Twisted-10.0.0/twisted/test/test_compat.py  |  199 +
 vendor/Twisted-10.0.0/twisted/test/test_context.py |   15 +
 .../Twisted-10.0.0/twisted/test/test_cooperator.py |  634 +++
 vendor/Twisted-10.0.0/twisted/test/test_defer.py   |  950 ++++
 vendor/Twisted-10.0.0/twisted/test/test_defgen.py  |  283 +
 vendor/Twisted-10.0.0/twisted/test/test_dict.py    |   22 +
 .../Twisted-10.0.0/twisted/test/test_digestauth.py |  671 +++
 vendor/Twisted-10.0.0/twisted/test/test_dirdbm.py  |  176 +
 vendor/Twisted-10.0.0/twisted/test/test_doc.py     |   92 +
 .../Twisted-10.0.0/twisted/test/test_enterprise.py |   41 +
 vendor/Twisted-10.0.0/twisted/test/test_epoll.py   |  159 +
 vendor/Twisted-10.0.0/twisted/test/test_error.py   |  170 +
 .../Twisted-10.0.0/twisted/test/test_explorer.py   |  236 +
 .../Twisted-10.0.0/twisted/test/test_extensions.py |   18 +
 .../Twisted-10.0.0/twisted/test/test_factories.py  |  162 +
 vendor/Twisted-10.0.0/twisted/test/test_failure.py |  318 ++
 vendor/Twisted-10.0.0/twisted/test/test_fdesc.py   |  235 +
 vendor/Twisted-10.0.0/twisted/test/test_finger.py  |   67 +
 .../Twisted-10.0.0/twisted/test/test_formmethod.py |   77 +
 vendor/Twisted-10.0.0/twisted/test/test_ftp.py     | 2671 +++++++++
 vendor/Twisted-10.0.0/twisted/test/test_hook.py    |  150 +
 vendor/Twisted-10.0.0/twisted/test/test_htb.py     |   96 +
 vendor/Twisted-10.0.0/twisted/test/test_ident.py   |  194 +
 vendor/Twisted-10.0.0/twisted/test/test_import.py  |   78 +
 .../Twisted-10.0.0/twisted/test/test_internet.py   | 1396 +++++
 vendor/Twisted-10.0.0/twisted/test/test_iutils.py  |  296 +
 vendor/Twisted-10.0.0/twisted/test/test_jelly.py   |  618 +++
 vendor/Twisted-10.0.0/twisted/test/test_journal.py |  169 +
 .../Twisted-10.0.0/twisted/test/test_lockfile.py   |  445 ++
 vendor/Twisted-10.0.0/twisted/test/test_log.py     |  559 ++
 vendor/Twisted-10.0.0/twisted/test/test_logfile.py |  314 ++
 .../Twisted-10.0.0/twisted/test/test_loopback.py   |  433 ++
 vendor/Twisted-10.0.0/twisted/test/test_manhole.py |   75 +
 .../Twisted-10.0.0/twisted/test/test_memcache.py   |  663 +++
 vendor/Twisted-10.0.0/twisted/test/test_modules.py |  391 ++
 vendor/Twisted-10.0.0/twisted/test/test_monkey.py  |  161 +
 vendor/Twisted-10.0.0/twisted/test/test_newcred.py |  487 ++
 vendor/Twisted-10.0.0/twisted/test/test_nmea.py    |  115 +
 vendor/Twisted-10.0.0/twisted/test/test_paths.py   |  896 +++
 vendor/Twisted-10.0.0/twisted/test/test_pb.py      | 1775 ++++++
 .../Twisted-10.0.0/twisted/test/test_pbfailure.py  |  424 ++
 vendor/Twisted-10.0.0/twisted/test/test_pcp.py     |  368 ++
 .../Twisted-10.0.0/twisted/test/test_persisted.py  |  314 ++
 vendor/Twisted-10.0.0/twisted/test/test_plugin.py  |  694 +++
 .../Twisted-10.0.0/twisted/test/test_policies.py   |  683 +++
 vendor/Twisted-10.0.0/twisted/test/test_postfix.py |  108 +
 vendor/Twisted-10.0.0/twisted/test/test_process.py | 2410 +++++++++
 .../Twisted-10.0.0/twisted/test/test_protocols.py  |  811 +++
 .../Twisted-10.0.0/twisted/test/test_randbytes.py  |  178 +
 vendor/Twisted-10.0.0/twisted/test/test_rebuild.py |  252 +
 vendor/Twisted-10.0.0/twisted/test/test_reflect.py |  756 +++
 .../Twisted-10.0.0/twisted/test/test_reflector.py  |  401 ++
 vendor/Twisted-10.0.0/twisted/test/test_roots.py   |   63 +
 .../Twisted-10.0.0/twisted/test/test_shortcut.py   |   26 +
 vendor/Twisted-10.0.0/twisted/test/test_sip.py     |  942 ++++
 vendor/Twisted-10.0.0/twisted/test/test_sob.py     |  172 +
 vendor/Twisted-10.0.0/twisted/test/test_socks.py   |  498 ++
 vendor/Twisted-10.0.0/twisted/test/test_ssl.py     |  664 +++
 .../Twisted-10.0.0/twisted/test/test_sslverify.py  |  558 ++
 .../Twisted-10.0.0/twisted/test/test_stateful.py   |   77 +
 vendor/Twisted-10.0.0/twisted/test/test_stdio.py   |  287 +
 vendor/Twisted-10.0.0/twisted/test/test_strcred.py |  622 +++
 .../Twisted-10.0.0/twisted/test/test_strerror.py   |  145 +
 .../twisted/test/test_stringtransport.py           |  160 +
 .../Twisted-10.0.0/twisted/test/test_strports.py   |   84 +
 vendor/Twisted-10.0.0/twisted/test/test_task.py    |  627 +++
 vendor/Twisted-10.0.0/twisted/test/test_tcp.py     | 1908 +++++++
 .../twisted/test/test_tcp_internals.py             |  240 +
 vendor/Twisted-10.0.0/twisted/test/test_text.py    |  156 +
 .../Twisted-10.0.0/twisted/test/test_threadable.py |  103 +
 .../Twisted-10.0.0/twisted/test/test_threadpool.py |  583 ++
 vendor/Twisted-10.0.0/twisted/test/test_threads.py |  412 ++
 .../twisted/test/test_timehelpers.py               |   31 +
 .../twisted/test/test_timeoutqueue.py              |   73 +
 vendor/Twisted-10.0.0/twisted/test/test_tpfile.py  |   52 +
 vendor/Twisted-10.0.0/twisted/test/test_twistd.py  | 1378 +++++
 vendor/Twisted-10.0.0/twisted/test/test_udp.py     |  661 +++
 vendor/Twisted-10.0.0/twisted/test/test_unix.py    |  405 ++
 vendor/Twisted-10.0.0/twisted/test/test_usage.py   |  372 ++
 vendor/Twisted-10.0.0/twisted/test/test_zshcomp.py |  210 +
 vendor/Twisted-10.0.0/twisted/test/testutils.py    |   55 +
 vendor/Twisted-10.0.0/twisted/test/time_helpers.py |   72 +
 vendor/Twisted-10.0.0/twisted/topfiles/CREDITS     |   60 +
 .../Twisted-10.0.0/twisted/topfiles/ChangeLog.Old  | 3888 +++++++++++++
 vendor/Twisted-10.0.0/twisted/topfiles/NEWS        |  942 ++++
 vendor/Twisted-10.0.0/twisted/topfiles/README      |   14 +
 vendor/Twisted-10.0.0/twisted/topfiles/setup.py    |   99 +
 vendor/Twisted-10.0.0/twisted/trial/__init__.py    |   52 +
 vendor/Twisted-10.0.0/twisted/trial/itrial.py      |  251 +
 vendor/Twisted-10.0.0/twisted/trial/reporter.py    | 1204 ++++
 vendor/Twisted-10.0.0/twisted/trial/runner.py      |  905 ++++
 .../Twisted-10.0.0/twisted/trial/test/__init__.py  |    1 +
 .../Twisted-10.0.0/twisted/trial/test/detests.py   |  195 +
 .../Twisted-10.0.0/twisted/trial/test/erroneous.py |  130 +
 .../twisted/trial/test/mockcustomsuite.py          |   21 +
 .../twisted/trial/test/mockcustomsuite2.py         |   21 +
 .../twisted/trial/test/mockcustomsuite3.py         |   28 +
 .../twisted/trial/test/mockdoctest.py              |  104 +
 .../twisted/trial/test/moduleself.py               |    7 +
 .../twisted/trial/test/moduletest.py               |   11 +
 vendor/Twisted-10.0.0/twisted/trial/test/notpython |    2 +
 vendor/Twisted-10.0.0/twisted/trial/test/novars.py |    6 +
 .../Twisted-10.0.0/twisted/trial/test/packages.py  |  134 +
 vendor/Twisted-10.0.0/twisted/trial/test/sample.py |   40 +
 .../twisted/trial/test/scripttest.py               |   14 +
 .../twisted/trial/test/suppression.py              |   57 +
 .../twisted/trial/test/test_assertions.py          |  742 +++
 .../twisted/trial/test/test_deferred.py            |  220 +
 .../twisted/trial/test/test_doctest.py             |   81 +
 .../twisted/trial/test/test_keyboard.py            |  113 +
 .../twisted/trial/test/test_loader.py              |  541 ++
 .../Twisted-10.0.0/twisted/trial/test/test_log.py  |  197 +
 .../twisted/trial/test/test_output.py              |  162 +
 .../twisted/trial/test/test_plugins.py             |   46 +
 .../twisted/trial/test/test_pyunitcompat.py        |  222 +
 .../twisted/trial/test/test_reporter.py            | 1561 ++++++
 .../twisted/trial/test/test_runner.py              |  914 ++++
 .../twisted/trial/test/test_script.py              |  390 ++
 .../twisted/trial/test/test_test_visitor.py        |   82 +
 .../twisted/trial/test/test_testcase.py            |   51 +
 .../twisted/trial/test/test_tests.py               | 1056 ++++
 .../Twisted-10.0.0/twisted/trial/test/test_util.py |  533 ++
 .../twisted/trial/test/test_warning.py             |  436 ++
 vendor/Twisted-10.0.0/twisted/trial/test/weird.py  |   20 +
 vendor/Twisted-10.0.0/twisted/trial/unittest.py    | 1597 ++++++
 vendor/Twisted-10.0.0/twisted/trial/util.py        |  378 ++
 vendor/Twisted-10.0.0/twisted/web/__init__.py      |   13 +
 .../Twisted-10.0.0/twisted/web/_auth/__init__.py   |    7 +
 vendor/Twisted-10.0.0/twisted/web/_auth/basic.py   |   59 +
 vendor/Twisted-10.0.0/twisted/web/_auth/digest.py  |   54 +
 vendor/Twisted-10.0.0/twisted/web/_auth/wrapper.py |  222 +
 vendor/Twisted-10.0.0/twisted/web/_newclient.py    | 1413 +++++
 vendor/Twisted-10.0.0/twisted/web/_version.py      |    3 +
 vendor/Twisted-10.0.0/twisted/web/client.py        |  644 +++
 vendor/Twisted-10.0.0/twisted/web/demo.py          |   29 +
 vendor/Twisted-10.0.0/twisted/web/distrib.py       |  374 ++
 vendor/Twisted-10.0.0/twisted/web/domhelpers.py    |  268 +
 vendor/Twisted-10.0.0/twisted/web/error.py         |  230 +
 vendor/Twisted-10.0.0/twisted/web/google.py        |   75 +
 vendor/Twisted-10.0.0/twisted/web/guard.py         |   17 +
 vendor/Twisted-10.0.0/twisted/web/html.py          |   49 +
 vendor/Twisted-10.0.0/twisted/web/http.py          | 1797 ++++++
 vendor/Twisted-10.0.0/twisted/web/http_headers.py  |  260 +
 vendor/Twisted-10.0.0/twisted/web/iweb.py          |  421 ++
 vendor/Twisted-10.0.0/twisted/web/microdom.py      | 1028 ++++
 vendor/Twisted-10.0.0/twisted/web/proxy.py         |  302 ++
 vendor/Twisted-10.0.0/twisted/web/resource.py      |  300 +
 vendor/Twisted-10.0.0/twisted/web/rewrite.py       |   52 +
 vendor/Twisted-10.0.0/twisted/web/script.py        |  169 +
 vendor/Twisted-10.0.0/twisted/web/server.py        |  527 ++
 vendor/Twisted-10.0.0/twisted/web/soap.py          |  154 +
 vendor/Twisted-10.0.0/twisted/web/static.py        | 1104 ++++
 vendor/Twisted-10.0.0/twisted/web/sux.py           |  657 +++
 vendor/Twisted-10.0.0/twisted/web/tap.py           |  234 +
 vendor/Twisted-10.0.0/twisted/web/test/__init__.py |    7 +
 vendor/Twisted-10.0.0/twisted/web/test/_util.py    |   24 +
 vendor/Twisted-10.0.0/twisted/web/test/test_cgi.py |  190 +
 .../twisted/web/test/test_distrib.py               |  361 ++
 .../twisted/web/test/test_domhelpers.py            |  306 ++
 .../Twisted-10.0.0/twisted/web/test/test_error.py  |  151 +
 .../Twisted-10.0.0/twisted/web/test/test_http.py   | 1531 ++++++
 .../twisted/web/test/test_http_headers.py          |  585 ++
 .../twisted/web/test/test_httpauth.py              |  586 ++
 .../twisted/web/test/test_newclient.py             | 2082 +++++++
 .../Twisted-10.0.0/twisted/web/test/test_proxy.py  |  541 ++
 .../twisted/web/test/test_resource.py              |  144 +
 .../Twisted-10.0.0/twisted/web/test/test_script.py |   70 +
 .../Twisted-10.0.0/twisted/web/test/test_soap.py   |  114 +
 .../Twisted-10.0.0/twisted/web/test/test_static.py | 1507 ++++++
 vendor/Twisted-10.0.0/twisted/web/test/test_tap.py |  251 +
 .../Twisted-10.0.0/twisted/web/test/test_vhost.py  |  105 +
 vendor/Twisted-10.0.0/twisted/web/test/test_web.py |  863 +++
 .../twisted/web/test/test_webclient.py             | 1060 ++++
 .../Twisted-10.0.0/twisted/web/test/test_wsgi.py   | 1572 ++++++
 vendor/Twisted-10.0.0/twisted/web/test/test_xml.py | 1105 ++++
 .../Twisted-10.0.0/twisted/web/test/test_xmlrpc.py |  510 ++
 vendor/Twisted-10.0.0/twisted/web/topfiles/NEWS    |  309 ++
 vendor/Twisted-10.0.0/twisted/web/topfiles/README  |    1 +
 .../Twisted-10.0.0/twisted/web/topfiles/setup.py   |   30 +
 vendor/Twisted-10.0.0/twisted/web/trp.py           |   23 +
 vendor/Twisted-10.0.0/twisted/web/twcgi.py         |  253 +
 vendor/Twisted-10.0.0/twisted/web/util.py          |  380 ++
 vendor/Twisted-10.0.0/twisted/web/vhost.py         |  135 +
 vendor/Twisted-10.0.0/twisted/web/wsgi.py          |  401 ++
 vendor/Twisted-10.0.0/twisted/web/xmlrpc.py        |  427 ++
 vendor/Twisted-10.0.0/twisted/words/__init__.py    |   10 +
 vendor/Twisted-10.0.0/twisted/words/_version.py    |    3 +
 vendor/Twisted-10.0.0/twisted/words/ewords.py      |   34 +
 vendor/Twisted-10.0.0/twisted/words/im/__init__.py |    8 +
 .../Twisted-10.0.0/twisted/words/im/baseaccount.py |   62 +
 vendor/Twisted-10.0.0/twisted/words/im/basechat.py |  316 ++
 .../Twisted-10.0.0/twisted/words/im/basesupport.py |  270 +
 .../twisted/words/im/instancemessenger.glade       | 3165 +++++++++++
 .../Twisted-10.0.0/twisted/words/im/interfaces.py  |  364 ++
 .../Twisted-10.0.0/twisted/words/im/ircsupport.py  |  261 +
 vendor/Twisted-10.0.0/twisted/words/im/locals.py   |   26 +
 .../Twisted-10.0.0/twisted/words/im/pbsupport.py   |  260 +
 vendor/Twisted-10.0.0/twisted/words/im/proxyui.py  |   24 +
 vendor/Twisted-10.0.0/twisted/words/im/tap.py      |   15 +
 .../Twisted-10.0.0/twisted/words/im/tocsupport.py  |  220 +
 vendor/Twisted-10.0.0/twisted/words/iwords.py      |  266 +
 .../twisted/words/protocols/__init__.py            |    1 +
 .../Twisted-10.0.0/twisted/words/protocols/irc.py  | 3166 +++++++++++
 .../twisted/words/protocols/jabber/__init__.py     |    8 +
 .../twisted/words/protocols/jabber/client.py       |  369 ++
 .../twisted/words/protocols/jabber/component.py    |  474 ++
 .../twisted/words/protocols/jabber/error.py        |  336 ++
 .../twisted/words/protocols/jabber/ijabber.py      |  199 +
 .../twisted/words/protocols/jabber/jid.py          |  249 +
 .../twisted/words/protocols/jabber/jstrports.py    |   31 +
 .../twisted/words/protocols/jabber/sasl.py         |  243 +
 .../words/protocols/jabber/sasl_mechanisms.py      |  240 +
 .../twisted/words/protocols/jabber/xmlstream.py    | 1136 ++++
 .../words/protocols/jabber/xmpp_stringprep.py      |  248 +
 .../Twisted-10.0.0/twisted/words/protocols/msn.py  | 2449 +++++++++
 .../twisted/words/protocols/oscar.py               | 1235 +++++
 .../Twisted-10.0.0/twisted/words/protocols/toc.py  | 1622 ++++++
 vendor/Twisted-10.0.0/twisted/words/service.py     | 1223 +++++
 vendor/Twisted-10.0.0/twisted/words/tap.py         |   72 +
 .../Twisted-10.0.0/twisted/words/test/__init__.py  |    1 +
 .../twisted/words/test/test_basesupport.py         |   97 +
 .../twisted/words/test/test_domish.py              |  421 ++
 .../Twisted-10.0.0/twisted/words/test/test_irc.py  | 1566 ++++++
 .../twisted/words/test/test_irc_service.py         |  110 +
 .../twisted/words/test/test_jabberclient.py        |  414 ++
 .../twisted/words/test/test_jabbercomponent.py     |  422 ++
 .../twisted/words/test/test_jabbererror.py         |  308 ++
 .../twisted/words/test/test_jabberjid.py           |  225 +
 .../twisted/words/test/test_jabbersasl.py          |  272 +
 .../words/test/test_jabbersaslmechanisms.py        |   90 +
 .../twisted/words/test/test_jabberxmlstream.py     | 1287 +++++
 .../words/test/test_jabberxmppstringprep.py        |   84 +
 .../Twisted-10.0.0/twisted/words/test/test_msn.py  |  503 ++
 .../twisted/words/test/test_oscar.py               |   24 +
 .../twisted/words/test/test_service.py             |  992 ++++
 .../Twisted-10.0.0/twisted/words/test/test_tap.py  |   78 +
 .../Twisted-10.0.0/twisted/words/test/test_toc.py  |  340 ++
 .../twisted/words/test/test_xishutil.py            |  345 ++
 .../twisted/words/test/test_xmlstream.py           |  201 +
 .../twisted/words/test/test_xmpproutertap.py       |   86 +
 .../twisted/words/test/test_xpath.py               |  260 +
 vendor/Twisted-10.0.0/twisted/words/toctap.py      |   20 +
 vendor/Twisted-10.0.0/twisted/words/topfiles/NEWS  |  230 +
 .../Twisted-10.0.0/twisted/words/topfiles/README   |    4 +
 .../Twisted-10.0.0/twisted/words/topfiles/setup.py |   53 +
 .../Twisted-10.0.0/twisted/words/xish/__init__.py  |   10 +
 vendor/Twisted-10.0.0/twisted/words/xish/domish.py |  848 +++
 .../Twisted-10.0.0/twisted/words/xish/utility.py   |  372 ++
 .../Twisted-10.0.0/twisted/words/xish/xmlstream.py |  261 +
 vendor/Twisted-10.0.0/twisted/words/xish/xpath.py  |  333 ++
 .../twisted/words/xish/xpathparser.g               |  375 ++
 .../twisted/words/xish/xpathparser.py              |  508 ++
 .../Twisted-10.0.0/twisted/words/xmpproutertap.py  |   30 +
 vendor/amqplib/__init__.py                         |    1 +
 vendor/amqplib/client_0_8/__init__.py              |   35 +
 vendor/amqplib/client_0_8/abstract_channel.py      |  114 +
 vendor/amqplib/client_0_8/basic_message.py         |  137 +
 vendor/amqplib/client_0_8/channel.py               | 2602 +++++++++
 vendor/amqplib/client_0_8/connection.py            |  826 +++
 vendor/amqplib/client_0_8/exceptions.py            |  105 +
 vendor/amqplib/client_0_8/method_framing.py        |  244 +
 vendor/amqplib/client_0_8/serialization.py         |  530 ++
 vendor/amqplib/client_0_8/transport.py             |  220 +
 vendor/anyjson/__init__.py                         |  124 +
 vendor/boto/README                                 |   53 +
 vendor/boto/bin/bundle_image                       |   27 +
 vendor/boto/bin/cfadmin                            |   70 +
 vendor/boto/bin/elbadmin                           |  179 +
 vendor/boto/bin/fetch_file                         |   37 +
 vendor/boto/bin/kill_instance                      |   12 +
 vendor/boto/bin/launch_instance                    |  138 +
 vendor/boto/bin/list_instances                     |   10 +
 vendor/boto/bin/pyami_sendmail                     |   47 +
 vendor/boto/bin/s3put                              |  196 +
 vendor/boto/bin/sdbadmin                           |  168 +
 vendor/boto/bin/taskadmin                          |  116 +
 vendor/boto/boto/__init__.py                       |  292 +
 vendor/boto/boto/cloudfront/__init__.py            |  223 +
 vendor/boto/boto/cloudfront/distribution.py        |  470 ++
 vendor/boto/boto/cloudfront/exception.py           |   26 +
 vendor/boto/boto/cloudfront/identity.py            |  122 +
 vendor/boto/boto/cloudfront/logging.py             |   38 +
 vendor/boto/boto/cloudfront/object.py              |   48 +
 vendor/boto/boto/cloudfront/signers.py             |   60 +
 vendor/boto/boto/connection.py                     |  644 +++
 vendor/boto/boto/contrib/__init__.py               |   22 +
 vendor/boto/boto/contrib/m2helpers.py              |   52 +
 vendor/boto/boto/contrib/ymlmessage.py             |   52 +
 vendor/boto/boto/ec2/__init__.py                   |   52 +
 vendor/boto/boto/ec2/address.py                    |   58 +
 vendor/boto/boto/ec2/autoscale/__init__.py         |  203 +
 vendor/boto/boto/ec2/autoscale/activity.py         |   55 +
 vendor/boto/boto/ec2/autoscale/group.py            |  189 +
 vendor/boto/boto/ec2/autoscale/instance.py         |   53 +
 vendor/boto/boto/ec2/autoscale/launchconfig.py     |   98 +
 vendor/boto/boto/ec2/autoscale/request.py          |   38 +
 vendor/boto/boto/ec2/autoscale/trigger.py          |  137 +
 vendor/boto/boto/ec2/blockdevicemapping.py         |   98 +
 vendor/boto/boto/ec2/bundleinstance.py             |   78 +
 vendor/boto/boto/ec2/buyreservation.py             |   81 +
 vendor/boto/boto/ec2/cloudwatch/__init__.py        |  213 +
 vendor/boto/boto/ec2/cloudwatch/datapoint.py       |   37 +
 vendor/boto/boto/ec2/cloudwatch/metric.py          |   71 +
 vendor/boto/boto/ec2/connection.py                 | 1605 ++++++
 vendor/boto/boto/ec2/ec2object.py                  |   41 +
 vendor/boto/boto/ec2/elb/__init__.py               |  238 +
 vendor/boto/boto/ec2/elb/healthcheck.py            |   68 +
 vendor/boto/boto/ec2/elb/instancestate.py          |   54 +
 vendor/boto/boto/ec2/elb/listelement.py            |   31 +
 vendor/boto/boto/ec2/elb/listener.py               |   64 +
 vendor/boto/boto/ec2/elb/loadbalancer.py           |  142 +
 vendor/boto/boto/ec2/image.py                      |  250 +
 vendor/boto/boto/ec2/instance.py                   |  294 +
 vendor/boto/boto/ec2/instanceinfo.py               |   47 +
 vendor/boto/boto/ec2/keypair.py                    |  111 +
 vendor/boto/boto/ec2/launchspecification.py        |   96 +
 vendor/boto/boto/ec2/regioninfo.py                 |   60 +
 vendor/boto/boto/ec2/reservedinstance.py           |   97 +
 vendor/boto/boto/ec2/securitygroup.py              |  282 +
 vendor/boto/boto/ec2/snapshot.py                   |  127 +
 vendor/boto/boto/ec2/spotdatafeedsubscription.py   |   63 +
 vendor/boto/boto/ec2/spotinstancerequest.py        |  109 +
 vendor/boto/boto/ec2/spotpricehistory.py           |   52 +
 vendor/boto/boto/ec2/volume.py                     |  208 +
 vendor/boto/boto/ec2/zone.py                       |   47 +
 vendor/boto/boto/emr/__init__.py                   |   29 +
 vendor/boto/boto/emr/connection.py                 |  236 +
 vendor/boto/boto/emr/emrobject.py                  |   34 +
 vendor/boto/boto/emr/jobflow.py                    |   89 +
 vendor/boto/boto/emr/step.py                       |  168 +
 vendor/boto/boto/exception.py                      |  293 +
 vendor/boto/boto/fps/__init__.py                   |   23 +
 vendor/boto/boto/fps/connection.py                 |  172 +
 vendor/boto/boto/handler.py                        |   46 +
 vendor/boto/boto/manage/__init__.py                |   23 +
 vendor/boto/boto/manage/cmdshell.py                |  169 +
 vendor/boto/boto/manage/propget.py                 |   64 +
 vendor/boto/boto/manage/server.py                  |  548 ++
 vendor/boto/boto/manage/task.py                    |  175 +
 vendor/boto/boto/manage/test_manage.py             |   34 +
 vendor/boto/boto/manage/volume.py                  |  420 ++
 vendor/boto/boto/mapreduce/__init__.py             |   23 +
 vendor/boto/boto/mapreduce/lqs.py                  |  152 +
 vendor/boto/boto/mapreduce/partitiondb.py          |  175 +
 vendor/boto/boto/mapreduce/pdb_delete              |  135 +
 vendor/boto/boto/mapreduce/pdb_describe            |  124 +
 vendor/boto/boto/mapreduce/pdb_revert              |  135 +
 vendor/boto/boto/mapreduce/pdb_upload              |  172 +
 vendor/boto/boto/mapreduce/queuetools.py           |   66 +
 vendor/boto/boto/mashups/__init__.py               |   23 +
 vendor/boto/boto/mashups/interactive.py            |   97 +
 vendor/boto/boto/mashups/iobject.py                |  115 +
 vendor/boto/boto/mashups/order.py                  |  211 +
 vendor/boto/boto/mashups/server.py                 |  395 ++
 vendor/boto/boto/mturk/__init__.py                 |   23 +
 vendor/boto/boto/mturk/connection.py               |  515 ++
 vendor/boto/boto/mturk/notification.py             |   95 +
 vendor/boto/boto/mturk/price.py                    |   48 +
 vendor/boto/boto/mturk/qualification.py            |  118 +
 vendor/boto/boto/mturk/question.py                 |  336 ++
 vendor/boto/boto/mturk/test/all_tests.py           |    8 +
 vendor/boto/boto/mturk/test/cleanup_tests.py       |   67 +
 .../test/create_free_text_question_regex.doctest   |   92 +
 vendor/boto/boto/mturk/test/create_hit.doctest     |   86 +
 .../boto/boto/mturk/test/create_hit_binary.doctest |   87 +
 vendor/boto/boto/mturk/test/create_hit_external.py |   14 +
 .../mturk/test/create_hit_from_hit_type.doctest    |   97 +
 .../mturk/test/create_hit_with_qualifications.py   |   18 +
 .../boto/boto/mturk/test/reviewable_hits.doctest   |   71 +
 vendor/boto/boto/mturk/test/search_hits.doctest    |   16 +
 vendor/boto/boto/pyami/__init__.py                 |   22 +
 vendor/boto/boto/pyami/bootstrap.py                |  121 +
 vendor/boto/boto/pyami/config.py                   |  203 +
 vendor/boto/boto/pyami/copybot.cfg                 |   60 +
 vendor/boto/boto/pyami/copybot.py                  |   97 +
 vendor/boto/boto/pyami/helloworld.py               |   28 +
 vendor/boto/boto/pyami/installers/__init__.py      |   64 +
 .../boto/boto/pyami/installers/ubuntu/__init__.py  |   22 +
 vendor/boto/boto/pyami/installers/ubuntu/apache.py |   43 +
 vendor/boto/boto/pyami/installers/ubuntu/ebs.py    |  206 +
 .../boto/boto/pyami/installers/ubuntu/installer.py |   96 +
 vendor/boto/boto/pyami/installers/ubuntu/mysql.py  |  109 +
 vendor/boto/boto/pyami/installers/ubuntu/trac.py   |  139 +
 vendor/boto/boto/pyami/launch_ami.py               |  178 +
 vendor/boto/boto/pyami/scriptbase.py               |   44 +
 vendor/boto/boto/pyami/startup.py                  |   59 +
 vendor/boto/boto/rds/__init__.py                   |  810 +++
 vendor/boto/boto/rds/dbinstance.py                 |  136 +
 vendor/boto/boto/rds/dbsecuritygroup.py            |  159 +
 vendor/boto/boto/rds/dbsnapshot.py                 |   74 +
 vendor/boto/boto/rds/event.py                      |   49 +
 vendor/boto/boto/rds/parametergroup.py             |  201 +
 vendor/boto/boto/resultset.py                      |  136 +
 vendor/boto/boto/s3/__init__.py                    |   31 +
 vendor/boto/boto/s3/acl.py                         |  162 +
 vendor/boto/boto/s3/bucket.py                      |  721 +++
 vendor/boto/boto/s3/bucketlistresultset.py         |   99 +
 vendor/boto/boto/s3/connection.py                  |  350 ++
 vendor/boto/boto/s3/deletemarker.py                |   56 +
 vendor/boto/boto/s3/key.py                         |  804 +++
 vendor/boto/boto/s3/prefix.py                      |   35 +
 vendor/boto/boto/s3/user.py                        |   49 +
 vendor/boto/boto/sdb/__init__.py                   |   41 +
 vendor/boto/boto/sdb/connection.py                 |  441 ++
 vendor/boto/boto/sdb/db/__init__.py                |   21 +
 vendor/boto/boto/sdb/db/blob.py                    |   64 +
 vendor/boto/boto/sdb/db/key.py                     |   59 +
 vendor/boto/boto/sdb/db/manager/__init__.py        |   88 +
 vendor/boto/boto/sdb/db/manager/pgmanager.py       |  389 ++
 vendor/boto/boto/sdb/db/manager/sdbmanager.py      |  599 ++
 vendor/boto/boto/sdb/db/manager/xmlmanager.py      |  517 ++
 vendor/boto/boto/sdb/db/model.py                   |  234 +
 vendor/boto/boto/sdb/db/property.py                |  556 ++
 vendor/boto/boto/sdb/db/query.py                   |   79 +
 vendor/boto/boto/sdb/db/sequence.py                |  224 +
 vendor/boto/boto/sdb/db/test_db.py                 |  225 +
 vendor/boto/boto/sdb/domain.py                     |  337 ++
 vendor/boto/boto/sdb/item.py                       |  105 +
 vendor/boto/boto/sdb/persist/__init__.py           |   83 +
 vendor/boto/boto/sdb/persist/checker.py            |  302 ++
 vendor/boto/boto/sdb/persist/object.py             |  207 +
 vendor/boto/boto/sdb/persist/property.py           |  371 ++
 vendor/boto/boto/sdb/persist/test_persist.py       |  141 +
 vendor/boto/boto/sdb/queryresultset.py             |   92 +
 vendor/boto/boto/sdb/regioninfo.py                 |   40 +
 vendor/boto/boto/services/__init__.py              |   23 +
 vendor/boto/boto/services/bs.py                    |  179 +
 vendor/boto/boto/services/message.py               |   58 +
 vendor/boto/boto/services/result.py                |  137 +
 vendor/boto/boto/services/service.py               |  161 +
 vendor/boto/boto/services/servicedef.py            |   91 +
 vendor/boto/boto/services/sonofmmm.cfg             |   43 +
 vendor/boto/boto/services/sonofmmm.py              |   81 +
 vendor/boto/boto/services/submit.py                |   88 +
 vendor/boto/boto/sns/__init__.py                   |  353 ++
 vendor/boto/boto/sqs/__init__.py                   |   42 +
 vendor/boto/boto/sqs/attributes.py                 |   46 +
 vendor/boto/boto/sqs/connection.py                 |  286 +
 vendor/boto/boto/sqs/jsonmessage.py                |   42 +
 vendor/boto/boto/sqs/message.py                    |  251 +
 vendor/boto/boto/sqs/queue.py                      |  414 ++
 vendor/boto/boto/sqs/regioninfo.py                 |   40 +
 vendor/boto/boto/tests/__init__.py                 |   23 +
 vendor/boto/boto/tests/devpay_s3.py                |  177 +
 vendor/boto/boto/tests/test.py                     |   85 +
 vendor/boto/boto/tests/test_ec2connection.py       |  154 +
 vendor/boto/boto/tests/test_s3connection.py        |  175 +
 vendor/boto/boto/tests/test_s3versioning.py        |  143 +
 vendor/boto/boto/tests/test_sdbconnection.py       |  104 +
 vendor/boto/boto/tests/test_sqsconnection.py       |  142 +
 vendor/boto/boto/utils.py                          |  561 ++
 vendor/boto/boto/vpc/__init__.py                   |  473 ++
 vendor/boto/boto/vpc/customergateway.py            |   54 +
 vendor/boto/boto/vpc/dhcpoptions.py                |   69 +
 vendor/boto/boto/vpc/subnet.py                     |   54 +
 vendor/boto/boto/vpc/vpc.py                        |   54 +
 vendor/boto/boto/vpc/vpnconnection.py              |   60 +
 vendor/boto/boto/vpc/vpngateway.py                 |   80 +
 vendor/boto/cq.py                                  |   82 +
 vendor/boto/docs/Makefile                          |   89 +
 vendor/boto/docs/make.bat                          |  113 +
 vendor/boto/docs/source/_templates/layout.html     |    3 +
 vendor/boto/docs/source/autoscale_tut.rst          |  140 +
 .../boto/docs/source/boto_theme/static/boto.css_t  |  239 +
 .../docs/source/boto_theme/static/pygments.css     |   61 +
 vendor/boto/docs/source/boto_theme/theme.conf      |    3 +
 vendor/boto/docs/source/conf.py                    |   30 +
 vendor/boto/docs/source/documentation.rst          |   59 +
 vendor/boto/docs/source/ec2_tut.rst                |  420 ++
 vendor/boto/docs/source/elb_tut.rst                |  202 +
 vendor/boto/docs/source/index.rst                  |   52 +
 vendor/boto/docs/source/ref/boto.rst               |   47 +
 vendor/boto/docs/source/ref/cloudfront.rst         |  108 +
 vendor/boto/docs/source/ref/contrib.rst            |   32 +
 vendor/boto/docs/source/ref/ec2.rst                |  223 +
 vendor/boto/docs/source/ref/fps.rst                |   19 +
 vendor/boto/docs/source/ref/index.rst              |   25 +
 vendor/boto/docs/source/ref/manage.rst             |   47 +
 vendor/boto/docs/source/ref/mapreduce.rst          |   38 +
 vendor/boto/docs/source/ref/mashups.rst            |   40 +
 vendor/boto/docs/source/ref/mturk.rst              |   47 +
 vendor/boto/docs/source/ref/pyami.rst              |  103 +
 vendor/boto/docs/source/ref/rds.rst                |   47 +
 vendor/boto/docs/source/ref/s3.rst                 |   54 +
 vendor/boto/docs/source/ref/sdb.rst                |  144 +
 vendor/boto/docs/source/ref/services.rst           |   61 +
 vendor/boto/docs/source/ref/sqs.rst                |   54 +
 vendor/boto/docs/source/ref/vpc.rst                |   54 +
 vendor/boto/docs/source/s3_tut.rst                 |  213 +
 vendor/boto/docs/source/sqs_tut.rst                |  230 +
 vendor/boto/docs/source/vpc_tut.rst                |   88 +
 vendor/boto/pylintrc                               |  305 ++
 vendor/boto/setup.py                               |   56 +
 vendor/carrot/__init__.py                          |    7 +
 vendor/carrot/backends/__init__.py                 |   54 +
 vendor/carrot/backends/base.py                     |  185 +
 vendor/carrot/backends/pikachu.py                  |  209 +
 vendor/carrot/backends/pyamqplib.py                |  328 ++
 vendor/carrot/backends/pystomp.py                  |  192 +
 vendor/carrot/backends/queue.py                    |   76 +
 vendor/carrot/connection.py                        |  229 +
 vendor/carrot/messaging.py                         |  981 ++++
 vendor/carrot/serialization.py                     |  253 +
 vendor/carrot/utils.py                             |   56 +
 vendor/lockfile/2.4.diff                           |   99 +
 vendor/lockfile/ACKS                               |    6 +
 vendor/lockfile/LICENSE                            |   21 +
 vendor/lockfile/MANIFEST                           |   19 +
 vendor/lockfile/PKG-INFO                           |   47 +
 vendor/lockfile/README                             |   23 +
 vendor/lockfile/RELEASE-NOTES                      |   42 +
 vendor/lockfile/doc/Makefile                       |   73 +
 vendor/lockfile/doc/conf.py                        |  179 +
 vendor/lockfile/doc/glossary.rst                   |   15 +
 vendor/lockfile/doc/index.rst                      |   22 +
 vendor/lockfile/doc/lockfile.rst                   |  257 +
 vendor/lockfile/lockfile/__init__.py               |  286 +
 vendor/lockfile/lockfile/linklockfile.py           |   71 +
 vendor/lockfile/lockfile/mkdirlockfile.py          |   79 +
 vendor/lockfile/lockfile/pidlockfile.py            |  181 +
 vendor/lockfile/lockfile/sqlitelockfile.py         |  142 +
 vendor/lockfile/setup.py                           |   32 +
 vendor/lockfile/test/compliancetest.py             |  228 +
 vendor/lockfile/test/test_lockfile.py              |   30 +
 vendor/pymox/COPYING                               |  202 +
 vendor/pymox/MANIFEST.in                           |    5 +
 vendor/pymox/README                                |   56 +
 vendor/pymox/mox.py                                | 1729 ++++++
 vendor/pymox/mox_test.py                           | 1853 +++++++
 vendor/pymox/mox_test_helper.py                    |   95 +
 vendor/pymox/setup.py                              |   14 +
 vendor/pymox/stubout.py                            |  142 +
 vendor/pymox/stubout_test.py                       |   47 +
 vendor/pymox/stubout_testee.py                     |    2 +
 vendor/python-daemon/ChangeLog                     |  187 +
 vendor/python-daemon/LICENSE.GPL-2                 |  339 ++
 vendor/python-daemon/LICENSE.PSF-2                 |   48 +
 vendor/python-daemon/MANIFEST.in                   |    4 +
 vendor/python-daemon/PKG-INFO                      |   37 +
 vendor/python-daemon/README.nova                   |    4 +
 vendor/python-daemon/daemon/__init__.py            |   47 +
 vendor/python-daemon/daemon/daemon.py              |  776 +++
 vendor/python-daemon/daemon/pidlockfile.py         |  195 +
 vendor/python-daemon/daemon/runner.py              |  229 +
 vendor/python-daemon/daemon/version/__init__.py    |   36 +
 .../python-daemon/daemon/version/version_info.py   |   23 +
 .../python-daemon/python_daemon.egg-info/PKG-INFO  |   37 +
 .../python_daemon.egg-info/SOURCES.txt             |   22 +
 .../python_daemon.egg-info/dependency_links.txt    |    1 +
 .../python_daemon.egg-info/not-zip-safe            |    1 +
 .../python_daemon.egg-info/requires.txt            |    2 +
 .../python_daemon.egg-info/top_level.txt           |    1 +
 vendor/python-daemon/setup.cfg                     |    5 +
 vendor/python-daemon/setup.py                      |   64 +
 vendor/python-gflags/AUTHORS                       |    2 +
 vendor/python-gflags/COPYING                       |   28 +
 vendor/python-gflags/ChangeLog                     |    5 +
 vendor/python-gflags/README                        |   23 +
 vendor/python-gflags/debian/README                 |    7 +
 vendor/python-gflags/debian/changelog              |   11 +
 vendor/python-gflags/debian/compat                 |    1 +
 vendor/python-gflags/debian/control                |   26 +
 vendor/python-gflags/debian/copyright              |   41 +
 vendor/python-gflags/debian/docs                   |    2 +
 vendor/python-gflags/debian/rules                  |   62 +
 vendor/python-gflags/gflags.py                     | 2340 ++++++++
 vendor/python-gflags/gflags2man.py                 |  536 ++
 vendor/python-gflags/gflags_helpxml_test.py        |  563 ++
 vendor/python-gflags/gflags_unittest.py            | 1679 ++++++
 vendor/python-gflags/setup.py                      |   44 +
 vendor/python-gflags/test_module_bar.py            |  135 +
 vendor/python-gflags/test_module_foo.py            |  120 +
 vendor/redis-py/.gitignore                         |    5 +
 vendor/redis-py/CHANGES                            |   58 +
 vendor/redis-py/INSTALL                            |    6 +
 vendor/redis-py/LICENSE                            |   22 +
 vendor/redis-py/MANIFEST.in                        |    4 +
 vendor/redis-py/README.md                          |   33 +
 vendor/redis-py/redis/__init__.py                  |   10 +
 vendor/redis-py/redis/client.py                    | 1259 +++++
 vendor/redis-py/redis/exceptions.py                |   20 +
 vendor/redis-py/setup.py                           |   42 +
 vendor/redis-py/tests/__init__.py                  |   11 +
 vendor/redis-py/tests/connection_pool.py           |   53 +
 vendor/redis-py/tests/pipeline.py                  |   61 +
 vendor/redis-py/tests/server_commands.py           | 1092 ++++
 vendor/tornado/MANIFEST.in                         |    2 +
 vendor/tornado/README                              |   27 +
 vendor/tornado/demos/appengine/README              |   48 +
 vendor/tornado/demos/appengine/app.yaml            |   11 +
 vendor/tornado/demos/appengine/blog.py             |  169 +
 vendor/tornado/demos/appengine/markdown.py         | 1877 +++++++
 vendor/tornado/demos/appengine/static/blog.css     |  153 +
 .../tornado/demos/appengine/templates/archive.html |   31 +
 vendor/tornado/demos/appengine/templates/base.html |   29 +
 .../tornado/demos/appengine/templates/compose.html |   42 +
 .../tornado/demos/appengine/templates/entry.html   |    5 +
 vendor/tornado/demos/appengine/templates/feed.xml  |   26 +
 vendor/tornado/demos/appengine/templates/home.html |    8 +
 .../demos/appengine/templates/modules/entry.html   |    8 +
 vendor/tornado/demos/auth/authdemo.py              |   79 +
 vendor/tornado/demos/blog/README                   |   57 +
 vendor/tornado/demos/blog/blog.py                  |  195 +
 vendor/tornado/demos/blog/markdown.py              | 1877 +++++++
 vendor/tornado/demos/blog/schema.sql               |   44 +
 vendor/tornado/demos/blog/static/blog.css          |  153 +
 vendor/tornado/demos/blog/templates/archive.html   |   31 +
 vendor/tornado/demos/blog/templates/base.html      |   27 +
 vendor/tornado/demos/blog/templates/compose.html   |   42 +
 vendor/tornado/demos/blog/templates/entry.html     |    5 +
 vendor/tornado/demos/blog/templates/feed.xml       |   26 +
 vendor/tornado/demos/blog/templates/home.html      |    8 +
 .../demos/blog/templates/modules/entry.html        |    8 +
 vendor/tornado/demos/chat/chatdemo.py              |  156 +
 vendor/tornado/demos/chat/static/chat.css          |   56 +
 vendor/tornado/demos/chat/static/chat.js           |  135 +
 vendor/tornado/demos/chat/templates/index.html     |   37 +
 vendor/tornado/demos/chat/templates/message.html   |    1 +
 vendor/tornado/demos/facebook/README               |    8 +
 vendor/tornado/demos/facebook/facebook.py          |  127 +
 vendor/tornado/demos/facebook/static/facebook.css  |   97 +
 .../demos/facebook/templates/modules/post.html     |   29 +
 .../tornado/demos/facebook/templates/stream.html   |   22 +
 vendor/tornado/demos/facebook/uimodules.py         |   22 +
 vendor/tornado/demos/helloworld/helloworld.py      |   43 +
 vendor/tornado/setup.py                            |   44 +
 vendor/tornado/tornado/__init__.py                 |   17 +
 vendor/tornado/tornado/auth.py                     |  883 +++
 vendor/tornado/tornado/autoreload.py               |   95 +
 vendor/tornado/tornado/database.py                 |  180 +
 vendor/tornado/tornado/epoll.c                     |  112 +
 vendor/tornado/tornado/escape.py                   |  112 +
 vendor/tornado/tornado/httpclient.py               |  465 ++
 vendor/tornado/tornado/httpserver.py               |  450 ++
 vendor/tornado/tornado/ioloop.py                   |  483 ++
 vendor/tornado/tornado/iostream.py                 |  229 +
 vendor/tornado/tornado/locale.py                   |  457 ++
 vendor/tornado/tornado/options.py                  |  386 ++
 vendor/tornado/tornado/s3server.py                 |  255 +
 vendor/tornado/tornado/template.py                 |  576 ++
 vendor/tornado/tornado/test/README                 |    4 +
 vendor/tornado/tornado/test/test_ioloop.py         |   38 +
 vendor/tornado/tornado/web.py                      | 1445 +++++
 vendor/tornado/tornado/websocket.py                |  138 +
 vendor/tornado/tornado/win32_support.py            |  123 +
 vendor/tornado/tornado/wsgi.py                     |  311 ++
 vendor/tornado/website/app.yaml                    |   15 +
 vendor/tornado/website/markdown/__init__.py        |  603 +++
 vendor/tornado/website/markdown/blockparser.py     |   95 +
 vendor/tornado/website/markdown/blockprocessors.py |  460 ++
 vendor/tornado/website/markdown/commandline.py     |   96 +
 vendor/tornado/website/markdown/etree_loader.py    |   33 +
 vendor/tornado/website/markdown/extensions/toc.py  |  140 +
 vendor/tornado/website/markdown/html4.py           |  274 +
 vendor/tornado/website/markdown/inlinepatterns.py  |  371 ++
 vendor/tornado/website/markdown/odict.py           |  162 +
 vendor/tornado/website/markdown/postprocessors.py  |   77 +
 vendor/tornado/website/markdown/preprocessors.py   |  214 +
 vendor/tornado/website/markdown/treeprocessors.py  |  329 ++
 vendor/tornado/website/static/base.css             |  120 +
 vendor/tornado/website/static/facebook.png         |  Bin 0 -> 7457 bytes
 vendor/tornado/website/static/friendfeed.png       |  Bin 0 -> 7906 bytes
 vendor/tornado/website/static/robots.txt           |    2 +
 vendor/tornado/website/static/tornado-0.1.tar.gz   |  Bin 0 -> 106878 bytes
 vendor/tornado/website/static/tornado-0.2.tar.gz   |  Bin 0 -> 200680 bytes
 vendor/tornado/website/static/tornado.png          |  Bin 0 -> 7101 bytes
 vendor/tornado/website/static/twitter.png          |  Bin 0 -> 7197 bytes
 vendor/tornado/website/templates/base.html         |   27 +
 .../tornado/website/templates/documentation.html   |    9 +
 vendor/tornado/website/templates/documentation.txt |  866 +++
 vendor/tornado/website/templates/index.html        |   51 +
 vendor/tornado/website/website.py                  |   63 +
 1867 files changed, 430845 insertions(+)